Split the gtk part of imlib into a separate package, to remove the

gtk dependency from the base package.

3 files changed, 13 insertions, 22 deletions

diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index e2c16e691c4..70679ee17db 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.107 2011/01/13 13:36:07 wiz Exp $
+# $NetBSD: Makefile,v 1.108 2011/02/19 08:51:25 markd Exp $
 
 DISTNAME=	imlib-1.9.15
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/imlib/1.9/}
 EXTRACT_SUFX=	.tar.bz2
@@ -23,6 +23,8 @@ CPPFLAGS+=		-DENABLE_NLS
 CONFIGURE_ENV+=		ac_cv_path_CONVERT_PROG="${LOCALBASE}/bin/convert"
 CONFIGURE_ENV+=		X_LDFLAGS=${X_LDFLAGS:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+# breaks kde3 kuickshow if shm and other than XAA acceleration
+CONFIGURE_ARGS+=	--disable-shm
 
 PKG_SYSCONFSUBDIR=	imlib
 EGDIR=			${PREFIX}/share/examples/imlib
@@ -35,6 +37,11 @@ CONF_FILES+=		${EGDIR}/im_palette-small.pal \
 CONF_FILES+=		${EGDIR}/im_palette-tiny.pal \
 			${PKG_SYSCONFDIR}/im_palette-tiny.pal
 
+SUBST_CLASSES+=		imlib-config
+SUBST_FILES.imlib-config=	imlib-config
+SUBST_SED.imlib-config=	-e 's,no --,${PREFIX}/bin/gtk-config --,'
+SUBST_STAGE.imlib-config=	post-configure
+
 # The following ensures that `imlib-config --libs' includes the correct
 # linker flags for linking the X11 libs.
 #
@@ -58,7 +65,6 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../graphics/netpbm/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
diff --git a/graphics/imlib/PLIST b/graphics/imlib/PLIST
index 5553dd3c3cd..e2666edee78 100644
--- a/graphics/imlib/PLIST
+++ b/graphics/imlib/PLIST
@@ -1,26 +1,12 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 17:59:18 joerg Exp $
-bin/imlib_config
+@comment $NetBSD: PLIST,v 1.11 2011/02/19 08:51:25 markd Exp $
 bin/imlib-config
-include/gdk_imlib.h
-include/gdk_imlib_private.h
-include/gdk_imlib_types.h
 include/Imlib.h
 include/Imlib_private.h
 include/Imlib_types.h
 lib/libImlib.la
-lib/libgdk_imlib.la
-lib/libimlib-bmp.la
-lib/libimlib-gif.la
-lib/libimlib-jpeg.la
-lib/libimlib-png.la
-lib/libimlib-ppm.la
-lib/libimlib-ps.la
-lib/libimlib-tiff.la
-lib/libimlib-xpm.la
 lib/pkgconfig/imlib.pc
 lib/pkgconfig/imlibgdk.pc
 man/man1/imlib-config.1
-man/man1/imlib_config.1
 share/aclocal/imlib.m4
 share/doc/imlib/bg.gif
 share/doc/imlib/border_diag.gif
@@ -31,7 +17,7 @@ share/doc/imlib/curve1.gif
 share/doc/imlib/curve2.gif
 share/doc/imlib/imlib.gif
 share/doc/imlib/index.html
-share/examples/imlib/imrc
-share/examples/imlib/im_palette.pal
 share/examples/imlib/im_palette-small.pal
 share/examples/imlib/im_palette-tiny.pal
+share/examples/imlib/im_palette.pal
+share/examples/imlib/imrc
diff --git a/graphics/imlib/buildlink3.mk b/graphics/imlib/buildlink3.mk
index 101ab2568c1..74ef38b3f0e 100644
--- a/graphics/imlib/buildlink3.mk
+++ b/graphics/imlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2011/01/13 13:36:07 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2011/02/19 08:51:25 markd Exp $
 
 BUILDLINK_TREE+=	imlib
 
@@ -15,7 +15,6 @@ BUILDLINK_PKGSRCDIR.imlib?=	../../graphics/imlib
 .include "../../graphics/netpbm/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
 .endif # IMLIB_BUILDLINK3_MK