summaryrefslogtreecommitdiff
path: root/japanese/kinput2
diff options
context:
space:
mode:
Diffstat (limited to 'japanese/kinput2')
-rw-r--r--japanese/kinput2/Makefile22
-rw-r--r--japanese/kinput2/pkg-comment2
-rw-r--r--japanese/kinput2/pkg-descr3
3 files changed, 13 insertions, 14 deletions
diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile
index 94a30f9dc74f..fbaef97db67f 100644
--- a/japanese/kinput2/Makefile
+++ b/japanese/kinput2/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: kinput2-wnn4
+# New ports collection makefile for: kinput2-freewnn
# Date created: 19 Dec 1997
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
@@ -17,13 +17,13 @@ MAINTAINER= taoka@FreeBSD.org
LIB_DEPENDS= ${LIB_INPUT_METHOD}
BUILD_DEPENDS= ${BUILD_INPUT_METHOD}
-PATCHDIR= ${.CURDIR}/../kinput2-wnn4/patches
-FILESDIR= ${.CURDIR}/../kinput2-wnn4/files
+PATCHDIR= ${.CURDIR}/../kinput2-freewnn/patches
+FILESDIR= ${.CURDIR}/../kinput2-freewnn/files
USE_IMAKE= yes
-.if !defined(CANNA) && !defined(SJ3) && !defined(WNN4) && !defined(WNN6)
+.if !defined(CANNA) && !defined(SJ3) && !defined(FREEWNN) && !defined(WNN6)
# For this port
-WNN4= yes
+FREEWNN= yes
.endif
#
# Specifying a velue INPUT_METHOD, and seting values BUILD_DEPENDS,
@@ -40,11 +40,11 @@ BUILD_INPUT_METHOD+= sj3serv:${PORTSDIR}/japanese/sj3
KINPUT2_DEF+= -DUseSj3 -Dport_SJ3SRC=${LOCALBASE}/include \
-Dport_SJ3LIB="-L${LOCALBASE}/lib -lsj3lib"
.endif
-.if defined(WNN4)
-INPUT_METHOD+= wnn4
-BUILD_INPUT_METHOD+= ${X11BASE}/lib/libwnn.a:${PORTSDIR}/japanese/Wnn
-KINPUT2_DEF+= -DUseWnn -Dport_WNNINCDIR=$(X11BASE)/include/wnn \
- -Dport_WNNLIB="-L$(X11BASE)/lib -lwnn -lcrypt"
+.if defined(FREEWNN)
+INPUT_METHOD+= freewnn
+LIB_INPUT_METHOD+= wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
+KINPUT2_DEF+= -DUseWnn -Dport_WNNINCDIR=$(LOCALBASE)/include/wnn \
+ -Dport_WNNLIB="-L$(LOCALBASE)/lib -lwnn -lcrypt"
.elif defined(WNN6)
INPUT_METHOD+= wnn6
LIB_INPUT_METHOD+= wnn6.1:${PORTSDIR}/japanese/Wnn6-lib
@@ -70,7 +70,7 @@ do-configure:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF}
post-install:
-# For Wnn4 or Wnn6
+# For FreeWnn or Wnn6
@if [ -e ${PKGDIR}/MESSAGE ]; then \
${CAT} ${PKGDIR}/MESSAGE; \
fi
diff --git a/japanese/kinput2/pkg-comment b/japanese/kinput2/pkg-comment
index 9c81bc542076..d474e4f41085 100644
--- a/japanese/kinput2/pkg-comment
+++ b/japanese/kinput2/pkg-comment
@@ -1 +1 @@
-Input server of Japanese text (Wnn4)
+Input server of Japanese text (FreeWnn)
diff --git a/japanese/kinput2/pkg-descr b/japanese/kinput2/pkg-descr
index 3fe8cd6ebcc2..6d9cd7e404f0 100644
--- a/japanese/kinput2/pkg-descr
+++ b/japanese/kinput2/pkg-descr
@@ -6,8 +6,7 @@ sends a request to kinput2. Kinput2 receives the request, does
kana-kanji conversion, and sends the converted text back to the
client.
-The port supports Wnn4. Egg key binding is avairable,
-if you run
+The port supports FreeWnn. Egg key binding is avairable, if you run
kinput2 -ccdef ccdef.kinput2.egg