Revert last commit. It is not possible (yet) to have the dirrmtry usage

in the post-install target.  Its usage must preceed generate-plist.

This problem needs to be revisited either in a rework of bsd.port.mk or
each of these Makefiles.

Hat:		portmgr
Pointy hat:	edwin`
This commit is contained in:
Mark Linimon 2006-01-23 07:04:10 +00:00
parent 78a96568b8
commit f6159fbf7a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=154215
12 changed files with 15 additions and 16 deletions

View file

@ -50,7 +50,7 @@ pre-install:
post-install:
dir=`php-config --extension-dir | ${SED} 's,^${LOCALBASE}/,,'`; \
${ECHO_CMD} "$$dir/sql_relay.so" >> ${TMPPLIST}; \
${ECHO_CMD} "@dirrmtry $$dir" >> ${TMPPLIST}
${ECHO_CMD} "@unexec rmdir %D/$$dir 2>/dev/null || true" >> ${TMPPLIST}
@${MKDIR} ${PREFIX}/etc/php
@${ECHO_CMD} extension=sql_relay.so \
>> ${PREFIX}/etc/php/extensions.ini
@ -64,7 +64,7 @@ post-install:
>> ${TMPPLIST}
@${ECHO_CMD} "@unexec [ -s %D/etc/php/extensions.ini ] || rm %D/etc/php/extensions.ini" \
>> ${TMPPLIST}
@${ECHO_CMD} "@dirrmtry etc/php" \
@${ECHO_CMD} "@unexec rmdir %D/etc/php 2> /dev/null || true" \
>> ${TMPPLIST}
.include <bsd.port.post.mk>

View file

@ -44,6 +44,6 @@ post-install:
${TAR} ztf ${WRKSRC}/doc/postgres.tar.gz | ${GREP} /$$ | \
${SED} "s,^,@dirrm\ ," >> ${TMPPLIST} ;\
${ECHO} @dirrm ${DOCSDIR:S,^${PREFIX}/,,}/html >> ${TMPPLIST} ;\
${ECHO} "@dirrmtry ${DOCSDIR:S,^${PREFIX}/,,}" >> ${TMPPLIST}
${ECHO} "@unexec rmdir %D/${DOCSDIR:S,^${PREFIX}/,,} 2> /dev/null || true" >> ${TMPPLIST}
.include "${MASTERDIR}/Makefile"

View file

@ -81,8 +81,7 @@ do-install:
post-install:
.if defined(PACKAGE_BUILDING)
${ECHO_CMD} "@dirrmtry ${CGIDIR}" >> ${TMPPLIST}
${ECHO_CMD} "@dirrmtry ${ICONSDIR}" >> ${TMPPLIST}
${ECHO_CMD} "@unexec rmdir %D/${CGIDIR} %D/${ICONSDIR} 2>/dev/null || true" >> ${TMPPLIST}
.endif
@${CAT} ${PKGMESSAGE}

View file

@ -120,9 +120,7 @@ do-install:
post-install:
.if defined(PACKAGE_BUILDING)
${ECHO_CMD} "@dirrmtry ${CGIDIR}" >> ${TMPPLIST}
${ECHO_CMD} "@dirrmtry ${ICONSDIR}" >> ${TMPPLIST}
${ECHO_CMD} "@dirrmtry ${CSSDIR}" >> ${TMPPLIST}
${ECHO_CMD} "@unexec rmdir -p %D/${CGIDIR} %D/${ICONSDIR} %D/${CSSDIR} 2>/dev/null || true" >> ${TMPPLIST}
.endif
@${CAT} ${PKGMESSAGE}

View file

@ -28,6 +28,6 @@ post-install:
${SED} -e 's,^${PREFIX}/,,' >> ${TMPPLIST}
@${FIND} ${PYTHON_SITELIBDIR}/logilab/pyreverse -type d | ${SORT} -r | \
${SED} -e 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
@${ECHO_CMD} "@dirrmtry %%PYTHSON_SITELIBDIR%%/logilab" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec rmdir %D/%%PYTHSON_SITELIBDIR%%/logilab 2>/dev/null || true" >> ${TMPPLIST}
.include <bsd.port.mk>

View file

@ -43,6 +43,6 @@ post-install:
@${FIND} ${dir} -type d | ${SORT} -r | \
${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
.endfor
@${ECHO_CMD} '@dirrmtry lib/security' >> ${TMPPLIST}
@${ECHO_CMD} '@unexec rmdir %D/lib/security 2>/dev/null || true' >> ${TMPPLIST}
.include <bsd.port.post.mk>

View file

@ -134,7 +134,7 @@ post-install:
${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
| ${SORT} -r | ${SED} -e 's/^/@dirrm /g' \
>>${WRKDIR}/PLIST.gcc-lib
(${ECHO_CMD} "@dirrmtry lib/gcc-lib/${CONFIGURE_TARGET}" ; ${ECHO_CMD} "@dirrmtry lib/gcc-lib") >> ${WRKDIR}/PLIST.gcc-lib
(${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib 2>&1 || true") >> ${WRKDIR}/PLIST.gcc-lib
${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script
${ECHO_CMD} "/Insert PLIST.gcc-lib" >> ${WRKDIR}/ex.script
${ECHO_CMD} "d" >> ${WRKDIR}/ex.script

View file

@ -135,7 +135,7 @@ post-install:
${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
| ${SORT} -r | ${SED} -e 's/^/@dirrm /g' \
>>${WRKDIR}/PLIST.gcc-lib
(${ECHO_CMD} "@dirrmtry lib/gcc-lib/${CONFIGURE_TARGET}" ; ${ECHO_CMD} "@dirrmtry lib/gcc-lib") >> ${WRKDIR}/PLIST.gcc-lib
(${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib 2>&1 || true") >> ${WRKDIR}/PLIST.gcc-lib
${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script
${ECHO_CMD} "/Insert PLIST.gcc-lib" >> ${WRKDIR}/ex.script
${ECHO_CMD} "d" >> ${WRKDIR}/ex.script

View file

@ -22,7 +22,7 @@ MAN1= bbmail.1
PLIST_FILES= bin/bbmail share/bbtools/bbmail.bb
post-install:
@${ECHO_CMD} "@dirrmtry share/bbtools" \
@${ECHO_CMD} "@unexec rmdir %D/share/bbtools 2>/dev/null || true" \
>> ${TMPPLIST}
.include <bsd.port.mk>

View file

@ -38,6 +38,7 @@ do-install:
.endfor
post-install:
@${ECHO_CMD} "@dirrmtry share/bbtools" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec rmdir %D/share/bbtools 2>/dev/null || true" \
>> ${TMPPLIST}
.include <bsd.port.mk>

View file

@ -56,7 +56,7 @@ post-install:
-or -name upgrade.php ')' | ${SED} -e \
's,^${PREFIX}/\(.*\),@unexec rm -f %D/\1 >/dev/null 2>\&1 || true,' >> ${TMPPLIST}
@${FIND} ${PREFIX}/${XARAYADIR} -type d -and -path "*var*" | \
${SED} -e 's,^${PREFIX}/\(.*\),@dirrmtry \1,' | \
${SED} -e 's,^${PREFIX}/\(.*\),@unexec rmdir %D/\1 >/dev/null 2>\&1 || true,' | \
${SORT} -r >> ${TMPPLIST}
@${FIND} ${PREFIX}/${XARAYADIR} -type d -and ! -path "*var*" | \
${SED} -e 's,^${PREFIX}/,@dirrm ,' | \

View file

@ -22,6 +22,7 @@ PLIST_FILES= bin/bbdate share/bbtools/README.bbdate \
share/bbtools/bbdate.style share/bbtools/bbtoolsrc.in
post-install:
@${ECHO_CMD} "@dirrmtry share/bbtools" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec rmdir %D/share/bbtools 2>/dev/null || true" \
>> ${TMPPLIST}
.include <bsd.port.mk>