Added wheel mouse support and Xaw3d IUSE flag.

8 files changed, 137 insertions, 13 deletions

diff --git a/x11-terms/kterm/ChangeLog b/x11-terms/kterm/ChangeLog
index 0e88852d4c23..09070b6f2829 100644
--- a/x11-terms/kterm/ChangeLog
+++ b/x11-terms/kterm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/kterm
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/kterm/ChangeLog,v 1.6 2003/09/08 21:19:15 usata Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/kterm/ChangeLog,v 1.7 2004/01/06 21:45:23 usata Exp $
+
+*kterm-6.2.0-r2 (07 Jan 2004)
+
+  07 Jan 2004; <usata@gentoo.org> kterm-6.2.0-r2.ebuild,
+  files/kterm-6.2.0-Xaw3d.patch, files/kterm-ad-gentoo.diff:
+  Added wheel mouse support and Xaw3d IUSE flag.
 
 *kterm-6.2.0-r1 (20 Jun 2003)
 
diff --git a/x11-terms/kterm/Manifest b/x11-terms/kterm/Manifest
index bf58581b6298..2d2380660606 100644
--- a/x11-terms/kterm/Manifest
+++ b/x11-terms/kterm/Manifest
@@ -1,11 +1,11 @@
-MD5 169136d8487e2dd2dfc5392ffc92a1c6 kterm-6.2.0.ebuild 888
-MD5 70cad5d9de9970a4e496cd182fbcfc76 ChangeLog 1051
+MD5 d8dac8f959dfd0399ebdcd0948a0cace kterm-6.2.0.ebuild 887
+MD5 fc1c34d07c53f62b99729b430942c268 ChangeLog 1250
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 b103b3d2c88ab9af9930c21911a42c5f kterm-6.2.0-r1.ebuild 1843
-MD5 a8819d965a242f6ee96b2b4607c5f33e kterm-6.2.0-r2.ebuild 1594
+MD5 14e96da3fd82df08df6cd5a0c3b5a0c8 kterm-6.2.0-r1.ebuild 1827
+MD5 daa7004e917384aaf554cd70a096b8f0 kterm-6.2.0-r2.ebuild 1693
 MD5 60f864908bc68079f6edb20c923f280f files/kterm-6.2.0-gentoo.patch 1519
 MD5 a56faea61552cc728261f1021372c95d files/digest-kterm-6.2.0-r1 200
 MD5 225ceb359c6916aa3089ff08f98ee36f files/digest-kterm-6.2.0 63
 MD5 2456d786b69d21ffb9ac133e8de1718b files/kterm-6.2.0-Xaw3d.patch 937
-MD5 ea3b41dc916e51fca2a503e96695e97c files/kterm-ad-gentoo.diff 690
+MD5 3ba95cde993d406153d9466a73203c4f files/kterm-ad-gentoo.diff 737
 MD5 a56faea61552cc728261f1021372c95d files/digest-kterm-6.2.0-r2 200
diff --git a/x11-terms/kterm/files/digest-kterm-6.2.0-r2 b/x11-terms/kterm/files/digest-kterm-6.2.0-r2
new file mode 100644
index 000000000000..a506138241ff
--- /dev/null
+++ b/x11-terms/kterm/files/digest-kterm-6.2.0-r2
@@ -0,0 +1,3 @@
+MD5 9cc72841b50dfba92bce01dbbebf3039 kterm-6.2.0.tar.gz 200448
+MD5 9b7f06ce63fa06a656e45b752f8f6240 kterm-6.2.0-wpi.patch.gz 6629
+MD5 f68251692cb979c0c3bb39fb26843ae8 kterm-6.2.0.ext02.patch.gz 15290
diff --git a/x11-terms/kterm/files/kterm-6.2.0-Xaw3d.patch b/x11-terms/kterm/files/kterm-6.2.0-Xaw3d.patch
new file mode 100644
index 000000000000..cda8856a8cff
--- /dev/null
+++ b/x11-terms/kterm/files/kterm-6.2.0-Xaw3d.patch
@@ -0,0 +1,25 @@
+diff -Naur kterm-6.2.0/Imakefile kterm-6.2.0-Xaw3d/Imakefile
+--- kterm-6.2.0/Imakefile	2003-12-13 15:35:05.000000000 +0900
++++ kterm-6.2.0-Xaw3d/Imakefile	2003-12-13 23:10:24.000000000 +0900
+@@ -23,6 +23,10 @@
+     PUCCPTYDDEF = -DPUCC_PTYD		/* does not need to be setuid */
+          PTYLIB = -lpucc
+ #endif
++#ifdef KTERM_XAW3D
++	XAWLIB = -lXaw3d
++	XAW6LIB =  -lXaw3d
++#endif
+ 
+  OSMAJORVERSION = OSMajorVersion
+  OSMINORVERSION = OSMinorVersion
+diff -Naur kterm-6.2.0/kterm.h kterm-6.2.0-Xaw3d/kterm.h
+--- kterm-6.2.0/kterm.h	2003-12-13 15:35:05.000000000 +0900
++++ kterm-6.2.0-Xaw3d/kterm.h	2003-12-13 15:35:55.000000000 +0900
+@@ -36,6 +36,6 @@
+ #define KTERM_KINPUT2	/* Kinput2 protocol */
+ #define KTERM_COLOR	/* color sequence */
+ #define KTERM_NOTEK	/* disables Tektronix emulation */
+-#undef  KTERM_XAW3D	/* Xaw3d -DARROW_SCROLLBAR support */
++#define KTERM_XAW3D	/* Xaw3d -DARROW_SCROLLBAR support */
+ 
+ #endif /* !_KTERM_H_ */
diff --git a/x11-terms/kterm/files/kterm-ad-gentoo.diff b/x11-terms/kterm/files/kterm-ad-gentoo.diff
new file mode 100644
index 000000000000..a502bac0eb73
--- /dev/null
+++ b/x11-terms/kterm/files/kterm-ad-gentoo.diff
@@ -0,0 +1,21 @@
+--- KTerm.ad.orig	2004-01-07 06:25:15.000000000 +0900
++++ KTerm.ad	2004-01-07 06:27:43.550017672 +0900
+@@ -125,3 +125,18 @@
+ 
+ *VT100*translations: #override  Shift<Key>space: \
+ 	begin-conversion(_JAPANESE_CONVERSION)
++
++! default values added by portage
++*VT100*kanjiMode:       euc
++*inputMethod:           kinput2
++!*openIm:                true
++! To use wallpaper, uncomment and set it to your favorite image
++!*wallPaper: /path/to/filename.xpm
++
++! To enable wheel mouse
++KTerm*VT100.Translations: #override\n\
++	<KeyPress>Prior:scroll-back(1,page)\n\
++	<KeyPress>Next:scroll-forw(1,page)\n\
++	Shift<Key>space:begin-conversion(_JAPANESE_CONVERSION)\n\
++	<Btn4Down>:scroll-back(1,halfpage)\n\
++	<Btn5Down>:scroll-forw(1,halfpage)\n
diff --git a/x11-terms/kterm/kterm-6.2.0-r1.ebuild b/x11-terms/kterm/kterm-6.2.0-r1.ebuild
index 5b8a66ef6bd9..943b2f28e68f 100644
--- a/x11-terms/kterm/kterm-6.2.0-r1.ebuild
+++ b/x11-terms/kterm/kterm-6.2.0-r1.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/kterm/kterm-6.2.0-r1.ebuild,v 1.3 2003/09/08 21:19:15 usata Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/kterm/kterm-6.2.0-r1.ebuild,v 1.4 2004/01/06 21:45:23 usata Exp $
 
 IUSE=""
 
diff --git a/x11-terms/kterm/kterm-6.2.0-r2.ebuild b/x11-terms/kterm/kterm-6.2.0-r2.ebuild
new file mode 100644
index 000000000000..afe8e570ca36
--- /dev/null
+++ b/x11-terms/kterm/kterm-6.2.0-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/kterm/kterm-6.2.0-r2.ebuild,v 1.1 2004/01/06 21:45:23 usata Exp $
+
+IUSE="Xaw3d"
+
+DESCRIPTION="Japanese Kanji X Terminal"
+SRC_URI="ftp://ftp.x.org/contrib/applications/${P}.tar.gz
+	http://www.asahi-net.or.jp/~hc3j-tkg/kterm/${P}-wpi.patch.gz
+	http://www.st.rim.or.jp/~hanataka/${P}.ext02.patch.gz"
+# until someone who reads japanese can find a better place
+HOMEPAGE="http://www.asahi-net.or.jp/~hc3j-tkg/kterm/"
+LICENSE="X11"
+SLOT="0"
+KEYWORDS="~x86 ~sparc -alpha ~ppc"
+
+DEPEND="${RDEPEND}
+	app-i18n/nkf"
+RDEPEND="virtual/x11
+	sys-libs/ncurses
+	Xaw3d? ( x11-libs/Xaw3d )"
+
+src_unpack(){
+	unpack ${A}
+
+	cd ${S}
+	epatch ${WORKDIR}/${P}-wpi.patch		# wallpaper patch
+	epatch ${WORKDIR}/${P}.ext02.patch		# JIS 0213 support
+	epatch ${FILESDIR}/${P}-gentoo.patch
+	epatch ${FILESDIR}/${PN}-ad-gentoo.diff
+
+	if [ `use Xaw3d` ]
+	then
+		epatch ${FILESDIR}/kterm-6.2.0-Xaw3d.patch
+	fi
+}
+
+src_compile(){
+
+	xmkmf -a || die
+	emake || die
+}
+
+src_install(){
+
+	einstall DESTDIR=${D} BINDIR=/usr/bin || die
+
+	# install man pages
+	newman kterm.man kterm.1
+	insinto /usr/share/man/ja/man1
+	nkf -e kterm.jman > kterm.ja.1
+	newins kterm.ja.1 kterm.1
+
+	tic terminfo.kt -o${D}/usr/share/terminfo || die "tic failed"
+
+	dodoc README.kt
+}
+
+pkg_postinst() {
+	einfo
+	einfo "KTerm wallpaper support is enabled."
+	einfo "In order to use this feature,"
+	einfo "you need specify favourite xpm file with -wp option"
+	einfo
+	einfo "\t% kterm -wp filename.xpm"
+	einfo
+	einfo "or set it with X resource"
+	einfo
+	einfo "\tKTerm*wallPaper: /path/to/filename.xpm"
+	einfo
+}
diff --git a/x11-terms/kterm/kterm-6.2.0.ebuild b/x11-terms/kterm/kterm-6.2.0.ebuild
index fc85461db0f7..04857b32123d 100644
--- a/x11-terms/kterm/kterm-6.2.0.ebuild
+++ b/x11-terms/kterm/kterm-6.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/kterm/kterm-6.2.0.ebuild,v 1.5 2003/02/13 17:35:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/kterm/kterm-6.2.0.ebuild,v 1.6 2004/01/06 21:45:23 usata Exp $
 
 DESCRIPTION="Japanese Kanji X Terminal"
 SRC_URI="ftp://ftp.x.org/contrib/applications/kterm-6.2.0.tar.gz"