ports/73995: Update port: devel/pear-PEAR to 1.3.3.1

Tue Nov 16 12:00:45 UTC 2004

>Number:         73995
>Category:       ports
>Synopsis:       Update port: devel/pear-PEAR to 1.3.3.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 16 12:00:44 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Antônio Carlos Venâncio Júnior
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
>Environment:
System: FreeBSD antonio.cb.sc.gov.br 4.10-STABLE FreeBSD 4.10-STABLE #2: Tue Nov  9 10:03:13 BRST 2004     root at antonio.cb.sc.gov.br:/usr/obj/usr/src/sys/ANTONIO  i386
>Description:
+ update devel/pear-PEAR to 1.3.3.1
+ install pear script as pear2
  - add patch file
  - update pkg-install
  - update pkg-deinstall
>How-To-Repeat:
>Fix:

--- Makefile.old	Tue Nov 16 09:35:26 2004
+++ Makefile	Tue Nov 16 09:32:54 2004
@@ -2,11 +2,11 @@
 # Date created:			  22 October 2002
 # Whom:				  Thierry Thomas (<thierry at pompo.net>)
 #
-# $FreeBSD: /repoman/r/pcvs/ports/devel/pear-PEAR/Makefile,v 1.16 2004/10/30 11:56:34 thierry Exp $
+# $FreeBSD: ports/devel/pear-PEAR/Makefile,v 1.16 2004/10/30 11:56:34 thierry Exp $
 #
 
 PORTNAME=	PEAR
-PORTVERSION=	1.3.3
+PORTVERSION=	1.3.3.1
 CATEGORIES=	devel www pear
 
 MAINTAINER=	antonio at php.net
@@ -25,8 +25,14 @@
 		PEAR/Autoloader.php PEAR/Command.php PEAR/Common.php PEAR/Config.php 	\
 		PEAR/Dependency.php PEAR/Downloader.php PEAR/Exception.php 		\
 		PEAR/ErrorStack.php PEAR/Builder.php PEAR/Installer.php 		\
-		PEAR/Packager.php PEAR/Registry.php PEAR/Remote.php
+		PEAR/Packager.php PEAR/Registry.php PEAR/Remote.php PEAR/RunTest.php
+SCRIPTFILES=	pear2
 
 .include <bsd.port.pre.mk>
+
+post-patch:
+	@${SED} "s|@pear_version@|${PORTVERSION}|g" \
+		${WRKSRC}/scripts/pearcmd.php > ${WRKSRC}/pear-${SCRIPTFILES}
+
 .include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>

--- Makefile.common.old	Tue Nov 16 09:36:49 2004
+++ Makefile.common	Tue Nov 16 09:44:05 2004
@@ -7,6 +7,8 @@
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	PEAR
 
+USE_REINPLACE=	yes
+
 .if !defined(USE_PHPIZE)
 NO_BUILD=	yes
 .endif
@@ -210,6 +212,8 @@
 .  for file in ${SCRIPTFILES}
 	@${CP} ${WRKSRC}/pear-${file} ${WRKSRC}/${file}
 	@${REINPLACE_CMD} -e "s|@php_bin@|${SCRIPTFILESDIR}/php|g" ${WRKSRC}/${file}
+	@${REINPLACE_CMD} -e "s|@php_dir@|${PREFIX}/lib/php|g" ${WRKSRC}/${file}
+	@${REINPLACE_CMD} -e "s|@include_path@|${PREFIX}/${LPEARDIR}|g" ${WRKSRC}/${file}
 	@${INSTALL_SCRIPT} ${WRKSRC}/${file} ${SCRIPTFILESDIR}/${file}
 .  endfor
 . endif

--- distinfo.old	Tue Nov 16 09:28:52 2004
+++ distinfo	Tue Nov 16 09:29:51 2004
@@ -1,2 +1,2 @@
-MD5 (PEAR/PEAR-1.3.3.tgz) = da8794961ff5649734928a8816fb2c66
-SIZE (PEAR/PEAR-1.3.3.tgz) = 103320
+MD5 (PEAR/PEAR-1.3.3.1.tgz) = 02a82aebb5df17c0e5e8bc0e23013b54
+SIZE (PEAR/PEAR-1.3.3.1.tgz) = 106079

--- pkg-deinstall.old	Tue Nov 16 09:37:20 2004
+++ pkg-deinstall	Tue Nov 16 09:39:49 2004
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /repoman/r/pcvs/ports/devel/pear-PEAR/pkg-deinstall,v 1.1 2003/06/07 23:00:39 nork Exp $
+# $FreeBSD: ports/devel/pear-PEAR/pkg-deinstall,v 1.1 2003/06/07 23:00:39 nork Exp $
 #
 # Remove package declaration from PEAR's registry.
 
@@ -10,4 +10,13 @@
 PKG_NAME=${1%%-[0-9._]*}
 PACKAGE=$(echo $PKG_NAME | sed 's/pear-//')
 
-${PKG_PREFIX}/bin/pear uninstall -r -n ${PACKAGE} || true
+PEAR=${PKG_PREFIX}/bin/pear
+PEAR2=${PKG_PREFIX}/bin/pear2
+
+if [ ${PKG_NAME} = "pear-PEAR" ]; then
+	PEAR_INSTALLER=${PEAR}
+else
+	PEAR_INSTALLER=${PEAR2}
+fi
+
+${PEAR_INSTALLER} uninstall -r -n ${PACKAGE} || true

--- pkg-install.old	Tue Nov 16 09:37:33 2004
+++ pkg-install	Tue Nov 16 09:40:26 2004
@@ -1,14 +1,21 @@
 #!/bin/sh
 #
-# $FreeBSD: /repoman/r/pcvs/ports/devel/pear-PEAR/pkg-install,v 1.1 2003/06/07 23:00:40 nork Exp $
+# $FreeBSD: ports/devel/pear-PEAR/pkg-install,v 1.1 2003/06/07 23:00:40 nork Exp $
 #
 # Register the package $1 in the port registry
 
 PREFIX=${PKG_PREFIX:-/usr/local}
 PEAR=${PREFIX}/bin/pear
+PEAR2=${PREFIX}/bin/pear2
 PKGREGDIR=${PREFIX}/share/pear/packages/$1
 
+if [ -f "${PEAR2}" ]; then
+	PEAR_INSTALLER=${PEAR2}
+else
+	PEAR_INSTALLER=${PEAR}
+fi
+
 [ "x$1" = "x" ] && exit 1
 if [ "x$2" = "xPOST-INSTALL" ]; then
-	${PEAR} install -r -f ${PKGREGDIR}/package.xml
+	${PEAR_INSTALLER} install -r -f ${PKGREGDIR}/package.xml
 fi

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	files
#	files/patch-scripts::pearcmd.php
#
echo c - files
mkdir -p files > /dev/null 2>&1
echo x - files/patch-scripts::pearcmd.php
sed 's/^X//' >files/patch-scripts::pearcmd.php << 'END-of-files/patch-scripts::pearcmd.php'
X--- scripts/pearcmd.php.orig	Thu Oct 28 14:37:56 2004
X+++ scripts/pearcmd.php	Thu Nov 11 11:21:39 2004
X@@ -1,3 +1,4 @@
X+#!@php_bin@ -n -q -dsafe_mode=0 -doutput_buffering=1
X <?php
X //
X // +----------------------------------------------------------------------+
X@@ -24,8 +25,10 @@
X /**
X  * @nodep Gtk
X  */
X+dl('pcre.so');
X+dl('xml.so');
X if ('@include_path@' != '@'.'include_path'.'@') {
X-    ini_set('include_path', '@include_path@');
X+    ini_set('include_path', '@include_path@:@include_path@/bootstrap');
X }
X ini_set('allow_url_fopen', true);
X if (!ini_get('safe_mode')) {
END-of-files/patch-scripts::pearcmd.php
exit

>Release-Note:
>Audit-Trail:
>Unformatted:

