summaryrefslogtreecommitdiff
path: root/inputmethod
diff options
context:
space:
mode:
authorsakamoto <sakamoto@pkgsrc.org>2002-06-10 09:54:59 +0000
committersakamoto <sakamoto@pkgsrc.org>2002-06-10 09:54:59 +0000
commitffa53737319a3ea7b469f7588d0b9b8117fc9581 (patch)
treef385e31ff7555ced62cedda1bd2a5dee69098cd5 /inputmethod
parentf530ea4bd64fcbfbb1b3673a1b58e7faefd7f04c (diff)
downloadpkgsrc-ffa53737319a3ea7b469f7588d0b9b8117fc9581.tar.gz
bump PKGREVISION, sync with canna-lib.
Diffstat (limited to 'inputmethod')
-rw-r--r--inputmethod/canuum/Makefile19
-rw-r--r--inputmethod/canuum/PLIST2
-rw-r--r--inputmethod/canuum/distinfo6
-rw-r--r--inputmethod/canuum/patches/patch-aa40
-rw-r--r--inputmethod/canuum/patches/patch-ac6
-rw-r--r--inputmethod/canuum/patches/patch-ae2
-rw-r--r--inputmethod/canuum/patches/patch-af2
7 files changed, 37 insertions, 40 deletions
diff --git a/inputmethod/canuum/Makefile b/inputmethod/canuum/Makefile
index 195e6638e37..b7392b0f19e 100644
--- a/inputmethod/canuum/Makefile
+++ b/inputmethod/canuum/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 13:01:31 seb Exp $
+# $NetBSD: Makefile,v 1.2 2002/06/10 09:54:59 sakamoto Exp $
#
DISTNAME= canuum-1.0
@@ -11,13 +11,12 @@ MAINTAINER= oishi@ims.ac.jp
HOMEPAGE= http://www.nec.co.jp/japanese/product/computer/soft/canna/
COMMENT= Japanese input tty frontend for Canna using uum
-DEPENDS= Canna-lib>=3.5.2:../../inputmethod/canna-lib
-
MANLANG= ja
MAN1= canuum.1
MAKE_ARGS= PREFIX=${PREFIX}
WRKSRC= ${WRKDIR}/Canna35b2/canuum
-USE_X11BASE= yes
+
+MAKE_ENV+= CCOPTIONS="${CPPFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
post-extract:
@${GTAR} -xzf ${DISTDIR}/Canna35b2.tar.gz -C ${WRKDIR} \
@@ -29,13 +28,17 @@ pre-patch:
@(cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < Canuum.patch)
do-configure:
- @(cd ${WRKSRC}; ${X11BASE}/bin/xmkmf; ${MAKE} ${MAKE_ARGS} Makefile; \
- ${MAKE} ${MAKE_ARGS} cannaconf.h; ${MAKE} ${MAKE_ARGS} depend)
+ @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${XMKMF_CMD}; \
+ ${MAKE} ${MAKE_ARGS} Makefile; \
+ ${MAKE} ${MAKE_ARGS} cannaconf.h; ${MAKE} ${MAKE_ARGS} depend)
do-build:
- @(cd ${WRKSRC}; ${MAKE} ${MAKE_ARGS} all)
+ @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_ARGS} all)
post-install:
- @${INSTALL_MAN} ${WRKSRC}/canuum.jmn ${PREFIX}/man/ja_JP.EUC/man1/canuum.1
+ @${INSTALL_MAN} ${WRKSRC}/canuum.jmn \
+ ${PREFIX}/man/ja_JP.EUC/man1/canuum.1
+.include "../../devel/nbitools/nbitools.mk"
+.include "../canna-lib/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/canuum/PLIST b/inputmethod/canuum/PLIST
index 69e9733dd2e..a879d463441 100644
--- a/inputmethod/canuum/PLIST
+++ b/inputmethod/canuum/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:01:31 seb Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/06/10 09:54:59 sakamoto Exp $
bin/canuum
man/ja_JP.EUC/man1/canuum.1
diff --git a/inputmethod/canuum/distinfo b/inputmethod/canuum/distinfo
index 48f42a775f3..de07668f646 100644
--- a/inputmethod/canuum/distinfo
+++ b/inputmethod/canuum/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/31 13:01:31 seb Exp $
+$NetBSD: distinfo,v 1.2 2002/06/10 09:54:59 sakamoto Exp $
SHA1 (Uum4.109.tar.gz) = 9d57fa67fc321c0b1101970b02154b5d6e42e88e
Size (Uum4.109.tar.gz) = 43738 bytes
SHA1 (Canna35b2.tar.gz) = 66742205272cbc6bd91f272596381f761feac0a2
Size (Canna35b2.tar.gz) = 1333329 bytes
-SHA1 (patch-aa) = 84e341fabc592fc5579d0c8b258b6e13809e8473
-SHA1 (patch-ac) = 8bcd6abc9d36305c86cf4f5993c4895a1e7c86e1
+SHA1 (patch-aa) = 45cdfd8107ee0beeae878c9940273fc6bca0385a
+SHA1 (patch-ac) = 9b8cd3f8d93c592f4f97956f77dadf118f4f03eb
SHA1 (patch-ae) = 1ef38a6651f2f619c15d68032787be694a2fa970
SHA1 (patch-af) = 5860402e3dc72e0d6ddaffc6cf33c017c7e19a34
diff --git a/inputmethod/canuum/patches/patch-aa b/inputmethod/canuum/patches/patch-aa
index 3e96615edfd..8c133748d21 100644
--- a/inputmethod/canuum/patches/patch-aa
+++ b/inputmethod/canuum/patches/patch-aa
@@ -1,9 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:01:31 seb Exp $
+$NetBSD: patch-aa,v 1.2 2002/06/10 09:55:00 sakamoto Exp $
---- Canna.conf.orig Thu Nov 28 11:27:01 1996
-+++ Canna.conf Wed Dec 8 10:14:38 1999
-@@ -129,19 +129,19 @@
- */
+--- Canna.conf- Fri Dec 1 00:31:14 2000
++++ Canna.conf Fri Dec 1 00:31:36 2000
+@@ -130,10 +130,14 @@
-cannaBinDir = /usr/local/canna/bin
-cannaSrvDir = /usr/local/canna/bin
@@ -11,17 +10,22 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:01:31 seb Exp $
-cannaManDir = /usr/local/canna/man
-cannaIncDir = /usr/local/canna/include/canna
-libCannaDir = /usr/lib
+-
+-ErrDir = /usr/spool/canna
+cannaBinDir = ${PREFIX}/bin
+cannaSrvDir = ${PREFIX}/sbin
+cannaLibDir = ${PREFIX}/share/canna
+cannaManDir = ${PREFIX}/man/ja_JP.EUC
+cannaIncDir = ${PREFIX}/include/canna
+libCannaDir = ${PREFIX}/lib
-
--ErrDir = /usr/spool/canna
++
+ErrDir = ${CANNA_SPOOL}
++
++/* INET6 related stuff */
++INET6_DEFS = ${INET6}
++INET6_LIBS = #-L/usr/local/v6/lib -linet6
- wcharDefinition = -DCANNA_WCHAR
+@@ -141,6 +145,6 @@
Wlib =
-JapaneseLocale = japanese
+JapaneseLocale = ja_JP.eucJP
@@ -31,27 +35,20 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:01:31 seb Exp $
+cannaOwner = ${CANNAOWNER}
+cannaGroup = ${CANNAGROUP}
- cannaOwnerGroup = -o $(cannaOwner) -g $(cannaGroup)
-@@ -149,5 +149,5 @@
- pointerIntegerDef =
+@@ -150,3 +154,3 @@
-cannaDsoRev = 1
+cannaDsoRev = 1.0
/* SunOS 4.x をお使いの方で shared object を利用する場合には
- cannaDsoRev = 1.1
-@@ -202,8 +202,7 @@
- * コマンド類をリンクする時は、次を YES にしてくだい。
+@@ -203,6 +207,5 @@
*/
-/* #define UseInstalledLibCanna YES */
-#define UseInstalledLibCanna NO
+#define UseInstalledLibCanna YES
--DicDir = $(cannaLibDir)/dic
-+DicDir = ${DICT_DIR}/canna
+ DicDir = $(cannaLibDir)/dic
- #ifdef NeXT
-@@ -240,16 +239,16 @@
- #endif
+@@ -241,14 +244,14 @@
# endif
- CANNALIB = -L$(libCannaDir) -lcanna $(DLLIB)
+ CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB)
@@ -71,9 +68,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:01:31 seb Exp $
- CANNALIB = -L$(CANNASRC) -lcanna $(DLLIB)
+ CANNALIB = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna $(DLLIB)
#endif /* UseInstalledLibCanna */
-
-@@ -260,12 +259,12 @@
- DEPCANNALIB16 = $(libCannaDir)/libcanna16.a
+@@ -261,10 +264,10 @@
# endif
- CANNALIB16 = -L$(libCannaDir) -lcanna16 $(DLLIB)
+ CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna16 $(DLLIB)
@@ -88,4 +83,3 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:01:31 seb Exp $
- CANNALIB16 = -L$(CANNASRC) -lcanna16 $(DLLIB)
+ CANNALIB16 = -Wl,-rpath,$(libCannaDir) -L$(libCannaDir) -lcanna16 $(DLLIB)
#endif /* UseInstalledLibCanna */
-
diff --git a/inputmethod/canuum/patches/patch-ac b/inputmethod/canuum/patches/patch-ac
index 1a89673b3c1..ef73abf6054 100644
--- a/inputmethod/canuum/patches/patch-ac
+++ b/inputmethod/canuum/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/05/31 13:01:31 seb Exp $
+$NetBSD: patch-ac,v 1.2 2002/06/10 09:55:00 sakamoto Exp $
--- Imakefile.orig Tue Apr 19 20:38:45 1994
+++ Imakefile Fri Jan 22 00:50:46 1999
@@ -19,8 +19,8 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/05/31 13:01:31 seb Exp $
+ CANNASRC = $(CANNAROOT)
DEFINES = -DCANNA -DJAPANESE $(SIGNAL_DEFINES)
- INCLUDES = -I$(CANNAROOT)/include
-+ INCLUDES = -I$(CANNAROOT) -I${PREFIX}/include
-+ LDOPTIONS = ${CANNALIB16}
++ INCLUDES = -I$(CANNAROOT) ${CPPFLAGS}
++EXTRA_LIBRARIES = ${LDFLAGS} -lcanna16 -lcanna
SRCS = header.c printf.c termio.c termcap.c ttyfdslot.c setutmp.c \
screen.c cursor.c jhlp.c xutoj.c canna.c
diff --git a/inputmethod/canuum/patches/patch-ae b/inputmethod/canuum/patches/patch-ae
index 8089d56e34b..f6e747c8e4d 100644
--- a/inputmethod/canuum/patches/patch-ae
+++ b/inputmethod/canuum/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:01:31 seb Exp $
+$NetBSD: patch-ae,v 1.2 2002/06/10 09:55:00 sakamoto Exp $
--- jhlp.c.orig Thu Jan 21 21:52:56 1999
+++ jhlp.c Thu Jan 21 21:56:35 1999
diff --git a/inputmethod/canuum/patches/patch-af b/inputmethod/canuum/patches/patch-af
index 329b60249cc..9db2aec4eee 100644
--- a/inputmethod/canuum/patches/patch-af
+++ b/inputmethod/canuum/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:01:31 seb Exp $
+$NetBSD: patch-af,v 1.2 2002/06/10 09:55:00 sakamoto Exp $
--- sheader.h.orig Tue Aug 17 17:47:04 1999
+++ sheader.h Tue Aug 17 17:48:00 1999