* Be a bit more clever with expressing the dependency so that we don't

  have to install mpage if we have another "text-to-ps" package
  installed.

* Add a "cups" package option so that this package can be used with
  CUPS without requiring any other "text-to-ps" filters to be installed.
  If the "cups" option is specified, then also try installing foomatic-rip
  as a CUPS filter (using the INSTALL script from the foomatic-filters-cups
  package).

* Move the example config file under ${PREFIX}/share/foomatic where
  other Foomatic-related data files will also go in the future.

Bump the PKGREVISION to 2.

6 files changed, 49 insertions, 54 deletions

diff --git a/print/foomatic-filters/DESCR b/print/foomatic-filters/DESCR
index 49f799d6866..9e6e1a3be81 100644
--- a/print/foomatic-filters/DESCR
+++ b/print/foomatic-filters/DESCR
@@ -1,9 +1,8 @@
 The foomatic-filters package provides foomatic-rip and foomatic-gswrapper.
 
-foomatic-rip uses an external renderer (like GhostScript) to
-translate PostScript to printer's native language. The printer
-capabilities are described in PPD files.  foomatic-rip works with
-every known spooler.
+foomatic-rip uses an external renderer (like GhostScript) to translate
+PostScript to printer's native language. The printer capabilities are
+described in PPD files.  foomatic-rip works with every known spooler.
 
 foomatic-gswrapper massages arguments to make Ghostscript execute
 properly as a filter.
diff --git a/print/foomatic-filters/MESSAGE b/print/foomatic-filters/MESSAGE
deleted file mode 100644
index 3509d80b271..00000000000
--- a/print/foomatic-filters/MESSAGE
+++ /dev/null
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2005/10/10 20:30:07 reed Exp $
-
-This package depends on mpage.
-
-The foomatic-rip script defaults to use in order: a2ps, enscript,
-or mpage.
-
-This can be adjusted in the ${PKG_SYSCONFDIR}/filter.conf
-configuration file with the "textfilter: ..." setting.
-
-You can install print/a2ps or print/enscript packages if needed.
-
-===========================================================================
diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile
index 16850f42c32..260f7aa02d7 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -1,42 +1,53 @@
-# $NetBSD: Makefile,v 1.7 2005/12/05 23:55:16 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/17 18:35:10 jlam Exp $
 
-DISTNAME=	foomatic-filters-3.0.2
-PKGREVISION=	1
-CATEGORIES=	print
-MASTER_SITES=	http://www.linuxprinting.org/download/foomatic/
+.include "Makefile.common"
 
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.linuxprinting.org/foomatic.html
-COMMENT=	Spooler independent postscript printing filter
+DISTNAME=	foomatic-filters-${FOOMATIC_FILTERS_VERSION}
+PKGREVISION=	2
+MASTER_SITES=	http://www.linuxprinting.org/download/foomatic/
 
-# You may choose from any of the following, if you wish
-DEPENDS+=	mpage-[0-9]*:../../print/mpage
-#DEPENDS+=	a2ps-[0-9]*:../../print/a2ps
-#DEPENDS+=	enscript-[0-9]*:../../print/enscript
+MAINTAINER=	jlam@pkgsrc.org
+COMMENT=	Spooler-independent PostScript printing filter
 
 CONFLICTS+=	foomatic-gswrapper-[0-9]
 
-GNU_CONFIGURE=		YES
-CONFIG_GUESS_OVERRIDE=  ${WRKSRC}/config.guess
-CONFIG_SUB_OVERRIDE=    ${WRKSRC}/config.sub
-
-# Rather than wrestle with the maintainer's horribly broken configure
-# scripts, we just override everything here
-CONFIGURE_ENV+= 	CUPS=${LOCALBASE}/share/cups
-CONFIGURE_ENV+= 	CUPS_FILTERS=${LOCALBASE}/lib/cups/filter
-CONFIGURE_ENV+= 	PRINTCAP=/etc/printcap
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR:Q}
-
 USE_TOOLS+=	gmake gs:run perl:run
-USE_PKGINSTALL=	yes
 INSTALL_TARGET=	install-bin install-man
 
-PKG_SYSCONFSUBDIR=	foomatic
-EGDIR=			${PREFIX}/share/examples/foomatic-filters/
-CONF_FILES=		${EGDIR}/filter.conf ${PKG_SYSCONFDIR}/filter.conf
+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_OPTIONS_VAR=	PKG_OPTIONS.foomatic
+PKG_SUPPORTED_OPTIONS=	cups
+
+.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
+
+USE_PKGINSTALL=		yes
+DEINSTALL_EXTRA_TMPL=	${.CURDIR}/../../print/foomatic-filters-cups/INSTALL
+INSTALL_EXTRA_TMPL=	${DEINSTALL_EXTRA_TMPL}
+
+EGDIR=		${PREFIX}/share/examples/foomatic
+CONFDIR=	${PKG_SYSCONFDIR}/foomatic
+
+REQD_DIRS=	${EGDIR}
+OWN_DIRS=	${CONFDIR}
+CONF_FILES=	${EGDIR}/filter.conf ${CONFDIR}/filter.conf
 
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/filter.conf ${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/foomatic-filters/PLIST b/print/foomatic-filters/PLIST
index 6f681230210..3692bf10768 100644
--- a/print/foomatic-filters/PLIST
+++ b/print/foomatic-filters/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/04/28 22:29:43 reed Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/12/17 18:35:10 jlam Exp $
 bin/foomatic-gswrapper
 bin/foomatic-rip
 man/man1/foomatic-gswrapper.1
 man/man1/foomatic-rip.1
-share/examples/foomatic-filters/filter.conf
-@dirrm share/examples/foomatic-filters
+share/examples/foomatic/filter.conf
diff --git a/print/foomatic-filters/distinfo b/print/foomatic-filters/distinfo
index 4405e17d078..a7202d5f2f6 100644
--- a/print/foomatic-filters/distinfo
+++ b/print/foomatic-filters/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/04/28 22:29:43 reed Exp $
+$NetBSD: distinfo,v 1.2 2005/12/17 18:35:10 jlam Exp $
 
 SHA1 (foomatic-filters-3.0.2.tar.gz) = 6d949949f432212632c704904272bc32f287b577
 RMD160 (foomatic-filters-3.0.2.tar.gz) = 612529ea462f7f1500f30ffed4aec105b410936c
 Size (foomatic-filters-3.0.2.tar.gz) = 125875 bytes
-SHA1 (patch-aa) = 3bc18d45ead52a31d10e82f7e0030d8c92359277
+SHA1 (patch-aa) = eb58f6cf9f14b63a47bcecfd43dd31db07336841
diff --git a/print/foomatic-filters/patches/patch-aa b/print/foomatic-filters/patches/patch-aa
index 430b64897ea..6d9f16b4848 100644
--- a/print/foomatic-filters/patches/patch-aa
+++ b/print/foomatic-filters/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/04/28 22:29:43 reed Exp $
+$NetBSD: patch-aa,v 1.2 2005/12/17 18:35:10 jlam Exp $
 
---- foomatic-rip.in.orig	2004-01-21 20:42:35.000000000 -0700
+--- foomatic-rip.in.orig	2004-08-26 16:53:35.000000000 -0400
 +++ foomatic-rip.in
 @@ -48,5 +48,5 @@ my $execpath = "@prefix@/bin:/usr/local/
  
  # CUPS raster drivers are searched here
 -my $cupsfilterpath = "@prefix@/lib/cups/filter:/usr/local/lib/cups/filter:/usr/local/libexec/cups/filter:/opt/cups/filter:/usr/lib/cups/filter";
-+my $cupsfilterpath = "@CUPS_FILTERS@";
++my $cupsfilterpath = "@CUPS_FILTERS@:@prefix@/lib/cups/filter";
  
  # Location of the configuration file "filter.conf", this file can be