Skip to content

Commit

Permalink
gtk2 ports: fix path-style dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
mascguy committed Oct 16, 2021
1 parent 7459497 commit 08ac79d
Show file tree
Hide file tree
Showing 208 changed files with 225 additions and 225 deletions.
2 changes: 1 addition & 1 deletion audio/libcanberra/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ configure.args --disable-alsa \

variant x11 {
depends_lib-append port:xorg-libX11 \
path:lib/pkgconfig/gtk+-2.0.pc \
path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:gtk3
configure.args-replace --disable-gtk --enable-gtk
configure.args-replace --disable-gtk3 --enable-gtk3
Expand Down
2 changes: 1 addition & 1 deletion audio/lv2/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ configure.args-append --no-plugins
depends_build-append port:pkgconfig

variant plugins description {Add sample plugins} {
depends_lib-append port:libsndfile path:lib/pkgconfig/gtk+-2.0.pc path:lib/pkgconfig/cairo.pc:cairo
depends_lib-append port:libsndfile path:lib/pkgconfig/gtk+-2.0.pc:gtk2 path:lib/pkgconfig/cairo.pc:cairo
configure.args-delete --no-plugins
}

Expand Down
2 changes: 1 addition & 1 deletion audio/tagtool/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ depends_build port:pkgconfig \
depends_lib port:id3lib \
port:libvorbis \
port:gettext \
path:lib/pkgconfig/gtk+-2.0.pc \
path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:libglade2 \
port:libxml2 \
port:sqlite3 \
Expand Down
2 changes: 1 addition & 1 deletion cad/gaw/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ variant gtk2 conflicts gtk3 description {Use the GTK2+ toolkit for the GUI} {
sha1 f8ee9b494a597ecfee646371064bd4b8256a66b8 \
rmd160 b8ff66ff4033c7abad422f0ef14ebb2556475214 \
sha256 a73658c52f097bdede96277694dae1c2b41fae82fe95ed9f11a9b8e635680ed8
depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc
depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc:gtk2

require_active_variants gtk2 x11

Expand Down
2 changes: 1 addition & 1 deletion cad/gerbv/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ checksums rmd160 d1178c2ecdd3d821f4593c6dc284fff959b217e0 \
revision 1

depends_build port:pkgconfig
depends_lib path:lib/pkgconfig/gtk+-2.0.pc \
depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:libpng

configure.args --disable-update-desktop-database
Expand Down
2 changes: 1 addition & 1 deletion cad/gtkwave/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ checksums rmd160 37e1b1bdc994ea8d9407e501b2afddb55321a22c \
depends_build port:pkgconfig

depends_lib port:bzip2 \
path:lib/pkgconfig/gtk+-2.0.pc \
path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:gtk-osx-application-gtk2 \
port:tk \
port:xz \
Expand Down
2 changes: 1 addition & 1 deletion cad/xgsch2pcb/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ checksums md5 caf84bc0f17b75a2984fea2a64fc2c81 \
distname geda-${name}-${version}
depends_build port:intltool
depends_lib port:desktop-file-utils \
path:lib/pkgconfig/gtk+-2.0.pc \
path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:pcb \
port:py27-pygtk \
port:dbus-python27
Expand Down
2 changes: 1 addition & 1 deletion comms/gnokii/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ platform macosx {
}

variant x11 {
depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc
depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc:gtk2
configure.args-delete --without-x
}

Expand Down
2 changes: 1 addition & 1 deletion comms/libinfinity/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ checksums rmd160 c36895b04fc5be315f4f110438d14bcde2fbfb69 \
depends_build port:pkgconfig

depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
path:lib/pkgconfig/gtk+-2.0.pc \
path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:libxml2 \
port:gnutls \
port:libgsasl \
Expand Down
2 changes: 1 addition & 1 deletion comms/xlog/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ checksums rmd160 8ce44c1521f4eb4e6af7400c39c2602ff7a613ad \
size 11407849

depends_lib path:lib/libhamlib.dylib:hamlib \
path:lib/pkgconfig/gtk+-2.0.pc
path:lib/pkgconfig/gtk+-2.0.pc:gtk2
depends_build port:pkgconfig

post-destroot {
Expand Down
2 changes: 1 addition & 1 deletion databases/postgis2/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ variant sfcgal description {Uses SFCGAL for 3D queries} {

variant gui description {Build the GUI import tool} {

depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc
depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc:gtk2
configure.args-append --with-gui
}

Expand Down
2 changes: 1 addition & 1 deletion devel/codeblocks/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ if {[variant_isset wxgtk28] || [variant_isset wxgtk30]} {
port:freetype \
port:gdk-pixbuf2 \
port:gettext \
path:lib/pkgconfig/gtk+-2.0.pc \
path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:xorg-libX11 \
port:xorg-libXcomposite \
port:xorg-libXcursor \
Expand Down
2 changes: 1 addition & 1 deletion devel/geany/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ configure.args --disable-silent-rules \

variant gtk2 conflicts gtk3 description {Use gtk2} {
depends_lib-append \
path:lib/pkgconfig/gtk+-2.0.pc \
path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:vte-gtk2-compat
}

Expand Down
2 changes: 1 addition & 1 deletion devel/gecko-sharp2/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ checksums md5 f88eaa06e71f8d8fa34cf59a3e034a6b \
depends_build port:pkgconfig

depends_lib port:mono \
path:lib/pkgconfig/gtk+-2.0.pc \
path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:gtk-sharp2

# mono is not universal
Expand Down
2 changes: 1 addition & 1 deletion devel/geoclue/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ depends_build \
port:pkgconfig

depends_lib \
path:lib/pkgconfig/gtk+-2.0.pc \
path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:dbus-glib \
port:libsoup

Expand Down
2 changes: 1 addition & 1 deletion devel/glade3/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ depends_build port:pkgconfig \
port:libtool

depends_lib port:desktop-file-utils \
path:lib/pkgconfig/gtk+-2.0.pc \
path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:libxml2

depends_run port:devhelp
Expand Down
2 changes: 1 addition & 1 deletion devel/gpsim/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ checksums rmd160 e84db6f55320e98dc37796e582949617c3547555 \
depends_build port:gputils \
port:pkgconfig

depends_lib path:lib/pkgconfig/gtk+-2.0.pc-extra \
depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2-extra \
port:popt
4 changes: 2 additions & 2 deletions devel/gtk-osx-application/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ subport gtk-osx-application-common-gtk3 {
subport gtk-osx-application-gtk2 {
set gtk_version gtk2

depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc \
depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
path:include/gtkmacintegration/gtk-mac-bundle.h:gtk-osx-application-common-gtk2

# force gtk version to 2.0
Expand All @@ -121,7 +121,7 @@ subport gtk-osx-application-gtk2 {
subport gtk-osx-application-common-gtk2 {
set gtk_version gtk2

depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc
depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc:gtk2

# force gtk version to 2.0
configure.args-append --with-gtk2 --without-gtk3 --disable-introspection
Expand Down
2 changes: 1 addition & 1 deletion devel/gtk2hs/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ checksums rmd160 c72acd0e2c5471c7757532cfb44c841be8e83f1d \
depends_build port:pkgconfig
depends_lib port:gconf \
port:ghc \
path:lib/pkgconfig/gtk+-2.0.pc \
path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:gnome-vfs \
path:lib/pkgconfig/cairo.pc:cairo \
port:librsvg \
Expand Down
2 changes: 1 addition & 1 deletion devel/gtkglext/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ checksums rmd160 7f5089d3ea64fd10b32632d9ea8f0b977e9317e7 \
size 956401

depends_build port:pkgconfig
depends_lib path:lib/pkgconfig/gtk+-2.0.pc \
depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:libGLU \
port:mesa \
port:pangox-compat \
Expand Down
6 changes: 3 additions & 3 deletions devel/gtkimageview/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ depends_build port:pkgconfig \
port:gnome-common \
port:gtk-doc

depends_lib path:lib/pkgconfig/gtk+-2.0.pc
depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2

patchfiles patch-configure.in.diff

Expand All @@ -49,11 +49,11 @@ configure.args --enable-compile-warnings=minimum
#

variant x11 conflicts quartz {
require_active_variants path:lib/pkgconfig/gtk+-2.0.pc x11
require_active_variants path:lib/pkgconfig/gtk+-2.0.pc:gtk2 x11
}

variant quartz conflicts x11 {
require_active_variants path:lib/pkgconfig/gtk+-2.0.pc quartz
require_active_variants path:lib/pkgconfig/gtk+-2.0.pc:gtk2 quartz
}

if {![variant_isset quartz]} {
Expand Down
2 changes: 1 addition & 1 deletion devel/gwenhywfar4/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ master_sites https://www.aquamaniac.de/rdm/attachments/download/${release}/
distname gwenhywfar-${version}

if {$subport == "gwenhywfar4-gtk"} {
depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc
depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc:gtk2
configure.args-append --with-guis="gtk2 cpp" --disable-qt4
}

Expand Down
2 changes: 1 addition & 1 deletion devel/gwenhywfar5/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ configure.args --enable-static
conflicts-delete $subport

subport gwenhywfar5-gtk2 {
depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc
depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc:gtk2
configure.args-append --with-guis="gtk2 cpp" --disable-qt4 --disable-qt5
}

Expand Down
2 changes: 1 addition & 1 deletion devel/libdivecomputer/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ checksums rmd160 63b5d8eeb36c58a3736f5daddb12ec2fab85542e \
sha256 7d64032d2e5cd4d6315ebb7ed5bcccc9399166d40228ae2e96e435749b950a0a

depends_lib port:gconf \
path:lib/pkgconfig/gtk+-2.0.pc \
path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
path:lib/pkgconfig/libusb-1.0.pc:libusb

use_autoreconf yes
Expand Down
2 changes: 1 addition & 1 deletion devel/libextractor/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ depends_lib port:bzip2 \
port:gettext \
port:giflib \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
path:lib/pkgconfig/gtk+-2.0.pc \
path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:gstreamer1 \
port:gstreamer1-gst-plugins-base \
path:include/turbojpeg.h:libjpeg-turbo \
Expand Down
2 changes: 1 addition & 1 deletion devel/libiodbc/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ variant x11 {
port:gdk-pixbuf2 \
port:gettext \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
path:lib/pkgconfig/gtk+-2.0.pc \
path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
path:lib/pkgconfig/pango.pc:pango \
port:xorg-libX11 \
port:xorg-libXcomposite \
Expand Down
2 changes: 1 addition & 1 deletion editors/cssed/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ long_description cssed is a small developer editor and validator, that \
homepage http://cssed.sourceforge.net/
master_sites sourceforge:project/cssed/cssed/${version}

depends_lib path:lib/pkgconfig/gtk+-2.0.pc \
depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:libxml2

depends_build port:hicolor-icon-theme \
Expand Down
2 changes: 1 addition & 1 deletion editors/leafpad/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ checksums rmd160 df9caa1d4248e7da3dc5ecae31f3e758f477732e \
depends_build port:pkgconfig \
port:intltool

depends_lib path:lib/pkgconfig/gtk+-2.0.pc \
depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:freetype \
port:desktop-file-utils

Expand Down
2 changes: 1 addition & 1 deletion editors/minimumprofit/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ distname mp-${version}
checksums md5 bfdc05b51bfdbafed892ab678eff8772 \
sha1 5233b6481e654c8a096412ba9dacc7ae7de5900f \
rmd160 37b52db182035243504cd49acd4ee5dc2668e744
depends_lib path:lib/pkgconfig/gtk+-2.0.pc \
depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:pcre \
port:ncurses

Expand Down
2 changes: 1 addition & 1 deletion editors/scite/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ distname ${name}[strsed ${version} {g/\.//}]
extract.suffix .tgz

depends_build port:pkgconfig
depends_lib path:lib/pkgconfig/gtk+-2.0.pc
depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2

checksums rmd160 0e0e79eee0dca1ee3f2d391f1a6e006763aa48ba \
sha256 9f17fe2a5dc294bd1077bf64f713bb06733eec271bab770841e55474e6c781c8
Expand Down
2 changes: 1 addition & 1 deletion editors/vim/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ variant athena description {Build GUI version using Athena widgets} requires x11
variant gtk2 description {Build GUI version using GTK 2.x widgets} requires x11 conflicts athena gtk3 motif {
configure.args-delete --disable-gui
configure.args-append --enable-gui=gtk2 --disable-darwin
depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc
depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc:gtk2
depends_build-append port:pkgconfig
}
variant gtk3 description {Build GUI version using GTK 3.x widgets} requires x11 conflicts athena gtk2 motif {
Expand Down
2 changes: 1 addition & 1 deletion emulators/basiliskii-devel/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ if {${subport} eq "basiliskii-devel"} {
description Graphical user interface to configure basiliskii.
long_description ${description}

depends_lib path:lib/pkgconfig/gtk+-2.0.pc
depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2

configure.args --disable-vosf \
--without-esd \
Expand Down
2 changes: 1 addition & 1 deletion emulators/basiliskii/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ if {${subport} eq "basiliskii"} {
description Graphical user interface to configure basiliskii.
long_description ${description}

depends_lib path:lib/pkgconfig/gtk+-2.0.pc
depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2

configure.args --disable-vosf \
--without-esd \
Expand Down
2 changes: 1 addition & 1 deletion emulators/nonpareil/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ extract.only ${prog} \
${appbundles}

depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
path:lib/pkgconfig/gtk+-2.0.pc \
path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:libpng \
port:libxml2 \
port:libsdl_sound \
Expand Down
2 changes: 1 addition & 1 deletion emulators/qemu/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ variant curses description {Use the curses text-only user interface} {
#variant gtk2 description {Use the GTK+ 2 graphical user interface} conflicts cocoa curses gtk3 sdl sdl2 {
# configure.args-replace --disable-gtk --enable-gtk
# configure.args-append --with-gtkabi=2.0
# depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc port:vte
# depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc:gtk2 port:vte
#}

# XXX: Build broken due to missing X11 symbols
Expand Down
2 changes: 1 addition & 1 deletion emulators/sheepshaver/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ if {${subport} eq "sheepshaver"} {
description Graphical user interface to configure SheepShaver.
long_description ${description}

depends_lib path:lib/pkgconfig/gtk+-2.0.pc
depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2

configure.args --disable-vosf \
--without-esd \
Expand Down
2 changes: 1 addition & 1 deletion games/cannonsmash/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ checksums md5 bcf2eddd0f04d58e5dac6d767f41d9af
depends_build port:pkgconfig

depends_lib port:libsdl_mixer port:libsdl_image \
path:lib/pkgconfig/gtk+-2.0.pc port:mesa port:libGLU port:xorg-libXmu
path:lib/pkgconfig/gtk+-2.0.pc:gtk2 port:mesa port:libGLU port:xorg-libXmu

patchfiles patch-BallView.h.diff \
patch-configure.in.diff \
Expand Down
2 changes: 1 addition & 1 deletion games/crack-attack/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ depends_lib port:libsdl \
port:mesa \
port:libGLU \
port:freeglut \
path:lib/pkgconfig/gtk+-2.0.pc
path:lib/pkgconfig/gtk+-2.0.pc:gtk2

checksums md5 262445024b0fca44508355242ea29d71 \
sha1 fbf445f95d77267d23a766a485fd55edbd333bb4 \
Expand Down
2 changes: 1 addition & 1 deletion games/dopewars/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ checksums md5 debf749de9053dc2fb2e74c37ae06206 \
rmd160 66c86bceb67657a9fb2ef7944b1a069dafab8ae0

depends_build port:pkgconfig
depends_lib path:lib/pkgconfig/gtk+-2.0.pc port:esound
depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2 port:esound

post-patch { reinplace "s| \$\(dopewars_DEPENDENCIES\)||g" ${worksrcpath}/src/Makefile.in
reinplace "s|need_relink=yes|need_relink=no|g" ${worksrcpath}/ltmain.sh
Expand Down
2 changes: 1 addition & 1 deletion games/eboard/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ checksums rmd160 9157280313a11fa839a46bed68db2ad22311079a \
size 1579046

depends_build-append port:pkgconfig
depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc \
depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:gstreamer1 \
port:gstreamer1-gst-plugins-base

Expand Down
2 changes: 1 addition & 1 deletion games/freeciv/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ subport freeciv-x11 {

platforms darwin

depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc
depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc:gtk2

configure.args-append --enable-client=gtk2 \
--enable-fcmp=gtk2
Expand Down
2 changes: 1 addition & 1 deletion games/gdash/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ checksums rmd160 bbd4a7486d04294b0ded8bac51567949e360b1b6 \

depends_build port:pkgconfig

depends_lib path:lib/pkgconfig/gtk+-2.0.pc \
depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:libpng \
port:libsdl2 \
port:libsdl2_image \
Expand Down
Loading

0 comments on commit 08ac79d

Please sign in to comment.