summaryrefslogtreecommitdiff
path: root/inputmethod
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-12-27 13:37:35 +0000
committerjoerg <joerg@pkgsrc.org>2006-12-27 13:37:35 +0000
commitd26cf36e5784f5b648404b8d68c21adb4398f33f (patch)
treecbd8d2123ffe05331db8b76b38b2de8182524736 /inputmethod
parent6432f76116c5a27e6f554145314e47d93eeec7a9 (diff)
downloadpkgsrc-d26cf36e5784f5b648404b8d68c21adb4398f33f.tar.gz
- fine grained X11 dependencies for packages which have either USE_IMAKE
or USE_X11BASE set, but don't include mk/x11.buildlink3.mk directly or via buildlink3.mks - introduce BUILDLINK_PREFIX.libXpm as alias for BUILDLINK_PREFIX.xpm in the !modular case - fix some cases where the check for libX11 couldn't work at all by using C++ for compilation without including the proper headers Verified using a full X11_TYPE=xorg bulk build without additional breakage. Discussed with salo@, wiz@ and send to packages@ for feedback.
Diffstat (limited to 'inputmethod')
-rw-r--r--inputmethod/gcin/Makefile3
-rw-r--r--inputmethod/kinput2/Makefile5
-rw-r--r--inputmethod/skkinput/Makefile4
3 files changed, 9 insertions, 3 deletions
diff --git a/inputmethod/gcin/Makefile b/inputmethod/gcin/Makefile
index 59ab00b503e..c88e75eebfb 100644
--- a/inputmethod/gcin/Makefile
+++ b/inputmethod/gcin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/21 06:00:46 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2006/12/27 13:37:38 joerg Exp $
#
DISTNAME= gcin-1.1.7
@@ -29,4 +29,5 @@ REPLACE_FILES.sh+= scripts/modify-XIM
REPLACE_FILES.sh+= scripts/utf8-edit
.include "../../x11/gtk2/modules.mk"
+.include "../../x11/libXtst/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/kinput2/Makefile b/inputmethod/kinput2/Makefile
index feb38a748db..20c3f8d5b41 100644
--- a/inputmethod/kinput2/Makefile
+++ b/inputmethod/kinput2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:09:43 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:38 joerg Exp $
DISTNAME= kinput2-v3
PKGNAME= kinput2-3.0
@@ -24,4 +24,7 @@ pre-configure:
do-configure:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF}
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/skkinput/Makefile b/inputmethod/skkinput/Makefile
index 398c7b2853e..fc48d93210d 100644
--- a/inputmethod/skkinput/Makefile
+++ b/inputmethod/skkinput/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/07/05 06:53:13 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:38 joerg Exp $
DISTNAME= skkinput-2.06.3
PKGREVISION= 2
@@ -19,4 +19,6 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/FAQ.jis ${PREFIX}/share/doc/skkinput
${INSTALL_DATA} ${WRKSRC}/BUGS.jis ${PREFIX}/share/doc/skkinput
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"