Date: Thu, 17 May 2007 20:12:17 +0200 From: Gerrit Beine <gerrit.beine@gmx.de> To: FreeBSD-gnats-submit@freebsd.org, freebsd-ports-bugs@freebsd.org Subject: Re: ports/112735: Enabling bsd.pear.mk to handle channels Message-ID: <200705172012.18179.gerrit.beine@gmx.de> In-Reply-To: <200705171310.l4HDA31n037403@freefall.freebsd.org> References: <200705171310.l4HDA31n037403@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Boundary-00=_CsJTG9cQ+LQ/W77 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Am Donnerstag, 17. Mai 2007 15:10 schrieb FreeBSD-gnats-submit@freebsd.org: > Thank you very much for your problem report. > It has the internal identification `ports/112735'. > The individual assigned to look at your > report is: freebsd-ports-bugs. > Because there were two mistakes, here is a newer version of the patch. Sorry... --Boundary-00=_CsJTG9cQ+LQ/W77 Content-Type: text/x-diff; charset="utf-8"; name="pear.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="pear.patch" diff -Nur /usr/ports/devel/pear/bsd.pear.mk pear/bsd.pear.mk --- /usr/ports/devel/pear/bsd.pear.mk Thu May 4 23:40:59 2006 +++ pear/bsd.pear.mk Thu May 17 14:26:06 2007 @@ -2,8 +2,14 @@ # Common code for pear- ports. +.if !defined(MASTER_SITES) MASTER_SITES= http://pear.php.net/get/ +.endif +.if defined(CHANNEL) +PKGNAMEPREFIX= ${CHANNEL}_pear- +.else PKGNAMEPREFIX= pear- +.endif EXTRACT_SUFX= .tgz DIST_SUBDIR= PEAR @@ -232,5 +238,10 @@ post-install: @${MKDIR} ${PKGREGDIR} @${INSTALL_DATA} ${WRKDIR}/package.xml ${PKGREGDIR} +.if defined(CHANNEL) + @${SETENV} PKG_PREFIX=${PREFIX} \ + ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL ${CHANNEL} +.else @${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL +.endif \ No newline at end of file diff -Nur /usr/ports/devel/pear/pear-deinstall pear/pear-deinstall --- /usr/ports/devel/pear/pear-deinstall Fri Dec 9 19:58:03 2005 +++ pear/pear-deinstall Thu May 17 18:11:33 2007 @@ -8,8 +8,14 @@ exit fi PKG_NAME=${1%%-[0-9._]*} -PACKAGE=$(echo $PKG_NAME | sed 's/pear-//') +CHANNEL=$(echo $PKG_NAME | sed 's/_pear-.*//') PEAR=${PKG_PREFIX}/bin/pear - -${PEAR} uninstall -r -n ${PACKAGE} || true +if [ ${CHANNEL} != ${PKG_NAME} ]; then + PACKAGE=$(echo $PKG_NAME | sed "s/${CHANNEL}_pear-//") + ${PEAR} uninstall -r -n ${CHANNEL}/${PACKAGE} || true + ${PEAR} channel-delete ${CHANNEL} || true +else + PACKAGE=$(echo $PKG_NAME | sed 's/pear-//') + ${PEAR} uninstall -r -n ${PACKAGE} || true +fi \ No newline at end of file diff -Nur /usr/ports/devel/pear/pear-install pear/pear-install --- /usr/ports/devel/pear/pear-install Fri Dec 9 19:58:03 2005 +++ pear/pear-install Thu May 17 18:08:46 2007 @@ -10,5 +10,10 @@ [ "x$1" = "x" ] && exit 1 if [ "x$2" = "xPOST-INSTALL" ]; then - ${PEAR} install -r -n -f ${PKGREGDIR}/package.xml + if [ -n "$3" ]; then + ${PEAR} channel-discover $3 || true + ${PEAR} install -r -n -f ${PKGREGDIR}/package.xml + else + ${PEAR} install -r -n -f ${PKGREGDIR}/package.xml + fi fi --Boundary-00=_CsJTG9cQ+LQ/W77--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200705172012.18179.gerrit.beine>