summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Brodin <antoine@FreeBSD.org>2014-11-12 20:11:15 +0000
committerAntoine Brodin <antoine@FreeBSD.org>2014-11-12 20:11:15 +0000
commitfaad978beffdab9b45854b8438b0b324e6c6ae81 (patch)
tree0fcccb9a24694698a1fa3d575a9b5e70155807b7
parentCleanup plist (diff)
Cleanup plist
Notes
Notes: svn path=/head/; revision=372501
-rw-r--r--math/octave-forge-base/pkg-plist3
-rw-r--r--math/octave/Makefile14
-rw-r--r--math/octave/pkg-plist2
3 files changed, 5 insertions, 14 deletions
diff --git a/math/octave-forge-base/pkg-plist b/math/octave-forge-base/pkg-plist
index b0eeff843287..2b999acfddb8 100644
--- a/math/octave-forge-base/pkg-plist
+++ b/math/octave-forge-base/pkg-plist
@@ -1,5 +1,4 @@
@unexec %D/libexec/octave/load-octave-pkg || true
libexec/octave/load-octave-pkg
-@exec mkdir -p %D/share/octave/tarballs
@exec %D/libexec/octave/load-octave-pkg
-@dirrmtry share/octave/tarballs
+@dir share/octave/tarballs
diff --git a/math/octave/Makefile b/math/octave/Makefile
index fe0d93d1734b..2828452fba51 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -112,20 +112,14 @@ post-install:
@${FIND} -s ${STAGEDIR}$d -not -type d -not -name '*.la' | \
${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${WRKDIR}/PLIST
@${FIND} -s ${STAGEDIR}$d -type d -empty | \
- ${SED} -e 's,^${STAGEDIR}${PREFIX}/,@exec ${MKDIR} %D/,' \
- -e 's,$$, 2>/dev/null || true,' >> ${WRKDIR}/PLIST
- @${FIND} -s ${STAGEDIR}$d -type d -depth | \
- ${SED} -e 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${WRKDIR}/PLIST
+ ${SED} -e 's,^${STAGEDIR}${PREFIX}/,@dir ,' \
+ >> ${WRKDIR}/PLIST
.endfor
.for d in ${PREFIX}/libexec/octave/api-v49+ ${PREFIX}/libexec/octave/site ${PREFIX}/lib/octave/site
@${FIND} -s ${STAGEDIR}$d -type d -empty | \
- ${SED} -e 's,^${STAGEDIR}${PREFIX}/,@exec ${MKDIR} %D/,' \
- -e 's,$$, 2>/dev/null || true,' >> ${WRKDIR}/PLIST
- @${FIND} -s ${STAGEDIR}$d -type d -depth | \
- ${SED} -e 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${WRKDIR}/PLIST
+ ${SED} -e 's,^${STAGEDIR}${PREFIX}/,@dir ,' \
+ >> ${WRKDIR}/PLIST
.endfor
- ${ECHO_CMD} @dirrm libexec/octave >> ${WRKDIR}/PLIST
- ${ECHO_CMD} @dirrm share/octave >> ${WRKDIR}/PLIST
cd ${WRKDIR} ; ${SED} -i.bak -e "/PLIST/ r PLIST" ${TMPPLIST}
check regression-test: build
diff --git a/math/octave/pkg-plist b/math/octave/pkg-plist
index 43f6d4fd96e1..e03917ab16b1 100644
--- a/math/octave/pkg-plist
+++ b/math/octave/pkg-plist
@@ -16,6 +16,4 @@ share/applications/www.octave.org-octave.desktop
%%PORTDOCS%%%%DOCSDIR%%/refcard-legal.ps
%%PORTDOCS%%%%DOCSDIR%%/refcard-letter.ps
%%PORTDOCS%%%%DOCSDIR%%/octave.ps
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
@comment Insert PLIST here
-@dirrm lib/octave