pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/print/foomatic4-filters fix the option logics so that ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/ca60d70c28be
branches: trunk
changeset: 568780:ca60d70c28be
user: drochner <drochner%pkgsrc.org@localhost>
date: Fri Dec 18 21:08:57 2009 +0000
description:
fix the option logics so that EVAL_PREFIX(cups) and derivatives of it
aren't used if the "cups" option is not set (which means that cups
is not a dependency)
diffstat:
print/foomatic4-filters/Makefile | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diffs (48 lines):
diff -r 2cd612bc5ea6 -r ca60d70c28be print/foomatic4-filters/Makefile
--- a/print/foomatic4-filters/Makefile Fri Dec 18 18:54:24 2009 +0000
+++ b/print/foomatic4-filters/Makefile Fri Dec 18 21:08:57 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/20 20:50:43 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2009/12/18 21:08:57 drochner Exp $
DISTNAME= foomatic-filters-4.0.3
CATEGORIES= print
@@ -16,12 +16,6 @@
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS+= --disable-file-converter-check
-EVAL_PREFIX+= CUPS_PREFIX=cups
-CUPS_FILTERDIR= ${CUPS_PREFIX:Q}/libexec/cups/filter
-CONFIGURE_ENV+= CUPS_FILTERS=${CUPS_FILTERDIR}
-FILES_SUBST+= CUPS_FILTERDIR=${CUPS_FILTERDIR}
-
-TEXTTOPS_DEPENDS= {a2ps,enscript,mpage}-[0-9]*
PKG_DESTDIR_SUPPORT= user-destdir
PKG_OPTIONS_VAR= PKG_OPTIONS.foomatic
@@ -42,13 +36,20 @@
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mcups)
-DEPENDS+= {cups>=1.0,${TEXTTOPS_DEPENDS}}:../../print/cups
-.else
-DEPENDS+= ${TEXTTOPS_DEPENDS}:../../print/mpage
-.endif
-
+DEPENDS+= cups>=1.0:../../print/cups
+EVAL_PREFIX+= CUPS_PREFIX=cups
+CUPS_FILTERDIR= ${CUPS_PREFIX:Q}/libexec/cups/filter
+CONFIGURE_ENV+= CUPS_FILTERS=${CUPS_FILTERDIR}
+FILES_SUBST+= CUPS_FILTERDIR=${CUPS_FILTERDIR}
DEINSTALL_TEMPLATES+= ${.CURDIR}/../../print/foomatic-filters-cups/DEINSTALL
INSTALL_TEMPLATES+= ${.CURDIR}/../../print/foomatic-filters-cups/INSTALL
+.else
+TEXTTOPS_DEPENDS= {a2ps,enscript,mpage}-[0-9]*
+DEPENDS+= ${TEXTTOPS_DEPENDS}:../../print/mpage
+CONFIGURE_ENV+= CUPS_CONFIG=/nonexistent
+CONFIGURE_ENV+= CUPS_SERVERBIN=/nonexistent
+CONFIGURE_ENV+= CUPS_FILTERS=/nonexistent
+.endif
EGDIR= ${PREFIX}/share/examples/foomatic
CONFDIR= ${PKG_SYSCONFDIR}/foomatic
Home |
Main Index |
Thread Index |
Old Index