From owner-svn-ports-head@FreeBSD.ORG Tue Sep 2 22:00:53 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 354FFCCB; Tue, 2 Sep 2014 22:00:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 06ED41A5F; Tue, 2 Sep 2014 22:00:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s82M0qmf086768; Tue, 2 Sep 2014 22:00:52 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s82M0qZO086767; Tue, 2 Sep 2014 22:00:52 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201409022200.s82M0qZO086767@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Tue, 2 Sep 2014 22:00:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367094 - head/devel/pear X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Sep 2014 22:00:53 -0000 Author: bapt Date: Tue Sep 2 22:00:52 2014 New Revision: 367094 URL: http://svnweb.freebsd.org/changeset/ports/367094 QAT: https://qat.redports.org/buildarchive/r367094/ Log: Remove NO_STAGE support and pkg_install support Modified: head/devel/pear/bsd.pear.mk Modified: head/devel/pear/bsd.pear.mk ============================================================================== --- head/devel/pear/bsd.pear.mk Tue Sep 2 21:59:23 2014 (r367093) +++ head/devel/pear/bsd.pear.mk Tue Sep 2 22:00:52 2014 (r367094) @@ -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 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