summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2007-01-16 11:20:25 +0000
committerabs <abs@pkgsrc.org>2007-01-16 11:20:25 +0000
commit8884a7bfac276fe6586c0b5dec4f93fdc3ccb989 (patch)
tree697368a541a231c222094715c1f772df18502539
parent0e9c5b8e05365a34a688417b09615d340db5dbd5 (diff)
downloadpkgsrc-8884a7bfac276fe6586c0b5dec4f93fdc3ccb989.tar.gz
fix modular X11 build
-rw-r--r--wm/jwm/Makefile3
-rw-r--r--www/ns-remote/Makefile6
2 files changed, 4 insertions, 5 deletions
diff --git a/wm/jwm/Makefile b/wm/jwm/Makefile
index ca3fbb0d570..48ad13693bf 100644
--- a/wm/jwm/Makefile
+++ b/wm/jwm/Makefile
@@ -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 @@ CONF_FILES= ${EGDIR}/system.jwmrc ${PKG_SYSCONFDIR}/system.jwmrc
.include "../../x11/libXft/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/ns-remote/Makefile b/www/ns-remote/Makefile
index 9f90213afbe..2825043c05b 100644
--- a/www/ns-remote/Makefile
+++ b/www/ns-remote/Makefile
@@ -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 @@ LDFLAGS.SunOS+= -lsocket -lnsl
INSTALLATION_DIRS= bin
-.include "../../mk/x11.buildlink3.mk"
-
do-extract:
${MKDIR} ${WRKSRC}
.for distfile in ${DISTFILES}
@@ -30,4 +28,6 @@ do-install:
${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"