Add one small patch and drop the autoconf dependency.

3 files changed, 25 insertions, 7 deletions

diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index c1da332501b..29efc93cddc 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2008/09/18 20:56:01 bjs Exp $
+# $NetBSD: Makefile,v 1.33 2008/09/23 11:23:56 joerg Exp $
 #
 
 DISTNAME=	xorg-server-1.4.2
@@ -19,7 +19,7 @@ SPECIAL_PERMS+=		bin/Xorg ${SETUID_ROOT_PERMS}
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	autoconf automake autoreconf gm4 gmake pkg-config
+USE_TOOLS+=	gmake pkg-config
 
 PKGCONFIG_OVERRIDE+=	xorg-server.pc.in
 SHLIBTOOL_OVERRIDE=	# empty
@@ -84,10 +84,6 @@ post-extract: dri-post-extract
 	${CP} ${FILESDIR}/modeline2c.awk ${WRKSRC}/hw/xfree86/common
 	${RM} -f ${WRKSRC}/Mesa-${MESA_VERSION}/docs/README.MINGW32.orig
 
-pre-configure:
-	cd ${WRKSRC} && \
-	${SETENV} ${CONFIGURE_ENV} autoreconf -v --install
-
 .include "options.mk"
 
 .include "../../devel/ncurses/buildlink3.mk"
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index 4a704a901c5..0f84c84a045 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2008/09/18 20:56:01 bjs Exp $
+$NetBSD: distinfo,v 1.25 2008/09/23 11:23:56 joerg Exp $
 
 SHA1 (MesaLib-7.0.4.tar.bz2) = 7e2ecbe89d245510d2681d04e959aee6adc205c5
 RMD160 (MesaLib-7.0.4.tar.bz2) = 0394bb9e00ea13f2399bc5895d4264221bbc03ac
@@ -13,6 +13,7 @@ SHA1 (patch-aa) = 05ded41f5d114b2d21bce2629999ea5758ae7e87
 SHA1 (patch-ab) = 20b62798fd6f4ea173f827a5e122cf95f4673983
 SHA1 (patch-ac) = 0e7d01cbdd692b75256318a0309551f6e5d2f5ec
 SHA1 (patch-ad) = 57f9b5413d0c48ac12343f9d75879a46bd334931
+SHA1 (patch-ae) = 814f46c830384292683b38261386d113897b66d1
 SHA1 (patch-ah) = b92699ae5913459799b8b870664786b3583e292d
 SHA1 (patch-sa) = 5586e998e2239b6851291b5f79b2e6009c78b174
 SHA1 (patch-sb) = b769780b446e4f10bc99ccd3373d666daf44f863
diff --git a/x11/modular-xorg-server/patches/patch-ae b/x11/modular-xorg-server/patches/patch-ae
new file mode 100644
index 00000000000..e666cfb339c
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-ae
@@ -0,0 +1,21 @@
+$NetBSD: patch-ae,v 1.7 2008/09/23 11:23:56 joerg Exp $
+
+--- hw/xfree86/modes/Makefile.in.orig	2008-09-23 13:06:26.000000000 +0200
++++ hw/xfree86/modes/Makefile.in
+@@ -56,7 +56,7 @@ ARFLAGS = cru
+ libxf86modes_a_AR = $(AR) $(ARFLAGS)
+ libxf86modes_a_LIBADD =
+ am_libxf86modes_a_OBJECTS = xf86Crtc.$(OBJEXT) xf86Cursors.$(OBJEXT) \
+-	xf86cvt.$(OBJEXT) xf86DiDGA.$(OBJEXT) xf86EdidModes.$(OBJEXT) \
++	xf86cvt.$(OBJEXT) xf86gtf.${OBJEXT} xf86DiDGA.$(OBJEXT) xf86EdidModes.$(OBJEXT) \
+ 	xf86Modes.$(OBJEXT) xf86RandR12.$(OBJEXT) xf86Rotate.$(OBJEXT)
+ libxf86modes_a_OBJECTS = $(am_libxf86modes_a_OBJECTS)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
+@@ -379,6 +379,7 @@ libxf86modes_a_SOURCES = \
+ 	xf86Crtc.h \
+ 	xf86Cursors.c \
+ 	xf86cvt.c \
++	xf86gtf.c \
+ 	xf86DiDGA.c \
+ 	xf86EdidModes.c \
+ 	xf86Modes.c \