Date: Tue, 4 Nov 2003 10:45:32 +0100 (CET) From: Alex Dupre <sysadmin@alexdupre.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: nork@FreeBSD.org Subject: ports/58914: [Maintainer Update] Port: lang/php4 Message-ID: <200311040945.hA49jWM0031262@armada.alexdupre.com> Resent-Message-ID: <200311040950.hA49oIb6036940@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 58914 >Category: ports >Synopsis: [Maintainer Update] Port: lang/php4 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Nov 04 01:50:18 PST 2003 >Closed-Date: >Last-Modified: >Originator: Alex Dupre >Release: FreeBSD 5.1-CURRENT i386 >Organization: >Environment: System: FreeBSD armada.alexdupre.com 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Tue Nov 4 00:49:58 CET 2003 alex@armada.alexdupre.com:/usr/obj/usr/src/sys/ARMADA i386 >Description: Update to 4.3.4 final release. >How-To-Repeat: >Fix: --- php4.diff begins here --- diff -ruN php4.orig/Makefile php4/Makefile --- php4.orig/Makefile Tue Nov 4 10:16:46 2003 +++ php4/Makefile Tue Nov 4 10:27:21 2003 @@ -20,7 +20,7 @@ # PORTNAME= php4 -PORTVERSION= 4.3.4.r1 +PORTVERSION= 4.3.4 PORTREVISION= 0 CATEGORIES?= lang devel www MASTER_SITES= http://www.php.net/distributions/:release \ @@ -45,7 +45,7 @@ .endif .endif DISTNAME= php-${PORTVERSION:S/.r/RC/} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:rc +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:release MAINTAINER?= sysadmin@alexdupre.com COMMENT= PHP Scripting Language (Apache Module and CLI) @@ -143,13 +143,6 @@ IS_INTERACTIVE= yes .endif -.if !defined(WITHOUT_APACHE) -APXS?= ${LOCALBASE}/sbin/apxs -PLIST_SUB+= APACHE="" -.else -PLIST_SUB+= APACHE="@comment " -.endif - WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work PHP4_OPTFILE?= ${HOME}/php4_options @@ -342,7 +335,7 @@ .endif .if defined(WITH_MBSTRING) -CONFIGURE_ARGS+=--enable-mbstring --enable-mbregex +CONFIGURE_ARGS+=--enable-mbstring .endif .if defined(WITH_MCAL) @@ -529,6 +522,7 @@ .include <bsd.port.pre.mk> .if !defined(WITHOUT_APACHE) +APXS?= ${LOCALBASE}/sbin/apxs .if exists(${LOCALBASE}/include/apache2/apr.h) WITH_APACHE2= yes .endif diff -ruN php4.orig/distinfo php4/distinfo --- php4.orig/distinfo Tue Nov 4 10:16:46 2003 +++ php4/distinfo Tue Nov 4 10:20:04 2003 @@ -1 +1 @@ -MD5 (php-4.3.4RC1.tar.bz2) = f7ff7bf763f917b9f955e19caf77c1f1 +MD5 (php-4.3.4.tar.bz2) = b9dd601863e08e52e3c4d5e02c2627cf diff -ruN php4.orig/files/patch-configure php4/files/patch-configure --- php4.orig/files/patch-configure Tue Nov 4 10:16:46 2003 +++ php4/files/patch-configure Tue Nov 4 10:23:00 2003 @@ -228,7 +228,7 @@ @@ -58977,8 +59151,8 @@ echo $ac_n "checking Oracle version""... $ac_c" 1>&6 - echo "configure:59852: checking Oracle version" >&5 + echo "configure:60535: checking Oracle version" >&5 - if test -s "$ORACLE_DIR/orainst/unix.rgs"; then - ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/ */:/g' | cut -d: -f 6 | cut -c 2-4` + if test -s "$ORACLE_DIR/ocommon/install/partial.prd"; then diff -ruN php4.orig/pkg-plist php4/pkg-plist --- php4.orig/pkg-plist Tue Nov 4 10:16:46 2003 +++ php4/pkg-plist Tue Nov 4 10:34:05 2003 @@ -57,24 +57,10 @@ include/php/Zend/zend_types.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_cn.h -include/php/ext/mbstring/mbfilter_ja.h -include/php/ext/mbstring/mbfilter_kr.h -include/php/ext/mbstring/mbfilter_ru.h -include/php/ext/mbstring/mbfilter_tw.h -include/php/ext/mbstring/mbregex.h include/php/ext/mbstring/mbstring.h include/php/ext/mbstring/php_mbregex.h include/php/ext/mbstring/php_unicode.h include/php/ext/mbstring/unicode_data.h -include/php/ext/mbstring/unicode_table.h -include/php/ext/mbstring/unicode_table_cn.h -include/php/ext/mbstring/unicode_table_ja.h -include/php/ext/mbstring/unicode_table_kr.h -include/php/ext/mbstring/unicode_table_ru.h -include/php/ext/mbstring/unicode_table_tw.h include/php/ext/pgsql/php_pgsql.h include/php/ext/session/mod_files.h include/php/ext/session/mod_mm.h --- php4.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311040945.hA49jWM0031262>