Modular Xorg support.

5 files changed, 35 insertions, 14 deletions

diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index a1dcee38d43..3afb3b32daa 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2006/12/15 14:34:20 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2007/02/15 22:53:09 joerg Exp $
 
 SNESVER=		1.43
 DISTNAME=		snes9x-${SNESVER}-src
@@ -79,8 +79,15 @@ MAKE_ENV+=	USBJOY=1
 MAKE_ENV+=	USBHID_H=1
 .endif
 
+BUILDLINK_DEPMETHOD.libXt?=	build
+
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXxf86dga/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/snes9x/distinfo b/emulators/snes9x/distinfo
index 69bb4e45cce..1018fceb4d4 100644
--- a/emulators/snes9x/distinfo
+++ b/emulators/snes9x/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2006/10/18 13:11:58 rillig Exp $
+$NetBSD: distinfo,v 1.17 2007/02/15 22:53:09 joerg Exp $
 
 SHA1 (snes9x-1.43-src.tar.gz) = c6883c451aeb442030862ec19a8dca25ee02d82c
 RMD160 (snes9x-1.43-src.tar.gz) = d2003f7afb208109405b41f4eec586b93518f9b2
@@ -19,7 +19,7 @@ SHA1 (patch-am) = 31d0ccf2e6124126929d9064ef2212d2a8bb963e
 SHA1 (patch-an) = 3ae10526aa66ef235c223e891c67b4aed6fc48df
 SHA1 (patch-ao) = b5b721563aee09909b7d6143bd699ec86ccaed3b
 SHA1 (patch-ap) = 1c1b7f1b45d75688870a94dadadb6da055e99cd0
-SHA1 (patch-aq) = 31202122ec35997571c8df51871ff3c4034c701b
+SHA1 (patch-aq) = f4d859bc0f569142e2a50bca1c895d133ed26920
 SHA1 (patch-ar) = 72a158e69b885b9ecf47245b9b83f8b50d48f96d
 SHA1 (patch-as) = 64a9fb042f40a4a699bd4128d538fae1cb9cb810
 SHA1 (patch-ba) = 73dccd2fdab90760644af5bf7885c8d87d253a47
diff --git a/emulators/snes9x/patches/patch-aq b/emulators/snes9x/patches/patch-aq
index a98177ee1af..4ca14b5b920 100644
--- a/emulators/snes9x/patches/patch-aq
+++ b/emulators/snes9x/patches/patch-aq
@@ -1,7 +1,7 @@
-$NetBSD: patch-aq,v 1.2 2006/10/18 13:11:59 rillig Exp $
+$NetBSD: patch-aq,v 1.3 2007/02/15 22:53:09 joerg Exp $
 
---- configure.orig	2004-12-30 23:15:48.000000000 +0100
-+++ configure	2006-10-18 13:51:14.687896164 +0200
+--- configure.orig	2004-12-30 22:15:48.000000000 +0000
++++ configure
 @@ -23,7 +23,9 @@ ac_help="$ac_help
  ac_help="$ac_help
    --with(out)-aido        Use a shared memory area for output (default: without)"
@@ -145,7 +145,19 @@ $NetBSD: patch-aq,v 1.2 2006/10/18 13:11:59 rillig Exp $
     JOYDEFINES=' -DJOYSTICK_SUPPORT'
  else
     with_joystick="no"
-@@ -4093,7 +4177,7 @@ fi
+@@ -4000,8 +4084,10 @@ cat > conftest.$ac_ext <<EOF
+ #line 4001 "configure"
+ #include "confdefs.h"
+ 
++#include <X11/Intrinsic.h>
++
+ int main() {
+-${x_direct_test_function}()
++${x_direct_test_function}(0)
+ ; return 0; }
+ EOF
+ if { (eval echo configure:4008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -4093,7 +4179,7 @@ fi
  if test xyes = x$no_x ; then
      echo "configure: warning: X is normally required to build on Unix." 1>&2
  else
@@ -154,7 +166,7 @@ $NetBSD: patch-aq,v 1.2 2006/10/18 13:11:59 rillig Exp $
    X_LIBS="-lX11 -lXext"
    LIBS="$LIBS $X_LIBS"
    SYSLIBS="$SYSLIBS $X_LDFLAGS $X_LIBS"
-@@ -4113,7 +4197,7 @@ if test "${with_extensions+set}" = set; 
+@@ -4113,7 +4199,7 @@ if test "${with_extensions+set}" = set; 
    withval="$with_extensions"
    :
  else
@@ -163,7 +175,7 @@ $NetBSD: patch-aq,v 1.2 2006/10/18 13:11:59 rillig Exp $
  fi
  
  
-@@ -4648,7 +4732,7 @@ else
+@@ -4648,7 +4734,7 @@ else
  #line 4649 "configure"
  #include "confdefs.h"
  
diff --git a/multimedia/mplayer-plugin-firefox/Makefile.common b/multimedia/mplayer-plugin-firefox/Makefile.common
index 7d7d43bab7d..4025b385c3b 100644
--- a/multimedia/mplayer-plugin-firefox/Makefile.common
+++ b/multimedia/mplayer-plugin-firefox/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2006/07/22 04:46:17 rillig Exp $
+# $NetBSD: Makefile.common,v 1.15 2007/02/15 23:15:47 joerg Exp $
 #
 
 DISTNAME=		mplayerplug-in-2.70
@@ -64,5 +64,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.xpt	\
 		${PREFIX}/lib/${BROWSER}/plugins
 
+.include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
diff --git a/print/ghostscript6/options.mk b/print/ghostscript6/options.mk
index 66834a2c690..3582d6ece11 100644
--- a/print/ghostscript6/options.mk
+++ b/print/ghostscript6/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2006/12/27 17:39:14 joerg Exp $
+# $NetBSD: options.mk,v 1.2 2007/02/15 23:01:43 joerg Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ghostscript
 PKG_SUPPORTED_OPTIONS=	x11
@@ -10,7 +10,8 @@ PKG_SUGGESTED_OPTIONS=	x11
 XLIBS=			Xt SM ICE Xext X11
 GS_DISPLAY_DEVICE=	x11.dev
 MAKEFRAGS+=		${FILESDIR}/devs.x11
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .else
 XLIBS?=			# empty
 GS_DISPLAY_DEVICE?=	# empty