summaryrefslogtreecommitdiff
path: root/inputmethod
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2007-09-07 22:12:10 +0000
committerjlam <jlam@pkgsrc.org>2007-09-07 22:12:10 +0000
commit07dd3147c68f13b523ce8edfd486a3f4f0d47fe1 (patch)
treee65f4ff0343b21db10e01b4ee2a8fa56a72846a8 /inputmethod
parentcdb276bfa1d6c9954bf0587b81f6152203d30047 (diff)
downloadpkgsrc-07dd3147c68f13b523ce8edfd486a3f4f0d47fe1.tar.gz
Convert packages that test and use USE_INET6 to use the options framework
and to support the "inet6" option instead. Remaining usage of USE_INET6 was solely for the benefit of the scripts that generate the README.html files. Replace: BUILD_DEFS+= USE_INET6 with BUILD_DEFS+= IPV6_READY and teach the README-generation tools to look for that instead. This nukes USE_INET6 from pkgsrc proper. We leave a tiny bit of code to continue to support USE_INET6 for pkgsrc-wip until it has been nuked from there as well.
Diffstat (limited to 'inputmethod')
-rw-r--r--inputmethod/canna/Makefile.common12
-rw-r--r--inputmethod/skkfep/Makefile4
-rw-r--r--inputmethod/skkinput/Makefile4
-rw-r--r--inputmethod/skkserv/Makefile4
4 files changed, 7 insertions, 17 deletions
diff --git a/inputmethod/canna/Makefile.common b/inputmethod/canna/Makefile.common
index ea939821820..ce6b7b5840d 100644
--- a/inputmethod/canna/Makefile.common
+++ b/inputmethod/canna/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2007/07/04 20:54:39 jlam Exp $
+# $NetBSD: Makefile.common,v 1.18 2007/09/07 22:12:12 jlam Exp $
#
# Canna common makefile.
#
@@ -27,16 +27,6 @@ CANNA_MODE= 0755
PKG_GROUPS_VARS+= CANNA_GROUP
PKG_USERS_VARS+= CANNA_USER
-# XXX IPv6 support. To be done.
-#BUILD_DEFS+= USE_INET6
-#.include "../../mk/bsd.prefs.mk"
-#.if 0 # defined(USE_INET6) && ${USE_INET6} == "YES"
-#INET6= -DINET6
-#.else
-#INET6= # empty
-#.endif
-#MAKE_ENV+= INET6=${INET6}
-
CANNA_ENV= CANNA_USER=${CANNA_USER} \
CANNA_GROUP=${CANNA_GROUP} \
CANNA_SPOOL=${CANNA_SPOOL} \
diff --git a/inputmethod/skkfep/Makefile b/inputmethod/skkfep/Makefile
index 00d0e3e9950..3dbade08e4b 100644
--- a/inputmethod/skkfep/Makefile
+++ b/inputmethod/skkfep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/01/07 09:13:56 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2007/09/07 22:12:12 jlam Exp $
DISTNAME= skkfep0.86c
PKGNAME= skkfep-0.86c
@@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://ei5nazha.yz.yamagata-u.ac.jp/~aito/aito-soft.html
COMMENT= Terminal based SKK-like Kana-to-Kanji FrontEnd Processor
-BUILD_DEFS+= USE_INET6
+BUILD_DEFS+= IPV6_READY
WRKSRC= ${WRKDIR}/skkfep
NO_CONFIGURE= yes
diff --git a/inputmethod/skkinput/Makefile b/inputmethod/skkinput/Makefile
index fc48d93210d..6a9c45d8fac 100644
--- a/inputmethod/skkinput/Makefile
+++ b/inputmethod/skkinput/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:38 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/07 22:12:12 jlam Exp $
DISTNAME= skkinput-2.06.3
PKGREVISION= 2
@@ -9,7 +9,7 @@ MAINTAINER= uebayasi@NetBSD.org
HOMEPAGE= http://skkinput2.sourceforge.jp/
COMMENT= X11 frontend for SKK
-BUILD_DEFS+= USE_INET6
+BUILD_DEFS+= IPV6_READY
USE_IMAKE= YES
diff --git a/inputmethod/skkserv/Makefile b/inputmethod/skkserv/Makefile
index a9af7020a5f..90d63379a25 100644
--- a/inputmethod/skkserv/Makefile
+++ b/inputmethod/skkserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/07/05 07:09:58 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/07 22:12:12 jlam Exp $
DISTNAME= skk9.6
PKGNAME= skkserv-3.9.4
@@ -16,7 +16,7 @@ COMMENT= Dictionary server for Simple Kana-Kanji conversion programs
WRKSRC= ${WRKDIR}/skk-9.6
-BUILD_DEFS+= USE_INET6
+BUILD_DEFS+= IPV6_READY
DIST_SUBDIR= skk