Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 9 Sep 2002 20:08:43 +0200
From:      Thierry Thomas <thierry@pompo.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        freebsd-ports@FreeBSD.org, dirk@FreeBSD.org
Subject:   Re: ports/37649: devel/pear: unbreaking, upgrading to 4.2, and adding Log module
Message-ID:  <20020909180843.GA13974@graf.pompo.net>
In-Reply-To: <20020501222449.1F7117527@graf.pompo.net>
References:  <200205021327.g42DRs090999@freefall.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
Le 02/05/2002 à 15:27:54 +0200, dirk@FreeBSD.org <dirk@FreeBSD.org> écrivait :
> Synopsis: devel/pear: unbreaking, upgrading to 4.2, and adding Log module
> 
> Responsible-Changed-From-To: freebsd-ports->dirk
> Responsible-Changed-By: dirk
> Responsible-Changed-When: Thu May 2 06:27:35 PDT 2002
> Responsible-Changed-Why: 
> I'll handle this.
> 
> http://www.freebsd.org/cgi/query-pr.cgi?pr=37649

Here is a patch to upgrade to 4.2.3 (this patch is against version
4.1.0):


diff -urN /usr/ports/devel/pear.orig/Makefile /usr/ports/devel/pear/Makefile
--- /usr/ports/devel/pear.orig/Makefile	Sun Jan 20 23:32:42 2002
+++ /usr/ports/devel/pear/Makefile	Mon Sep  9 19:43:53 2002
@@ -6,39 +6,68 @@
 #
 
 PORTNAME=	pear
-PORTVERSION=	4.1.0
+PORTVERSION=	4.2.3
+PORTREVISION?=	0
 CATEGORIES=	devel www
-MASTER_SITES=	ftp://ftp.horde.org/pub/horde/tarballs/
-PKGNAMESUFFIX=	-devel
+MASTER_SITES=	http://us.php.net/${PHP_DISTDIR}/ \
+		http://php.he.net/${PHP_DISTDIR}/ \
+		http://www.php3.de/${PHP_DISTDIR}/ \
+		http://au.php.net/${PHP_DISTDIR}/ \
+		http://at.php.net/${PHP_DISTDIR}/ \
+		http://br.php.net/${PHP_DISTDIR}/ \
+		http://php.easydns.com/${PHP_DISTDIR}/ \
+		http://www.php.cz/${PHP_DISTDIR}/ \
+		http://php3.globe.de/${PHP_DISTDIR}/
+DISTNAME=	php-${PORTVERSION}
+
+PATCH_SITES=	http://pear.php.net/get/
+PATCHFILES=	Console_Getopt-${CG_VERSION}.tgz	\
+		Log-${LOG_VERSION}.tgz			\
+		Mail_Mime-${MM_VERSION}.tgz		\
+		Net_Socket-${NS_VERSION}.tgz
 
 MAINTAINER=	thierry@pompo.net
 
 RUN_DEPENDS=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
 
+PHP_DISTDIR=	distributions
+
 USE_BZIP2=	yes
-NO_BUILD=	yes
+USE_SUBMAKE=	yes
+USE_AUTOCONF_VER=213
+
+CONFIGURE_ARGS=	--with-config-file-path=${PREFIX}/etc	\
+		--without-gd				\
+		--without-mysql
+
+CG_VERSION=	0.11
+LOG_VERSION=	1.2
+MM_VERSION=	1.2.1
+NS_VERSION=	1.0.1
 
 LPHP_LIB?=	lib/php
 
 PLIST_SUB=	PEARDIR=${LPHP_LIB}
+PEARDIR=	${PREFIX}/${LPHP_LIB}
 
-PEARDIR=	${LOCALBASE}/${LPHP_LIB}
+# Missing file in 4.2
+post-extract:
+.for file in ${PATCHFILES}
+	(cd ${WRKDIR}; ${TAR} xzf ${DISTDIR}/${file})
+.endfor
 
-FORBIDDEN=	"This module is now part of mod_php4 as of 4.1.0"
+do-build:
+	@${DO_NADA}
 
 do-install:
-	@${ECHO} "===> Backup the original PEAR from mod_php4 into ${PEARDIR}.DIST_PHP ..."
-	${MV}	${PEARDIR} ${PEARDIR}.DIST_PHP
-	@${ECHO} "===> Installing the new PEAR ..."
-	${MKDIR} ${PEARDIR}
-	${CP} -Rp ${WRKSRC}/* ${PEARDIR}
+	(cd ${WRKSRC} &&				\
+	 ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install-pear)
 
 post-install:
-	@${ECHO} "*****************************************************************"
-	@${ECHO} ""
-	@${ECHO} "The new PEAR has replaced your original distribution."
-	@${ECHO} "No recompilation or restarting of the server is necessary."
-	@${ECHO} ""
-	@${ECHO} "*****************************************************************"
+	${CP} -Rp ${WRKDIR}/Console_Getopt-${CG_VERSION}/* ${PREFIX}/${LPHP_LIB}
+	${CP} -Rp ${WRKDIR}/Log-${LOG_VERSION}/* ${PREFIX}/${LPHP_LIB}
+	${CP} -Rp ${WRKDIR}/Mail_Mime-${MM_VERSION}/* ${PREFIX}/${LPHP_LIB}/Mail
+	${CP} -Rp ${WRKDIR}/Net_Socket-${NS_VERSION}/* ${PREFIX}/${LPHP_LIB}/Net
+	${CHOWN} -R root:wheel ${PREFIX}/${LPHP_LIB}
 
 .include <bsd.port.mk>
diff -urN /usr/ports/devel/pear.orig/distinfo /usr/ports/devel/pear/distinfo
--- /usr/ports/devel/pear.orig/distinfo	Thu Dec 13 04:40:54 2001
+++ /usr/ports/devel/pear/distinfo	Mon Sep  9 19:44:32 2002
@@ -1 +1,5 @@
-MD5 (pear-4.1.0.tar.bz2) = 991e8ab60d44b5e9641fffadb9bb28bd
+MD5 (php-4.2.3.tar.bz2) = a0c7531f3d53a7736742c780f72a0f41
+MD5 (Console_Getopt-0.11.tgz) = 449e54f888ecb8bf153fd30abe96d383
+MD5 (Log-1.2.tgz) = 94d3ce13ec9642273d3903dc6422474b
+MD5 (Mail_Mime-1.2.1.tgz) = 667f631d9b128ef559bf97b9cd182c48
+MD5 (Net_Socket-1.0.1.tgz) = f2b5f199a8586b855a549c2dccfbbd81
diff -urN /usr/ports/devel/pear.orig/pkg-plist /usr/ports/devel/pear/pkg-plist
--- /usr/ports/devel/pear.orig/pkg-plist	Thu Dec 13 04:40:54 2001
+++ /usr/ports/devel/pear/pkg-plist	Tue Aug 27 23:21:46 2002
@@ -1,23 +1,7 @@
 %%PEARDIR%%/Archive/Tar.php
-%%PEARDIR%%/Benchmark/Iterate.php
-%%PEARDIR%%/Benchmark/Timer.php
-%%PEARDIR%%/Cache/Container/db.php
-%%PEARDIR%%/Cache/Container/dbx.php
-%%PEARDIR%%/Cache/Container/file.php
-%%PEARDIR%%/Cache/Container/phplib.php
-%%PEARDIR%%/Cache/Container/shm.php
-%%PEARDIR%%/Cache/Error.php
-%%PEARDIR%%/Cache/Container.php
-%%PEARDIR%%/Cache/DB.php
-%%PEARDIR%%/Cache/Function.php
-%%PEARDIR%%/Cache/Graphics.php
-%%PEARDIR%%/Cache/Output.php
-%%PEARDIR%%/Cache/OutputCompression.php
 %%PEARDIR%%/Console/Getopt.php
 %%PEARDIR%%/Crypt/CBC.php
 %%PEARDIR%%/Crypt/HCEMD5.php
-%%PEARDIR%%/Date/Calc.php
-%%PEARDIR%%/Date/Human.php
 %%PEARDIR%%/DB/common.php
 %%PEARDIR%%/DB/fbsql.php
 %%PEARDIR%%/DB/ibase.php
@@ -30,6 +14,9 @@
 %%PEARDIR%%/DB/pgsql.php
 %%PEARDIR%%/DB/storage.php
 %%PEARDIR%%/DB/sybase.php
+%%PEARDIR%%/DB.php
+%%PEARDIR%%/Date/Calc.php
+%%PEARDIR%%/Date/Human.php
 %%PEARDIR%%/File/Find.php
 %%PEARDIR%%/File/Passwd.php
 %%PEARDIR%%/File/SearchReplace.php
@@ -43,58 +30,63 @@
 %%PEARDIR%%/HTML/Select.php
 %%PEARDIR%%/HTML/Table.php
 %%PEARDIR%%/HTTP/Compress.php
-%%PEARDIR%%/Image/Remote.php
+%%PEARDIR%%/HTTP.php
 %%PEARDIR%%/Log/composite.php
+%%PEARDIR%%/Log/console.php
 %%PEARDIR%%/Log/file.php
 %%PEARDIR%%/Log/mcal.php
-%%PEARDIR%%/Log/Observer.php
+%%PEARDIR%%/Log/observer.php
 %%PEARDIR%%/Log/sql.php
 %%PEARDIR%%/Log/syslog.php
+%%PEARDIR%%/Log.php
 %%PEARDIR%%/Mail/RFC822.php
 %%PEARDIR%%/Mail/mime.php
+%%PEARDIR%%/Mail/mimeDecode.php
+%%PEARDIR%%/Mail/mimePart.php
 %%PEARDIR%%/Mail/sendmail.php
 %%PEARDIR%%/Mail/smtp.php
-%%PEARDIR%%/Math/Fraction.php
-%%PEARDIR%%/Math/Util.php
+%%PEARDIR%%/Mail/xmail.dtd
+%%PEARDIR%%/Mail/xmail.xsl
+%%PEARDIR%%/Mail.php
 %%PEARDIR%%/Net/Curl.php
 %%PEARDIR%%/Net/Dig.php
 %%PEARDIR%%/Net/SMTP.php
 %%PEARDIR%%/Net/Socket.php
-%%PEARDIR%%/Numbers/Roman.php
-%%PEARDIR%%/Payment/Verisign.php
+%%PEARDIR%%/PEAR/Autoloader.php
+%%PEARDIR%%/PEAR/Command/Auth.php
+%%PEARDIR%%/PEAR/Command/Common.php
+%%PEARDIR%%/PEAR/Command/Config.php
+%%PEARDIR%%/PEAR/Command/Install.php
+%%PEARDIR%%/PEAR/Command/Package.php
+%%PEARDIR%%/PEAR/Command/Registry.php
+%%PEARDIR%%/PEAR/Command/Remote.php
+%%PEARDIR%%/PEAR/Command.php
 %%PEARDIR%%/PEAR/Common.php
 %%PEARDIR%%/PEAR/Config.php
+%%PEARDIR%%/PEAR/Dependency.php
+%%PEARDIR%%/PEAR/Frontend/CLI.php
 %%PEARDIR%%/PEAR/Installer.php
 %%PEARDIR%%/PEAR/Packager.php
 %%PEARDIR%%/PEAR/Registry.php
 %%PEARDIR%%/PEAR/Remote.php
-%%PEARDIR%%/PEAR/Uploader.php
+%%PEARDIR%%/PEAR.php
 %%PEARDIR%%/Schedule/At.php
+%%PEARDIR%%/System.php
 %%PEARDIR%%/XML/Parser.php
-%%PEARDIR%%/build/pear.m4
+%%PEARDIR%%/build/acinclude.m4
+%%PEARDIR%%/build/dynlib.m4
+%%PEARDIR%%/build/dynlib.mk
 %%PEARDIR%%/build/fastgen.sh
 %%PEARDIR%%/build/library.mk
 %%PEARDIR%%/build/ltlib.mk
 %%PEARDIR%%/build/mkdep.awk
+%%PEARDIR%%/build/pear.m4
 %%PEARDIR%%/build/program.mk
 %%PEARDIR%%/build/rules.mk
 %%PEARDIR%%/build/rules_common.mk
 %%PEARDIR%%/build/rules_pear.mk
-%%PEARDIR%%/build/dynlib.mk
 %%PEARDIR%%/build/shtool
-%%PEARDIR%%/build/dynlib.m4
-%%PEARDIR%%/build/acinclude.m4
-%%PEARDIR%%/Cache.php
-%%PEARDIR%%/DB.php
-%%PEARDIR%%/HTTP.php
-%%PEARDIR%%/Log.php
-%%PEARDIR%%/Mail.php
-%%PEARDIR%%/PEAR.php
-%%PEARDIR%%/System.php
 @dirrm %%PEARDIR%%/Archive
-@dirrm %%PEARDIR%%/Benchmark
-@dirrm %%PEARDIR%%/Cache/Container
-@dirrm %%PEARDIR%%/Cache
 @dirrm %%PEARDIR%%/Console
 @dirrm %%PEARDIR%%/Crypt
 @dirrm %%PEARDIR%%/Date
@@ -105,13 +97,13 @@
 @dirrm %%PEARDIR%%/Image
 @dirrm %%PEARDIR%%/Log
 @dirrm %%PEARDIR%%/Mail
-@dirrm %%PEARDIR%%/Math
 @dirrm %%PEARDIR%%/Net
-@dirrm %%PEARDIR%%/Numbers
-@dirrm %%PEARDIR%%/Payment
+@dirrm %%PEARDIR%%/PEAR/Command
+@dirrm %%PEARDIR%%/PEAR/Frontend
 @dirrm %%PEARDIR%%/PEAR
 @dirrm %%PEARDIR%%/Schedule
 @dirrm %%PEARDIR%%/XML
 @dirrm %%PEARDIR%%/build
+@dirrm %%PEARDIR%%/extensions/no-debug-non-zts-20020429
+@dirrm %%PEARDIR%%/extensions
 @dirrm %%PEARDIR%%
-@unexec mv %D/lib/php.DIST_PHP %D/lib/php || true


-- 
Th. Thomas.

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020909180843.GA13974>