summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg>2007-02-19 18:40:44 +0000
committerjoerg <joerg>2007-02-19 18:40:44 +0000
commit642cedb2adcd395df09a6c9eb75e30de0f206748 (patch)
treed61499298ed20bf0a136e3578ef171a5d90331f6
parent6cda212a01e885bce6bbf5946c58fa66323c4eab (diff)
downloadpkgsrc-642cedb2adcd395df09a6c9eb75e30de0f206748.tar.gz
Modular Xorg support.
-rw-r--r--editors/mule/Makefile6
-rw-r--r--emulators/pearpc/Makefile3
-rw-r--r--emulators/pearpc/options.mk3
3 files changed, 6 insertions, 6 deletions
diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index 113cbe4fa98..c8a7ae72980 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2006/12/06 16:42:20 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2007/02/19 18:40:44 joerg Exp $
DISTNAME= mule-2.3
PKGREVISION= 4
@@ -35,8 +35,6 @@ CONFIGURE_ARGS+= --bdf-path=${X11PREFIX}/lib/X11/fonts/intlfonts/bdf
INFO_FILES= # PLIST
-.include "../../mk/x11.buildlink3.mk"
-
# Remove original versions of patched files so that aren't installed.
post-build:
${FIND} ${WRKSRC} -name "*.orig" | ${XARGS} ${RM} -f
@@ -50,4 +48,6 @@ post-install:
< ${WRKSRC}/etc/CHARSETS > ${PREFIX}/lib/mule/19.28/etc/CHARSETS
#diff -u ${WRKSRC}/etc/CHARSETS ${PREFIX}/lib/mule/19.28/etc/CHARSETS
+.include "../../x11/xbitmaps/buildlink3.mk"
+.include "../../x11/libXaw/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/pearpc/Makefile b/emulators/pearpc/Makefile
index 65fb9a44019..5f3eeb4f5f9 100644
--- a/emulators/pearpc/Makefile
+++ b/emulators/pearpc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/07/22 04:46:15 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/19 18:44:10 joerg Exp $
DISTNAME= pearpc-0.4
PKGREVISION= 1
@@ -46,5 +46,4 @@ SUBST_MESSAGE.conf= Fixing configuration file.
.include "options.mk"
.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/pearpc/options.mk b/emulators/pearpc/options.mk
index 1ab21ce8d3b..8ef0eee8127 100644
--- a/emulators/pearpc/options.mk
+++ b/emulators/pearpc/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/12/22 19:27:36 ghen Exp $
+# $NetBSD: options.mk,v 1.2 2007/02/19 18:44:11 joerg Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.pearpc
PKG_OPTIONS_REQUIRED_GROUPS= ui
@@ -9,6 +9,7 @@ PKG_SUGGESTED_OPTIONS= x11
.if !empty(PKG_OPTIONS:Mx11)
CONFIGURE_ARGS+= --enable-ui=x11
+.include "../../x11/libX11/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Msdl)