Date: Thu, 2 May 2002 00:24:49 +0200 (CEST) From: Thierry Thomas <thierry@pompo.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Dirk Froemberg <dirk@FreeBSD.org> Subject: ports/37649: devel/pear: unbreaking, upgrading to 4.2, and adding Log module Message-ID: <20020501222449.1F7117527@graf.pompo.net>
next in thread | raw e-mail | index | archive | help
>Number: 37649 >Category: ports >Synopsis: devel/pear: unbreaking, upgrading to 4.2, and adding Log module >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed May 01 15:30:02 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Thierry Thomas >Release: FreeBSD 4.5-STABLE i386 >Organization: Kabbale Eros >Environment: System: FreeBSD graf.pompo.net 4.5-STABLE FreeBSD 4.5-STABLE #0: Sat Mar 9 11:54:44 CET 2002 root@graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF010429 i386 >Description: Log modules have been removed from PEAR, and since mod_php4 4.2 the ports www/horde-devel (Horde 2.x) and mail/imp-devel (IMP 3.x) are broken. >How-To-Repeat: Run imp-devel with mod_php4 4.2 => you will get an error. >Fix: Apply the following patch (but please don't commit this PR before PEAR is removed from mod_php4): diff -urN pear.orig/Makefile pear/Makefile --- pear.orig/Makefile Sun Jan 20 23:32:42 2002 +++ pear/Makefile Wed May 1 23:50:56 2002 @@ -6,39 +6,56 @@ # PORTNAME= pear -PORTVERSION= 4.1.0 +PORTVERSION= 4.2.0 +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= Log-1.1.tgz MAINTAINER= thierry@pompo.net RUN_DEPENDS= ${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4 -USE_BZIP2= yes -NO_BUILD= yes +PHP_DISTDIR= distributions + +USE_SUBMAKE= yes +USE_AUTOCONF_VER=213 + +CONFIGURE_ARGS= --with-config-file-path=${PREFIX}/etc \ + --without-gd \ + --without-mysql 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 ${DISTDIR}/${PATCHFILES}; do \ + cd ${WRKDIR}; \ + ${TAR} xvfz ${DISTDIR}/${PATCHFILES}; \ + done -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}/Log-1.1/* ${PREFIX}/${LPHP_LIB} .include <bsd.port.mk> diff -urN pear.orig/distinfo pear/distinfo --- pear.orig/distinfo Thu Dec 13 21:37:01 2001 +++ pear/distinfo Wed May 1 22:35:58 2002 @@ -1 +1,2 @@ -MD5 (pear-4.1.0.tar.bz2) = 991e8ab60d44b5e9641fffadb9bb28bd +MD5 (php-4.2.0.tar.gz) = 88d55481de32ab0168aa580f7b611022 +MD5 (Log-1.1.tgz) = 66617006d074ed9c2ba30a94f492880d diff -urN pear.orig/pkg-plist pear/pkg-plist --- pear.orig/pkg-plist Thu Dec 13 21:37:01 2001 +++ pear/pkg-plist Wed May 1 23:47:18 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,57 @@ %%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/sendmail.php %%PEARDIR%%/Mail/smtp.php -%%PEARDIR%%/Math/Fraction.php -%%PEARDIR%%/Math/Util.php +%%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 +91,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-20010901 +@dirrm %%PEARDIR%%/extensions @dirrm %%PEARDIR%% -@unexec mv %D/lib/php.DIST_PHP %D/lib/php || true >Release-Note: >Audit-Trail: >Unformatted: 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?20020501222449.1F7117527>