Implement WANT_IMLIB and USE_IMLIB.

9 files changed, 67 insertions, 68 deletions

diff --git a/x11-toolkits/gtk-engines/Makefile b/x11-toolkits/gtk-engines/Makefile
index 4929b10b53db..d1e2eb2722e8 100644
--- a/x11-toolkits/gtk-engines/Makefile
+++ b/x11-toolkits/gtk-engines/Makefile
@@ -13,13 +13,9 @@ MASTER_SITE_SUBDIR=	stable/sources/gtk-engines
 
 MAINTAINER=	vanilla@FreeBSD.org
 
-LIB_DEPENDS=	gdk_imlib.5:${PORTSDIR}/graphics/imlib
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
+USE_IMLIB=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
 THEMES=		metal notif pixmap redmond95
 
diff --git a/x11-toolkits/gtk-engines2/Makefile b/x11-toolkits/gtk-engines2/Makefile
index 4929b10b53db..d1e2eb2722e8 100644
--- a/x11-toolkits/gtk-engines2/Makefile
+++ b/x11-toolkits/gtk-engines2/Makefile
@@ -13,13 +13,9 @@ MASTER_SITE_SUBDIR=	stable/sources/gtk-engines
 
 MAINTAINER=	vanilla@FreeBSD.org
 
-LIB_DEPENDS=	gdk_imlib.5:${PORTSDIR}/graphics/imlib
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
+USE_IMLIB=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
 THEMES=		metal notif pixmap redmond95
 
diff --git a/x11-toolkits/p5-Gtk/Makefile b/x11-toolkits/p5-Gtk/Makefile
index 669d303a9563..ea9c4bd5d0a4 100644
--- a/x11-toolkits/p5-Gtk/Makefile
+++ b/x11-toolkits/p5-Gtk/Makefile
@@ -15,15 +15,14 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vanilla@FreeBSD.org
 
-LIB_DEPENDS=	gdk_imlib.5:${PORTSDIR}/graphics/imlib
-
 USE_PERL5=	yes
+USE_IMLIB=	yes
 
 MAN3=		Gtk::GtkColorSelectButton.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
-		@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-		--with-gdkimlib --without-gnome CC="${CC}" CCFLAGS="${CFLAGS}"
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
+	--with-gdkimlib --without-gnome CC="${CC}" CCFLAGS="${CFLAGS}"
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile
index 90fae7927061..82b31e8aaba7 100644
--- a/x11-toolkits/py-gtk/Makefile
+++ b/x11-toolkits/py-gtk/Makefile
@@ -14,22 +14,20 @@ DISTNAME=	gnome-python-1.0.53
 
 MAINTAINER=	nectar@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12                  \
-		Imlib.5:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade
+
+WRKSRC=		${WRKDIR}/${DISTNAME}/pygtk
 
-GTK_CONFIG=	${X11BASE}/bin/gtk12-config
 USE_GMAKE=	yes
+USE_IMLIB=	yes
 USE_PYTHON=	yes
-CONFIGURE_ENV=	GTK_CONFIG=${GTK_CONFIG} PYTHON=${PYTHON_CMD}
 USE_LIBTOOL=	yes
-PLIST_COMPLETE= ${PKGDIR}/PLIST
+CONFIGURE_ENV=	PYTHON=${PYTHON_CMD}
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/pygtk
 EG_SRC_DIR=	${WRKSRC}/examples
 EG_DST_DIR=	${PREFIX}/share/examples/py-gtk
 
 .if !defined(NOPORTDOCS)
-PLIST=		${PLIST_COMPLETE}
 post-install:
 	${MKDIR} ${EG_DST_DIR}
 	${TAR} -C ${EG_SRC_DIR} -cf - . | ${TAR} -C ${EG_DST_DIR} -xvf -
@@ -43,7 +41,7 @@ PLIST=		${WRKDIR}/PLIST.nodocs
 pre-install:
 	${RM} -f ${PLIST}
 	${GREP} -E -v '^(@dirrm )?(share/examples/)|(share/doc/)'       \
-		${PLIST_COMPLETE} > ${PLIST}
+		${PKGDIR}/PLIST > ${PLIST}
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-gtk/pkg-plist b/x11-toolkits/py-gtk/pkg-plist
index a3b39ddc87a6..0d4f663222cd 100644
--- a/x11-toolkits/py-gtk/pkg-plist
+++ b/x11-toolkits/py-gtk/pkg-plist
@@ -17,9 +17,13 @@ lib/%%PYTHON_VERSION%%/site-packages/Gtkinter.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Gtkinter.pyo
 lib/%%PYTHON_VERSION%%/site-packages/_gdkimlibmodule.so
 lib/%%PYTHON_VERSION%%/site-packages/_gtkmodule.so
+lib/%%PYTHON_VERSION%%/site-packages/_libglademodule.so
 lib/%%PYTHON_VERSION%%/site-packages/gtk.py
 lib/%%PYTHON_VERSION%%/site-packages/gtk.pyc
 lib/%%PYTHON_VERSION%%/site-packages/gtk.pyo
+lib/%%PYTHON_VERSION%%/site-packages/libglade.py
+lib/%%PYTHON_VERSION%%/site-packages/libglade.pyc
+lib/%%PYTHON_VERSION%%/site-packages/libglade.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pyglade/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/pyglade/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pyglade/__init__.pyo
@@ -82,14 +86,14 @@ share/examples/py-gtk/testgtk/README
 share/examples/py-gtk/testgtk/test.xpm
 share/examples/py-gtk/testgtk/testgtk.py
 share/examples/py-gtk/testgtk/testgtkrc
-@dirrm include/pygtk
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/pyglade
-@dirrm share/doc/py-gtk
-@dirrm share/examples/py-gtk/gl
-@dirrm share/examples/py-gtk/glade
-@dirrm share/examples/py-gtk/ide
-@dirrm share/examples/py-gtk/imlib
-@dirrm share/examples/py-gtk/neil
-@dirrm share/examples/py-gtk/simple
 @dirrm share/examples/py-gtk/testgtk
+@dirrm share/examples/py-gtk/simple
+@dirrm share/examples/py-gtk/neil
+@dirrm share/examples/py-gtk/imlib
+@dirrm share/examples/py-gtk/ide
+@dirrm share/examples/py-gtk/glade
+@dirrm share/examples/py-gtk/gl
 @dirrm share/examples/py-gtk
+@dirrm share/doc/py-gtk
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/pyglade
+@dirrm include/pygtk
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 90fae7927061..82b31e8aaba7 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -14,22 +14,20 @@ DISTNAME=	gnome-python-1.0.53
 
 MAINTAINER=	nectar@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12                  \
-		Imlib.5:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	glade.4:${PORTSDIR}/devel/libglade
+
+WRKSRC=		${WRKDIR}/${DISTNAME}/pygtk
 
-GTK_CONFIG=	${X11BASE}/bin/gtk12-config
 USE_GMAKE=	yes
+USE_IMLIB=	yes
 USE_PYTHON=	yes
-CONFIGURE_ENV=	GTK_CONFIG=${GTK_CONFIG} PYTHON=${PYTHON_CMD}
 USE_LIBTOOL=	yes
-PLIST_COMPLETE= ${PKGDIR}/PLIST
+CONFIGURE_ENV=	PYTHON=${PYTHON_CMD}
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/pygtk
 EG_SRC_DIR=	${WRKSRC}/examples
 EG_DST_DIR=	${PREFIX}/share/examples/py-gtk
 
 .if !defined(NOPORTDOCS)
-PLIST=		${PLIST_COMPLETE}
 post-install:
 	${MKDIR} ${EG_DST_DIR}
 	${TAR} -C ${EG_SRC_DIR} -cf - . | ${TAR} -C ${EG_DST_DIR} -xvf -
@@ -43,7 +41,7 @@ PLIST=		${WRKDIR}/PLIST.nodocs
 pre-install:
 	${RM} -f ${PLIST}
 	${GREP} -E -v '^(@dirrm )?(share/examples/)|(share/doc/)'       \
-		${PLIST_COMPLETE} > ${PLIST}
+		${PKGDIR}/PLIST > ${PLIST}
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-gtk2/pkg-plist b/x11-toolkits/py-gtk2/pkg-plist
index a3b39ddc87a6..0d4f663222cd 100644
--- a/x11-toolkits/py-gtk2/pkg-plist
+++ b/x11-toolkits/py-gtk2/pkg-plist
@@ -17,9 +17,13 @@ lib/%%PYTHON_VERSION%%/site-packages/Gtkinter.pyc
 lib/%%PYTHON_VERSION%%/site-packages/Gtkinter.pyo
 lib/%%PYTHON_VERSION%%/site-packages/_gdkimlibmodule.so
 lib/%%PYTHON_VERSION%%/site-packages/_gtkmodule.so
+lib/%%PYTHON_VERSION%%/site-packages/_libglademodule.so
 lib/%%PYTHON_VERSION%%/site-packages/gtk.py
 lib/%%PYTHON_VERSION%%/site-packages/gtk.pyc
 lib/%%PYTHON_VERSION%%/site-packages/gtk.pyo
+lib/%%PYTHON_VERSION%%/site-packages/libglade.py
+lib/%%PYTHON_VERSION%%/site-packages/libglade.pyc
+lib/%%PYTHON_VERSION%%/site-packages/libglade.pyo
 lib/%%PYTHON_VERSION%%/site-packages/pyglade/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/pyglade/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/pyglade/__init__.pyo
@@ -82,14 +86,14 @@ share/examples/py-gtk/testgtk/README
 share/examples/py-gtk/testgtk/test.xpm
 share/examples/py-gtk/testgtk/testgtk.py
 share/examples/py-gtk/testgtk/testgtkrc
-@dirrm include/pygtk
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/pyglade
-@dirrm share/doc/py-gtk
-@dirrm share/examples/py-gtk/gl
-@dirrm share/examples/py-gtk/glade
-@dirrm share/examples/py-gtk/ide
-@dirrm share/examples/py-gtk/imlib
-@dirrm share/examples/py-gtk/neil
-@dirrm share/examples/py-gtk/simple
 @dirrm share/examples/py-gtk/testgtk
+@dirrm share/examples/py-gtk/simple
+@dirrm share/examples/py-gtk/neil
+@dirrm share/examples/py-gtk/imlib
+@dirrm share/examples/py-gtk/ide
+@dirrm share/examples/py-gtk/glade
+@dirrm share/examples/py-gtk/gl
 @dirrm share/examples/py-gtk
+@dirrm share/doc/py-gtk
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/pyglade
+@dirrm include/pygtk
diff --git a/x11-toolkits/ruby-gtk/Makefile b/x11-toolkits/ruby-gtk/Makefile
index e992ce9b8c04..5a21425408b5 100644
--- a/x11-toolkits/ruby-gtk/Makefile
+++ b/x11-toolkits/ruby-gtk/Makefile
@@ -15,22 +15,24 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	yasuf@bsdclub.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-
 USE_XLIB=	yes
+USE_GTK=	yes
+WANT_IMLIB=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-CONFIGURE_ARGS=	${GTK_CONFIG}
 INSTALL_TARGET=	site-install
 
-.if defined(WITHOUT_IMLIB)
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_IMLIB)
+USE_IMLIB=	yes
 .else
-LIB_DEPENDS+=	Imlib.5:${PORTSDIR}/graphics/imlib
-GTK_CONFIG?=	${X11BASE}/bin/imlib-config
+PLIST=		${WRKDIR}/PLIST
+pre-install:
+	@${SED} -e '/gdkimlib/d' ${PKGDIR}/PLIST > ${PLIST}
 .endif
 
 post-configure:
@@ -43,7 +45,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${RUBY_EXAMPLESDIR}/gtk
 	${MKDIR} ${RUBY_EXAMPLESDIR}/gtk/browser
 	${INSTALL_DATA} ${WRKSRC}/doc/*.rb ${RUBY_EXAMPLESDIR}/gtk/browser
-.if !defined(NO_IMLIB)
+.if defined(HAVE_IMLIB)
 	${MKDIR} ${RUBY_EXAMPLESDIR}/gtk/gdkimlib
 	${INSTALL_DATA} ${WRKSRC}/sample/gdkimlib/*.rb ${RUBY_EXAMPLESDIR}/gtk/gdkimlib
 .endif
@@ -52,4 +54,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/api-ja/* ${RUBY_DOCDIR}/gtk/ja
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile
index e992ce9b8c04..5a21425408b5 100644
--- a/x11-toolkits/ruby-gtk2/Makefile
+++ b/x11-toolkits/ruby-gtk2/Makefile
@@ -15,22 +15,24 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	yasuf@bsdclub.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-
 USE_XLIB=	yes
+USE_GTK=	yes
+WANT_IMLIB=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-CONFIGURE_ARGS=	${GTK_CONFIG}
 INSTALL_TARGET=	site-install
 
-.if defined(WITHOUT_IMLIB)
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_IMLIB)
+USE_IMLIB=	yes
 .else
-LIB_DEPENDS+=	Imlib.5:${PORTSDIR}/graphics/imlib
-GTK_CONFIG?=	${X11BASE}/bin/imlib-config
+PLIST=		${WRKDIR}/PLIST
+pre-install:
+	@${SED} -e '/gdkimlib/d' ${PKGDIR}/PLIST > ${PLIST}
 .endif
 
 post-configure:
@@ -43,7 +45,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${RUBY_EXAMPLESDIR}/gtk
 	${MKDIR} ${RUBY_EXAMPLESDIR}/gtk/browser
 	${INSTALL_DATA} ${WRKSRC}/doc/*.rb ${RUBY_EXAMPLESDIR}/gtk/browser
-.if !defined(NO_IMLIB)
+.if defined(HAVE_IMLIB)
 	${MKDIR} ${RUBY_EXAMPLESDIR}/gtk/gdkimlib
 	${INSTALL_DATA} ${WRKSRC}/sample/gdkimlib/*.rb ${RUBY_EXAMPLESDIR}/gtk/gdkimlib
 .endif
@@ -52,4 +54,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/api-ja/* ${RUBY_DOCDIR}/gtk/ja
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>