CVS commit: pkgsrc/print/a2ps

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Apr 13 18:29:47 UTC 2023

Modified Files:
        pkgsrc/print/a2ps: Makefile distinfo
Added Files:
        pkgsrc/print/a2ps/patches: patch-config.h.in patch-lib_free.c

Log Message:
a2ps: update to 4.15.4.

* Noteworthy changes in release 4.15.4 (2023-04-13) [stable]
 * Bug fixes:
   - Fix to read configured paper size correctly with libpaper 1.x.
 * Documentation:
   - Various minor documentation improvements.
 * Build system:
   - Fix tests when building with libpaper 1.x.
   - Require gperf for bootstrapping, and use it correctly in build system.
   - Require a new-enough version of texinfo.


To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 pkgsrc/print/a2ps/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/print/a2ps/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/print/a2ps/patches/patch-config.h.in \
    pkgsrc/print/a2ps/patches/patch-lib_free.c

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.97 pkgsrc/print/a2ps/Makefile:1.98
--- pkgsrc/print/a2ps/Makefile:1.97     Thu Apr 13 14:13:56 2023
+++ pkgsrc/print/a2ps/Makefile  Thu Apr 13 18:29:47 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.97 2023/04/13 14:13:56 wiz Exp $
+# $NetBSD: Makefile,v 1.98 2023/04/13 18:29:47 wiz Exp $
 
-DISTNAME=              a2ps-4.15.3
-PKGREVISION=           2
+DISTNAME=              a2ps-4.15.4
 CATEGORIES=            print
 MASTER_SITES=          ${MASTER_SITE_GNU:=a2ps/}
 
@@ -11,7 +10,6 @@ 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
@@ -21,6 +19,7 @@ GNU_CONFIGURE=                yes
 CONFIGURE_ENV+=                LPR=lpr
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=       ac_cv_prog_EMACS=no
+CONFIGURE_ARGS+=       --disable-dependency-tracking
 CONFIGURE_ENV+=                file_prog=${FILE_CMD:Q}
 
 INFO_FILES=            yes
@@ -35,14 +34,6 @@ 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
 
 pre-build:

Index: pkgsrc/print/a2ps/distinfo
diff -u pkgsrc/print/a2ps/distinfo:1.24 pkgsrc/print/a2ps/distinfo:1.25
--- pkgsrc/print/a2ps/distinfo:1.24     Fri Apr  7 21:25:40 2023
+++ pkgsrc/print/a2ps/distinfo  Thu Apr 13 18:29:47 2023
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.24 2023/04/07 21:25:40 wiz Exp $
+$NetBSD: distinfo,v 1.25 2023/04/13 18:29:47 wiz Exp $
 
-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
+BLAKE2s (a2ps-4.15.4.tar.gz) = 1a0641507c0e1f358daf047bbb889bff298997fa3b46ba3d2e3d35806044921c
+SHA512 (a2ps-4.15.4.tar.gz) = aac3dfed21919682afa688b7315eeea012c5d496aad163b801021ed81d6056362d149745dcf48a99d139909c2ec796ce56bd4e63adb103d746ad89c691ea7779
+Size (a2ps-4.15.4.tar.gz) = 3570970 bytes
+SHA1 (patch-config.h.in) = 3212c121b656f5f77ed713fc1eff93609ea12aaf
+SHA1 (patch-lib_free.c) = 1859b76b268d956e406ad076e821d9335f903685

Added files:

Index: pkgsrc/print/a2ps/patches/patch-config.h.in
diff -u /dev/null pkgsrc/print/a2ps/patches/patch-config.h.in:1.1
--- /dev/null   Thu Apr 13 18:29:47 2023
+++ pkgsrc/print/a2ps/patches/patch-config.h.in Thu Apr 13 18:29:47 2023
@@ -0,0 +1,21 @@
+$NetBSD: patch-config.h.in,v 1.1 2023/04/13 18:29:47 wiz Exp $
+
+malloc/free confusion
+https://savannah.gnu.org/bugs/index.php?64040
+
+--- config.h.in.orig   2023-04-13 14:06:36.000000000 +0000
++++ config.h.in
+@@ -2001,13 +2001,3 @@
+ #endif
+ 
+ 
+-#define malloc GC_malloc
+-#define calloc GC_calloc
+-#define realloc GC_realloc
+-#ifndef free
+-#define free GC_free
+-#endif
+-#define strdup GC_strdup
+-#define strndup GC_strndup
+-#define reallocarray a2ps_reallocarray
+-
Index: pkgsrc/print/a2ps/patches/patch-lib_free.c
diff -u /dev/null pkgsrc/print/a2ps/patches/patch-lib_free.c:1.1
--- /dev/null   Thu Apr 13 18:29:47 2023
+++ pkgsrc/print/a2ps/patches/patch-lib_free.c  Thu Apr 13 18:29:47 2023
@@ -0,0 +1,21 @@
+$NetBSD: patch-lib_free.c,v 1.1 2023/04/13 18:29:47 wiz Exp $
+
+malloc/free confusion
+https://savannah.gnu.org/bugs/index.php?64040
+
+--- lib/free.c.orig    2023-04-12 17:05:08.000000000 +0000
++++ lib/free.c
+@@ -41,11 +41,11 @@ rpl_free (void *p)
+   err[0] = errno;
+   err[1] = errno;
+   errno = 0;
+-  GC_free (p);
++  free (p);
+   errno = err[errno == 0];
+ # else
+   int err = errno;
+-  GC_free (p);
++  free (p);
+   errno = err;
+ # endif
+ }