CVS commit: pkgsrc/math/djbsort

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Jul 31 06:24:57 UTC 2018

Modified Files:
        pkgsrc/math/djbsort: DEINSTALL Makefile
Removed Files:
        pkgsrc/math/djbsort: PLIST

Log Message:
Compiler options are also baked into paths, so switch to dynamic PLIST.
Install with pax, not cp. On deinstall, remove whatever's left in
share/djbsort.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/djbsort/DEINSTALL
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/djbsort/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/math/djbsort/PLIST

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

Modified files:

Index: pkgsrc/math/djbsort/DEINSTALL
diff -u pkgsrc/math/djbsort/DEINSTALL:1.1 pkgsrc/math/djbsort/DEINSTALL:1.2
--- pkgsrc/math/djbsort/DEINSTALL:1.1   Tue Jul 31 05:38:56 2018
+++ pkgsrc/math/djbsort/DEINSTALL       Tue Jul 31 06:24:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.1 2018/07/31 05:38:56 schmonz Exp $
+# $NetBSD: DEINSTALL,v 1.2 2018/07/31 06:24:57 schmonz Exp $
 
 SHAREDIR="@SHAREDIR@"
 
@@ -10,4 +10,8 @@ DEINSTALL)
                ${RM} -f ${PREFIX}/${i}
        done
        ;;
+
+POST-DEINSTALL)
+       ${RM} -rf ${PREFIX}/${SHAREDIR}
+       ;;
 esac

Index: pkgsrc/math/djbsort/Makefile
diff -u pkgsrc/math/djbsort/Makefile:1.2 pkgsrc/math/djbsort/Makefile:1.3
--- pkgsrc/math/djbsort/Makefile:1.2    Tue Jul 31 05:38:56 2018
+++ pkgsrc/math/djbsort/Makefile        Tue Jul 31 06:24:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/07/31 05:38:56 schmonz Exp $
+# $NetBSD: Makefile,v 1.3 2018/07/31 06:24:57 schmonz Exp $
 
 DISTNAME=              djbsort-20180717
 PKGREVISION=           1
@@ -12,6 +12,8 @@ LICENSE=              public-domain
 
 DEPENDS+=              python27-[0-9]*:../../lang/python27
 
+USE_TOOLS+=            pax
+
 REPLACE_INTERPRETER+=  python27
 REPLACE.python27.old=  .*python2\{0,1\}[^ ]*
 REPLACE.python27.new=  ${LOCALBASE}/bin/python2.7
@@ -31,7 +33,9 @@ FILES_SUBST+=         INSTALL_DATA=${INSTALL_DA
 FILES_SUBST+=          PSEUDO_PLIST=${PSEUDO_PLIST:Q}
 FILES_SUBST+=          SHAREDIR=${SHAREDIR:Q}
 
-INSTALLATION_DIRS=     include lib share
+INSTALLATION_DIRS=     include lib ${SHAREDIR}
+
+PLIST_SRC=             ${WRKDIR}/PLIST_DYNAMIC
 
 pre-configure:
        cd ${WRKSRC} && rm -f *.orig
@@ -39,9 +43,12 @@ pre-configure:
 do-build:
        cd ${WRKSRC} && ./build
 
+pre-install:
+       ${CP} pseudo-PLIST ${WRKSRC}
+       cd ${WRKSRC} && ${FIND} . -type f | ${SORT} | ${SED} -e 's|^\.|${SHAREDIR}|g' > ${WRKDIR}/PLIST_DYNAMIC
+
 do-install:
-       cp pseudo-PLIST ${WRKSRC}
-       cp -Rp ${WRKSRC} ${DESTDIR}${PREFIX}/${SHAREDIR}
+       cd ${WRKSRC} && pax -rw -pe -v . ${DESTDIR}${PREFIX}/${SHAREDIR}
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"