diff options
| author | joerg <joerg> | 2009-06-14 22:57:58 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2009-06-14 22:57:58 +0000 |
| commit | 586e55a958abfb26982c8f1ee40ef325478a1704 (patch) | |
| tree | 63741286465d08baa5292031d5f6b9ffd847c5b9 /math | |
| parent | 9212099042a94886237378bae31335043b8e0231 (diff) | |
| download | pkgsrc-586e55a958abfb26982c8f1ee40ef325478a1704.tar.gz | |
Remove @dirrm related logic.
Diffstat (limited to 'math')
| -rw-r--r-- | math/R/Makefile.extension | 9 | ||||
| -rwxr-xr-x | math/scilab/files/update_plist | 8 |
2 files changed, 3 insertions, 14 deletions
diff --git a/math/R/Makefile.extension b/math/R/Makefile.extension index 7007e5935a6..2d9743c2786 100644 --- a/math/R/Makefile.extension +++ b/math/R/Makefile.extension @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.extension,v 1.12 2008/10/13 11:08:31 markd Exp $ +# $NetBSD: Makefile.extension,v 1.13 2009/06/14 22:58:04 joerg Exp $ # # This Makefile fragment is included by packages for R library packages. # @@ -31,13 +31,8 @@ R_INST_DIRS?= ${R_PKGNAME} R_HOMEPAGE_BASE= http://cran.r-project.org/web/packages R_PKG_INSTALL_ARGS= -l ${DESTDIR}${PREFIX}/${R_LIB} -R_PACKLIST_FILES_CMD= ( cd ${DESTDIR}${PREFIX}; for dir in ${R_INST_DIRS}; do \ +GENERATE_PLIST+= ( cd ${DESTDIR}${PREFIX}; for dir in ${R_INST_DIRS}; do \ ${FIND} ${R_LIB}/$${dir} \( -type f -o -type l \) -print; done ) | ${SORT} -u -R_PACKLIST_DIRS_CMD= ( cd ${DESTDIR}${PREFIX}; for dir in ${R_INST_DIRS}; do \ - ${FIND} ${R_LIB}/$${dir} -type d -print; done ) | ${SORT} -ur | ${SED} -e "s|^|@dirrm |" -R_GENERATE_PLIST= ${R_PACKLIST_FILES_CMD}; \ - ${R_PACKLIST_DIRS_CMD}; -GENERATE_PLIST+= ${R_GENERATE_PLIST} INSTALL_TEMPLATES+= ../../math/R/files/pkg-index.tmpl DEINSTALL_TEMPLATES+= ../../math/R/files/pkg-index.tmpl diff --git a/math/scilab/files/update_plist b/math/scilab/files/update_plist index 6ad6218ff8a..6f8daab8b30 100755 --- a/math/scilab/files/update_plist +++ b/math/scilab/files/update_plist @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: update_plist,v 1.1 2007/03/23 22:08:56 dmcmahill Exp $ +# $NetBSD: update_plist,v 1.2 2009/06/14 22:58:04 joerg Exp $ # # The scilab install uses tar which preserves times and makes @@ -13,9 +13,3 @@ grep "^bin" PLIST >> plist.new find /usr/pkg/lib/scilab-4.1 -type f -print | sort | sed 's;/usr/pkg/lib/scilab-4.1;lib/${PKGNAME};g' >> plist.new find /usr/pkg/share/doc/scilab-4.1 -type f -print | sort | sed 's;/usr/pkg/share/doc/scilab-4.1;share/doc/${PKGNAME};g' >> plist.new - -find /usr/pkg/lib/scilab-4.1 -type d -print | sort -r | sed 's;/usr/pkg/lib/scilab-4.1;@dirrm lib/${PKGNAME};g' >> plist.new -echo '@dirrm lib/${PKGNAME}' >> plist.new - -find /usr/pkg/share/doc/scilab-4.1 -type d -print | sort -r | sed 's;/usr/pkg/share/doc/scilab-4.1;@dirrm share/doc/${PKGNAME};g' >> plist.new -echo '@dirrm share/doc/${PKGNAME}' >> plist.new |