CVS commit: pkgsrc/print/a2ps

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

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.95 -r1.96 pkgsrc/print/a2ps/Makefile

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.95 pkgsrc/print/a2ps/Makefile:1.96
--- pkgsrc/print/a2ps/Makefile:1.95     Fri Apr  7 21:25:40 2023
+++ pkgsrc/print/a2ps/Makefile  Sat Apr  8 23:18:51 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.95 2023/04/07 21:25:40 wiz Exp $
+# $NetBSD: Makefile,v 1.96 2023/04/08 23:18:51 wiz Exp $
 
 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}${PKG_SYSCONFBASE} && ${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"