Fix build on SunOS, allow x86_64 as an SunOS platform (if set so in pkgsrc).

Bump PKGREVISION.

5 files changed, 50 insertions, 8 deletions

diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index 3cd24b49604..0e93d576528 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.66 2011/12/30 09:33:04 is Exp $
+# $NetBSD: Makefile,v 1.67 2012/03/13 14:13:52 fhajny Exp $
 #
 
 DISTNAME=	xorg-server-1.6.5
 PKGNAME=	modular-${DISTNAME}
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=xserver/}
 EXTRACT_SUFX=	.tar.bz2
@@ -84,6 +84,21 @@ CONFIGURE_ARGS+=	--disable-xorgcfg	# deprecated
 CONFIGURE_ARGS+=	--with-int10=x86emu
 
 CONFIGURE_ENV+=		APP_MAN_SUFFIX=1 FILE_MAN_SUFFIX=5
+CONFIGURE_ENV+=		DRIVER_MAN_SUFFIX=4
+
+PLIST_VARS+=		sunos
+PLIST_SUBST+=		SUNOS_ARCH=${SUNOS_ARCH}
+
+.if ${OPSYS} == "SunOS"
+PLIST.sunos=		yes
+.  if ${MACHINE_ARCH} == "i386"
+SUNOS_ARCH=		ia32
+.  elif ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "x86_64"
+SUNOS_ARCH=		amd64
+.  elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
+SUNOS_ARCH=		sparcv8plus
+.  endif
+.endif
 
 # Workaround for PR#41556.
 # Avoid to use bsd_kqueue_apm, force to use bsd_apm instead.
diff --git a/x11/modular-xorg-server/PLIST b/x11/modular-xorg-server/PLIST
index b54e04d69f5..e583bd9f241 100644
--- a/x11/modular-xorg-server/PLIST
+++ b/x11/modular-xorg-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2009/08/01 11:06:23 hasso Exp $
+@comment $NetBSD: PLIST,v 1.17 2012/03/13 14:13:52 fhajny Exp $
 bin/X
 bin/Xnest
 bin/Xorg
@@ -9,6 +9,7 @@ include/xorg/BT.h
 include/xorg/IBM.h
 include/xorg/TI.h
 include/xorg/XIstubs.h
+${PLIST.sunos}include/xorg/agpgart.h
 include/xorg/bstore.h
 include/xorg/bstorestr.h
 include/xorg/bt829.h
@@ -102,6 +103,7 @@ include/xorg/shadow.h
 include/xorg/shadowfb.h
 include/xorg/shmint.h
 include/xorg/site.h
+${PLIST.sunos}include/xorg/solaris-${SUNOS_ARCH}.il
 include/xorg/swaprep.h
 include/xorg/swapreq.h
 include/xorg/tda8425.h
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index 3a54814fd3e..512b0e31b08 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.44 2011/12/30 09:33:04 is Exp $
+$NetBSD: distinfo,v 1.45 2012/03/13 14:13:52 fhajny Exp $
 
 SHA1 (xorg-server-1.6.5.tar.bz2) = c57c80dd15d3ca492e58ae993b9015d085ec6ea6
 RMD160 (xorg-server-1.6.5.tar.bz2) = 702970358a5643dbc9205f42e39c5b8ed2ff845a
 Size (xorg-server-1.6.5.tar.bz2) = 4678406 bytes
 SHA1 (patch-ab) = c65457bf58b7504375b31512c743c9f1a5dcdde0
-SHA1 (patch-ac) = ab74f292949196e878458afa2e354c73f4d9fd3f
+SHA1 (patch-ac) = fdc115fad11cddcc77e3aee4d6992b6e7c6fbf32
 SHA1 (patch-af) = 722d4679d3386c9a02e1c45a1aa355658ccc2908
 SHA1 (patch-aj) = 84ff5c6215d0b62734cf26e78394a70afe2b7007
 SHA1 (patch-ak) = df6d3b2172254e1f9d44eb40144cad5ed29a7d1d
@@ -25,6 +25,7 @@ SHA1 (patch-bl) = 42fb973bd4a22bbe6c441159f1edcaf7c04f0d27
 SHA1 (patch-bm) = 9c7192eb98816165d8fb16af465e0056045280b2
 SHA1 (patch-bn) = 27dffea8ce05ac79fd438818fba463f57776f2af
 SHA1 (patch-bo) = ee05a01c6b1d4d0b759d8372f16c5f752273f73e
+SHA1 (patch-configure) = 031bc0accf1dd71ed687e7aac3fcc9498cb06784
 SHA1 (patch-sa) = bdd9209e873f676ee4d0436a94e468b824e80f87
 SHA1 (patch-sb) = 48c22a62b30c6bc4d5786624bc264fee30a9bb81
 SHA1 (patch-sc) = dd93e15253b78395050d65df0f972e57ccf546e0
diff --git a/x11/modular-xorg-server/patches/patch-ac b/x11/modular-xorg-server/patches/patch-ac
index 5fb14d0d463..3bae281f159 100644
--- a/x11/modular-xorg-server/patches/patch-ac
+++ b/x11/modular-xorg-server/patches/patch-ac
@@ -1,9 +1,19 @@
-$NetBSD: patch-ac,v 1.6 2010/10/31 23:43:08 wiz Exp $
+$NetBSD: patch-ac,v 1.7 2012/03/13 14:13:52 fhajny Exp $
 
 Fix build on DragonFly after header moved.
+Do not set HAS_USL_VTS on any SunOS platform.
 
---- hw/xfree86/os-support/xf86_OSlib.h.orig	2010-10-30 02:24:29 +0200
-+++ hw/xfree86/os-support/xf86_OSlib.h	2010-10-30 02:25:03 +0200
+--- hw/xfree86/os-support/xf86_OSlib.h.orig	2011-10-28 15:02:52.128328912 +0000
++++ hw/xfree86/os-support/xf86_OSlib.h
+@@ -140,7 +140,7 @@
+ #  include <sys/mmap.h>		/* MMAP driver header */
+ # endif
+ 
+-# if !defined(sun) || (!defined(sparc) && !defined(__SOL8__))
++# if !defined(sun)
+ #  define HAS_USL_VTS
+ # endif
+ # if !defined(sun)
 @@ -346,7 +346,7 @@
  #    include <dev/wscons/wsdisplay_usl_io.h>
  #   endif /* WSCONS_SUPPORT */
diff --git a/x11/modular-xorg-server/patches/patch-configure b/x11/modular-xorg-server/patches/patch-configure
new file mode 100644
index 00000000000..0b1073c7c9c
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-configure
@@ -0,0 +1,14 @@
+$NetBSD: patch-configure,v 1.1 2012/03/13 14:13:52 fhajny Exp $
+
+Allow x86_64 as a SunOS arch.
+--- configure.orig	2009-10-12 05:04:15.000000000 +0000
++++ configure
+@@ -18293,7 +18293,7 @@ fi
+ 		  sparc*)
+ 			SOLARIS_INOUT_ARCH="sparcv8plus"
+ 			;;
+-		  i*86)
++		  i*86|x86_64)
+ 			if test x$SOLARIS_64 = xyes ; then
+ 				SOLARIS_INOUT_ARCH="amd64"
+ 			else