pkg/37102: x11/modular-xorg-server fails to build without ipv6

[Yakovetsky Vladimir <yx%x.ua@localhost>]

>Number:         37102
>Category:       pkg
>Synopsis:       x11/modular-xorg-server fails to build without ipv6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Oct 10 15:35:00 +0000 2007
>Originator:     Yakovetsky Vladimir
>Release:        NetBSD 4.99.31
>Organization:
>Environment:
System: NetBSD lrou.x.ua 4.99.31 NetBSD 4.99.31 (lrou_odd-1.852) #0: Sun Sep 30 
18:16:16 EEST 2007 yx%lrou.x.ua@localhost:/sys/arch/i386/compile/lrou_odd i386
Architecture: i386
Machine: i386

>Description:
        x11/modular-xorg-server fails to build without ipv6
        (i.e. fails with x11/xtrans/patches/patch-aa,v 1.2).

>How-To-Repeat:
% grep -i inet6 /etc/mk.conf
MKINET6=                no
PKG_DEFAULT_OPTIONS+=   -inet6

% grep X11 /etc/mk.conf
X11_TYPE=               modular

% ident /usr/pkgsrc/x11/xtrans/patches/patch-aa
/usr/pkgsrc/x11/xtrans/patches/patch-aa:
     $NetBSD: patch-aa,v 1.2 2007/10/07 12:39:29 joerg Exp $

% cd /usr/pkgsrc/x11/modular-xorg-server && make update
...
checking if IPv6 support should be built... yes
...
cc -DHAVE_XORG_CONFIG_H -Wall -Wpointer-arith -Wstrict-prototypes 
-Wmissing-prototypes -Wmissing-declarations -Wnested-externs 
-fno-strict-aliasing -D_BSD_SOURCE -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT 
-D_POSIX_THREAD_SAFE_FUNCTIONS 
-I/usr/obj/x11/modular-xorg-server/work/.buildlink/include 
-I/usr/obj/x11/modular-xorg-server/work/.buildlink/include/freetype2 
-I../../include -I../../Xext -I../../composite -I../../damageext -I../../xfixes 
-I../../Xi -I../../mi -I../../miext/shadow -I../../miext/damage -I../../render 
-I../../randr -I../../fb -O2 -mfpmath=sse -msse2 -march=pentium4 
-finline-functions -fomit-frame-pointer -ffast-math -Wl,-R/usr/pkg/lib -o Xorg 
-rdynamic xorg.o  -L/usr/obj/x11/modular-xorg-server/work/.buildlink/lib 
../../dix/.libs/libdix.a common/libinit.a loader/libloader.a 
./.libs/libosandcommon.a rac/librac.a parser/libxf86config.a 
dixmods/.libs/libdixmods.a modes/libxf86modes.a ramdac/libramdac.a ddc/libddc.a 
i2c/libi2c.a ../../composite/.libs/libcomposite.a ../../!
 mi/.libs/libmi.a ../../xfixes/.libs/libxfixes.a 
../../Xext/.libs/libXextbuiltin.a ../../GL/glx/.libs/libglx.a 
../../GL/mesa/.libs/libGLcore.a ../../render/.libs/librender.a 
../../randr/.libs/librandr.a ../../damageext/.libs/libdamageext.a 
../../miext/damage/.libs/libdamage.a ../../miext/cw/.libs/libcw.a 
../../miext/shadow/.libs/libshadow.a ../../Xi/.libs/libXi.a 
../../xkb/.libs/libxkb.a ../../dix/.libs/libxpstubs.a ../../os/.libs/libos.a 
/usr/obj/x11/modular-xorg-server/work/.buildlink/lib/libXfont.so 
/usr/obj/x11/modular-xorg-server/work/.buildlink/lib/libfreetype.so 
/usr/obj/x11/modular-xorg-server/work/.buildlink/lib/libXau.so 
/usr/obj/x11/modular-xorg-server/work/.buildlink/lib/libfontenc.so -lz 
/usr/obj/x11/modular-xorg-server/work/.buildlink/lib/libXdmcp.so -li386 
dixmods/.libs/libxorgxkb.a -lm   -Wl,--rpath 
-Wl,/usr/obj/x11/modular-xorg-server/work/.buildlink/lib -Wl,--rpath 
-Wl,/usr/obj/x11/modular-xorg-server/work/.buildlink/lib
../../os/.libs/libos.a(xstrans.o): In function 
`_XSERVTransSocketINETCreateListener':
xstrans.c:(.text+0x229b): undefined reference to `in6addr_any'
gmake[4]: *** [Xorg] Error 1
gmake[4]: Leaving directory 
`/usr/obj/x11/modular-xorg-server/work/xorg-server-1.3.0.0/hw/xfree86'
gmake[3]: *** [all-recursive] Error 1
gmake[3]: Leaving directory 
`/usr/obj/x11/modular-xorg-server/work/xorg-server-1.3.0.0/hw/xfree86'
gmake[2]: *** [all] Error 2
gmake[2]: Leaving directory 
`/usr/obj/x11/modular-xorg-server/work/xorg-server-1.3.0.0/hw/xfree86'
gmake[1]: *** [all-recursive] Error 1
gmake[1]: Leaving directory 
`/usr/obj/x11/modular-xorg-server/work/xorg-server-1.3.0.0/hw'
gmake: *** [all-recursive] Error 1
*** Error code 2

Stop.


>Fix:
--- x11/modular-xorg-server/Makefile.orig
+++ x11/modular-xorg-server/Makefile
@@ -24,8 +24,16 @@
 PKG_SUPPORTED_OPTIONS= dri
 PKG_OPTIONS_VAR=       PKG_OPTIONS.xorg-server
 PKG_OPTIONS_LEGACY_OPTS=glx:dri
+PKG_SUPPORTED_OPTIONS+=        inet6
+
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=       --enable-ipv6
+.else
+CONFIGURE_ARGS+=       --disable-ipv6
+.endif
+
 .if !empty(PKG_OPTIONS:Mdri)
 DISTFILES=             ${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=            MesaLib-6.5.2.tar.bz2