Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 12 Nov 2014 20:11:15 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r372501 - in head/math: octave octave-forge-base
Message-ID:  <201411122011.sACKBFFs069943@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Wed Nov 12 20:11:15 2014
New Revision: 372501
URL: https://svnweb.freebsd.org/changeset/ports/372501
QAT: https://qat.redports.org/buildarchive/r372501/

Log:
  Cleanup plist

Modified:
  head/math/octave-forge-base/pkg-plist
  head/math/octave/Makefile
  head/math/octave/pkg-plist

Modified: head/math/octave-forge-base/pkg-plist
==============================================================================
--- head/math/octave-forge-base/pkg-plist	Wed Nov 12 18:48:53 2014	(r372500)
+++ head/math/octave-forge-base/pkg-plist	Wed Nov 12 20:11:15 2014	(r372501)
@@ -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

Modified: head/math/octave/Makefile
==============================================================================
--- head/math/octave/Makefile	Wed Nov 12 18:48:53 2014	(r372500)
+++ head/math/octave/Makefile	Wed Nov 12 20:11:15 2014	(r372501)
@@ -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

Modified: head/math/octave/pkg-plist
==============================================================================
--- head/math/octave/pkg-plist	Wed Nov 12 18:48:53 2014	(r372500)
+++ head/math/octave/pkg-plist	Wed Nov 12 20:11:15 2014	(r372501)
@@ -16,6 +16,4 @@ share/applications/www.octave.org-octave
 %%PORTDOCS%%%%DOCSDIR%%/refcard-legal.ps
 %%PORTDOCS%%%%DOCSDIR%%/refcard-letter.ps
 %%PORTDOCS%%%%DOCSDIR%%/octave.ps
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @comment Insert PLIST here
-@dirrm lib/octave



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411122011.sACKBFFs069943>