CVS commit: pkgsrc/print

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/print
From: "Benny Siegert" <bsiegert%netbsd.org@localhost>
Date: Mon, 24 Jul 2023 19:25:37 +0000

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Mon Jul 24 19:25:36 UTC 2023

Modified Files:
        pkgsrc/print/foomatic-filters: Makefile Makefile.common PLIST distinfo
        pkgsrc/print/foomatic-filters-cups: Makefile
Added Files:
        pkgsrc/print/foomatic-filters/patches: patch-aa
            patch-foomatic-gswrapper.in patch-makeMan.in
Removed Files:
        pkgsrc/print/foomatic-filters/patches: patch-Makefile.am
            patch-configure.ac patch-process.c patch-util.c patch-util.h

Log Message:
foomatic-filters: revert 4.0.17 update.

This is incompatible with foomatic-ppd and breaks bulk builds.

Requested by wiz@


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/print/foomatic-filters/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/foomatic-filters/Makefile.common \
    pkgsrc/print/foomatic-filters/PLIST
cvs rdiff -u -r1.10 -r1.11 pkgsrc/print/foomatic-filters/distinfo
cvs rdiff -u -r1.18 -r1.19 pkgsrc/print/foomatic-filters-cups/Makefile
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/print/foomatic-filters/patches/patch-Makefile.am \
    pkgsrc/print/foomatic-filters/patches/patch-configure.ac \
    pkgsrc/print/foomatic-filters/patches/patch-process.c \
    pkgsrc/print/foomatic-filters/patches/patch-util.c \
    pkgsrc/print/foomatic-filters/patches/patch-util.h
cvs rdiff -u -r0 -r1.6 pkgsrc/print/foomatic-filters/patches/patch-aa
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/print/foomatic-filters/patches/patch-foomatic-gswrapper.in \
    pkgsrc/print/foomatic-filters/patches/patch-makeMan.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/foomatic-filters/Makefile
diff -u pkgsrc/print/foomatic-filters/Makefile:1.42 pkgsrc/print/foomatic-filters/Makefile:1.43
--- pkgsrc/print/foomatic-filters/Makefile:1.42 Sun Jul 23 10:17:23 2023
+++ pkgsrc/print/foomatic-filters/Makefile      Mon Jul 24 19:25:36 2023
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.42 2023/07/23 10:17:23 bsiegert Exp $
+# $NetBSD: Makefile,v 1.43 2023/07/24 19:25:36 bsiegert Exp $
 
 .include "Makefile.common"
 
 DISTNAME=      foomatic-filters-${FOOMATIC_FILTERS_VERSION}
+PKGREVISION=   20
 MASTER_SITES=  http://www.openprinting.org/download/foomatic/oldstuff/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -11,13 +12,13 @@ LICENSE=    gnu-gpl-v2
 
 CONFLICTS+=    foomatic-gswrapper-[0-9]*
 
-USE_TOOLS+=    gmake gs:run perl:run pkg-config autoconf automake autoreconf
+USE_TOOLS+=    gmake gs:run perl:run
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=       --disable-file-converter-check
 
-CUPS_FILTERDIR=                ${PREFIX}/libexec/cups/filter
+CUPS_FILTERDIR=                ${LOCALBASE}/libexec/cups/filter
 CONFIGURE_ENV+=                CUPS_FILTERS=${CUPS_FILTERDIR}
 FILES_SUBST+=          CUPS_FILTERDIR=${CUPS_FILTERDIR}
 
@@ -58,11 +59,7 @@ CONF_FILES=  ${EGDIR}/filter.conf ${CONFD
 
 INSTALLATION_DIRS+=    ${EGDIR}
 
-pre-configure:
-       cd ${WRKSRC} && ${TOOLS_PATH.autoreconf} -vi
-
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/filter.conf ${DESTDIR}${EGDIR}
 
-.include "../../sysutils/dbus/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/foomatic-filters/Makefile.common
diff -u pkgsrc/print/foomatic-filters/Makefile.common:1.3 pkgsrc/print/foomatic-filters/Makefile.common:1.4
--- pkgsrc/print/foomatic-filters/Makefile.common:1.3   Sun Jul 23 10:17:23 2023
+++ pkgsrc/print/foomatic-filters/Makefile.common       Mon Jul 24 19:25:36 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.3 2023/07/23 10:17:23 bsiegert Exp $
+# $NetBSD: Makefile.common,v 1.4 2023/07/24 19:25:36 bsiegert Exp $
 #
 # used by print/foomatic-filters/Makefile
 # used by print/foomatic-filters-cups/Makefile
 
-FOOMATIC_FILTERS_VERSION=      4.0.17
+FOOMATIC_FILTERS_VERSION=      3.0.2
 CATEGORIES=                    print
 HOMEPAGE=                      http://www.linuxprinting.org/foomatic.html
Index: pkgsrc/print/foomatic-filters/PLIST
diff -u pkgsrc/print/foomatic-filters/PLIST:1.3 pkgsrc/print/foomatic-filters/PLIST:1.4
--- pkgsrc/print/foomatic-filters/PLIST:1.3     Sun Jul 23 10:17:23 2023
+++ pkgsrc/print/foomatic-filters/PLIST Mon Jul 24 19:25:36 2023
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2023/07/23 10:17:23 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.4 2023/07/24 19:25:36 bsiegert Exp $
+bin/foomatic-gswrapper
 bin/foomatic-rip
+man/man1/foomatic-gswrapper.1
 man/man1/foomatic-rip.1
 share/examples/foomatic/filter.conf
-share/examples/foomatic/filter.conf.sample
-@pkgdir share/examples/foomatic/direct

Index: pkgsrc/print/foomatic-filters/distinfo
diff -u pkgsrc/print/foomatic-filters/distinfo:1.10 pkgsrc/print/foomatic-filters/distinfo:1.11
--- pkgsrc/print/foomatic-filters/distinfo:1.10 Sun Jul 23 10:17:23 2023
+++ pkgsrc/print/foomatic-filters/distinfo      Mon Jul 24 19:25:36 2023
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.10 2023/07/23 10:17:23 bsiegert Exp $
+$NetBSD: distinfo,v 1.11 2023/07/24 19:25:36 bsiegert Exp $
 
-BLAKE2s (foomatic-filters-4.0.17.tar.gz) = 918beef56eeed1c796cd9defc1d60c69840e068d2f6fd5392feb98fdd5b14875
-SHA512 (foomatic-filters-4.0.17.tar.gz) = f07d2ac64a28e9353418deb9dd2009f5ef7676ab268af211edfcd012c231c9081516dae450f2b7910b687f75f7e53c8198fda2508f3fd527120940b4905292dd
-Size (foomatic-filters-4.0.17.tar.gz) = 266276 bytes
-SHA1 (patch-Makefile.am) = fa8b549d58171299fe8921fe31b5c27ddaa11538
-SHA1 (patch-configure.ac) = 9cefd7a9f3fb1ff07c247e69a0bf3c678c1f1841
-SHA1 (patch-process.c) = 6eb16c17153b1435a26d8b3c56677f06eacb809f
-SHA1 (patch-util.c) = de0732672e510cb13432f89aebd4bcd74a92c84e
-SHA1 (patch-util.h) = ca0bdade982b07eb0302bb1647304775cc0e912a
+BLAKE2s (foomatic-filters-3.0.2.tar.gz) = 214ff6154f1a162ba5bfc3da653839f1fa8e7bf316657952f4f1c730b5f65aa4
+SHA512 (foomatic-filters-3.0.2.tar.gz) = 6159531f004e18e5f8ec822befc5c6c26a98103ede4fd18a661fdeeb0054700dae2aabec57de43e275c18718d8e3a3ed3abd5dd8a9e809a5ee1453b69de7f0c2
+Size (foomatic-filters-3.0.2.tar.gz) = 125875 bytes
+SHA1 (patch-aa) = 4b471d5fec7147d82eba47512bf851ed0b9d97a3
+SHA1 (patch-foomatic-gswrapper.in) = 7622c2e1e6e21b996207d74414d29c36012e2867
+SHA1 (patch-makeMan.in) = 2e317a37ae0f605f57a15555003b09dcc4b53f79

Index: pkgsrc/print/foomatic-filters-cups/Makefile
diff -u pkgsrc/print/foomatic-filters-cups/Makefile:1.18 pkgsrc/print/foomatic-filters-cups/Makefile:1.19
--- pkgsrc/print/foomatic-filters-cups/Makefile:1.18    Sun Jul 23 10:17:23 2023
+++ pkgsrc/print/foomatic-filters-cups/Makefile Mon Jul 24 19:25:36 2023
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.18 2023/07/23 10:17:23 bsiegert Exp $
+# $NetBSD: Makefile,v 1.19 2023/07/24 19:25:36 bsiegert Exp $
 
 META_PACKAGE=  yes
 
 .include "../../print/foomatic-filters/Makefile.common"
 
 DISTNAME=      foomatic-filters-cups-${FOOMATIC_FILTERS_VERSION}
+PKGREVISION=   4
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Foomatic support for CUPS

Added files:

Index: pkgsrc/print/foomatic-filters/patches/patch-aa
diff -u /dev/null pkgsrc/print/foomatic-filters/patches/patch-aa:1.6
--- /dev/null   Mon Jul 24 19:25:37 2023
+++ pkgsrc/print/foomatic-filters/patches/patch-aa      Mon Jul 24 19:25:36 2023
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.6 2023/07/24 19:25:36 bsiegert Exp $
+
+--- foomatic-rip.in.orig       2004-08-26 15:53:35.000000000 -0500
++++ foomatic-rip.in    2006-10-02 19:23:18.000000000 -0500
+@@ -47,7 +47,7 @@
+ my $execpath = "@prefix@/bin:/usr/local/bin:/usr/bin:/bin";
+ 
+ # 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@:@prefix@/lib/cups/filter";
+ 
+ # Location of the configuration file "filter.conf", this file can be
+ # used to change the settings of foomatic-rip without editing
+@@ -5919,7 +5919,7 @@
+                            "      # Custom page size settings\n",
+                            "      # We aren't really checking for " .
+                            "legal vals.\n",
+-                           "      if [ \"x\${$varn}\" == 'x$val' ]; " .
++                           "      if [ \"x\${$varn}\" = 'x$val' ]; " .
+                            "then\n",
+                            "        $varn=\"\${$varn}.\${PageWidth}" .
+                            "x\${PageHeight}\${PageSizeUnit}\"\n",

Index: pkgsrc/print/foomatic-filters/patches/patch-foomatic-gswrapper.in
diff -u /dev/null pkgsrc/print/foomatic-filters/patches/patch-foomatic-gswrapper.in:1.3
--- /dev/null   Mon Jul 24 19:25:37 2023
+++ pkgsrc/print/foomatic-filters/patches/patch-foomatic-gswrapper.in   Mon Jul 24 19:25:36 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-foomatic-gswrapper.in,v 1.3 2023/07/24 19:25:36 bsiegert Exp $
+
+--- foomatic-gswrapper.in.orig 2004-01-22 03:42:35.000000000 +0000
++++ foomatic-gswrapper.in
+@@ -19,10 +19,10 @@ my $configpath = "@sysconfdir@/foomatic"
+ 
+ # Set GhostScript path
+ my $gspath = "gs";
+-$gspath = $conf{gspath} if defined(%conf) and defined $conf{gspath};
++$gspath = $conf{gspath} if %conf and defined $conf{gspath};
+ my $execpath = "@prefix@/bin:/usr/local/bin:/usr/bin:/bin";
+ # Get execution path from config file
+-$execpath = $conf{execpath} if defined(%conf) and defined $conf{execpath};
++$execpath = $conf{execpath} if %conf and defined $conf{execpath};
+ $ENV{'PATH'} = $execpath;
+ 
+ grep (m!\-sOutputFile=\-! 
Index: pkgsrc/print/foomatic-filters/patches/patch-makeMan.in
diff -u /dev/null pkgsrc/print/foomatic-filters/patches/patch-makeMan.in:1.3
--- /dev/null   Mon Jul 24 19:25:37 2023
+++ pkgsrc/print/foomatic-filters/patches/patch-makeMan.in      Mon Jul 24 19:25:36 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-makeMan.in,v 1.3 2023/07/24 19:25:36 bsiegert Exp $
+
+* some platfoms does not have `file' utilty, others does not recognize such
+  files as `roff'.
+
+--- makeMan.in.orig    2004-01-22 03:42:35.000000000 +0000
++++ makeMan.in
+@@ -29,8 +29,6 @@ foreach my $file (@files)
+       next unless -f $file and $file =~ /^(.*\.[1-9])\.in$/;
+       my ($man) = $1;
+       $man =~ s,.*/,,;
+-      next unless ((`file $file` =~ m/\b[ntg]roff\b/) or
+-                   (`file $file` =~ m/\[nt\]roff/));
+       print STDERR "MATCHED\n" if $VERBOSE;
+       $append = '';
+       open IN, "<$file" or (warn "Can't read input file $file!" and next FILE);

Prev by Date: CVS commit: pkgsrc/devel/py-multipledispatch
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/devel/py-multipledispatch
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index