CVS commit: pkgsrc

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Sat Nov 28 01:20:03 UTC 2020

Modified Files:
        pkgsrc/devel/ltsa: Makefile
        pkgsrc/devel/mantis: Makefile
        pkgsrc/fonts/mplayer-fonts: Makefile
        pkgsrc/graphics/netpbm: Makefile
        pkgsrc/multimedia/mplayer-share: Makefile
        pkgsrc/textproc/xhtml: Makefile

Log Message:
Remove superfluous specification characters from pax invocations

A bunch of packages had an extra "p" specification character passed to
the pax -p option. One is enough. Committed to reduce the human parsing
costs, should someone else need to examine this. (In my case because it
seems recent Linux distros have changed such that some -p arguments can
now cause an error to occur, where previously they were accepted.)


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/ltsa/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/devel/mantis/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/fonts/mplayer-fonts/Makefile
cvs rdiff -u -r1.227 -r1.228 pkgsrc/graphics/netpbm/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/multimedia/mplayer-share/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/xhtml/Makefile

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

Modified files:

Index: pkgsrc/devel/ltsa/Makefile
diff -u pkgsrc/devel/ltsa/Makefile:1.14 pkgsrc/devel/ltsa/Makefile:1.15
--- pkgsrc/devel/ltsa/Makefile:1.14     Wed Aug 16 20:45:35 2017
+++ pkgsrc/devel/ltsa/Makefile  Sat Nov 28 01:20:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/08/16 20:45:35 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2020/11/28 01:20:03 gutteridge Exp $
 #
 
 DISTNAME=      ltsa2.2
@@ -28,11 +28,11 @@ do-build:
 
 do-install:
        ${INSTALL_SCRIPT} ${WRKSRC}/ltsa.sh ${DESTDIR}${PREFIX}/bin/ltsa
-       cd ${WRKSRC}/lib && pax -rwpppm . ${DESTDIR}${PREFIX}/lib/ltsa
+       cd ${WRKSRC}/lib && pax -rwppm . ${DESTDIR}${PREFIX}/lib/ltsa
        ${CHMOD} -R og-w ${DESTDIR}${PREFIX}/lib/ltsa
        ${INSTALL_DATA} ${WRKSRC}/fspv2.pdf ${DESTDIR}${PREFIX}/share/doc/ltsa
        ${INSTALL_DATA} ${WRKSRC}/readme.txt ${DESTDIR}${PREFIX}/share/doc/ltsa
-       cd ${WRKSRC}/Examples && pax -rwpppm . ${DESTDIR}${PREFIX}/share/examples/ltsa
+       cd ${WRKSRC}/Examples && pax -rwppm . ${DESTDIR}${PREFIX}/share/examples/ltsa
        ${CHMOD} -R og-w ${DESTDIR}${PREFIX}/share/examples/ltsa
 
 .include "../../mk/java-vm.mk"

Index: pkgsrc/devel/mantis/Makefile
diff -u pkgsrc/devel/mantis/Makefile:1.54 pkgsrc/devel/mantis/Makefile:1.55
--- pkgsrc/devel/mantis/Makefile:1.54   Sun Jan 26 17:31:00 2020
+++ pkgsrc/devel/mantis/Makefile        Sat Nov 28 01:20:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2020/01/26 17:31:00 rillig Exp $
+# $NetBSD: Makefile,v 1.55 2020/11/28 01:20:03 gutteridge Exp $
 
 DISTNAME=      mantisbt-2.4.1
 PKGNAME=       ${DISTNAME:S/mantisbt/mantis/}
@@ -55,7 +55,7 @@ post-extract:
 
 do-install:
        cd ${WRKSRC}/doc && \
-               pax -rwpppm en-US ${DESTDIR}${PREFIX}/share/doc/mantis
+               pax -rwppm en-US ${DESTDIR}${PREFIX}/share/doc/mantis
 
        ${MV} ${WRKSRC}/config/config_inc.php.sample \
                ${WRKSRC}/config_inc.php
@@ -66,7 +66,7 @@ do-install:
 .endfor
 
        cd ${WRKSRC} && ${FIND} . -name .cvsignore -print | ${XARGS} ${RM} -f
-       cd ${WRKSRC} && pax -rwpppm . ${DESTDIR}${MANTIS_HOME}
+       cd ${WRKSRC} && pax -rwppm . ${DESTDIR}${MANTIS_HOME}
 
        cd ${DESTDIR}${MANTIS_HOME} && \
                ${FIND} . -type f | ${XARGS} ${CHMOD} ${SHAREMODE}

Index: pkgsrc/fonts/mplayer-fonts/Makefile
diff -u pkgsrc/fonts/mplayer-fonts/Makefile:1.11 pkgsrc/fonts/mplayer-fonts/Makefile:1.12
--- pkgsrc/fonts/mplayer-fonts/Makefile:1.11    Sat Nov  2 22:24:42 2019
+++ pkgsrc/fonts/mplayer-fonts/Makefile Sat Nov 28 01:20:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/11/02 22:24:42 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2020/11/28 01:20:03 gutteridge Exp $
 
 DISTNAME=      mplayer-fonts-20030714
 PKGREVISION=   1
@@ -30,7 +30,7 @@ do-install:
        for D in font-arial-cp1250 font-arial-iso-8859-1 \
                font-arial-iso-8859-2 font-arial-iso-8859-7; do \
                (cd ${WRKDIR}/$$D && \
-                       pax -rwpppm * ${DESTDIR}${PREFIX}/share/mplayer/fonts); \
+                       pax -rwppm * ${DESTDIR}${PREFIX}/share/mplayer/fonts); \
        done
        ${LN} -s ${PREFIX}/share/mplayer/fonts/font-arial-18-iso-8859-1 \
                ${DESTDIR}${PREFIX}/share/mplayer/font

Index: pkgsrc/graphics/netpbm/Makefile
diff -u pkgsrc/graphics/netpbm/Makefile:1.227 pkgsrc/graphics/netpbm/Makefile:1.228
--- pkgsrc/graphics/netpbm/Makefile:1.227       Thu Nov  5 09:08:25 2020
+++ pkgsrc/graphics/netpbm/Makefile     Sat Nov 28 01:20:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.227 2020/11/05 09:08:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.228 2020/11/28 01:20:03 gutteridge Exp $
 
 DISTNAME=      netpbm-10.79.04
 PKGREVISION=   6
@@ -118,7 +118,7 @@ post-install:
        ${MKDIR} share &&                                       \
        ${MV} misc share/netpbm &&                              \
        ${CHOWN} -R ${BINOWN}:${BINGRP} . &&                    \
-       pax -rwpppm . ${DESTDIR}${PREFIX}
+       pax -rwppm . ${DESTDIR}${PREFIX}
        ${RM} -fr ${STAGEDIR}
        ${INSTALL_DATA} ${WRKDIR}/netpbm-userguide/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
        ${INSTALL_DATA} ${WRKDIR}/netpbm-userguide/*.3 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3

Index: pkgsrc/multimedia/mplayer-share/Makefile
diff -u pkgsrc/multimedia/mplayer-share/Makefile:1.72 pkgsrc/multimedia/mplayer-share/Makefile:1.73
--- pkgsrc/multimedia/mplayer-share/Makefile:1.72       Tue Aug 18 17:58:10 2020
+++ pkgsrc/multimedia/mplayer-share/Makefile    Sat Nov 28 01:20:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2020/08/18 17:58:10 leot Exp $
+# $NetBSD: Makefile,v 1.73 2020/11/28 01:20:03 gutteridge Exp $
 
 .include "Makefile.common"
 
@@ -20,7 +20,7 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/etc/codecs.conf ${DESTDIR}${PREFIX}/share/mplayer
        ${INSTALL_DATA} ${WRKSRC}/etc/input.conf ${DESTDIR}${PREFIX}/share/mplayer
        (set -e; cd ${WRKSRC}/DOCS && \
-               pax -rwpppm * ${DESTDIR}${PREFIX}/share/mplayer/DOCS); \
+               pax -rwppm * ${DESTDIR}${PREFIX}/share/mplayer/DOCS); \
        ${FIND} ${DESTDIR}${PREFIX}/share/mplayer/DOCS -type d -print | \
                ${XARGS} ${CHMOD} ${PKGDIRMODE}
        ${FIND} ${DESTDIR}${PREFIX}/share/mplayer/DOCS -type f -print | \

Index: pkgsrc/textproc/xhtml/Makefile
diff -u pkgsrc/textproc/xhtml/Makefile:1.11 pkgsrc/textproc/xhtml/Makefile:1.12
--- pkgsrc/textproc/xhtml/Makefile:1.11 Sun Jan 26 17:32:18 2020
+++ pkgsrc/textproc/xhtml/Makefile      Sat Nov 28 01:20:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/01/26 17:32:18 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2020/11/28 01:20:03 gutteridge Exp $
 #
 
 DISTNAME=      xhtml1
@@ -23,7 +23,7 @@ XML_CATALOGS= ${PREFIX}/share/xml/xhtml/
 INSTALLATION_DIRS=     share/xml/xhtml/1.0
 
 do-install:
-       cd ${WRKSRC}/DTD && pax -rwpppm . ${DESTDIR}${PREFIX}/share/xml/xhtml/1.0
+       cd ${WRKSRC}/DTD && pax -rwppm . ${DESTDIR}${PREFIX}/share/xml/xhtml/1.0
        ${INSTALL_DATA} ${FILESDIR}/catalog10 \
            ${DESTDIR}${PREFIX}/share/xml/xhtml/1.0/catalog