Subject: Re: Avoiding netpm dependencies
To: Geert Hendrickx <ghen@telenet.be>
From: Martin Husemann <martin@duskware.de>
List: tech-pkg
Date: 11/08/2005 12:18:55
--Dxnq1zWXvFF0Q93v
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

And here is the patch for imlib.

Martin

--Dxnq1zWXvFF0Q93v
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/imlib/Makefile,v
retrieving revision 1.94
diff -u -r1.94 Makefile
--- Makefile	1 Jun 2005 18:02:56 -0000	1.94
+++ Makefile	8 Nov 2005 11:17:46 -0000
@@ -48,9 +48,10 @@
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
-.include "../../graphics/netpbm/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
 
+.include "options.mk"
+
 .include "../../mk/bsd.pkg.mk"
Index: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/imlib/buildlink3.mk,v
retrieving revision 1.7
diff -u -r1.7 buildlink3.mk
--- buildlink3.mk	28 Dec 2004 23:18:21 -0000	1.7
+++ buildlink3.mk	8 Nov 2005 11:17:46 -0000
@@ -19,9 +19,9 @@
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
-.include "../../graphics/netpbm/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
+.include "options.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
Index: options.mk
===================================================================
RCS file: options.mk
diff -N options.mk
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ options.mk	8 Nov 2005 11:17:46 -0000
@@ -0,0 +1,12 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.imlib
+PKG_SUPPORTED_OPTIONS=	netpbm
+PKG_SUGGESTED_OPTIONS=	netpbm
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mnetpbm)
+.include "../../graphics/netpbm/buildlink3.mk"
+.endif
+

--Dxnq1zWXvFF0Q93v--