[pkgsrc/trunk]: pkgsrc fix modular X11 build

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0fbfe9fdd8cd
branches:  trunk
changeset: 523988:0fbfe9fdd8cd
user:      abs <abs%pkgsrc.org@localhost>
date:      Tue Jan 16 11:20:25 2007 +0000

description:
fix modular X11 build

diffstat:

 wm/jwm/Makefile        |  3 +--
 www/ns-remote/Makefile |  6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r 8861ed0f5a9b -r 0fbfe9fdd8cd wm/jwm/Makefile
--- a/wm/jwm/Makefile   Tue Jan 16 11:07:59 2007 +0000
+++ b/wm/jwm/Makefile   Tue Jan 16 11:20:25 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/01/05 16:56:54 abs Exp $
+# $NetBSD: Makefile,v 1.6 2007/01/16 11:20:25 abs Exp $
 #
 
 DISTNAME=              jwm-1.8
@@ -34,5 +34,4 @@
 
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 8861ed0f5a9b -r 0fbfe9fdd8cd www/ns-remote/Makefile
--- a/www/ns-remote/Makefile    Tue Jan 16 11:07:59 2007 +0000
+++ b/www/ns-remote/Makefile    Tue Jan 16 11:20:25 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/10/04 22:04:10 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2007/01/16 11:24:22 abs Exp $
 
 DISTNAME=      ns-remote
 PKGNAME=       ns-remote-1.11
@@ -17,8 +17,6 @@
 
 INSTALLATION_DIRS=     bin
 
-.include "../../mk/x11.buildlink3.mk"
-
 do-extract:
        ${MKDIR} ${WRKSRC}
 .for distfile in ${DISTFILES}
@@ -30,4 +28,6 @@
        ${INSTALL_PROGRAM} ${WRKSRC}/ns-remote ${PREFIX}/bin
        ${INSTALL_SCRIPT} ${FILESDIR}/ns-open ${PREFIX}/bin
 
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"