Update print/cupsomatic to 2.2. Changes from version 1.2 include allowing

the use of a config file.

3 files changed, 39 insertions, 32 deletions

diff --git a/print/cupsomatic/Makefile b/print/cupsomatic/Makefile
index 58f33919435..4be6c4b7192 100644
--- a/print/cupsomatic/Makefile
+++ b/print/cupsomatic/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2001/09/09 20:36:44 agc Exp $
+# $NetBSD: Makefile,v 1.10 2002/02/13 18:55:53 jlam Exp $
 
 DISTNAME=	cupsomatic
-PKGNAME=	${DISTNAME}-1.6
+PKGNAME=	${DISTNAME}-2.2
 CATEGORIES=	print
 EXTRACT_SUFX=	# empty
 
@@ -25,27 +25,31 @@ CONFLICTS+=	cupsomatic-200012??
 
 DIST_SUBDIR=	${PKGNAME}
 
-DEPENDS+=	cups>=1.1.1:../../print/cups
+DEPENDS+=	cups>=1.1.10:../../print/cups
 DEPENDS+=	foomatic-gswrapper>=1.2:../../print/foomatic-gswrapper
 DEPENDS+=	ghostscript{,-nox11}-[6-9]*:../../print/ghostscript
 DEPENDS+=	mpage-[0-9]*:../../print/mpage
 
-USE_PERL5=	# defined
+USE_PERL5=	yes
 WRKSRC=		${WRKDIR}
-NO_CONFIGURE=	# defined
 EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}/${DISTNAME}
 
 FILTERDIR=	${PREFIX}/libexec/cups/filter
 
-post-extract:
-	cd ${WRKSRC}; ${MV} ${DISTNAME} ${DISTNAME}.in
-
 do-build:
-	${SED}	-e "s,@PERL@,${PERL5},g"				\
-		-e "s,@LOCALBASE@,${LOCALBASE},g"			\
-		${WRKSRC}/${DISTNAME}.in > ${WRKSRC}/${DISTNAME}
+	cd ${WRKSRC};							\
+	for file in cupsomatic; do					\
+		${SED}	-e "s|/usr/bin/perl|${PERL5}|g"			\
+			-e "s|/usr/local|${LOCALBASE}|g"		\
+			-e "s|/etc/foomatic|${PKG_SYSCONFDIR}/foomatic|g" \
+			$${file} > $${file}.fixed;			\
+		${MV} $${file}.fixed $${file};				\
+	done
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${FILTERDIR}
+	cd ${WRKSRC};							\
+	for file in cupsomatic; do					\
+		${INSTALL_SCRIPT} ${WRKSRC}/$${file} ${FILTERDIR};	\
+	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/cupsomatic/distinfo b/print/cupsomatic/distinfo
index e016b05c90d..738706884a0 100644
--- a/print/cupsomatic/distinfo
+++ b/print/cupsomatic/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/05/14 17:54:32 jlam Exp $
+$NetBSD: distinfo,v 1.4 2002/02/13 18:55:53 jlam Exp $
 
-SHA1 (cupsomatic-1.6/cupsomatic) = d1f7d98f78298bea9cae2cfbd106361640325c65
-Size (cupsomatic-1.6/cupsomatic) = 24370 bytes
-SHA1 (patch-aa) = c78c13fe49213edeb75f344c564d20bbf5c2c465
+SHA1 (cupsomatic-2.2/cupsomatic) = 51fa0709b6c2d9685a5450b938ce809c42686d3a
+Size (cupsomatic-2.2/cupsomatic) = 35814 bytes
+SHA1 (patch-aa) = 566607e0703d8a4216d47cbada4cf9329c94e9e4
diff --git a/print/cupsomatic/patches/patch-aa b/print/cupsomatic/patches/patch-aa
index e92cd8d2b6f..1c8589fe3d2 100644
--- a/print/cupsomatic/patches/patch-aa
+++ b/print/cupsomatic/patches/patch-aa
@@ -1,19 +1,22 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/08 16:57:25 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2002/02/13 18:55:54 jlam Exp $
 
---- cupsomatic.in.orig	Thu Dec  7 03:48:55 2000
-+++ cupsomatic.in
-@@ -1,4 +1,4 @@
--#! /usr/bin/perl
-+#!@PERL@
+--- cupsomatic.orig	Sat Feb  9 14:35:39 2002
++++ cupsomatic
+@@ -37,7 +37,7 @@
+ # the first one.
+ # You can set this to "a2ps", "enscript" or "mpage" to select one of the
+ # default command strings.
+-my $enscriptcommand = "";
++my $enscriptcommand = "mpage";
  
- # The above Perl path may vary on your system; fix it!!!
+ # Set to 1 to insert postscript code for accounting.
+ my $ps_accounting = 1;
+@@ -267,7 +267,7 @@
+ # onto the stack @examined_stuff, which will be stuffed into
+ # Ghostscript/whatever later on.
  
-@@ -26,7 +26,7 @@
- # possibly other stuff.  The default path is often fine on Linux, but
- # may not be on other systems.
- # 
--# $ENV{'PATH'} = '/usr/local/bin:/usr/bin:/bin';
-+$ENV{'PATH'} = '@LOCALBASE@/bin:/usr/local/bin:/usr/bin:/bin';
- 
- 
- # Set debug to 1 to enable the debug logfile for this filter; it will
+-print $logh "Seaerching job for option settings ...\n";
++print $logh "Searching job for option settings ...\n";
+ my $maxlines = 1000;            # how many lines to examine?
+ my $more_stuff = 1;             # there is more stuff in stdin.
+ my $linect = 0;                 # how many lines have we examined?