fix END and OME; update savage driver

5 files changed, 67 insertions, 27 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index f866e80724c4..af0642e0025e 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,8 +1,15 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.94 2003/02/15 20:17:12 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.95 2003/02/16 21:57:13 azarah Exp $
 
-  15 Feb 2003; Hannes Mehnert <hannes@gentoo.org> xfree-4.2.99.4.ebuild:
+  16 Feb 2003; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild,
+                                                    xfree-4.2.99.4.ebuild :
+
+  Add a patch for HOME and END keys not working in xterm.  Should fix bugs
+  #15254 and #15608.  Update savage driver in xfree-4.2.1-r2, fixing bug
+  #14534.
+
+  15 Feb 2003; Hannes Mehnert <hannes@gentoo.org> xfree-4.2.99.4.ebuild :
 
   bumped savage driver to 1.1.27t (prior versions do not work). also added
   dep on app-arch/unzip (because 1.1.27t is a .zip)
diff --git a/x11-base/xfree/files/digest-xfree-4.2.1-r2 b/x11-base/xfree/files/digest-xfree-4.2.1-r2
index 435e65e1b399..c49f6607e805 100644
--- a/x11-base/xfree/files/digest-xfree-4.2.1-r2
+++ b/x11-base/xfree/files/digest-xfree-4.2.1-r2
@@ -5,7 +5,7 @@ MD5 2f2852c80924a9b5356c3037a471c1a1 fcpackage.2_1.tar.gz 544661
 MD5 38adc94a4953a6b29e8619c25dda4887 4.2.0-4.2.1.diff.gz 54763
 MD5 50891a2431cc829d98829e385e2c452c XFree86-4.2.1-patches-1.2.tar.bz2 405424
 MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156
-MD5 fe6b93f81cc2e9cacded137c4aaff25f savage-1.1.25t.tgz 69515
+MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974
 MD5 9cb34b1f0bf5cb0afdd865934664b2ad sis_drv_src_271102-1.tar.gz 317440
 MD5 aaeb8f8b276a6849f7a570097d69788e glide3-headers.tar.bz2 14564
 MD5 cbdc2fdd7d2ed0832795e86a8b9ee19a andale32.exe 198384
diff --git a/x11-base/xfree/files/xfree-4.2.x-home_end-keys.patch b/x11-base/xfree/files/xfree-4.2.x-home_end-keys.patch
new file mode 100644
index 000000000000..f6e81777c47a
--- /dev/null
+++ b/x11-base/xfree/files/xfree-4.2.x-home_end-keys.patch
@@ -0,0 +1,11 @@
+--- xc/programs/xterm/XTerm.ad.home_end	2003-02-16 23:28:57.000000000 +0200
++++ xc/programs/xterm/XTerm.ad	2003-02-16 23:29:07.000000000 +0200
+@@ -150,8 +150,6 @@
+ !events generated by the wheel
+ *VT100.translations:   #override \
+                        <Key>Delete:    string(0x1b) string("[3~")  \n\
+-                       <Key>Home:      string(0x1b) string("[1~")  \n\
+-                       <Key>End:       string(0x1b) string("[4~")  \n\
+ ~@Num_Lock              <Key>KP_Home:   string(0x1b) string("[1~")  \n\
+ ~@Num_Lock              <Key>KP_End:    string(0x1b) string("[4~")  \n\
+ Shift                   <Key>F1:        string(0x1b) string("[23~") \n\
diff --git a/x11-base/xfree/xfree-4.2.1-r2.ebuild b/x11-base/xfree/xfree-4.2.1-r2.ebuild
index 339cb5a10c41..fc94fe7f74ac 100644
--- a/x11-base/xfree/xfree-4.2.1-r2.ebuild
+++ b/x11-base/xfree/xfree-4.2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r2.ebuild,v 1.20 2003/02/13 16:54:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r2.ebuild,v 1.21 2003/02/16 21:57:13 azarah Exp $
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
@@ -43,7 +43,7 @@ PATCH_VER="1.2"
 FT2_VER="2.1.2"
 FC2_VER="2.1"
 SISDRV_VER="271102-1"
-SAVDRV_VER="1.1.25t"
+SAVDRV_VER="1.1.27t"
 
 BASE_PV="4.2.0"
 MY_SV="${BASE_PV//\.}"
@@ -61,7 +61,7 @@ X_PATCHES="http://ftp.xfree86.org/pub/XFree86/${PV}/patches/${BASE_PV}-${PV}.dif
 # hours ...
 
 X_DRIVERS="http://people.mandrakesoft.com/~flepied/projects/wacom/xf86Wacom.c.gz
-	http://www.probo.com/timr/savage-${SAVDRV_VER}.tgz
+	http://www.probo.com/timr/savage-${SAVDRV_VER}.zip
 	http://www.webit.at/~twinny/sis/sis_drv_src_${SISDRV_VER}.tar.gz
 	3dfx? ( mirror://gentoo/glide3-headers.tar.bz2 )"
 # Updated Wacom driver at http://people.mandrakesoft.com/~flepied/projects/wacom/
@@ -168,9 +168,9 @@ src_unpack() {
 		EPATCH_EXCLUDE="107_all_4.2.1-gcc32-internal-compiler-error.patch.bz2"
 	fi
 
-        # remove 082 patch which b0rks keycodes
-        # see bug #13073
-        rm ${WORKDIR}/patch/082*
+	# Remove 082 patch which b0rks keycodes,
+	# see bug #13073
+	rm -f ${WORKDIR}/patch/082*
 
 	# Various Patches from all over
 	epatch ${WORKDIR}/patch/
@@ -181,10 +181,13 @@ src_unpack() {
 	#   http://www.jg555.com/cvs/cvsweb.cgi/~checkout~/patches/xfree/xfree-4.2.x.-bison.fixes.patch
 	epatch ${FILESDIR}/xfree-4.2.x.-bison.fixes.patch
 
+	# Fix HOME and END keys to work in xterm, bug #15254
+	epatch ${FILESDIR}/xfree-4.2.x-home_end-keys.patch
+
 	# Update the Savage Driver
 	ebegin "Updating Savage driver"
 	cd ${S}/programs/Xserver/hw/xfree86/drivers/savage
-	tar -zxf ${DISTDIR}/savage-${SAVDRV_VER}.tgz || die
+	unzip -qo ${DISTDIR}/savage-${SAVDRV_VER}.zip || die
 	eend 0
     
 	# Update the SIS Driver
@@ -253,6 +256,16 @@ src_unpack() {
 		echo "#define GccWarningOptions -Wno-return-type -w" >> config/cf/host.def
 	fi
 
+	if [ -n "`use pam`" ]
+	then
+		# If you want to have optional pam support, do it properly ...
+		echo "#define HasPam YES" >> config/cf/host.def
+		echo "#define HasPamMisc YES" >> config/cf/host.def
+	else
+		echo "#define HasPam NO" >> config/cf/host.def
+		echo "#define HasPamMisc NO" >> config/cf/host.def
+	fi
+
 	if [ "${ARCH}" = "x86" ]
 	then
 		# optimize Mesa for architecture
@@ -344,7 +357,7 @@ src_install() {
 		make DESTDIR=${D} install || die
 	fi
 
-	# Make sure user running xterm can only write to utmp.
+	# Make sure the user running xterm can only write to utmp.
 	fowners root.utmp /usr/X11R6/bin/xterm
 	fperms 2755 /usr/X11R6/bin/xterm
 
@@ -369,10 +382,11 @@ src_install() {
 	eend 0
 
 	insinto /etc/X11
-	# We use fontconfig now ...
+	# We still use freetype for now ...
 	doins ${FILESDIR}/${PVR}/XftConfig
 	newins ${FILESDIR}/${PVR}/XftConfig XftConfig.new
-	#newins ${S}/lib/Xft/XftConfig-OBSOLETE XftConfig
+	# This is if we are using Fontconfig only ...
+	#newins ${S}/lib/Xft1/XftConfig-OBSOLETE XftConfig
 	dosym ../../../../etc/X11/XftConfig /usr/X11R6/lib/X11/XftConfig
 
 	# Install example config file
@@ -449,7 +463,7 @@ src_install() {
 				fi
 				;;
 			ja*|ko*|zh*)
-				if [ -r "${x}/Compose" ]
+				if [ -r ${x}/Compose ]
 				then
 					rm -f ${x}/Compose
 				fi
@@ -463,7 +477,10 @@ src_install() {
 	# new display manager script
 	doexe ${FILESDIR}/${PVR}/startDM.sh
 	exeinto /etc/X11/Sessions
-	doexe ${FILESDIR}/${PVR}/Sessions/*
+	for x in ${FILESDIR}/${PVR}/Sessions/*
+	do
+		[ -f ${x} ] && doexe ${x}
+	done
 	insinto /etc/env.d
 	doins ${FILESDIR}/${PVR}/10xfree
 	insinto /etc/X11/xinit
@@ -472,10 +489,13 @@ src_install() {
 	doexe ${FILESDIR}/${PVR}/Xsession ${FILESDIR}/${PVR}/Xsetup_0
 	insinto /etc/X11/fs
 	newins ${FILESDIR}/${PVR}/xfs.config config
-	insinto /etc/pam.d
-	newins ${FILESDIR}/${PVR}/xdm.pamd xdm
-	# Need to fix console permissions first
-	newins ${FILESDIR}/${PVR}/xserver.pamd xserver
+	if [ -n "`use pam`" ]
+	then
+		insinto /etc/pam.d
+		newins ${FILESDIR}/${PVR}/xdm.pamd xdm
+		# Need to fix console permissions first
+		newins ${FILESDIR}/${PVR}/xserver.pamd xserver
+	fi
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/${PVR}/xdm.start xdm
 	newexe ${FILESDIR}/${PVR}/xfs.start xfs
@@ -523,7 +543,7 @@ src_install() {
 	           grep -v ' shared object,' | \
 	           sed -n -e 's/^\(.*\):[  ]*ELF.*, not stripped/\1/p')
 	do
-		if [ -f ${x} ]
+	if [ -f ${x} ]
 		then
 			# Dont do the modules ...
 			if [ "${x/\/usr\/X11R6\/lib\/modules}" = "${x}" ]
@@ -666,7 +686,7 @@ pkg_postinst() {
 		#  3)  Now Generate fonts.dir files.
 		#
 		#  CID fonts is a bit more involved, but as we do not install any,
-		#  I am not going to bother.
+		#  thus I am not going to bother.
 		#
 		#  <azarah@gentoo.org> (20 Oct 2002)
 		#
@@ -692,9 +712,9 @@ pkg_postinst() {
 				# Only generate .scale files if there are truetype
 				# fonts present ...
 				if [ "${x/encodings}" = "${x}" -a \
-				     -n "$(find ${x} -iname '*.tt[cf]' -print)" ]
+				     -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ]
 				then
-					${ROOT}/usr/X11R6/bin/ttmkfdir \
+					${ROOT}/usr/X11R6/bin/ttmkfdir -x 2 \
 						-e ${ROOT}/usr/X11R6/lib/X11/fonts/encodings/encodings.dir \
 						-o ${x}/fonts.scale -d ${x}
 				fi
@@ -727,9 +747,8 @@ pkg_postinst() {
 
 			# Only generate XftCache files if there are truetype
 			# fonts present ...
-			if [ "${x/encodings}" = "${x}" ] && \
-			   [ -n "$(find ${x} -iname '*.tt[cf]' -print)" -o \
-			     -n "$(find ${x} -iname '*.pf[ab]' -print)" ]
+			if [ "${x/encodings}" = "${x}" -a \
+			     -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ]
 			then
 				LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/X11R6/lib" \
 				${ROOT}/usr/X11R6/bin/xftcache ${x} &> /dev/null
diff --git a/x11-base/xfree/xfree-4.2.99.4.ebuild b/x11-base/xfree/xfree-4.2.99.4.ebuild
index 040f27b866ca..6b64df8089da 100644
--- a/x11-base/xfree/xfree-4.2.99.4.ebuild
+++ b/x11-base/xfree/xfree-4.2.99.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.99.4.ebuild,v 1.8 2003/02/15 20:17:12 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.99.4.ebuild,v 1.9 2003/02/16 21:57:13 azarah Exp $
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
@@ -167,6 +167,9 @@ src_unpack() {
 	# enable the nv driver on ppc
 	use ppc && ( patch -p0 < ${FILESDIR}/${PV}/${PV}-enable-nv-on-ppc.patch || die )
 
+	# Fix HOME and END keys to work in xterm, bug #15254
+	epatch ${FILESDIR}/xfree-4.2.x-home_end-keys.patch
+
 	# Update the Savage Driver
 	# savage driver 1.1.27t is a .zip and contains a savage directory
 	# (that's why we have to be in drivers, not in savage subdir).