aboutsummaryrefslogtreecommitdiffstats
path: root/x11-toolkits
diff options
context:
space:
mode:
authorreg <reg@FreeBSD.org>2000-10-05 14:42:57 +0800
committerreg <reg@FreeBSD.org>2000-10-05 14:42:57 +0800
commit72ce7050d03c812e37966786e11996a90713afea (patch)
tree9ec01d647da1c4e80223e31fc766740c2a43ebff /x11-toolkits
parent97830337b8c0333a12d15a49ea1f9c9cdc3dfddf (diff)
downloadfreebsd-ports-gnome-72ce7050d03c812e37966786e11996a90713afea.tar.gz
freebsd-ports-gnome-72ce7050d03c812e37966786e11996a90713afea.tar.zst
freebsd-ports-gnome-72ce7050d03c812e37966786e11996a90713afea.zip
Implement USE_GTK, part 2.
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/buffy/Makefile7
-rw-r--r--x11-toolkits/clean-theme-gtk/Makefile7
-rw-r--r--x11-toolkits/colorstep/Makefile7
-rw-r--r--x11-toolkits/engradient/Makefile7
-rw-r--r--x11-toolkits/gnome-look/Makefile7
-rw-r--r--x11-toolkits/gob/Makefile8
-rw-r--r--x11-toolkits/gtk--/Makefile8
-rw-r--r--x11-toolkits/gtk--/pkg-plist16
-rw-r--r--x11-toolkits/gtk--2/Makefile8
-rw-r--r--x11-toolkits/gtk--2/pkg-plist16
-rw-r--r--x11-toolkits/gtk-Mac2-theme/Makefile7
-rw-r--r--x11-toolkits/gtkbe/Makefile7
-rw-r--r--x11-toolkits/gtkextra--/Makefile8
-rw-r--r--x11-toolkits/gtkextra/Makefile7
-rw-r--r--x11-toolkits/gtkextra2/Makefile7
-rw-r--r--x11-toolkits/gtkglarea/Makefile6
-rw-r--r--x11-toolkits/gtkglarea2/Makefile6
-rw-r--r--x11-toolkits/gtkmm12/Makefile8
-rw-r--r--x11-toolkits/gtkmm12/pkg-plist16
-rw-r--r--x11-toolkits/gtkmm20/Makefile8
-rw-r--r--x11-toolkits/gtkmm20/pkg-plist16
-rw-r--r--x11-toolkits/gtkmm24/Makefile8
-rw-r--r--x11-toolkits/gtkmm24/pkg-plist16
-rw-r--r--x11-toolkits/gtkmm30/Makefile8
-rw-r--r--x11-toolkits/gtkmm30/pkg-plist16
-rw-r--r--x11-toolkits/gtkstep-pastel/Makefile7
-rw-r--r--x11-toolkits/gtkstep/Makefile6
-rw-r--r--x11-toolkits/gtkstep/pkg-plist2
-rw-r--r--x11-toolkits/guile-gnome/Makefile9
-rw-r--r--x11-toolkits/guile-gnome/files/patch-ad11
-rw-r--r--x11-toolkits/guile-gtk/Makefile9
-rw-r--r--x11-toolkits/icegradient/Makefile7
-rw-r--r--x11-toolkits/pike-gtk/Makefile8
-rw-r--r--x11-toolkits/pike-gtk/files/patch-aa11
-rw-r--r--x11-toolkits/py-wxPython/Makefile11
-rw-r--r--x11-toolkits/py-wxPython24/Makefile11
-rw-r--r--x11-toolkits/py-wxPython26/Makefile11
-rw-r--r--x11-toolkits/py-wxPython28/Makefile11
-rw-r--r--x11-toolkits/thinice/Makefile7
-rw-r--r--x11-toolkits/wxgtk-devel/Makefile16
-rw-r--r--x11-toolkits/wxgtk/Makefile16
-rw-r--r--x11-toolkits/wxgtk24/Makefile16
-rw-r--r--x11-toolkits/xenophilia/Makefile9
43 files changed, 165 insertions, 248 deletions
diff --git a/x11-toolkits/buffy/Makefile b/x11-toolkits/buffy/Makefile
index 77a5621711e4..f85cfe2bdead 100644
--- a/x11-toolkits/buffy/Makefile
+++ b/x11-toolkits/buffy/Makefile
@@ -12,15 +12,10 @@ MASTER_SITES= http://reality.sgi.com/offer/src/buffy/
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
FETCH_BEFORE_ARGS= -b
USE_X_PREFIX= yes
+USE_GTK= yes
USE_LIBTOOL= yes
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
-
.include <bsd.port.mk>
diff --git a/x11-toolkits/clean-theme-gtk/Makefile b/x11-toolkits/clean-theme-gtk/Makefile
index 65e56edb9943..e1d7b00547da 100644
--- a/x11-toolkits/clean-theme-gtk/Makefile
+++ b/x11-toolkits/clean-theme-gtk/Makefile
@@ -12,16 +12,11 @@ MASTER_SITES= http://progen.dynodns.net/dengen/cleantheme/
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
WRKSRC= ${WRKDIR}/gtk-clean-theme
USE_X_PREFIX= yes
USE_LIBTOOL= yes
+USE_GTK= yes
USE_GMAKE= yes
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
-
.include <bsd.port.mk>
diff --git a/x11-toolkits/colorstep/Makefile b/x11-toolkits/colorstep/Makefile
index 591d3fad87b5..448d973cfd9c 100644
--- a/x11-toolkits/colorstep/Makefile
+++ b/x11-toolkits/colorstep/Makefile
@@ -14,15 +14,10 @@ DISTNAME= ColorStep-1.2.x-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
WRKSRC= ${WRKDIR}/${PORTNAME}-0.5
USE_X_PREFIX= yes
+USE_GTK= yes
USE_LIBTOOL= yes
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
-
.include <bsd.port.mk>
diff --git a/x11-toolkits/engradient/Makefile b/x11-toolkits/engradient/Makefile
index aa3293d2eea0..a44d6e701c8f 100644
--- a/x11-toolkits/engradient/Makefile
+++ b/x11-toolkits/engradient/Makefile
@@ -14,16 +14,11 @@ DISTNAME= EnGradient-1.2.x-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
WRKSRC= ${WRKDIR}/gtk-${PORTNAME}-0.1
USE_X_PREFIX= yes
+USE_GTK= yes
USE_LIBTOOL= yes
USE_GMAKE= yes
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
-
.include <bsd.port.mk>
diff --git a/x11-toolkits/gnome-look/Makefile b/x11-toolkits/gnome-look/Makefile
index 1c54bbbccc8a..39d49e0cb69a 100644
--- a/x11-toolkits/gnome-look/Makefile
+++ b/x11-toolkits/gnome-look/Makefile
@@ -13,14 +13,9 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
USE_X_PREFIX= yes
+USE_GTK= yes
USE_LIBTOOL= yes
USE_GMAKE= yes
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
-
.include <bsd.port.mk>
diff --git a/x11-toolkits/gob/Makefile b/x11-toolkits/gob/Makefile
index 2218bf9af506..0269ec0c12a3 100644
--- a/x11-toolkits/gob/Makefile
+++ b/x11-toolkits/gob/Makefile
@@ -12,16 +12,10 @@ MASTER_SITES= http://ftp.5z.com/pub/gob/
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-
USE_GMAKE= yes
+USE_GTK= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
MAN1= gob.1
diff --git a/x11-toolkits/gtk--/Makefile b/x11-toolkits/gtk--/Makefile
index cf9293d5cf8a..4b0271f29a18 100644
--- a/x11-toolkits/gtk--/Makefile
+++ b/x11-toolkits/gtk--/Makefile
@@ -13,20 +13,18 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
- sigc.1:${PORTSDIR}/devel/libsigc++
+LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
USE_NEWGCC= yes
USE_GMAKE= yes
+USE_GTK= yes
USE_LIBTOOL= yes
+LIBTOOLFLAGS= --disable-ltlibs --release-ignore
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static=yes \
--without-gnome
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
post-install:
@${CAT} ${PKGDIR}/MESSAGE
diff --git a/x11-toolkits/gtk--/pkg-plist b/x11-toolkits/gtk--/pkg-plist
index e2b120fbcd59..26c307d9394e 100644
--- a/x11-toolkits/gtk--/pkg-plist
+++ b/x11-toolkits/gtk--/pkg-plist
@@ -186,16 +186,16 @@ lib/gtkmm/proc/gtkconvert.m4
lib/gtkmm/proc/gtkmmproc
lib/gtkmm/proc/list.m4
lib/gtkmm/proc/stage1.m4
-lib/libgdkmm.so
-lib/libgdkmm-1.2.so.1
lib/libgdkmm.a
-lib/libgtkmm.so
-lib/libgtkmm-1.2.so.1
+lib/libgdkmm.so
+lib/libgdkmm.so.1
lib/libgtkmm.a
+lib/libgtkmm.so
+lib/libgtkmm.so.1
share/aclocal/gtk--.m4
-@dirrm include/gdk--
-@dirrm include/gtk--/private
-@dirrm include/gtk--
-@dirrm lib/gtkmm/include
@dirrm lib/gtkmm/proc
+@dirrm lib/gtkmm/include
@dirrm lib/gtkmm
+@dirrm include/gtk--/private
+@dirrm include/gtk--
+@dirrm include/gdk--
diff --git a/x11-toolkits/gtk--2/Makefile b/x11-toolkits/gtk--2/Makefile
index cf9293d5cf8a..4b0271f29a18 100644
--- a/x11-toolkits/gtk--2/Makefile
+++ b/x11-toolkits/gtk--2/Makefile
@@ -13,20 +13,18 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
- sigc.1:${PORTSDIR}/devel/libsigc++
+LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
USE_NEWGCC= yes
USE_GMAKE= yes
+USE_GTK= yes
USE_LIBTOOL= yes
+LIBTOOLFLAGS= --disable-ltlibs --release-ignore
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static=yes \
--without-gnome
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
post-install:
@${CAT} ${PKGDIR}/MESSAGE
diff --git a/x11-toolkits/gtk--2/pkg-plist b/x11-toolkits/gtk--2/pkg-plist
index e2b120fbcd59..26c307d9394e 100644
--- a/x11-toolkits/gtk--2/pkg-plist
+++ b/x11-toolkits/gtk--2/pkg-plist
@@ -186,16 +186,16 @@ lib/gtkmm/proc/gtkconvert.m4
lib/gtkmm/proc/gtkmmproc
lib/gtkmm/proc/list.m4
lib/gtkmm/proc/stage1.m4
-lib/libgdkmm.so
-lib/libgdkmm-1.2.so.1
lib/libgdkmm.a
-lib/libgtkmm.so
-lib/libgtkmm-1.2.so.1
+lib/libgdkmm.so
+lib/libgdkmm.so.1
lib/libgtkmm.a
+lib/libgtkmm.so
+lib/libgtkmm.so.1
share/aclocal/gtk--.m4
-@dirrm include/gdk--
-@dirrm include/gtk--/private
-@dirrm include/gtk--
-@dirrm lib/gtkmm/include
@dirrm lib/gtkmm/proc
+@dirrm lib/gtkmm/include
@dirrm lib/gtkmm
+@dirrm include/gtk--/private
+@dirrm include/gtk--
+@dirrm include/gdk--
diff --git a/x11-toolkits/gtk-Mac2-theme/Makefile b/x11-toolkits/gtk-Mac2-theme/Makefile
index fa55b76d6ccd..86c6bacfaddd 100644
--- a/x11-toolkits/gtk-Mac2-theme/Makefile
+++ b/x11-toolkits/gtk-Mac2-theme/Makefile
@@ -14,16 +14,11 @@ DISTNAME= Mac2-1.2.x-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_X_PREFIX= yes
+USE_GTK= yes
USE_LIBTOOL= yes
USE_GMAKE= yes
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
-
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkbe/Makefile b/x11-toolkits/gtkbe/Makefile
index 83c5ecc1320d..f8d46d24ab9c 100644
--- a/x11-toolkits/gtkbe/Makefile
+++ b/x11-toolkits/gtkbe/Makefile
@@ -14,16 +14,11 @@ DISTNAME= GTK-Be-1.2.x-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
WRKSRC= ${WRKDIR}/GTKBeEngine
USE_X_PREFIX= yes
+USE_GTK= yes
USE_LIBTOOL= yes
USE_GMAKE= yes
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
-
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkextra--/Makefile b/x11-toolkits/gtkextra--/Makefile
index 79940ed421a3..6392a02a048a 100644
--- a/x11-toolkits/gtkextra--/Makefile
+++ b/x11-toolkits/gtkextra--/Makefile
@@ -14,15 +14,13 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sobomax@FreeBSD.org
LIB_DEPENDS= gtkextra.10:${PORTSDIR}/x11-toolkits/gtkextra \
- gtkmm-1.2.1:${PORTSDIR}/x11-toolkits/gtk--
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+ gtkmm.1:${PORTSDIR}/x11-toolkits/gtk--
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_GTK= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \
- PERL="${PERL}"
+CONFIGURE_ENV= PERL="${PERL}"
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkextra/Makefile b/x11-toolkits/gtkextra/Makefile
index 0cb43f971db7..5faebcff90d3 100644
--- a/x11-toolkits/gtkextra/Makefile
+++ b/x11-toolkits/gtkextra/Makefile
@@ -13,15 +13,10 @@ DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
USE_X_PREFIX= yes
+USE_GTK= yes
USE_LIBTOOL= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
-
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index 0cb43f971db7..5faebcff90d3 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -13,15 +13,10 @@ DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
USE_X_PREFIX= yes
+USE_GTK= yes
USE_LIBTOOL= yes
USE_GMAKE= yes
INSTALLS_SHLIB= yes
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
-
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkglarea/Makefile b/x11-toolkits/gtkglarea/Makefile
index 3fb37b44e803..d2f9679ff0b9 100644
--- a/x11-toolkits/gtkglarea/Makefile
+++ b/x11-toolkits/gtkglarea/Makefile
@@ -12,14 +12,10 @@ MASTER_SITES= http://www.student.oulu.fi/~jlof/gtkglarea/download/
MAINTAINER= jaeger16@yahoo.com
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_MESA= yes
+USE_GTK= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
CONFIGURE_ARGS= --with-lib-GL
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkglarea2/Makefile b/x11-toolkits/gtkglarea2/Makefile
index 3fb37b44e803..d2f9679ff0b9 100644
--- a/x11-toolkits/gtkglarea2/Makefile
+++ b/x11-toolkits/gtkglarea2/Makefile
@@ -12,14 +12,10 @@ MASTER_SITES= http://www.student.oulu.fi/~jlof/gtkglarea/download/
MAINTAINER= jaeger16@yahoo.com
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_MESA= yes
+USE_GTK= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
CONFIGURE_ARGS= --with-lib-GL
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile
index cf9293d5cf8a..4b0271f29a18 100644
--- a/x11-toolkits/gtkmm12/Makefile
+++ b/x11-toolkits/gtkmm12/Makefile
@@ -13,20 +13,18 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
- sigc.1:${PORTSDIR}/devel/libsigc++
+LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
USE_NEWGCC= yes
USE_GMAKE= yes
+USE_GTK= yes
USE_LIBTOOL= yes
+LIBTOOLFLAGS= --disable-ltlibs --release-ignore
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static=yes \
--without-gnome
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
post-install:
@${CAT} ${PKGDIR}/MESSAGE
diff --git a/x11-toolkits/gtkmm12/pkg-plist b/x11-toolkits/gtkmm12/pkg-plist
index e2b120fbcd59..26c307d9394e 100644
--- a/x11-toolkits/gtkmm12/pkg-plist
+++ b/x11-toolkits/gtkmm12/pkg-plist
@@ -186,16 +186,16 @@ lib/gtkmm/proc/gtkconvert.m4
lib/gtkmm/proc/gtkmmproc
lib/gtkmm/proc/list.m4
lib/gtkmm/proc/stage1.m4
-lib/libgdkmm.so
-lib/libgdkmm-1.2.so.1
lib/libgdkmm.a
-lib/libgtkmm.so
-lib/libgtkmm-1.2.so.1
+lib/libgdkmm.so
+lib/libgdkmm.so.1
lib/libgtkmm.a
+lib/libgtkmm.so
+lib/libgtkmm.so.1
share/aclocal/gtk--.m4
-@dirrm include/gdk--
-@dirrm include/gtk--/private
-@dirrm include/gtk--
-@dirrm lib/gtkmm/include
@dirrm lib/gtkmm/proc
+@dirrm lib/gtkmm/include
@dirrm lib/gtkmm
+@dirrm include/gtk--/private
+@dirrm include/gtk--
+@dirrm include/gdk--
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index cf9293d5cf8a..4b0271f29a18 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -13,20 +13,18 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
- sigc.1:${PORTSDIR}/devel/libsigc++
+LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
USE_NEWGCC= yes
USE_GMAKE= yes
+USE_GTK= yes
USE_LIBTOOL= yes
+LIBTOOLFLAGS= --disable-ltlibs --release-ignore
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static=yes \
--without-gnome
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
post-install:
@${CAT} ${PKGDIR}/MESSAGE
diff --git a/x11-toolkits/gtkmm20/pkg-plist b/x11-toolkits/gtkmm20/pkg-plist
index e2b120fbcd59..26c307d9394e 100644
--- a/x11-toolkits/gtkmm20/pkg-plist
+++ b/x11-toolkits/gtkmm20/pkg-plist
@@ -186,16 +186,16 @@ lib/gtkmm/proc/gtkconvert.m4
lib/gtkmm/proc/gtkmmproc
lib/gtkmm/proc/list.m4
lib/gtkmm/proc/stage1.m4
-lib/libgdkmm.so
-lib/libgdkmm-1.2.so.1
lib/libgdkmm.a
-lib/libgtkmm.so
-lib/libgtkmm-1.2.so.1
+lib/libgdkmm.so
+lib/libgdkmm.so.1
lib/libgtkmm.a
+lib/libgtkmm.so
+lib/libgtkmm.so.1
share/aclocal/gtk--.m4
-@dirrm include/gdk--
-@dirrm include/gtk--/private
-@dirrm include/gtk--
-@dirrm lib/gtkmm/include
@dirrm lib/gtkmm/proc
+@dirrm lib/gtkmm/include
@dirrm lib/gtkmm
+@dirrm include/gtk--/private
+@dirrm include/gtk--
+@dirrm include/gdk--
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index cf9293d5cf8a..4b0271f29a18 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -13,20 +13,18 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
- sigc.1:${PORTSDIR}/devel/libsigc++
+LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
USE_NEWGCC= yes
USE_GMAKE= yes
+USE_GTK= yes
USE_LIBTOOL= yes
+LIBTOOLFLAGS= --disable-ltlibs --release-ignore
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static=yes \
--without-gnome
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
post-install:
@${CAT} ${PKGDIR}/MESSAGE
diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist
index e2b120fbcd59..26c307d9394e 100644
--- a/x11-toolkits/gtkmm24/pkg-plist
+++ b/x11-toolkits/gtkmm24/pkg-plist
@@ -186,16 +186,16 @@ lib/gtkmm/proc/gtkconvert.m4
lib/gtkmm/proc/gtkmmproc
lib/gtkmm/proc/list.m4
lib/gtkmm/proc/stage1.m4
-lib/libgdkmm.so
-lib/libgdkmm-1.2.so.1
lib/libgdkmm.a
-lib/libgtkmm.so
-lib/libgtkmm-1.2.so.1
+lib/libgdkmm.so
+lib/libgdkmm.so.1
lib/libgtkmm.a
+lib/libgtkmm.so
+lib/libgtkmm.so.1
share/aclocal/gtk--.m4
-@dirrm include/gdk--
-@dirrm include/gtk--/private
-@dirrm include/gtk--
-@dirrm lib/gtkmm/include
@dirrm lib/gtkmm/proc
+@dirrm lib/gtkmm/include
@dirrm lib/gtkmm
+@dirrm include/gtk--/private
+@dirrm include/gtk--
+@dirrm include/gdk--
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index cf9293d5cf8a..4b0271f29a18 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -13,20 +13,18 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
- sigc.1:${PORTSDIR}/devel/libsigc++
+LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
USE_NEWGCC= yes
USE_GMAKE= yes
+USE_GTK= yes
USE_LIBTOOL= yes
+LIBTOOLFLAGS= --disable-ltlibs --release-ignore
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static=yes \
--without-gnome
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
post-install:
@${CAT} ${PKGDIR}/MESSAGE
diff --git a/x11-toolkits/gtkmm30/pkg-plist b/x11-toolkits/gtkmm30/pkg-plist
index e2b120fbcd59..26c307d9394e 100644
--- a/x11-toolkits/gtkmm30/pkg-plist
+++ b/x11-toolkits/gtkmm30/pkg-plist
@@ -186,16 +186,16 @@ lib/gtkmm/proc/gtkconvert.m4
lib/gtkmm/proc/gtkmmproc
lib/gtkmm/proc/list.m4
lib/gtkmm/proc/stage1.m4
-lib/libgdkmm.so
-lib/libgdkmm-1.2.so.1
lib/libgdkmm.a
-lib/libgtkmm.so
-lib/libgtkmm-1.2.so.1
+lib/libgdkmm.so
+lib/libgdkmm.so.1
lib/libgtkmm.a
+lib/libgtkmm.so
+lib/libgtkmm.so.1
share/aclocal/gtk--.m4
-@dirrm include/gdk--
-@dirrm include/gtk--/private
-@dirrm include/gtk--
-@dirrm lib/gtkmm/include
@dirrm lib/gtkmm/proc
+@dirrm lib/gtkmm/include
@dirrm lib/gtkmm
+@dirrm include/gtk--/private
+@dirrm include/gtk--
+@dirrm include/gdk--
diff --git a/x11-toolkits/gtkstep-pastel/Makefile b/x11-toolkits/gtkstep-pastel/Makefile
index 11c822e96bf3..131f431cb2f3 100644
--- a/x11-toolkits/gtkstep-pastel/Makefile
+++ b/x11-toolkits/gtkstep-pastel/Makefile
@@ -14,15 +14,10 @@ DISTNAME= ${PORTNAME}-1.2.x-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
WRKSRC= ${WRKDIR}/${PORTNAME}-0.10.1
USE_X_PREFIX= yes
+USE_GTK= yes
USE_LIBTOOL= yes
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
-
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkstep/Makefile b/x11-toolkits/gtkstep/Makefile
index 8a8c69f5a4aa..7f2358477d35 100644
--- a/x11-toolkits/gtkstep/Makefile
+++ b/x11-toolkits/gtkstep/Makefile
@@ -12,13 +12,9 @@ MASTER_SITES= http://ulli.linuxave.net/gtkstep/
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_BZIP2= yes
USE_X_PREFIX= yes
+USE_GTK= yes
USE_LIBTOOL= yes
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkstep/pkg-plist b/x11-toolkits/gtkstep/pkg-plist
index 05941a6dad6d..813409b1de80 100644
--- a/x11-toolkits/gtkstep/pkg-plist
+++ b/x11-toolkits/gtkstep/pkg-plist
@@ -1,6 +1,6 @@
+lib/gtk/themes/engines/libstep.so
share/themes/Step/ICON.png
share/themes/Step/README.html
share/themes/Step/gtk/gtkrc
-lib/gtk/themes/engines/libstep.so
@dirrm share/themes/Step/gtk
@dirrm share/themes/Step
diff --git a/x11-toolkits/guile-gnome/Makefile b/x11-toolkits/guile-gnome/Makefile
index c079948c1266..574d50add2cf 100644
--- a/x11-toolkits/guile-gnome/Makefile
+++ b/x11-toolkits/guile-gnome/Makefile
@@ -14,20 +14,15 @@ DISTNAME= gnome-guile-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
- guile.9:${PORTSDIR}/lang/guile \
+LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile \
guilegtk-1.2.0:${PORTSDIR}/x11-toolkits/guile-gtk \
glade.4:${PORTSDIR}/devel/libglade
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-
USE_LIBTOOL= yes
+USE_GTK= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --without-bonobo --without-gtkhtml --with-libglade
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>
diff --git a/x11-toolkits/guile-gnome/files/patch-ad b/x11-toolkits/guile-gnome/files/patch-ad
new file mode 100644
index 000000000000..7b9b2527dd24
--- /dev/null
+++ b/x11-toolkits/guile-gnome/files/patch-ad
@@ -0,0 +1,11 @@
+--- guile-gnome/libglade/Makefile.in.orig Mon Oct 2 01:09:47 2000
++++ guile-gnome/libglade/Makefile.in Mon Oct 2 01:11:08 2000
+@@ -97,7 +97,7 @@
+ INCLUDES = -I.. -I$(srcdir)/.. -I../../guile-gtk -I$(srcdir)/../../guile-gtk -I$(includedir) $(GUILE_INCS) $(GNOME_INCLUDEDIR)
+
+
+-GLADE_LIBS = -lglade -lglade-gnome -lglade-bonobo
++GLADE_LIBS = `libglade-config --libs gnome`
+
+ lib_LTLIBRARIES = libguileglade.la
+ libguileglade_la_SOURCES = libglade-glue.c
diff --git a/x11-toolkits/guile-gtk/Makefile b/x11-toolkits/guile-gtk/Makefile
index 06596397b3b5..19d59813a88b 100644
--- a/x11-toolkits/guile-gtk/Makefile
+++ b/x11-toolkits/guile-gtk/Makefile
@@ -13,17 +13,12 @@ MASTER_SITE_SUBDIR= unstable/sources/gnome-guile
MAINTAINER= ade@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
- guile.9:${PORTSDIR}/lang/guile
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
+LIB_DEPENDS= guile.9:${PORTSDIR}/lang/guile
+USE_GTK= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>
diff --git a/x11-toolkits/icegradient/Makefile b/x11-toolkits/icegradient/Makefile
index cdd5b4c899e1..a440908a942f 100644
--- a/x11-toolkits/icegradient/Makefile
+++ b/x11-toolkits/icegradient/Makefile
@@ -15,16 +15,11 @@ DISTNAME= IceGradient-1.2.x-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
WRKSRC= ${WRKDIR}/gtk-${PORTNAME}-0.0.2
USE_X_PREFIX= yes
+USE_GTK= yes
USE_LIBTOOL= yes
USE_GMAKE= yes
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
-
.include <bsd.port.mk>
diff --git a/x11-toolkits/pike-gtk/Makefile b/x11-toolkits/pike-gtk/Makefile
index 91e649477fab..6d8b3af890c5 100644
--- a/x11-toolkits/pike-gtk/Makefile
+++ b/x11-toolkits/pike-gtk/Makefile
@@ -14,15 +14,9 @@ DISTNAME= pigtk_${PORTVERSION}
MAINTAINER= ijliao@csie.nctu.edu.tw
BUILD_DEPENDS= pike:${PORTSDIR}/lang/pike
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
USE_XLIB= yes
+USE_GTK= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= GTK_CONFIG=${X11BASE}/bin/gtk12-config
-
-# To delete "-Wl,-E" from options for ld.
-# (The options are created by gtk12-config.)
-post-configure:
- cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/patch-Makefile
.include <bsd.port.mk>
diff --git a/x11-toolkits/pike-gtk/files/patch-aa b/x11-toolkits/pike-gtk/files/patch-aa
new file mode 100644
index 000000000000..e53c7470b1b9
--- /dev/null
+++ b/x11-toolkits/pike-gtk/files/patch-aa
@@ -0,0 +1,11 @@
+--- configure.orig Thu Nov 18 01:52:35 1999
++++ configure Thu Nov 18 01:53:02 1999
+@@ -3198,7 +3198,7 @@
+ next) LDSHARED="$CC $CFLAGS -nostdlib -r";;
+ Linux*) LDSHARED="$CC -shared";;
+ GNU*) LDSHARED="ld -Bshareable";;
+- FreeBSD*) LDSHARED="ld -Bshareable";;
++ FreeBSD*) LDSHARED="$CC -shared";;
+ NetBSD) LDSHARED="ld -Bshareable";;
+ OpenBSD*) LDSHARED="ld -Bshareable";;
+ BSD/OS*) LDSHARED="shlicc -r";;
diff --git a/x11-toolkits/py-wxPython/Makefile b/x11-toolkits/py-wxPython/Makefile
index 87fadb373c49..9e8a136742b9 100644
--- a/x11-toolkits/py-wxPython/Makefile
+++ b/x11-toolkits/py-wxPython/Makefile
@@ -18,9 +18,10 @@ LIB_DEPENDS= wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk
WRKSRC= ${WRKDIR}/${DISTNAME}/src
-USE_PYTHON= YES
-USE_GMAKE= YES
-USE_NEWGCC= YES
+USE_GMAKE= yes
+USE_NEWGCC= yes
+USE_PYTHON= yes
+USE_GTK= yes
MAKE_ENV= "LN_S=${LN} -s" "INSTALL_DATA=${INSTALL_DATA}"
ALL_TARGET= default
INSTALL_TARGET= install-freebsd
@@ -30,8 +31,8 @@ TARGETDIR= ${PYTHON_SITELIBDIR}/wxPython
HELPERLIBDIR= ${PREFIX}/lib
do-configure:
- ${SED} -e "s:%CFLAGS%:${CFLAGS} `gtk12-config --cflags`:" \
- -e "s:%LFLAGS%:`gtk12-config --libs` -L${WRKSRC}:" \
+ ${SED} -e "s:%CFLAGS%:${CFLAGS} `${GTK_CONFIG} --cflags`:" \
+ -e "s:%LFLAGS%:`${GTK_CONFIG} --libs` -L${WRKSRC}:" \
-e "s:%TARGETDIR%:${TARGETDIR}:" \
-e "s:%HELPERLIBDIR%:${HELPERLIBDIR}:" \
-e "s:%CXX%:${CXX}:" -e "s:%WRKSRC%:${WRKSRC}:" \
diff --git a/x11-toolkits/py-wxPython24/Makefile b/x11-toolkits/py-wxPython24/Makefile
index 87fadb373c49..9e8a136742b9 100644
--- a/x11-toolkits/py-wxPython24/Makefile
+++ b/x11-toolkits/py-wxPython24/Makefile
@@ -18,9 +18,10 @@ LIB_DEPENDS= wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk
WRKSRC= ${WRKDIR}/${DISTNAME}/src
-USE_PYTHON= YES
-USE_GMAKE= YES
-USE_NEWGCC= YES
+USE_GMAKE= yes
+USE_NEWGCC= yes
+USE_PYTHON= yes
+USE_GTK= yes
MAKE_ENV= "LN_S=${LN} -s" "INSTALL_DATA=${INSTALL_DATA}"
ALL_TARGET= default
INSTALL_TARGET= install-freebsd
@@ -30,8 +31,8 @@ TARGETDIR= ${PYTHON_SITELIBDIR}/wxPython
HELPERLIBDIR= ${PREFIX}/lib
do-configure:
- ${SED} -e "s:%CFLAGS%:${CFLAGS} `gtk12-config --cflags`:" \
- -e "s:%LFLAGS%:`gtk12-config --libs` -L${WRKSRC}:" \
+ ${SED} -e "s:%CFLAGS%:${CFLAGS} `${GTK_CONFIG} --cflags`:" \
+ -e "s:%LFLAGS%:`${GTK_CONFIG} --libs` -L${WRKSRC}:" \
-e "s:%TARGETDIR%:${TARGETDIR}:" \
-e "s:%HELPERLIBDIR%:${HELPERLIBDIR}:" \
-e "s:%CXX%:${CXX}:" -e "s:%WRKSRC%:${WRKSRC}:" \
diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile
index 87fadb373c49..9e8a136742b9 100644
--- a/x11-toolkits/py-wxPython26/Makefile
+++ b/x11-toolkits/py-wxPython26/Makefile
@@ -18,9 +18,10 @@ LIB_DEPENDS= wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk
WRKSRC= ${WRKDIR}/${DISTNAME}/src
-USE_PYTHON= YES
-USE_GMAKE= YES
-USE_NEWGCC= YES
+USE_GMAKE= yes
+USE_NEWGCC= yes
+USE_PYTHON= yes
+USE_GTK= yes
MAKE_ENV= "LN_S=${LN} -s" "INSTALL_DATA=${INSTALL_DATA}"
ALL_TARGET= default
INSTALL_TARGET= install-freebsd
@@ -30,8 +31,8 @@ TARGETDIR= ${PYTHON_SITELIBDIR}/wxPython
HELPERLIBDIR= ${PREFIX}/lib
do-configure:
- ${SED} -e "s:%CFLAGS%:${CFLAGS} `gtk12-config --cflags`:" \
- -e "s:%LFLAGS%:`gtk12-config --libs` -L${WRKSRC}:" \
+ ${SED} -e "s:%CFLAGS%:${CFLAGS} `${GTK_CONFIG} --cflags`:" \
+ -e "s:%LFLAGS%:`${GTK_CONFIG} --libs` -L${WRKSRC}:" \
-e "s:%TARGETDIR%:${TARGETDIR}:" \
-e "s:%HELPERLIBDIR%:${HELPERLIBDIR}:" \
-e "s:%CXX%:${CXX}:" -e "s:%WRKSRC%:${WRKSRC}:" \
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index 87fadb373c49..9e8a136742b9 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -18,9 +18,10 @@ LIB_DEPENDS= wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk
WRKSRC= ${WRKDIR}/${DISTNAME}/src
-USE_PYTHON= YES
-USE_GMAKE= YES
-USE_NEWGCC= YES
+USE_GMAKE= yes
+USE_NEWGCC= yes
+USE_PYTHON= yes
+USE_GTK= yes
MAKE_ENV= "LN_S=${LN} -s" "INSTALL_DATA=${INSTALL_DATA}"
ALL_TARGET= default
INSTALL_TARGET= install-freebsd
@@ -30,8 +31,8 @@ TARGETDIR= ${PYTHON_SITELIBDIR}/wxPython
HELPERLIBDIR= ${PREFIX}/lib
do-configure:
- ${SED} -e "s:%CFLAGS%:${CFLAGS} `gtk12-config --cflags`:" \
- -e "s:%LFLAGS%:`gtk12-config --libs` -L${WRKSRC}:" \
+ ${SED} -e "s:%CFLAGS%:${CFLAGS} `${GTK_CONFIG} --cflags`:" \
+ -e "s:%LFLAGS%:`${GTK_CONFIG} --libs` -L${WRKSRC}:" \
-e "s:%TARGETDIR%:${TARGETDIR}:" \
-e "s:%HELPERLIBDIR%:${HELPERLIBDIR}:" \
-e "s:%CXX%:${CXX}:" -e "s:%WRKSRC%:${WRKSRC}:" \
diff --git a/x11-toolkits/thinice/Makefile b/x11-toolkits/thinice/Makefile
index cec85d690e51..69dc7dcc49c7 100644
--- a/x11-toolkits/thinice/Makefile
+++ b/x11-toolkits/thinice/Makefile
@@ -13,13 +13,8 @@ DISTNAME= gtk-${PORTNAME}-theme-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
USE_X_PREFIX= yes
+USE_GTK= yes
USE_LIBTOOL= yes
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
-
.include <bsd.port.mk>
diff --git a/x11-toolkits/wxgtk-devel/Makefile b/x11-toolkits/wxgtk-devel/Makefile
index 392619d943b5..adc0bd76859d 100644
--- a/x11-toolkits/wxgtk-devel/Makefile
+++ b/x11-toolkits/wxgtk-devel/Makefile
@@ -13,30 +13,32 @@ DISTNAME= wxGTK-${PORTVERSION}
MAINTAINER= nectar@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
- png.4:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
jpeg.9:${PORTSDIR}/graphics/jpeg
WRKSRC= ${WRKDIR}/wxGTK
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
USE_NEWGCC= yes
USE_GMAKE= yes
+USE_GTK= yes
USE_AUTOCONF= yes
+INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-libpng=sys \
--with-libjpeg=sys \
--with-libtiff=sys \
--with-zlib=sys
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \
- CPPFLAGS="-D_THREAD_SAFE -I${LOCALBASE}/include" \
+CONFIGURE_ENV= CPPFLAGS="-D_THREAD_SAFE -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-INSTALLS_SHLIB= yes
+
AUTOCONF= autoconf && \
${PERL} -pi -e 's|-l\$$THREADS_LIB|-pthread|g ; \
s|-l\$$THREADS_LINK|-pthread|g' \
${WRKSRC}/configure
+post-install:
+ @${RM} -rf ${PREFIX}/include/wx/motif
+ @${RM} -rf ${PREFIX}/include/wx/msw
+
.include <bsd.port.mk>
diff --git a/x11-toolkits/wxgtk/Makefile b/x11-toolkits/wxgtk/Makefile
index 392619d943b5..adc0bd76859d 100644
--- a/x11-toolkits/wxgtk/Makefile
+++ b/x11-toolkits/wxgtk/Makefile
@@ -13,30 +13,32 @@ DISTNAME= wxGTK-${PORTVERSION}
MAINTAINER= nectar@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
- png.4:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
jpeg.9:${PORTSDIR}/graphics/jpeg
WRKSRC= ${WRKDIR}/wxGTK
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
USE_NEWGCC= yes
USE_GMAKE= yes
+USE_GTK= yes
USE_AUTOCONF= yes
+INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-libpng=sys \
--with-libjpeg=sys \
--with-libtiff=sys \
--with-zlib=sys
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \
- CPPFLAGS="-D_THREAD_SAFE -I${LOCALBASE}/include" \
+CONFIGURE_ENV= CPPFLAGS="-D_THREAD_SAFE -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-INSTALLS_SHLIB= yes
+
AUTOCONF= autoconf && \
${PERL} -pi -e 's|-l\$$THREADS_LIB|-pthread|g ; \
s|-l\$$THREADS_LINK|-pthread|g' \
${WRKSRC}/configure
+post-install:
+ @${RM} -rf ${PREFIX}/include/wx/motif
+ @${RM} -rf ${PREFIX}/include/wx/msw
+
.include <bsd.port.mk>
diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
index 392619d943b5..adc0bd76859d 100644
--- a/x11-toolkits/wxgtk24/Makefile
+++ b/x11-toolkits/wxgtk24/Makefile
@@ -13,30 +13,32 @@ DISTNAME= wxGTK-${PORTVERSION}
MAINTAINER= nectar@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
- png.4:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
jpeg.9:${PORTSDIR}/graphics/jpeg
WRKSRC= ${WRKDIR}/wxGTK
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
USE_NEWGCC= yes
USE_GMAKE= yes
+USE_GTK= yes
USE_AUTOCONF= yes
+INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-libpng=sys \
--with-libjpeg=sys \
--with-libtiff=sys \
--with-zlib=sys
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \
- CPPFLAGS="-D_THREAD_SAFE -I${LOCALBASE}/include" \
+CONFIGURE_ENV= CPPFLAGS="-D_THREAD_SAFE -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-INSTALLS_SHLIB= yes
+
AUTOCONF= autoconf && \
${PERL} -pi -e 's|-l\$$THREADS_LIB|-pthread|g ; \
s|-l\$$THREADS_LINK|-pthread|g' \
${WRKSRC}/configure
+post-install:
+ @${RM} -rf ${PREFIX}/include/wx/motif
+ @${RM} -rf ${PREFIX}/include/wx/msw
+
.include <bsd.port.mk>
diff --git a/x11-toolkits/xenophilia/Makefile b/x11-toolkits/xenophilia/Makefile
index a3e856502db7..f038f5a6c4e4 100644
--- a/x11-toolkits/xenophilia/Makefile
+++ b/x11-toolkits/xenophilia/Makefile
@@ -13,15 +13,8 @@ DISTNAME= Xenophilia-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_X_PREFIX= yes
-MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
+USE_GTK= yes
ALL_TARGET= # empty
-pre-install:
- @${MKDIR} ${PREFIX}/lib/gtk/themes/engines
-
.include <bsd.port.mk>