Fixed compile issue, bug #185360.

Package-Manager: portage-2.1.2.11

5 files changed, 222 insertions, 5 deletions

diff --git a/app-i18n/jfbterm/ChangeLog b/app-i18n/jfbterm/ChangeLog
index 0e48a4468c20..a61d7797709f 100644
--- a/app-i18n/jfbterm/ChangeLog
+++ b/app-i18n/jfbterm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/jfbterm
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/jfbterm/ChangeLog,v 1.43 2007/07/22 02:53:17 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/jfbterm/ChangeLog,v 1.44 2007/08/18 02:08:20 matsuu Exp $
+
+*jfbterm-0.4.7-r4 (18 Aug 2007)
+
+  18 Aug 2007; MATSUU Takuto <matsuu@gentoo.org>
+  +files/jfbterm-0.4.7-gentoo.patch, +jfbterm-0.4.7-r4.ebuild:
+  Fixed compile issue, bug #185360. This patch is based on debian patch.
+  Clean up ebuild. Added media-fonts/intlfonts to DEPEND.
+  Removed ppc64 arch because media-fonts/intlfonts has no ppc64 KEYWORDS.
 
   21 Jul 2007; Tom Gall <tgall@gentoo.org> jfbterm-0.4.7-r3.ebuild:
   stable on ppc64 bug 162676
diff --git a/app-i18n/jfbterm/Manifest b/app-i18n/jfbterm/Manifest
index 43690557798e..1f74ae7b7b9d 100644
--- a/app-i18n/jfbterm/Manifest
+++ b/app-i18n/jfbterm/Manifest
@@ -1,3 +1,7 @@
+AUX jfbterm-0.4.7-gentoo.patch 8279 RMD160 dbbce3af6c7f2c872b984bebe3bf1adbcbbde5fa SHA1 9c49502b86d06d23dfa17755f8f76fa8750b1749 SHA256 b6130c9a79c714229fa8764da012bed6835f1daf1c330b8bf27fb9e777c66b46
+MD5 e30ab17af50d0bfbbb4b8a80789adb39 files/jfbterm-0.4.7-gentoo.patch 8279
+RMD160 dbbce3af6c7f2c872b984bebe3bf1adbcbbde5fa files/jfbterm-0.4.7-gentoo.patch 8279
+SHA256 b6130c9a79c714229fa8764da012bed6835f1daf1c330b8bf27fb9e777c66b46 files/jfbterm-0.4.7-gentoo.patch 8279
 AUX jfbterm-0.4.7-no-kernel-headers.patch 522 RMD160 19cfe796736953d94bf4ed900576e957364f3980 SHA1 dcd164714f6d51dd69caa8fb0b64cbe6d593af47 SHA256 a87896ecfd73925a01bbd639e1b80c578dcb8e83fd006d5931308141c7bf33e8
 MD5 2ba0ed07a34d3df8971c0f22018521f2 files/jfbterm-0.4.7-no-kernel-headers.patch 522
 RMD160 19cfe796736953d94bf4ed900576e957364f3980 files/jfbterm-0.4.7-no-kernel-headers.patch 522
@@ -15,10 +19,14 @@ EBUILD jfbterm-0.4.7-r3.ebuild 1402 RMD160 33e1c64992a66d7754a272f829c5587bf01c9
 MD5 25e3b895f504b3a6ce3f4d8b0c8c0cf3 jfbterm-0.4.7-r3.ebuild 1402
 RMD160 33e1c64992a66d7754a272f829c5587bf01c9b38 jfbterm-0.4.7-r3.ebuild 1402
 SHA256 df8e3bd4f625743e10b1083b8798150dfea82d753908777d493b14565553da25 jfbterm-0.4.7-r3.ebuild 1402
-MISC ChangeLog 6358 RMD160 70c05b6d298e635883f75e8978e48ba78d500eb7 SHA1 51ab6e57675d96fd1da071ad02656a7bd2a8468a SHA256 42d5a039dcf2e44f6708eb0cd6899bbe0570621e8b64ca8af69b7fe37ef8e6dd
-MD5 6e00078fd930e17f50ffe0be43e51ac8 ChangeLog 6358
-RMD160 70c05b6d298e635883f75e8978e48ba78d500eb7 ChangeLog 6358
-SHA256 42d5a039dcf2e44f6708eb0cd6899bbe0570621e8b64ca8af69b7fe37ef8e6dd ChangeLog 6358
+EBUILD jfbterm-0.4.7-r4.ebuild 1265 RMD160 9a3f1145ceeff2aeee664961ac1de62b68260872 SHA1 14d834c87f3e6f05905fd87cfb377e7c1c272cc1 SHA256 8b09e0f1615369bdb33c61e4fe3417c8ad1007cfe734cf1803a5b6f5240c8575
+MD5 aceeec4a08ce2e35b72bdef8bb0da864 jfbterm-0.4.7-r4.ebuild 1265
+RMD160 9a3f1145ceeff2aeee664961ac1de62b68260872 jfbterm-0.4.7-r4.ebuild 1265
+SHA256 8b09e0f1615369bdb33c61e4fe3417c8ad1007cfe734cf1803a5b6f5240c8575 jfbterm-0.4.7-r4.ebuild 1265
+MISC ChangeLog 6710 RMD160 9d0f0bfb44af0af1ed8cba7e2caa2cf9615aede1 SHA1 e355fb4fa62f49addae9ede72894e0e4455bd667 SHA256 25ec02c2f279d162ab5c06f352a6cc00146d21dc817d41daf27f9966dde37095
+MD5 4a90b4222e5aea12be94417385550e25 ChangeLog 6710
+RMD160 9d0f0bfb44af0af1ed8cba7e2caa2cf9615aede1 ChangeLog 6710
+SHA256 25ec02c2f279d162ab5c06f352a6cc00146d21dc817d41daf27f9966dde37095 ChangeLog 6710
 MISC metadata.xml 567 RMD160 ce8a065fc61e44e128e4111414b3b793a6902d4b SHA1 4c49d32f964e0c58791489ceaaeae4987e01da0b SHA256 a7276ede7d1d355e705985646fea5518266cb673e2cb138c24983d217fff0d46
 MD5 86a8d60602760b24311a0309d18d677c metadata.xml 567
 RMD160 ce8a065fc61e44e128e4111414b3b793a6902d4b metadata.xml 567
@@ -29,3 +37,6 @@ SHA256 8ff7849bfad9a841f49afe0bb6bed60c999b1dca57cbd960ed5af628f7d61654 files/di
 MD5 76dbb76c755ba9238d830fcced31c6a1 files/digest-jfbterm-0.4.7-r3 241
 RMD160 e0be59d3c16da612e15b30a638cbc1e553e24a5f files/digest-jfbterm-0.4.7-r3 241
 SHA256 8ff7849bfad9a841f49afe0bb6bed60c999b1dca57cbd960ed5af628f7d61654 files/digest-jfbterm-0.4.7-r3 241
+MD5 76dbb76c755ba9238d830fcced31c6a1 files/digest-jfbterm-0.4.7-r4 241
+RMD160 e0be59d3c16da612e15b30a638cbc1e553e24a5f files/digest-jfbterm-0.4.7-r4 241
+SHA256 8ff7849bfad9a841f49afe0bb6bed60c999b1dca57cbd960ed5af628f7d61654 files/digest-jfbterm-0.4.7-r4 241
diff --git a/app-i18n/jfbterm/files/digest-jfbterm-0.4.7-r4 b/app-i18n/jfbterm/files/digest-jfbterm-0.4.7-r4
new file mode 100644
index 000000000000..e9393b952732
--- /dev/null
+++ b/app-i18n/jfbterm/files/digest-jfbterm-0.4.7-r4
@@ -0,0 +1,3 @@
+MD5 cb0b869bd1c21f0dd224b7fc40517680 jfbterm-0.4.7.tar.gz 104592
+RMD160 814c9c78fd7da8d8a4747b2644f8007554e6679f jfbterm-0.4.7.tar.gz 104592
+SHA256 a18446040cfaadd51c1ce77bb06ba6860372a70a04e36962e2635253a1f693a3 jfbterm-0.4.7.tar.gz 104592
diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-gentoo.patch b/app-i18n/jfbterm/files/jfbterm-0.4.7-gentoo.patch
new file mode 100644
index 000000000000..8dc8bc097b05
--- /dev/null
+++ b/app-i18n/jfbterm/files/jfbterm-0.4.7-gentoo.patch
@@ -0,0 +1,144 @@
+diff -Naur jfbterm-0.4.7.orig/fbcommon.c jfbterm-0.4.7/fbcommon.c
+--- jfbterm-0.4.7.orig/fbcommon.c	2003-09-03 00:23:17.000000000 +0900
++++ jfbterm-0.4.7/fbcommon.c	2007-08-18 10:55:30.000000000 +0900
+@@ -46,7 +46,6 @@
+ #endif
+ #include <linux/vt.h>
+ #include <linux/fb.h>
+-#include <asm/page.h>
+ 
+ #include "mytypes.h"
+ #include "fbcommon.h"
+@@ -475,6 +474,9 @@
+ 			perror("ioctl FBIOGET_CON2FBMAP");
+ 			c2m.framebuffer = 0;
+ 		}
++		if (-1 == c2m.framebuffer) {
++			c2m.framebuffer = 0;
++		}
+ 		close(fd);
+ 		snprintf(fbdn, 15, "/dev/fb%d", c2m.framebuffer);
+ 	}
+diff -Naur jfbterm-0.4.7.orig/jfbterm.conf.sample jfbterm-0.4.7/jfbterm.conf.sample
+--- jfbterm-0.4.7.orig/jfbterm.conf.sample	2003-09-16 00:16:35.000000000 +0900
++++ jfbterm-0.4.7/jfbterm.conf.sample	2007-08-18 10:19:00.000000000 +0900
+@@ -19,29 +19,29 @@
+ #	Absolute path or relative path to PWD
+ #
+ ###############################################################################
+-fontset : iso646-1973irv,pcf,L,/usr/X11R6/lib/X11/fonts/misc/8x16.pcf.gz
++fontset : iso646-1973irv,pcf,L,/usr/share/fonts/misc/8x16.pcf.gz
+ +fontset: ansix3.4-1968,alias,L,iso646-1973irv
+-+fontset: jisc6226-1978,pcf,L,/usr/X11R6/lib/X11/fonts/misc/jiskan16.pcf.gz
+++fontset: jisc6226-1978,pcf,L,/usr/share/fonts/misc/jiskan16.pcf.gz
+ +fontset: jisx0208-1983,alias,L,jisc6226-1978
+-+fontset: jisc6220-1969roman,pcf,L,/usr/X11R6/lib/X11/fonts/misc/a18rk.pcf.gz
+++fontset: jisc6220-1969roman,pcf,L,/usr/share/fonts/intlfonts/a18rk.pcf.gz
+ +fontset: jisc6220-1969kana,alias,R,jisc6220-1969roman
+-+fontset: jisx0212-1990,pcf,L,/usr/X11R6/lib/X11/fonts/misc/jksp16.pcf.gz
+-+fontset: gb2312-80,pcf,L,/usr/X11R6/lib/X11/fonts/misc/gb16fs.pcf.gz
+-+fontset: ksc5601-1987,pcf,L,/usr/X11R6/lib/X11/fonts/misc/hanglg16.pcf.gz
+-+fontset: iso8859.1-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x16.pcf.gz
+-+fontset: iso8859.2-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt2-16-etl.pcf.gz
+-+fontset: iso8859.3-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt3-16-etl.pcf.gz
+-+fontset: iso8859.4-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt4-16-etl.pcf.gz
+-+fontset: iso8859.5-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/cyr16-etl.pcf.gz
+-+fontset: iso8859.7-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/grk16-etl.pcf.gz
+-+fontset: iso8859.8-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/heb16-etl.pcf.gz
+-+fontset: iso8859.9-1989,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt5-16-etl.pcf.gz
+-+fontset: iso8859.10-1992,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-10.pcf.gz
+-+fontset: iso8859.13-1998,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-13.pcf.gz
+-+fontset: iso8859.14-1998,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-14.pcf.gz
+-+fontset: iso8859.15-1999,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-15.pcf.gz
+++fontset: jisx0212-1990,pcf,L,/usr/share/fonts/intlfonts/jksp16.pcf.gz
+++fontset: gb2312-80,pcf,L,/usr/share/fonts/misc/gb16fs.pcf.gz
+++fontset: ksc5601-1987,pcf,L,/usr/share/fonts/misc/hanglg16.pcf.gz
+++fontset: iso8859.1-1987,pcf,R,/usr/share/fonts/misc/8x16.pcf.gz
+++fontset: iso8859.2-1987,pcf,R,/usr/share/fonts/intlfonts/lt2-16-etl.pcf.gz
+++fontset: iso8859.3-1988,pcf,R,/usr/share/fonts/intlfonts/lt3-16-etl.pcf.gz
+++fontset: iso8859.4-1988,pcf,R,/usr/share/fonts/intlfonts/lt4-16-etl.pcf.gz
+++fontset: iso8859.5-1988,pcf,R,/usr/share/fonts/intlfonts/cyr16-etl.pcf.gz
+++fontset: iso8859.7-1987,pcf,R,/usr/share/fonts/intlfonts/grk16-etl.pcf.gz
+++fontset: iso8859.8-1988,pcf,R,/usr/share/fonts/intlfonts/heb16-etl.pcf.gz
+++fontset: iso8859.9-1989,pcf,R,/usr/share/fonts/intlfonts/lt5-16-etl.pcf.gz
+++fontset: iso8859.10-1992,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-10.pcf.gz
+++fontset: iso8859.13-1998,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-13.pcf.gz
+++fontset: iso8859.14-1998,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-14.pcf.gz
+++fontset: iso8859.15-1999,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-15.pcf.gz
+ +fontset: vt100-graphics,pcf,L,/usr/share/fonts/jfbterm/vt100-graphics.pcf.gz
+-+fontset: iso10646.1,pcf,U,/usr/X11R6/lib/X11/fonts/misc/unifont.pcf.gz
+++fontset: iso10646.1,pcf,U,/usr/share/fonts/unifont/unifont.pcf.gz
+ 
+ 
+ ###############################################################################
+diff -Naur jfbterm-0.4.7.orig/jfbterm.conf.sample.ja jfbterm-0.4.7/jfbterm.conf.sample.ja
+--- jfbterm-0.4.7.orig/jfbterm.conf.sample.ja	2003-09-16 00:16:35.000000000 +0900
++++ jfbterm-0.4.7/jfbterm.conf.sample.ja	2007-08-18 10:19:11.000000000 +0900
+@@ -25,29 +25,29 @@
+ #	絶対パス or PWDからの相対パス
+ #
+ ################################################################################
+-fontset : iso646-1973irv,pcf,L,/usr/X11R6/lib/X11/fonts/misc/8x16.pcf.gz
++fontset : iso646-1973irv,pcf,L,/usr/share/fonts/misc/8x16.pcf.gz
+ +fontset: ansix3.4-1968,alias,L,iso646-1973irv
+-+fontset: jisc6226-1978,pcf,L,/usr/X11R6/lib/X11/fonts/misc/jiskan16.pcf.gz
+++fontset: jisc6226-1978,pcf,L,/usr/share/fonts/misc/jiskan16.pcf.gz
+ +fontset: jisx0208-1983,alias,L,jisc6226-1978
+-+fontset: jisc6220-1969roman,pcf,L,/usr/X11R6/lib/X11/fonts/misc/a18rk.pcf.gz
+++fontset: jisc6220-1969roman,pcf,L,/usr/share/fonts/intlfonts/a18rk.pcf.gz
+ +fontset: jisc6220-1969kana,alias,R,jisc6220-1969roman
+-+fontset: jisx0212-1990,pcf,L,/usr/X11R6/lib/X11/fonts/misc/jksp16.pcf.gz
+-+fontset: gb2312-80,pcf,L,/usr/X11R6/lib/X11/fonts/misc/gb16fs.pcf.gz
+-+fontset: ksc5601-1987,pcf,L,/usr/X11R6/lib/X11/fonts/misc/hanglg16.pcf.gz
+-+fontset: iso8859.1-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x16.pcf.gz
+-+fontset: iso8859.2-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt2-16-etl.pcf.gz
+-+fontset: iso8859.3-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt3-16-etl.pcf.gz
+-+fontset: iso8859.4-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt4-16-etl.pcf.gz
+-+fontset: iso8859.5-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/cyr16-etl.pcf.gz
+-+fontset: iso8859.7-1987,pcf,R,/usr/X11R6/lib/X11/fonts/misc/grk16-etl.pcf.gz
+-+fontset: iso8859.8-1988,pcf,R,/usr/X11R6/lib/X11/fonts/misc/heb16-etl.pcf.gz
+-+fontset: iso8859.9-1989,pcf,R,/usr/X11R6/lib/X11/fonts/misc/lt5-16-etl.pcf.gz
+-+fontset: iso8859.10-1992,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-10.pcf.gz
+-+fontset: iso8859.13-1998,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-13.pcf.gz
+-+fontset: iso8859.14-1998,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-14.pcf.gz
+-+fontset: iso8859.15-1999,pcf,R,/usr/X11R6/lib/X11/fonts/misc/8x13-ISO8859-15.pcf.gz
+++fontset: jisx0212-1990,pcf,L,/usr/share/fonts/intlfonts/jksp16.pcf.gz
+++fontset: gb2312-80,pcf,L,/usr/share/fonts/misc/gb16fs.pcf.gz
+++fontset: ksc5601-1987,pcf,L,/usr/share/fonts/misc/hanglg16.pcf.gz
+++fontset: iso8859.1-1987,pcf,R,/usr/share/fonts/misc/8x16.pcf.gz
+++fontset: iso8859.2-1987,pcf,R,/usr/share/fonts/intlfonts/lt2-16-etl.pcf.gz
+++fontset: iso8859.3-1987,pcf,R,/usr/share/fonts/intlfonts/lt3-16-etl.pcf.gz
+++fontset: iso8859.4-1988,pcf,R,/usr/share/fonts/intlfonts/lt4-16-etl.pcf.gz
+++fontset: iso8859.5-1988,pcf,R,/usr/share/fonts/intlfonts/cyr16-etl.pcf.gz
+++fontset: iso8859.7-1987,pcf,R,/usr/share/fonts/intlfonts/grk16-etl.pcf.gz
+++fontset: iso8859.8-1988,pcf,R,/usr/share/fonts/intlfonts/heb16-etl.pcf.gz
+++fontset: iso8859.9-1989,pcf,R,/usr/share/fonts/intlfonts/lt5-16-etl.pcf.gz
+++fontset: iso8859.10-1992,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-10.pcf.gz
+++fontset: iso8859.13-1998,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-13.pcf.gz
+++fontset: iso8859.14-1998,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-14.pcf.gz
+++fontset: iso8859.15-1999,pcf,R,/usr/share/fonts/misc/8x13-ISO8859-15.pcf.gz
+ +fontset: vt100-graphics,pcf,L,/usr/share/fonts/jfbterm/vt100-graphics.pcf.gz
+-+fontset: iso10646.1,pcf,L,/usr/X11R6/lib/X11/fonts/misc/unifont.pcf.gz
+++fontset: iso10646.1,pcf,L,/usr/share/fonts/unifont/unifont.pcf.gz
+ 
+ ################################################################################
+ #
+diff -Naur jfbterm-0.4.7.orig/util.h jfbterm-0.4.7/util.h
+--- jfbterm-0.4.7.orig/util.h	2003-09-16 00:45:31.000000000 +0900
++++ jfbterm-0.4.7/util.h	2007-08-18 08:48:49.000000000 +0900
+@@ -31,6 +31,7 @@
+ 
+ #include <sys/types.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ 
+ void util_privilege_init();
+ void util_privilege_on();
+@@ -49,4 +50,7 @@
+ 
+ int util_search_string(const char* s, const char** array);
+ 
++#define PAGE_SIZE (sysconf(_SC_PAGESIZE))
++#define PAGE_MASK (~(PAGE_SIZE-1))
++
+ #endif /* INCLUDE_UTIL_H */
diff --git a/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild b/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild
new file mode 100644
index 000000000000..941932f94610
--- /dev/null
+++ b/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild,v 1.1 2007/08/18 02:08:20 matsuu Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit flag-o-matic eutils autotools
+
+DESCRIPTION="The J Framebuffer Terminal/Multilingual Enhancement with UTF-8 support"
+HOMEPAGE="http://jfbterm.sourceforge.jp/"
+SRC_URI="mirror://sourceforge.jp/${PN}/13501/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="debug"
+
+DEPEND=">=sys-libs/ncurses-5.6"
+RDEPEND="media-fonts/unifont
+	media-fonts/font-misc-misc
+	media-fonts/intlfonts"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-sigchld-debian.patch"
+	epatch "${FILESDIR}/${P}-no-kernel-headers.patch"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+
+	eautoreconf
+}
+
+src_compile() {
+	append-ldflags $(bindnow-flags)
+
+	econf $(use_enable debug) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	dodir /etc /usr/share/fonts/jfbterm
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+
+	mv "${D}"/etc/jfbterm.conf{.sample,}
+
+	doman jfbterm.1 jfbterm.conf.5
+
+	dodoc AUTHORS ChangeLog NEWS README*
+	dodoc jfbterm.conf.sample*
+}