CVS commit: pkgsrc/print/foomatic4-db-engine

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Sat Jul 21 16:07:22 UTC 2018

Modified Files:
        pkgsrc/print/foomatic4-db-engine: Makefile distinfo

Log Message:
foomatic4-db-engine: Update to 4.0.13

pkgsrc changes:
 - Try to address several pkglint warnings
 - Also pass CUPS_PPDS via CONFIGURE_ENV
 - Depends on curl via DEPENDS: just bin/curl is needed not libcurl

Changes:
4.0.13
------
 * Makefile.in: Add support for LDFLAGS variable (bug 1422).
 * configure.ac: Allow user-configurable PERLPREFIX via environment
   variable (Bug 1294).


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/print/foomatic4-db-engine/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/foomatic4-db-engine/distinfo

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

Modified files:

Index: pkgsrc/print/foomatic4-db-engine/Makefile
diff -u pkgsrc/print/foomatic4-db-engine/Makefile:1.29 pkgsrc/print/foomatic4-db-engine/Makefile:1.30
--- pkgsrc/print/foomatic4-db-engine/Makefile:1.29      Fri Jul 20 19:14:00 2018
+++ pkgsrc/print/foomatic4-db-engine/Makefile   Sat Jul 21 16:07:22 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2018/07/20 19:14:00 leot Exp $
+# $NetBSD: Makefile,v 1.30 2018/07/21 16:07:22 leot Exp $
 #
 
-DISTNAME=      foomatic-db-engine-4.0.12
-PKGREVISION=   9
+DISTNAME=      foomatic-db-engine-4.0.13
 CATEGORIES=    print
 MASTER_SITES=  http://www.openprinting.org/download/foomatic/
 
@@ -11,19 +10,27 @@ HOMEPAGE=   http://www.linuxfoundation.org
 COMMENT=       Foomatic's database engine
 LICENSE=       gnu-gpl-v2
 
+# XXX wget should work too
+DEPENDS+=      curl-[0-9]*:../../www/curl
+
 GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
+USE_TOOLS+=    file perl gmake
+
+BUILD_DEFS+=   PKG_SYSCONFBASE
+
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASE}
+
 CONFIGURE_ENV+=        PRINTF=/usr/bin/printf
-CONFIGURE_ENV+=        LIBDIR=${LOCALBASE}/share/foomatic
-CONFIGURE_ENV+=        FOOMATIC_RIP=${LOCALBASE}/bin/foomatic-rip
-CONFIGURE_ENV+=        LOCALBASE=${LOCALBASE}
+CONFIGURE_ENV+=        LIBDIR=${PREFIX}/share/foomatic
+CONFIGURE_ENV+=        FOOMATIC_RIP=${PREFIX}/bin/foomatic-rip
+CONFIGURE_ENV+=        LOCALBASE=${PREFIX}
+CONFIGURE_ENV+=        CUPS_PPDS=${PREFIX}/share/cups/model
 CONFIGURE_ENV+=        CUPS_ETC=${PKG_SYSCONFBASE}/cups
 CONFIGURE_ENV+=        PERL_INSTALLDIRS=vendor
-USE_TOOLS+=    file perl gmake
-PERL5_PACKLIST=        auto/Foomatic/.packlist
 
 PERL5_CONFIGURE=       no
 PERL5_CONFIGURE_DIRS=  lib
+PERL5_PACKLIST=                auto/Foomatic/.packlist
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -31,19 +38,17 @@ PERL5_CONFIGURE_DIRS=       lib
 TOOLS_PLATFORM.file=   # doesn't support -
 .endif
 
+SUBST_CLASSES+=                fixpath
+SUBST_STAGE.fixpath=   post-build
+SUBST_FILES.fixpath=   lib/Foomatic/Defaults.pm
+SUBST_SED.fixpath=     -e "s,${TOOLS_DIR}/bin/curl,${BUILDLINK_PREFIX.curl}/bin/curl,g"
+
 # XXX generated but needs to be present before perl5-configure
 post-extract:
        ${TOUCH} ${WRKSRC}/lib/Foomatic/Defaults.pm
 
 post-configure: perl5-configure
 
-SUBST_CLASSES+=                fixpath
-SUBST_STAGE.fixpath=   post-build
-SUBST_FILES.fixpath=   lib/Foomatic/Defaults.pm
-SUBST_SED.fixpath=     -e "s,${TOOLS_DIR}/bin/curl,${BUILDLINK_PREFIX.curl}/bin/curl,g"
-
 .include "../../lang/perl5/module.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-# XXX wget should work too
-.include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/foomatic4-db-engine/distinfo
diff -u pkgsrc/print/foomatic4-db-engine/distinfo:1.8 pkgsrc/print/foomatic4-db-engine/distinfo:1.9
--- pkgsrc/print/foomatic4-db-engine/distinfo:1.8       Fri Jul 20 19:14:00 2018
+++ pkgsrc/print/foomatic4-db-engine/distinfo   Sat Jul 21 16:07:22 2018
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2018/07/20 19:14:00 leot Exp $
+$NetBSD: distinfo,v 1.9 2018/07/21 16:07:22 leot Exp $
 
-SHA1 (foomatic-db-engine-4.0.12.tar.gz) = c3b747113b6a64b998000774e7c2d03ce48654c1
-RMD160 (foomatic-db-engine-4.0.12.tar.gz) = 163ad52e616928aa723cb3d263f1686e6a187500
-SHA512 (foomatic-db-engine-4.0.12.tar.gz) = b7e99ace6a632e9b0213183bd2c6c2d11ca072ea0414e8ca569082b7ec183dd81c80594ad63fdee82d761ae36d4fce9d3c881569a95a6085ec326ef7fd21154f
-Size (foomatic-db-engine-4.0.12.tar.gz) = 360499 bytes
+SHA1 (foomatic-db-engine-4.0.13.tar.gz) = 68d6addec5ac5ba4235b5da991351eab5c754df5
+RMD160 (foomatic-db-engine-4.0.13.tar.gz) = 77b92e8849bfe09d46ab66900aaad3dae61060bd
+SHA512 (foomatic-db-engine-4.0.13.tar.gz) = da6a0dd9c0d7935d59a4bdd5454c1b7dcb81508f17a98ebfb9fd50fb6b5ed593f4b226715030f22c082c5328c7f7e99d775eeadcb444db5c8ad1441a11a179bf
+Size (foomatic-db-engine-4.0.13.tar.gz) = 360631 bytes
 SHA1 (patch-aa) = 3f81a888afc0f0ee6c913f09f2ea896058f015dd
 SHA1 (patch-foomatic-combo-xml.c) = 63693ff90b03ab8f460b0dd83ece4d2e5bdabaf1
 SHA1 (patch-makeMan.in) = 1beb5dbd5e288660a374e035e52b51fb80b9cc61