From root@helo.liwing.de  Thu Jun 26 02:23:56 2003
Return-Path: <root@helo.liwing.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id AEB0637B401; Thu, 26 Jun 2003 02:23:56 -0700 (PDT)
Received: from helo.liwing.de (helo.liwing.de [213.70.188.163])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id A1EE744025; Thu, 26 Jun 2003 02:23:55 -0700 (PDT)
	(envelope-from root@helo.liwing.de)
Received: from helo.liwing.de (localhost.liwing.de [127.0.0.1])
	by helo.liwing.de (8.12.7/8.12.7) with ESMTP id h5Q9Np3F002573;
	Thu, 26 Jun 2003 09:23:51 GMT
	(envelope-from root@helo.liwing.de)
Received: (from root@localhost)
	by helo.liwing.de (8.12.7/8.12.7/Submit) id h5Q9NoaC002572;
	Thu, 26 Jun 2003 09:23:50 GMT
Message-Id: <200306260923.h5Q9NoaC002572@helo.liwing.de>
Date: Thu, 26 Jun 2003 09:23:50 GMT
From: Jens Rehsack <rehsack@liwing.de>
Reply-To: Jens Rehsack <rehsack@liwing.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Jens Rehsack <rehsack@liwing.de>,
	Alex Dupre <sysadmin@alexdupre.com>,
	Norikatsu Shigemura <nork@freebsd.org>
Subject: [patch] lang/php4 for being able to disable ipv6
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         53754
>Category:       ports
>Synopsis:       [patch] lang/php4 for being able to disable ipv6
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    nork
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 26 02:30:12 PDT 2003
>Closed-Date:    Wed Jul 02 23:03:30 PDT 2003
>Last-Modified:  Wed Jul 02 23:03:30 PDT 2003
>Originator:     Jens Rehsack
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
LiWing IT-Services
>Environment:
System: FreeBSD webdev.muppets.liwing.de 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Sun Jun 22 10:22:35 GMT 2003 root@webdev.muppets.liwing.de:/usr/obj/usr/src/sys/WEBDEV i386


	All OS versions where lang/php4 automatically add's ipv6 support
>Description:
	This patch is a solution the maintainer seems not to like but I think it should discussed. The requirement of disabling IPv6
	when it's not supported by OS (because it's not compiled in) is IMHO not worth to be ignored. If someone has a better solution,
	I would be glad to hear, but as long as none is available, I recommend this solution.

	I also recommend not to make only extensions selectable, because other features maybe useful, too.
	An example for this is the availability for -CLI, -SAPI and -CGI slave ports.
>How-To-Repeat:
	
>Fix:

	

--- patch-ipv6-Makefile.diff begins here ---
--- lang/php4/Makefile.orig	Wed Jun 25 01:35:17 2003
+++ lang/php4/Makefile	Wed Jun 25 08:12:21 2003
@@ -106,10 +106,10 @@
 
 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 \
+		ICONV IMAP INTERBASE INIFILE IPV6 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 \
 		UNIXODBC WDDX XML XMLRPC XSLT YAZ YP ZIP ZLIB
 
 .for opt in ${ALL_OPTIONS}
@@ -127,7 +127,11 @@
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400014
-CONFIGURE_ARGS+=--disable-ipv6
+WITHOUT_IPV6=	ON
+.else
+.ifndef WITHOUT_IPV6
+WITH_IPV6?=	ON
+.endif
 .endif
 
 .if !defined(WITHOUT_APACHE)
@@ -357,6 +361,12 @@
 .if defined(WITH_INTERBASE)
 LIB_DEPENDS+=	gds.1:${PORTSDIR}/databases/firebird
 CONFIGURE_ARGS+=--with-interbase=${LOCALBASE}/firebird
+.endif
+
+.if defined(WITH_IPV6)
+CONFIGURE_ARGS+=--enable-ipv6
+.else
+CONFIGURE_ARGS+=--disable-ipv6
 .endif
 
 .if defined(WITH_MBSTRING)
--- patch-ipv6-Makefile.diff ends here ---

--- patch-ipv6-scripts_configure.diff begins here ---
--- lang/php4/scripts/configure.php.orig	Wed Jun 25 01:35:17 2003
+++ lang/php4/scripts/configure.php	Wed Jun 25 07:40:29 2003
@@ -42,6 +42,7 @@
 IMAP		"IMAP support" ${WITH_IMAP:-OFF} \
 INIFILE		"INI file support (dba)" ${WITH_INIFILE:-OFF} \
 INTERBASE	"Interbase 6 database support (Firebird)" ${WITH_INTERBASE:-OFF} \
+IPV6		"Internet Protocol v6" ${WITH_IPV6:-OFF} \
 MBSTRING	"multibyte string support" ${WITH_MBSTRING:-OFF} \
 MCAL		"Modular Calendar Access Library support" ${WITH_MCAL:-OFF} \
 MCVE		"MCVE support" ${WITH_MCVE:-OFF} \
--- patch-ipv6-scripts_configure.diff ends here ---

--- patch-ipv6-scripts_php4_options.diff begins here ---
--- lang/php4/scripts/php4_options.orig	Wed Jun 25 07:39:00 2003
+++ lang/php4/scripts/php4_options	Wed Jun 25 07:39:23 2003
@@ -22,6 +22,7 @@
 WITH_IMAP=OFF
 WITH_INIFILE=OFF
 WITH_INTERBASE=OFF
+WITH_IPV6=OFF
 WITH_MBSTRING=OFF
 WITH_MCAL=OFF
 WITH_MCVE=OFF
--- patch-ipv6-scripts_php4_options.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->analyzed 
State-Changed-By: nork 
State-Changed-When: Thu Jun 26 02:38:59 PDT 2003 
State-Changed-Why:  
Humm..  I understand your description.  I think that's right. 
I'm waiting for MAINTAINER's response. 


Responsible-Changed-From-To: freebsd-ports-bugs->nork 
Responsible-Changed-By: nork 
Responsible-Changed-When: Thu Jun 26 02:38:59 PDT 2003 
Responsible-Changed-Why:  
I'll handle this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=53754 
State-Changed-From-To: analyzed->closed 
State-Changed-By: nork 
State-Changed-When: Wed Jul 2 23:03:08 PDT 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=53754 
>Unformatted:
