CVS commit: pkgsrc/print

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/print
From: "Benny Siegert" <bsiegert%netbsd.org@localhost>
Date: Sun, 23 Jul 2023 10:17:23 +0000

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Jul 23 10:17:23 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-Makefile.am
            patch-configure.ac patch-process.c patch-util.c patch-util.h
Removed Files:
        pkgsrc/print/foomatic-filters/patches: patch-aa
            patch-foomatic-gswrapper.in patch-makeMan.in

Log Message:
foomatic-filters: update to 4.0.17.

This is a big update across many versions, too many changes to list here.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/print/foomatic-filters/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/foomatic-filters/Makefile.common \
    pkgsrc/print/foomatic-filters/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/print/foomatic-filters/distinfo
cvs rdiff -u -r1.17 -r1.18 pkgsrc/print/foomatic-filters-cups/Makefile
cvs rdiff -u -r0 -r1.1 \
    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 -r1.4 -r0 pkgsrc/print/foomatic-filters/patches/patch-aa
cvs rdiff -u -r1.1 -r0 \
    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.41 pkgsrc/print/foomatic-filters/Makefile:1.42
--- pkgsrc/print/foomatic-filters/Makefile:1.41 Tue Jun 28 11:35:27 2022
+++ pkgsrc/print/foomatic-filters/Makefile      Sun Jul 23 10:17:23 2023
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2022/06/28 11:35:27 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2023/07/23 10:17:23 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
@@ -12,13 +11,13 @@ LICENSE=    gnu-gpl-v2
 
 CONFLICTS+=    foomatic-gswrapper-[0-9]*
 
-USE_TOOLS+=    gmake gs:run perl:run
+USE_TOOLS+=    gmake gs:run perl:run pkg-config autoconf automake autoreconf
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=       --disable-file-converter-check
 
-CUPS_FILTERDIR=                ${LOCALBASE}/libexec/cups/filter
+CUPS_FILTERDIR=                ${PREFIX}/libexec/cups/filter
 CONFIGURE_ENV+=                CUPS_FILTERS=${CUPS_FILTERDIR}
 FILES_SUBST+=          CUPS_FILTERDIR=${CUPS_FILTERDIR}
 
@@ -59,7 +58,11 @@ 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.2 pkgsrc/print/foomatic-filters/Makefile.common:1.3
--- pkgsrc/print/foomatic-filters/Makefile.common:1.2   Sun Oct  5 16:41:08 2014
+++ pkgsrc/print/foomatic-filters/Makefile.common       Sun Jul 23 10:17:23 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.2 2014/10/05 16:41:08 wiz Exp $
+# $NetBSD: Makefile.common,v 1.3 2023/07/23 10:17:23 bsiegert Exp $
 #
 # used by print/foomatic-filters/Makefile
 # used by print/foomatic-filters-cups/Makefile
 
-FOOMATIC_FILTERS_VERSION=      3.0.2
+FOOMATIC_FILTERS_VERSION=      4.0.17
 CATEGORIES=                    print
 HOMEPAGE=                      http://www.linuxprinting.org/foomatic.html
Index: pkgsrc/print/foomatic-filters/PLIST
diff -u pkgsrc/print/foomatic-filters/PLIST:1.2 pkgsrc/print/foomatic-filters/PLIST:1.3
--- pkgsrc/print/foomatic-filters/PLIST:1.2     Sat Dec 17 18:35:10 2005
+++ pkgsrc/print/foomatic-filters/PLIST Sun Jul 23 10:17:23 2023
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2005/12/17 18:35:10 jlam Exp $
-bin/foomatic-gswrapper
+@comment $NetBSD: PLIST,v 1.3 2023/07/23 10:17:23 bsiegert Exp $
 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.9 pkgsrc/print/foomatic-filters/distinfo:1.10
--- pkgsrc/print/foomatic-filters/distinfo:1.9  Tue Oct 26 11:12:06 2021
+++ pkgsrc/print/foomatic-filters/distinfo      Sun Jul 23 10:17:23 2023
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 11:12:06 nia Exp $
+$NetBSD: distinfo,v 1.10 2023/07/23 10:17:23 bsiegert Exp $
 
-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
+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

Index: pkgsrc/print/foomatic-filters-cups/Makefile
diff -u pkgsrc/print/foomatic-filters-cups/Makefile:1.17 pkgsrc/print/foomatic-filters-cups/Makefile:1.18
--- pkgsrc/print/foomatic-filters-cups/Makefile:1.17    Sun Nov 12 16:03:37 2017
+++ pkgsrc/print/foomatic-filters-cups/Makefile Sun Jul 23 10:17:23 2023
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2017/11/12 16:03:37 khorben Exp $
+# $NetBSD: Makefile,v 1.18 2023/07/23 10:17:23 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-Makefile.am
diff -u /dev/null pkgsrc/print/foomatic-filters/patches/patch-Makefile.am:1.1
--- /dev/null   Sun Jul 23 10:17:23 2023
+++ pkgsrc/print/foomatic-filters/patches/patch-Makefile.am     Sun Jul 23 10:17:23 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.am,v 1.1 2023/07/23 10:17:23 bsiegert Exp $
+
+Install config files to EGDIR.
+
+--- Makefile.am.orig   2012-07-02 14:50:46.000000000 +0000
++++ Makefile.am
+@@ -14,7 +14,7 @@ SRC=@srcdir@
+ BINDIR=$(bindir)
+ SBINDIR=$(sbindir)
+ MANDIR=$(mandir)
+-ETCDIR=$(sysconfdir)/foomatic
++ETCDIR=$(prefix)/share/examples/foomatic
+ INSTALL=@INSTALL@
+ 
+ # Paths for CUPS
Index: pkgsrc/print/foomatic-filters/patches/patch-configure.ac
diff -u /dev/null pkgsrc/print/foomatic-filters/patches/patch-configure.ac:1.1
--- /dev/null   Sun Jul 23 10:17:23 2023
+++ pkgsrc/print/foomatic-filters/patches/patch-configure.ac    Sun Jul 23 10:17:23 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.ac,v 1.1 2023/07/23 10:17:23 bsiegert Exp $
+
+Add check for strlcpy and strlcat.
+
+--- configure.ac.orig  2012-07-02 14:50:46.000000000 +0000
++++ configure.ac
+@@ -43,7 +43,7 @@ AC_TYPE_SIGNAL
+ AC_FUNC_STRTOD
+ AC_FUNC_VPRINTF
+ AC_CHECK_FUNCS([dup2 getcwd gethostname regcomp setenv strcasecmp strchr strcspn strdup strncasecmp strndup strrchr strstr strcasestr strtol])
+-
++AC_CHECK_FUNCS([strlcpy strlcat])
+ 
+ ETCSEARCHPATH=${prefix}/etc:/usr/etc:/usr/local/etc
+ LIBSEARCHPATH=${libdir}:/usr/lib:/usr/lib64:/usr/local/lib:${prefix}/libexec:/usr/libexec:/usr/local/libexec
Index: pkgsrc/print/foomatic-filters/patches/patch-process.c
diff -u /dev/null pkgsrc/print/foomatic-filters/patches/patch-process.c:1.1
--- /dev/null   Sun Jul 23 10:17:23 2023
+++ pkgsrc/print/foomatic-filters/patches/patch-process.c       Sun Jul 23 10:17:23 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-process.c,v 1.1 2023/07/23 10:17:23 bsiegert Exp $
+
+signal.h is required to use the kill function.
+
+--- process.c.orig     2012-07-02 14:50:46.000000000 +0000
++++ process.c
+@@ -28,6 +28,7 @@
+ #include <sys/wait.h>
+ #include <errno.h>
+ #include <stdlib.h>
++#include <signal.h>
+ 
+ int kidgeneration = 0;
+ 
Index: pkgsrc/print/foomatic-filters/patches/patch-util.c
diff -u /dev/null pkgsrc/print/foomatic-filters/patches/patch-util.c:1.1
--- /dev/null   Sun Jul 23 10:17:23 2023
+++ pkgsrc/print/foomatic-filters/patches/patch-util.c  Sun Jul 23 10:17:23 2023
@@ -0,0 +1,34 @@
+$NetBSD: patch-util.c,v 1.1 2023/07/23 10:17:23 bsiegert Exp $
+
+Use HAVE_STRLCPY and HAVE_STRLCAT.
+
+--- util.c.orig        2012-07-02 14:50:46.000000000 +0000
++++ util.c
+@@ -163,7 +163,7 @@ strcasestr (const char *haystack, const
+ }
+ #endif
+ 
+-#ifndef __OpenBSD__
++#ifndef HAVE_STRLCPY
+ size_t strlcpy(char *dest, const char *src, size_t size)
+ {
+     char *pdest = dest;
+@@ -182,7 +182,9 @@ size_t strlcpy(char *dest, const char *s
+         while (*psrc++);
+     return (psrc - src -1);
+ }
++#endif /* ! HAVE_STRLCPY */
+ 
++#ifndef HAVE_STRLCAT
+ size_t strlcat(char *dest, const char *src, size_t size)
+ {
+     char *pdest = dest;
+@@ -203,7 +205,7 @@ size_t strlcat(char *dest, const char *s
+ 
+     return len + (psrc - src);
+ }
+-#endif /* ! __OpenBSD__ */
++#endif /* ! HAVE_STRLCAT */
+ 
+ void strrepl(char *str, const char *chars, char repl)
+ {
Index: pkgsrc/print/foomatic-filters/patches/patch-util.h
diff -u /dev/null pkgsrc/print/foomatic-filters/patches/patch-util.h:1.1
--- /dev/null   Sun Jul 23 10:17:23 2023
+++ pkgsrc/print/foomatic-filters/patches/patch-util.h  Sun Jul 23 10:17:23 2023
@@ -0,0 +1,19 @@
+$NetBSD: patch-util.h,v 1.1 2023/07/23 10:17:23 bsiegert Exp $
+
+Use HAVE_STRLCPY and HAVE_STRLCAT.
+
+--- util.h.orig        2012-07-02 14:50:46.000000000 +0000
++++ util.h
+@@ -70,8 +70,12 @@ char * strcasestr (const char *haystack,
+ /* Copy at most size-1 characters from src to dest
+    dest will always be \0 terminated (unless size == 0)
+    returns strlen(src) */
++#ifndef HAVE_STRLCPY
+ size_t strlcpy(char *dest, const char *src, size_t size);
++#endif
++#ifndef HAVE_STRLCAT
+ size_t strlcat(char *dest, const char *src, size_t size);
++#endif
+ 
+ /* Replace all occurences of each of the characters in 'chars' by 'repl' */
+ void strrepl(char *str, const char *chars, char repl);

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index