Unfinished package

3 files changed, 62 insertions, 35 deletions

diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index 661982ab661..a926ef97001 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.19 2007/09/24 22:31:16 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2007/10/29 16:04:53 shannonjr Exp $
 
 DISTNAME=	xorg-server-1.3.0.0
 PKGNAME=	modular-${DISTNAME}
-PKGREVISION=	3
-CATEGORIES=	x11
+CATEGORIES=	local
 MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/
 EXTRACT_SUFX=	.tar.bz2
 
 SPECIAL_PERMS+=	bin/Xorg ${SETUID_ROOT_PERMS}
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-MAINTAINER=	joerg@NetBSD.org
+MAINTAINER=	shannonjr@NetBSD.org
 COMMENT=	Xorg X11 Server from modular X.org X11
 
 USE_LIBTOOL=		YES
@@ -19,34 +18,23 @@ PKGCONFIG_OVERRIDE+=	xorg-server.pc.in
 USE_TOOLS+=		pkg-config
 USE_TOOLS+=		gmake
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
-CONFIGURE_ARGS+=	--enable-dri
 
-PKG_SUPPORTED_OPTIONS=	dri
+PKG_SUPPORTED_OPTIONS=	xglx
 PKG_OPTIONS_VAR=	PKG_OPTIONS.xorg-server
 PKG_OPTIONS_LEGACY_OPTS=glx:dri
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mdri)
-DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
-DISTFILES+=		MesaLib-6.5.2.tar.bz2
-SITES.MesaLib-6.5.2.tar.bz2= ${MASTER_SITE_SOURCEFORGE:=mesa3d/}
-MESA_SRC=		${WRKDIR}/Mesa-6.5.2
-CONFIGURE_ARGS+=	--enable-glx
-CONFIGURE_ARGS+=	--with-mesa-source=${MESA_SRC}
-.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64" || \
-    ${MACHINE_ARCH} == "alpha"
-GLX_DEFINES+=		-D__GLX_ALIGN64
-.endif
+.if !empty(PKG_OPTIONS:Mxglx)
 CONFIGURE_ENV+=		GLX_DEFINES=${GLX_DEFINES:M*:Q}
-# glcore.h and dri_interface.h shipped with *proto are older than
-# those in Mesa-6.5.2. Either patch them or trick the build into using
-# the newer ones.
-#BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.8nb1
-#BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.0.3nb1
 PLIST_SUBST+=		USE_DRI=""
-.else
-CONFIGURE_ARGS+=	--disable-glx
-PLIST_SUBST+=		USE_DRI="@comment "
+CONFIGURE_ARGS+=	--enable-xglx
+CONFIGURE_ARGS+=	--enable-xgl
+CONFIGURE_ARGS+=	--enable-xkb
+CONFIGURE_ARGS+=	--disable-dri
+CONFIGURE_ARGS+=	--disable-kdriveserver
+CONFIGURE_ARGS+=	--enable-dlopen
+AUTOCONF_REQD=		2.61
+USE_TOOLS+=		autoconf
 .endif
 
 CONFIGURE_ENV+=	APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5
@@ -61,19 +49,25 @@ BUILDLINK_API_DEPENDS.fixesproto+=	fixesproto>=4.0
 BUILDLINK_API_DEPENDS.kbproto+=		kbproto>=1.0.3
 BUILDLINK_API_DEPENDS.randrproto+=	randrproto>=1.2.1
 
+
 post-extract:
 	${CP} ${FILESDIR}/modeline2c.awk ${WRKSRC}/hw/xfree86/common
 .if !empty(PKG_OPTIONS:Mdri)
 	${LN} -s ${MESA_SRC:Q}/include/GL ${WRKSRC:Q}/GL/glx/GL
 .endif
 
+.if !empty(PKG_OPTIONS:Mxglx)
+pre-configure:
+	cd ${WRKSRC} && autoconf
+
+.include "../../graphics/glitz/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.endif
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/libfontenc/buildlink3.mk"
-.if empty(PKG_OPTIONS:Mdri)
-# for GLX we already have the Mesa source
-.include "../../graphics/MesaLib/buildlink3.mk"
-.endif
+.include "../../mk/dlopen.buildlink3.mk"
 .include "../../x11/bigreqsproto/buildlink3.mk"
 .include "../../x11/compositeproto/buildlink3.mk"
 .include "../../x11/damageproto/buildlink3.mk"
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index 90623b13957..f82e809db16 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2007/08/24 16:43:28 joerg Exp $
+$NetBSD: distinfo,v 1.16 2007/10/29 16:04:53 shannonjr Exp $
 
 SHA1 (MesaLib-6.5.2.tar.bz2) = ba860bb6ee57c02202342dfd5927464a068ea18f
 RMD160 (MesaLib-6.5.2.tar.bz2) = 9a92d69110c066ae6734bcaafb78f222ac2df6d3
@@ -7,7 +7,7 @@ SHA1 (xorg-server-1.3.0.0.tar.bz2) = 6f9645fe70da5b6a121f3e8fa6c2fc1e4307390c
 RMD160 (xorg-server-1.3.0.0.tar.bz2) = 1a4fecd73aed0d5adabe84066c24ce69dc2c2dc1
 Size (xorg-server-1.3.0.0.tar.bz2) = 5968263 bytes
 SHA1 (patch-aa) = f72780165c9ecd3e9ab31d03c1b2d777290d09e2
-SHA1 (patch-ab) = d99c045eff730b3fbdc92938faaa75b653640c58
+SHA1 (patch-ab) = 59c5219e44f5991da6f3882c46a1a7defde09a10
 SHA1 (patch-ad) = 752235269f10daade0bf60665cccde39d1583064
 SHA1 (patch-af) = 6c58872798a30b31154dd7b167c84bf20ac417be
 SHA1 (patch-ag) = 222427db3e1bdbf977e992aa91aae5f16992345a
@@ -18,6 +18,22 @@ SHA1 (patch-db) = 28913a094c8499536a71c8d4d7ca57a5efb25b39
 SHA1 (patch-dc) = 75df6f37b1cbc9574adb5ee66cb84d0f5ebac853
 SHA1 (patch-dd) = cfb7c9d470098b0fcfcddbe9a1363a14f762fe19
 SHA1 (patch-de) = f887f3fd09406006b6165779b74be780b7fddd18
+SHA1 (patch-ma) = 26c9cd9ad7fe3c96b929e0d07f27c9acede8d656
+SHA1 (patch-mb) = b3d80c5048f3c18517798a8b6286f32b710fd49e
+SHA1 (patch-mc) = 2c4adeda5cd5f8256017aad18fc690c33427766c
+SHA1 (patch-md) = e9640eaa104c6c7302917a35843bf10253a02e05
+SHA1 (patch-me) = e4c23011300690340f5d6edd1c02e07b278e7c28
+SHA1 (patch-mf) = 6ff39bfec26e3e9070e66119ef9b1c5e9eca6976
+SHA1 (patch-mg) = 42598a22a2bcc75d29c61f9ca7a4b352789066d4
+SHA1 (patch-mh) = 6270e23dba9c30459d2bc61df8bc11111df56a31
+SHA1 (patch-mi) = 44b11ee207f49ae1b113ab7b62a32c1ad3adbe37
+SHA1 (patch-mj) = ccf7526b6dc8e84a5747906980d2052c77a4ac8e
+SHA1 (patch-mk) = 982c5d69ff3bd1ac529be12c18da23c4d9384990
+SHA1 (patch-ml) = 5a695f6506a566f04b02d140961441dbee9a5cfe
+SHA1 (patch-mm) = d95b1492ddb8456b673a952e08d4d9fe68e9e64d
+SHA1 (patch-mn) = 48d7fee7daf6fa394b5fb7c564cbaf430fd1d238
+SHA1 (patch-mo) = 1bbda4b3881e72cf704eac0453c1cfe557c3fc8c
+SHA1 (patch-qa) = 06f14ba4f0ebf9ee829881dddb7012751c582ab6
 SHA1 (patch-sa) = 5586e998e2239b6851291b5f79b2e6009c78b174
 SHA1 (patch-sb) = b769780b446e4f10bc99ccd3373d666daf44f863
 SHA1 (patch-sc) = 33c4d4731e3732032f84946fc17e28d0cba389a6
diff --git a/x11/modular-xorg-server/patches/patch-ab b/x11/modular-xorg-server/patches/patch-ab
index e1f988afe98..62cac7bbf70 100644
--- a/x11/modular-xorg-server/patches/patch-ab
+++ b/x11/modular-xorg-server/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.4 2007/08/24 16:43:28 joerg Exp $
+$NetBSD: patch-ab,v 1.5 2007/10/29 16:04:54 shannonjr Exp $
 
---- configure.orig	2007-04-20 01:25:26.000000000 +0000
+--- configure.orig	2007-04-19 19:25:26.000000000 -0600
 +++ configure
 @@ -24767,6 +24767,10 @@ _ACEOF
  #define USE_DEV_IO 1
@@ -59,7 +59,15 @@ $NetBSD: patch-ab,v 1.4 2007/08/24 16:43:28 joerg Exp $
  
  if test $VERSION_SNAP = "0"; then
  	if test $VERSION_PATCH = "0"; then
-@@ -30903,7 +30904,7 @@ cat >>confdefs.h <<_ACEOF
+@@ -30426,7 +30427,6 @@ else
+   XGL_FALSE=
+ fi
+ 
+-
+ if test "x$XGL" = xyes; then
+ 	XGL_LIBS="$FB_LIB $MI_LIB $COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $MIEXT_LAYER_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
+ 
+@@ -30903,7 +30903,7 @@ cat >>confdefs.h <<_ACEOF
  _ACEOF
  
  		;;
@@ -68,7 +76,7 @@ $NetBSD: patch-ab,v 1.4 2007/08/24 16:43:28 joerg Exp $
  	  	XORG_OS="freebsd"
  		XORG_OS_SUBDIR="bsd"
  		XORG_OS_KBD="BSD"
-@@ -31146,7 +31147,14 @@ echo "$as_me: error: Your OS is unknown.
+@@ -31146,7 +31146,14 @@ echo "$as_me: error: Your OS is unknown.
  		;;
  	  sparc*)
  		xorg_bus_sparcpci="yes"
@@ -84,3 +92,12 @@ $NetBSD: patch-ab,v 1.4 2007/08/24 16:43:28 joerg Exp $
  		;;
  	  x86_64*|amd64*)
  		case $host_os in
+@@ -35222,6 +35229,8 @@ do
+   case $ac_option in
+   # Handling of the options.
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++	: Avoid regenerating within pkgsrc
++	exit 0
+     ac_cs_recheck=: ;;
+   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+     echo "$ac_cs_version"; exit ;;