Fixed compile issue.

5 files changed, 92 insertions, 15 deletions

diff --git a/app-i18n/freewnn/ChangeLog b/app-i18n/freewnn/ChangeLog
index ab32d0f0dbe1..7ddc051dc6f2 100644
--- a/app-i18n/freewnn/ChangeLog
+++ b/app-i18n/freewnn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/freewnn
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/ChangeLog,v 1.13 2004/06/24 21:45:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/ChangeLog,v 1.14 2004/07/01 22:14:12 matsuu Exp $
+
+*freewnn-1.1.1_alpha20-r1 (02 Jul 2004)
+
+  02 Jul 2004; <matsuu@gentoo.org> +files/freewnn-1.1.1_alpha20-gentoo.diff,
+  +freewnn-1.1.1_alpha20-r1.ebuild:
+  Fixed compile issue. Bug#46021.
 
   23 May 2004; Mamoru KOMACHI <usata@gentoo.org> freewnn-1.1.1_alpha20.ebuild:
   Stable on ppc
diff --git a/app-i18n/freewnn/Manifest b/app-i18n/freewnn/Manifest
index 1fdce125a4fd..c19b17e46a73 100644
--- a/app-i18n/freewnn/Manifest
+++ b/app-i18n/freewnn/Manifest
@@ -1,22 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 85178fa99e5aadbfd0288f1db13da43c ChangeLog 2306
+MD5 ad1b5c28b737b4cd9bc7b5d3b8d23900 freewnn-1.1.1_alpha17.ebuild 1547
 MD5 62bc63f44df993b21e0382fa14bc9cc3 freewnn-1.1.1_alpha20.ebuild 1333
+MD5 bfa23ad5338165cd50147ecef8ef30be freewnn-1.1.1_alpha20-r1.ebuild 1243
+MD5 85178fa99e5aadbfd0288f1db13da43c ChangeLog 2306
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 ad1b5c28b737b4cd9bc7b5d3b8d23900 freewnn-1.1.1_alpha17.ebuild 1547
+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 26f2f4f4d23f76e26254c9d074e3e75a files/digest-freewnn-1.1.1_alpha17 71
+MD5 e6f71c09539eca59f75a3480b734d3d1 files/freewnn-1.1.1_alpha20-gentoo.diff 1044
+MD5 a67e6df6683b65c8912a11446a1c1240 files/digest-freewnn-1.1.1_alpha20-r1 72
+MD5 a24127af4d21ec364c841cc06b37411a files/a017/FreeWnn-sighandler.patch 876
 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 a24127af4d21ec364c841cc06b37411a files/a017/FreeWnn-sighandler.patch 876
 MD5 7db8085bf871d6445f549b015b7217a9 files/a017/FreeWnn-uum.patch 1983
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFA33f2HTu7gpaalycRAtxvAKC0C2hXjiAipJnQDdXz2mCRIHzFqgCgxlbd
-ciuKlUYDBsPFZ+YIYmLTncQ=
-=DZzK
------END PGP SIGNATURE-----
diff --git a/app-i18n/freewnn/files/digest-freewnn-1.1.1_alpha20-r1 b/app-i18n/freewnn/files/digest-freewnn-1.1.1_alpha20-r1
new file mode 100644
index 000000000000..8dcce6ef112d
--- /dev/null
+++ b/app-i18n/freewnn/files/digest-freewnn-1.1.1_alpha20-r1
@@ -0,0 +1 @@
+MD5 c00549415cdb08c1f35240dccf8dab20 FreeWnn-1.1.1-a020.tar.bz2 3015928
diff --git a/app-i18n/freewnn/files/freewnn-1.1.1_alpha20-gentoo.diff b/app-i18n/freewnn/files/freewnn-1.1.1_alpha20-gentoo.diff
new file mode 100644
index 000000000000..8969034a118d
--- /dev/null
+++ b/app-i18n/freewnn/files/freewnn-1.1.1_alpha20-gentoo.diff
@@ -0,0 +1,24 @@
+diff -Naur FreeWnn-1.10-pl020.orig/configure FreeWnn-1.10-pl020/configure
+--- FreeWnn-1.10-pl020.orig/configure	2002-09-02 02:48:20.000000000 +0900
++++ FreeWnn-1.10-pl020/configure	2004-06-26 11:29:16.742279625 +0900
+@@ -2514,7 +2514,7 @@
+ CDEBUGFLAGS=${CDEBUGFLAGS:-"-O"}
+ case $host in
+ *-*-linux*)
+-    CCOPTIONS="-Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE"
++    CCOPTIONS="-Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE"
+     CDEBUGFLAGS="-O2 -fno-strength-reduce"
+     ;;
+ *-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
+diff -Naur FreeWnn-1.10-pl020.orig/configure.in FreeWnn-1.10-pl020/configure.in
+--- FreeWnn-1.10-pl020.orig/configure.in	2002-09-02 02:48:19.000000000 +0900
++++ FreeWnn-1.10-pl020/configure.in	2004-06-26 11:30:21.886225442 +0900
+@@ -261,7 +261,7 @@
+ CDEBUGFLAGS=${CDEBUGFLAGS:-"-O"}
+ case $host in
+ *-*-linux*)
+-    CCOPTIONS="-Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE"
++    CCOPTIONS="-Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE"
+     CDEBUGFLAGS="-O2 -fno-strength-reduce"
+     ;;
+ *-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha20-r1.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha20-r1.ebuild
new file mode 100644
index 000000000000..ecc3e0660614
--- /dev/null
+++ b/app-i18n/freewnn/freewnn-1.1.1_alpha20-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/freewnn/freewnn-1.1.1_alpha20-r1.ebuild,v 1.1 2004/07/01 22:14:12 matsuu 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.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
+IUSE="X ipv6"
+
+DEPEND="virtual/libc
+	X? ( virtual/x11 )"
+
+S="${WORKDIR}/FreeWnn-1.10-pl020"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	#Change WNNOWNER to root so we don't need to add wnn user
+	sed -i -e "s/WNNOWNER = wnn/WNNOWNER = root/" makerule.mk.in || die
+	epatch ${FILESDIR}/${P}-gentoo.diff
+}
+
+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
+}