diff options
author | Martin Schlemmer <azarah@gentoo.org> | 2001-11-11 11:33:20 +0000 |
---|---|---|
committer | Martin Schlemmer <azarah@gentoo.org> | 2001-11-11 11:33:20 +0000 |
commit | ee0163dde3c671485d49cd3bd6d7f1c72c2b99cf (patch) | |
tree | 2fb27c5036f13903a48b1c839eb047c64b77f709 /x11-base | |
parent | Update with man page installation fix (diff) | |
download | gentoo-2-ee0163dde3c671485d49cd3bd6d7f1c72c2b99cf.tar.gz gentoo-2-ee0163dde3c671485d49cd3bd6d7f1c72c2b99cf.tar.bz2 gentoo-2-ee0163dde3c671485d49cd3bd6d7f1c72c2b99cf.zip |
dont forget about rc5 users
Diffstat (limited to 'x11-base')
-rw-r--r-- | x11-base/xfree/files/4.1.0-r1/10xfree | 5 | ||||
-rw-r--r-- | x11-base/xfree/files/4.1.0-r1/XftConfig | 71 | ||||
-rw-r--r-- | x11-base/xfree/files/4.1.0-r1/Xsession | 56 | ||||
-rw-r--r-- | x11-base/xfree/files/4.1.0-r1/site.def | 20 | ||||
-rw-r--r-- | x11-base/xfree/files/4.1.0-r1/xdm | 4 | ||||
-rw-r--r-- | x11-base/xfree/files/4.1.0-r1/xdm.start | 62 | ||||
-rw-r--r-- | x11-base/xfree/files/4.1.0-r1/xinitrc | 42 | ||||
-rw-r--r-- | x11-base/xfree/files/digest-xfree-4.1.0-r1 | 4 | ||||
-rw-r--r-- | x11-base/xfree/xfree-4.1.0-r1.ebuild | 88 |
9 files changed, 352 insertions, 0 deletions
diff --git a/x11-base/xfree/files/4.1.0-r1/10xfree b/x11-base/xfree/files/4.1.0-r1/10xfree new file mode 100644 index 000000000000..87d675d0a361 --- /dev/null +++ b/x11-base/xfree/files/4.1.0-r1/10xfree @@ -0,0 +1,5 @@ +PATH=/usr/X11R6/bin +ROOTPATH=/usr/X11R6/bin +LDPATH=/usr/X11R6/lib +MANPATH=/usr/X11R6/man +INFODIR=/usr/X11R6/info diff --git a/x11-base/xfree/files/4.1.0-r1/XftConfig b/x11-base/xfree/files/4.1.0-r1/XftConfig new file mode 100644 index 000000000000..16af856f7c29 --- /dev/null +++ b/x11-base/xfree/files/4.1.0-r1/XftConfig @@ -0,0 +1,71 @@ +# +# XftConfig +# +# Use with Type1 and TrueType fonts +# + +dir "/usr/X11R6/lib/X11/fonts/Type1" +dir "/usr/X11R6/lib/X11/fonts/truetype" + +# +# alias 'fixed' for 'mono' +# +match any family == "fixed" edit family =+ "mono"; + +# +#Check users config file +# +includeif "~/.xftconfig" + +# +# Substitute TrueType fonts for Type1 versions +# +match any family == "Times" edit family += "Times New Roman"; +match any family == "Helvetica" edit family += "Verdana"; +match any family == "Courier" edit family += "Courier New"; + +# +# Use TrueType fonts for defaults +# +match any family == "serif" edit family += "Times New Roman"; +match any family == "sans" edit family += "Verdana"; + +# +# Use monotype.com (andale) face where possible +# +match + any family == "mono" + all slant == roman + all weight < bold +edit + family += "monotype.com"; +# +# otherwise, use courier +# +match any family == "mono" edit family += "Courier New"; + +# +# Alias between XLFD families and font file family name, prefer local fonts +# +match any family == "Charter" edit family += "Bitstream Charter"; +match any family == "Bitstream Charter" edit family =+ "Charter"; + +match any family == "Lucidux Serif" edit family += "LuciduxSerif"; +match any family == "LuciduxSerif" edit family =+ "Lucidux Serif"; + +match any family == "Lucidux Sans" edit family += "LuciduxSans"; +match any family == "LuciduxSans" edit family =+ "Lucidux Sans"; + +match any family == "Lucidux Mono" edit family += "LuciduxMono"; +match any family == "LuciduxMono" edit family =+ "Lucidux Mono"; + +# +# TrueType font aliases +# +match any family == "Comic Sans" edit family += "Comic Sans MS"; +match any family == "Comic Sans MS" edit family =+ "Comic Sans"; +match any family == "Trebuchet" edit family += "Trebuchet MS"; +match any family == "Trebuchet MS" edit family =+ "Trebuchet"; +match any family == "Monotype" edit family =+ "Monotype.com"; +match any family == "Andale Mono" edit family += "Monotype.com"; +match any family == "Monotype.com" edit family =+ "Andale Mono"; diff --git a/x11-base/xfree/files/4.1.0-r1/Xsession b/x11-base/xfree/files/4.1.0-r1/Xsession new file mode 100644 index 000000000000..42215d8b80e8 --- /dev/null +++ b/x11-base/xfree/files/4.1.0-r1/Xsession @@ -0,0 +1,56 @@ +#!/bin/sh +# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $ +# +# +# $XFree86: xc/programs/xdm/config/Xsession,v 1.2 1998/01/11 03:48:32 dawes Exp $ + +# redirect errors to a file in user's home directory if we can +for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER" +do + if ( cp /dev/null "$errfile" 2> /dev/null ) + then + chmod 600 "$errfile" + exec > "$errfile" 2>&1 + break + fi +done + +case $# in +1) + if [ -f /usr/X11R6/bin/wm/$1 ] + then + source /etc/profile + /usr/X11R6/bin/wm/$1 + else + #failsafe + exec xterm -geometry 80x24-0-0 + fi + ;; +0) + startup=$HOME/.xsession + resources=$HOME/.Xresources + + + if [ -s "$startup" -a -x "$startup" ]; then + exec "$startup" + else + if [ -f $HOME/.wm ] + then + mywm="/usr/X11R6/bin/wm/`cat $HOME/.wm`" + if [ -f $mywm ] + then + source /etc/profile + $mywm + exit 0 + fi + else + if [ -r "$resources" ]; then + xrdb -load "$resources" + exec xsm + fi + fi + fi + ;; + +esac + diff --git a/x11-base/xfree/files/4.1.0-r1/site.def b/x11-base/xfree/files/4.1.0-r1/site.def new file mode 100644 index 000000000000..612ff0a1646e --- /dev/null +++ b/x11-base/xfree/files/4.1.0-r1/site.def @@ -0,0 +1,20 @@ +#define HasZlib YES +#define HasGcc2ForCplusplus YES +#define ForceNormalLib YES +#define BuildXinerama YES +#define SharedLibXau YES +#define BuildRman NO +#define BuildHtmlManPages NO +#define BuildAllSpecsDocs NO +#define BuildSpecsDocs NO +#define BuildGLULibrary NO +#define SharedLibGLU NO +#define NormalLibGLU NO +/* binutils-2.9 */ +#define LinuxBinUtilsMajorVersion 29 +/* glibc-2.2 (6.2 because glibc is considered libc-6) */ +#define LinuxCLibMajorVersion 6 +#define LinuxClibMinorVersion 2 +#define HasTk NO +#define HasTcl NO +#define FSUseSyslog YES diff --git a/x11-base/xfree/files/4.1.0-r1/xdm b/x11-base/xfree/files/4.1.0-r1/xdm new file mode 100644 index 000000000000..f1773fb59a12 --- /dev/null +++ b/x11-base/xfree/files/4.1.0-r1/xdm @@ -0,0 +1,4 @@ +auth required pam_pwdb.so +account required pam_pwdb.so +password required pam_pwdb.so md5 +session required pam_pwdb.so diff --git a/x11-base/xfree/files/4.1.0-r1/xdm.start b/x11-base/xfree/files/4.1.0-r1/xdm.start new file mode 100644 index 000000000000..40ae96b0be9f --- /dev/null +++ b/x11-base/xfree/files/4.1.0-r1/xdm.start @@ -0,0 +1,62 @@ +#! /bin/bash +#RCUPDATE:4:99:This line is required for script management +# Copyright (c) 1996-99 SuSE GmbH Nuernberg, Germany. All rights reserved. +# +# Author: Florian La Roche <florian@suse.de>, 1996 +# Werner Fink <werner@suse.de>, 1996,98,99 +# Martin Scherbaum <maddin@suse.de>, 1997 +# Reinhard Max <max@suse.de>, 1997 +# +# /sbin/init.d/xdm +# + +. /etc/rc.d/config/basic +. /etc/rc.d/config/functions + +. /etc/profile.env +export PATH=/bin:/sbin:/usr/bin:/usr/sbin:$ROOTPATH + +case "$DISPLAYMANAGER" in + kdm|kde|KDM|KDE) + EXE=$KDEDIR/bin/kdm + ;; + gdm|GDM|Gnome|GNOME) + EXE=/usr/bin/gdm + ;; + *) + EXE=/usr/X11R6/bin/xdm ;; + +esac + +test ! -x "$EXE" && EXE=/usr/X11R6/bin/xdm + +SERVICE=${EXE##*/} +PID="/var/run/xdm.pid" +opts="start stop restart" + +start() { + ebegin "Starting ${SERVICE}" + start-stop-daemon --start --quiet --exe $EXE 1>&2 + if [ -n "$?" ] ; then + # After a crash or a kill signal we may have + # a wrong owner ship of /dev/console + chown root:tty /dev/console /dev/tty0 + chmod 622 /dev/console /dev/tty0 + else + eend $? "Error starting ${SERVICE}." + fi +} + +stop() { + ebegin "Stopping ${SERVICE}" + killall X + start-stop-daemon --stop --quiet --exe $EXE 1>&2 + eend $? "Error stopping ${SERVICE}." +} + +restart() { + stop + start +} + +doservice ${@} diff --git a/x11-base/xfree/files/4.1.0-r1/xinitrc b/x11-base/xfree/files/4.1.0-r1/xinitrc new file mode 100644 index 000000000000..0c8faef40844 --- /dev/null +++ b/x11-base/xfree/files/4.1.0-r1/xinitrc @@ -0,0 +1,42 @@ +#!/bin/sh +# $XConsortium: xinitrc.cpp,v 1.4 91/08/22 11:41:34 rws Exp $ + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +sysresources=/usr/X11R6/lib/X11/xinit/.Xresources +sysmodmap=/usr/X11R6/lib/X11/xinit/.Xmodmap + +# merge in defaults and keymaps + +if [ -f $sysresources ]; then + xrdb -merge $sysresources +fi + +if [ -f $sysmodmap ]; then + xmodmap $sysmodmap +fi + +if [ -f $userresources ]; then + xrdb -merge $userresources +fi + +if [ -f $usermodmap ]; then + xmodmap $usermodmap +fi + +# start some nice program +if [ -f $HOME/.wm ] +then + mywm="/usr/X11R6/bin/wm/`cat $HOME/.wm`" + if [ -f $mywm ] + then + $mywm + exit 0 + fi +else + twm & + xclock -geometry 50x50-1+1 & + xterm -geometry 80x50+494+51 & + xterm -geometry 80x20+494-0 & + exec xterm -geometry 80x66+0+0 -name login +fi
\ No newline at end of file diff --git a/x11-base/xfree/files/digest-xfree-4.1.0-r1 b/x11-base/xfree/files/digest-xfree-4.1.0-r1 new file mode 100644 index 000000000000..142d8b1c9d6b --- /dev/null +++ b/x11-base/xfree/files/digest-xfree-4.1.0-r1 @@ -0,0 +1,4 @@ +MD5 2d4709f7106a1d65c175be445a3d3c32 X410src-1.tgz 25022464 +MD5 beaffed1cbdb700e5fed6a5490a7f222 X410src-2.tgz 22528000 +MD5 f94e42cd5c5e31a702ec64bfdc017a7d X410src-3.tgz 9322496 +MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz 1531904 diff --git a/x11-base/xfree/xfree-4.1.0-r1.ebuild b/x11-base/xfree/xfree-4.1.0-r1.ebuild new file mode 100644 index 000000000000..1b63c4fe76ce --- /dev/null +++ b/x11-base/xfree/xfree-4.1.0-r1.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2001 Gentoo Technologies, Inc. +# 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.1.0-r1.ebuild,v 1.3 2001/11/11 11:33: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/4.1.0/source" +SRC_PATH1="ftp://ftp1.sourceforge.net/pub/mirrors/XFree86/4.1.0/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" +# This has been removed. Anyone know why exactly ?? + + +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 +} + +src_compile() { + + make World || die +} + +src_install() { + + make install DESTDIR=${D} || die + make install.man DESTDIR=${D} || die + + #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 /usr/X11R6/lib/X11 + doins ${FILESDIR}/${PVR}/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/env.d + doins ${FILESDIR}/${PVR}/10xfree + insinto /etc/X11/xinit + doins ${FILESDIR}/${PVR}/xinitrc + insinto /etc/X11/xdm + doins ${FILESDIR}/${PVR}/Xsession + insinto /etc/pam.d + doins ${FILESDIR}/${PVR}/xdm + exeinto /etc/init.d + newexe ${FILESDIR}/${PVR}/xdm.start xdm +} |