diff options
| author | mm <mm@FreeBSD.org> | 2011-07-08 00:50:46 +0800 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2011-07-08 00:50:46 +0800 |
| commit | 1fcf970875915ea602ace380f42d9e59fcdd76ba (patch) | |
| tree | 29d3979465c14f21d4fa9c2956ac3fdf1b1cba35 /devel | |
| parent | a8f417cc2caeb36b2373d1b7840779a144e052ec (diff) | |
| download | freebsd-ports-graphics-1fcf970875915ea602ace380f42d9e59fcdd76ba.tar.gz freebsd-ports-graphics-1fcf970875915ea602ace380f42d9e59fcdd76ba.tar.zst freebsd-ports-graphics-1fcf970875915ea602ace380f42d9e59fcdd76ba.zip | |
For PEAR_AUTOINSTALL move do-autogenerate-plist to the pre-install stage
This way TMPPLIST gets correctly generated
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/pear/bsd.pear.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/devel/pear/bsd.pear.mk b/devel/pear/bsd.pear.mk index a2c4b41d901..f07b90e6f24 100644 --- a/devel/pear/bsd.pear.mk +++ b/devel/pear/bsd.pear.mk @@ -185,19 +185,19 @@ do-autogenerate-plist: echo "Package files outside PREFIX, cannot use autoinstall ..."; \ exit 1; fi; @${ECHO_MSG} "===> Generating packing list with pear" - @${ECHO_CMD} "${LPKGREGDIR}/package.xml" > ${TMPPLIST} + @${ECHO_CMD} "${LPKGREGDIR}/package.xml" > ${PLIST} @FILES=`${PEAR} list-files ${PEARPKGREF} | ${TAIL} +4 | \ ${AWK} '{ print $$2 }' | ${SED} -e "s|${PREFIX}/||g"`; \ - for f in $${FILES}; do ${ECHO_CMD} $${f} >> ${TMPPLIST}; done; \ + for f in $${FILES}; do ${ECHO_CMD} $${f} >> ${PLIST}; done; \ for d in $${FILES}; do ${ECHO_CMD} $${d}; done | ${DIRFILTER} | \ - while read dir; do ${ECHO_CMD} "@unexec rmdir %D/$${dir} 2>/dev/null || true" >> ${TMPPLIST}; \ + while read dir; do ${ECHO_CMD} "@dirrmtry $${dir}" >> ${PLIST}; \ done; - @${ECHO_CMD} "@dirrm ${LPKGREGDIR}" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec rmdir %D/${LPKGREGDIR:H} 2>/dev/null || true" >> ${TMPPLIST} + @${ECHO_CMD} "@dirrm ${LPKGREGDIR}" >> ${PLIST} + @${ECHO_CMD} "@dirrmtry ${LPKGREGDIR:H}" >> ${PLIST} . if defined(PEAR_AUTOINSTALL) -pre-install: pear-pre-install do-generate-deinstall-script -do-install: do-auto-install do-autogenerate-plist pear-post-install +pre-install: pear-pre-install do-generate-deinstall-script do-auto-install do-autogenerate-plist +do-install: pear-post-install . else pre-install: pear-pre-install do-generate-plist do-generate-deinstall-script |