Restore fragment of patch-ab that got lost during the cross-compile

changes. This should fix the NetBSD and DragonFly issues. Bump revision.

3 files changed, 58 insertions, 8 deletions

diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index 71670a5250d..c28f67381cd 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2007/08/14 21:34:36 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2007/08/24 16:43:28 joerg Exp $
 
 DISTNAME=	xorg-server-1.3.0.0
 PKGNAME=	modular-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index 52d42a5b1c8..90623b13957 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2007/08/16 20:10:15 joerg Exp $
+$NetBSD: distinfo,v 1.15 2007/08/24 16:43:28 joerg 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) = 0ccf8e6051ca9350b2a06b5f75e962a55dd11865
+SHA1 (patch-ab) = d99c045eff730b3fbdc92938faaa75b653640c58
 SHA1 (patch-ad) = 752235269f10daade0bf60665cccde39d1583064
 SHA1 (patch-af) = 6c58872798a30b31154dd7b167c84bf20ac417be
 SHA1 (patch-ag) = 222427db3e1bdbf977e992aa91aae5f16992345a
diff --git a/x11/modular-xorg-server/patches/patch-ab b/x11/modular-xorg-server/patches/patch-ab
index 02a79a7854c..e1f988afe98 100644
--- a/x11/modular-xorg-server/patches/patch-ab
+++ b/x11/modular-xorg-server/patches/patch-ab
@@ -1,8 +1,40 @@
-$NetBSD: patch-ab,v 1.3 2007/08/16 20:10:15 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2007/08/24 16:43:28 joerg Exp $
 
---- configure.orig	2007-08-16 16:48:09.000000000 +0200
+--- configure.orig	2007-04-20 01:25:26.000000000 +0000
 +++ configure
-@@ -26426,15 +26426,7 @@ echo $ECHO_N "checking for $prefix/share
+@@ -24767,6 +24767,10 @@ _ACEOF
+ #define USE_DEV_IO 1
+ _ACEOF
+  ;;
++		*dragonfly*)	cat >>confdefs.h <<\_ACEOF
++#define USE_DEV_IO 1
++_ACEOF
++ ;;
+ 		*netbsd*)	cat >>confdefs.h <<\_ACEOF
+ #define USE_I386_IOPL 1
+ _ACEOF
+@@ -24873,7 +24877,7 @@ fi
+ DRI=no
+ KDRIVE_HW=no
+ case $host_os in
+-  *freebsd*)
++  *freebsd* | *dragonfly*)
+ 	case $host_os in
+ 		kfreebsd*-gnu) ;;
+ 		*)
+@@ -24912,6 +24916,11 @@ _ACEOF
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
++#define PCVT_SUPPORT 1
++_ACEOF
++
++
++cat >>confdefs.h <<\_ACEOF
+ #define WSCONS_SUPPORT 1
+ _ACEOF
+ 
+@@ -26417,15 +26426,7 @@ echo $ECHO_N "checking for $prefix/share
  if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -18,7 +50,25 @@ $NetBSD: patch-ab,v 1.3 2007/08/16 20:10:15 joerg Exp $
  fi
  ac_res=`eval echo '${'$as_ac_File'}'`
  	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-@@ -31155,7 +31147,14 @@ echo "$as_me: error: Your OS is unknown.
+@@ -28182,7 +28183,7 @@ _ACEOF
+ 
+ fi
+ 
+-VENDOR_RELEASE="((($VERSION_MAJOR) * 10000000) + (($VERSION_MINOR) * 100000) + (($VERSION_PATCH) * 1000) + $VERSION_SNAP)"
++VENDOR_RELEASE=`expr \( $VERSION_MAJOR \* 10000000 \) + \( $VERSION_MINOR \* 100000 \) + \( $VERSION_PATCH \* 1000 \) + $VERSION_SNAP`
+ 
+ if test $VERSION_SNAP = "0"; then
+ 	if test $VERSION_PATCH = "0"; then
+@@ -30903,7 +30904,7 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+ 
+ 		;;
+-	  freebsd* | kfreebsd*-gnu)
++	  freebsd* | kfreebsd*-gnu | dragonfly*)
+ 	  	XORG_OS="freebsd"
+ 		XORG_OS_SUBDIR="bsd"
+ 		XORG_OS_KBD="BSD"
+@@ -31146,7 +31147,14 @@ echo "$as_me: error: Your OS is unknown.
  		;;
  	  sparc*)
  		xorg_bus_sparcpci="yes"