add patch for build error; nls added; add support for new session stuff

3 files changed, 130 insertions, 1 deletions

diff --git a/x11-base/xfree/files/digest-xfree-4.2.0-r1 b/x11-base/xfree/files/digest-xfree-4.2.0-r1
new file mode 100644
index 000000000000..4a816eab2f70
--- /dev/null
+++ b/x11-base/xfree/files/digest-xfree-4.2.0-r1
@@ -0,0 +1,4 @@
+MD5 ad43a8e9e39703322005cd6f7145b77f X420src-1.tgz 25968640
+MD5 dae33268a9f2735b9678a81fb23e8d3e X420src-2.tgz 23228416
+MD5 560899e175a02ab592185b69756f539e X420src-3.tgz 9310208
+MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz 1527808
diff --git a/x11-base/xfree/xfree-4.2.0-r1.ebuild b/x11-base/xfree/xfree-4.2.0-r1.ebuild
new file mode 100644
index 000000000000..933256a4e0c4
--- /dev/null
+++ b/x11-base/xfree/xfree-4.2.0-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Maintainer: Achim Gottinger <achim@gentoo.org>, Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.0-r1.ebuild,v 1.1 2002/01/20 16:16:20 azarah Exp $
+
+MY_V="`echo ${PV} |sed -e 's:\.::g'`"
+S=${WORKDIR}/xc
+DESCRIPTION="Xfree86: famouse and free X server"
+SRC_PATH0="ftp://ftp.xfree.org/pub/XFree86/${PV}/source"
+SRC_PATH1="ftp://ftp1.sourceforge.net/pub/mirrors/XFree86/${PV}/source"
+
+SRC_URI="$SRC_PATH0/X${MY_V}src-1.tgz
+	 $SRC_PATH0/X${MY_V}src-2.tgz
+	 $SRC_PATH0/X${MY_V}src-3.tgz
+	 $SRC_PATH1/X${MY_V}src-1.tgz
+	 $SRC_PATH1/X${MY_V}src-2.tgz
+	 $SRC_PATH1/X${MY_V}src-3.tgz
+       	 http://www.ibiblio.org/gentoo/gentoo-sources/truetype.tar.gz"
+
+HOMEPAGE="http://www.xfree.org"
+
+DEPEND=">=sys-libs/ncurses-5.1
+        >=sys-libs/zlib-1.1.3-r2
+        sys-devel/flex
+        sys-devel/perl"
+	
+RDEPEND=">=sys-libs/ncurses-5.1"
+
+PROVIDE="virtual/x11 virtual/opengl"
+# virtual/glu"	
+
+src_unpack () {
+
+	unpack X${MY_V}src-{1,2,3}.tgz
+	
+	cd ${S}
+	cp ${FILESDIR}/${PVR}/site.def config/cf/host.def
+	echo "#define DefaultGcc2i386Opt ${CFLAGS}" >>  config/cf/host.def
+	echo "#define GccWarningOptions -Wno" >>  config/cf/host.def
+	echo "#define DefaultCCOptions -ansi" >>  config/cf/host.def
+
+	# fix build problem
+	cp ${S}/programs/Xserver/os/Imakefile \
+		${S}/programs/Xserver/os/Imakefile.orig
+	sed -e 's:NormalLibraryTarget(os,$(OBJS)):NormalLibraryTarget(os,$(OBJS) ../../lib/Xau/libXau.a):' \
+		${S}/programs/Xserver/os/Imakefile.orig \
+		> ${S}/programs/Xserver/os/Imakefile
+}
+
+src_compile() {
+
+	emake World || die
+
+	if [ "`use nls`" ]
+	then
+		cd ${S}/nls
+		make || die
+		cd ${s}
+	fi
+}
+
+src_install() {
+
+	make install DESTDIR=${D} || die
+	make install.man DESTDIR=${D} || die
+
+	if [ "`use nls`" ]
+	then
+		cd ${S}/nls
+		make DESTDIR=${D} install || die
+		cd ${S}
+	fi
+
+	#we zap the host.def file which gets hard-coded with our CFLAGS, messing up other things that use xmkmf
+	echo > ${D}/usr/X11R6/lib/X11/config/host.def
+	#theoretically, /usr/X11R6/lib/X11/config is a possible candidate for config file management.
+	#If we find that people really worry about imake stuff, we may add it.  But for now, we leave
+	#the dir unprotected.
+
+	insinto /etc/X11
+	doins ${FILESDIR}/${PVR}/XftConfig
+	dosym ../../../.././etc/X11/XftConfig /usr/X11R6/lib/X11/XftConfig
+	cd ${D}/usr/X11R6/lib/X11/fonts
+	tar -xz --no-same-owner -f ${DISTDIR}/truetype.tar.gz
+	dosym /usr/X11R6/lib/libGL.so.1.2 /usr/X11R6/lib/libMesaGL.so
+	dosym /usr/X11R6/bin /usr/bin/X11
+	
+	#X installs some /usr/lib/libGL symlinks, pointing to the libGL's in /usr/X11R6/lib.
+	#I don't see the point in this.  Yes, according to LSB, the correct location for libGL is
+	#in /usr/lib, but this is so closely integrated with X itself that /usr/X11R6/lib seems
+	#like the right place.
+	rm -rf ${D}/usr/lib    
+	
+	#dosym /usr/X11R6/lib/libGLU.so.1.3 /usr/lib/libMesaGLU.so
+	#We're no longer including libGLU from here.  Packaged separately, from separate sources.
+
+	insinto /etc/X11
+	doins ${FILESDIR}/${PVR}/chooser.sh
+	insinto /etc/X11/Sessions
+	doins ${FILESDIR}/${PVR}/Sessions/*
+	insinto /etc/env.d
+	doins ${FILESDIR}/${PVR}/10xfree
+	insinto /etc/X11/xinit
+	doins ${FILESDIR}/${PVR}/xinitrc
+	insinto /etc/X11/xdm
+	doins ${FILESDIR}/${PVR}/Xsession
+	insinto /etc/X11/fs
+	newins ${FILESDIR}/${PVR}/xfs.config config
+	insinto /etc/pam.d
+	doins ${FILESDIR}/${PVR}/xdm
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/${PVR}/xdm.start xdm
+	newexe ${FILESDIR}/${PVR}/xfs.start xfs
+}
+
+pkg_preinst() {
+	#this changed from a file to a symlink
+	rm -rf /usr/X11R6/lib/X11/XftConfig
+}
diff --git a/x11-base/xfree/xfree-4.2.0.ebuild b/x11-base/xfree/xfree-4.2.0.ebuild
index 2e568acddfa1..745d4b7ddb76 100644
--- a/x11-base/xfree/xfree-4.2.0.ebuild
+++ b/x11-base/xfree/xfree-4.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Desktop Team <desktop@gentoo.org>
 # Author: Achim Gottinger <achim@gentoo.org>, Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.0.ebuild,v 1.1 2002/01/20 03:51:46 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.0.ebuild,v 1.2 2002/01/20 16:16:20 azarah Exp $
 
 MY_V="`echo ${PV} |sed -e 's:\.::g'`"
 S=${WORKDIR}/xc
@@ -41,6 +41,12 @@ src_unpack () {
 	echo "#define DefaultGcc2i386Opt ${CFLAGS}" >>  config/cf/host.def
 	echo "#define GccWarningOptions -Wno" >>  config/cf/host.def
 	echo "#define DefaultCCOptions -ansi" >>  config/cf/host.def
+
+	cp ${S}/programs/Xserver/os/Imakefile \
+		${S}/programs/Xserver/os/Imakefile.orig
+	sed -e 's:NormalLibraryTarget(os,$(OBJS)):NormalLibraryTarget(os,$(OBJS) ../../lib/Xau/libXau.a):' \
+		${S}/programs/Xserver/os/Imakefile.orig \
+		> ${S}/programs/Xserver/os/Imakefile
 }
 
 src_compile() {