diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-09-02 22:00:52 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-09-02 22:00:52 +0000 |
| commit | 880479b2e0de57e5d1338e10ae65e146f7f6d42a (patch) | |
| tree | d6cd4af57fb5657ff4a0ae50ddbdb3e8004462a7 /devel | |
| parent | 209ab56cad8f8c4c5d518ef54562ed76137c3576 (diff) | |
Remove NO_STAGE support and pkg_install support
Notes
Notes:
svn path=/head/; revision=367094
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/pear/bsd.pear.mk | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/devel/pear/bsd.pear.mk b/devel/pear/bsd.pear.mk index 2ce0d9fbcb74..9e98b9d59b3f 100644 --- a/devel/pear/bsd.pear.mk +++ b/devel/pear/bsd.pear.mk @@ -191,7 +191,6 @@ do-autogenerate-plist: patch exit 1; fi; @${ECHO_CMD} "${LPKGREGDIR}/package.xml" > ${PLIST} # pkg_install needs to escape $ in directory name while pkg does not -.if defined(WITH_PKGNG) @cd ${WRKDIR}/inst/${PREFIX} && ${FIND} . -type f | ${SORT} \ | ${CUT} -c 3- >> ${PLIST} @cd ${WRKDIR}/inst/${PREFIX} && ${FIND} . -type d | ${SORT} -r | \ @@ -201,17 +200,6 @@ do-autogenerate-plist: patch ${ECHO_CMD} "@dirrmtry $${d}" >> ${PLIST}; \ fi; \ done -.else - @cd ${WRKDIR}/inst/${PREFIX} && ${FIND} . -type f | ${SORT} \ - | ${CUT} -c 3- >> ${PLIST} - @cd ${WRKDIR}/inst/${PREFIX} && ${FIND} . -type d | ${SORT} -r | \ - ${CUT} -c 3- | ${SED} -e 's,\$$,\\\\$$,g' | \ - while read d ; do \ - if [ ! -d "${LOCALBASE}/$${d}" ]; then \ - ${ECHO_CMD} "@dirrmtry $${d}" >> ${PLIST}; \ - fi; \ - done -.endif @${ECHO_CMD} "@dirrm ${LPKGREGDIR}" >> ${PLIST} @${ECHO_CMD} "@dirrmtry ${LPKGREGDIR:H}" >> ${PLIST} @@ -228,15 +216,11 @@ do-install: do-install-files do-install-docs do-install-tests do-install-sqls \ do-auto-install: @${ECHO_MSG} "===> Installing package with pear" -.if defined(NO_STAGE) - @cd ${WRKSRC} && ${PEAR} install -n -f package.xml -.else @cd ${WRKSRC} && ${PEAR} install -n -f -P ${STAGEDIR} package.xml # Clean up orphans re-generated by pear-install .for R in .channels .depdb .depdblock .filemap .lock .registry @${RM} -rf ${STAGEDIR}${PREFIX}/${LPEARDIR}/${R} .endfor -.endif do-install-files: do-install-files-msg @${MKDIR} ${STAGEDIR}${INSTDIR} @@ -326,10 +310,6 @@ do-generate-deinstall-script: pear-post-install: @${MKDIR} ${STAGEDIR}${PKGREGDIR} @${INSTALL_DATA} ${WRKDIR}/package.xml ${STAGEDIR}${PKGREGDIR} -.if defined(NO_STAGE) && !defined(PEAR_AUTOINSTALL) - @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif show-depends: patch @${PEAR} package-dependencies ${WRKDIR}/package.xml |