ports/63637: [patch] x11-servers/XFree86-4-Server-snap: Add WITHOUT_IPV6 knob

[Simon Barner]

>Number:         63637
>Category:       ports
>Synopsis:       [patch] x11-servers/XFree86-4-Server-snap: Add WITHOUT_IPV6 knob
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 02 03:10:18 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Simon Barner
>Release:        FreeBSD 4.9 i386
>Organization:
>Environment:
System: FreeBSD zi025.glhnet.mhn.de 4.9-STABLE FreeBSD 4.9-STABLE #0: Tue Feb 10 01:57:14 CET 2004     simon at zi025.glhnet.mhn.de:/usr/src/sys/compile/KISTE  i386

>Description:

When I tried to run the lastest XFree86 server (4.3.99.15), it
complained that IPv6 was not available, and it refused to start.

Since switching to an IPv6-enabled kernel made XFree start again, I am
sure that the lacking IPv6 support and not my upgrade from XFree 4.3.0_14
to the -snap version was the source of my trouble.

The following patch adds an WITHOUT_IPV6 knob to the
XFree86-4-Server-snap port (the port for 4.3.0 defaults to disable IPv6,
so no patch is needed there).

>How-To-Repeat:

Try to run XFree86 4.3.9.15 on a kernel without IPv6 support.

>Fix:

Apply the following patch to the XFree86-4-Server-snap port, and rebuild
it with `make -DWITHOUT_IPV6'.

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server-snap/Makefile,v
retrieving revision 1.150
diff -u -r1.150 Makefile
--- Makefile	12 Feb 2004 20:16:05 -0000	1.150
+++ Makefile	2 Mar 2004 10:52:20 -0000
@@ -42,7 +42,8 @@
 USE_BZIP2=		yes
 SCRIPTS_ENV=		OSVERSION=${OSVERSION} \
 			BuildXF86DRI=${BuildXF86DRI} \
-			WITH_DEBUG="${WITH_DEBUG}"
+			WITH_DEBUG="${WITH_DEBUG}"\
+			WITHOUT_IPV6="${WITHOUT_IPV6}"
 MAN1=			XFree86.1 \
 			Xserver.1 \
 			gtf.1 \
Index: scripts/configure
===================================================================
RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server-snap/scripts/configure,v
retrieving revision 1.80
diff -u -r1.80 configure
--- scripts/configure	13 Nov 2003 10:33:55 -0000	1.80
+++ scripts/configure	2 Mar 2004 10:52:20 -0000
@@ -77,6 +77,10 @@
 	echo "#define FreeBSDCFLAGS ${CFLAGS}"	>> $LOCALDEF
 fi
 
+if [ X$WITHOUT_IPV6 != X ]; then
+	echo "#define BuildIPv6 NO"		>> $LOCALDEF
+fi
+
 # We need to test cards on these architectures and see what can be added 
 # to the other architectures.
 cat >> $LOCALDEF <<END
>Release-Note:
>Audit-Trail:
>Unformatted: