haha, nevermind. no wonder why it wouldnt work... i copied over files from the wrong directory. *hangs head*

5 files changed, 71 insertions, 137 deletions

diff --git a/app-i18n/freewnn/ChangeLog b/app-i18n/freewnn/ChangeLog
index d0888ad4f5ec..8fba5d6638ee 100644
--- a/app-i18n/freewnn/ChangeLog
+++ b/app-i18n/freewnn/ChangeLog
@@ -1,9 +1,16 @@
 # ChangeLog for app-i18n/freewnn
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/ChangeLog,v 1.10 2004/05/10 22:30:25 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/ChangeLog,v 1.11 2004/05/10 23:04:40 lv Exp $
+
+*freewnn-1.1.1_alpha17 (10 May 2004)
+
+  10 May 2004; Travis Tilley <lv@gentoo.org> -files/a017/FreeWnn-ja.patch,
+  +freewnn-1.1.1_alpha17.ebuild:
+  haha, nevermind. no wonder why it wouldnt work... i copied over files from the
+  wrong directory. *hangs head*
 
   10 May 2004; Travis Tilley <lv@gentoo.org> -freewnn-1.1.1_alpha17.ebuild:
-  i made a mistake, removing ebuild until i can figure out why its trying to
+  i made a mistake, removing ebuild until i can figure out why its failing to
   build kWnn
 
 *freewnn-1.1.1_alpha17 (10 May 2004)
diff --git a/app-i18n/freewnn/Manifest b/app-i18n/freewnn/Manifest
index 8f82f813139e..f332f8137efc 100644
--- a/app-i18n/freewnn/Manifest
+++ b/app-i18n/freewnn/Manifest
@@ -1,6 +1,8 @@
+MD5 4ffc36aba74c3a3841f53b3d0377e14b freewnn-1.1.1_alpha17.ebuild 1553
 MD5 9888440d4e05044b375e61360dea1851 freewnn-1.1.1_alpha20.ebuild 1340
-MD5 57796ae6fb5b3df74194efc46a98182f ChangeLog 1952
+MD5 2758ac7d726571ac57244c59e416f4c0 ChangeLog 2213
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+MD5 26f2f4f4d23f76e26254c9d074e3e75a files/digest-freewnn-1.1.1_alpha17 71
 MD5 a67e6df6683b65c8912a11446a1c1240 files/digest-freewnn-1.1.1_alpha20 72
 MD5 9ef81b34a1fb16dd2b5c6f717913cb9e files/freewnn.initd 296
 MD5 a24127af4d21ec364c841cc06b37411a files/a017/FreeWnn-sighandler.patch 876
@@ -8,4 +10,3 @@ MD5 8b54a21960c4499a862294bac020848b files/a017/FreeWnn-1.1.1-a017.dif 19564
 MD5 d7f8705d389f74cb64218fe0ff512be5 files/a017/FreeWnn-lib64.patch 479
 MD5 96c9b5198682f09611b2ec0dbeddbce3 files/a017/FreeWnn-s390x.patch 7099
 MD5 7db8085bf871d6445f549b015b7217a9 files/a017/FreeWnn-uum.patch 1983
-MD5 4efe3f1cf65425510ebeea12cdb2f178 files/a017/FreeWnn-ja.patch 4905
diff --git a/app-i18n/freewnn/files/a017/FreeWnn-ja.patch b/app-i18n/freewnn/files/a017/FreeWnn-ja.patch
deleted file mode 100644
index c2e7b9661a1c..000000000000
--- a/app-i18n/freewnn/files/a017/FreeWnn-ja.patch
+++ /dev/null
@@ -1,133 +0,0 @@
---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/etc/msg.c	Mon Mar 20 17:31:33 2000
-+++ FreeWnn-1.1.1-a017/Xsi/Wnn/etc/msg.c	Fri Aug 18 15:20:20 2000
-@@ -457,12 +457,12 @@
- {
-   struct msg_cat *cd;
- 
--  cd = msg_open ("msg", "%L", "ja_JP");
-+  cd = msg_open ("msg", "%L", "ja");
- 
--  printf (msg_get (cd, 5, "message not found\n", "ja_JP"), 555);
-+  printf (msg_get (cd, 5, "message not found\n", "ja"), 555);
-   printf (msg_get (cd, 6, "message not found\n", "zh_CN"));
-   printf (msg_get (cd, -1, "", "ja_JP"), 555);
--  printf (msg_get (cd, 2, "message not found\n", "ja_JP"), "abc");
-+  printf (msg_get (cd, 2, "message not found\n", "ja"), "abc");
-   printf (msg_get (cd, 100, "message not found\n", "zh_CN"), "abc");
- }
- #endif /* not_use */
---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/include/jd_sock.h	Wed Feb 23 16:31:29 2000
-+++ FreeWnn-1.1.1-a017/Xsi/Wnn/include/jd_sock.h	Fri Aug 18 15:41:45 2000
-@@ -67,7 +67,7 @@
- #ifdef  JAPANESE                /* Japanese */
- # define WNN_PORT_IN    (0x5701)
- static char *sockname = "/tmp/jd_sockV4";       /* for jserver */
--# define LANG_NAME      "ja_JP"
-+# define LANG_NAME      "ja"
- # define SERVERNAME     "wnn4"
- # define MESSAGE_FILE   "jserver.msg"
- #else /* JAPANESE */
-@@ -98,7 +98,7 @@
- 
- # define WNN_PORT_IN    (0x5701)
- static char *sockname = "/tmp/jd_sockV4";       /* for jserver */
--# define LANG_NAME      "ja_JP"
-+# define LANG_NAME      "ja"
- # define SERVERNAME     "wnn4"
- # define MESSAGE_FILE   "jserver.msg"
- #endif /* KOREAN */
---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/include/jslib.h	Wed Feb 23 16:31:30 2000
-+++ FreeWnn-1.1.1-a017/Xsi/Wnn/include/jslib.h	Fri Aug 18 15:42:49 2000
-@@ -394,8 +394,8 @@
- /*
-   JSLIB function declaration
- */
--#define js_open(server, timeout)        js_open_lang(server, "ja_JP", timeout)
--#define js_connect(server,env_name)     js_connect_lang(server, env_name, "ja_JP")
-+#define js_open(server, timeout)        js_open_lang(server, "ja", timeout)
-+#define js_connect(server,env_name)     js_connect_lang(server, env_name, "ja")
- 
- extern WNN_JSERVER_ID *js_open_lang ();
- extern int js_close ();
---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/include/msg.h	Wed Feb 23 16:31:30 2000
-+++ FreeWnn-1.1.1-a017/Xsi/Wnn/include/msg.h	Fri Aug 18 15:43:29 2000
-@@ -50,7 +50,7 @@
- /*
- #define DEF_LANG "C"
- */
--#define DEF_LANG "ja_JP"
-+#define DEF_LANG "ja"
- 
- extern struct msg_cat *msg_open ();
- extern char *msg_get ();
---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/include/wnn_config.h	Wed Feb 23 16:31:30 2000
-+++ FreeWnn-1.1.1-a017/Xsi/Wnn/include/wnn_config.h	Fri Aug 18 15:46:02 2000
-@@ -44,7 +44,7 @@
- #define WNN_CSERVER_ENV         "CSERVER"
- #define WNN_KSERVER_ENV         "KSERVER"
- #define WNN_TSERVER_ENV         "TSERVER"
--#define WNN_J_LANG              "ja_JP"
-+#define WNN_J_LANG              "ja"
- #define WNN_C_LANG              "zh_CN"
- #define WNN_K_LANG              "ko_KR"
- #define WNN_T_LANG              "zh_TW"
-@@ -79,7 +79,7 @@
- /* for jserver */
- #ifndef SERVER_INIT_FILE
- # ifdef JAPANESE
--#  define SERVER_INIT_FILE      "/ja_JP/jserverrc"
-+#  define SERVER_INIT_FILE      "/ja/jserverrc"
- # else /* JAPANESE */
- # ifdef CHINESE
- # ifdef TAIWANESE
-@@ -91,7 +91,7 @@
- # ifdef KOREAN
- #  define SERVER_INIT_FILE      "/ko_KR/kserverrc"
- # else /* KOREAN */
--#  define SERVER_INIT_FILE      "/ja_JP/jserverrc"      /* Default */
-+#  define SERVER_INIT_FILE      "/ja/jserverrc"      /* Default */
- # endif /* KOREAN */
- # endif /* CHINESE */
- # endif /* JAPANESE */
-@@ -109,7 +109,7 @@
- 
- #define ENVRCFILE               "/wnnenvrc"
- #ifndef HINSIDATA_FILE
--# define HINSIDATA_FILE         "/ja_JP/hinsi.data"
-+# define HINSIDATA_FILE         "/ja/hinsi.data"
- #endif /* HINSIDATA_FILE */
- 
- #define USR_DIC_DIR_VAR "@USR"
---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jd/serverdefs	Sun Jan 30 04:40:48 2000
-+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jd/serverdefs	Fri Aug 18 15:46:43 2000
-@@ -30,7 +30,7 @@
- ;
- 
- ;lang_name	machine_name	unix_domain_socket_name	service_name	port_num
--ja_JP		jserver		/tmp/jd_sockV4		wnn4		22273
-+ja		jserver		/tmp/jd_sockV4		wnn4		22273
- japanese	jserver		/tmp/jd_sockV4		wnn4		22273
- nihongo		jserver		/tmp/jd_sockV4		wnn4		22273
- zh_CN		cserver		/tmp/cd_sockV4		wnn4_Cn		22289
---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jlib/jl.c	Mon Mar 20 17:21:12 2000
-+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jlib/jl.c	Fri Aug 18 15:47:44 2000
-@@ -442,7 +442,7 @@
-   if (!lang || !*lang)
-     {
- /* Sorry! Default is Japanese. :-) */
--      strcpy (p_lang, "ja_JP");
-+      strcpy (p_lang, "ja");
-     }
-   else
-     {
---- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/header.c	Wed Feb 23 16:31:42 2000
-+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/header.c	Fri Aug 18 15:48:36 2000
-@@ -131,7 +131,7 @@
- 
- FuncDataBase function_db[] = {
- #ifdef JAPANESE
--  {"ja_JP",
-+  {"ja",
-    {NULL, NULL, call_t_redraw_move_normal,
-     call_t_redraw_move_1_normal, call_t_redraw_move_2_normal,
-     call_t_print_l_normal, NULL, char_len_normal, char_q_len_normal,
diff --git a/app-i18n/freewnn/files/digest-freewnn-1.1.1_alpha17 b/app-i18n/freewnn/files/digest-freewnn-1.1.1_alpha17
new file mode 100644
index 000000000000..1bb27067cd4c
--- /dev/null
+++ b/app-i18n/freewnn/files/digest-freewnn-1.1.1_alpha17
@@ -0,0 +1 @@
+MD5 cf7cb1fa5ac5b624c559469de17282f9 FreeWnn-1.1.1-a017.tar.gz 3357397
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha17.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha17.ebuild
new file mode 100644
index 000000000000..565d85a2a064
--- /dev/null
+++ b/app-i18n/freewnn/freewnn-1.1.1_alpha17.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/freewnn-1.1.1_alpha17.ebuild,v 1.4 2004/05/10 23:04:40 lv Exp $
+
+inherit eutils
+
+MY_P="FreeWnn-${PV/_alpha/-a0}"
+
+DESCRIPTION="Network-Extensible Kana-to-Kanji Conversion System"
+HOMEPAGE="http://www.freewnn.org/"
+SRC_URI="ftp://ftp.freewnn.org/pub/FreeWnn/alpha/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~alpha ~ia64 ~amd64 ~ppc"
+IUSE="X ipv6"
+
+DEPEND="virtual/glibc
+	X? ( virtual/x11 )"
+
+S="${WORKDIR}/${MY_P}/Xsi"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/a017/FreeWnn-sighandler.patch
+	epatch ${FILESDIR}/a017/FreeWnn-uum.patch
+	epatch ${FILESDIR}/a017/FreeWnn-1.1.1-a017.dif
+	epatch ${FILESDIR}/a017/FreeWnn-lib64.patch
+	use s390 && epatch ${FILESDIR}/a017/FreeWnn-s390x.patch
+
+	#Change WNNOWNER to root so we don't need to add wnn user
+	sed -i -e "s/WNNOWNER = wnn/WNNOWNER = root/" ${S}/makerule.mk.in
+}
+
+src_compile() {
+	econf \
+		--disable-cWnn \
+		--disable-kWnn \
+		--without-termcap \
+		`use_with X x` \
+		`use_with ipv6` || die "./configure failed"
+
+	emake || die
+	#make || die
+}
+
+src_install () {
+	# install executables, libs ,dictionaries
+	make DESTDIR=${D} install || die "installation failed"
+	# install man pages
+	make DESTDIR=${D} install.man || die "installation of manpages failed"
+	# install docs
+	dodoc ChangeLog* INSTALL* CONTRIBUTORS
+	# install rc script
+	exeinto /etc/init.d ; newexe ${FILESDIR}/freewnn.initd freewnn
+}