From c2fac04363e73cee38e409b0acfbc45b5715a4aa Mon Sep 17 00:00:00 2001
From: drochner <drochner>
Date: Fri, 18 Dec 2009 21:08:57 +0000
Subject: 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)

---
 print/foomatic4-filters/Makefile | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'print')

diff --git a/print/foomatic4-filters/Makefile b/print/foomatic4-filters/Makefile
index 2ee462fa501..3bb2c50ffee 100644
--- a/print/foomatic4-filters/Makefile
+++ b/print/foomatic4-filters/Makefile
@@ -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 @@ GNU_CONFIGURE=		yes
 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,14 +36,21 @@ INSTALL_TARGET=	install-bin install-man
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcups)
-DEPENDS+=	{cups>=1.0,${TEXTTOPS_DEPENDS}}:../../print/cups
+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
 
-DEINSTALL_TEMPLATES+=	${.CURDIR}/../../print/foomatic-filters-cups/DEINSTALL
-INSTALL_TEMPLATES+=	${.CURDIR}/../../print/foomatic-filters-cups/INSTALL
-
 EGDIR=		${PREFIX}/share/examples/foomatic
 CONFDIR=	${PKG_SYSCONFDIR}/foomatic
 
-- 
cgit v1.2.3