Add patch to not include DESTDIR in the paths for default resources files

specified in the man page, fix bug #132843. Change the directory for the
resources files on modular to the one used in the 7.0 release.

(Portage version: 2.1_pre10-r4)

4 files changed, 129 insertions, 1 deletions

diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog
index 81f82caecfce..f696cf064aaf 100644
--- a/x11-terms/xterm/ChangeLog
+++ b/x11-terms/xterm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-terms/xterm
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.134 2006/05/03 14:22:36 exg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.135 2006/05/10 11:23:44 exg Exp $
+
+*xterm-212-r2 (10 May 2006)
+
+  10 May 2006; Emanuele Giaquinta <exg@gentoo.org>
+  +files/xterm-app-defaults-ref.patch, +xterm-212-r2.ebuild:
+  Add patch to not include DESTDIR in the paths for default resources files
+  specified in the man page, fix bug #132843. Change the directory for the
+  resources files on modular to the one used in the 7.0 release.
 
 *xterm-212-r1 (03 May 2006)
 
diff --git a/x11-terms/xterm/files/digest-xterm-212-r2 b/x11-terms/xterm/files/digest-xterm-212-r2
new file mode 100644
index 000000000000..6d07057d24f9
--- /dev/null
+++ b/x11-terms/xterm/files/digest-xterm-212-r2
@@ -0,0 +1,3 @@
+MD5 d39ec47dbf846e0e7dddb354280c4074 xterm-212.tgz 764465
+RMD160 2808cdf3f550ef9df7e83a4844f3f4f64f0508a1 xterm-212.tgz 764465
+SHA256 bfd201600c0f0f3c3d9dcfe32fde1db333307a87a4453084bf55a7aa97b3b6ae xterm-212.tgz 764465
diff --git a/x11-terms/xterm/files/xterm-app-defaults-ref.patch b/x11-terms/xterm/files/xterm-app-defaults-ref.patch
new file mode 100644
index 000000000000..423bdb8b2044
--- /dev/null
+++ b/x11-terms/xterm/files/xterm-app-defaults-ref.patch
@@ -0,0 +1,11 @@
+--- Makefile.in.old	2006-05-10 07:18:24.000000000 +0200
++++ Makefile.in	2006-05-10 07:18:56.000000000 +0200
+@@ -168,7 +168,7 @@
+ install \
+ install-man \
+ install-full :: $(MANDIR)
+-	$(SHELL) $(srcdir)/minstall.sh "$(INSTALL_DATA)" $(srcdir)/xterm.man    $(MANDIR)/$(actual_xterm).$(manext)  $(APPSDIR)
++	$(SHELL) $(srcdir)/minstall.sh "$(INSTALL_DATA)" $(srcdir)/xterm.man    $(MANDIR)/$(actual_xterm).$(manext)  $(appsdir)
+ 	$(SHELL) $(srcdir)/minstall.sh "$(INSTALL_DATA)" $(srcdir)/resize.man   $(MANDIR)/$(actual_resize).$(manext) $(APPSDIR)
+ 
+ @no_appsdir@install \
diff --git a/x11-terms/xterm/xterm-212-r2.ebuild b/x11-terms/xterm/xterm-212-r2.ebuild
new file mode 100644
index 000000000000..dcd46e21e34e
--- /dev/null
+++ b/x11-terms/xterm/xterm-212-r2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-212-r2.ebuild,v 1.1 2006/05/10 11:23:44 exg Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="Terminal Emulator for X Windows"
+HOMEPAGE="http://dickey.his.com/xterm/"
+SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
+
+LICENSE="X11"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="truetype Xaw3d unicode toolbar doc"
+
+RDEPEND="|| ( (	x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-libs/libXmu
+		x11-libs/libxkbfile
+		x11-libs/libXft
+		x11-libs/libXaw
+		unicode? ( x11-apps/luit ) )
+	virtual/x11 )
+	Xaw3d? ( x11-libs/Xaw3d )
+	virtual/utempter"
+
+DEPEND="${RDEPEND}
+	doc? ( sys-apps/groff )
+	|| ( x11-proto/xproto virtual/x11 )"
+
+pkg_setup() {
+	if has_version "x11-libs/libX11"; then
+		DEFAULTS_DIR="/usr/share/X11/app-defaults"
+	else
+		DEFAULTS_DIR="/etc/X11/app-defaults"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/xterm-app-defaults-ref.patch
+}
+
+src_compile() {
+	filter-flags "-fstack-protector"
+
+	local myconf=""
+
+	if has_version "x11-libs/libX11"; then
+		myconf="--disable-narrowproto"
+	fi
+
+	econf \
+		--libdir=/etc \
+		--with-x \
+		--with-utempter \
+		--disable-setuid \
+		--disable-full-tgetent \
+		--disable-imake \
+		--enable-ansi-color \
+		--enable-256-color \
+		--enable-broken-osc \
+		--enable-broken-st \
+		--enable-load-vt-fonts \
+		--enable-i18n \
+		--enable-wide-chars \
+		--enable-doublechars \
+		--enable-warnings \
+		--enable-tcap-query \
+		--enable-logging \
+		--enable-dabbrev \
+		--with-app-defaults=${DEFAULTS_DIR} \
+		$(use_enable toolbar) \
+		$(use_enable truetype freetype) \
+		$(use_enable unicode luit) $(use_enable unicode mini-luit) \
+		$(use_with Xaw3d) \
+		${myconf} \
+		|| die
+
+	emake || die "failed to compile xterm"
+
+	if use doc ; then
+		make ctlseqs.txt || die "failed to make documentation file"
+	fi
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc README* INSTALL* ctlseqs.txt
+
+	# Fix permissions -- it grabs them from live system, and they can
+	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
+	# respectively (#69510).
+	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
+	fperms 0755 /usr/bin/xterm
+
+	# restore the navy blue
+	sed -i "s:blue2$:blue:" ${D}${DEFAULTS_DIR}/XTerm-color
+
+	# Fix for bug #91453 at Thomas Dickey's suggestion:
+	echo "*allowWindowOps: 	false" >> ${D}/${DEFAULTS_DIR}/XTerm
+	echo "*allowWindowOps: 	false" >> ${D}/${DEFAULTS_DIR}/UXTerm
+}