CVS commit: [pkgsrc-2023Q1] pkgsrc/print/a2ps

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Wed Apr 12 17:35:12 UTC 2023

Modified Files:
        pkgsrc/print/a2ps [pkgsrc-2023Q1]: Makefile distinfo

Log Message:
Pullup ticket #6752 - requested by wiz
print/a2ps: restore functionality

Revisions pulled up:
- print/a2ps/Makefile                                           1.93-1.96
- print/a2ps/distinfo                                           1.23-1.24

---
   Module Name: pkgsrc
   Committed By:        wiz
   Date:                Wed Mar 29 08:20:03 UTC 2023

   Modified Files:
        pkgsrc/print/a2ps: Makefile distinfo

   Log Message:
   a2ps: update to 4.15.2.

   * Noteworthy changes in release 4.15.2 (2023-03-19) [stable]
    * Bug fixes:
      - Fix old crash when using --stdin="".
    * Build
      - Make configure stop if libpaper is not found.
      - Enable building the manual for gnu.org.

---
   Module Name: pkgsrc
   Committed By:        mrg
   Date:                Thu Mar 30 05:34:10 UTC 2023

   Modified Files:
        pkgsrc/print/a2ps: Makefile

   Log Message:
   use ${PKG_SYSCONFBASE} instead of ${PREFIX}/etc

---
   Module Name: pkgsrc
   Committed By:        wiz
   Date:                Fri Apr  7 21:25:40 UTC 2023

   Modified Files:
        pkgsrc/print/a2ps: Makefile distinfo

   Log Message:
   a2ps: update to 4.15.3.

   * Noteworthy changes in release 4.15.3 (2023-03-26) [stable]
    * Bug fixes:
      - Fix fixps to use GhostScript’s ps2write device instead of defunct
        pswrite.
    * Build:
      - Fix a problem building PDF version of manual.

---
   Module Name: pkgsrc
   Committed By:        wiz
   Date:                Sat Apr  8 23:18:51 UTC 2023

   Modified Files:
        pkgsrc/print/a2ps: Makefile

   Log Message:
   a2ps: depend on misc/getopt for a2ps-lpr-wrapper

   From John D. Baker.

   Fix some pkglint while here and bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.92.2.1 pkgsrc/print/a2ps/Makefile
cvs rdiff -u -r1.22 -r1.22.2.1 pkgsrc/print/a2ps/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/a2ps/Makefile
diff -u pkgsrc/print/a2ps/Makefile:1.92 pkgsrc/print/a2ps/Makefile:1.92.2.1
--- pkgsrc/print/a2ps/Makefile:1.92     Sun Mar 19 07:02:06 2023
+++ pkgsrc/print/a2ps/Makefile  Wed Apr 12 17:35:12 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.92 2023/03/19 07:02:06 wiz Exp $
+# $NetBSD: Makefile,v 1.92.2.1 2023/04/12 17:35:12 bsiegert Exp $
 
-DISTNAME=              a2ps-4.15.1
+DISTNAME=              a2ps-4.15.3
+PKGREVISION=           1
 CATEGORIES=            print
 MASTER_SITES=          ${MASTER_SITE_GNU:=a2ps/}
 
@@ -10,6 +11,7 @@ COMMENT=              Formats an ascii file for prin
 LICENSE=               gnu-gpl-v3
 
 DEPENDS+=              psutils>=1.17:../../print/psutils
+DEPENDS+=              getopt-[0-9]*:../../misc/getopt
 
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
@@ -33,6 +35,12 @@ REPLACE_SH+=         contrib/[a-z]*.in
 
 INSTALLATION_DIRS=     share/examples/a2ps
 
+# use ${PREFIX}/bin/getopt rather than unadorned 'getopt'
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_FILES.paths=     src/a2ps-lpr-wrapper
+SUBST_SED.paths=       -e 's,\(getopt\),${PREFIX}/bin/\1,'
+
 # 3 test failures as of 4.15
 # https://savannah.gnu.org/bugs/index.php?63919
 TEST_TARGET=           check
@@ -42,7 +50,7 @@ pre-build:
        ${TOUCH} ${WRKSRC}/doc/*.dvi
 
 post-install:
-       cd ${DESTDIR}${PREFIX}/etc && ${MV} a2ps-site.cfg a2ps.cfg ${DESTDIR}${PREFIX}/share/examples/a2ps
+       cd ${DESTDIR}${PKG_SYSCONFDIR} && ${MV} a2ps-site.cfg a2ps.cfg ${DESTDIR}${PREFIX}/share/examples/a2ps
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/boehm-gc/buildlink3.mk"

Index: pkgsrc/print/a2ps/distinfo
diff -u pkgsrc/print/a2ps/distinfo:1.22 pkgsrc/print/a2ps/distinfo:1.22.2.1
--- pkgsrc/print/a2ps/distinfo:1.22     Sun Mar 19 07:02:06 2023
+++ pkgsrc/print/a2ps/distinfo  Wed Apr 12 17:35:12 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.22 2023/03/19 07:02:06 wiz Exp $
+$NetBSD: distinfo,v 1.22.2.1 2023/04/12 17:35:12 bsiegert Exp $
 
-BLAKE2s (a2ps-4.15.1.tar.gz) = d474b01a8529f494c97244fe8f39a18f498ca1d0956412d118780bba7d23d4e7
-SHA512 (a2ps-4.15.1.tar.gz) = ed58bd03b9390f44b03ae2458bb94655ef0597f11aa89a2d778b14f03fba4d0e0272795d2f968ae304be46d7b862a2f0ce1dc82328d71a02b0293b23ec8b6fa5
-Size (a2ps-4.15.1.tar.gz) = 3598826 bytes
+BLAKE2s (a2ps-4.15.3.tar.gz) = af7f4c49669fab371fc02849e4b5b2b36128d66e70bd36b0cca21863fce1d888
+SHA512 (a2ps-4.15.3.tar.gz) = 41f0590c5f794af767b57bfe2eeea105b73232ea9a9fcf87380d93cb4ccaaf652c69990bcb06d1da5f398f4c7d0ab6d23d9c3f5b6a85c37f36e72dc03e7ddc2a
+Size (a2ps-4.15.3.tar.gz) = 3601424 bytes