Implement WANT_IMLIB and USE_IMLIB.

9 files changed, 46 insertions, 40 deletions

diff --git a/graphics/chbg/Makefile b/graphics/chbg/Makefile
index 800ca8e3f4ae..bdd242ae1815 100644
--- a/graphics/chbg/Makefile
+++ b/graphics/chbg/Makefile
@@ -14,12 +14,10 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	p@dancris.com
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		Imlib.5:${PORTSDIR}/graphics/imlib
-
 USE_GMAKE=	yes
+USE_IMLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
-		CFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/graphics/chbg/files/patch-aa b/graphics/chbg/files/patch-aa
new file mode 100644
index 000000000000..96f2f273d11f
--- /dev/null
+++ b/graphics/chbg/files/patch-aa
@@ -0,0 +1,20 @@
+--- configure.orig	Tue Oct  3 15:37:21 2000
++++ configure	Tue Oct  3 15:39:25 2000
+@@ -2547,7 +2547,7 @@
+   for ac_dir in $ac_dummy; do
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_IMLIB_CONFIG=""yes""
++      ac_cv_prog_IMLIB_CONFIG=""imlib-config""
+       break
+     fi
+   done
+@@ -2562,7 +2562,7 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+-if eval "test x$IMLIB_CONFIG = xyes"; then
++if eval "test x$IMLIB_CONFIG != xno"; then
+ 	echo "$ac_t"""checking for gdk_imlib configuration using imlib-config script ..."" 1>&6
+ 	IMLIB_LIBS=`imlib-config --libs-gdk`
+ 	echo "$ac_t"""	gdk_imlib LDFLAGS=$IMLIB_LIBS"" 1>&6
diff --git a/graphics/chbg/pkg-plist b/graphics/chbg/pkg-plist
index 506789aa76d0..6ea5ee1f9777 100644
--- a/graphics/chbg/pkg-plist
+++ b/graphics/chbg/pkg-plist
@@ -1 +1,4 @@
 bin/chbg
+share/locale/fr/LC_MESSAGES/chbg.mo
+share/locale/sk/LC_MESSAGES/chbg.mo
+share/locale/ja/LC_MESSAGES/chbg.mo
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index 5ef9b5529583..a77cfc88c8cd 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -15,10 +15,9 @@ MASTER_SITES=	http://mirror.nucba.ac.jp/mirror/enlightenment/enlightenment/libs/
 
 MAINTAINER=	vanilla@FreeBSD.org
 
-LIB_DEPENDS=	Imlib.5:${PORTSDIR}/graphics/imlib
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_IMLIB=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/gphoto/Makefile b/graphics/gphoto/Makefile
index 3fabf1a1fb43..5f51a91709bb 100644
--- a/graphics/gphoto/Makefile
+++ b/graphics/gphoto/Makefile
@@ -13,19 +13,13 @@ MASTER_SITES=	ftp://ftp.gphoto.org/projects/gphoto/pub/tar/stable/ \
        
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gdk_imlib.5:${PORTSDIR}/graphics/imlib
 RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
+USE_IMLIB=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--disable-gtktest --disable-imlibtest
 
 MAN1=		gphoto.1
 
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 3fabf1a1fb43..5f51a91709bb 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -13,19 +13,13 @@ MASTER_SITES=	ftp://ftp.gphoto.org/projects/gphoto/pub/tar/stable/ \
        
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gdk_imlib.5:${PORTSDIR}/graphics/imlib
 RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
+USE_IMLIB=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--disable-gtktest --disable-imlibtest
 
 MAN1=		gphoto.1
 
diff --git a/graphics/gtkgraph/Makefile b/graphics/gtkgraph/Makefile
index fcea058fbdb8..713f81a31417 100644
--- a/graphics/gtkgraph/Makefile
+++ b/graphics/gtkgraph/Makefile
@@ -12,21 +12,17 @@ MASTER_SITES=	http://gtkgraph.linuxave.net/
 
 MAINTAINER=	jedgar@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		intl.1:${PORTSDIR}/devel/gettext \
-		gdk_imlib.5:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+USE_IMLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-x
-CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-pre-configure:
-	@${PERL} -pi.orig -e 's|-O2|${CFLAGS}|' ${WRKSRC}/configure
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g ; s|-O2|${CFLAGS}| ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/graphics/gview/Makefile b/graphics/gview/Makefile
index 2191eb33fe7c..3bd835aa3255 100644
--- a/graphics/gview/Makefile
+++ b/graphics/gview/Makefile
@@ -14,15 +14,17 @@ MASTER_SITES=	http://netpedia.net/hosting/gview/ \
 
 MAINTAINER=	cpiazza@FreeBSD.org
 
-LIB_DEPENDS=	gdk_imlib.5:${PORTSDIR}/graphics/imlib
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
+USE_IMLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		GTK_CONFIG="${GTK_CONFIG}"
+		LIBS="-L${LOCALBASE}/lib"
+
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
+		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
+		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile
index 68a40a33bb5a..da461530d457 100644
--- a/graphics/qiv/Makefile
+++ b/graphics/qiv/Makefile
@@ -13,10 +13,10 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	billf@FreeBSD.org
 
-LIB_DEPENDS=	gdk_imlib.5:${PORTSDIR}/graphics/imlib
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_IMLIB=	yes
+
 MAN1=		qiv.1
 
 do-configure: