From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 3 08:50:26 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED5C937B405 for ; Thu, 3 Jul 2003 08:50:25 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA17743FFD for ; Thu, 3 Jul 2003 08:50:20 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h63FoKUp060864 for ; Thu, 3 Jul 2003 08:50:20 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h63FoKdr060863; Thu, 3 Jul 2003 08:50:20 -0700 (PDT) Resent-Date: Thu, 3 Jul 2003 08:50:20 -0700 (PDT) Resent-Message-Id: <200307031550.h63FoKdr060863@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alex Dupre Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A406B37B404; Thu, 3 Jul 2003 08:48:52 -0700 (PDT) Received: from vaio.alexdupre.com (ppp-146-16.24-151.libero.it [151.24.16.146]) by mx1.FreeBSD.org (Postfix) with ESMTP id D00884400B; Thu, 3 Jul 2003 08:48:49 -0700 (PDT) (envelope-from alex@vaio.alexdupre.com) Received: from vaio.alexdupre.com (localhost [127.0.0.1]) by vaio.alexdupre.com (8.12.9/8.12.9) with ESMTP id h63FmkL9000397; Thu, 3 Jul 2003 17:48:46 +0200 (CEST) (envelope-from alex@vaio.alexdupre.com) Received: (from alex@localhost) by vaio.alexdupre.com (8.12.9/8.12.9/Submit) id h63FmjDE000396; Thu, 3 Jul 2003 17:48:45 +0200 (CEST) Message-Id: <200307031548.h63FmjDE000396@vaio.alexdupre.com> Date: Thu, 3 Jul 2003 17:48:45 +0200 (CEST) From: Alex Dupre To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: nork@FreeBSD.org Subject: ports/54061: [Maintainer Update] Port: lang/php4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Alex Dupre List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jul 2003 15:50:27 -0000 >Number: 54061 >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: Thu Jul 03 08:50:19 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Alex Dupre >Release: FreeBSD 4.8-ALEXDUPRE i386 >Organization: >Environment: System: FreeBSD 4.8-ALEXDUPRE i386 >Description: Add default overload extension. Add WITH_REGEX_TYPE knob (requested by Jens Rehsack). Small fixes. >How-To-Repeat: >Fix: --- php4.diff begins here --- diff -ruN php4.orig/Makefile php4/Makefile --- php4.orig/Makefile Thu Jul 3 17:04:53 2003 +++ php4/Makefile Thu Jul 3 17:33:02 2003 @@ -7,9 +7,9 @@ # There are many ways to select which extensions you want to enable, either # in interactive mode or in batch mode. # -# By default, the enabled extensions are: CTYPE, MYSQL, PCRE, POSIX, SESSION, -# TOKENIZER, XML and ZLIB. This behaviour can be changed overriding the -# PHP4_OPTIONS variable (e.g. PHP4_OPTIONS="EXT1 EXT2 EXT3"). +# By default, the enabled extensions are: CTYPE, MYSQL, OVERLOAD, PCRE, POSIX, +# SESSION, TOKENIZER, XML and ZLIB. This behaviour can be changed overriding +# the PHP4_OPTIONS variable (e.g. PHP4_OPTIONS="EXT1 EXT2 EXT3"). # # Another way is to use the WITH_ and WITHOUT_ knobs, for additional # and default extensions respectively (implies batch mode). @@ -71,6 +71,18 @@ --with-zlib-dir=/usr \ --disable-all +.if !defined(WITH_REGEX_TYPE) || ${WITH_REGEX_TYPE} == "php" +CONFIGURE_ARGS+=--with-regex=php +.else +.if ${WITH_REGEX_TYPE} == "system" +CONFIGURE_ARGS+=--with-regex=system +.else +.if ${WITH_REGEX_TYPE} == "apache" +CONFIGURE_ARGS+=--with-regex=apache +.endif +.endif +.endif + EXT_DIR= 20020429 SAPI_FILE= "@comment " @@ -107,9 +119,9 @@ ALL_OPTIONS= BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DBASE DBX DOMXML \ DOMXSLT EXIF FILEPRO FRIBIDI FTP GD GDBM GETTEXT GMP HYPERWAVE \ ICONV IMAP INTERBASE INIFILE MBSTRING MCAL MCVE MCRYPT MHASH \ - MIME MING MYSQL NCURSES OPENLDAP OPENSSL ORACLE PCNTL PCRE \ - PDFLIB POSIX POSTGRESQL PSPELL READLINE RECODE SESSION SHMOP \ - SNMP SOCKETS SYBASEDB SYBASECT SYSVSEM SYSVSHM TOKENIZER \ + MIME MING MYSQL NCURSES OPENLDAP OPENSSL ORACLE OVERLOAD PCNTL \ + PCRE PDFLIB POSIX POSTGRESQL PSPELL READLINE RECODE SESSION \ + SHMOP SNMP SOCKETS SYBASEDB SYBASECT SYSVSEM SYSVSHM TOKENIZER \ UNIXODBC WDDX XML XMLRPC XSLT YAZ YP ZIP ZLIB .for opt in ${ALL_OPTIONS} @@ -161,7 +173,7 @@ WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work PHP4_OPTFILE?= ${HOME}/php4_options -PHP4_OPTIONS?= CTYPE MYSQL PCRE POSIX SESSION TOKENIZER XML ZLIB +PHP4_OPTIONS?= CTYPE MYSQL OVERLOAD PCRE POSIX SESSION TOKENIZER XML ZLIB .for opt in ${ALL_OPTIONS} .if defined(WITH_${opt}) @@ -202,18 +214,18 @@ WITH_ICONV_DEP= yes .endif -.if defined(WITH_POSTGRESQL) -WITH_OPENSSL_DEP= yes -.endif - .if defined(WITH_SNMP) WITH_OPENSSL= yes .endif -.if defined(WITH_WDDX) || defined(WITH_XMLRPC) || defined(WITH_XSLT) +.if defined(WITH_XMLRPC) || defined(WITH_XSLT) WITH_XML_DEP= yes .endif +.if defined(WITH_WDDX) +WITH_XML= yes +.endif + .if defined(WITH_BCMATH) CONFIGURE_ARGS+=--enable-bcmath .endif @@ -296,6 +308,7 @@ LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg CONFIGURE_ARGS+=--with-gd \ --enable-gd-native-ttf \ + --enable-gd-jis-conv \ --with-freetype-dir=${LOCALBASE} \ --with-jpeg-dir=${LOCALBASE} \ --with-png-dir=${LOCALBASE} @@ -444,6 +457,10 @@ BUILD_DEPENDS+= ${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client RUN_DEPENDS+= ${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client CONFIGURE_ARGS+=--with-oracle=${LOCALBASE}/oracle7 +.endif + +.if defined(WITH_OVERLOAD) +CONFIGURE_ARGS+=--enable-overload .endif .if defined(WITH_PCNTL) diff -ruN php4.orig/pkg-message php4/pkg-message --- php4.orig/pkg-message Thu Jul 3 17:04:53 2003 +++ php4/pkg-message Thu Jul 3 17:13:43 2003 @@ -2,8 +2,8 @@ You have installed the php4 package. -Have a look at the php4 port if you need additional extensions -other than ctype, MySQL, PCRE, POSIX, session, tokenizer, XML and ZLIB. +Have a look at the php4 port if you need additional extensions other than +CTYPE, MYSQL, OVERLOAD, PCRE, POSIX, SESSION, TOKENIZER, XML and ZLIB. You can find it at ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/lang/php4.tar diff -ruN php4.orig/scripts/configure.php php4/scripts/configure.php --- php4.orig/scripts/configure.php Thu Jul 3 17:04:53 2003 +++ php4/scripts/configure.php Thu Jul 3 17:12:21 2003 @@ -54,6 +54,7 @@ OPENLDAP "OpenLDAP support" ${WITH_OPENLDAP:-OFF} \ OPENSSL "OpenSSL support" ${WITH_OPENSSL:-OFF} \ ORACLE "Oracle support" ${WITH_ORACLE:-OFF} \ +OVERLOAD "user-space object overloading support" ${WITH_OVERLOAD:-OFF} \ PCNTL "pcntl support (CLI only)" ${WITH_PCNTL:-OFF} \ PCRE "Perl Compatible Regular Expression support" ${WITH_PCRE:-OFF} \ PDFLIB "PDFlib support" ${WITH_PDFLIB:-OFF} \ @@ -72,7 +73,7 @@ SYSVSHM "System V shared memory support" ${WITH_SYSVSHM:-OFF} \ TOKENIZER "tokenizer support" ${WITH_TOKENIZER:-OFF} \ UNIXODBC "unixODBC support" ${WITH_UNIXODBC:-OFF} \ -WDDX "WDDX support" ${WITH_WDDX:-OFF} \ +WDDX "WDDX support (implies XML)" ${WITH_WDDX:-OFF} \ XML "XML support" ${WITH_XML:-OFF} \ XMLRPC "XMLRPC-EPI support" ${WITH_XMLRPC:-OFF} \ XSLT "XSLT Sablotron support" ${WITH_XSLT:-OFF} \ diff -ruN php4.orig/scripts/php4_options php4/scripts/php4_options --- php4.orig/scripts/php4_options Thu Jul 3 17:04:53 2003 +++ php4/scripts/php4_options Thu Jul 3 17:12:41 2003 @@ -34,6 +34,7 @@ WITH_OPENLDAP=OFF WITH_OPENSSL=OFF WITH_ORACLE=OFF +WITH_OVERLOAD=ON WITH_PCNTL=OFF WITH_PCRE=ON WITH_PDFLIB=OFF --- php4.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: