svn commit: r337610 - in head/print: foomatic-db foomatic-db-engine foomatic-db/files foomatic-filters

Wolfgang Jenkner wjenkner at inode.at
Sun Dec 29 02:17:15 UTC 2013


On Thu, Dec 26 2013, Boris Samorodov wrote:

>   . take maintainership print/foomatic-db, print/foomatic-db-engine, print/foomatic-filters);
>   . update to version 20131207;
>   . change MASTER_SITES;
>   . use new LIB_DEPENDS syntax;
>   . incorporate USES=gmake;
>   . allow staging.

The update has brought a dependency on dbus, which, IIUC, is only needed
to support colord.

May I suggest to make these dependencies optional, like in the patch
below?

Index: foomatic-filters/Makefile
===================================================================
--- foomatic-filters/Makefile	(revision 337750)
+++ foomatic-filters/Makefile	(working copy)
@@ -11,8 +11,6 @@
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
-
 USES=		perl5 pkgconfig
 USE_AUTOTOOLS=	autoheader
 USE_GHOSTSCRIPT=yes
@@ -32,12 +30,13 @@
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	A2PS CUPS_IMAGE MPAGE
+OPTIONS_DEFINE=	A2PS COLORD CUPS_IMAGE MPAGE
 OPTIONS_RADIO=	ENSCRIPT
 OPTIONS_RADIO_ENSCRIPT=	ENSCRIPT_A4 ENSCRIPT_LETTER ENSCRIPT_LETTERDJ
 OPTIONS_DEFAULT=	CUPS_IMAGE A2PS ENSCRIPT_A4 MPAGE
 CUPS_IMAGE_DESC=	Install cups image utilities
 A2PS_DESC=		Install a2ps convertor
+COLORD_DESC=		Query colord (via dbus)
 ENSCRIPT_A4_DESC=	Install enscript convertor (A4)
 ENSCRIPT_LETTER_DESC=	Install enscript convertor (letter)
 ENSCRIPT_LETTERDJ_DESC=	Install enscript convertor (letterdj)
@@ -53,6 +52,14 @@
 RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps
 .endif
 
+.if ${PORT_OPTIONS:MCOLORD}
+LIB_DEPENDS+=	libdbus-1.so:${PORTSDIR}/devel/dbus
+RUN_DEPENDS+=	colormgr:${PORTSDIR}/graphics/colord
+CONFIGURE_ARGS+=	--enable-dbus
+.else
+CONFIGURE_ARGS+=	--disable-dbus
+.endif
+
 .if ${PORT_OPTIONS:MENSCRIPT_A4}
 RUN_DEPENDS+=	enscript:${PORTSDIR}/print/enscript-a4
 .endif


More information about the svn-ports-head mailing list