[pkgsrc/trunk]: pkgsrc/x11/modular-xorg-server fix to build on FreeBSD7-STABE...

[sno <sno%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1a2f20fef943
branches:  trunk
changeset: 399478:1a2f20fef943
user:      sno <sno%pkgsrc.org@localhost>
date:      Sun Sep 20 12:04:01 2009 +0000

description:
fix to build on FreeBSD7-STABE/amd64

diffstat:

 x11/modular-xorg-server/Makefile         |   5 ++++-
 x11/modular-xorg-server/distinfo         |   4 ++--
 x11/modular-xorg-server/patches/patch-sa |  17 +++++++++++++----
 3 files changed, 19 insertions(+), 7 deletions(-)

diffs (62 lines):

diff -r a90fd75d34c3 -r 1a2f20fef943 x11/modular-xorg-server/Makefile
--- a/x11/modular-xorg-server/Makefile  Sun Sep 20 11:57:16 2009 +0000
+++ b/x11/modular-xorg-server/Makefile  Sun Sep 20 12:04:01 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2009/08/01 15:33:46 tnn Exp $
+# $NetBSD: Makefile,v 1.52 2009/09/20 12:04:01 sno Exp $
 #
 
 DISTNAME=      xorg-server-1.6.3
@@ -46,6 +46,9 @@
 CONFIGURE_ARGS+=       --with-builder-addr="tech-x11%NetBSD.org@localhost"
 CONFIGURE_ARGS+=       --with-os-vendor="The NetBSD Foundation"
 .endif
+.if ${OPSYS} == "FreeBSD"
+CONFIGURE_ARGS+=       --without-dtrace
+.endif
 CONFIGURE_ARGS+=       --with-os-name=${MACHINE_PLATFORM:Q}
 CONFIGURE_ARGS+=       --with-vendor-web="http://www.pkgsrc.org/";
 
diff -r a90fd75d34c3 -r 1a2f20fef943 x11/modular-xorg-server/distinfo
--- a/x11/modular-xorg-server/distinfo  Sun Sep 20 11:57:16 2009 +0000
+++ b/x11/modular-xorg-server/distinfo  Sun Sep 20 12:04:01 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2009/08/01 11:06:23 hasso Exp $
+$NetBSD: distinfo,v 1.38 2009/09/20 12:04:01 sno Exp $
 
 SHA1 (xorg-server-1.6.3.tar.bz2) = 1f28e8723e110e5c1a1adf3bc89325a81a526184
 RMD160 (xorg-server-1.6.3.tar.bz2) = 5b9ddfeb9fb7082ef600e368ada8abbb006fe418
@@ -10,7 +10,7 @@
 SHA1 (patch-ak) = df6d3b2172254e1f9d44eb40144cad5ed29a7d1d
 SHA1 (patch-al) = cb1fb44037f23fb2838ed36aaf2591946264fe53
 SHA1 (patch-am) = be278e6044dfa37b108d2544c82b84f36b6ca9d7
-SHA1 (patch-sa) = a22001b4146dcbcbd5405c9a1ff7b1632ec946b8
+SHA1 (patch-sa) = bdd9209e873f676ee4d0436a94e468b824e80f87
 SHA1 (patch-sb) = 0a064016b16e088d08cd9e290a57cb4efb4f5d26
 SHA1 (patch-sc) = dd93e15253b78395050d65df0f972e57ccf546e0
 SHA1 (patch-sd) = 36d3946217b57416e8d0d3099e48d4e9f957c881
diff -r a90fd75d34c3 -r 1a2f20fef943 x11/modular-xorg-server/patches/patch-sa
--- a/x11/modular-xorg-server/patches/patch-sa  Sun Sep 20 11:57:16 2009 +0000
+++ b/x11/modular-xorg-server/patches/patch-sa  Sun Sep 20 12:04:01 2009 +0000
@@ -1,8 +1,17 @@
-$NetBSD: patch-sa,v 1.2 2009/06/07 11:23:47 wiz Exp $
+$NetBSD: patch-sa,v 1.3 2009/09/20 12:04:01 sno Exp $
 
---- hw/xfree86/common/compiler.h.orig  2009-05-19 14:25:30 +0300
-+++ hw/xfree86/common/compiler.h       2009-05-19 14:26:04 +0300
-@@ -531,7 +531,7 @@ inl(unsigned short port)
+--- hw/xfree86/common/compiler.h.orig  2009-07-07 19:48:58.000000000 +0200
++++ hw/xfree86/common/compiler.h       2009-09-20 11:51:51.000000000 +0200
+@@ -465,7 +465,7 @@
+ extern unsigned int inw(unsigned long port);
+ extern unsigned int inl(unsigned long port);
+  
+-#   elif defined(linux) && defined(__amd64__)
++#   elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__)
+  
+ #    include <inttypes.h>
+ 
+@@ -531,7 +531,7 @@
     return ret;
  }