From owner-freebsd-ports Sat Jan 11 9:49:40 2003 Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A9AA437B401 for ; Sat, 11 Jan 2003 09:49:29 -0800 (PST) Received: from emmi.physik.TU-Berlin.DE (emmi.physik.TU-Berlin.DE [130.149.160.103]) by mx1.FreeBSD.org (Postfix) with ESMTP id D08E143F1E for ; Sat, 11 Jan 2003 09:49:28 -0800 (PST) (envelope-from ibex@emmi.physik.TU-Berlin.DE) Received: from emmi.physik.TU-Berlin.DE (localhost.physik.TU-Berlin.DE [127.0.0.1]) by emmi.physik.TU-Berlin.DE (8.12.6/8.11.6) with ESMTP id h0BHnRlk099911; Sat, 11 Jan 2003 18:49:27 +0100 (CET) (envelope-from ibex@emmi.physik.TU-Berlin.DE) Received: (from ibex@localhost) by emmi.physik.TU-Berlin.DE (8.12.6/8.12.3/Submit) id h0BHnRBg099910; Sat, 11 Jan 2003 18:49:27 +0100 (CET) Date: Sat, 11 Jan 2003 18:49:27 +0100 From: Dirk Froemberg To: Thierry Thomas Cc: ports@freebsd.org Subject: mod_php4 upgrade Message-ID: <20030111174927.GA98556@physik.TU-Berlin.DE> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="PNTmBPCT7hxwcZjr" Content-Disposition: inline User-Agent: Mutt/1.4i Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org --PNTmBPCT7hxwcZjr Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi Thierry! I finished an upgrade for mod_php4 to 4.3.0 and disabled pear. What about devel/pear-install now? Is there anything ready I can commit? And what about the dependencies of other ports? Did you had a look at them? 8-) Regards Dirk -- Dirk Froemberg FreeBSD: The Power to Serve! http://www.FreeBSD.org/ --PNTmBPCT7hxwcZjr Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="mod_php4-diffs.txt" ? mod_php4-diffs.txt Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/mod_php4/Makefile,v retrieving revision 1.180 diff -u -u -r1.180 Makefile --- Makefile 23 Nov 2002 20:49:41 -0000 1.180 +++ Makefile 11 Jan 2003 17:44:03 -0000 @@ -6,7 +6,7 @@ # PORTNAME?= mod_php4 -PORTVERSION= 4.2.3 +PORTVERSION= 4.3.0 PORTREVISION?= 0 CATEGORIES?= www MASTER_SITES= http://us.php.net/${PHP_DISTDIR}/ \ @@ -49,20 +49,22 @@ .endif .if defined(STANDALONE) -CONFIGURE_ARGS= --with-config-file-path=${PREFIX}/etc/php.standalone \ - --disable-pear \ +CONFIGURE_ARGS= --disable-cgi \ + --with-config-file-path=${PREFIX}/etc/php.standalone \ --enable-discard-path \ --with-readline=/usr MAKE_ENV= STANDALONE="${STANDALONE}" +INSTALL_TARGET= install-cli .else +CONFIGURE_ARGS= --disable-cli .if defined(WITH_APACHE2) -CONFIGURE_ARGS= --with-apxs2=${PREFIX}/sbin/apxs \ +CONFIGURE_ARGS+=--with-apxs2=${PREFIX}/sbin/apxs \ --with-tsrm-pth PLIST_SUB= MOD_DIR=libexec/apache2 \ NON= .else -CONFIGURE_ARGS= --with-apxs=${PREFIX}/sbin/apxs +CONFIGURE_ARGS+=--with-apxs=${PREFIX}/sbin/apxs PLIST_SUB= MOD_DIR=libexec/apache \ NON=non- .endif @@ -72,7 +74,8 @@ CONFIGURE_ARGS+=--enable-versioning \ --with-regex=system \ --without-gd \ - --without-mysql + --without-mysql \ + --without-pear CFLAGS+= -I${PREFIX}/include Index: distinfo =================================================================== RCS file: /home/ncvs/ports/www/mod_php4/distinfo,v retrieving revision 1.112 diff -u -u -r1.112 distinfo --- distinfo 9 Sep 2002 08:32:24 -0000 1.112 +++ distinfo 11 Jan 2003 17:44:03 -0000 @@ -1 +1 @@ -MD5 (php-4.2.3.tar.bz2) = a0c7531f3d53a7736742c780f72a0f41 +MD5 (php-4.3.0.tar.bz2) = 6a3e1ad25cc912816c1f958cd4507767 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/www/mod_php4/pkg-plist,v retrieving revision 1.39 diff -u -u -r1.39 pkg-plist --- pkg-plist 9 Sep 2002 08:32:24 -0000 1.39 +++ pkg-plist 11 Jan 2003 17:44:03 -0000 @@ -1,278 +1,8 @@ -bin/pear -bin/pearize -bin/php-config -bin/phpextdist -bin/phpize -bin/phptar etc/php.ini-dist -include/php/TSRM/TSRM.h -include/php/TSRM/acconfig.h -include/php/TSRM/readdir.h -include/php/TSRM/tsrm_config.h -include/php/TSRM/tsrm_config.w32.h -include/php/TSRM/tsrm_config_common.h -include/php/TSRM/tsrm_strtok_r.h -include/php/TSRM/tsrm_virtual_cwd.h -include/php/TSRM/tsrm_win32.h -include/php/Zend/FlexLexer.h -include/php/Zend/acconfig.h -include/php/Zend/zend.h -include/php/Zend/zend_API.h -include/php/Zend/zend_alloc.h -include/php/Zend/zend_builtin_functions.h -include/php/Zend/zend_compile.h -include/php/Zend/zend_config.h -include/php/Zend/zend_config.w32.h -include/php/Zend/zend_constants.h -include/php/Zend/zend_dynamic_array.h -include/php/Zend/zend_errors.h -include/php/Zend/zend_execute.h -include/php/Zend/zend_execute_locks.h -include/php/Zend/zend_extensions.h -include/php/Zend/zend_fast_cache.h -include/php/Zend/zend_globals.h -include/php/Zend/zend_globals_macros.h -include/php/Zend/zend_hash.h -include/php/Zend/zend_highlight.h -include/php/Zend/zend_indent.h -include/php/Zend/zend_ini.h -include/php/Zend/zend_ini_parser.h -include/php/Zend/zend_ini_scanner.h -include/php/Zend/zend_istdiostream.h -include/php/Zend/zend_language_parser.h -include/php/Zend/zend_language_scanner.h -include/php/Zend/zend_list.h -include/php/Zend/zend_llist.h -include/php/Zend/zend_modules.h -include/php/Zend/zend_operators.h -include/php/Zend/zend_ptr_stack.h -include/php/Zend/zend_qsort.h -include/php/Zend/zend_stack.h -include/php/Zend/zend_static_allocator.h -include/php/Zend/zend_variables.h -include/php/acconfig.h -include/php/ext/mbstring/cp932_table.h -include/php/ext/mbstring/mbfilter.h -include/php/ext/mbstring/mbfilter_ja.h -include/php/ext/mbstring/mbregex.h -include/php/ext/mbstring/mbstring.h -include/php/ext/mbstring/unicode_table.h -include/php/ext/mbstring/unicode_table_ja.h -include/php/ext/session/mod_files.h -include/php/ext/session/mod_mm.h -include/php/ext/session/mod_user.h -include/php/ext/session/php_session.h -include/php/ext/standard/aggregation.h -include/php/ext/standard/base64.h -include/php/ext/standard/basic_functions.h -include/php/ext/standard/crc32.h -include/php/ext/standard/credits.h -include/php/ext/standard/credits_ext.h -include/php/ext/standard/credits_sapi.h -include/php/ext/standard/cyr_convert.h -include/php/ext/standard/datetime.h -include/php/ext/standard/dl.h -include/php/ext/standard/dns.h -include/php/ext/standard/exec.h -include/php/ext/standard/file.h -include/php/ext/standard/flock_compat.h -include/php/ext/standard/fsock.h -include/php/ext/standard/head.h -include/php/ext/standard/html.h -include/php/ext/standard/info.h -include/php/ext/standard/md5.h -include/php/ext/standard/microtime.h -include/php/ext/standard/pack.h -include/php/ext/standard/pageinfo.h -include/php/ext/standard/parsedate.h -include/php/ext/standard/php_array.h -include/php/ext/standard/php_assert.h -include/php/ext/standard/php_browscap.h -include/php/ext/standard/php_crypt.h -include/php/ext/standard/php_dir.h -include/php/ext/standard/php_ext_syslog.h -include/php/ext/standard/php_filestat.h -include/php/ext/standard/php_fopen_wrappers.h -include/php/ext/standard/php_ftok.h -include/php/ext/standard/php_image.h -include/php/ext/standard/php_incomplete_class.h -include/php/ext/standard/php_iptc.h -include/php/ext/standard/php_lcg.h -include/php/ext/standard/php_link.h -include/php/ext/standard/php_mail.h -include/php/ext/standard/php_math.h -include/php/ext/standard/php_metaphone.h -include/php/ext/standard/php_parsedate.h -include/php/ext/standard/php_rand.h -include/php/ext/standard/php_smart_str.h -include/php/ext/standard/php_smart_str_public.h -include/php/ext/standard/php_standard.h -include/php/ext/standard/php_string.h -include/php/ext/standard/php_type.h -include/php/ext/standard/php_var.h -include/php/ext/standard/php_versioning.h -include/php/ext/standard/quot_print.h -include/php/ext/standard/reg.h -include/php/ext/standard/scanf.h -include/php/ext/standard/uniqid.h -include/php/ext/standard/url.h -include/php/ext/standard/url_scanner.h -include/php/ext/standard/url_scanner_ex.h -include/php/ext/xml/expat/ascii.h -include/php/ext/xml/expat/asciitab.h -include/php/ext/xml/expat/expat.h -include/php/ext/xml/expat/iasciitab.h -include/php/ext/xml/expat/latin1tab.h -include/php/ext/xml/expat/nametab.h -include/php/ext/xml/expat/utf8tab.h -include/php/ext/xml/expat/winconfig.h -include/php/ext/xml/expat/xmlrole.h -include/php/ext/xml/expat/xmltok.h -include/php/ext/xml/expat/xmltok_impl.h -include/php/ext/xml/php_xml.h -include/php/main/SAPI.h -include/php/main/build-defs.h -include/php/main/config.w32.h -include/php/main/fopen_wrappers.h -include/php/main/internal_functions_registry.h -include/php/main/logos.h -include/php/main/php.h -include/php/main/php3_compat.h -include/php/main/php_compat.h -include/php/main/php_config.h -include/php/main/php_content_types.h -include/php/main/php_globals.h -include/php/main/php_ini.h -include/php/main/php_logos.h -include/php/main/php_main.h -include/php/main/php_network.h -include/php/main/php_open_temporary_file.h -include/php/main/php_output.h -include/php/main/php_reentrancy.h -include/php/main/php_regex.h -include/php/main/php_streams.h -include/php/main/php_syslog.h -include/php/main/php_ticks.h -include/php/main/php_variables.h -include/php/main/php_version.h -include/php/main/rfc1867.h -include/php/main/safe_mode.h -include/php/main/snprintf.h -include/php/main/win95nt.h -include/php/php_version.h -include/php/regex/cclass.h -include/php/regex/cname.h -include/php/regex/regex.h -include/php/regex/regex2.h -include/php/regex/regex_extra.h -include/php/regex/utils.h -lib/php/Archive/Tar.php -lib/php/Console/Getopt.php -lib/php/Crypt/CBC.php -lib/php/Crypt/HCEMD5.php -lib/php/DB.php -lib/php/DB/common.php -lib/php/DB/fbsql.php -lib/php/DB/ibase.php -lib/php/DB/ifx.php -lib/php/DB/msql.php -lib/php/DB/mssql.php -lib/php/DB/mysql.php -lib/php/DB/oci8.php -lib/php/DB/odbc.php -lib/php/DB/pgsql.php -lib/php/DB/storage.php -lib/php/DB/sybase.php -lib/php/Date/Calc.php -lib/php/Date/Human.php -lib/php/File/Find.php -lib/php/File/Passwd.php -lib/php/File/SearchReplace.php -lib/php/HTML/Common.php -lib/php/HTML/Form.php -lib/php/HTML/IT.php -lib/php/HTML/ITX.php -lib/php/HTML/IT_Error.php -lib/php/HTML/Page.php -lib/php/HTML/Processor.php -lib/php/HTML/Select.php -lib/php/HTML/Table.php -lib/php/HTTP.php -lib/php/HTTP/Compress.php -lib/php/Mail.php -lib/php/Mail/RFC822.php -lib/php/Mail/sendmail.php -lib/php/Mail/smtp.php -lib/php/Net/Curl.php -lib/php/Net/Dig.php -lib/php/Net/SMTP.php -lib/php/PEAR.php -lib/php/PEAR/Autoloader.php -lib/php/PEAR/Command.php -lib/php/PEAR/Command/Auth.php -lib/php/PEAR/Command/Common.php -lib/php/PEAR/Command/Config.php -lib/php/PEAR/Command/Install.php -lib/php/PEAR/Command/Package.php -lib/php/PEAR/Command/Registry.php -lib/php/PEAR/Command/Remote.php -lib/php/PEAR/Common.php -lib/php/PEAR/Config.php -lib/php/PEAR/Dependency.php -lib/php/PEAR/Frontend/CLI.php -lib/php/PEAR/Installer.php -lib/php/PEAR/Packager.php -lib/php/PEAR/Registry.php -lib/php/PEAR/Remote.php -lib/php/Schedule/At.php -lib/php/System.php -lib/php/XML/Parser.php -lib/php/build/acinclude.m4 -lib/php/build/dynlib.m4 -lib/php/build/dynlib.mk -lib/php/build/fastgen.sh -lib/php/build/library.mk -lib/php/build/ltlib.mk -lib/php/build/mkdep.awk -lib/php/build/pear.m4 -lib/php/build/program.mk -lib/php/build/rules.mk -lib/php/build/rules_common.mk -lib/php/build/rules_pear.mk -lib/php/build/shtool %%MOD_DIR%%/libphp4.so @exec %D/sbin/apxs -e -a -n php4 %f @unexec %D/sbin/apxs -e -A -n php4 %f -@dirrm include/php/TSRM -@dirrm include/php/Zend -@dirrm include/php/ext/mbstring -@dirrm include/php/ext/session -@dirrm include/php/ext/standard -@dirrm include/php/ext/xml/expat -@dirrm include/php/ext/xml -@dirrm include/php/ext -@dirrm include/php/main -@dirrm include/php/regex -@dirrm include/php -@dirrm lib/php/Archive -@dirrm lib/php/Console -@dirrm lib/php/Crypt -@dirrm lib/php/DB -@dirrm lib/php/Date -@dirrm lib/php/File -@dirrm lib/php/HTML -@dirrm lib/php/HTTP -@dirrm lib/php/Image -@dirrm lib/php/Mail -@dirrm lib/php/Net -@dirrm lib/php/PEAR/Command -@dirrm lib/php/PEAR/Frontend -@dirrm lib/php/PEAR -@dirrm lib/php/Schedule -@dirrm lib/php/XML -@dirrm lib/php/build @dirrm lib/php/extensions/no-debug-%%NON%%zts-20020429 @dirrm lib/php/extensions @dirrm lib/php @exec mkdir -p %D/lib/php/extensions/no-debug-%%NON%%zts-20020429 -@exec mkdir -p %D/lib/php/Image Index: files/patch-Makefile.in =================================================================== RCS file: files/patch-Makefile.in diff -N files/patch-Makefile.in --- files/patch-Makefile.in 19 Dec 2001 19:48:41 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ ---- Makefile.in.orig Sun Apr 22 03:09:12 2001 -+++ Makefile.in Wed Dec 19 20:38:06 2001 -@@ -24,7 +24,11 @@ - - targets = $(LTLIBRARY_NAME) $(PHP_PROGRAM) - -+.if defined(STANDALONE) -+install_targets = install-sapi -+.else - install_targets = install-sapi install-modules -+.endif - - include $(top_srcdir)/build/rules.mk - include $(top_srcdir)/build/library.mk Index: files/patch-aa =================================================================== RCS file: files/patch-aa diff -N files/patch-aa --- files/patch-aa 15 Oct 2001 20:58:57 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ ---- ext/ming/php_ming.h.orig Mon May 28 02:09:57 2001 -+++ ext/ming/php_ming.h Mon Oct 15 22:53:37 2001 -@@ -28,7 +28,10 @@ - - #if HAVE_MING - --#include "ming.h" -+#include "ming/ming.h" -+ -+/* XXX: dirty workaround */ -+#define MING_VERSION_TEXT "0.2a" - - extern zend_module_entry ming_module_entry; - #define ming_module_ptr &ming_module_entry Index: files/patch-ext_mcal_config.m4 =================================================================== RCS file: /home/ncvs/ports/www/mod_php4/files/patch-ext_mcal_config.m4,v retrieving revision 1.3 diff -u -u -r1.3 patch-ext_mcal_config.m4 --- files/patch-ext_mcal_config.m4 2 Dec 2001 21:38:19 -0000 1.3 +++ files/patch-ext_mcal_config.m4 11 Jan 2003 17:44:03 -0000 @@ -1,9 +1,9 @@ ---- ext/mcal/config.m4.orig Tue Mar 27 22:34:31 2001 -+++ ext/mcal/config.m4 Fri Nov 30 09:26:56 2001 -@@ -44,5 +44,14 @@ +--- ext/mcal/config.m4.orig Wed Mar 27 11:26:16 2002 ++++ ext/mcal/config.m4 Fri Jan 3 19:38:46 2003 +@@ -41,5 +41,14 @@ PHP_SUBST(MCAL_SHARED_LIBADD) AC_DEFINE(HAVE_MCAL,1,[ ]) - PHP_EXTENSION(mcal,$ext_shared) + PHP_NEW_EXTENSION(mcal, php_mcal.c, $ext_shared) + cat >> confdefs.h <<\EOF +/* Interfaces to callbacks in libmcal */ +#include Index: files/patch-ext_ming_php_ming.h =================================================================== RCS file: files/patch-ext_ming_php_ming.h diff -N files/patch-ext_ming_php_ming.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-ext_ming_php_ming.h 11 Jan 2003 17:44:03 -0000 @@ -0,0 +1,11 @@ +--- ext/ming/php_ming.h.orig Mon Apr 8 02:46:22 2002 ++++ ext/ming/php_ming.h Fri Jan 3 19:35:55 2003 +@@ -24,7 +24,7 @@ + extern zend_module_entry ming_module_entry; + #define ming_module_ptr &ming_module_entry + +-#include ++#include + + PHP_RINIT_FUNCTION(ming); + PHP_MINIT_FUNCTION(ming); --PNTmBPCT7hxwcZjr-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message