diff options
author | Satoshi Taoka <taoka@FreeBSD.org> | 2001-08-27 01:20:24 +0000 |
---|---|---|
committer | Satoshi Taoka <taoka@FreeBSD.org> | 2001-08-27 01:20:24 +0000 |
commit | 7b117d21671d6f9038809eb4a27e9f198fb9bbf6 (patch) | |
tree | 66c5fec50129c6628a27c1324ece64daf50596c9 /japanese/Wnn7-lib/files | |
parent | Minor changes: (diff) |
* Add Wnn7's clients (jvim, jvim3, kinput2, mule) and a library for
Wnn7 clients (Wnn7-lib). Notice the latter is modified from Wnn6-lib
by me and is not released from the Product company of Wnn7 (Omron
Software Co., Ltd).
* Modify master ports of the above ports according to adding these.
* [ports/editors/mule/pkg-descr] My English in pkg-descr was corrected
Submitted by: imp
Notes
Notes:
svn path=/head/; revision=46945
Diffstat (limited to 'japanese/Wnn7-lib/files')
-rw-r--r-- | japanese/Wnn7-lib/files/patch-wnn7-aa | 15 | ||||
-rw-r--r-- | japanese/Wnn7-lib/files/patch-wnn7-ab | 20 | ||||
-rw-r--r-- | japanese/Wnn7-lib/files/patch-wnn7-ac | 20 | ||||
-rw-r--r-- | japanese/Wnn7-lib/files/patch-wnn7-ad | 39 | ||||
-rw-r--r-- | japanese/Wnn7-lib/files/patch-wnn7-ae | 14 |
5 files changed, 108 insertions, 0 deletions
diff --git a/japanese/Wnn7-lib/files/patch-wnn7-aa b/japanese/Wnn7-lib/files/patch-wnn7-aa new file mode 100644 index 000000000000..bc2a5469d0fc --- /dev/null +++ b/japanese/Wnn7-lib/files/patch-wnn7-aa @@ -0,0 +1,15 @@ +--- Wnn/include/config.h.orig Wed Oct 28 13:36:24 1998 ++++ Wnn/include/config.h Wed Jul 18 17:03:05 2001 +@@ -140,7 +140,11 @@ + #define _CONFIG_H_ + + #ifndef LIBDIR +-#define LIBDIR "/usr/local/lib/wnn6" ++#define LIBDIR "/usr/lib/wnn7" ++#endif /* LIBDIR */ ++ ++#ifndef SHARDIR ++#define SHARDIR "/usr/share/wnn7" + #endif /* LIBDIR */ + + #ifdef TAIWANESE diff --git a/japanese/Wnn7-lib/files/patch-wnn7-ab b/japanese/Wnn7-lib/files/patch-wnn7-ab new file mode 100644 index 000000000000..12ba70b5fb81 --- /dev/null +++ b/japanese/Wnn7-lib/files/patch-wnn7-ab @@ -0,0 +1,20 @@ +--- config/Project.tmpl.~1~ Wed Oct 28 13:36:36 1998 ++++ config/Project.tmpl Mon Jul 16 02:54:32 2001 +@@ -507,7 +507,7 @@ + #endif + + #ifndef WnnWnnDir +-#define WnnWnnDir /usr/local/lib/wnn6 ++#define WnnWnnDir /usr/lib/wnn7 + #endif + + +@@ -563,7 +563,7 @@ + WNNCNVFILEDIR = $(WNNJDSRC)/cvtfileDir + WNNINCLUDES = -I$(WNNINCLUDESRC) -I$(WNNROMKANMSRC) + WNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\" +- WNNJLIB = $(WNNJLIBSRC)/libwnn6_fromsrc.a ++ WNNJLIB = $(WNNJLIBSRC)/libwnn6_for_wnn7_fromsrc.a + WNNCONVLIB = $(WNNCONVSRC)/libconvkey.a + + CWNNTOP = $(IMTOP)/cWnn diff --git a/japanese/Wnn7-lib/files/patch-wnn7-ac b/japanese/Wnn7-lib/files/patch-wnn7-ac new file mode 100644 index 000000000000..63a197fbaa3f --- /dev/null +++ b/japanese/Wnn7-lib/files/patch-wnn7-ac @@ -0,0 +1,20 @@ +--- config/X11.tmpl.~1~ Wed Oct 28 13:36:37 1998 ++++ config/X11.tmpl Mon Jul 16 02:54:53 2001 +@@ -507,7 +507,7 @@ + #endif + + #ifndef WnnWnnDir +-#define WnnWnnDir /usr/local/lib/wnn6 ++#define WnnWnnDir /usr/lib/wnn7 + #endif + + +@@ -563,7 +563,7 @@ + WNNCNVFILEDIR = $(WNNJDSRC)/cvtfileDir + WNNINCLUDES = -I$(WNNINCLUDESRC) -I$(WNNROMKANMSRC) + WNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\" +- WNNJLIB = $(WNNJLIBSRC)/libwnn6_fromsrc.a ++ WNNJLIB = $(WNNJLIBSRC)/libwnn6_for_wnn7_fromsrc.a + WNNCONVLIB = $(WNNCONVSRC)/libconvkey.a + + CWNNTOP = $(IMTOP)/cWnn diff --git a/japanese/Wnn7-lib/files/patch-wnn7-ad b/japanese/Wnn7-lib/files/patch-wnn7-ad new file mode 100644 index 000000000000..3843e87fd0f1 --- /dev/null +++ b/japanese/Wnn7-lib/files/patch-wnn7-ad @@ -0,0 +1,39 @@ +--- Wnn/jlib/Imakefile.~1~ Mon Jul 16 02:58:38 2001 ++++ Wnn/jlib/Imakefile Mon Jul 16 03:04:20 2001 +@@ -74,9 +74,9 @@ + LibraryObjectRule() + + #if DoSharedLib +-AllTarget($(OBJS) libwnn6_fromsrc.a libwnn6.so.$(SOWNN6LIBREV)) ++AllTarget($(OBJS) libwnn6_for_wnn7_fromsrc.a libwnn6_for_wnn7.so.$(SOWNN6LIBREV)) + #else +-AllTarget($(OBJS) libwnn6_fromsrc.a) ++AllTarget($(OBJS) libwnn6_for_wnn7_fromsrc.a) + #endif + + +@@ -90,19 +90,19 @@ + + + #if DoSharedLib +-SharedLibraryTarget(wnn6,$(SOWNN6LIBREV),$(OBJS),.,.) ++SharedLibraryTarget(wnn6_for_wnn7,$(SOWNN6LIBREV),$(OBJS),.,.) + #endif + +-UnsharedLibraryTarget(wnn6_fromsrc,$(UNSHAREDOBJS),unshared,..) +-LintLibraryTarget(wnn6_fromsrc,$(SRCS)) ++UnsharedLibraryTarget(wnn6_for_wnn7_fromsrc,$(UNSHAREDOBJS),unshared,..) ++LintLibraryTarget(wnn6_for_wnn7_fromsrc,$(SRCS)) + + instlib:: install + + #if DoSharedLib +-InstallSharedLibrary(wnn6,$(SOWNN6LIBREV),$(WNNLIBDIR)) ++InstallSharedLibrary(wnn6_for_wnn7,$(SOWNN6LIBREV),$(WNNLIBDIR)) + #endif + +-InstallLibrary(wnn6_fromsrc,$(WNNLIBDIR)) ++InstallLibrary(wnn6_for_wnn7_fromsrc,$(WNNLIBDIR)) + + #if ProfileLibJlib + ProfiledLibraryTarget(wnn,$(OBJS)) diff --git a/japanese/Wnn7-lib/files/patch-wnn7-ae b/japanese/Wnn7-lib/files/patch-wnn7-ae new file mode 100644 index 000000000000..f253bc3d6694 --- /dev/null +++ b/japanese/Wnn7-lib/files/patch-wnn7-ae @@ -0,0 +1,14 @@ +--- Wnn/jlib/js.c.orig Wed Oct 28 13:36:31 1998 ++++ Wnn/jlib/js.c Wed Jul 18 17:14:31 2001 +@@ -953,8 +953,9 @@ + LockMutex(&msg_lock); + if (wnn_msg_cat == NULL){ + char nlspath[64]; +- strcpy(nlspath, LIBDIR); +- strcat(nlspath, "/%L/%N"); ++ strcpy(nlspath, SHARDIR); ++ strcat(nlspath, "/msg"); ++ strcat(nlspath, "/%N"); + wnn_msg_cat = msg_open("libwnn.msg", nlspath, lang, NULL); + if(wnn_msg_cat == NULL){ + fprintf(stderr, "libwnn: Can't open message file for libwnn.a\n"); |