Modular Xorg support.

4 files changed, 27 insertions, 8 deletions

diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile
index 39012222f23..ede98e512f6 100644
--- a/security/kth-krb4/Makefile
+++ b/security/kth-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/09/07 08:46:20 wennmach Exp $
+# $NetBSD: Makefile,v 1.47 2007/01/30 20:41:38 joerg Exp $
 #
 
 DISTNAME=		krb4-1.2.2
@@ -55,5 +55,5 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/services-1.5.diff ${EXAMPLEDIR}
 
 .include "../../security/openssl/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index d2011803c30..e52820c1631 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/12/15 20:33:05 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2007/01/30 20:41:32 joerg Exp $
 #
 
 DISTNAME=		rxvt-unicode-8.1
@@ -28,5 +28,5 @@ post-install:
 .include "options.mk"
 
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/rxvt-unicode/distinfo b/x11/rxvt-unicode/distinfo
index 4da85a7fc9c..f25083ef90d 100644
--- a/x11/rxvt-unicode/distinfo
+++ b/x11/rxvt-unicode/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2006/12/15 15:01:30 martin Exp $
+$NetBSD: distinfo,v 1.9 2007/01/30 20:41:32 joerg Exp $
 
 SHA1 (rxvt-unicode-8.1.tar.bz2) = b7d1d5188a655bcade8fd0708903bc3fc73484a4
 RMD160 (rxvt-unicode-8.1.tar.bz2) = 2e0535449267a43222976fd6a3dfeb7fd3201c87
 Size (rxvt-unicode-8.1.tar.bz2) = 874511 bytes
-SHA1 (patch-aa) = cbab8557288f82bd7f04741596bdce6d18a161a6
+SHA1 (patch-aa) = 65e70e11f65aa086355cc9333991e3e6f15e9b73
diff --git a/x11/rxvt-unicode/patches/patch-aa b/x11/rxvt-unicode/patches/patch-aa
index 94293ec1da9..0fc8493f776 100644
--- a/x11/rxvt-unicode/patches/patch-aa
+++ b/x11/rxvt-unicode/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2006/08/07 23:21:16 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2007/01/30 20:41:32 joerg Exp $
 
---- configure.orig	2006-02-08 22:48:51.000000000 +0000
+--- configure.orig	2006-10-03 11:20:57.000000000 +0000
 +++ configure
 @@ -3291,59 +3291,6 @@ fi
  LINKER=$LINKER
@@ -62,3 +62,22 @@ $NetBSD: patch-aa,v 1.3 2006/08/07 23:21:16 wiz Exp $
  
  cat >>confdefs.h <<\_ACEOF
  #define _GNU_SOURCE 1
+@@ -6356,11 +6303,16 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
++extern "C" {
++#include <X11/xpm.h>
++#include <stddef.h>
++}
++
+ int
+ main ()
+ {
+-XpmReadFileToPixmap()
+-  ;
++  Drawable d;
++  XpmReadFileToPixmap(NULL, d, NULL, NULL, NULL, NULL);
+   return 0;
+ }
+ _ACEOF