CVS commit: pkgsrc/print/psutils

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Apr 13 14:22:35 UTC 2023

Modified Files:
        pkgsrc/print/psutils: DESCR Makefile PLIST distinfo

Log Message:
psutils: update to 2.10.

New major version from a new, active upstream.
Now uses libpaper for papersize selection.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/psutils/DESCR
cvs rdiff -u -r1.52 -r1.53 pkgsrc/print/psutils/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/psutils/PLIST
cvs rdiff -u -r1.10 -r1.11 pkgsrc/print/psutils/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/psutils/DESCR
diff -u pkgsrc/print/psutils/DESCR:1.1 pkgsrc/print/psutils/DESCR:1.2
--- pkgsrc/print/psutils/DESCR:1.1      Wed Oct 31 23:28:00 2001
+++ pkgsrc/print/psutils/DESCR  Thu Apr 13 14:22:35 2023
@@ -1,21 +1,5 @@
-psbook            rearranges pages into signatures
-psselect          selects pages and page ranges
-pstops            performs general page rearrangement and selection
-psnup             put multiple pages per physical sheet of paper
-psresize          alter document paper size
-epsffit           fits an EPSF file to a given bounding box
-getafm     (sh)   outputs PostScript to retrieve AFM file from printer
-showchar   (sh)   outputs PostScript to draw a character with metric info
-fixdlsrps  (perl) filter to fix DviLaser/PS output so that PSUtils works
-fixfmps    (perl) filter to fix framemaker documents so that psselect etc. work
-fixmacps   (perl) filter to fix Macintosh documents with saner version of md
-fixpsditps (perl) filter to fix Transcript psdit documents to work with PSUtils
-fixpspps   (perl) filter to fix PSPrint PostScript so that psselect etc. work
-fixscribeps (perl) filter to fix Scribe PostScript so that psselect etc. work
-fixtpps    (perl) filter to fix Troff Tpscript documents
-fixwfwps   (perl) filter to fix Word for Windows documents for PSUtils
-fixwpps    (perl) filter to fix WordPerfect documents for PSUtils
-fixwwps    (perl) filter to fix Windows Write documents for PSUtils
-extractres (perl) filter to extract resources from PostScript files
-includeres (perl) filter to include resources into PostScript files
-psmerge    (perl) hack script to merge multiple PostScript files
+PSUtils is a suite of utilities for manipulating PostScript documents
+produced according to the Document Structuring Conventions. You
+can select and rearrange pages, including arrangement into signatures
+for booklet printing, combine multple pages into a single page for
+n-up printing, and resize, flip and rotate pages.

Index: pkgsrc/print/psutils/Makefile
diff -u pkgsrc/print/psutils/Makefile:1.52 pkgsrc/print/psutils/Makefile:1.53
--- pkgsrc/print/psutils/Makefile:1.52  Tue Jun 28 11:35:31 2022
+++ pkgsrc/print/psutils/Makefile       Thu Apr 13 14:22:35 2023
@@ -1,48 +1,21 @@
-# $NetBSD: Makefile,v 1.52 2022/06/28 11:35:31 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2023/04/13 14:22:35 wiz Exp $
 
-DISTNAME=      psutils-p17
-PKGNAME=       psutils-1.17
-PKGREVISION=   12
+DISTNAME=      psutils-2.10
 CATEGORIES=    print
-MASTER_SITES=  ftp://ftp.knackered.org/pub/psutils/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=rrthomas/}
+GITHUB_RELEASE=        v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://knackered.org/angus/psutils/
+HOMEPAGE=      https://github.com/rrthomas/psutils/
 COMMENT=       Utilities for manipulating PostScript documents
+LICENSE=       gnu-gpl-v3
 
-WRKSRC=                ${WRKDIR}/psutils
-USE_TOOLS+=    perl:run
+DEPENDS+=      p5-IPC-Run3-[0-9]*:../../devel/p5-IPC-Run3
 
-.include "../../mk/bsd.prefs.mk"
-BUILD_DEFS+=   PAPERSIZE
-
-.if !defined(PAPERSIZE)
-PKG_FAIL_REASON+=      "PAPERSIZE must be defined by the pkgsrc user."
-.else
-.  if ${PAPERSIZE} != "A4" && ${PAPERSIZE} != "a4" && ${PAPERSIZE} != "Letter"
-PKG_FAIL_REASON+=      "Invalid PAPERSIZE (${PAPERSIZE}). Choose one of A4 or Letter."
-.  endif
-.endif
-
-MAKE_ENV+=     PERL5=${PERL5:Q}
-MAKE_FLAGS+=   PAPER=`${ECHO} ${PAPERSIZE} | ${TR} '[A-Z]' '[a-z]'`
-MAKE_FLAGS+=   MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-MAKE_FILE=     Makefile.unix
-
-EGDIR=         ${PREFIX}/share/examples/psutils
-CONF_FILES=    ${EGDIR}/psutils.cfg ${PKG_SYSCONFDIR}/psutils.cfg
-
-SUBST_CLASSES+=                psu
-SUBST_STAGE.psu=       pre-configure
-SUBST_MESSAGE.psu=     Adjusting the installation prefix.
-SUBST_FILES.psu=       psutil.c
-SUBST_SED.psu=         -e "s|@prefix@|${PREFIX}|g"
-
-INSTALLATION_DIRS=     ${EGDIR}
-INSTALL_MAKE_FLAGS=    PREFIX=${DESTDIR}${PREFIX}
-
-post-install:
-       low=`${ECHO} ${PAPERSIZE} | ${TR} '[A-Z]' '[a-z]'`              \
-       && ${ECHO} "PAPERSIZE=$$low" > ${DESTDIR}${EGDIR}/psutils.cfg
+GNU_CONFIGURE= yes
+USE_TOOLS+=    perl:run bash:test
+TEST_TARGET=   check
+REPLACE_BASH+= tests/run-test
 
+.include "../../print/libpaper/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/psutils/PLIST
diff -u pkgsrc/print/psutils/PLIST:1.4 pkgsrc/print/psutils/PLIST:1.5
--- pkgsrc/print/psutils/PLIST:1.4      Sun Jun 14 18:11:59 2009
+++ pkgsrc/print/psutils/PLIST  Thu Apr 13 14:22:35 2023
@@ -1,45 +1,21 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:11:59 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2023/04/13 14:22:35 wiz Exp $
 bin/epsffit
 bin/extractres
-bin/fixdlsrps
-bin/fixfmps
-bin/fixmacps
-bin/fixpsditps
-bin/fixpspps
-bin/fixscribeps
-bin/fixtpps
-bin/fixwfwps
-bin/fixwpps
-bin/fixwwps
-bin/getafm
 bin/includeres
 bin/psbook
-bin/psmerge
+bin/psjoin
 bin/psnup
 bin/psresize
 bin/psselect
 bin/pstops
-bin/showchar
 man/man1/epsffit.1
 man/man1/extractres.1
-man/man1/fixdlsrps.1
-man/man1/fixfmps.1
-man/man1/fixmacps.1
-man/man1/fixpsditps.1
-man/man1/fixpspps.1
-man/man1/fixscribeps.1
-man/man1/fixtpps.1
-man/man1/fixwfwps.1
-man/man1/fixwpps.1
-man/man1/fixwwps.1
-man/man1/getafm.1
 man/man1/includeres.1
 man/man1/psbook.1
-man/man1/psmerge.1
+man/man1/psjoin.1
 man/man1/psnup.1
 man/man1/psresize.1
 man/man1/psselect.1
 man/man1/pstops.1
-share/examples/psutils/psutils.cfg
-share/psutils/md68_0.ps
-share/psutils/md71_0.ps
+man/man1/psutils.1
+share/psutils/PSUtils.pm

Index: pkgsrc/print/psutils/distinfo
diff -u pkgsrc/print/psutils/distinfo:1.10 pkgsrc/print/psutils/distinfo:1.11
--- pkgsrc/print/psutils/distinfo:1.10  Tue Oct 26 11:12:14 2021
+++ pkgsrc/print/psutils/distinfo       Thu Apr 13 14:22:35 2023
@@ -1,17 +1,5 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 11:12:14 nia Exp $
+$NetBSD: distinfo,v 1.11 2023/04/13 14:22:35 wiz Exp $
 
-BLAKE2s (psutils-p17.tar.gz) = bb9f3b1ca084bb341054bd60befa8f6971af75d37bb911280e0c05d7ec586a9e
-SHA512 (psutils-p17.tar.gz) = 91feff88c885173ab1c4ba6b5ffd0d9e90bfa6105479b074065584fc2a87e78fbe71e4bc90d2e7079d86b467caf092b6744b0ea4234880ba78cad8dd7820de77
-Size (psutils-p17.tar.gz) = 62039 bytes
-SHA1 (patch-aa) = 90961e898a113c4d4fa64e8d44d40469c76f156d
-SHA1 (patch-ab) = 60f1d0cef0632cccc30735bdf04c2b97a7a2c20f
-SHA1 (patch-ac) = 5dcbb4fbbf883486e41dddbf5c9eca0ed91166c6
-SHA1 (patch-ad) = 9f2ed03ad9fd298692ef19204a9b5092022150c8
-SHA1 (patch-ae) = d6ed0910d6b2b6f43ffe1fa29c35543bb4b9855c
-SHA1 (patch-af) = 4452ec086be0abe895a48b2684f7e4afe65cf25c
-SHA1 (patch-ag) = a07233adb18ffa01999449935fce96983626e7c9
-SHA1 (patch-ah) = c79bfd15e8befdb592facfd8a4f4f7194ad6a3ea
-SHA1 (patch-ai) = 892656673a66e7088dd479d8aac330293541cc1f
-SHA1 (patch-aj) = b40914b40486599fcec8baba362dc8f38a39848f
-SHA1 (patch-ak) = af57aff407916deab9221485b62b9c81f8d7b55b
-SHA1 (patch-am) = 7ee8c9666051ecca81fd09b3c51acb76184ba6cb
+BLAKE2s (psutils-2.10.tar.gz) = a14e8ae39dc5f78003a01b771dc47714b0fbb1414abe90e0444b43b37aee85a6
+SHA512 (psutils-2.10.tar.gz) = 565ff9ce2fd56e7d3bbf62796e4b04261ec6a0f9bb9be741409f7d0d9dcd3c23fcf843ee8364e7e1c8ad6843e66eef34a1a63b06d01301d450cf1fda7d9f6da3
+Size (psutils-2.10.tar.gz) = 1220245 bytes