diff options
129 files changed, 0 insertions, 7541 deletions
diff --git a/dev-perl/XML-LibXSLT/files/digest-XML-LibXSLT-0.95 b/dev-perl/XML-LibXSLT/files/digest-XML-LibXSLT-0.95 deleted file mode 100644 index 0ddede444cdb..000000000000 --- a/dev-perl/XML-LibXSLT/files/digest-XML-LibXSLT-0.95 +++ /dev/null @@ -1 +0,0 @@ -MD5 460e2c1fc82fc62ae825d127d0730acb XML-LibXSLT-0.95.tar.gz diff --git a/net-fs/autofs/autofs-3.1.7.ebuild b/net-fs/autofs/autofs-3.1.7.ebuild deleted file mode 100644 index 61b99bcb93ed..000000000000 --- a/net-fs/autofs/autofs-3.1.7.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-3.1.7.ebuild,v 1.1 2000/11/26 20:54:18 achim Exp $ - -A=${P}.tar.bz2 -S=${WORKDIR}/${P} -DESCRIPTION="Automounter" -SRC_URI="ftp://ftp.kernel.org/pub/linux/daemons/autofs/${A} - ftp://ftp.de.kernel.org/pub/linux/daemons/autofs/${A} - ftp://ftp.uk.kernel.org/pub/linux/daemons/autofs/${A}" - -DEPEND=">=sys-libs/glibc-2.1.3" - -src_compile() { - cd ${S} - try ./configure --host=${HOST} --prefix=/usr - try make -} - -src_install() { - cd ${S} - into /usr - dosbin daemon/automount - insinto /usr/lib/autofs - insopts -m 755 - doins modules/*.so - dodoc COPYING COPYRIGHT NEWS README* TODO - cd man - doman auto.master.5 autofs.5 autofs.8 automount.8 - cd ../samples - dodir /etc/autofs - cp ${O}/files/auto.master ${D}/etc/autofs - cp ${O}/files/auto.misc ${D}/etc/autofs - dodir /etc/rc.d/init.d - cp ${O}/files/autofs ${D}/etc/rc.d/init.d -} - -pkg_config() { - . ${ROOT}/etc/rc.d/config/functions - echo "Activating autofs..." - ${ROOT}/usr/sbin/rc-update add autofs -} - diff --git a/net-fs/autofs/files/digest-autofs-3.1.7 b/net-fs/autofs/files/digest-autofs-3.1.7 deleted file mode 100644 index 55137064ccd8..000000000000 --- a/net-fs/autofs/files/digest-autofs-3.1.7 +++ /dev/null @@ -1 +0,0 @@ -MD5 4f602f82442b48ce9c2e0005d59c3408 autofs-3.1.7.tar.bz2 diff --git a/net-fs/nfs-utils/files/digest-nfs-utils-0.2.1-r1 b/net-fs/nfs-utils/files/digest-nfs-utils-0.2.1-r1 deleted file mode 100644 index 526bdc17ac1d..000000000000 --- a/net-fs/nfs-utils/files/digest-nfs-utils-0.2.1-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 cdf44aadf551e4037fd9c9c69ea75930 nfs-utils-0.2.1.tar.gz diff --git a/net-fs/nfs-utils/files/digest-nfs-utils-0.2.1-r2 b/net-fs/nfs-utils/files/digest-nfs-utils-0.2.1-r2 deleted file mode 100644 index 526bdc17ac1d..000000000000 --- a/net-fs/nfs-utils/files/digest-nfs-utils-0.2.1-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 cdf44aadf551e4037fd9c9c69ea75930 nfs-utils-0.2.1.tar.gz diff --git a/net-fs/nfs-utils/nfs-utils-0.2.1-r1.ebuild b/net-fs/nfs-utils/nfs-utils-0.2.1-r1.ebuild deleted file mode 100644 index 3a496511a8ed..000000000000 --- a/net-fs/nfs-utils/nfs-utils-0.2.1-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-0.2.1-r1.ebuild,v 1.1 2000/12/11 18:05:42 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Kernel NFS-Server" -SRC_URI="ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/"${A} -HOMEPAGE="http://nfs.sourceforge.net" - -DEPEND=">=sys-apps/bash-2.04 - >=sys-libs/glibc-2.1.3" - -src_compile() { - try ./configure --mandir=${D}/usr/man --with-statedir=/var/state/nfs \ - --prefix=${D} --exec-prefix=${D} - try make -} - -src_install() { - cd ${S} - try make install STATEDIR=${D}/var/state/nfs - dodir /etc/rc.d/init.d - cp ${O}/files/nfs ${D}/etc/rc.d/init.d - cp ${O}/files/exports ${D}/etc - dodoc ChangeLog COPYING README - docinto linux-nfs - dodoc linux-nfs/* -} -pkg_config() { - - . ${ROOT}/etc/rc.d/config/functions - . ${ROOT}/var/db/pkg/install.config - - echo "Generating symlinks..." - ${ROOT}/usr/sbin/rc-update add nfs - if [ -n "${nfsserver_home}" ] - then - echo "Export Homedirs..." - cp ${ROOT}/etc/exports ${ROOT}/etc/exports.orig - sed -e "s:^#nfsserver_home:${nfsserver_home}:" \ - -e "s/eth0_net/${eth0_net}/" \ - -e "s/eth0_mask/${eth0_mask}/" \ - ${ROOT}/etc/exports.orig > ${ROOT}/etc/exports - fi -} - - - - diff --git a/net-fs/nfs-utils/nfs-utils-0.2.1-r2.ebuild b/net-fs/nfs-utils/nfs-utils-0.2.1-r2.ebuild deleted file mode 100644 index fdb4d462ed1f..000000000000 --- a/net-fs/nfs-utils/nfs-utils-0.2.1-r2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-0.2.1-r2.ebuild,v 1.1 2001/01/20 01:13:36 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Kernel NFS-Server" -SRC_URI="ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/"${A} -HOMEPAGE="http://nfs.sourceforge.net" - -DEPEND=">=sys-apps/bash-2.04 - >=sys-libs/glibc-2.1.3" - -src_compile() { - try ./configure --mandir=${D}/usr/man --with-statedir=/var/lib/nfs \ - --prefix=${D} --exec-prefix=${D} - try make -} - -src_install() { - cd ${S} - try make install STATEDIR=${D}/var/lib/nfs - dodir /etc/rc.d/init.d - cp ${O}/files/nfs ${D}/etc/rc.d/init.d - cp ${O}/files/exports ${D}/etc - dodoc ChangeLog COPYING README - docinto linux-nfs - dodoc linux-nfs/* -} -pkg_config() { - - . ${ROOT}/etc/rc.d/config/functions - . ${ROOT}/var/db/pkg/install.config - - echo "Generating symlinks..." - ${ROOT}/usr/sbin/rc-update add nfs - if [ -n "${nfsserver_home}" ] - then - echo "Export Homedirs..." - cp ${ROOT}/etc/exports ${ROOT}/etc/exports.orig - sed -e "s:^#nfsserver_home:${nfsserver_home}:" \ - -e "s/eth0_net/${eth0_net}/" \ - -e "s/eth0_mask/${eth0_mask}/" \ - ${ROOT}/etc/exports.orig > ${ROOT}/etc/exports - fi -} - - - - diff --git a/net-fs/samba/files/digest-samba-2.0.7-r1 b/net-fs/samba/files/digest-samba-2.0.7-r1 deleted file mode 100644 index 70ced815d738..000000000000 --- a/net-fs/samba/files/digest-samba-2.0.7-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 b5e61ea655d476072fd0365785fea2d0 samba-2.0.7.tar.gz diff --git a/net-fs/samba/files/digest-samba-2.0.7-r2 b/net-fs/samba/files/digest-samba-2.0.7-r2 deleted file mode 100644 index 70ced815d738..000000000000 --- a/net-fs/samba/files/digest-samba-2.0.7-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 b5e61ea655d476072fd0365785fea2d0 samba-2.0.7.tar.gz diff --git a/net-fs/samba/files/digest-samba-2.0.7-r4 b/net-fs/samba/files/digest-samba-2.0.7-r4 deleted file mode 100644 index 70ced815d738..000000000000 --- a/net-fs/samba/files/digest-samba-2.0.7-r4 +++ /dev/null @@ -1 +0,0 @@ -MD5 b5e61ea655d476072fd0365785fea2d0 samba-2.0.7.tar.gz diff --git a/net-fs/samba/files/digest-samba-2.0.7-r5 b/net-fs/samba/files/digest-samba-2.0.7-r5 deleted file mode 100644 index 70ced815d738..000000000000 --- a/net-fs/samba/files/digest-samba-2.0.7-r5 +++ /dev/null @@ -1 +0,0 @@ -MD5 b5e61ea655d476072fd0365785fea2d0 samba-2.0.7.tar.gz diff --git a/net-fs/samba/files/digest-samba-2.2.0_alpha3 b/net-fs/samba/files/digest-samba-2.2.0_alpha3 deleted file mode 100644 index bd8658627e77..000000000000 --- a/net-fs/samba/files/digest-samba-2.2.0_alpha3 +++ /dev/null @@ -1 +0,0 @@ -MD5 da85e74765ae02ac1dc8b48241a9ef3e samba-2.2.0-alpha3.tar.bz2 diff --git a/net-libs/libpcap/files/digest-libpcap-0.5.2 b/net-libs/libpcap/files/digest-libpcap-0.5.2 deleted file mode 100644 index 66c4563f9ca0..000000000000 --- a/net-libs/libpcap/files/digest-libpcap-0.5.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 1138682b9bef56c8c9986346645f7216 libpcap-0.5.2.tar.gz diff --git a/net-libs/libpcap/libpcap-0.5.2.ebuild b/net-libs/libpcap/libpcap-0.5.2.ebuild deleted file mode 100644 index 7a4ea67b22d3..000000000000 --- a/net-libs/libpcap/libpcap-0.5.2.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-0.5.2.ebuild,v 1.3 2000/11/01 04:44:19 achim Exp $ - -P=libpcap-0.5.2 -A=${P}.tar.gz -S=${WORKDIR}/libpcap-0.5 -DESCRIPTION="pcap-Library" -SRC_URI="http://www.tcpdump.org/release/${A} - http://www.jp.tcpdump.org/release/${A}" - -HOMEPAGE="http://www.tcpdump.org/" - -DEPEND=">=sys-libs/glibc-2.1.3" - -src_compile() { - cd ${S} - try ./configure --host=${CHOST} --prefix=/usr --enable-ipv6 - try make -} - -src_install() { - cd ${S} - dodir /usr/lib - dodir /usr/include/net - dodir /usr/man/man3 - try make prefix=${D}/usr install - try make prefix=${D}/usr install-incl - try make prefix=${D}/usr install-man - prepman - dodoc CREDITS CHANGES FILES README VERSION -} - - - diff --git a/net-libs/libwww/files/digest-libwww-5.3.1-r1 b/net-libs/libwww/files/digest-libwww-5.3.1-r1 deleted file mode 100644 index e7fe138b985b..000000000000 --- a/net-libs/libwww/files/digest-libwww-5.3.1-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 74e09f8afa84e8a688766856fe9c134c w3c-libwww-5.3.1.tar.gz diff --git a/net-libs/libwww/files/digest-libwww-5.3.2 b/net-libs/libwww/files/digest-libwww-5.3.2 deleted file mode 100644 index ec9e87c3e16e..000000000000 --- a/net-libs/libwww/files/digest-libwww-5.3.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 9bff5c3269d959a49aaf667977676880 w3c-libwww-5.3.2.tar.gz diff --git a/net-libs/libwww/libwww-5.3.1-r1.ebuild b/net-libs/libwww/libwww-5.3.1-r1.ebuild deleted file mode 100644 index f0be5ad99ed5..000000000000 --- a/net-libs/libwww/libwww-5.3.1-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/libwww-5.3.1-r1.ebuild,v 1.2 2000/12/21 08:22:29 achim Exp $ - -A=w3c-${P}.tar.gz -S=${WORKDIR}/w3c-${P} -DESCRIPTION="A general-purpose client side WEB API" -SRC_URI="http://www.w3.org/Library/Distribution/${A}" -HOMEPAGE="http://www.w3.org/Library/" - -DEPEND=">=sys-apps/bash-2.04 - >=sys-libs/glibc-2.1.3 - >=dev-db/mysql-3.23.26 - >=dev-libs/openssl-0.9.6" - -src_compile() { - - cd ${S} - try ./configure --prefix=/usr --host=${CHOST} --with-zlib \ - --with-md5 --with-ssl --with-mysql - try make - -} - -src_install () { - - cd ${S} - try make prefix=${D}/usr install - dodoc COPYRIGHT - docinto html - dodoc *.html - -} - diff --git a/net-libs/pam_ldap/files/digest-pam_ldap-82 b/net-libs/pam_ldap/files/digest-pam_ldap-82 deleted file mode 100644 index 4300b0133dfb..000000000000 --- a/net-libs/pam_ldap/files/digest-pam_ldap-82 +++ /dev/null @@ -1 +0,0 @@ -MD5 b97ccc6023f429f9f33467c529f0a1a4 pam_ldap-82.tar.gz diff --git a/net-libs/pam_ldap/pam_ldap-82.ebuild b/net-libs/pam_ldap/pam_ldap-82.ebuild deleted file mode 100644 index e1bd6bf2f5aa..000000000000 --- a/net-libs/pam_ldap/pam_ldap-82.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/net-libs/pam_ldap/pam_ldap-82.ebuild,v 1.1 2000/11/26 20:54:19 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="PAM LDAP Module" -HOMEPAGE="http://www.padl.com/pam_ldap.html" -SRC_URI="ftp://ftp.padl.com/pub/"${A} - -DEPEND=">=sys-libs/glibc-2.1.3 - >=sys-libs/pam-0.72 - >=net-nds/openldap-1.2.11" - -src_unpack() { - unpack ${A} -} - -src_compile() { - cd ${S} - touch NEWS - touch AUTHORS - try ./configure --host=${CHOST} --prefix=/usr --with-ldap-lib=openldap - try make -} - -src_install() { - cd ${S} - exeinto /usr/lib/security - doexe pam_ldap.so - dodoc pam.conf ldap.conf - dodoc ChangeLog COPYING.* CVSVersionInfo.txt README - docinto pam.d - dodoc pam.d/* -} - - - - - diff --git a/package-buildorder b/package-buildorder deleted file mode 100644 index a3a826c79d1d..000000000000 --- a/package-buildorder +++ /dev/null @@ -1,290 +0,0 @@ -./dev-util/cvs/cvs-1.11.ebuild -./dev-util/guile/guile-1.4-r1.ebuild -./dev-util/sel/sel-0.08.2.ebuild -./dev-util/strace/strace-4.2.ebuild -./dev-util/yacc/yacc-1.9.1-r1.ebuild -./x11-base/xfree/xfree-4.0.1-r1.ebuild -./media-libs/mesa/mesa-glu-3.2.1.ebuild -./app-shells/tcsh/tcsh-6.09-r1.ebuild -./media-libs/glut/glut-3.7.ebuild -./media-libs/aalib/aalib-1.2.ebuild -./media-libs/jpeg/jpeg-6b-r1.ebuild -./media-libs/giflib/giflib-4.1.0-r1.ebuild -X ./media-libs/libungif/libungif-4.1.0_beta1-r1.ebuild -./media-libs/libpng/libpng-1.0.8-r1.ebuild -./media-libs/libmng/libmng-0.9.2.ebuild -./media-libs/tiff/tiff-3.5.5-r1.ebuild -./media-libs/freetype/freetype-1.3.1-r1.ebuild -./media-libs/t1lib/t1lib-1.0.1-r1.ebuild -./media-libs/libgd/libgd-1.8.3-r1.ebuild -./dev-libs/glib/glib-1.2.8-r1.ebuild -./x11-libs/gtk+/gtk+-1.2.8-r1.ebuild -./gnome-base/gdk-pixbuf/gdk-pixbuf-0.8.0.ebuild -./media-libs/imlib/imlib-1.9.8.1.ebuild -./media-libs/fnlib/fnlib-0.5.ebuild -./media-sound/alsa-driver/alsa-driver-0.5.9b.ebuild -./media-libs/alsa-lib/alsa-lib-0.5.9.ebuild -./media-sound/nas/nas-1.4.1.ebuild -./media-libs/audiofile/audiofile-0.1.9.ebuild -./media-sound/esound/esound-0.2.19.ebuild -./media-libs/libmikmod/libmikmod-3.1.9-r1.ebuild -./dev-lang/nasm/nasm-0.98-r1.ebuild -./media-libs/libsdl/libsdl-1.1.5.ebuild -./media-libs/mpeg-lib/mpeg-lib-1.3.1.ebuild -./media-libs/mpeg2vidcodec-12.ebuild -./media-libs/smjpeg/smjpeg-0.2.1-r1.ebuild -./media-libs/smpeg/smpeg-0.4.1.ebuild -./dev-libs/gmp/gmp-3.1.ebuild -./dev-libs/libpcre/libpcre-3.2-r1.ebuild -./dev-libs/librep/librep-0.13.1.ebuild -./dev-libs/openssl/openssl-0.9.6.ebuild -./x11-libs/libPropList/libPropList-0.10.1-r1.ebuild -./app-admin/daemontools/daemontools-0.70-r1.ebuild -./app-admin/killproc/killproc-1.12-r1.ebuild -./app-admin/runset/runset-1.3-r1.ebuild -./app-admin/usbview/usbview-0.9.0.ebuild -./app-admin/webalizer/webalizer-1.30.04-r1.ebuild -./app-admin/yup/yup-0.6.5-r1.ebuild -./app-arch/rpm/rpm-3.0.5.ebuild -./app-admin/logrotate/logrotate-3.3-r1.ebuild -./app-arch/unzip/unzip-5.41-r1.ebuild -./app-arch/zip/zip-2.3.ebuild -./app-cdr/cdrecord/cdrecord-1.9-r1.ebuild -./app-doc/gimp-user-manual/gime-user-manual-html-2.0-ebuild -./app-doc/man-pages/man-pages-1.31.ebuild -./net-nds/openldap/openldap-1.2.11-r1.ebuild -./x11-libs/openmotif/openmotif-2.1.30-r1.ebuild -./app-editors/gtk-xemacs/gtk-xemacs-21.1.12_p3.ebuild -./app-editors/joe/joe-2.8-r1.ebuild -./app-editors/vim-gtk/vim-gtk-5.7-r1.ebuild -./app-misc/lhinv/lhinv-1.1-r1.ebuild -./app-shells/ccsh/ccsh-0.0.4-r1.ebuild -./app-shells/esh/esh-0.8-r1.ebuild -./app-shells/pdksh/pdksh-5.2.14-r1.ebuild -./app-shells/psh/psh-0.008-r1.ebuild -./app-shells/sash/sash-3.4-r2.ebuild -./app-shells/zsh/zsh-3.1.9.ebuild -./app-text/a2ps/a2ps-4.13b-r1.ebuild -./net-print/LPRng/LPRng-3.6.24.ebuild -./app-text/tetex/tetex-1.0.7-r1.ebuild -./app-text/ghostscript/ghostscript-6.23.ebuild -./app-text/dgs/dgs-0.5.9.1.ebuild -./dev-lang/tcl-tk-8.0/tcl-tk-8.0.5-r1.ebuild -./dev-lang/tcl-tk-8.1/tcl-tk-8.1.1-r1.ebuild -./dev-lang/jdk/jdk-1.2.2.ebuild -./dev-db/mysql/mysql-3.23.26.ebuild -./net-fs/nfs-utils/nfs-utils-0.1.9.1-r1.ebuild -./net-fs/samba/samba-2.0.7-r1.ebuild -./net-ftp/ftp/ftp-0.17-r1.ebuild -./net-ftp/lftp/lftp-2.3.4.ebuild -./net-ftp/proftpd/proftpd-1.2.0_rc2-r1.ebuild -./app-text/docbook-dtd/docbook-dtd30-sgml-1.0.ebuild -./app-text/docbook-dtd/docbook-dtd31-sgml-1.0.ebuild -./app-text/docbook-dtd/docbook-dtd40-sgml-1.0.ebuild -./app-text/docbook-dtd/docbook-dtd41-sgml-1.0.ebuild -./app-text/docbook-style-dsssl/docbook-style-dsssl-1.57.ebuild -./app-text/openjade/openjade-1.3-r1.ebuild -./app-text/docbook-utils/docbook-utils-0.5.5.ebuild -./app-text/jadetex/jadetex-2.20.ebuild -./app-text/sgml-common/sgml-common-0.3.ebuild -./app-text/sgml2x/sgml2x-0.11-r1.ebuild -./net-nds/portmap/portmap-5b-r1.ebuild -./net-mail/qmail/qmail-1.03-r1.ebuild -./net-www/apache-ssl/apache-ssl-1.3.12.2.6.6.ebuild -./app-misc/gfontview/gfontview-0.4.1-r1.ebuild -./app-text/metamail/metamail-2.7-r1.ebuild -./app-text/html-xml-utils/html-xml-utils-1.3.ebuild -./app-text/sablotron/sablotron-0.44.ebuild -./app-text/ttf2pt1/ttf2pt1-3.3.0.ebuild -./app-text/rcs/rcs-5.7.ebuild -./dev-lang/python/python-1.5.2-r1.ebuild -./app-admin/modlogan/modlogan-0.5.2.ebuild -./dev-perl/SGMLSpm/SGMPSpm-1.03ii.ebuild -./dev-perl/ExtUtils-F77/ExtUtils-F77-1.13.ebuild -./dev-perl/Parse-RecDescent/Parse-RecDescent-1.79.ebuild -./dev-perl/PDL/PDL-2.1.1.ebuild -./dev-perl/gtk-perl/gtk-perl-0.7000-r1.ebuild -./dev-perl/perl-tk/perl-tk800-022.ebuild -./dev-perl/XML-Parser/XML-Parser-2.29.ebuild -./dev-perl/libxml-perl/libxml-perl-0.07.ebuild -./dev-perl/XML-Sablot/XML-Sablot-0.43.ebuild -./dev-perl/libnet/libnet-1.0703-r1.ebuild -./dev-perl/HTML-Tagset/HTML-Tagset-3.02.ebuild -./dev-perl/HTML-Parser/HTML-Parser-3.13.ebuild -./dev-perl/MIME-Base64/MIME-Base64-2.11.ebuild -./dev-perl/URI/URI-1.0.9.ebuild -./dev-perl/Digest-MD5/Digest-MD5-2.12.ebuild -./dev-perl/libwww-perl/libwww-perl-5.48.ebuild -./dev-perl/XML-Encoding/XML-Encoding-1.01.ebuild -./dev-perl/XML-Catalog/XML-Catalog-0.01.ebuild -./dev-perl/XML-DT/XML-DT-0.14.ebuild -./dev-perl/XML-DOM/XML-DOM-1.2.5.ebuild -./dev-perl/XML-Writer/XML-Writer-0.4.ebuild -./dev-perl/XML-XSLT/XML-XSLT-0.24.ebuild -./dev-java/fesi/fesi-1.ebuild -./dev-java/jndi/jndi-1.2.1-r1.ebuild -./dev-java/mysql-jdbc/mysql-jdbc-1.2.3-r1.ebuild -./dev-java/xt/xt-1.ebuild -./media-gfx/blender/blender-2.04.ebuild -./dev-libs/swig/swig-1.3_alpha4.ebuild -./dev-libs/slib/slib-2.3.8.ebuild -./net-print/cups/cups-1.1.3.ebuild -./x11-libs/gtkDGS/gtkDGS-0.3.3.ebuild -./media-gfx/autotrace/autotrace-0.24a.ebuild -./media-sound/alsa-utils/alsa-utils-0.5.9a.ebuild -./media-sound/lame/lame-3.86b.ebuild -./media-sound/lopster/lopster-0.9.4.ebuild -./media-sound/mpg123/mpg123-0.59r.ebuild -./media-sound/sox/sox-12.16.ebuild -./media-sound/xmms/xmms-1.2.2-r1.ebuild -./media-video/bcast-2000/bcast-2000a-r1.ebuild -./media-video/mjpeg-tools/mjpeg-tools-1a.ebuild -./media-video/mpeg-tools/mpeg-tools-1.5b.ebuild -./media-video/mpeg2-movie/mpeg2-movie-1.2.2.ebuild -./media-video/smpeg-xmms/smpeg-xmms-0.3.1.ebuild -./media-video/mpeg-movie/mpeg-movie-1.6.0.ebuild -./media-video/xawtv/xawtv-3.20.ebuild -./media-video/xmovie/xmovie-1.5.1.ebuild -./media-video/xanim/xanim-2.80.1.ebuild -./media-video/xanim-export/xanim-export-2.80.1.ebuild -./net-libs/libpcap/libpcap-0.5.2.ebuild -./net-analyzer/ethereal/ethereal-0.8.12.ebuild -./net-analyzer/nessus/nessus-1.0.5.ebuild -./net-analyzer/ngrep/ngrep-1.38-r1.ebuild -./net-analyzer/ntop/ntop-1.3.1-r1.ebuild -./net-analyzer/tcpdump/tcpdump-3.5.2.ebuild -./net-analyzer/tcpstat/tcpstat-1.3.ebuild -./net-dialup/isdn4k-utils/isdn4k-utils-3.1_p1-r1.ebuild -./net-dialup/ppp/ppp-2.4.0-r1.ebuild -./net-dialup/pppoed/pppoed-0.47-r1.ebuild -./net-dialup/rp-pppoe/rp-pppoe-2.3.ebuild -./net-dialup/wvdial/wvdial-1.41-r1.ebuild -./net-fs/autofs/autofs-3.1.5-r1.ebuild -./net-fs/netatalk/netatalk-1.4_beta2-r1.ebuild -./net-libs/libwww(libwww-5.3.1.ebuild -./net-libs/nss_ldap/nss_ldap-113.ebuild -./net-libs/pam_ldap/pam_ldap-70.ebuild -./net-mail/vlnx/vlnx-407e-r1.ebuild -./net-mail/tnef/tnef-0.13.ebuild -./net-mail/amavis/amavis-0.2.1_p3.ebuild -./net-mail/fetchmail/fetchmail-5.5.1.ebuild -./net-mail/mutt/mutt-1.2.5-r1.ebuild -./net-mail/pine-maildir/pine-maildir-4.21-r1.ebuild -./net-mail/pine/pine-4.21-r1.ebuild -./net-misc/bind/bind-8.2.2.5-r1.ebuild -./net-misc/dhcp/dhcp-3.0_beta0206.ebuild -./net-misc/hylafax/hylafax-cvs-000614-r1.ebuild -./net-misc/ipchains-firewall/ipchains-firewall-1.7.0-r1.ebuild -./net-misc/netkit-bootpd/netkit-bootpd-0.17-r1.ebuild -./net-misc/netkit-fingerd/netkit-fingerd-0.17-r1.ebuild -./net-misc/netkit-routed/netkit-routed-0.17-r1.ebuild -./net-misc/netkit-rsh/netkit-rsh-0.17-r1.ebuild -./net-misc/netkit-talk/netkit-talk-0.17-r1.ebuild -./net-misc/netkit-telnetd/netkit-telnetd-0.17-r1.ebuild -./net-misc/netkit-timed/netkit-timed-0.17-r1.ebuild -./net-misc/nut/nut-0.44.1.ebuild -./net-misc/openssh/openssh-2.2.0_p1.ebuild -./net-misc/rsync/rsync-2.4.6.ebuild -./net-misc/snarf/snarf-7.0-r1.ebuild -./net-misc/sslwrap/sslwrap-2.0.5-r1.ebuild -./net-misc/wget/wget-1.5.3-r1.ebuild -./net-misc/whois/whois-4.5.1.ebuild -./net-nds/yp-tools/yp-tools-2.4-r1.ebuild -./net-nds/ypbind/ypbind-1.6-r1.ebuild -./net-nds/ypserv/ypserv-1.3.9-r1.ebuild -./dev-lang/php-4/php-4.0.3_p1.ebuild -./dev-perl/mod_perl/mod_perl-1.24-ebuild -./dev-perl/SOAP/SOAP-0.25.ebuild -./net-www/jakarta/jakarta-3.1-r1.ebuild -./net-www/cocoon/cocoon-1.7.4.ebuild -./net-www/cvsweb/cvsweb-1.93.ebuild -./net-www/lynx/lynx-2.8.3-r1.ebuild -./net-www/htdig/htdig-3.1.5.ebuild -./net-www/netscape/netscape-4.75.ebuild -./net-www/squid/squid-2.3.4s-r1.ebuild -./net-www/w3m/w3m-0.1.10-r1.ebuild -./x11-base/nvidia/nvidia-0.9.5.ebuild -./x11-wm/WindowMaker/WindowMaker-0.62.1-r1.ebuild -./x11-terms/eterm/eterm-0.8.10.ebuild -./x11-terms/rxvt/rxvt-2.6.3.ebuild -./gnome-base/ORBit/ORBit-0.5.3.ebuild -./gnome-base/gnome-libs/gnome-libs-1.2.4.ebuild -./gnome-base/libgtop/libgtop-1.0.9.ebuild -./gnome-base/libxml/libxml-1.8.9.ebuild -./media-gfx/imagemagic/imagemagic-5.2.4.ebuild -./gnome-base/oaf/oaf-0.5.1.ebuild -./x11-libs/gtk-engines/gtk-engines-0.10.ebuild -./gnome-base/gnome-print/gnome-print-0.24.ebuild -./gnome-base/bonobo/bonobo-0.18.ebuild -./gnome-base/libglade/libglade-0.14.ebuild -./gnome-base/libghttp/libghttp-1.0.7.ebuild -./gnome-base/control-center/control-center-1.2.1.ebuild -./gnome-base/gdk-pixbuf/gdk-pixbuf-0.8.0.ebuild -./gnome-base/gconf/gconf-0.8.ebuild -./gnome-base/gtkhtml/gtkhtml-0.6.1.ebuild -./gnome-base/gnome-core/gnome-core-1.2.1.ebuild -./gnome-base/gnome-applets/gnome-applets-1.2.1.ebuild -./x11-wm/enlightenment/enlightenment-0.16.4-r1.ebuild -./gnome-base/mc/mc-4.5.51.ebuild -./dev-python/gnome-python/gnome-python-1.0.53-r1.ebuild -./app-admin/powertweak/powertweak-0.1.16-r1.ebuild -./media-video/vlc/vlc-0.1.99h.ebuild -./media-video/xmps/xmps-0.1.3-r1.ebuild -./net-irc/bitchx/bitchx-1.0.17.ebuild -./net-irc/xchat/xchat-1.4.2.ebuild -./dev-libs/rep-gtk/rep-gtk-0.14.ebuild -./x11-wm/sawfish/sawfish-0.31.1.ebuild -./media-gfx/gimp/gimp-1.1.28.ebuild -./media-gfx/gimp-print/gimp-print-4.0.0_rc1.ebuild -./gnome-base/gnome-vfs/gnome-vfs-0.3.1.ebuild -./gnome-libs/libole2/libole2-0.1.6.ebuild -./gnome-libs/libgda/libgda-0.1.0.ebuild -./gnome-libs/libunicode/libunicode-0.4.ebuild -./gnome-libs/gal/gal-0.1.ebuild -./gnome-apps/bug-buddy/bug-buddy-1.1.ebuild -./gnome-apps/ee/ee-0.3.12.ebuild -./gnome-apps/evolution/evolution-0.5.1.ebuild -./gnome-apps/gb/gb-0.0.12.ebuild -./gnome-apps/gdm/gdm-2.0_beta4.ebuild -./gnome-apps/gedit/gedit-0.9.1.ebuild -./gnome-apps/ggv/ggv-0.95.ebuild -./gnome-apps/glade/glade-0.5.9.ebuild -./gnome-apps/gnapster/gnapser-1.3.12.ebuild -./gnome-apps/gnofin/gnofin-0.8.0.ebuild -./gnome-apps/gnome-audio/gnome-audio-1.0.0.ebuild -./gnome-apps/gnome-media/gnome-media-1.2.0.ebuild -./gnome-apps/gnome-utils/gnome-utils-1.2.0.ebuild -./gnome-apps/gnorpm/gnorpm-0.95.1.ebuild -./dev-libs/g-wrap/g-wrap-0.9.5.ebuild -./gnome-apps/gnucash/gnucash-1.4.6.ebuild -./gnome-apps/gtop/gtop-1.0.9.ebuild -./gnome-apps/gupsc/gupsc-0.3.0.ebuild -./gnome-apps/medusa/medusa-0.2.ebuild -./gnome-apps/nautilus/nautilus-0.1.0.ebuild -./gnome-apps/nmap/nmap-2.53.ebuild -./gnome-apps/powershell/powershell-0.80.ebuild -./gnome-apps/users-guide/users-guide-1.2.ebuild -./gnome-office/abiword/abiword-0.7.11.ebuild -./gnome-office/dia/dia-0.86.ebuild -./gnome-office/eog/eog-0.5.ebuild -./gnome-office/gnome-db/gnome-db-0.0.95.ebuild -./gnome-office/gnome-pim/gnome-pim-1.2.0.ebuild -./gnome-office/gnumeric/gnumeric-0.57.ebuild -./kde-base/qt/qt-x11-2.2.1.ebuild -./dev-utils/lincvs/lincvs-0.3_beta1.ebuild -./media-libs/avifile/avifile-0.47.3.ebuild -./media-video/lamp/lamp-20000903.ebuild -./kde-base/kde-support/kdesupport-2.0_rc2.ebuild -./kde-base/kdelibs/kdelibs-2.0_rc2.ebuild -./kde-base/kdebase/kdebase-2.0_rc2.ebuild -./kde-base/kde-i18n/kde-i18n-20001016.ebuild -./kde-apps/kdeadmin/kdeadmin-2.0_rc2.ebuild -./kde-apps/kdegraphics/kdegraphics-2.0_rc2.ebuild -./kde-apps/kmago/kmago-0.2.ebuild -./kde-apps/kdemultimedia/kdemultimedia-2.0_rc2.ebuild -./kde-apps/kdenetwork/kdenetwork-2.0_rc2.ebuild -./kde-apps/kdepim/kdepim-2.0_rc2.ebuild -./kde-apps/kdeutils/kdeutils-2.0_rc2.ebuild -./kde-apps/kdoc/kdoc-2.0_rc2.ebuild -./kde-apps/koffice/koffice-2.0_rc2.ebuild -./kde-apps/krusader/krusader-0.65.1.ebuild diff --git a/sys-libs/cracklib/cracklib-2.7-r1.ebuild b/sys-libs/cracklib/cracklib-2.7-r1.ebuild deleted file mode 100644 index ca5f2df7b1db..000000000000 --- a/sys-libs/cracklib/cracklib-2.7-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.7-r1.ebuild,v 1.9 2000/12/24 09:55:16 achim Exp $ - -A=cracklib2_2.7.orig.tar.gz -A0=${P}-redhat.patch -S=${WORKDIR}/cracklib,2.7 -DESCRIPTION="Cracklib" -SRC_URI="ftp://ftp.debian.org/debian/dists/potato/main/source/utils/cracklib2_2.7.orig.tar.gz" - -DEPEND=">=sys-libs/glibc-2.1.3" -RDEPEND="$DEPEND - >=sys-apps/bash-2.04" - -src_unpack() { - unpack ${A} - cd ${S} - patch -p1 <${O}/files/${A0} -} - -src_compile() { - cd ${S} - # Parallel mke not supported - try make DICTPATH=\"/usr/share/cracklib/pw_dict\" all -} - -src_install() { - cd ${S} - into /usr - dodir /usr/lib - dodir /usr/sbin - dodir /usr/include - dodir /usr/share/cracklib - ROOT=${D} try make DICTPATH=\"/usr/share/cracklib/pw_dict\" install - mv ${D}/usr/lib ${D} - preplib /usr - dodoc HISTORY LICENCE MANIFEST POSTER README -} - - - - diff --git a/sys-libs/cracklib/files/digest-cracklib-2.7-r1 b/sys-libs/cracklib/files/digest-cracklib-2.7-r1 deleted file mode 100644 index d156a8214c46..000000000000 --- a/sys-libs/cracklib/files/digest-cracklib-2.7-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 7f810e310c7f2df33d1eaa2b41ab2435 cracklib2_2.7.orig.tar.gz diff --git a/sys-libs/db/db-1.85.ebuild b/sys-libs/db/db-1.85.ebuild deleted file mode 100644 index 36c870ca1acd..000000000000 --- a/sys-libs/db/db-1.85.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-1.85.ebuild,v 1.6 2001/01/31 20:49:07 achim Exp $ - -A=db.1.85.tar.gz -S=${WORKDIR}/db.1.85 -DESCRIPTION="db 1.85 -- required for RPM 4.0 to compile; that's about it." -SRC_URI="http://www.sleepycat.com/update/1.85/db.1.85.tar.gz" -HOMEPAGE="http://www.sleepycat.com" -DEPEND="virtual/glibc" -RDEPEND=$DEPEND -src_unpack() { - unpack ${A} - cd ${S} - patch -p1 < ${FILESDIR}/db.1.85.patch -} - -src_compile() { - cd ${S}/PORT/linux - try make ${MAKEOPTS} OORG=\"${CFLAGS} -fomit-frame-pointer\" prefix=/usr -} - -src_install () { - cd PORT/linux - cp libdb.a libdb1.a - dolib.a libdb1.a - cp libdb.so.2 libdb1.so.2 - dolib.so libdb1.so.2 - dosym libdb1.so.2 /usr/lib/libdb1.so - dosym libdb1.so.2 /usr/lib/libdb.so.2 - dosym libdb1.so.2 /usr/lib/libndbm.so - dosym libdb1.a /usr/lib/libndbm.a - dodir /usr/include/db1 - insinto /usr/include/db1 - doins ../include/ndbm.h ../../include/db.h ../../include/mpool.h - dosed "s:<db.h>:<db1/db.h>;" /usr/include/ndbm.h - cp db_dump185 db1_dump185 - dobin db1_dump185 - cd ${S} - dodoc changelog README - docinto ps - dodoc docs/*.ps - docinto hash - dodoc hash/README - -} - - diff --git a/sys-libs/db/db-3.1.17-r1.ebuild b/sys-libs/db/db-3.1.17-r1.ebuild deleted file mode 100644 index d506097ed56f..000000000000 --- a/sys-libs/db/db-3.1.17-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.1.17-r1.ebuild,v 1.4 2001/01/27 02:01:11 drobbins Exp $ - -A=${P}-patched.tar.gz -S=${WORKDIR}/${P}-patched/build_unix -DESCRIPTION="Berkeley DB for transaction support in MySQL" -SRC_URI="ftp://mysql.valueclick.com/mysql/Downloads/db/${A} - http://download.sourceforge.net/pub/mirrors/mysql/Downloads/db/${A}" -HOMEPAGE="http://www.mysql.com" -RDEPEND=">=sys-libs/glibc-2.2 !sys-libs/glibc-2.1.3" -DEPEND="$RDEPEND - =sys-libs/db-1.85" -src_compile() { - - cd ${S} - try ../dist/configure --enable-compat185 --enable-dump185 --prefix=/usr --host=${CHOST} --enable-shared --enable-static --enable-cxx - #enable-rpc hurts me - echo - # Parallel make does not work - echo "Building static libs..." - make libdb=libdb-3.1.a libdb-3.1.a - make libcxx=libdb_cxx-3.1.a libdb_cxx-3.1.a - - echo - echo "Building db_dump185..." - try /bin/sh ./libtool --mode=compile cc -c ${CFLAGS} -I/usr/include/db1 -I../dist/../include -D_REENTRANT ../dist/../db_dump185/db_dump185.c - try gcc -s -static -o db_dump185 db_dump185.lo -L/usr/lib -ldb1 - - echo - echo "Building everything else..." - try make libdb=libdb-3.1.a libcxx=libdb_cxx-3.1.a -} - -src_install () { - cd ${S} - try make libdb=libdb-3.1.a libcxx=libcxx_3.1.a prefix=${D}/usr install - dolib.a libdb-3.1.a libdb_cxx-3.1.a - dolib libdb-3.1.la libdb_cxx-3.1.la - cd .. - dodoc README LICENSE - mv ${D}/usr/docs ${D}/usr/doc/${PF}/html - prepalldocs - dodir usr/include/db3 - cd ${D}/usr/include - mv *.h db3 - ln db3/db.h db.h -} - diff --git a/sys-libs/db/files/digest-db-1.85 b/sys-libs/db/files/digest-db-1.85 deleted file mode 100644 index f77fd46ea895..000000000000 --- a/sys-libs/db/files/digest-db-1.85 +++ /dev/null @@ -1 +0,0 @@ -MD5 42cc6c1e1e25818bd3e3f91328edb0f1 db.1.85.tar.gz diff --git a/sys-libs/db/files/digest-db-3.1.17-r1 b/sys-libs/db/files/digest-db-3.1.17-r1 deleted file mode 100644 index 787e3de98bfc..000000000000 --- a/sys-libs/db/files/digest-db-3.1.17-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 66d970eaa852ee8f2b6293f4f61a5a69 db-3.1.17-patched.tar.gz diff --git a/sys-libs/db/files/digest-db-3.1.17-r2 b/sys-libs/db/files/digest-db-3.1.17-r2 deleted file mode 100644 index 787e3de98bfc..000000000000 --- a/sys-libs/db/files/digest-db-3.1.17-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 66d970eaa852ee8f2b6293f4f61a5a69 db-3.1.17-patched.tar.gz diff --git a/sys-libs/db/files/digest-db-3.2.3h b/sys-libs/db/files/digest-db-3.2.3h deleted file mode 100644 index 42617da0179b..000000000000 --- a/sys-libs/db/files/digest-db-3.2.3h +++ /dev/null @@ -1 +0,0 @@ -MD5 7a4a88daa29268eebb57ff2ed58dff53 db-3.2.3h.tar.gz diff --git a/sys-libs/gdbm/files/digest-gdbm-1.8.0-r1 b/sys-libs/gdbm/files/digest-gdbm-1.8.0-r1 deleted file mode 100644 index cb8535ca1a05..000000000000 --- a/sys-libs/gdbm/files/digest-gdbm-1.8.0-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 cd543862287f55ad66e62cc9d82cc906 gdbm-1.8.0.tar.gz diff --git a/sys-libs/gdbm/gdbm-1.8.0-r1.ebuild b/sys-libs/gdbm/gdbm-1.8.0-r1.ebuild deleted file mode 100644 index 01b699c669a7..000000000000 --- a/sys-libs/gdbm/gdbm-1.8.0-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/gdbm-1.8.0-r1.ebuild,v 1.7 2001/01/31 20:49:07 achim Exp $ - -# FOR SOME REASON, THE CONFIGURE SCRIPT DOES NOT USE THE EXPORTED CFLAGS, SO -# THIS LIBRARY ONLY HAS -O OPTS, WE WON'T WORRY ABOUT THIS FOR SUCH AN -# INSIGNIFICANT LIB, but one day... - -P=gdbm-1.8.0 -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Standard GNU database libraries included for compatibility with Perl" -SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/gdbm/${A} - ftp://prep.ai.mit.edu/gnu/gdbm/${A}" -HOMEPAGE="http://www.gnu.org/software/gdbm/gdbm.html" - -DEPEND="virtual/glibc" - -RDEPEND=$DEPEND - -src_compile() { - try ./configure --host=${CHOST} --prefix=/usr - try pmake -} - -src_install() { - try make prefix=${D}/usr install - dodoc COPYING ChangeLog NEWS README -} - - - diff --git a/sys-libs/glibc/files/digest-glibc-2.2-r2 b/sys-libs/glibc/files/digest-glibc-2.2-r2 deleted file mode 100644 index 349839a1d262..000000000000 --- a/sys-libs/glibc/files/digest-glibc-2.2-r2 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 92918fe47103a5335fd7b2f62202104d glibc-2.2.tar.gz -MD5 2200eeb12b3f402bfa1d9160486d3d86 glibc-linuxthreads-2.2.tar.gz diff --git a/sys-libs/glibc/files/digest-glibc-2.2.1 b/sys-libs/glibc/files/digest-glibc-2.2.1 deleted file mode 100644 index 7b9682289a38..000000000000 --- a/sys-libs/glibc/files/digest-glibc-2.2.1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 5fda58bc58a2e7b5a818994b5d1445c3 glibc-2.2.1.tar.gz -MD5 0963a626c6f4dc0c9871f60931643f5a glibc-linuxthreads-2.2.1.tar.gz diff --git a/sys-libs/glibc/files/digest-glibc-2.2.1-r1 b/sys-libs/glibc/files/digest-glibc-2.2.1-r1 deleted file mode 100644 index 7b9682289a38..000000000000 --- a/sys-libs/glibc/files/digest-glibc-2.2.1-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 5fda58bc58a2e7b5a818994b5d1445c3 glibc-2.2.1.tar.gz -MD5 0963a626c6f4dc0c9871f60931643f5a glibc-linuxthreads-2.2.1.tar.gz diff --git a/sys-libs/glibc/files/digest-glibc-2.2.1-r2 b/sys-libs/glibc/files/digest-glibc-2.2.1-r2 deleted file mode 100644 index 7b9682289a38..000000000000 --- a/sys-libs/glibc/files/digest-glibc-2.2.1-r2 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 5fda58bc58a2e7b5a818994b5d1445c3 glibc-2.2.1.tar.gz -MD5 0963a626c6f4dc0c9871f60931643f5a glibc-linuxthreads-2.2.1.tar.gz diff --git a/sys-libs/glibc/files/digest-glibc-2.2.2 b/sys-libs/glibc/files/digest-glibc-2.2.2 deleted file mode 100644 index 380888a4e467..000000000000 --- a/sys-libs/glibc/files/digest-glibc-2.2.2 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 e9def8ff00baf03898505837a677ca06 glibc-2.2.2.tar.gz -MD5 9678bc074a9fa0bd21e7205f4c9cafdf glibc-linuxthreads-2.2.2.tar.gz diff --git a/sys-libs/glibc/files/digest-glibc-2.2.2-r1 b/sys-libs/glibc/files/digest-glibc-2.2.2-r1 deleted file mode 100644 index 380888a4e467..000000000000 --- a/sys-libs/glibc/files/digest-glibc-2.2.2-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 e9def8ff00baf03898505837a677ca06 glibc-2.2.2.tar.gz -MD5 9678bc074a9fa0bd21e7205f4c9cafdf glibc-linuxthreads-2.2.2.tar.gz diff --git a/sys-libs/glibc/files/glibc-2.2-ldconfig.patch b/sys-libs/glibc/files/glibc-2.2-ldconfig.patch deleted file mode 100644 index acc5174705b8..000000000000 --- a/sys-libs/glibc/files/glibc-2.2-ldconfig.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- glibc-2.2/elf/ldconfig.c Tue Nov 14 20:05:26 2000 -+++ glibc-2.2/elf/ldconfig.c Tue Nov 14 20:05:02 2000 -@@ -370,13 +370,13 @@ - - /* Get complete path. */ - full_libname = alloca (strlen (path) + strlen (libname) + 2); -- full_soname = alloca (strlen (path) + strlen (libname) + 2); -+ full_soname = alloca (strlen (path) + strlen (soname) + 2); - sprintf (full_libname, "%s/%s", path, libname); - sprintf (full_soname, "%s/%s", path, soname); - if (opt_chroot) - { - real_full_libname = alloca (strlen (real_path) + strlen (libname) + 2); -- real_full_soname = alloca (strlen (real_path) + strlen (libname) + 2); -+ real_full_soname = alloca (strlen (real_path) + strlen (soname) + 2); - sprintf (real_full_libname, "%s/%s", real_path, libname); - sprintf (real_full_soname, "%s/%s", real_path, soname); - } - - diff --git a/sys-libs/glibc/files/setjmp.S b/sys-libs/glibc/files/setjmp.S deleted file mode 100644 index 40710be1ef51..000000000000 --- a/sys-libs/glibc/files/setjmp.S +++ /dev/null @@ -1,77 +0,0 @@ -/* setjmp for i386, ELF version. - Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <sysdep.h> -#define _ASM -#define _SETJMP_H -#include <bits/setjmp.h> - - /* We include the BSD entry points here as well but we make - them weak. */ -ENTRY (setjmp) - .weak C_SYMBOL_NAME (setjmp) - popl %eax /* Pop return PC. */ - popl %ecx /* Pop jmp_buf argument. */ - pushl $1 /* Push second argument of zero. */ - pushl %ecx /* Push back first argument. */ - pushl %eax /* Push back return PC. */ - /* Note that we have to use a non-exported symbol in the next - jump since otherwise gas will emit it as a jump through the - PLT which is what we cannot use here. */ - jmp .Linternal_sigsetjmp -END (setjmp) - - /* Binary compatibility entry point. */ -ENTRY (_setjmp) - .weak C_SYMBOL_NAME (_setjmp) -ENTRY (__setjmp) - popl %eax /* Pop return address. */ - popl %ecx /* Pop jmp_buf. */ - pushl $0 /* Push zero argument. */ - pushl %ecx /* Push jmp_buf. */ - pushl %eax /* Push back return address. */ - -ENTRY (__sigsetjmp) -.Linternal_sigsetjmp = __sigsetjmp - movl 4(%esp), %eax /* User's jmp_buf in %eax. */ - /* Save registers. */ - movl %ebx, (JB_BX*4)(%eax) - movl %esi, (JB_SI*4)(%eax) - movl %edi, (JB_DI*4)(%eax) - movl %ebp, (JB_BP*4)(%eax) - leal 4(%esp), %ecx /* Save SP as it will be after we return. */ - movl %ecx, (JB_SP*4)(%eax) - movl 0(%esp), %ecx /* Save PC we are returning to now. */ - movl %ecx, (JB_PC*4)(%eax) - - /* Make a tail call to __sigjmp_save; it takes the same args. */ -#ifdef PIC - /* We cannot use the PLT, because it requires that %ebx be set, but - we can't save and restore our caller's value. Instead, we do an - indirect jump through the GOT, using for the temporary register - %ecx, which is call-clobbered. */ - call here -here: popl %ecx - addl $_GLOBAL_OFFSET_TABLE_+[.-here], %ecx - movl C_SYMBOL_NAME(__sigjmp_save@GOT)(%ecx), %ecx - jmp *%ecx -#else - jmp __sigjmp_save -#endif -END (__sigsetjmp) diff --git a/sys-libs/glibc/glibc-2.2-r2.ebuild b/sys-libs/glibc/glibc-2.2-r2.ebuild deleted file mode 100644 index 1fd168ca6c3f..000000000000 --- a/sys-libs/glibc/glibc-2.2-r2.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2-r2.ebuild,v 1.5 2000/11/30 23:14:00 achim Exp $ - -A="$P.tar.gz glibc-linuxthreads-${PV}.tar.gz" -S=${WORKDIR}/${P} -DESCRIPTION="GNU libc6 (also called glibc2) C library" -SRC_URI="ftp://sourceware.cygnus.com/pub/glibc/releases/glibc-${PV}.tar.gz - ftp://sourceware.cygnus.com/pub/glibc/releases/glibc-linuxthreads-${PV}.tar.gz - ftp://ftp.unina.it/pub/Unix/cygnus/glibc/releases/glibc-${PV}.tar.gz - ftp://ftp.unina.it/pub/Unix/cygnus/glibc/releases/glibc-linuxthreads-${PV}.tar.gz - ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.gz - ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-${PV}.tar.gz" -HOMEPAGE="http://www.gnu.org/software/libc/libc.html" -DEPEND="" -RDEPEND="$DEPEND - >=sys-apps/bash-2.04 - >=sys-devel/perl-5.6" - -src_compile() { - - rm -rf buildhere - mkdir buildhere - cd buildhere - try ../configure --host=${CHOST} --without-cvs \ - --enable-add-ons=linuxthreads \ - --disable-profile --prefix=/usr \ - --enable-kernel=2.2.17 - try make PARALLELMFLAGS=${MAKEOPTS} -# make check -} - -src_unpack() { - unpack glibc-${PV}.tar.gz - cd ${S} - unpack glibc-linuxthreads-${PV}.tar.gz - patch -p1 < ${FILESDIR}/glibc-2.2-ldconfig.patch -} - -src_install() { - cd ${S} - rm -rf ${D} - mkdir ${D} - dodir /etc/rc.d/init.d - export LC_ALL=C - try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} install -C buildhere - try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} info -C buildhere - try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} localedata/install-locales -C buildhere - try make PARALELLMFLAGS=${MAKEOPTS} -C linuxthreads/man - mkdir -p ${D}/usr/man/man3 - install -m 0644 linuxthreads/man/*.3thr ${D}/usr/man/man3 - chmod 755 ${D}/usr/libexec/pt_chown - install -m 644 nscd/nscd.conf ${D}/etc - install -m 755 ${O}/files/nscd ${D}/etc/rc.d/init.d/nscd - rm ${D}/lib/ld-linux.so.2 - rm ${D}/lib/libc.so.6 - - dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE NEWS NOTES \ - PROJECTS README* -} - -pkg_preinst() -{ - echo "Saving ld-linux and libc6" - - cp ${ROOT}lib/ld-linux.so.2 ${ROOT}tmp - sln ${ROOT}tmp/ld-linux.so.2 ${ROOT}lib/ld-linux.so.2 - cp ${ROOT}lib/libc.so.6 ${ROOT}tmp - sln ${ROOT}tmp/libc.so.6 ${ROOT}lib/libc.so.6 - - if [ -e ${ROOT}etc/localtime ] - then - #keeping old timezone - rm ${D}/etc/localtime - else - echo "Please remember to set your timezone using the zic command." - fi -} - -pkg_postinst() -{ - echo "Setting ld-linux and libc6" - - sln ${ROOT}lib/ld-2.2.so ${ROOT}lib/ld-linux.so.2 - sln ${ROOT}lib/libc-2.2.so ${ROOT}lib/libc.so.6 - rm ${ROOT}tmp/ld-linux.so.2 - rm ${ROOT}tmp/libc.so.6 - ldconfig -r ${ROOT} -} - - diff --git a/sys-libs/glibc/glibc-2.2.1-r1.ebuild b/sys-libs/glibc/glibc-2.2.1-r1.ebuild deleted file mode 100644 index 254a32ff4d59..000000000000 --- a/sys-libs/glibc/glibc-2.2.1-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.1-r1.ebuild,v 1.1 2001/02/07 16:10:52 achim Exp $ - -A="$P.tar.gz glibc-linuxthreads-${PV}.tar.gz" -S=${WORKDIR}/${P} -DESCRIPTION="GNU libc6 (also called glibc2) C library" -SRC_URI="ftp://sourceware.cygnus.com/pub/glibc/releases/glibc-${PV}.tar.gz - ftp://sourceware.cygnus.com/pub/glibc/releases/glibc-linuxthreads-${PV}.tar.gz - ftp://ftp.unina.it/pub/Unix/cygnus/glibc/releases/glibc-${PV}.tar.gz - ftp://ftp.unina.it/pub/Unix/cygnus/glibc/releases/glibc-linuxthreads-${PV}.tar.gz - ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.gz - ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-${PV}.tar.gz" -HOMEPAGE="http://www.gnu.org/software/libc/libc.html" - -DEPEND="sys-devel/perl - sys-devel/gettext" - -RDEPEND="$DEPEND" - -PROVIDE="virtual/glibc" - -src_unpack() { - - unpack glibc-${PV}.tar.gz - cd ${S} - unpack glibc-linuxthreads-${PV}.tar.gz - -} - -src_compile() { - - rm -rf buildhere - mkdir buildhere - cd buildhere - try ../configure --host=${CHOST} --without-cvs \ - --enable-add-ons=linuxthreads \ - --disable-profile --prefix=/usr \ - --mandir=/usr/share/man --infodir=/usr/share/info \ - --libexecdir=/usr/lib/misc \ - --enable-kernel=2.4.0 - try make PARALLELMFLAGS=${MAKEOPTS} - make check -} - - -src_install() { - - rm -rf ${D} - mkdir ${D} - dodir /etc/rc.d/init.d - export LC_ALL=C - try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} install -C buildhere - try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} info -C buildhere - try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} localedata/install-locales -C buildhere - try make PARALELLMFLAGS=${MAKEOPTS} -C linuxthreads/man - - cd ${S}/linuxthreads/man - for i in *.3thr - do - newman $i ${i%.3thr}.3 - done - - cd ${S} - chmod 755 ${D}/usr/lib/misc/pt_chown - install -m 644 nscd/nscd.conf ${D}/etc - install -m 755 ${FILESDIR}/nscd ${D}/etc/rc.d/init.d/nscd - rm ${D}/lib/ld-linux.so.2 - rm ${D}/lib/libc.so.6 - - dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE NEWS NOTES \ - PROJECTS README* -} - -pkg_preinst() -{ - echo "Saving ld-linux and libc6" - - /bin/cp ${ROOT}lib/ld-linux.so.2 ${ROOT}tmp - /sbin/sln ${ROOT}tmp/ld-linux.so.2 ${ROOT}lib/ld-linux.so.2 - /bin/cp ${ROOT}lib/libc.so.6 ${ROOT}tmp - /sbin/sln ${ROOT}tmp/libc.so.6 ${ROOT}lib/libc.so.6 - - if [ -e ${ROOT}etc/localtime ] - then - #keeping old timezone - /bin/rm ${D}/etc/localtime - else - echo "Please remember to set your timezone using the zic command." - fi -} - -pkg_postinst() -{ - echo "Setting ld-linux and libc6" - - /sbin/sln ${ROOT}lib/ld-2.2.so ${ROOT}lib/ld-linux.so.2 - /sbin/sln ${ROOT}lib/libc-2.2.so ${ROOT}lib/libc.so.6 - /bin/rm ${ROOT}tmp/ld-linux.so.2 - /bin/rm ${ROOT}tmp/libc.so.6 - /sbin/ldconfig -r ${ROOT} - -} - - diff --git a/sys-libs/glibc/glibc-2.2.1-r2.ebuild b/sys-libs/glibc/glibc-2.2.1-r2.ebuild deleted file mode 100644 index 0175727dad1c..000000000000 --- a/sys-libs/glibc/glibc-2.2.1-r2.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.1-r2.ebuild,v 1.1 2001/02/20 09:29:21 achim Exp $ - -A="$P.tar.gz glibc-linuxthreads-${PV}.tar.gz" -S=${WORKDIR}/${P} -DESCRIPTION="GNU libc6 (also called glibc2) C library" -SRC_URI="ftp://sourceware.cygnus.com/pub/glibc/releases/glibc-${PV}.tar.gz - ftp://sourceware.cygnus.com/pub/glibc/releases/glibc-linuxthreads-${PV}.tar.gz - ftp://ftp.unina.it/pub/Unix/cygnus/glibc/releases/glibc-${PV}.tar.gz - ftp://ftp.unina.it/pub/Unix/cygnus/glibc/releases/glibc-linuxthreads-${PV}.tar.gz - ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.gz - ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-${PV}.tar.gz" -HOMEPAGE="http://www.gnu.org/software/libc/libc.html" - -DEPEND="sys-devel/perl - sys-devel/gettext - gd? ( media-libs/libgd )" - -RDEPEND="gd? ( sys-libs/zlib media-libs/libpng )" - -PROVIDE="virtual/glibc" - -src_unpack() { - - unpack glibc-${PV}.tar.gz - cd ${S} - unpack glibc-linuxthreads-${PV}.tar.gz - cd io - patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch - -} - -src_compile() { - - local myconf - if [ "`use build`" ] - then - # If we build for the build system we use the kernel headers from the target - myconf="--with-header=$ROOT}usr/include" - fi - if [ "`use gd`" ] - then - myconf="${myconf} --with-gd" - else - myconf="${myconf} --with-gd=no" - fi - rm -rf buildhere - mkdir buildhere - cd buildhere - try ../configure --host=${CHOST} --without-cvs \ - --enable-add-ons=linuxthreads \ - --disable-profile --prefix=/usr \ - --mandir=/usr/share/man --infodir=/usr/share/info \ - --libexecdir=/usr/lib/misc \ - --enable-kernel=2.4.0 ${myconf} - try make - make check -} - - -src_install() { - - rm -rf ${D} - mkdir ${D} - dodir /etc/rc.d/init.d - export LC_ALL=C - try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} install -C buildhere - try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} info -C buildhere - try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} localedata/install-locales -C buildhere - try make PARALELLMFLAGS=${MAKEOPTS} -C linuxthreads/man - - cd ${S}/linuxthreads/man - for i in *.3thr - do - newman $i ${i%.3thr}.3 - done - - cd ${S} - chmod 755 ${D}/usr/lib/misc/pt_chown - install -m 644 nscd/nscd.conf ${D}/etc - install -m 755 ${FILESDIR}/nscd ${D}/etc/rc.d/init.d/nscd - rm ${D}/lib/ld-linux.so.2 - rm ${D}/lib/libc.so.6 - - dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE NEWS NOTES \ - PROJECTS README* -} - -pkg_preinst() -{ - echo "Saving ld-linux and libc6" - - /bin/cp ${ROOT}lib/ld-linux.so.2 ${ROOT}tmp - /sbin/sln ${ROOT}tmp/ld-linux.so.2 ${ROOT}lib/ld-linux.so.2 - /bin/cp ${ROOT}lib/libc.so.6 ${ROOT}tmp - /sbin/sln ${ROOT}tmp/libc.so.6 ${ROOT}lib/libc.so.6 - - if [ -e ${ROOT}etc/localtime ] - then - #keeping old timezone - /bin/rm ${D}/etc/localtime - else - echo "Please remember to set your timezone using the zic command." - fi -} - -pkg_postinst() -{ - echo "Setting ld-linux and libc6" - - /sbin/sln ${ROOT}lib/ld-${PV}.so ${ROOT}lib/ld-linux.so.2 - /sbin/sln ${ROOT}lib/libc-${PV}.so ${ROOT}lib/libc.so.6 - /bin/rm ${ROOT}tmp/ld-linux.so.2 - /bin/rm ${ROOT}tmp/libc.so.6 - /sbin/ldconfig -r ${ROOT} - -} - - diff --git a/sys-libs/glibc/glibc-2.2.1.ebuild b/sys-libs/glibc/glibc-2.2.1.ebuild deleted file mode 100644 index bb46cf00d510..000000000000 --- a/sys-libs/glibc/glibc-2.2.1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.1.ebuild,v 1.3 2001/01/31 20:49:07 achim Exp $ - -A="$P.tar.gz glibc-linuxthreads-${PV}.tar.gz" -S=${WORKDIR}/${P} -DESCRIPTION="GNU libc6 (also called glibc2) C library" -SRC_URI="ftp://sourceware.cygnus.com/pub/glibc/releases/glibc-${PV}.tar.gz - ftp://sourceware.cygnus.com/pub/glibc/releases/glibc-linuxthreads-${PV}.tar.gz - ftp://ftp.unina.it/pub/Unix/cygnus/glibc/releases/glibc-${PV}.tar.gz - ftp://ftp.unina.it/pub/Unix/cygnus/glibc/releases/glibc-linuxthreads-${PV}.tar.gz - ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.gz - ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-${PV}.tar.gz" -HOMEPAGE="http://www.gnu.org/software/libc/libc.html" -DEPEND="" -RDEPEND="$DEPEND - >=sys-apps/bash-2.04 - >=sys-devel/perl-5.6" -PROVIDE="virtual/glibc" - -src_compile() { - - rm -rf buildhere - mkdir buildhere - cd buildhere - try ../configure --host=${CHOST} --without-cvs \ - --enable-add-ons=linuxthreads \ - --disable-profile --prefix=/usr \ - --enable-kernel=2.4.0 - try make PARALLELMFLAGS=${MAKEOPTS} - make check -} - -src_unpack() { - unpack glibc-${PV}.tar.gz - cd ${S} - unpack glibc-linuxthreads-${PV}.tar.gz -# patch -p1 < ${FILESDIR}/glibc-2.2-ldconfig.patch -} - -src_install() { - cd ${S} - rm -rf ${D} - mkdir ${D} - dodir /etc/rc.d/init.d - export LC_ALL=C - try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} install -C buildhere - try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} info -C buildhere - try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} localedata/install-locales -C buildhere - try make PARALELLMFLAGS=${MAKEOPTS} -C linuxthreads/man - mkdir -p ${D}/usr/man/man3 - install -m 0644 linuxthreads/man/*.3thr ${D}/usr/man/man3 - chmod 755 ${D}/usr/libexec/pt_chown - install -m 644 nscd/nscd.conf ${D}/etc - install -m 755 ${O}/files/nscd ${D}/etc/rc.d/init.d/nscd - rm ${D}/lib/ld-linux.so.2 - rm ${D}/lib/libc.so.6 - - dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE NEWS NOTES \ - PROJECTS README* -} - -pkg_preinst() -{ - echo "Saving ld-linux and libc6" - - /bin/cp ${ROOT}lib/ld-linux.so.2 ${ROOT}tmp - /sbin/sln ${ROOT}tmp/ld-linux.so.2 ${ROOT}lib/ld-linux.so.2 - /bin/cp ${ROOT}lib/libc.so.6 ${ROOT}tmp - /sbin/sln ${ROOT}tmp/libc.so.6 ${ROOT}lib/libc.so.6 - - if [ -e ${ROOT}etc/localtime ] - then - #keeping old timezone - /bin/rm ${D}/etc/localtime - else - echo "Please remember to set your timezone using the zic command." - fi -} - -pkg_postinst() -{ - echo "Setting ld-linux and libc6" - - /sbin/sln ${ROOT}lib/ld-2.2.so ${ROOT}lib/ld-linux.so.2 - /sbin/sln ${ROOT}lib/libc-2.2.so ${ROOT}lib/libc.so.6 - /bin/rm ${ROOT}tmp/ld-linux.so.2 - /bin/rm ${ROOT}tmp/libc.so.6 - /sbin/ldconfig -r ${ROOT} -} - - diff --git a/sys-libs/glibc/glibc-2.2.2-r1.ebuild b/sys-libs/glibc/glibc-2.2.2-r1.ebuild deleted file mode 100644 index a2bed99c11ab..000000000000 --- a/sys-libs/glibc/glibc-2.2.2-r1.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.2-r1.ebuild,v 1.5 2001/03/06 05:27:28 achim Exp $ - -A="$P.tar.gz glibc-linuxthreads-${PV}.tar.gz" -S=${WORKDIR}/${P} -DESCRIPTION="GNU libc6 (also called glibc2) C library" -SRC_URI="ftp://sourceware.cygnus.com/pub/glibc/releases/glibc-${PV}.tar.gz - ftp://sourceware.cygnus.com/pub/glibc/releases/glibc-linuxthreads-${PV}.tar.gz - ftp://ftp.unina.it/pub/Unix/cygnus/glibc/releases/glibc-${PV}.tar.gz - ftp://ftp.unina.it/pub/Unix/cygnus/glibc/releases/glibc-linuxthreads-${PV}.tar.gz - ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.gz - ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-${PV}.tar.gz" -HOMEPAGE="http://www.gnu.org/software/libc/libc.html" - -DEPEND="nls? ( sys-devel/gettext ) gd? ( media-libs/libgd )" - -RDEPEND="gd? ( sys-libs/zlib media-libs/libpng )" - -PROVIDE="virtual/glibc" - -src_unpack() { - - unpack glibc-${PV}.tar.gz - cd ${S} - unpack glibc-linuxthreads-${PV}.tar.gz - for i in mtrace-perl mtrace-tst-loading-perl posix-bug-regex2-mem-perl configure.in configure - do - echo "Applying $i patch..." - patch -p0 < ${FILESDIR}/glibc-2.2.2-${i}.diff - done - cd io - patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch - - -} - -src_compile() { - - local myconf - if [ "`use build`" ] - then - # If we build for the build system we use the kernel headers from the target - myconf="--with-header=${ROOT}usr/include" - fi - if [ "`use gd`" ] - then - myconf="${myconf} --with-gd=yes" - else - myconf="${myconf} --with-gd=no" - fi - if [ -z "`use nls`" ] - then - myconf="${myconf} --disable-nls" - fi - rm -rf buildhere - mkdir buildhere - cd buildhere - try ../configure --host=${CHOST} --without-cvs \ - --enable-add-ons=linuxthreads \ - --disable-profile --prefix=/usr \ - --mandir=/usr/share/man --infodir=/usr/share/info \ - --libexecdir=/usr/lib/misc \ - --enable-kernel=2.4.0 ${myconf} - try make - make check -} - - -src_install() { - - rm -rf ${D} - mkdir ${D} - dodir /etc/rc.d/init.d - export LC_ALL=C - try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} install -C buildhere - try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} info -C buildhere - if [ -z "`use build`" ] - then - try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} localedata/install-locales -C buildhere - - # I commented out linuxthreads man pages because I don't want - # glibc to build depend on perl - # dodir /usr/share/man/man3 - # try make MANDIR=${D}/usr/share/man/man3 install -C linuxthreads/man - # cd ${D}/usr/share/man/man3 - # for i in *.3thr - # do - # mv ${i} ${i%.3thr}.3 - # done - - install -m 644 nscd/nscd.conf ${D}/etc - install -m 755 ${FILESDIR}/nscd ${D}/etc/rc.d/init.d/nscd - dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE NEWS NOTES \ - PROJECTS README* - else - rm -rf ${D}/usr/share/{man,info,zoneinfo} - fi - - rm ${D}/lib/ld-linux.so.2 - rm ${D}/lib/libc.so.6 - - chmod 755 ${D}/usr/lib/misc/pt_chown - -} - -pkg_preinst() -{ - echo "Saving ld-linux and libc6" - - /bin/cp ${ROOT}lib/ld-linux.so.2 ${ROOT}tmp - /sbin/sln ${ROOT}tmp/ld-linux.so.2 ${ROOT}lib/ld-linux.so.2 - /bin/cp ${ROOT}lib/libc.so.6 ${ROOT}tmp - /sbin/sln ${ROOT}tmp/libc.so.6 ${ROOT}lib/libc.so.6 - - if [ -e ${ROOT}etc/localtime ] - then - #keeping old timezone - /bin/rm ${D}/etc/localtime - else - echo "Please remember to set your timezone using the zic command." - fi -} - -pkg_postinst() -{ - echo "Setting ld-linux and libc6" - - /sbin/sln ${ROOT}lib/ld-${PV}.so ${ROOT}lib/ld-linux.so.2 - /sbin/sln ${ROOT}lib/libc-${PV}.so ${ROOT}lib/libc.so.6 - /bin/rm ${ROOT}tmp/ld-linux.so.2 - /bin/rm ${ROOT}tmp/libc.so.6 - /sbin/ldconfig -r ${ROOT} - -} - - - diff --git a/sys-libs/glibc/glibc-2.2.2.ebuild b/sys-libs/glibc/glibc-2.2.2.ebuild deleted file mode 100644 index f7a10779e545..000000000000 --- a/sys-libs/glibc/glibc-2.2.2.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.2.ebuild,v 1.1 2001/02/17 02:43:51 achim Exp $ - -A="$P.tar.gz glibc-linuxthreads-${PV}.tar.gz" -S=${WORKDIR}/${P} -DESCRIPTION="GNU libc6 (also called glibc2) C library" -SRC_URI="ftp://sourceware.cygnus.com/pub/glibc/releases/glibc-${PV}.tar.gz - ftp://sourceware.cygnus.com/pub/glibc/releases/glibc-linuxthreads-${PV}.tar.gz - ftp://ftp.unina.it/pub/Unix/cygnus/glibc/releases/glibc-${PV}.tar.gz - ftp://ftp.unina.it/pub/Unix/cygnus/glibc/releases/glibc-linuxthreads-${PV}.tar.gz - ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.gz - ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-${PV}.tar.gz" -HOMEPAGE="http://www.gnu.org/software/libc/libc.html" - -DEPEND="sys-devel/perl - sys-devel/gettext" - -RDEPEND="$DEPEND" - -PROVIDE="virtual/glibc" - -src_unpack() { - - unpack glibc-${PV}.tar.gz - cd ${S} - unpack glibc-linuxthreads-${PV}.tar.gz - cd io - patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch - -} - -src_compile() { - - rm -rf buildhere - mkdir buildhere - cd buildhere - try ../configure --host=${CHOST} --without-cvs \ - --enable-add-ons=linuxthreads \ - --disable-profile --prefix=/usr \ - --mandir=/usr/share/man --infodir=/usr/share/info \ - --libexecdir=/usr/lib/misc \ - --enable-kernel=2.4.0 - try make - make check -} - - -src_install() { - - rm -rf ${D} - mkdir ${D} - dodir /etc/rc.d/init.d - export LC_ALL=C - try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} install -C buildhere - try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} info -C buildhere - try make PARALELLMFLAGS=${MAKEOPTS} install_root=${D} localedata/install-locales -C buildhere - try make PARALELLMFLAGS=${MAKEOPTS} -C linuxthreads/man - - cd ${S}/linuxthreads/man - for i in *.3thr - do - newman $i ${i%.3thr}.3 - done - - cd ${S} - chmod 755 ${D}/usr/lib/misc/pt_chown - install -m 644 nscd/nscd.conf ${D}/etc - install -m 755 ${FILESDIR}/nscd ${D}/etc/rc.d/init.d/nscd - rm ${D}/lib/ld-linux.so.2 - rm ${D}/lib/libc.so.6 - - dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE NEWS NOTES \ - PROJECTS README* -} - -pkg_preinst() -{ - echo "Saving ld-linux and libc6" - - /bin/cp ${ROOT}lib/ld-linux.so.2 ${ROOT}tmp - /sbin/sln ${ROOT}tmp/ld-linux.so.2 ${ROOT}lib/ld-linux.so.2 - /bin/cp ${ROOT}lib/libc.so.6 ${ROOT}tmp - /sbin/sln ${ROOT}tmp/libc.so.6 ${ROOT}lib/libc.so.6 - - if [ -e ${ROOT}etc/localtime ] - then - #keeping old timezone - /bin/rm ${D}/etc/localtime - else - echo "Please remember to set your timezone using the zic command." - fi -} - -pkg_postinst() -{ - echo "Setting ld-linux and libc6" - - /sbin/sln ${ROOT}lib/ld-2.2.so ${ROOT}lib/ld-linux.so.2 - /sbin/sln ${ROOT}lib/libc-2.2.so ${ROOT}lib/libc.so.6 - /bin/rm ${ROOT}tmp/ld-linux.so.2 - /bin/rm ${ROOT}tmp/libc.so.6 - /sbin/ldconfig -r ${ROOT} - -} - - diff --git a/sys-libs/gpm/files/digest-gpm-1.19.3 b/sys-libs/gpm/files/digest-gpm-1.19.3 deleted file mode 100644 index 239093b9f071..000000000000 --- a/sys-libs/gpm/files/digest-gpm-1.19.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 dbfc33e0d52d008eeec1c8f93885e3f9 gpm-1.19.3.tar.gz diff --git a/sys-libs/gpm/files/digest-gpm-1.19.3-r1 b/sys-libs/gpm/files/digest-gpm-1.19.3-r1 deleted file mode 100644 index 77933740e92e..000000000000 --- a/sys-libs/gpm/files/digest-gpm-1.19.3-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 dbfc33e0d52d008eeec1c8f93885e3f9 gpm-1.19.3.tar.gz -MD5 69337348611578f680dc8e2224296878 devfs.patch diff --git a/sys-libs/gpm/gpm-1.19.3-r1.ebuild b/sys-libs/gpm/gpm-1.19.3-r1.ebuild deleted file mode 100644 index 791ef883b474..000000000000 --- a/sys-libs/gpm/gpm-1.19.3-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.19.3-r1.ebuild,v 1.2 2001/01/31 20:49:07 achim Exp $ - -P=gpm-1.19.3 -A="${P}.tar.gz devfs.patch" -S=${WORKDIR}/${P} -DESCRIPTION="Console-based mouse driver" -SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/mouse/${A} - ftp://ftp.prosa.it/pub/gpm/patches/devfs.patch" - -DEPEND="virtual/glibc - >=sys-libs/ncurses-5.1" - -RDEPEND=$DEPEND - -src_unpack() { - unpack ${P}.tar.gz - cd ${S} - cp ${FILESDIR}/gpmInt.h . - patch -p1 < ${DISTDIR}/devfs.patch -} - -src_compile() { - cd ${S} - try ./configure --prefix=/usr --sysconfdir=/etc/gpm - cp Makefile Makefile.orig - if [ -z "`use tex`" ] - then - sed -e "s/doc//" Makefile.orig > Makefile - fi - try make ${MAKEOPTS} -} - -src_install() { - try make prefix=${D}/usr install - chmod 755 ${D}/usr/lib/libgpm.so.1.18.0 - dodoc Announce COPYING ChangeLog FAQ MANIFEST README.* - docinto txt - dodoc doc/gpmdoc.txt - if [ "`use tex`" ] - then - docinto ps - dodoc doc/*.ps - fi - insinto /etc/gpm - doins gpm-root.conf - -} - - - diff --git a/sys-libs/gpm/gpm-1.19.3.ebuild b/sys-libs/gpm/gpm-1.19.3.ebuild deleted file mode 100644 index f5d4646c2c08..000000000000 --- a/sys-libs/gpm/gpm-1.19.3.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.19.3.ebuild,v 1.5 2000/11/30 23:14:00 achim Exp $ - -P=gpm-1.19.3 -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Console-based mouse driver" -SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/mouse/${A}" - -DEPEND=">=sys-libs/glibc-2.1.3 - >=sys-libs/ncurses-5.1" - -RDEPEND=$DEPEND - -src_unpack() { - unpack ${A} - cd ${S} - cp ${FILESDIR}/gpmInt.h . -} - -src_compile() { - cd ${S} - try ./configure --prefix=/usr --sysconfdir=/etc/gpm - cp Makefile Makefile.orig - if [ -z "`use tex`" ] - then - sed -e "s/doc//" Makefile.orig > Makefile - fi - try make ${MAKEOPTS} -} - -src_install() { - try make prefix=${D}/usr install - chmod 755 ${D}/usr/lib/libgpm.so.1.18.0 - dodoc Announce COPYING ChangeLog FAQ MANIFEST README.* - docinto txt - dodoc doc/gpmdoc.txt - if [ "`use tex`" ] - then - docinto ps - dodoc doc/*.ps - fi - insinto /etc/gpm - doins gpm-root.conf - -} - - - diff --git a/sys-libs/lib-compat/files/digest-lib-compat-1.0-r1 b/sys-libs/lib-compat/files/digest-lib-compat-1.0-r1 deleted file mode 100644 index 0fabad7e4087..000000000000 --- a/sys-libs/lib-compat/files/digest-lib-compat-1.0-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 3be2a6bf54736b393851e92b43212655 lib-compat.tar.gz diff --git a/sys-libs/lib-compat/lib-compat-1.0-r1.ebuild b/sys-libs/lib-compat/lib-compat-1.0-r1.ebuild deleted file mode 100644 index aa373c9b0201..000000000000 --- a/sys-libs/lib-compat/lib-compat-1.0-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/lib-compat/lib-compat-1.0-r1.ebuild,v 1.4 2000/11/07 11:16:08 achim Exp $ - -P=lib-compat-1.0 -A=lib-compat.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Compatibility c++ and libc5 libraries for programs new and old" -SRC_URI="ftp://gentoolinux.sourceforge.net/pub/gentoolinux/current/distfiles/"${A} - -DEPEND="" -RDEPEND="" - -src_unpack () { - mkdir ${S} - cd ${S} - unpack ${A} -} - -src_compile() { - echo -} - -src_install() { - into /usr - dolib.so *.so* - preplib /usr -} - - - diff --git a/sys-libs/ncurses/files/digest-ncurses-5.2 b/sys-libs/ncurses/files/digest-ncurses-5.2 deleted file mode 100644 index c4e94d20cd91..000000000000 --- a/sys-libs/ncurses/files/digest-ncurses-5.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 464d6a49010cf2a6eb9ce59a264d4d47 ncurses-5.2.tar.gz diff --git a/sys-libs/ncurses/files/digest-ncurses-5.2-r1 b/sys-libs/ncurses/files/digest-ncurses-5.2-r1 deleted file mode 100644 index c4e94d20cd91..000000000000 --- a/sys-libs/ncurses/files/digest-ncurses-5.2-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 464d6a49010cf2a6eb9ce59a264d4d47 ncurses-5.2.tar.gz diff --git a/sys-libs/ncurses/files/digest-ncurses-5.2-r2 b/sys-libs/ncurses/files/digest-ncurses-5.2-r2 deleted file mode 100644 index c4e94d20cd91..000000000000 --- a/sys-libs/ncurses/files/digest-ncurses-5.2-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 464d6a49010cf2a6eb9ce59a264d4d47 ncurses-5.2.tar.gz diff --git a/sys-libs/ncurses/ncurses-5.2-r1.ebuild b/sys-libs/ncurses/ncurses-5.2-r1.ebuild deleted file mode 100644 index 1d3667ca14ae..000000000000 --- a/sys-libs/ncurses/ncurses-5.2-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.2-r1.ebuild,v 1.5 2001/02/03 20:10:31 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Linux console display libarary" -SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/ncurses/${A} - ftp://ftp.gnu.org/pub/gnu/ncurses/${A}" -HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html" -DEPEND="virtual/glibc" - -src_compile() { - try ./configure --prefix=/usr --libdir=/lib \ - --enable-symlinks --disable-termcap \ - --with-shared \ - --without-debug --with-rcs-ids \ - --host=${CHOST} - try make ${MAKEOPTS} -} - -src_install() { - dodir /usr/lib - try make DESTDIR=${D} install - cd ${D}/lib - ln -s libncurses.a libcurses.a - chmod 755 ${D}/lib/*.5.0.2 - cd ${S} - dodoc ANNOUNCE MANIFEST NEWS README* TO-DO - dodoc doc/*.doc - docinto html - dodoc doc/html/*.html - docinto html/ada - dodoc doc/html/ada/*.htm - docinto html/ada/files - dodoc doc/html/ada/files/*.htm - docinto html/ada/funcs - dodoc doc/html/ada/funcs/*.htm - docinto html/man - dodoc doc/html/man/*.html - - #with this fix, the default xterm has color as it should - cd ${D}/usr/share/terminfo/x - mv xterm xterm.orig - ln -s xterm-color xterm -} - - - diff --git a/sys-libs/ncurses/ncurses-5.2-r2.ebuild b/sys-libs/ncurses/ncurses-5.2-r2.ebuild deleted file mode 100644 index f07cad77a0ee..000000000000 --- a/sys-libs/ncurses/ncurses-5.2-r2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.2-r2.ebuild,v 1.1 2001/02/07 16:10:52 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Linux console display libarary" -SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/ncurses/${A} - ftp://ftp.gnu.org/pub/gnu/ncurses/${A}" -HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html" -DEPEND="virtual/glibc" - -src_compile() { - - try ./configure --prefix=/usr --libdir=/lib --mandir=/usr/share/man \ - --enable-symlinks --disable-termcap \ - --with-shared \ - --without-debug --with-rcs-ids \ - --host=${CHOST} - - try make ${MAKEOPTS} - -} - -src_install() { - - dodir /usr/lib - try make DESTDIR=${D} install - - cd ${D}/lib - ln -s libncurses.a libcurses.a - chmod 755 ${D}/lib/*.${PV} - dodir /usr/lib - mv libform* libmenu* libpanel* ../usr/lib - mv *.a ../usr/lib - - cd ${S} - - dodoc ANNOUNCE MANIFEST NEWS README* TO-DO - dodoc doc/*.doc - docinto html - dodoc doc/html/*.html - docinto html/ada - dodoc doc/html/ada/*.htm - docinto html/ada/files - dodoc doc/html/ada/files/*.htm - docinto html/ada/funcs - dodoc doc/html/ada/funcs/*.htm - docinto html/man - dodoc doc/html/man/*.html - - #with this fix, the default xterm has color as it should - cd ${D}/usr/share/terminfo/x - mv xterm xterm.orig - ln -s xterm-color xterm - -} - - - diff --git a/sys-libs/nss-db/files/digest-nss-db-2.2 b/sys-libs/nss-db/files/digest-nss-db-2.2 deleted file mode 100644 index 1b8f725c050d..000000000000 --- a/sys-libs/nss-db/files/digest-nss-db-2.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 c2565cbd4a941ba70e41391693c3252d nss_db-2.2.tar.gz diff --git a/sys-libs/nss-db/nss-db-2.2.ebuild b/sys-libs/nss-db/nss-db-2.2.ebuild deleted file mode 100644 index fdc9b4438302..000000000000 --- a/sys-libs/nss-db/nss-db-2.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/nss-db/nss-db-2.2.ebuild,v 1.3 2000/11/30 23:14:00 achim Exp $ - -A=nss_db-2.2.tar.gz -S=${WORKDIR}/nss_db-2.2 -DESCRIPTION="Allows important system files to be stored in a fast database file rather than plain text" -SRC_URI="ftp://ftp.gnu.org/gnu/glibc/${A}" -HOMEPAGE="http://www.gnu.org" -#now db needs to move to the base install, that's ok. -DEPEND=">=sys-libs/db-3.1.17 >=sys-libs/glibc-2.2-r2" - -src_compile() { - try ./configure --with-db=/usr/include/db3 --prefix=/usr --libdir=/usr/lib - try make ${MAKEOPTS} -} - -src_install () { - make DESTDIR=${D} install - rm -rf ${D}/usr/lib - cd ${D}/lib - ln -s libnss_db-2.2.so libnss_db.so - cd ${S} - dodoc AUTHORS COPYING* ChangeLog NEWS README THANKS -} - diff --git a/sys-libs/pam/files/digest-pam-0.72-r1 b/sys-libs/pam/files/digest-pam-0.72-r1 deleted file mode 100644 index 72a8102851cb..000000000000 --- a/sys-libs/pam/files/digest-pam-0.72-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 6389fdef0da51e459bf54ec93c6b7df4 Linux-PAM-0.72.tar.gz diff --git a/sys-libs/pam/files/digest-pam-0.73 b/sys-libs/pam/files/digest-pam-0.73 deleted file mode 100644 index ccd8aff91778..000000000000 --- a/sys-libs/pam/files/digest-pam-0.73 +++ /dev/null @@ -1 +0,0 @@ -MD5 f243620e29b7da69d5cf2f0794952992 Linux-PAM-0.73.tar.gz diff --git a/sys-libs/pam/files/digest-pam-0.73-r1 b/sys-libs/pam/files/digest-pam-0.73-r1 deleted file mode 100644 index ccd8aff91778..000000000000 --- a/sys-libs/pam/files/digest-pam-0.73-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 f243620e29b7da69d5cf2f0794952992 Linux-PAM-0.73.tar.gz diff --git a/sys-libs/pam/files/pam-0.73-pam_issue.diff b/sys-libs/pam/files/pam-0.73-pam_issue.diff deleted file mode 100644 index 03657bcad233..000000000000 --- a/sys-libs/pam/files/pam-0.73-pam_issue.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- modules/pam_issue/pam_issue.c~ Tue Jun 20 22:11:40 2000 -+++ modules/pam_issue/pam_issue.c Sun Feb 18 10:03:26 2001 -@@ -28,6 +28,7 @@ - #include <sys/utsname.h> - #include <utmp.h> - #include <malloc.h> -+#include <time.h> - - #include <security/_pam_macros.h> - diff --git a/sys-libs/pam/pam-0.72-r1.ebuild b/sys-libs/pam/pam-0.72-r1.ebuild deleted file mode 100644 index 8e0725663fce..000000000000 --- a/sys-libs/pam/pam-0.72-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.72-r1.ebuild,v 1.8 2000/12/24 09:55:16 achim Exp $ - -P=pam-0.72 -A=Linux-PAM-0.72.tar.gz -S=${WORKDIR}/Linux-PAM-0.72 -DESCRIPTION="PAM" -SRC_URI="http://openrock.net/pub/linux/libs/pam/pre/library/${A}" -HOMEPAGE="http://www.redhat.com/linux-info/pam/" - -DEPEND=">=sys-libs/cracklib-2.7 - >=sys-libs/pwdb-0.61" - -src_unpack() { - unpack ${A} - cd ${S} - touch .freezemake - rm default.defs - sed -e "s/CFLAGS=.*/CFLAGS=${CFLAGS} -pipe -D_REENTRANT/" \ - -e "s:LIBDIR=.*:LIBDIR=/lib:" \ - -e "s:FAKEROOT=.*:FAKEROOT=${D}:" defs/linux.defs > default.defs - echo "EXTRALS=-lcrypt" >> default.defs - cp Makefile Makefile.orig - sed -e "s/DIRS = modules libpam/DIRS = libpam modules/" Makefile.orig > Makefile - cd modules/pam_mkhomedir - cp Makefile Makefile.orig - sed -e "s:-lpam:-L../../libpam -lpam:" Makefile.orig > Makefile - -} -src_compile() { - try make ${MAKEOPTS} -} - -src_install() { - cd ${S} - touch conf/.ignore_age - try make install - dosbin bin/pam_conv1 - dodoc CHANGELOG Copyright README - docinto modules - dodoc modules/README - cd modules - for i in pam_* - do - if [ -f $i/README ] - then - docinto modules/$i - dodoc $i/README - fi - done - doman doc/man/*.[38] - cd ${D}/usr/lib - preplib /usr -} - - - diff --git a/sys-libs/pam/pam-0.73-r1.ebuild b/sys-libs/pam/pam-0.73-r1.ebuild deleted file mode 100644 index 6ccc517abafa..000000000000 --- a/sys-libs/pam/pam-0.73-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.73-r1.ebuild,v 1.3 2001/03/06 05:27:28 achim Exp $ - -P=pam-${PV} -A=Linux-PAM-${PV}.tar.gz -S=${WORKDIR}/Linux-PAM-${PV} -DESCRIPTION="PAM" -SRC_URI="http://www.kernel.org/pub/linux/libs/pam/pre/library/${A}" -HOMEPAGE="http://www.redhat.com/linux-info/pam/" - -DEPEND=">=sys-libs/cracklib-2.7-r2 - >=sys-libs/pwdb-0.61-r3 - berkdb? ( =sys-libs/db-1.85-r1 )" - -src_unpack() { - unpack ${A} - cd ${S} - patch -p0 < ${FILESDIR}/pam-0.73-pam_issue.diff -} - -src_compile() { - - try ./configure --prefix= --host=${CHOST} \ - --sbindir=/usr/sbin --mandir=/usr/share/man \ - --enable-fakeroot=${D} \ - --enable-read-both-confs - - - cp Makefile Makefile.orig - sed -e "s:libpam_misc doc examples:libpam_misc:" \ - Makefile.orig > Makefile - - cp Make.Rules Make.orig - sed -e "s:/usr/bin/install:/bin/install:" \ - -e "s:-Wpointer-arith::" \ - -e "s:^CFLAGS=:CFLAGS=${CFLAGS} :" Make.orig > Make.Rules - - if [ -z "`use berkdb`" ] - then - cp Make.Rules Make.orig - sed -e "s:^HAVE_LIBNDBM=yes:HAVE_LIBNDBM=no:" Make.orig > Make.Rules - fi - - try make - -} - -src_install() { - - try make install MANDIR=\"/usr/share/man\" - dodoc CHANGELOG Copyright README - docinto modules - dodoc modules/README - cd modules - for i in pam_* - do - if [ -f $i/README ] - then - docinto modules/$i - dodoc $i/README - fi - done - - dosym libpam.so.0.73 /lib/libpam.so - dosym libpamc.so.0.73 /lib/libpamc.so - dosym libpam_misc.so.0.73 /lib/libpam_misc.so - dosym libpam.so.0.73 /lib/libpam.so.0 - dosym libpamc.so.0.73 /lib/libpamc.so.0 - dosym libpam_misc.so.0.73 /lib/libpam_misc.so.0 - -} - - - diff --git a/sys-libs/pam/pam-0.73.ebuild b/sys-libs/pam/pam-0.73.ebuild deleted file mode 100644 index a000e69ea156..000000000000 --- a/sys-libs/pam/pam-0.73.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.73.ebuild,v 1.3 2001/01/31 20:49:07 achim Exp $ - -P=pam-${PV} -A=Linux-PAM-${PV}.tar.gz -S=${WORKDIR}/Linux-PAM-${PV} -DESCRIPTION="PAM" -SRC_URI="http://www.kernel.org/pub/linux/libs/pam/pre/library/${A}" -HOMEPAGE="http://www.redhat.com/linux-info/pam/" - -DEPEND=">=sys-libs/cracklib-2.7 - >=sys-libs/pwdb-0.61" - -src_unpack() { - unpack ${A} - cd ${S} -# touch .freezemake - cd modules/pam_userdb - cp pam_userdb.c pam_userdb.orig - sed -e "s:<ndbm\.h>:<db1/ndbm.h>:" pam_userdb.orig > pam_userdb.c - -} -src_compile() { - try ./configure --prefix= --host=${CHOST} \ - --sbindir=/usr/sbin \ - --enable-fakeroot=${D} \ - --enable-read-both-confs - # try make ${MAKEOPTS} - cp Makefile Makefile.orig - sed -e "s:libpam_misc doc examples:libpam_misc doc:" \ - Makefile.orig > Makefile - try make -} - -src_install() { - cd ${S} - try make install - dodoc CHANGELOG Copyright README - docinto modules - dodoc modules/README - cd modules - for i in pam_* - do - if [ -f $i/README ] - then - docinto modules/$i - dodoc $i/README - fi - done - doman doc/man/*.[38] - dosym libpam.so.0.73 /lib/libpam.so - dosym libpamc.so.0.73 /lib/libpamc.so - dosym libpam_misc.so.0.73 /lib/libpam_misc.so - dosym libpam.so.0.73 /lib/libpam.so.0 - dosym libpamc.so.0.73 /lib/libpamc.so.0 - dosym libpam_misc.so.0.73 /lib/libpam_misc.so.0 -} - - - diff --git a/sys-libs/pwdb/files/digest-pwdb-0.61-r2 b/sys-libs/pwdb/files/digest-pwdb-0.61-r2 deleted file mode 100644 index d50286493b8e..000000000000 --- a/sys-libs/pwdb/files/digest-pwdb-0.61-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 47e2dc0d5590390fe7a3937961575b09 pwdb-0.61.tar.gz diff --git a/sys-libs/pwdb/pwdb-0.61-r2.ebuild b/sys-libs/pwdb/pwdb-0.61-r2.ebuild deleted file mode 100644 index 9601ff1eb8f7..000000000000 --- a/sys-libs/pwdb/pwdb-0.61-r2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/pwdb/pwdb-0.61-r2.ebuild,v 1.3 2000/12/24 09:55:16 achim Exp $ - -P=pwdb-0.61 -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Password Database" -SRC_URI="ftp://gentoolinux.sourceforge.net/pub/gentoolinux/current/distfiles/${A}" - -DEPEND=">=sys-libs/glibc-2.1.3" - -RDEPEND=$DEPEND - -src_unpack () { - mkdir ${S} - cd ${S} - unpack ${A} -} -src_compile() { - cd ${S} - cp Makefile Makefile.orig - sed -e "s/^DIRS = .*/DIRS = libpwdb/" Makefile.orig > Makefile - try make ${MAKEOPTS} -} - -src_install() { - cd ${S} - into /usr - dodir /usr/include/pwdb - dodir /lib - dodoc CHANGES Copyright CREDITS README - docinto html - dodoc doc/html/* - docinto txt - dodoc doc/*.txt - insinto /etc - doins conf/pwdb.conf - try make INCLUDED=${D}/usr/include/pwdb LIBDIR=${D}/lib LDCONFIG="echo" install - preplib / - - cd ${O}/files - insinto /etc/pam.d - doins passwd -} - - - - diff --git a/sys-libs/readline/files/digest-readline-4.1-r1 b/sys-libs/readline/files/digest-readline-4.1-r1 deleted file mode 100644 index 95e8e8c725c5..000000000000 --- a/sys-libs/readline/files/digest-readline-4.1-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 d0c31936fb627237275fdfd991fe3873 readline-4.1.tar.gz diff --git a/sys-libs/readline/readline-4.1-r1.ebuild b/sys-libs/readline/readline-4.1-r1.ebuild deleted file mode 100644 index 479ae7ceb37f..000000000000 --- a/sys-libs/readline/readline-4.1-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.1-r1.ebuild,v 1.10 2001/01/31 20:49:07 achim Exp $ - -P=readline-4.1 -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Another cute console display library" -SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/readline/${A} - ftp://ftp.gnu.org/gnu/readline/${A}" - -DEPEND="virtual/glibc - >=sys-libs/ncurses-5.2" - -RDEPEND="virtual/glibc" - - -src_compile() { - try ./configure --host=${CHOST} --with-curses --prefix=/usr - try make ${MAKEOPTS} - cd shlib - try make ${MAKEOPTS} - -} - - -src_install() { - cd ${S} - try make prefix=${D}/usr install - cd shlib - try make prefix=${D}/usr install - cd .. - dodoc CHANGELOG CHANGES COPYING MANIFEST README USAGE - docinto ps - dodoc doc/*.ps - docinto html - dodoc doc/*.html - mv ${D}/usr/lib ${D} - dosym libhistory.so.4.1 /lib/libhistory.so - dosym libreadline.so.4.1 /lib/libreadline.so - # Needed because make install uses ${D} for the link - dosym libhistory.so.4.1 /lib/libhistory.so.4 - dosym libreadline.so.4.1 /lib/libreadline.so.4 - chmod 755 ${D}/lib/*.4.1 -} - - - - diff --git a/sys-libs/slang/files/digest-slang-1.4.2 b/sys-libs/slang/files/digest-slang-1.4.2 deleted file mode 100644 index ea751ba53026..000000000000 --- a/sys-libs/slang/files/digest-slang-1.4.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 81f769cb2ff1fb3dbe28bd58866e07c4 slang-1.4.2.tar.gz diff --git a/sys-libs/slang/files/digest-slang-1.4.2-r1 b/sys-libs/slang/files/digest-slang-1.4.2-r1 deleted file mode 100644 index ea751ba53026..000000000000 --- a/sys-libs/slang/files/digest-slang-1.4.2-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 81f769cb2ff1fb3dbe28bd58866e07c4 slang-1.4.2.tar.gz diff --git a/sys-libs/slang/files/digest-slang-1.4.3 b/sys-libs/slang/files/digest-slang-1.4.3 deleted file mode 100644 index b16140bb2c07..000000000000 --- a/sys-libs/slang/files/digest-slang-1.4.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 fc70e0eca4173e3e25452123966c94de slang-1.4.3.tar.gz diff --git a/sys-libs/slang/files/digest-slang-1.4.4 b/sys-libs/slang/files/digest-slang-1.4.4 deleted file mode 100644 index a4b735e7b0cc..000000000000 --- a/sys-libs/slang/files/digest-slang-1.4.4 +++ /dev/null @@ -1 +0,0 @@ -MD5 111f8d2b8d7bc9bbb4d0593538553618 slang-1.4.4.tar.gz diff --git a/sys-libs/slang/slang-1.4.2.ebuild b/sys-libs/slang/slang-1.4.2.ebuild deleted file mode 100644 index f69fbef6968b..000000000000 --- a/sys-libs/slang/slang-1.4.2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-1.4.2.ebuild,v 1.6 2001/01/31 20:49:07 achim Exp $ - -P=slang-1.4.2 -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Console display library used by most text viewer" -SRC_URI="ftp://space.mit.edu/pub/davis/slang/v1.4/${A}" - -DEPEND="virtual/glibc" - -src_compile() { - try ./configure --host=${CHOST} --prefix=/usr - try make ${MAKEOPTS} prefix=${D}/usr elf -} - -src_unpack() { - unpack ${A} - cd ${S} - cp configure configure.orig - sed -e "s/ELF_CFLAGS=\"-O2/ELF_CFLAGS=\"${CFLAGS}/" configure.orig > configure -} - -src_install() { - try make ${MAKEOPTS} prefix=${D}/usr install-elf - mv ${D}/usr/lib ${D} - preplib /usr - rm -rf ${D}/usr/doc/slang - dodoc COPYING* NEWS README *.txt - dodoc doc/*.txt doc/internal/*.txt doc/text/*.txt - docinto html - dodoc doc/*.html -} - - - diff --git a/sys-libs/slang/slang-1.4.3.ebuild b/sys-libs/slang/slang-1.4.3.ebuild deleted file mode 100644 index a80aa966792b..000000000000 --- a/sys-libs/slang/slang-1.4.3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-1.4.3.ebuild,v 1.2 2001/02/07 19:35:06 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Console display library used by most text viewer" -SRC_URI="ftp://space.mit.edu/pub/davis/slang/v1.4/${A}" - -DEPEND=">=sys-libs/ncurses-5.2-r2" - -src_unpack() { - - unpack ${A} - cd ${S} - cp configure configure.orig - sed -e "s/ELF_CFLAGS=\"-O2/ELF_CFLAGS=\"${CFLAGS}/" configure.orig > configure -} - - -src_compile() { - - try ./configure --host=${CHOST} --prefix=/usr - try make ${MAKEOPTS} prefix=${D}/usr all elf - #cp src/objs/libslang.a . - #try make ${MAKEOPTS} prefix=${D}/usr clean elf -} - -src_install() { - - dolib.a src/objs/libslang.a - dolib.so src/elfobjs/libslang.so.${PV} - dosym linslang.so.${PV} /usr/lib/libslang.so - - insinto /usr/include - doins src/{slang.h,slcurses.h} - dodoc COPYING* NEWS README *.txt - dodoc doc/*.txt doc/internal/*.txt doc/text/*.txt - docinto html - dodoc doc/*.html -} - - - diff --git a/sys-libs/slang/slang-1.4.4.ebuild b/sys-libs/slang/slang-1.4.4.ebuild deleted file mode 100644 index d46be12731ce..000000000000 --- a/sys-libs/slang/slang-1.4.4.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/slang/slang-1.4.4.ebuild,v 1.1 2001/03/09 10:26:59 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Console display library used by most text viewer" -SRC_URI="ftp://space.mit.edu/pub/davis/slang/v1.4/${A}" - -DEPEND=">=sys-libs/ncurses-5.2-r2" - -src_unpack() { - - unpack ${A} - cd ${S} - cp configure configure.orig - sed -e "s/ELF_CFLAGS=\"-O2/ELF_CFLAGS=\"${CFLAGS}/" configure.orig > configure -} - - -src_compile() { - - try ./configure --host=${CHOST} --prefix=/usr - try make ${MAKEOPTS} prefix=${D}/usr all elf - #cp src/objs/libslang.a . - #try make ${MAKEOPTS} prefix=${D}/usr clean elf -} - -src_install() { - - dolib.a src/objs/libslang.a - dolib.so src/elfobjs/libslang.so.${PV} - dosym linslang.so.${PV} /usr/lib/libslang.so - - insinto /usr/include - doins src/{slang.h,slcurses.h} - dodoc COPYING* NEWS README *.txt - dodoc doc/*.txt doc/internal/*.txt doc/text/*.txt - docinto html - dodoc doc/*.html -} - - - diff --git a/sys-libs/zlib/files/digest-zlib-1.1.3-r1 b/sys-libs/zlib/files/digest-zlib-1.1.3-r1 deleted file mode 100644 index 89e1c40016b6..000000000000 --- a/sys-libs/zlib/files/digest-zlib-1.1.3-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 ada18615d2a66dee4d6f5ff916ecd4c6 zlib-1.1.3.tar.gz diff --git a/sys-libs/zlib/zlib-1.1.3-r1.ebuild b/sys-libs/zlib/zlib-1.1.3-r1.ebuild deleted file mode 100644 index e1fe6d5b95d3..000000000000 --- a/sys-libs/zlib/zlib-1.1.3-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.1.3-r1.ebuild,v 1.7 2001/01/31 20:49:07 achim Exp $ - -P=zlib-1.1.3 -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Standard (de)compression library" -SRC_URI="ftp://ftp.freesoftware.com/pub/infozip/zlib/${A}" - -DEPEND="virtual/glibc" -RDEPEND=$DEPEND - -src_compile() { - cd ${S} - try ./configure --shared --prefix=/usr - try make ${MAKEOPTS} - try make test - try ./configure --prefix=/usr - try make ${MAKEOPTS} -} - -src_install() { - into /usr - dodir /usr/include - insinto /usr/include - doins zconf.h zlib.h - dolib libz.so.1.1.3 - dolib libz.a - dosym libz.so.1.1.3 /usr/lib/libz.so - dosym libz.so.1.1.3 /usr/lib/libz.so.1 - dodoc FAQ README algorithm.txt ChangeLog -} - diff --git a/x11-base/xfree/files/4.0.1/site.def b/x11-base/xfree/files/4.0.1/site.def deleted file mode 100644 index c516e927e29e..000000000000 --- a/x11-base/xfree/files/4.0.1/site.def +++ /dev/null @@ -1,7 +0,0 @@ -#define HasZlib YES -#define HasGcc2 YES -#define HasGcc2ForCplusplus YES -#define ForceNormalLib YES -#define BuildXinerama YES -#define SharedLibXau YES - diff --git a/x11-base/xfree/files/4.0.2/XftConfig b/x11-base/xfree/files/4.0.2/XftConfig deleted file mode 100644 index 16af856f7c29..000000000000 --- a/x11-base/xfree/files/4.0.2/XftConfig +++ /dev/null @@ -1,71 +0,0 @@ -# -# 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.0.2/glibc-2.2.2-ClockP.diff b/x11-base/xfree/files/4.0.2/glibc-2.2.2-ClockP.diff deleted file mode 100644 index 34f6f048a589..000000000000 --- a/x11-base/xfree/files/4.0.2/glibc-2.2.2-ClockP.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- xc/programs/xclock/ClockP.h~ Tue Nov 7 00:05:41 2000 -+++ xc/programs/xclock/ClockP.h Tue Feb 20 00:58:10 2001 -@@ -52,6 +52,7 @@ - - #include <X11/Xos.h> /* Needed for struct tm. */ - #include "Clock.h" -+#include <time.h> - #include <X11/Xaw/SimpleP.h> - - #define SEG_BUFF_SIZE 128 diff --git a/x11-base/xfree/files/4.0.2/site.def b/x11-base/xfree/files/4.0.2/site.def deleted file mode 100644 index 613bf0b389c1..000000000000 --- a/x11-base/xfree/files/4.0.2/site.def +++ /dev/null @@ -1,9 +0,0 @@ -#define HasZlib YES -#define HasGcc2ForCplusplus YES -#define GccWarningOptions -Wall -#define ForceNormalLib YES -#define BuildXinerama YES -#define SharedLibXau YES -#define Freetype2Dir /usr -#define MANPATH /usr/X11R6/share/man - diff --git a/x11-base/xfree/files/4.0.2/xfree-4.0.2-r3.diff b/x11-base/xfree/files/4.0.2/xfree-4.0.2-r3.diff deleted file mode 100644 index f29cc59936d4..000000000000 --- a/x11-base/xfree/files/4.0.2/xfree-4.0.2-r3.diff +++ /dev/null @@ -1,3881 +0,0 @@ -Index: config/cf/FreeBSD.cf -=================================================================== -RCS file: /cvs/xc/config/cf/FreeBSD.cf,v -retrieving revision 3.101 -retrieving revision 3.101.2.1 -diff -U3 -r3.101 -r3.101.2.1 ---- config/cf/FreeBSD.cf 2000/12/04 18:49:09 3.101 -+++ config/cf/FreeBSD.cf 2001/01/22 19:49:12 3.101.2.1 -@@ -2,7 +2,7 @@ - XCOMM - XCOMM - XCOMM --XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.101 2000/12/04 18:49:09 dawes Exp $ -+XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.101.2.1 2001/01/22 19:49:12 dawes Exp $ - - #ifndef UseElfFormat - #define UseElfFormat DefaultToElfFormat -@@ -59,6 +59,12 @@ - #define HasNCurses YES - #define HasVarRun YES - #define HasVarDb YES -+ -+#if (OSMajorVersion > 1) -+#define InstallXloadSetGID NO -+#else -+#define InstallXloadSetGID YES -+#endif - - #define AvoidNullMakeCommand YES - #define StripInstalledPrograms YES -Index: config/cf/Imake.rules -=================================================================== -RCS file: /cvs/xc/config/cf/Imake.rules,v -retrieving revision 3.86 -retrieving revision 3.86.2.1 -diff -U3 -r3.86 -r3.86.2.1 ---- config/cf/Imake.rules 2000/12/12 17:05:30 3.86 -+++ config/cf/Imake.rules 2001/01/27 20:08:17 3.86.2.1 -@@ -5,7 +5,7 @@ - XCOMM - XCOMM - XCOMM --XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.86 2000/12/12 17:05:30 dawes Exp $ -+XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.86.2.1 2001/01/27 20:08:17 herrb Exp $ - - /* - * MACHINE-INDEPENDENT RULES; DO NOT MODIFY -@@ -1217,7 +1217,7 @@ - InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\ - @@\ - install.man:: @@\ -- @(TMP=/tmp/tmp.$$$$; \ @@\ -+ @(TMP=#tmp.$$$$; \ @@\ - RemoveFile($${TMP}); \ @@\ - echo .so `basename destdir`/file.$(MANSUFFIX) > $${TMP}; \ @@\ - for i in aliases; do (set -x; \ @@\ -@@ -1258,7 +1258,7 @@ - InstallHtmlManPageAliases(file,aliases,suffix) @@\ - @@\ - install.man:: @@\ -- @(TMP=/tmp/tmp.$$$$; \ @@\ -+ @(TMP=#tmp.$$$$; \ @@\ - RemoveFile($${TMP}); \ @@\ - echo .so `basename destdir`/file.suffix > $${TMP}; \ @@\ - for i in aliases; do (set -x; \ @@\ -Index: config/cf/NetBSD.cf -=================================================================== -RCS file: /cvs/xc/config/cf/NetBSD.cf,v -retrieving revision 3.87 -retrieving revision 3.87.2.2 -diff -U3 -r3.87 -r3.87.2.2 ---- config/cf/NetBSD.cf 2000/12/03 16:14:08 3.87 -+++ config/cf/NetBSD.cf 2001/02/11 21:51:42 3.87.2.2 -@@ -2,7 +2,7 @@ - - - --XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.87 2000/12/03 16:14:08 herrb Exp $ -+XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.87.2.2 2001/02/11 21:51:42 herrb Exp $ - - - #ifndef OSName -@@ -67,10 +67,19 @@ - (OSMajorVersion == 1 && OSMinorVersion < 2))) - #define HasMkstemp YES - #endif -+/* But the standalone mktemp doesn't exist before NetBSD 1.5*/ -+#if (OSMajorVersion == 0 || (OSMajorVersion == 1 && OSMinorVersion <= 4)) -+# define HasMktemp NO -+#else -+# define HasMktemp YES -+#endif -+ - #define HasUsableFileMmap YES - - #define HasVarRun YES - #define HasVarDb YES -+ -+#define InstallXloadSetGID NO - - /* Defines for using the GNU pth thread library -- experimental */ - -Index: config/cf/OpenBSD.cf -=================================================================== -RCS file: /cvs/xc/config/cf/OpenBSD.cf,v -retrieving revision 3.44 -retrieving revision 3.44.2.2 -diff -U3 -r3.44 -r3.44.2.2 ---- config/cf/OpenBSD.cf 2000/12/02 20:15:03 3.44 -+++ config/cf/OpenBSD.cf 2001/02/11 18:03:47 3.44.2.2 -@@ -1,4 +1,4 @@ --XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.44 2000/12/02 20:15:03 herrb Exp $ -+XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.44.2.2 2001/02/11 18:03:47 herrb Exp $ - XCOMM - - #ifndef OSName -@@ -72,6 +72,8 @@ - #define HasVarRun YES - #define HasVarDb YES - -+#define InstallXloadSetGID NO -+ - #ifndef HasLibPthread - #define HasLibPthread NO - #endif -@@ -147,7 +149,7 @@ - # define LdPostLib /**/ - # define ServerExtraDefines GccGasOption XFree86ServerDefines - # ifndef XFree86ConsoleDefines --# define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT -+# define XFree86ConsoleDefines -DPCCONS_SUPPORT -DWSCONS_SUPPORT -DPCVT_SUPPORT - # endif - #endif - -@@ -424,8 +426,10 @@ - # endif - - /* Support for USB Mices */ --# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 6) --# define UsbMouseSupport YES -+# ifndef UsbMouseSupport -+# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 6) -+# define UsbMouseSupport YES -+# endif - # endif - - /* -Index: config/cf/X11.tmpl -=================================================================== -RCS file: /cvs/xc/config/cf/X11.tmpl,v -retrieving revision 1.93 -retrieving revision 1.93.2.1 -diff -U3 -r1.93 -r1.93.2.1 ---- config/cf/X11.tmpl 2000/12/15 18:18:04 1.93 -+++ config/cf/X11.tmpl 2001/01/22 19:49:17 1.93.2.1 -@@ -5,7 +5,7 @@ - XCOMM - XCOMM - XCOMM --XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.93 2000/12/15 18:18:04 keithp Exp $ -+XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.93.2.1 2001/01/22 19:49:17 dawes Exp $ - - /*************************************************************************** - * * -@@ -339,6 +339,9 @@ - #ifndef InstallXtermSetUID - #define InstallXtermSetUID YES /* xterm needs to be set uid */ - #endif -+#ifndef InstallXloadSetGID -+#define InstallXloadSetGID YES /* xload often needs set gid kmem */ -+#endif - #ifndef InstallXinitConfig - #define InstallXinitConfig NO /* install sample xinit config */ - #endif -@@ -358,6 +361,12 @@ - #ifndef InstallAppDefFiles - #define InstallAppDefFiles YES /* install application defaults */ - #endif -+#ifndef UseConfDirForAppDefaults -+#define UseConfDirForAppDefaults YES -+#endif -+#ifndef UseConfDirForXkb -+#define UseConfDirForXkb YES -+#endif - #ifndef CompressAllFonts - #define CompressAllFonts NO - #endif -@@ -2347,6 +2356,7 @@ - * if the InstallAppDefFiles configuration parameter is set. - */ - #ifndef InstallAppDefaultsLong -+#if UseConfDirForAppDefaults - #if InstallAppDefFiles - #define InstallAppDefaultsLong(file,class) @@\ - LinkConfDirectory(app-defaults,.,app-defaults,.) @@\ -@@ -2356,6 +2366,15 @@ - LinkConfDirectory(app-defaults,.,app-defaults,.) @@\ - InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) - #endif /* InstallAppDefFiles */ -+#else /* UseConfDirForAppDefaults */ -+#if InstallAppDefFiles -+#define InstallAppDefaultsLong(file,class) @@\ -+InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) -+#else -+#define InstallAppDefaultsLong(file,class) @@\ -+InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) -+#endif /* InstallAppDefFiles */ -+#endif /* UseConfDirForAppDefaults */ - #endif /* InstallAppDefaultsLong */ - - /* -Index: config/cf/linux.cf -=================================================================== -RCS file: /cvs/xc/config/cf/linux.cf,v -retrieving revision 3.157 -retrieving revision 3.157.2.1 -diff -U3 -r3.157 -r3.157.2.1 ---- config/cf/linux.cf 2000/12/14 17:00:46 3.157 -+++ config/cf/linux.cf 2001/01/22 19:49:19 3.157.2.1 -@@ -4,7 +4,7 @@ - - - --XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.157 2000/12/14 17:00:46 dawes Exp $ -+XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.157.2.1 2001/01/22 19:49:19 dawes Exp $ - - #ifndef LinuxElfDefault - # define LinuxElfDefault YES -@@ -215,6 +215,10 @@ - # ifndef HasLibCrypt - # define HasLibCrypt NO - # endif -+#endif -+ -+#ifndef InstallXloadSetGID -+#define InstallXloadSetGID NO - #endif - - /* <linux/input.h> support mainly for USB support */ -Index: config/cf/osf1.cf -=================================================================== -RCS file: /cvs/xc/config/cf/osf1.cf,v -retrieving revision 3.6 -retrieving revision 3.6.8.1 -diff -U3 -r3.6 -r3.6.8.1 ---- config/cf/osf1.cf 1997/06/11 12:24:18 3.6 -+++ config/cf/osf1.cf 2001/01/22 19:49:23 3.6.8.1 -@@ -35,6 +35,9 @@ - #define ShLibDir /usr/shlib - #define SharedLibPex NO /* losing, no shared -lm */ - #endif -+ -+#define InstallXloadSetGID NO -+ - #define ThreadedX ModernOSF1 - - #if ThreadedX -Index: config/cf/xf86site.def -=================================================================== -RCS file: /cvs/xc/config/cf/xf86site.def,v -retrieving revision 3.170 -retrieving revision 3.170.2.1 -diff -U3 -r3.170 -r3.170.2.1 ---- config/cf/xf86site.def 2000/12/14 16:38:45 3.170 -+++ config/cf/xf86site.def 2001/02/11 21:51:44 3.170.2.1 -@@ -1,4 +1,4 @@ --XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.170 2000/12/14 16:38:45 dawes Exp $ -+XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.170.2.1 2001/02/11 21:51:44 herrb Exp $ - /******************************************************************************/ - /* - * This file is to provide a quick method for most people to change the -@@ -748,4 +748,9 @@ - #define X86EMU_LIBPATH /usr/local/lib - */ - -- -+/* -+ * By default, gccmakedep uses mktemp for security reasons. -+ * Uncomment this, if your system lacks mktemp. -+ * -+#define HasMktemp NO -+ */ -Index: config/cf/xfree86.cf -=================================================================== -RCS file: /cvs/xc/config/cf/xfree86.cf,v -retrieving revision 3.338 -retrieving revision 3.338.2.1 -diff -U3 -r3.338 -r3.338.2.1 ---- config/cf/xfree86.cf 2000/12/14 16:59:06 3.338 -+++ config/cf/xfree86.cf 2001/02/11 21:51:43 3.338.2.1 -@@ -1,4 +1,4 @@ --XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.338 2000/12/14 16:59:06 dawes Exp $ -+XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.338.2.1 2001/02/11 21:51:43 herrb Exp $ - /* - * This configuration file contains all of the configuration - * information for the XFree86 based X Servers. -@@ -1287,6 +1287,10 @@ - # ifndef Has3DNowSupport - # define Has3DNowSupport NO - # endif -+#endif -+ -+#ifndef HasMktemp -+#define HasMktemp YES - #endif - - #include <xf86.rules> -Index: config/util/Imakefile -=================================================================== -RCS file: /cvs/xc/config/util/Imakefile,v -retrieving revision 3.29 -retrieving revision 3.29.2.1 -diff -U3 -r3.29 -r3.29.2.1 ---- config/util/Imakefile 2000/12/06 15:35:01 3.29 -+++ config/util/Imakefile 2001/02/11 21:51:46 3.29.2.1 -@@ -1,5 +1,5 @@ - XCOMM $XConsortium: Imakefile /main/16 1996/11/13 14:43:28 lehors $ --XCOMM $XFree86: xc/config/util/Imakefile,v 3.29 2000/12/06 15:35:01 eich Exp $ -+XCOMM $XFree86: xc/config/util/Imakefile,v 3.29.2.1 2001/02/11 21:51:46 herrb Exp $ - - #if UseCCMakeDepend - MDEP_PROG = makedepend -@@ -18,6 +18,10 @@ - LNDIR_PROG = ProgramTargetName(lndir) - #endif - -+#if HasMktemp -+MKTEMPDEFINE = -DHAS_MKTEMP -+#endif -+ - #if BuildRman - RMAN_PROG = ProgramTargetName(rman) - #endif -@@ -64,10 +68,10 @@ - #endif - - CppScriptTarget(xmkmf,xmkmf.cpp,-DCONFIGDIRSPEC='"'"-I$(CONFIGDIR)"'"',$(ICONFIGFILES)) --CppScriptTarget(makedepend,mdepend.cpp,-DPREPROC='"'"$(PREPROCESSCMD_MKDEPEND)"'"',$(ICONFIGFILES)) -+CppScriptTarget(makedepend,mdepend.cpp,$(MKTEMPDEFINE) -DPREPROC='"'"$(PREPROCESSCMD_MKDEPEND)"'"',$(ICONFIGFILES)) - CppScriptTarget(mergelib,mergelib.cpp,"-DARCMD=$(AR)" "-DRANLIB=$(RANLIB)",$(ICONFIGFILES)) - #ifndef OS2Architecture --CppScriptTarget(gccmakedep,gccmdep.cpp,-DCCCMD='"'"$(GCCCMD)"'"' -DRMCMD='"'"$(RM)"'"' -DLNCMD='"'"$(LN)"'"' -DMVCMD='"'"$(MV)"'"',$(ICONFIGFILES)) -+CppScriptTarget(gccmakedep,gccmdep.cpp,$(MKTEMPDEFINE) -DCCCMD='"'"$(GCCCMD)"'"' -DRMCMD='"'"$(RM)"'"' -DLNCMD='"'"$(LN)"'"' -DMVCMD='"'"$(MV)"'"',$(ICONFIGFILES)) - #endif - - #ifndef OpenBSDArchitecture -Index: config/util/gccmdep.cpp -=================================================================== -RCS file: /cvs/xc/config/util/gccmdep.cpp,v -retrieving revision 3.5 -retrieving revision 3.5.2.1 -diff -U3 -r3.5 -r3.5.2.1 ---- config/util/gccmdep.cpp 2000/11/14 21:59:21 3.5 -+++ config/util/gccmdep.cpp 2001/01/27 20:07:33 3.5.2.1 -@@ -3,7 +3,7 @@ - XCOMM - XCOMM makedepend which uses 'gcc -M' - XCOMM --XCOMM $XFree86: xc/config/util/gccmdep.cpp,v 3.5 2000/11/14 21:59:21 dawes Exp $ -+XCOMM $XFree86: xc/config/util/gccmdep.cpp,v 3.5.2.1 2001/01/27 20:07:33 herrb Exp $ - XCOMM - XCOMM Based on mdepend.cpp and code supplied by Hongjiu Lu <hjl@nynexst.com> - XCOMM -@@ -14,6 +14,18 @@ - LN=LNCMD - MV=MVCMD - -+XCOMM Security: if $tmp exists exit immediately -+rm -f ${TMP} -+if [ -e ${TMP} ] ; then -+ echo "$0: ${TMP} exists already, exit." 1>&2 -+ exit 1; -+fi -+#if defined(HAS_MKTEMP) -+if [ -n "`type -p mktemp`" ] ; then -+ TMP="`mktemp ${TMP}.XXXXXX`" || exit 1 -+fi -+#endif -+ - trap "$RM ${TMP}*; exit 1" 1 2 15 - trap "$RM ${TMP}*; exit 0" 1 2 13 - -@@ -33,7 +45,7 @@ - -D*|-I*) - args="$args '$1'" - ;; -- -g|-O*) -+ -g|-O) - ;; - *) - if [ "$endmarker"x = x ]; then -Index: config/util/mdepend.cpp -=================================================================== -RCS file: /cvs/xc/config/util/mdepend.cpp,v -retrieving revision 3.3 -retrieving revision 3.3.2.1 -diff -U3 -r3.3 -r3.3.2.1 ---- config/util/mdepend.cpp 2000/08/08 03:16:26 3.3 -+++ config/util/mdepend.cpp 2001/02/11 21:51:47 3.3.2.1 -@@ -22,7 +22,7 @@ - XCOMM USG users will probably have to change "silent" to "-s" instead of - XCOMM "-" (at least, that is what the documentation implies). - XCOMM --XCOMM $XFree86: xc/config/util/mdepend.cpp,v 3.3 2000/08/08 03:16:26 dawes Exp $ -+XCOMM $XFree86: xc/config/util/mdepend.cpp,v 3.3.2.1 2001/02/11 21:51:47 herrb Exp $ - XCOMM - - CC=PREPROC -@@ -35,6 +35,18 @@ - TMPMAKEFILE=${TMP}c - MAGICLINE=${TMP}d - ARGS=${TMP}e -+ -+XCOMM Security: if $tmp exists exit immediately -+rm -f ${TMP} -+if [ -e ${TMP} ] ; then -+ echo "$0: ${TMP} exists already, exit." 1>&2 -+ exit 1; -+fi -+#if defined(HAS_MKTEMP) -+if [ -n "`type -p mktemp`" ] ; then -+ TMP="`mktemp ${TMP}.XXXXXX`" || exit 1 -+fi -+#endif - - trap "rm -f ${TMP}*; exit 1" 1 2 15 - trap "rm -f ${TMP}*; exit 0" 1 2 13 -Index: extras/rman/rman.c -=================================================================== -RCS file: /cvs/xc/extras/rman/rman.c,v -retrieving revision 1.12 -retrieving revision 1.12.2.1 -diff -U3 -r1.12 -r1.12.2.1 ---- extras/rman/rman.c 2000/12/01 18:48:08 1.12 -+++ extras/rman/rman.c 2000/12/21 19:01:07 1.12.2.1 -@@ -16,7 +16,7 @@ - source interpretation added September 24, 1996 - renamed PolyglotMan due to lawsuit by Rosetta, Inc. August 8, 1997 - */ --/* $XFree86: xc/extras/rman/rman.c,v 1.12 2000/12/01 18:48:08 dawes Exp $ */ -+/* $XFree86: xc/extras/rman/rman.c,v 1.12.2.1 2000/12/21 19:01:07 dawes Exp $ */ - - - /* TO DO **** -@@ -474,12 +474,14 @@ - { - char *p0; - static char *nonhref = "\">'"; -+ static char *punct = ".,:;)]}?!"; - - while (*p==' ') p++; - if (strincmp(p,"http",4)==0) { - href="%s"; manrefname = p; - p+=4; - while (*p && !isspace(*p) && !strchr(nonhref,*p)) p++; -+ while (strchr(punct, *(p - 1))) p--; - } else { - href = manRef; - -Index: lib/Xaw/AsciiSrc.c -=================================================================== -RCS file: /cvs/xc/lib/Xaw/AsciiSrc.c,v -retrieving revision 1.25 -retrieving revision 1.25.2.1 -diff -U3 -r1.25 -r1.25.2.1 ---- lib/Xaw/AsciiSrc.c 2000/11/28 17:25:09 1.25 -+++ lib/Xaw/AsciiSrc.c 2001/01/27 20:06:11 1.25.2.1 -@@ -22,7 +22,7 @@ - - */ - --/* $XFree86: xc/lib/Xaw/AsciiSrc.c,v 1.25 2000/11/28 17:25:09 dawes Exp $ */ -+/* $XFree86: xc/lib/Xaw/AsciiSrc.c,v 1.25.2.1 2001/01/27 20:06:11 herrb Exp $ */ - - /* - * AsciiSrc.c - AsciiSrc object. (For use with the text widget). -@@ -1456,7 +1456,7 @@ - open_mode = O_WRONLY | O_CREAT | O_EXCL; - fdopen_mode = "w"; - } -- else -+ else { - /* O_NOFOLLOW is a FreeBSD & Linux extension */ - #ifdef O_NOFOLLOW - open_mode = O_RDWR | O_NOFOLLOW; -@@ -1464,6 +1464,7 @@ - open_mode = O_RDWR; /* unsafe; subject to race conditions */ - #endif /* O_NOFOLLOW */ - fdopen_mode = "r+"; -+ } - break; - default: - XtErrorMsg("badMode", "asciiSourceCreate", "XawError", -Index: lib/Xaw/Form.c -=================================================================== -RCS file: /cvs/xc/lib/Xaw/Form.c,v -retrieving revision 1.18 -retrieving revision 1.18.2.1 -diff -U3 -r1.18 -r1.18.2.1 ---- lib/Xaw/Form.c 2000/10/26 17:57:49 1.18 -+++ lib/Xaw/Form.c 2001/02/09 20:45:08 1.18.2.1 -@@ -1,4 +1,4 @@ --/* $TOG: Form.c /main/54 1998/05/14 14:55:45 kaleb $ */ -+/* $Xorg: Form.c,v 1.3 2000/08/17 19:45:32 cpqbld Exp $ */ - - /*********************************************************** - -@@ -43,7 +43,7 @@ - - ******************************************************************/ - --/* $XFree86: xc/lib/Xaw/Form.c,v 1.18 2000/10/26 17:57:49 dawes Exp $ */ -+/* $XFree86: xc/lib/Xaw/Form.c,v 1.18.2.1 2001/02/09 20:45:08 paulo Exp $ */ - - #include <X11/IntrinsicP.h> - #include <X11/StringDefs.h> -@@ -582,6 +582,11 @@ - always_resize_children = - ChangeFormGeometry((Widget)fw, False, maxx, maxy, NULL, NULL); - -+#ifdef OLDXAW -+ fw->form.old_width = fw->core.width; -+ fw->form.old_height = fw->core.height; -+#endif -+ - if (force_relayout) - ret_val = True; - else -@@ -656,7 +661,6 @@ - static void - LayoutChild(Widget w) - { -- FormWidget fw = (FormWidget)XtParent(w); - FormConstraints form = (FormConstraints)w->core.constraints; - Widget ref; - -@@ -684,22 +688,16 @@ - form->form.new_y = form->form.dy; - if ((ref = form->form.horiz_base) != NULL) { - FormConstraints ref_form = (FormConstraints)ref->core.constraints; -- Dimension width; - - LayoutChild(ref); -- width = fw->form.old_width ? -- ref_form->form.virtual_width : XtWidth(ref); -- form->form.new_x += ref_form->form.new_x + width + -+ form->form.new_x += ref_form->form.new_x + XtWidth(ref) + - (XtBorderWidth(ref) << 1); - } - if ((ref = form->form.vert_base) != NULL) { - FormConstraints ref_form = (FormConstraints)ref->core.constraints; -- Dimension height; - - LayoutChild(ref); -- height = fw->form.old_height ? -- ref_form->form.virtual_height : XtHeight(ref); -- form->form.new_y += ref_form->form.new_y + height + -+ form->form.new_y += ref_form->form.new_y + XtHeight(ref) + - (XtBorderWidth(ref) << 1); - } - -@@ -891,8 +889,6 @@ - * The window will be updated when no_refigure is set back - * to False - */ -- form->form.virtual_width = XtWidth(w); -- form->form.virtual_height = XtHeight(w); - form->form.deferred_resize = True; - ret_val = XtGeometryDone; - } -@@ -902,6 +898,8 @@ - /* - * Resets everything. - */ -+ fw->form.old_width = XtWidth(fw); -+ fw->form.old_height = XtHeight(fw); - for (childP = children; childP - children < num_children; childP++) { - Widget nw = *childP; - -@@ -916,8 +914,6 @@ - nform->form.virtual_height = XtHeight(nw); - } - } -- fw->form.old_width = XtWidth(fw); -- fw->form.old_height = XtHeight(fw); - } - else { - XtWidth(w) = old_width; -@@ -1022,23 +1018,21 @@ - (*((FormWidgetClass)w->core.widget_class)->form_class.layout) - (fw, XtWidth(w), XtHeight(w), True); - -- if (!fw->form.old_width || !fw->form.old_height) { -- fw->form.old_width = XtWidth(w); -- fw->form.old_height = XtHeight(w); -- for (children = childP = fw->composite.children; -- childP - children < num_children; -- childP++) { -- child = *childP; -- if (!XtIsManaged(child)) -- continue; -- form = (FormConstraints)child->core.constraints; -+ fw->form.old_width = XtWidth(w); -+ fw->form.old_height = XtHeight(w); -+ for (children = childP = fw->composite.children; -+ childP - children < num_children; -+ childP++) { -+ child = *childP; -+ if (!XtIsManaged(child)) -+ continue; -+ form = (FormConstraints)child->core.constraints; - #ifndef OLDXAW -- form->form.virtual_x = XtX(child); -- form->form.virtual_y = XtY(child); -+ form->form.virtual_x = XtX(child); -+ form->form.virtual_y = XtY(child); - #endif -- form->form.virtual_width = XtWidth(child); -- form->form.virtual_height = XtHeight(child); -- } -+ form->form.virtual_width = XtWidth(child); -+ form->form.virtual_height = XtHeight(child); - } - } - -Index: lib/Xaw/MultiSrc.c -=================================================================== -RCS file: /cvs/xc/lib/Xaw/MultiSrc.c,v -retrieving revision 1.19 -retrieving revision 1.19.2.1 -diff -U3 -r1.19 -r1.19.2.1 ---- lib/Xaw/MultiSrc.c 1999/07/19 13:36:02 1.19 -+++ lib/Xaw/MultiSrc.c 2001/01/27 20:06:56 1.19.2.1 -@@ -27,7 +27,7 @@ - * - * Much code taken from X11R3 String and Disk Sources. - */ --/* $XFree86: xc/lib/Xaw/MultiSrc.c,v 1.19 1999/07/19 13:36:02 dawes Exp $ */ -+/* $XFree86: xc/lib/Xaw/MultiSrc.c,v 1.19.2.1 2001/01/27 20:06:56 herrb Exp $ */ - - /* - -@@ -67,6 +67,10 @@ - #include "XawI18n.h" - #include "Private.h" - -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <fcntl.h> -+ - #define MAGIC_VALUE ((XawTextPosition)-1) - #define streq(a, b) (strcmp((a), (b)) == 0) - -@@ -1158,7 +1162,9 @@ - static FILE * - InitStringOrFile(MultiSrcObject src, Bool newString) - { -- char *open_mode = NULL; -+ mode_t open_mode; -+ const char *fdopen_mode = NULL; -+ int fd; - FILE *file; - char fileName[TMPSIZ]; - Display *d = XtDisplayOfObject((Widget)src); -@@ -1208,7 +1214,8 @@ - XtErrorMsg("NoFile", "multiSourceCreate", "XawError", - "Creating a read only disk widget and no file specified.", - NULL, 0); -- open_mode = "r"; -+ open_mode = O_RDONLY; -+ fdopen_mode = "r"; - break; - case XawtextAppend: - case XawtextEdit: -@@ -1218,10 +1225,18 @@ - - (void)tmpnam((char *)src->multi_src.string); - src->multi_src.is_tempfile = True; -- open_mode = "w"; -+ open_mode = O_WRONLY | O_CREAT | O_EXCL; -+ fdopen_mode = "w"; - } -- else -- open_mode = "r+"; -+ else { -+/* O_NOFOLLOW is a BSD & Linux extension */ -+#ifdef O_NOFOLLOW -+ open_mode = O_RDWR | O_NOFOLLOW; -+#else -+ open_mode = O_RDWR; /* unsafe; subject to race conditions */ -+#endif -+ fdopen_mode = "r+"; -+ } - break; - default: - XtErrorMsg("badMode", "multiSourceCreate", "XawError", -@@ -1243,12 +1258,14 @@ - } - - if (!src->multi_src.is_tempfile) { -- if ((file = fopen((char *)src->multi_src.string, open_mode)) != NULL) { -- (void)fseek(file, 0, 2); -- src->multi_src.length = ftell(file); -- return file; -+ if ((fd = open((char *)src->multi_src.string, open_mode, 0666)) != 0) { -+ if ((file = fdopen(fd, fdopen_mode)) != NULL) { -+ (void)fseek(file, 0, SEEK_END); -+ src->multi_src.length = (XawTextPosition)ftell(file); -+ return(file); -+ } - } -- else { -+ { - String params[2]; - Cardinal num_params = 2; - -@@ -1258,7 +1275,7 @@ - "openError", "multiSourceCreate", "XawWarning", - "Cannot open file %s; %s", params, &num_params); - } -- } -+ } - src->multi_src.length = 0; - return (NULL); - } -Index: lib/Xaw/Pixmap.c -=================================================================== -RCS file: /cvs/xc/lib/Xaw/Pixmap.c,v -retrieving revision 3.15 -retrieving revision 3.15.2.1 -diff -U3 -r3.15 -r3.15.2.1 ---- lib/Xaw/Pixmap.c 2000/09/26 15:56:54 3.15 -+++ lib/Xaw/Pixmap.c 2001/02/09 20:45:09 3.15.2.1 -@@ -25,7 +25,7 @@ - * XFree86 Project. - */ - --/* $XFree86: xc/lib/Xaw/Pixmap.c,v 3.15 2000/09/26 15:56:54 tsi Exp $ */ -+/* $XFree86: xc/lib/Xaw/Pixmap.c,v 3.15.2.1 2001/02/09 20:45:09 paulo Exp $ */ - - #include <string.h> - #include <stdio.h> -@@ -437,7 +437,7 @@ - cache = (XawCache **)bsearch(screen, xaw->elems, - xaw->num_elems, sizeof(XtPointer), - bcmp_long); -- if (!cache) -+ if (!cache || !(*cache)->num_elems) - return (NULL); - if (flags == FIND_SCREEN) - return (*cache); -@@ -446,7 +446,7 @@ - cache = (XawCache **)bsearch((void *)colormap, (*cache)->elems, - (*cache)->num_elems, sizeof(XtPointer), - bcmp_long); -- if (!cache) -+ if (!cache || !(*cache)->num_elems) - return (NULL); - if (flags == FIND_COLORMAP) - return (*cache); -@@ -456,7 +456,7 @@ - (*cache)->num_elems, sizeof(XtPointer), - bcmp_long); - -- if (!cache) -+ if (!cache || !(*cache)->num_elems) - return (NULL); - return (*cache); - } -Index: lib/Xaw/Text.c -=================================================================== -RCS file: /cvs/xc/lib/Xaw/Text.c,v -retrieving revision 3.40 -retrieving revision 3.40.2.1 -diff -U3 -r3.40 -r3.40.2.1 ---- lib/Xaw/Text.c 2000/12/07 20:26:12 3.40 -+++ lib/Xaw/Text.c 2001/02/09 20:45:09 3.40.2.1 -@@ -1,4 +1,4 @@ --/* $TOG: Text.c /main/201 1998/06/24 11:53:44 kaleb $ */ -+/* $Xorg: Text.c,v 1.3 2000/08/17 19:45:40 cpqbld Exp $ */ - - /*********************************************************** - -@@ -70,7 +70,7 @@ - * XFree86 Project. - */ - --/* $XFree86: xc/lib/Xaw/Text.c,v 3.40 2000/12/07 20:26:12 dawes Exp $ */ -+/* $XFree86: xc/lib/Xaw/Text.c,v 3.40.2.1 2001/02/09 20:45:09 paulo Exp $ */ - - #include <stdio.h> - #include <X11/IntrinsicP.h> -@@ -805,6 +805,7 @@ - XtRealizeWidget(vbar); - XtMapWidget(vbar); - } -+ XtSetKeyboardFocus(vbar, (Widget)ctx); - } - - /* -@@ -863,6 +864,7 @@ - XtRealizeWidget(hbar); - XtMapWidget(hbar); - } -+ XtSetKeyboardFocus(hbar, (Widget)ctx); - } - - /* -Index: lib/Xaw/TextAction.c -=================================================================== -RCS file: /cvs/xc/lib/Xaw/TextAction.c,v -retrieving revision 3.35 -retrieving revision 3.35.2.1 -diff -U3 -r3.35 -r3.35.2.1 ---- lib/Xaw/TextAction.c 2000/12/07 20:26:12 3.35 -+++ lib/Xaw/TextAction.c 2001/02/09 20:45:09 3.35.2.1 -@@ -21,7 +21,7 @@ - in this Software without prior written authorization from The Open Group. - - */ --/* $XFree86: xc/lib/Xaw/TextAction.c,v 3.35 2000/12/07 20:26:12 dawes Exp $ */ -+/* $XFree86: xc/lib/Xaw/TextAction.c,v 3.35.2.1 2001/02/09 20:45:09 paulo Exp $ */ - - #include <stdio.h> - #include <stdlib.h> -@@ -2835,12 +2835,23 @@ - EndAction((TextWidget)w); - } - -+/* This is kind of a hack, but, only one text widget can have focus at -+ * a time on one display. There is a problem in the implementation of the -+ * text widget, the scrollbars can not be adressed via editres, since they -+ * are not children of a subclass of composite. -+ * The focus variable is required to make sure only one text window will -+ * show a block cursor at one time. -+ */ -+struct _focus { Display *display; Widget widget; }; -+static struct _focus *focus; -+static Cardinal num_focus; - /*ARGSUSED*/ - static void - TextFocusIn(Widget w, XEvent *event, String *p, Cardinal *n) - { - TextWidget ctx = (TextWidget)w; - Bool display_caret = ctx->text.display_caret; -+ int i; - - if (event->xfocus.detail == NotifyPointer) - return; -@@ -2853,6 +2864,25 @@ - ctx->text.hasfocus = TRUE; - if (display_caret) - EndAction(ctx); -+ -+ for (i = 0; i < num_focus; i++) -+ if (focus[i].display == XtDisplay(w)) -+ break; -+ if (i >= num_focus) { -+ focus = (struct _focus*) -+ XtRealloc((XtPointer)focus, sizeof(struct _focus) * (num_focus + 1)); -+ i = num_focus; -+ focus[i].widget = w; -+ focus[i].display = XtDisplay(w); -+ num_focus++; -+ } -+ if (focus[i].widget != w) { -+ Widget old = focus[i].widget; -+ -+ focus[i].widget = w; -+ if (old != NULL) -+ TextFocusOut(old, event, p, n); -+ } - } - - /*ARGSUSED*/ -@@ -2861,8 +2891,24 @@ - { - TextWidget ctx = (TextWidget)w; - Bool display_caret = ctx->text.display_caret; -+ Widget shell; -+ Window window; -+ int i, revert; -+ -+ shell = w; -+ while (shell) { -+ if (XtIsShell(shell)) -+ break; -+ shell = XtParent(shell); -+ } - -- if (event->xfocus.detail == NotifyPointer) -+ for (i = 0; i < num_focus; i++) -+ if (focus[i].display == XtDisplay(w)) -+ break; -+ XGetInputFocus(XtDisplay(w), &window, &revert); -+ if ((XtWindow(shell) == window && -+ (i < num_focus && focus[i].widget == w)) -+ || event->xfocus.detail == NotifyPointer) - return; - - /* Let the input method know focus has left.*/ -@@ -3110,6 +3156,8 @@ - FD_ZERO(&fds); - FD_SET(ConnectionNumber(XtDisplay(w)), &fds); - (void)select(FD_SETSIZE, &fds, NULL, NULL, &tmval); -+ if (tmval.tv_usec != 500000) -+ usleep(40000); - - StartAction(ctx, NULL); - #ifndef OLDXAW -@@ -3342,8 +3390,9 @@ - return; - } - else { -- mult = mult * 10 + params[0][0] - '0'; -- ctx->text.mult = ctx->text.mult * 10 + params[0][0] - '0'; -+ mult = mult * 10 + (params[0][0] - '0') * (mult < 0 ? -1 : 1); -+ ctx->text.mult = ctx->text.mult * 10 + (params[0][0] - '0') * -+ (mult < 0 ? -1 : 1); - } - if (mult != ctx->text.mult || mult >= 32767) { /* checks for overflow */ - XBell(XtDisplay(w), 0); -Index: lib/Xaw/TextPop.c -=================================================================== -RCS file: /cvs/xc/lib/Xaw/TextPop.c,v -retrieving revision 1.16 -retrieving revision 1.16.2.1 -diff -U3 -r1.16 -r1.16.2.1 ---- lib/Xaw/TextPop.c 2000/05/18 16:29:52 1.16 -+++ lib/Xaw/TextPop.c 2001/02/09 20:45:10 1.16.2.1 -@@ -22,7 +22,7 @@ - - */ - --/* $XFree86: xc/lib/Xaw/TextPop.c,v 1.16 2000/05/18 16:29:52 dawes Exp $ */ -+/* $XFree86: xc/lib/Xaw/TextPop.c,v 1.16.2.1 2001/02/09 20:45:10 paulo Exp $ */ - - /* - * This file is broken up into three sections one dealing with -@@ -837,7 +837,7 @@ - static Bool - DoSearch(struct SearchAndReplace *search) - { -- char msg[BUFSIZ]; -+ char msg[37]; - Widget tw = XtParent(search->search_popup); - XawTextPosition pos; - XawTextScanDirection dir; -@@ -875,11 +875,27 @@ - GetString to get a tame version */ - - if (pos == XawTextSearchError) { -- (void)XmuSnprintf(msg, sizeof(msg), -- "Could not find string ``%s''.", -- GetString(search->search_text)); -+ char *ptr; -+ int len; -+ -+ ptr = GetString(search->search_text); -+ len = strlen(ptr); -+ (void)XmuSnprintf(msg, sizeof(msg), "%s", ptr); -+ -+ ptr = strchr(msg, '\n'); -+ if (ptr != NULL || sizeof(msg) - 1 < len) { -+ if (ptr != NULL) -+ len = ptr - msg + 4; -+ else -+ len = strlen(msg); -+ -+ if (len < 4) -+ strcpy(msg, "..."); -+ else -+ strcpy(msg + len - 4, "..."); -+ } - XawTextUnsetSelection(tw); -- SetSearchLabels(search, msg, "", True); -+ SetSearchLabels(search, "Could not find string", msg, True); - - return (False); - } -@@ -1019,15 +1035,26 @@ - - if (new_pos == XawTextSearchError) { - if (count == 0) { -- char msg[BUFSIZ]; -- -- /* The Raw string in find.ptr may be WC I can't use here, -- so I call GetString to get a tame version */ -- -- (void)XmuSnprintf(msg, sizeof(msg), -- "Error: Could not find string ``%s''", -- GetString(search->search_text)); -- SetSearchLabels(search, msg, "", True); -+ char msg[37]; -+ char *ptr; -+ int len; -+ -+ ptr = GetString(search->search_text); -+ len = strlen(ptr); -+ (void)XmuSnprintf(msg, sizeof(msg), "%s", ptr); -+ ptr = strchr(msg, '\n'); -+ if (ptr != NULL || sizeof(msg) - 1 < len) { -+ if (ptr != NULL) -+ len = ptr - msg + 4; -+ else -+ len = strlen(msg); -+ -+ if (len < 4) -+ strcpy(msg, "..."); -+ else -+ strcpy(msg + len - 4, "..."); -+ } -+ SetSearchLabels(search, "Could not find string", msg, True); - - if (redisplay) { - XawTextSetInsertionPoint(tw, ipos); -@@ -1047,7 +1074,7 @@ - XawTextGetSelectionPos(tw, &pos, &end_pos); - - if (search->selection_changed) { -- SetSearchLabels(search, "Selection has been modified, aborting.", -+ SetSearchLabels(search, "Selection modified, aborting.", - "", True); - if (redisplay) { - XawTextSetInsertionPoint(tw, ipos); -@@ -1067,11 +1094,7 @@ - } - - if (XawTextReplace(tw, pos, end_pos, &replace) != XawEditDone) { -- char msg[BUFSIZ]; -- -- (void)XmuSnprintf(msg, sizeof(msg), -- "'%s' with '%s'", find.ptr, replace.ptr); -- SetSearchLabels(search, "Error while replacing", msg, True); -+ SetSearchLabels(search, "Error while replacing.", "", True); - if (redisplay) { - XawTextSetInsertionPoint(tw, ipos); - XawTextEnableRedisplay(tw); -Index: lib/Xaw/TextSrc.c -=================================================================== -RCS file: /cvs/xc/lib/Xaw/TextSrc.c,v -retrieving revision 1.25 -retrieving revision 1.25.2.1 -diff -U3 -r1.25 -r1.25.2.1 ---- lib/Xaw/TextSrc.c 2000/09/26 15:56:55 1.25 -+++ lib/Xaw/TextSrc.c 2001/02/09 20:45:10 1.25.2.1 -@@ -21,7 +21,7 @@ - - */ - --/* $XFree86: xc/lib/Xaw/TextSrc.c,v 1.25 2000/09/26 15:56:55 tsi Exp $ */ -+/* $XFree86: xc/lib/Xaw/TextSrc.c,v 1.25.2.1 2001/02/09 20:45:10 paulo Exp $ */ - - /* - * Author: Chris Peterson, MIT X Consortium. -@@ -1022,9 +1022,9 @@ - XtFree((XtPointer)entity); - if (entity == anchor->entities) { - if ((anchor->entities = enext) == NULL) { -+ eprev = NULL; - anchor = XawTextSourceRemoveAnchor(w, anchor); - entity = anchor ? anchor->entities : NULL; -- eprev = NULL; - } - else - eprev = entity = enext; -@@ -1053,6 +1053,7 @@ - XtFree((XtPointer)entity); - anchor->cache = NULL; - if (entity == anchor->entities) { -+ eprev = NULL; - if ((anchor->entities = enext) == NULL) { - if (i == 0) - ++i; -@@ -1069,7 +1070,6 @@ - break; - } - anchor = src->textSrc.anchors[i]; -- eprev = NULL; - entity = anchor->entities; - continue; - } -Index: programs/Xserver/dix/events.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/dix/events.c,v -retrieving revision 3.35 -retrieving revision 3.35.2.1 -diff -U3 -r3.35 -r3.35.2.1 ---- programs/Xserver/dix/events.c 2000/10/22 21:12:09 3.35 -+++ programs/Xserver/dix/events.c 2001/02/09 20:45:14 3.35.2.1 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.35 2000/10/22 21:12:09 mvojkovi Exp $ */ -+/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.35.2.1 2001/02/09 20:45:14 paulo Exp $ */ - /************************************************************ - - Copyright 1987, 1998 The Open Group -@@ -2783,6 +2783,44 @@ - if (deactivateGrab) - (*keybd->DeactivateGrab)(keybd); - } -+ -+#ifdef XKB -+/* This function is used to set the key pressed or key released state - -+ this is only used when the pressing of keys does not cause -+ CoreProcessKeyEvent to be called, as in for example Mouse Keys. -+*/ -+void -+FixKeyState (xE, keybd) -+ register xEvent *xE; -+ register DeviceIntPtr keybd; -+{ -+ int key, bit; -+ register BYTE *kptr; -+ register KeyClassPtr keyc = keybd->key; -+ -+ key = xE->u.u.detail; -+ kptr = &keyc->down[key >> 3]; -+ bit = 1 << (key & 7); -+#ifdef DEBUG -+ if ((xkbDebugFlags&0x4)&& -+ ((xE->u.u.type==KeyPress)||(xE->u.u.type==KeyRelease))) { -+ ErrorF("FixKeyState: Key %d %s\n",key, -+ (xE->u.u.type==KeyPress?"down":"up")); -+ } -+#endif -+ switch (xE->u.u.type) -+ { -+ case KeyPress: -+ *kptr |= bit; -+ break; -+ case KeyRelease: -+ *kptr &= ~bit; -+ break; -+ default: -+ FatalError("Impossible keyboard event"); -+ } -+} -+#endif - - void - #ifdef XKB -Index: programs/Xserver/hw/xfree86/CHANGELOG -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/CHANGELOG,v -retrieving revision 3.1485 -retrieving revision 3.1485.2.15 -diff -U3 -r3.1485 -r3.1485.2.15 ---- programs/Xserver/hw/xfree86/CHANGELOG 2000/12/18 15:55:33 3.1485 -+++ programs/Xserver/hw/xfree86/CHANGELOG 2001/02/15 16:01:33 3.1485.2.15 -@@ -1,3 +1,51 @@ -+XFree86 4.0.2a (?? February 2001) -+1231. Add missing Rage 128 PD chip support (Ishikawa Mutsumi). -+1230. Work around compiler-generated call to memcpy in the sis driver -+ (David Dawes). -+1229. Fix the neomagic driver so that it saves/restores the palette (#4452, -+ Ken Hornstein). -+1228. Fix a palette saving bug in the vgahw module (#4452, Ken Hornstein). -+1227. [SECURITY] complete fix for /tmp race in gccmakedep and makedepend. -+ (Branden Robinson). -+1226. Add support for wsmouse protocol under OpenBSD/i386 (Matthieu Herrb). -+1225. [SECURITY] fix possible buffer overflow (NOT on stack) in xdm -+ xdmcp code (patch69 from Red Hat SRPMS). -+1224. Make acceleration work on the Trident Cyber9388 (Alan Hourihane). -+1223. Make some changes to the clock selection for trident driver -+ (Alan Hourihane). -+1222. Ensure Video is unavailable when no acceleration available in the -+ trident driver (Alan Hourihane). -+1221. Allow xf86ClaimPciSlot to be called with a NULL GDevPtr, as it was -+ previously (Alan Hourihane). -+1220. Correct some problems with xedit c-mode. Fix geometry management -+ incompatibilites with Xaw 6 in the Form widget. -+ Fix problem in libxf86config when comparing float and double and -+ small fix to xf86cfg when converting a HorizSync or VertRefresh -+ specification string to format used internally by libxf86config. -+ Adds dvorak keyboard and fixes Ukranian in rules/xfree86.lst. -+ Fix problems in the xkb interface of xf86cfg and fix autorepeat with -+ MouseKeys, based on patches and suggestion of Stephen Montgomery-Smith -+ (Paulo César Pereira de Andrade). -+1219. Undo s3virge changes in 4.0.2 for Xv support on ViRGE chipsets since -+ they caused problems with plain ViRGE cards. Xv is still supported -+ for the ViRGE DX (#4414, 4430, Kevin Brosius). -+1218. Fix incorrect driverName fields in the cyrix, i810 and sis drivers. -+ This was causing 'XFree86 -configure' to get the driver name wrong. -+ Also fix the documentation of this field in the DESIGN doc (David Dawes). -+1217. [SECURITY] Fix temp files vulnerabilites in xman on systems with -+ mkstemp(). (Matthieu Herrb). -+1216. [SECURITY] Fix temp vulnerabilities in Xaw/MultiSrc.c using the technique -+ in patch #4279 (Branden Robinson). Fix temp file vulnerability in -+ gccmakedep based on report from Alan Cox. Fix temp file vulnerability -+ in Imake.rules, InstallManPageAliases (Matthieu Herrb). -+1215. Fix Neomagic 2200 screen corruption (Egbert Eich). -+1214. Add an imake control for determining when xload should be installed -+ set-gid (David Dawes). -+1213. Add some imake controls for installing Xkb and app-defaults files -+ in the traditional location rather than under /etc/X11 (Red Hat does -+ that) (David Dawes). -+1212. Misc bindist updates. -+ - XFree86 4.0.2 (18 December 2000) - 1211. Fix a problem introduced recently when using the "ps/2" protocol for - mice on FreeBSD (David Dawes). -@@ -12114,4 +12162,4 @@ - XFree86 3.0 (26 April 1994) - - --$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.1485 2000/12/18 15:55:33 dawes Exp $ -+$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.1485.2.15 2001/02/15 16:01:33 martin Exp $ -Index: programs/Xserver/hw/xfree86/common/xf86Bus.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/common/xf86Bus.c,v -retrieving revision 1.56 -retrieving revision 1.56.2.1 -diff -U3 -r1.56 -r1.56.2.1 ---- programs/Xserver/hw/xfree86/common/xf86Bus.c 2000/12/06 15:35:07 1.56 -+++ programs/Xserver/hw/xfree86/common/xf86Bus.c 2001/02/10 10:23:53 1.56.2.1 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Bus.c,v 1.56 2000/12/06 15:35:07 eich Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Bus.c,v 1.56.2.1 2001/02/10 10:23:53 alanh Exp $ */ - /* - * Copyright (c) 1997-1999 by The XFree86 Project, Inc. - */ -@@ -443,7 +443,8 @@ - pEnt->chipset = xf86Entities[entityIndex]->chipset; - pEnt->resources = xf86Entities[entityIndex]->resources; - pEnt->driver = xf86Entities[entityIndex]->driver; -- if (xf86Entities[entityIndex]->devices[0]) { -+ if ( (xf86Entities[entityIndex]->devices) && -+ (xf86Entities[entityIndex]->devices[0]) ) { - for (i = 0; i < xf86Entities[entityIndex]->numInstances; i++) - if (xf86Entities[entityIndex]->devices[i]->screen == 0) - break; -@@ -469,7 +470,8 @@ - int i; - - /* We might not use AddDevtoEntity */ -- if (!xf86Entities[entityIndex]->devices[0]) -+ if ( (!xf86Entities[entityIndex]->devices) || -+ (!xf86Entities[entityIndex]->devices[0]) ) - return NULL; - - if (entityIndex >= xf86NumEntities || -Index: programs/Xserver/hw/xfree86/common/xf86Configure.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v -retrieving revision 3.49 -retrieving revision 3.49.2.1 -diff -U3 -r3.49 -r3.49.2.1 ---- programs/Xserver/hw/xfree86/common/xf86Configure.c 2000/12/12 18:23:50 3.49 -+++ programs/Xserver/hw/xfree86/common/xf86Configure.c 2001/02/11 18:03:48 3.49.2.1 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.49 2000/12/12 18:23:50 tsi Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.49.2.1 2001/02/11 18:03:48 herrb Exp $ */ - /* - * Copyright 2000 by Alan Hourihane, Sychdyn, North Wales. - * -@@ -286,6 +286,14 @@ - path[len] = '\0'; - if (strstr(path, "psaux") != NULL) - DFLT_MOUSE_PROTO = "PS/2"; -+ } -+#endif -+#ifdef WSCONS_SUPPORT -+ fd = open("/dev/wsmouse0", 0); -+ if (fd > 0) { -+ DFLT_MOUSE_DEV = "/dev/wsmouse0"; -+ DFLT_MOUSE_PROTO = "wsmouse"; -+ close(fd); - } - #endif - -Index: programs/Xserver/hw/xfree86/common/xf86PciInfo.h -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h,v -retrieving revision 1.83 -retrieving revision 1.83.2.1 -diff -U3 -r1.83 -r1.83.2.1 ---- programs/Xserver/hw/xfree86/common/xf86PciInfo.h 2000/12/07 21:34:20 1.83 -+++ programs/Xserver/hw/xfree86/common/xf86PciInfo.h 2001/02/15 16:01:40 1.83.2.1 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h,v 1.83 2000/12/07 21:34:20 mvojkovi Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h,v 1.83.2.1 2001/02/15 16:01:40 martin Exp $ */ - /* - * PCI Probe - * -@@ -231,6 +231,7 @@ - #define PCI_CHIP_MACH64LS 0x4C53 - #define PCI_CHIP_RAGE128MF 0x4D46 - #define PCI_CHIP_RAGE128ML 0x4D4C -+#define PCI_CHIP_RAGE128PD 0x5044 - #define PCI_CHIP_RAGE128PF 0x5046 - #define PCI_CHIP_RAGE128PR 0x5052 - #define PCI_CHIP_RADEON_QD 0x5144 -@@ -796,6 +797,7 @@ - {PCI_CHIP_MACH64LS, "Mach64 LS",0}, - {PCI_CHIP_RAGE128MF, "Rage 128 Mobility MF",0}, - {PCI_CHIP_RAGE128ML, "Rage 128 Mobility ML",0}, -+ {PCI_CHIP_RAGE128PD, "Rage 128 Pro PD",0}, - {PCI_CHIP_RAGE128PF, "Rage 128 Pro PF",0}, - {PCI_CHIP_RAGE128PR, "Rage 128 Pro PR",0}, - {PCI_CHIP_RADEON_QD, "Radeon QD",0}, -Index: programs/Xserver/hw/xfree86/common/xf86pciBus.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c,v -retrieving revision 3.28 -retrieving revision 3.28.2.1 -diff -U3 -r3.28 -r3.28.2.1 ---- programs/Xserver/hw/xfree86/common/xf86pciBus.c 2000/12/08 20:13:35 3.28 -+++ programs/Xserver/hw/xfree86/common/xf86pciBus.c 2001/02/10 10:23:55 3.28.2.1 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c,v 3.28 2000/12/08 20:13:35 eich Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c,v 3.28.2.1 2001/02/10 10:23:55 alanh Exp $ */ - - /* - * Copyright (c) 1997-1999 by The XFree86 Project, Inc. -@@ -2343,7 +2343,8 @@ - p->pciBusId.func = func; - p->active = active; - p->inUse = FALSE; -- xf86AddDevToEntity(num, dev); -+ if (dev) -+ xf86AddDevToEntity(num, dev); - /* Here we initialize the access structure */ - p->access = xnfcalloc(1,sizeof(EntityAccessRec)); - while (ppaccp && *ppaccp) { -Index: programs/Xserver/hw/xfree86/doc/BugReport -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/doc/Attic/BugReport,v -retrieving revision 1.3 -retrieving revision 1.3.2.1 -diff -U3 -r1.3 -r1.3.2.1 ---- programs/Xserver/hw/xfree86/doc/BugReport 2000/08/03 12:24:02 1.3 -+++ programs/Xserver/hw/xfree86/doc/BugReport 2000/12/19 18:13:35 1.3.2.1 -@@ -5,7 +5,7 @@ - - VERSION: - --4.0.1a -+4.0.2 - - VIDEO DRIVER: - -@@ -54,4 +54,4 @@ - - - --$XFree86: xc/programs/Xserver/hw/xfree86/doc/BugReport,v 1.3 2000/08/03 12:24:02 dawes Exp $ -+$XFree86: xc/programs/Xserver/hw/xfree86/doc/BugReport,v 1.3.2.1 2000/12/19 18:13:35 dawes Exp $ -Index: programs/Xserver/hw/xfree86/doc/DESIGN -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/doc/DESIGN,v -retrieving revision 1.33 -retrieving revision 1.33.2.1 -diff -U3 -r1.33 -r1.33.2.1 ---- programs/Xserver/hw/xfree86/doc/DESIGN 2000/12/04 19:47:21 1.33 -+++ programs/Xserver/hw/xfree86/doc/DESIGN 2001/02/09 03:26:01 1.33.2.1 -@@ -408,12 +408,12 @@ - points required during the early phase of InitOutput(). xf86AddDriver() adds - it to the global xf86DriverList[] array. - --The DriverRec contains the driver's version, a short descriptive message, the --Identify(), Probe() and AvailableOptions() function entry points as well as a --pointer to the driver's module (as returned from the loader when the driver --was loaded) and a reference count which keeps track of how many screens are --using the driver. The entry driver entry points are those required prior to --the driver allocating and filling in its ScrnInfoRec. -+The DriverRec contains the driver canonical name, the Identify(), Probe() and -+AvailableOptions() function entry points as well as a pointer to the driver's -+module (as returned from the loader when the driver was loaded) and a refer- -+ence count which keeps track of how many screens are using the driver. The -+entry driver entry points are those required prior to the driver allocating -+and filling in its ScrnInfoRec. - - For a static server, the xf86DriverList[] array is initialised at build time, - and the loading of modules is not done. -@@ -5368,7 +5368,7 @@ - - DriverRec ZZZ = { - VERSION, -- "unaccelerated driver for ZZZ Zzzzzy cards", -+ ZZZ_DRIVER_NAME, - ZZZIdentify, - ZZZProbe, - ZZZAvailableOptions, -@@ -6302,7 +6302,7 @@ - ZZZFreeRec(xf86Screens[scrnIndex]); - } - -- Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.39 2000/12/04 18:49:54 dawes Exp $ -+ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.39.2.1 2001/02/08 19:31:03 dawes Exp $ - - --$XFree86: xc/programs/Xserver/hw/xfree86/doc/DESIGN,v 1.33 2000/12/04 19:47:21 dawes Exp $ -+$XFree86: xc/programs/Xserver/hw/xfree86/doc/DESIGN,v 1.33.2.1 2001/02/09 03:26:01 dawes Exp $ -Index: programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v -retrieving revision 1.39 -retrieving revision 1.39.2.1 -diff -U3 -r1.39 -r1.39.2.1 ---- programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml 2000/12/04 18:49:54 1.39 -+++ programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml 2001/02/08 19:31:03 1.39.2.1 -@@ -36,7 +36,7 @@ - - - <ident> --$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.39 2000/12/04 18:49:54 dawes Exp $ -+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.39.2.1 2001/02/08 19:31:03 dawes Exp $ - </ident> - - -@@ -517,8 +517,8 @@ - &s.code;InitOutput()&e.code;. &s.code;xf86AddDriver()&e.code; adds - it to the global &s.code;xf86DriverList[]&e.code; array. - -- The &s.code;DriverRec&e.code; contains the driver's version, a short -- descriptive message, the &s.code;Identify()&e.code;, -+ The &s.code;DriverRec&e.code; contains the driver canonical name, -+ the &s.code;Identify()&e.code;, - &s.code;Probe()&e.code; and &s.code;AvailableOptions()&e.code; - function entry points as well as a pointer - to the driver's module (as returned from the loader when the driver -@@ -6336,7 +6336,7 @@ - <code> - DriverRec ZZZ = { - VERSION, -- "unaccelerated driver for ZZZ Zzzzzy cards", -+ ZZZ_DRIVER_NAME, - ZZZIdentify, - ZZZProbe, - ZZZAvailableOptions, -Index: programs/Xserver/hw/xfree86/doc/sgml/README.sgml -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v -retrieving revision 3.110 -retrieving revision 3.110.2.1 -diff -U3 -r3.110 -r3.110.2.1 ---- programs/Xserver/hw/xfree86/doc/sgml/README.sgml 2000/12/15 16:11:57 3.110 -+++ programs/Xserver/hw/xfree86/doc/sgml/README.sgml 2001/02/09 04:25:04 3.110.2.1 -@@ -15,7 +15,7 @@ - <date>15 December 2000 - - <ident> --$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.110 2000/12/15 16:11:57 dawes Exp $ -+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.110.2.1 2001/02/09 04:25:04 dawes Exp $ - </ident> - - <abstract> -@@ -31,8 +31,22 @@ - <sect>What is XFree86 &relvers;? - <p> - --XFree86 &relvers; is the third full release in the <![ %earlyrel; [new]]> --XFree86 4 series. -+<![ %updaterel [ -+XFree86 &relvers; is the &whichupdaterel; update to &fullrelvers;, -+the &whichfullrel; full release in the <![ %earlyrel; [new]]> XFree86 -+4 series. -+ -+Update releases are taken from a stable/maintenance branch. They are -+designed to be installed on top of the full release that they are -+updating. They contain fixes for serious problems, most commonly -+fixes for security issues, fixes for driver bugs, and fixes that improve -+stability. -+]]> -+ -+<![ %fullrel [ -+XFree86 &relvers; is the &whichfullrel; full release in the <![ %earlyrel; -+[new]]> XFree86 4 series. -+]]> - - <p> - XFree86 release 4 is a major re-design of the basic architectural -@@ -47,9 +61,10 @@ - The road to XFree86 release 4 began as an architectural concept in mid - 1997, with the serious framework being implemented in code the beginning - of 1998. There were several snapshots on the road to 4.0 which are now --part of the 4.0 base release. The &relvers; version is an upgrade to -+part of the 4.0 base release. -+<![ %fullrel [The &relvers; version is an upgrade to - &prevrelvers;, which include more hardware ports, code enhancements and --bug fixes. -+bug fixes.]]> - - Release 4 also included the long-awaited integration of the DRI (Direct - Rendering Infrastructure). This upgrade into the code base gives -@@ -194,114 +209,135 @@ - <htmlurl name="Installation Document" url="Install.html">. Information about - obtaining the release in source form is given below. - ]]> -+ -+<![ %updaterel; [ -+The source for version &relvers; is available as a patch relative to -+&prevrelvers;. -+The patch file is <tt>&prevrelvers;-&relvers;.diff.gz</tt>. -+ -+The patch -+should be applied to a clean &prevrelvers; source tree, working from -+the directory containing the <tt>xc/</tt> directory. The patch should -+be applied by running: - --The source for version &relvers; is split into three tarballs: --<tt>X&srcvers;src-1.tgz</tt>, <tt>X&srcvers;src-2.tgz</tt>, --<tt>X&srcvers;src-3.tgz</tt>. The first contains everything except the -+<tscreen><verb> -+gzip -d < &prevrelvers;-&relvers;.diff.gz | patch -p0 -E -+</verb></tscreen> -+ -+Information about getting the source for &prevrelvers can be found in the -+README file for that version, which can be found on the -+<url name="XFree86 web site" url="http://www.xfree86.org/pub/XFree86/&prevrelvers;/README.html">. -+. -+]]> -+ -+<![ %fullrel [ -+The source for version &fullrelvers; is split into three tarballs: -+<tt>X&fullsrcvers;src-1.tgz</tt>, <tt>X&fullsrcvers;src-2.tgz</tt>, -+<tt>X&fullsrcvers;src-3.tgz</tt>. The first contains everything except the - fonts and general X11 documentation. It is sufficient for building - XFree86 is you already have a set of fonts. The second contains the - fonts and the source for the general X11 documentation. The third - contains the general X11 documentation in hardcopy format. - - <![ %onediff; [ --A source patch relative to version &prevrelvers; is also available. --The patch file is <tt>&prevrelvers;-&relvers;.diff.gz</tt>. -+A source patch relative to version &prevfullrelvers; is also available. -+The patch file is <tt>&prevfullrelvers;-&fullrelvers;.diff.gz</tt>. - <![ %difftar; [ - There is also a tarball that contains some files that have components that --can't be included in a diff. It is <tt>&relvers;.tgz</tt>. -+can't be included in a diff. It is <tt>&fullrelvers;.tgz</tt>. - ]]> - The patch --should be applied to a clean &prevrelvers; source tree, working from -+should be applied to a clean &prevfullrelvers; source tree, working from - the directory containing the <tt>xc/</tt> directory. The patch should - be applied by running: - - <tscreen><verb> --gzip -d < &prevrelvers;-&relvers;.diff.gz | patch -p0 -E -+gzip -d < &prevfullrelvers;-&fullrelvers;.diff.gz | patch -p0 -E - </verb></tscreen> - <![ %difftar; [ - <tscreen><verb> --gzip -d < &relvers;.tgz | tar vxf - -+gzip -d < &fullrelvers;.tgz | tar vxf - - </verb></tscreen> - ]]> - ]]> - - <![ %twodiffs; [ --A source patch relative to version &prevrelvers; is also available. -+A source patch relative to version &prevfullrelvers; is also available. - Because of its size, it is split into two parts. --The patch files are <tt>&prevrelvers;-&relvers;.diff1.gz</tt> and --<tt>&prevrelvers;-&relvers;.diff2.gz</tt>. -+The patch files are <tt>&prevfullrelvers;-&fullrelvers;.diff1.gz</tt> and -+<tt>&prevfullrelvers;-&fullrelvers;.diff2.gz</tt>. - <![ %difftar; [ - There is also a tarball that contains some files that have components that --can't be included in a diff. It is <tt>&relvers;.tgz</tt>. -+can't be included in a diff. It is <tt>&fullrelvers;.tgz</tt>. - ]]> - These patches should --be applied to a clean &prevrelvers; source tree, working from the directory -+be applied to a clean &prevfullrelvers; source tree, working from the directory - containing the <tt>xc/</tt> directory. The patches should be applied by - running: - - <tscreen><verb> --gzip -d < &prevrelvers;-&relvers;.diff1.gz | patch -p0 -E --gzip -d < &prevrelvers;-&relvers;.diff2.gz | patch -p0 -E -+gzip -d < &prevfullrelvers;-&fullrelvers;.diff1.gz | patch -p0 -E -+gzip -d < &prevfullrelvers;-&fullrelvers;.diff2.gz | patch -p0 -E - </verb></tscreen> - <![ %difftar; [ - <tscreen><verb> --gzip -d < &relvers;.tgz | tar vxf - -+gzip -d < &fullrelvers;.tgz | tar vxf - - </verb></tscreen> - ]]> - ]]> - - <![ %threediffs; [ --A source patch relative to version &prevrelvers; is also available. -+A source patch relative to version &prevfullrelvers; is also available. - Because of its size, it is split into three parts. --The patch files are <tt>&prevrelvers;-&relvers;.diff1.gz</tt>, --<tt>&prevrelvers;-&relvers;.diff2.gz</tt> and --<tt>&prevrelvers;-&relvers;.diff3.gz</tt>. -+The patch files are <tt>&prevfullrelvers;-&fullrelvers;.diff1.gz</tt>, -+<tt>&prevfullrelvers;-&fullrelvers;.diff2.gz</tt> and -+<tt>&prevfullrelvers;-&fullrelvers;.diff3.gz</tt>. - <![ %difftar; [ - There is also a tarball that contains some files that have components that --can't be included in a diff. It is <tt>&relvers;.tgz</tt>. -+can't be included in a diff. It is <tt>&fullrelvers;.tgz</tt>. - ]]> - These patches should --be applied to a clean &prevrelvers; source tree, working from the directory -+be applied to a clean &prevfullrelvers; source tree, working from the directory - containing the <tt>xc/</tt> directory. The patches should be applied by - running: - - <tscreen><verb> --gzip -d < &prevrelvers;-&relvers;.diff1.gz | patch -p0 -E --gzip -d < &prevrelvers;-&relvers;.diff2.gz | patch -p0 -E --gzip -d < &prevrelvers;-&relvers;.diff3.gz | patch -p0 -E -+gzip -d < &prevfullrelvers;-&fullrelvers;.diff1.gz | patch -p0 -E -+gzip -d < &prevfullrelvers;-&fullrelvers;.diff2.gz | patch -p0 -E -+gzip -d < &prevfullrelvers;-&fullrelvers;.diff3.gz | patch -p0 -E - </verb></tscreen> - <![ %difftar; [ - <tscreen><verb> --gzip -d < &relvers;.tgz | tar vxf - -+gzip -d < &fullrelvers;.tgz | tar vxf - - </verb></tscreen> - ]]> - ]]> - - <![ %fourdiffs; [ --A source patch relative to version &prevrelvers; is also available. -+A source patch relative to version &prevfullrelvers; is also available. - Because of its size, it is split into four parts. --The patch files are <tt>&prevrelvers;-&relvers;.diff1.gz</tt>, --<tt>&prevrelvers;-&relvers;.diff2.gz</tt>, --<tt>&prevrelvers;-&relvers;.diff3.gz</tt> and --<tt>&prevrelvers;-&relvers;.diff4.gz</tt>. -+The patch files are <tt>&prevfullrelvers;-&fullrelvers;.diff1.gz</tt>, -+<tt>&prevfullrelvers;-&fullrelvers;.diff2.gz</tt>, -+<tt>&prevfullrelvers;-&fullrelvers;.diff3.gz</tt> and -+<tt>&prevfullrelvers;-&fullrelvers;.diff4.gz</tt>. - <![ %difftar; [ - There is also a tarball that contains some files that have components that --can't be included in a diff. It is <tt>&relvers;.tgz</tt>. -+can't be included in a diff. It is <tt>&fullrelvers;.tgz</tt>. - ]]> - These patches should --be applied to a clean &prevrelvers; source tree, working from the directory -+be applied to a clean &prevfullrelvers; source tree, working from the directory - containing the <tt>xc/</tt> directory. The patches should be applied by - running: - - <tscreen><verb> --gzip -d < &prevrelvers;-&relvers;.diff1.gz | patch -p0 -E --gzip -d < &prevrelvers;-&relvers;.diff2.gz | patch -p0 -E --gzip -d < &prevrelvers;-&relvers;.diff3.gz | patch -p0 -E --gzip -d < &prevrelvers;-&relvers;.diff4.gz | patch -p0 -E -+gzip -d < &prevfullrelvers;-&fullrelvers;.diff1.gz | patch -p0 -E -+gzip -d < &prevfullrelvers;-&fullrelvers;.diff2.gz | patch -p0 -E -+gzip -d < &prevfullrelvers;-&fullrelvers;.diff3.gz | patch -p0 -E -+gzip -d < &prevfullrelvers;-&fullrelvers;.diff4.gz | patch -p0 -E - </verb></tscreen> - <![ %difftar; [ - <tscreen><verb> --gzip -d < &relvers;.tgz | tar vxf - -+gzip -d < &fullrelvers;.tgz | tar vxf - - </verb></tscreen> - ]]> - ]]> -@@ -311,6 +347,7 @@ - - To format the XFree86 documentation use the latest version of our doctools - package available as <tt>doctools-&doctoolsvers;.tgz</tt>. -+]]> <!-- fullrel --> - - <sect>Reporting Bugs - <p> -Index: programs/Xserver/hw/xfree86/doc/sgml/defs.ent -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/doc/sgml/defs.ent,v -retrieving revision 1.15 -retrieving revision 1.15.2.1 -diff -U3 -r1.15 -r1.15.2.1 ---- programs/Xserver/hw/xfree86/doc/sgml/defs.ent 2000/12/08 19:10:25 1.15 -+++ programs/Xserver/hw/xfree86/doc/sgml/defs.ent 2001/02/09 04:25:04 1.15.2.1 -@@ -1,12 +1,19 @@ --<!-- $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/defs.ent,v 1.15 2000/12/08 19:10:25 dawes Exp $ --> -+<!-- $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/defs.ent,v 1.15.2.1 2001/02/09 04:25:04 dawes Exp $ --> - - <!-- shared entity definitions for the XFree86 documentation --> - - <!-- XFree86 version string --> --<!ENTITY relvers CDATA "4.0.2"> --<!ENTITY prevrelvers CDATA "4.0.1"> --<!ENTITY srcvers CDATA "402"> --<!ENTITY prevsrcvers CDATA "401"> -+<!ENTITY relvers CDATA "4.0.3"> -+<!ENTITY prevrelvers CDATA "4.0.2"> -+<!ENTITY fullrelvers CDATA "4.0.2"> -+<!ENTITY prevfullrelvers CDATA "4.0.1"> -+<!ENTITY srcvers CDATA "403"> -+<!ENTITY prevsrcvers CDATA "402"> -+<!ENTITY fullsrcvers CDATA "402"> -+<!ENTITY prevfullsrcvers CDATA "401"> -+<!ENTITY whichfullrel CDATA "third"> -+<!ENTITY whichupdaterel CDATA "first"> -+ - <!-- Version of the most recent 3.3.x release --> - <!ENTITY legacyvers CDATA "3.3.6"> - -@@ -25,4 +32,6 @@ - <!ENTITY % firstrel 'IGNORE'> - <!ENTITY % earlyrel 'INCLUDE'> - <!ENTITY % laterrel 'INCLUDE'> -+<!ENTITY % fullrel 'IGNORE'> -+<!ENTITY % updaterel 'INCLUDE'> - -Index: programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c,v -retrieving revision 1.13 -retrieving revision 1.13.2.1 -diff -U3 -r1.13 -r1.13.2.1 ---- programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c 2000/12/08 19:15:33 1.13 -+++ programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c 2001/02/15 16:01:41 1.13.2.1 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c,v 1.13 2000/12/08 19:15:33 martin Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c,v 1.13.2.1 2001/02/15 16:01:41 martin Exp $ */ - /* - * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario, - * Precision Insight, Inc., Cedar Park, Texas, and -@@ -891,6 +891,7 @@ - case PCI_CHIP_RAGE128RG: - case PCI_CHIP_RAGE128RK: - case PCI_CHIP_RAGE128RL: -+ case PCI_CHIP_RAGE128PD: - case PCI_CHIP_RAGE128PF: - default: info->HasPanelRegs = FALSE; break; - } -@@ -989,6 +990,7 @@ - } else { - switch (info->Chipset) { - case PCI_CHIP_RAGE128LE: -+ case PCI_CHIP_RAGE128PD: - case PCI_CHIP_RAGE128RE: - case PCI_CHIP_RAGE128RK: info->IsPCI = TRUE; break; - case PCI_CHIP_RAGE128LF: -Index: programs/Xserver/hw/xfree86/drivers/ati/r128_probe.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_probe.c,v -retrieving revision 1.6 -retrieving revision 1.6.2.1 -diff -U3 -r1.6 -r1.6.2.1 ---- programs/Xserver/hw/xfree86/drivers/ati/r128_probe.c 2000/12/13 02:45:00 1.6 -+++ programs/Xserver/hw/xfree86/drivers/ati/r128_probe.c 2001/02/15 16:01:41 1.6.2.1 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_probe.c,v 1.6 2000/12/13 02:45:00 tsi Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_probe.c,v 1.6.2.1 2001/02/15 16:01:41 martin Exp $ */ - /* - * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario, - * Precision Insight, Inc., Cedar Park, Texas, and -@@ -54,6 +54,7 @@ - { PCI_CHIP_RAGE128RG, "ATI Rage 128 RG (AGP)" }, - { PCI_CHIP_RAGE128RK, "ATI Rage 128 RK (PCI)" }, - { PCI_CHIP_RAGE128RL, "ATI Rage 128 RL (AGP)" }, -+ { PCI_CHIP_RAGE128PD, "ATI Rage 128 Pro PD (AGP)" }, - { PCI_CHIP_RAGE128PF, "ATI Rage 128 Pro PF (AGP)" }, - { PCI_CHIP_RAGE128LE, "ATI Rage 128 Mobility LE (PCI)" }, - { PCI_CHIP_RAGE128LF, "ATI Rage 128 Mobility LF (AGP)" }, -@@ -68,6 +69,7 @@ - { PCI_CHIP_RAGE128RG, PCI_CHIP_RAGE128RG, RES_SHARED_VGA }, - { PCI_CHIP_RAGE128RK, PCI_CHIP_RAGE128RK, RES_SHARED_VGA }, - { PCI_CHIP_RAGE128RL, PCI_CHIP_RAGE128RL, RES_SHARED_VGA }, -+ { PCI_CHIP_RAGE128PD, PCI_CHIP_RAGE128PD, RES_SHARED_VGA }, - { PCI_CHIP_RAGE128PF, PCI_CHIP_RAGE128PF, RES_SHARED_VGA }, - { PCI_CHIP_RAGE128LE, PCI_CHIP_RAGE128LE, RES_SHARED_VGA }, - { PCI_CHIP_RAGE128LF, PCI_CHIP_RAGE128LF, RES_SHARED_VGA }, -Index: programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v -retrieving revision 1.14 -retrieving revision 1.14.2.1 -diff -U3 -r1.14 -r1.14.2.1 ---- programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c 2000/12/02 15:30:37 1.14 -+++ programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c 2001/02/08 19:31:07 1.14.2.1 -@@ -26,7 +26,7 @@ - * Dirk H. Hohndel (hohndel@suse.de), - * Portions: the GGI project & confidential CYRIX databooks. - */ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.14 2000/12/02 15:30:37 tsi Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.14.2.1 2001/02/08 19:31:07 dawes Exp $ */ - - #include "fb.h" - #include "mibank.h" -@@ -112,7 +112,7 @@ - - DriverRec CYRIX = { - VERSION, -- "accelerated driver for Cyrix integrated processors", -+ CYRIX_DRIVER_NAME, - CYRIXIdentify, - CYRIXProbe, - CYRIXAvailableOptions, -Index: programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c,v -retrieving revision 1.39 -retrieving revision 1.39.2.1 -diff -U3 -r1.39 -r1.39.2.1 ---- programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c 2000/12/02 15:30:42 1.39 -+++ programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c 2001/02/08 19:31:09 1.39.2.1 -@@ -25,7 +25,7 @@ - SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - **************************************************************************/ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c,v 1.39 2000/12/02 15:30:42 tsi Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c,v 1.39.2.1 2001/02/08 19:31:09 dawes Exp $ */ - - /* - * Authors: -@@ -92,7 +92,7 @@ - - DriverRec I810 = { - I810_VERSION, -- "Accelerated driver for Intel i810 cards", -+ I810_DRIVER_NAME, - I810Identify, - I810Probe, - I810AvailableOptions, -Index: programs/Xserver/hw/xfree86/drivers/neomagic/neo_2200.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2200.c,v -retrieving revision 1.12 -retrieving revision 1.12.2.1 -diff -U3 -r1.12 -r1.12.2.1 ---- programs/Xserver/hw/xfree86/drivers/neomagic/neo_2200.c 2000/10/17 21:36:15 1.12 -+++ programs/Xserver/hw/xfree86/drivers/neomagic/neo_2200.c 2001/01/22 19:59:11 1.12.2.1 -@@ -22,7 +22,7 @@ - CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - **********************************************************************/ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2200.c,v 1.12 2000/10/17 21:36:15 mvojkovi Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2200.c,v 1.12.2.1 2001/01/22 19:59:11 dawes Exp $ */ - /* - * The original Precision Insight driver for - * XFree86 v.3.3 has been sponsored by Red Hat. -@@ -337,8 +337,8 @@ - NEOACLPtr nAcl = NEOACLPTR(pScrn); - - if ((dstY < srcY) || ((dstY == srcY) && (dstX < srcX))) { -- if (((dstX < 64) && ((srcX + w) == pScrn->displayWidth)) || -- ((dstX == 0) && (w > (pScrn->displayWidth - 64)))) { -+ if ((((dstX < 64) && ((srcX + w) == pScrn->displayWidth)) || -+ ((dstX == 0) && (w > (pScrn->displayWidth - 64)))) && (w > 64)) { - - int srcX1 = srcX + 64; - int dstX1 = dstX + 64; -@@ -368,9 +368,9 @@ - OUTREG(NEOREG_XYEXT, (h<<16) | (w & 0xffff)); - } - } else { -- if ((((dstX + w) > (pScrn->displayWidth - 64)) && (srcX == 0)) -+ if (((((dstX + w) > (pScrn->displayWidth - 64)) && (srcX == 0)) - || (((dstX + w) == pScrn->displayWidth) -- && (w > (pScrn->displayWidth - 64)))) { -+ && (w > (pScrn->displayWidth - 64)))) && (w > 64)) { - int srcX1, dstX1; - - w -= 64; -Index: programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c,v -retrieving revision 1.46 -retrieving revision 1.46.2.1 -diff -U3 -r1.46 -r1.46.2.1 ---- programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c 2000/12/06 18:08:54 1.46 -+++ programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c 2001/02/13 21:06:17 1.46.2.1 -@@ -22,7 +22,7 @@ - CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - **********************************************************************/ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c,v 1.46 2000/12/06 18:08:54 eich Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c,v 1.46.2.1 2001/02/13 21:06:17 dawes Exp $ */ - - /* - * The original Precision Insight driver for -@@ -2137,7 +2137,7 @@ - /* - * This function handles restoring the generic VGA registers. */ - vgaHWRestore(pScrn, VgaReg, -- VGA_SR_MODE | (restoreFonts ? VGA_SR_FONTS : 0)); -+ VGA_SR_MODE | VGA_SR_CMAP | (restoreFonts ? VGA_SR_FONTS : 0)); - - VGAwGR(0x0E, restore->ExtCRTDispAddr); - VGAwGR(0x0F, restore->ExtCRTOffset); -Index: programs/Xserver/hw/xfree86/drivers/s3virge/TODO_NOTES -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/s3virge/TODO_NOTES,v -retrieving revision 1.18 -retrieving revision 1.18.2.1 -diff -U3 -r1.18 -r1.18.2.1 ---- programs/Xserver/hw/xfree86/drivers/s3virge/TODO_NOTES 2000/11/28 20:59:17 1.18 -+++ programs/Xserver/hw/xfree86/drivers/s3virge/TODO_NOTES 2001/02/09 03:29:29 1.18.2.1 -@@ -1,7 +1,7 @@ - S3 ViRGE 4.0 devel notes - - rev: --27 Nov 2000 KJB -+3 Jan 2001 KJB - - - Function Implemented -@@ -23,6 +23,11 @@ - - Status - ------ -+1/03/01 KJB -+Ver 1.6.0 -+Revert ViRGE to pre-Xv changes. ViRGE DX still supports Xv, but changes -+added for Xv and ViRGE caused problems with normal display. -+ - 11/27/00 KJB - Ver 1.5.0 - Clean up, bump version for 4.0.2 submission. -@@ -259,4 +264,4 @@ - - - --$XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/TODO_NOTES,v 1.18 2000/11/28 20:59:17 dawes Exp $ -+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/TODO_NOTES,v 1.18.2.1 2001/02/09 03:29:29 dawes Exp $ -Index: programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c,v -retrieving revision 1.70 -retrieving revision 1.70.2.1 -diff -U3 -r1.70 -r1.70.2.1 ---- programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c 2000/12/14 00:55:25 1.70 -+++ programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c 2001/02/09 03:29:30 1.70.2.1 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c,v 1.70 2000/12/14 00:55:25 dawes Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c,v 1.70.2.1 2001/02/09 03:29:30 dawes Exp $ */ - - /* - Copyright (C) 1994-1999 The XFree86 Project, Inc. All Rights Reserved. -@@ -116,9 +116,9 @@ - - #define S3VIRGE_NAME "S3VIRGE" - #define S3VIRGE_DRIVER_NAME "s3virge" --#define S3VIRGE_VERSION_NAME "1.5.0" -+#define S3VIRGE_VERSION_NAME "1.6.0" - #define S3VIRGE_VERSION_MAJOR 1 --#define S3VIRGE_VERSION_MINOR 5 -+#define S3VIRGE_VERSION_MINOR 6 - #define S3VIRGE_PATCHLEVEL 0 - #define S3VIRGE_DRIVER_VERSION ((S3VIRGE_VERSION_MAJOR << 24) | \ - (S3VIRGE_VERSION_MINOR << 16) | \ -@@ -3073,7 +3073,7 @@ - S3VCommonCalcClock(dclk, 1, 1, 31, 0, 4, - 230000, 460000, &new->SR13, &new->SR12); - } /* end TRIO_3D if() */ -- else { /* Is this correct for DX/GX as well? */ -+ else if(ps3v->Chipset == S3_ViRGE_DXGX) { - if (pScrn->bitsPerPixel == 8) { - if(dclk > 80000) { /* We need pixmux */ - new->CR67 = 0x10; -@@ -3110,7 +3110,39 @@ - } - S3VCommonCalcClock(dclk, 1, 1, 31, 0, 3, - 135000, 270000, &new->SR13, &new->SR12); -- } -+ } /* end DXGX if() */ -+ else { /* Everything else ... (only ViRGE) */ -+ if (pScrn->bitsPerPixel == 8) { -+ if(dclk > 80000) { /* We need pixmux */ -+ new->CR67 = 0x10; -+ new->SR15 |= 0x10; /* Set DCLK/2 bit */ -+ new->SR18 = 0x80; /* Enable pixmux */ -+ } -+ } -+ else if ((pScrn->bitsPerPixel == 16) && (pScrn->weight.green == 5)) { -+ new->CR67 = 0x30; /* 15bpp */ -+ } -+ else if (pScrn->bitsPerPixel == 16) { -+ new->CR67 = 0x50; -+ } -+ else if (pScrn->bitsPerPixel == 24) { -+ new->CR67 = 0xd0 | 0x0c; -+ /* Flag STREAMS proc. required */ -+ ps3v->NeedSTREAMS = TRUE; -+ S3VInitSTREAMS(pScrn, new->STREAMS, mode); -+ new->MMPR0 = 0xc000; /* Adjust FIFO slots */ -+ } -+ else if (pScrn->bitsPerPixel == 32) { -+ new->CR67 = 0xd0 | 0x0c; -+ /* Flag STREAMS proc. required */ -+ ps3v->NeedSTREAMS = TRUE; -+ S3VInitSTREAMS(pScrn, new->STREAMS, mode); -+ new->MMPR0 = 0x10000; /* Still more FIFO slots */ -+ } -+ S3VCommonCalcClock(dclk, 1, 1, 31, 0, 3, -+ 135000, 270000, &new->SR13, &new->SR12); -+ } /* end great big if()... */ -+ - - /* Now adjust the value of the FIFO based upon options specified */ - if( ps3v->fifo_moderate ) { -Index: programs/Xserver/hw/xfree86/drivers/s3virge/s3v_xv.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_xv.c,v -retrieving revision 1.2 -retrieving revision 1.2.2.1 -diff -U3 -r1.2 -r1.2.2.1 ---- programs/Xserver/hw/xfree86/drivers/s3virge/s3v_xv.c 2000/11/28 20:59:18 1.2 -+++ programs/Xserver/hw/xfree86/drivers/s3virge/s3v_xv.c 2001/02/09 03:29:31 1.2.2.1 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_xv.c,v 1.2 2000/11/28 20:59:18 dawes Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_xv.c,v 1.2.2.1 2001/02/09 03:29:31 dawes Exp $ */ - /* - Copyright (C) 2000 The XFree86 Project, Inc. All Rights Reserved. - -@@ -106,9 +106,9 @@ - (pScrn->bitsPerPixel == 16) - ) - && -- ((ps3v->Chipset == S3_ViRGE_DXGX) || -+ ((ps3v->Chipset == S3_ViRGE_DXGX) /* || */ - /* S3_ViRGE_GX2_SERIES(ps3v->Chipset) || */ -- (ps3v->Chipset == S3_ViRGE) -+ /* (ps3v->Chipset == S3_ViRGE) */ - ) - && !ps3v->NoAccel - ) -Index: programs/Xserver/hw/xfree86/drivers/sis/init301.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/sis/init301.c,v -retrieving revision 1.3 -retrieving revision 1.3.2.1 -diff -U3 -r1.3 -r1.3.2.1 ---- programs/Xserver/hw/xfree86/drivers/sis/init301.c 2000/12/02 01:16:16 1.3 -+++ programs/Xserver/hw/xfree86/drivers/sis/init301.c 2001/02/14 19:14:22 1.3.2.1 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/init301.c,v 1.3 2000/12/02 01:16:16 dawes Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/init301.c,v 1.3.2.1 2001/02/14 19:14:22 dawes Exp $ */ - - #include "xf86.h" - #include "xf86PciInfo.h" -@@ -1355,7 +1355,7 @@ - USHORT oldREFIndex,CRT1ModeNo,oldModeIDOffset; - long int longtemp; - -- USHORT LatencyFactor[48]={ 88, 80, 78, 72, 70, 00, /* 64 bit BQ=2 */ -+ static USHORT LatencyFactor[48]={ 88, 80, 78, 72, 70, 00, /* 64 bit BQ=2 */ - 00, 79, 77, 71, 69, 49, /* 64 bit BQ=1 */ - 88, 80, 78, 72, 70, 00, /* 128 bit BQ=2 */ - 00, 72, 70, 64, 62, 44, /* 128 bit BQ=1 */ -Index: programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c,v -retrieving revision 1.55 -retrieving revision 1.55.2.1 -diff -U3 -r1.55 -r1.55.2.1 ---- programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c 2000/12/02 15:30:51 1.55 -+++ programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c 2001/02/08 19:31:09 1.55.2.1 -@@ -25,7 +25,7 @@ - * Mitani Hiroshi <hmitani@drl.mei.co.jp> - * David Thomas <davtom@dream.org.uk>. - */ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c,v 1.55 2000/12/02 15:30:51 tsi Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c,v 1.55.2.1 2001/02/08 19:31:09 dawes Exp $ */ - - - #include "fb.h" -@@ -117,7 +117,7 @@ - - DriverRec SIS = { - SIS_CURRENT_VERSION, -- "accelerated driver for SiS chipsets", -+ SIS_DRIVER_NAME, - SISIdentify, - SISProbe, - SISAvailableOptions, -Index: programs/Xserver/hw/xfree86/drivers/trident/trident.h -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/trident/trident.h,v -retrieving revision 1.33 -retrieving revision 1.33.2.1 -diff -U3 -r1.33 -r1.33.2.1 ---- programs/Xserver/hw/xfree86/drivers/trident/trident.h 2000/12/08 09:05:16 1.33 -+++ programs/Xserver/hw/xfree86/drivers/trident/trident.h 2001/02/10 11:22:10 1.33.2.1 -@@ -21,7 +21,7 @@ - * - * Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk> - */ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident.h,v 1.33 2000/12/08 09:05:16 alanh Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident.h,v 1.33.2.1 2001/02/10 11:22:10 alanh Exp $ */ - - #ifndef _TRIDENT_H_ - #define _TRIDENT_H_ -@@ -266,8 +266,7 @@ - #define HAS_DST_TRANS ((pTrident->Chipset == PROVIDIA9682) || \ - (pTrident->Chipset == PROVIDIA9685)) - --#define Is3Dchip ((pTrident->Chipset == CYBER9388) || \ -- (pTrident->Chipset == CYBER9397) || \ -+#define Is3Dchip ((pTrident->Chipset == CYBER9397) || \ - (pTrident->Chipset == CYBER9397DVD) || \ - (pTrident->Chipset == CYBER9520) || \ - (pTrident->Chipset == CYBER9525DVD) || \ -Index: programs/Xserver/hw/xfree86/drivers/trident/trident_accel.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/trident/trident_accel.c,v -retrieving revision 1.19 -retrieving revision 1.19.2.1 -diff -U3 -r1.19 -r1.19.2.1 ---- programs/Xserver/hw/xfree86/drivers/trident/trident_accel.c 2000/12/07 16:48:04 1.19 -+++ programs/Xserver/hw/xfree86/drivers/trident/trident_accel.c 2001/02/10 11:22:10 1.19.2.1 -@@ -23,7 +23,7 @@ - * - * Trident accelerated options. - */ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_accel.c,v 1.19 2000/12/07 16:48:04 alanh Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_accel.c,v 1.19.2.1 2001/02/10 11:22:10 alanh Exp $ */ - - #include "xf86.h" - #include "xf86_OSproc.h" -@@ -158,7 +158,8 @@ - infoPtr->SubsequentScreenToScreenCopy = - TridentSubsequentScreenToScreenCopy; - -- if (!(pTrident->Chipset == PROVIDIA9685 && pScrn->bitsPerPixel > 8)) { -+ if (!((pTrident->Chipset == PROVIDIA9685 || -+ pTrident->Chipset == CYBER9388) && pScrn->bitsPerPixel > 8)) { - infoPtr->Mono8x8PatternFillFlags = NO_PLANEMASK | - HARDWARE_PATTERN_SCREEN_ORIGIN | - BIT_ORDER_IN_BYTE_MSBFIRST; -@@ -282,7 +283,8 @@ - - REPLICATE(transparency_color); - if (transparency_color != -1) { -- if (pTrident->Chipset == PROVIDIA9685) { -+ if (pTrident->Chipset == PROVIDIA9685 || -+ pTrident->Chipset == CYBER9388) { - dst |= 1<<16; - } else { - TGUI_OPERMODE(pTrident->EngineOperation | DST_ENABLE); -@@ -294,7 +296,8 @@ - if ((pTrident->Chipset == PROVIDIA9682) || - (pTrident->Chipset == TGUI9680)) - dst |= FASTMODE; -- if (pTrident->Chipset == PROVIDIA9685) -+ if (pTrident->Chipset == PROVIDIA9685 || -+ pTrident->Chipset == CYBER9388) - dst |= 1<<21; - } - -@@ -332,7 +335,8 @@ - pTrident->BltScanDirection = 0; - REPLICATE(color); - TGUI_FMIX(XAAPatternROP[rop]); -- if (pTrident->Chipset == PROVIDIA9685) { -+ if (pTrident->Chipset == PROVIDIA9685 || -+ pTrident->Chipset == CYBER9388) { - TGUI_FPATCOL(color); - if (rop == GXcopy) - pTrident->BltScanDirection |= 1<<21; -@@ -404,10 +408,12 @@ - if ((pTrident->Chipset == PROVIDIA9682 || - pTrident->Chipset == TGUI9680) && rop == GXcopy) - pTrident->BltScanDirection |= FASTMODE; -- if (pTrident->Chipset == PROVIDIA9685 && rop == GXcopy) -+ if ((pTrident->Chipset == PROVIDIA9685 || -+ pTrident->Chipset == CYBER9388) && rop == GXcopy) - pTrident->BltScanDirection |= 1<<21; - REPLICATE(fg); -- if (pTrident->Chipset == PROVIDIA9685) { -+ if (pTrident->Chipset == PROVIDIA9685 || -+ pTrident->Chipset == CYBER9388) { - TGUI_FPATCOL(fg); - if (bg == -1) { - pTrident->BltScanDirection |= 1<<12; -@@ -463,7 +469,8 @@ - TGUI_FMIX(XAAPatternROP[rop]); - if ((pTrident->Chipset == PROVIDIA9682 || - pTrident->Chipset == TGUI9680) && rop == GXcopy) drawflag = FASTMODE; -- if (pTrident->Chipset == PROVIDIA9685) { -+ if (pTrident->Chipset == PROVIDIA9685 || -+ pTrident->Chipset == CYBER9388) { - if (rop == GXcopy) drawflag |= 1<<21; - TGUI_FPATCOL(color); - } else { -@@ -522,26 +529,30 @@ - int drawflag = 0; - - REPLICATE(fg); -- if (pTrident->Chipset == PROVIDIA9685) -+ if (pTrident->Chipset == PROVIDIA9685 || -+ pTrident->Chipset == CYBER9388) - TGUI_FPATCOL(fg); - else - TGUI_FCOLOUR(fg); - - if (bg == -1) { - drawflag |= 1<<12; -- if (pTrident->Chipset == PROVIDIA9685) -+ if (pTrident->Chipset == PROVIDIA9685 || -+ pTrident->Chipset == CYBER9388) - TGUI_BPATCOL(~fg); - else - TGUI_BCOLOUR(~fg); - } else { - REPLICATE(bg); -- if (pTrident->Chipset == PROVIDIA9685) -+ if (pTrident->Chipset == PROVIDIA9685 || -+ pTrident->Chipset == CYBER9388) - TGUI_BPATCOL(bg); - else - TGUI_BCOLOUR(bg); - } - -- if (pTrident->Chipset == PROVIDIA9685) { -+ if (pTrident->Chipset == PROVIDIA9685 || -+ pTrident->Chipset == CYBER9388) { - drawflag |= 7<<18; - if (rop == GXcopy) drawflag |= 1<<21; - } -@@ -584,7 +595,8 @@ - - REPLICATE(transparency_color); - if (transparency_color != -1) { -- if (pTrident->Chipset == PROVIDIA9685) { -+ if (pTrident->Chipset == PROVIDIA9685 || -+ pTrident->Chipset == CYBER9388) { - drawflag |= 1<<16; - } else { - TGUI_OPERMODE(pTrident->EngineOperation | DST_ENABLE); -Index: programs/Xserver/hw/xfree86/drivers/trident/trident_dac.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/trident/trident_dac.c,v -retrieving revision 1.37 -retrieving revision 1.37.2.1 -diff -U3 -r1.37 -r1.37.2.1 ---- programs/Xserver/hw/xfree86/drivers/trident/trident_dac.c 2000/12/14 19:29:44 1.37 -+++ programs/Xserver/hw/xfree86/drivers/trident/trident_dac.c 2001/02/10 11:22:10 1.37.2.1 -@@ -21,7 +21,7 @@ - * - * Author: Alan Hourihane, alanh@fairlite.demon.co.uk - */ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_dac.c,v 1.37 2000/12/14 19:29:44 dawes Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_dac.c,v 1.37.2.1 2001/02/10 11:22:10 alanh Exp $ */ - - #include "xf86.h" - #include "xf86_OSproc.h" -@@ -333,7 +333,6 @@ - case CYBER9525DVD: - case CYBER9397DVD: - case CYBER9397: -- case CYBER9388: - case IMAGE975: - case IMAGE985: - if (pScrn->bitsPerPixel >= 8) -@@ -344,9 +343,12 @@ - pReg->tridentRegs3x4[PreEndFetch] = 0xFF; - /* Fall Through */ - case PROVIDIA9685: -+ case CYBER9388: -+ case CYBER9385: - pReg->tridentRegs3x4[Enhancement0] = 0x40; - /* Fall Through */ - case PROVIDIA9682: -+ case CYBER9382: - if (pTrident->UsePCIRetry) - pReg->tridentRegs3x4[PCIRetry] = 0xDF; - else -Index: programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c,v -retrieving revision 1.119 -retrieving revision 1.119.2.1 -diff -U3 -r1.119 -r1.119.2.1 ---- programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c 2000/12/08 09:05:16 1.119 -+++ programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c 2001/02/10 11:22:11 1.119.2.1 -@@ -28,7 +28,7 @@ - * Massimiliano Ghilardi, max@Linuz.sns.it, some fixes to the - * clockchip programming code. - */ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c,v 1.119 2000/12/08 09:05:16 alanh Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c,v 1.119.2.1 2001/02/10 11:22:11 alanh Exp $ */ - - #include "xf1bpp.h" - #include "xf4bpp.h" -@@ -418,6 +418,7 @@ - "XAACreateInfoRec", - "XAAHelpPatternROP", - "XAAHelpSolidROP", -+ "XAAFillSolidRects", - "XAACopyROP", - "XAAPatternROP", - "XAAInit", -@@ -1635,9 +1636,9 @@ - case CYBERBLADEI7: - pTrident->ddc1Read = Tridentddc1Read; - ramtype = "SDRAM"; -- pTrident->IsCyber = TRUE; -+ /* pTrident->IsCyber = TRUE; VIA MVP4 integrated Desktop version */ - Support24bpp = TRUE; -- chipset = "CyberBlade/i7"; -+ chipset = "CyberBlade/i7/VIA MVP4"; - pTrident->NewClockCode = TRUE; - pTrident->frequency = NTSC; - break; -@@ -2579,13 +2580,10 @@ - pScrn->fbOffset = 0; - - #ifdef XvExtension -- if (pTrident->Chipset >= CYBER9397) -+ if ((pTrident->Chipset >= CYBER9397) && (!pTrident->NoAccel)) - TRIDENTInitVideo(pScreen); - #endif - -- if(pTrident->BlockHandler) -- pScreen->BlockHandler = pTrident->BlockHandler; -- - pTrident->CloseScreen = pScreen->CloseScreen; - pScreen->CloseScreen = TRIDENTCloseScreen; - pScreen->SaveScreen = TRIDENTSaveScreen; -@@ -2744,6 +2742,9 @@ - if (pTrident->DGAModes) - xfree(pTrident->DGAModes); - pScrn->vtSema = FALSE; -+ -+ if(pTrident->BlockHandler) -+ pScreen->BlockHandler = pTrident->BlockHandler; - - pScreen->CloseScreen = pTrident->CloseScreen; - return (*pScreen->CloseScreen)(scrnIndex, pScreen); -Index: programs/Xserver/hw/xfree86/drivers/trident/tridenthelper.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/trident/tridenthelper.c,v -retrieving revision 1.15 -retrieving revision 1.15.2.1 -diff -U3 -r1.15 -r1.15.2.1 ---- programs/Xserver/hw/xfree86/drivers/trident/tridenthelper.c 2000/12/14 19:29:45 1.15 -+++ programs/Xserver/hw/xfree86/drivers/trident/tridenthelper.c 2001/02/10 11:22:11 1.15.2.1 -@@ -21,7 +21,7 @@ - * - * Author: Alan Hourihane, alanh@fairlite.demon.co.uk - */ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/tridenthelper.c,v 1.15 2000/12/14 19:29:45 dawes Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/tridenthelper.c,v 1.15.2.1 2001/02/10 11:22:11 alanh Exp $ */ - - #include "xf86.h" - #include "xf86_OSproc.h" -@@ -46,8 +46,7 @@ - int freq, ffreq; - int m, n, k; - int p, q, r, s; -- int startn, endn; -- int endm, endk; -+ int endn, endm, endk, startk; - - p = q = r = s = 0; - -@@ -55,23 +54,25 @@ - - if (pTrident->NewClockCode) - { -- startn = 64; - endn = 255; - endm = 63; -- endk = 3; -+ endk = 2; -+ if (clock >= 100000) startk = 0; -+ if (clock < 100000) startk = 1; -+ if (clock < 50000) startk = 2; - } - else - { -- startn = 0; - endn = 121; - endm = 31; - endk = 1; -+ startk = 0; - } - - freq = clock; - -- for (k=endk;k>=0;k--) -- for (n=startn;n<=endn;n++) -+ for (k=startk;k<=endk;k++) -+ for (n=0;n<=endn;n++) - for (m=1;m<=endm;m++) - { - ffreq = ( ( ((n + 8) * pTrident->frequency) / ((m + 2) * powerup[k]) ) * 1000); -Index: programs/Xserver/hw/xfree86/drivers/v4l/v4l.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v -retrieving revision 1.19 -retrieving revision 1.19.2.1 -diff -U3 -r1.19 -r1.19.2.1 ---- programs/Xserver/hw/xfree86/drivers/v4l/v4l.c 2000/06/13 02:28:34 1.19 -+++ programs/Xserver/hw/xfree86/drivers/v4l/v4l.c 2001/02/08 19:31:10 1.19.2.1 -@@ -2,7 +2,7 @@ - * video4linux Xv Driver - * based on Michael Schimek's permedia 2 driver. - */ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.19 2000/06/13 02:28:34 dawes Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.19.2.1 2001/02/08 19:31:10 dawes Exp $ */ - - #include "videodev.h" - #include "xf86.h" -@@ -37,7 +37,7 @@ - - DriverRec V4L = { - 40000, -- "Xv driver for video4linux", -+ "v4l", - V4LIdentify, /* Identify*/ - V4LProbe, /* Probe */ - V4LAvailableOptions, -Index: programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/var-list -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/var-list,v -retrieving revision 1.2 -retrieving revision 1.2.2.1 -diff -U3 -r1.2 -r1.2.2.1 ---- programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/var-list 2000/02/22 18:24:42 1.2 -+++ programs/Xserver/hw/xfree86/etc/bindist/FreeBSD/var-list 2000/12/20 18:57:55 1.2.2.1 -@@ -1 +1,2 @@ --db -+db/xdm -+db/xkb -Index: programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/var-list -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/var-list,v -retrieving revision 1.1 -retrieving revision 1.1.2.1 -diff -U3 -r1.1 -r1.1.2.1 ---- programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/var-list 2000/02/27 00:24:31 1.1 -+++ programs/Xserver/hw/xfree86/etc/bindist/FreeBSD-aout/var-list 2000/12/20 18:57:56 1.1.2.1 -@@ -1 +1,2 @@ --db -+db/xdm -+db/xkb -Index: programs/Xserver/hw/xfree86/etc/bindist/Linux-axp/var-list -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-axp/var-list,v -retrieving revision 1.3 -retrieving revision 1.3.2.1 -diff -U3 -r1.3 -r1.3.2.1 ---- programs/Xserver/hw/xfree86/etc/bindist/Linux-axp/var-list 2000/12/14 21:45:12 1.3 -+++ programs/Xserver/hw/xfree86/etc/bindist/Linux-axp/var-list 2000/12/20 18:57:57 1.3.2.1 -@@ -1 +1,2 @@ --lib -+lib/xdm -+lib/xkb -Index: programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/var-list -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/var-list,v -retrieving revision 1.2 -retrieving revision 1.2.2.1 -diff -U3 -r1.2 -r1.2.2.1 ---- programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/var-list 2000/12/14 21:45:13 1.2 -+++ programs/Xserver/hw/xfree86/etc/bindist/Linux-ix86/var-list 2000/12/20 18:57:57 1.2.2.1 -@@ -1 +1,2 @@ --lib -+lib/xdm -+lib/xkb -Index: programs/Xserver/hw/xfree86/etc/bindist/Linux-m68k/var-list -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-m68k/var-list,v -retrieving revision 1.2 -retrieving revision 1.2.2.1 -diff -U3 -r1.2 -r1.2.2.1 ---- programs/Xserver/hw/xfree86/etc/bindist/Linux-m68k/var-list 2000/12/14 21:45:14 1.2 -+++ programs/Xserver/hw/xfree86/etc/bindist/Linux-m68k/var-list 2000/12/20 18:57:58 1.2.2.1 -@@ -1 +1,2 @@ --lib -+lib/xdm -+lib/xkb -Index: programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/var-list -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/var-list,v -retrieving revision 1.2 -retrieving revision 1.2.2.1 -diff -U3 -r1.2 -r1.2.2.1 ---- programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/var-list 2000/12/14 21:45:14 1.2 -+++ programs/Xserver/hw/xfree86/etc/bindist/Linux-mips/var-list 2000/12/20 18:57:58 1.2.2.1 -@@ -1 +1,2 @@ --lib -+lib/xdm -+lib/xkb -Index: programs/Xserver/hw/xfree86/etc/bindist/Linux-ppc/var-list -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/etc/bindist/Linux-ppc/var-list,v -retrieving revision 1.2 -retrieving revision 1.2.2.1 -diff -U3 -r1.2 -r1.2.2.1 ---- programs/Xserver/hw/xfree86/etc/bindist/Linux-ppc/var-list 2000/12/14 21:45:15 1.2 -+++ programs/Xserver/hw/xfree86/etc/bindist/Linux-ppc/var-list 2000/12/20 18:57:59 1.2.2.1 -@@ -1 +1,2 @@ --lib -+lib/xdm -+lib/xkb -Index: programs/Xserver/hw/xfree86/etc/bindist/NetBSD-aout-ix86/var-list -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-aout-ix86/var-list,v -retrieving revision 1.1 -retrieving revision 1.1.2.1 -diff -U3 -r1.1 -r1.1.2.1 ---- programs/Xserver/hw/xfree86/etc/bindist/NetBSD-aout-ix86/var-list 2000/12/09 21:46:28 1.1 -+++ programs/Xserver/hw/xfree86/etc/bindist/NetBSD-aout-ix86/var-list 2000/12/20 18:57:59 1.1.2.1 -@@ -1 +1,2 @@ --db -+db/xdm -+db/xkb -Index: programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/var-list -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/var-list,v -retrieving revision 1.1 -retrieving revision 1.1.2.1 -diff -U3 -r1.1 -r1.1.2.1 ---- programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/var-list 2000/02/27 01:26:50 1.1 -+++ programs/Xserver/hw/xfree86/etc/bindist/NetBSD-ix86/var-list 2000/12/20 18:58:00 1.1.2.1 -@@ -1 +1,2 @@ --db -+db/xdm -+db/xkb -Index: programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/var-list -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/var-list,v -retrieving revision 1.1 -retrieving revision 1.1.2.1 -diff -U3 -r1.1 -r1.1.2.1 ---- programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/var-list 2000/02/27 01:29:03 1.1 -+++ programs/Xserver/hw/xfree86/etc/bindist/OpenBSD-ix86/var-list 2000/12/20 18:58:00 1.1.2.1 -@@ -1 +1,2 @@ --db -+db/xdm -+db/xkb -Index: programs/Xserver/hw/xfree86/etc/bindist/common/host.def -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/etc/bindist/common/host.def,v -retrieving revision 1.8 -retrieving revision 1.8.2.1 -diff -U3 -r1.8 -r1.8.2.1 ---- programs/Xserver/hw/xfree86/etc/bindist/common/host.def 2000/12/15 21:54:37 1.8 -+++ programs/Xserver/hw/xfree86/etc/bindist/common/host.def 2000/12/19 18:13:36 1.8.2.1 -@@ -6,7 +6,7 @@ - * - XFree86 doctools package (requires groff) - * - nroff/troff or groff - * -- * $XFree86: xc/programs/Xserver/hw/xfree86/etc/bindist/common/host.def,v 1.8 2000/12/15 21:54:37 dawes Exp $ -+ * $XFree86: xc/programs/Xserver/hw/xfree86/etc/bindist/common/host.def,v 1.8.2.1 2000/12/19 18:13:36 dawes Exp $ - */ - - #define HasSgmlFmt YES -@@ -21,5 +21,5 @@ - - #define InstallHardcopyDocs YES - #define HardcopyDocDirs RX XIE XKB XPRINT -- -+#define InstallMiscManPages YES - -Index: programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c,v -retrieving revision 3.15 -retrieving revision 3.15.2.1 -diff -U3 -r3.15 -r3.15.2.1 ---- programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c 2000/11/14 21:59:24 3.15 -+++ programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c 2001/02/11 18:03:48 3.15.2.1 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c,v 3.15 2000/11/14 21:59:24 dawes Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c,v 3.15.2.1 2001/02/11 18:03:48 herrb Exp $ */ - /* - * Copyright 1992 by Rich Murphey <Rich@Rice.edu> - * Copyright 1993 by David Wexelblat <dwex@goblin.org> -@@ -66,7 +66,7 @@ - #define PCVT_CONSOLE_MODE O_RDWR|O_NDELAY - #endif - --#ifdef WSCONS_SUPPORT -+#if defined(WSCONS_SUPPORT) && defined(__NetBSD__) - /* NetBSD's new console driver */ - #define WSCONS_PCVT_COMPAT_CONSOLE_DEV "/dev/ttyE0" - #endif -@@ -485,7 +485,7 @@ - #endif - - fd = open(PCVT_CONSOLE_DEV, PCVT_CONSOLE_MODE, 0); --#ifdef WSCONS_SUPPORT -+#ifdef WSCONS_PCVT_COMPAT_CONSOLE_DEV - if (fd < 0) - { - fd = open(WSCONS_PCVT_COMPAT_CONSOLE_DEV, PCVT_CONSOLE_MODE, 0); -Index: programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c,v -retrieving revision 1.17 -retrieving revision 1.17.2.1 -diff -U3 -r1.17 -r1.17.2.1 ---- programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c 2000/12/18 15:52:25 1.17 -+++ programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c 2001/02/11 18:03:48 1.17.2.1 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c,v 1.17 2000/12/18 15:52:25 dawes Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c,v 1.17.2.1 2001/02/11 18:03:48 herrb Exp $ */ - - /* - * Copyright 1999 by The XFree86 Project, Inc. -@@ -598,6 +598,23 @@ - } - #endif /* USBMOUSE */ - -+static Bool -+bsdMousePreInit(InputInfoPtr pInfo, const char *protocol, int flags) -+{ -+ /* The protocol is guaranteed to be one of the internalNames[] */ -+#ifdef WSCONS_SUPPORT -+ if (xf86NameCmp(protocol, "WSMouse") == 0) { -+ return wsconsPreInit(pInfo, protocol, flags); -+ } -+#endif -+#ifdef USBMOUSE_SUPPORT -+ if (xf86NameCmp(protocol, "usb") == 0) { -+ return usbPreInit(pInfo, protocol, flags); -+ } -+#endif -+ return TRUE; -+} -+ - OSMouseInfoPtr - xf86OSMouseInit(int flags) - { -@@ -615,13 +632,7 @@ - p->SetPS2Res = SetSysMouseRes; - p->SetBMRes = SetSysMouseRes; - p->SetMiscRes = SetSysMouseRes; --#endif -- /* XXX This assumes that WSCONS and USB are mutually exclusive. */ --#if defined(WSCONS_SUPPORT) -- p->PreInit = wsconsPreInit; --#endif --#if defined(USBMOUSE_SUPPORT) -- p->PreInit = usbPreInit; - #endif -+ p->PreInit = bsdMousePreInit; - return p; - } -Index: programs/Xserver/hw/xfree86/parser/Monitor.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/parser/Monitor.c,v -retrieving revision 1.18 -retrieving revision 1.18.2.1 -diff -U3 -r1.18 -r1.18.2.1 ---- programs/Xserver/hw/xfree86/parser/Monitor.c 2000/12/05 19:06:53 1.18 -+++ programs/Xserver/hw/xfree86/parser/Monitor.c 2001/02/09 20:45:11 1.18.2.1 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Monitor.c,v 1.18 2000/12/05 19:06:53 paulo Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Monitor.c,v 1.18.2.1 2001/02/09 20:45:11 paulo Exp $ */ - /* - * - * Copyright (c) 1997 Metro Link Incorporated -@@ -434,7 +434,7 @@ - break; - case DASH: - if (xf86getToken (NULL) != NUMBER || -- val.realnum < ptr->mon_hsync[ptr->mon_n_hsync].lo) -+ (float)val.realnum < ptr->mon_hsync[ptr->mon_n_hsync].lo) - Error (HORIZSYNC_MSG, NULL); - ptr->mon_hsync[ptr->mon_n_hsync].hi = val.realnum; - break; -@@ -468,7 +468,7 @@ - break; - case DASH: - if (xf86getToken (NULL) != NUMBER || -- val.realnum < ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo) -+ (float)val.realnum < ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo) - Error (VERTREFRESH_MSG, NULL); - ptr->mon_vrefresh[ptr->mon_n_vrefresh].hi = val.realnum; - break; -Index: programs/Xserver/hw/xfree86/vgahw/vgaHW.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.c,v -retrieving revision 1.42 -retrieving revision 1.42.2.1 -diff -U3 -r1.42 -r1.42.2.1 ---- programs/Xserver/hw/xfree86/vgahw/vgaHW.c 2000/11/14 18:20:38 1.42 -+++ programs/Xserver/hw/xfree86/vgahw/vgaHW.c 2001/02/13 21:06:19 1.42.2.1 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.c,v 1.42 2000/11/14 18:20:38 dawes Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.c,v 1.42.2.1 2001/02/13 21:06:19 dawes Exp $ */ - - /* - * -@@ -1117,7 +1117,7 @@ - } else { - /* save the colourmap */ - hwp->writeDacReadAddr(hwp, 0x02); -- for (i = 3; i < 768; i++) { -+ for (i = 6; i < 768; i++) { - save->DAC[i] = hwp->readDacData(hwp); - DACDelay(hwp); - #ifdef DEBUG -Index: programs/Xserver/hw/xfree86/xf86cfg/Imakefile -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile,v -retrieving revision 1.13 -retrieving revision 1.13.2.1 -diff -U3 -r1.13 -r1.13.2.1 ---- programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2000/12/14 01:21:57 1.13 -+++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2001/02/09 20:45:13 1.13.2.1 -@@ -1,4 +1,4 @@ --XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile,v 1.13 2000/12/14 01:21:57 dawes Exp $ -+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile,v 1.13.2.1 2001/02/09 20:45:13 paulo Exp $ - - XCOMM CDEBUGFLAGS=-g -Wall -ansi -pedantic - -@@ -96,7 +96,7 @@ - #endif - - DEFINES = -DXF86CONFIG=\"XConfigFile\" $(MODULEDEFINES) \ -- $(CURSESDEFINES) -+ $(CURSESDEFINES) -DPROJECT_ROOT=\"ProjectRoot\" - - #if HasDlopen - DLLIB = DlLibrary -Index: programs/Xserver/hw/xfree86/xf86cfg/XF86Cfg.ad -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/xf86cfg/XF86Cfg.ad,v -retrieving revision 1.6 -retrieving revision 1.6.2.1 -diff -U3 -r1.6 -r1.6.2.1 ---- programs/Xserver/hw/xfree86/xf86cfg/XF86Cfg.ad 2000/11/30 20:55:16 1.6 -+++ programs/Xserver/hw/xfree86/xf86cfg/XF86Cfg.ad 2001/02/09 20:45:11 1.6.2.1 -@@ -26,7 +26,7 @@ - !! - !! Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> - !! --!! $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/XF86Cfg.ad,v 1.6 2000/11/30 20:55:16 paulo Exp $ -+!! $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/XF86Cfg.ad,v 1.6.2.1 2001/02/09 20:45:11 paulo Exp $ - !! - - *Form.background: gray85 -@@ -1338,7 +1338,7 @@ - <tt><b>Apply changes</b></tt> button there is no way to undo your changes.</font> - - --*Expert.geometry: 800x600 -+*Expert.geometry: 640x460 - *Expert*vpane.min: 64 - *Expert*vpane.max: 64 - *Expert*vpane.showGrip: False -@@ -1767,3 +1767,4 @@ - *expert*tree*buffers.flagsL.fromVert: size - *expert*tree*buffers.flags.fromVert: size - *expert*tree*buffers.flags.fromHoriz: flagsL -+*Expert*close.label: Close -\ No newline at end of file -Index: programs/Xserver/hw/xfree86/xf86cfg/accessx.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/xf86cfg/accessx.c,v -retrieving revision 1.7 -retrieving revision 1.7.2.1 -diff -U3 -r1.7 -r1.7.2.1 ---- programs/Xserver/hw/xfree86/xf86cfg/accessx.c 2000/10/20 14:59:05 1.7 -+++ programs/Xserver/hw/xfree86/xf86cfg/accessx.c 2001/02/09 20:45:11 1.7.2.1 -@@ -26,7 +26,7 @@ - * - * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> - * -- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/accessx.c,v 1.7 2000/10/20 14:59:05 alanh Exp $ -+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/accessx.c,v 1.7.2.1 2001/02/09 20:45:11 paulo Exp $ - */ - - #include "config.h" -@@ -179,15 +179,12 @@ - XtNstate, - (xkb_info->xkb->ctrls->enabled_ctrls & - (XkbAccessXKeysMask | XkbStickyKeysMask | -- XkbMouseKeysMask | XkbMouseKeysAccelMask | -- XkbRepeatKeysMask | XkbSlowKeysMask | -- XkbBounceKeysMask)) != 0, NULL, 0); -+ XkbSlowKeysMask | XkbBounceKeysMask)) != 0, NULL, 0); - - apply = XtCreateManagedWidget("apply", commandWidgetClass, accessx, NULL, 0); - XtAddCallback(apply, XtNcallback, ApplyCallback, NULL); - - form = XtCreateManagedWidget("Accessx", formWidgetClass, accessx, NULL, 0); -- XtAddCallback(enable, XtNcallback, EnableCallback, (XtPointer)form); - timeoutToggle = XtVaCreateManagedWidget("timeoutToggle", toggleWidgetClass, - form, XtNstate, - xkb_info->xkb->ctrls->ax_timeout > 60 -@@ -450,7 +447,6 @@ - - XtSetArg(args[0], XtNstate, &state); - XtGetValues(enable, args, 1); -- EnableCallback(enable, (XtPointer)form, (XtPointer)(long)state); - } - - void -@@ -471,7 +467,7 @@ - static void - EnableCallback(Widget w, XtPointer user_data, XtPointer call_data) - { -- XtSetSensitive(user_data, (long)call_data); -+ XtSetSensitive((Widget)user_data, (long)call_data); - } - - /*ARGSUSED*/ -@@ -534,162 +530,148 @@ - XtSetArg(args[0], XtNstate, &state); - XtGetValues(enable, args, 1); - if (state) { -- xkb_info->xkb->ctrls->enabled_ctrls |= XkbAccessXKeysMask; - xkb_info->config.initial_ctrls |= XkbAccessXKeysMask; -+ xkb_info->xkb->ctrls->enabled_ctrls |= XkbAccessXKeysMask; -+ } -+ else { -+ xkb_info->config.initial_ctrls &= ~XkbAccessXKeysMask; -+ xkb_info->xkb->ctrls->enabled_ctrls &= ~XkbAccessXKeysMask; -+ } -+ -+ /* Timeout */ -+ XtSetArg(args[0], XtNstate, &state); -+ XtGetValues(timeoutToggle, args, 1); -+ if (state) -+ xkb_info->config.ax_timeout = -+ xkb_info->xkb->ctrls->ax_timeout = timeout->value * 60; -+ else -+ xkb_info->config.ax_timeout = -+ xkb_info->xkb->ctrls->ax_timeout = 65535; -+ -+ /* Enable StickyKeys */ -+ XtSetArg(args[0], XtNstate, &state); -+ XtGetValues(sticky, args, 1); -+ if (state) { -+ xkb_info->config.initial_ctrls |= XkbStickyKeysMask; -+ xkb_info->xkb->ctrls->enabled_ctrls |= XkbStickyKeysMask; -+ } -+ else { -+ xkb_info->config.initial_ctrls &= ~XkbStickyKeysMask; -+ xkb_info->xkb->ctrls->enabled_ctrls &= ~XkbStickyKeysMask; -+ } -+ XtSetArg(args[0], XtNstate, &state); -+ XtGetValues(stickyAuto, args, 1); -+ if (state) { -+ xkb_info->config.initial_opts &= ~XkbAX_TwoKeysMask; -+ xkb_info->config.initial_opts &= ~XkbAX_LatchToLockMask; -+ xkb_info->xkb->ctrls->ax_options &= ~XkbAX_TwoKeysMask; -+ xkb_info->xkb->ctrls->ax_options &= ~XkbAX_LatchToLockMask; -+ } -+ else { -+ xkb_info->config.initial_opts &= ~XkbAX_TwoKeysMask; -+ xkb_info->config.initial_opts |= XkbAX_LatchToLockMask; -+ xkb_info->xkb->ctrls->ax_options &= ~XkbAX_TwoKeysMask; -+ xkb_info->xkb->ctrls->ax_options |= XkbAX_LatchToLockMask; -+ } -+ XtSetArg(args[0], XtNstate, &state); -+ XtGetValues(stickyBeep, args, 1); -+ if (state) { -+ xkb_info->config.initial_opts |= XkbAX_StickyKeysFBMask; -+ xkb_info->xkb->ctrls->ax_options |= XkbAX_StickyKeysFBMask; -+ } -+ else { -+ xkb_info->config.initial_opts &= ~XkbAX_StickyKeysFBMask; -+ xkb_info->xkb->ctrls->ax_options &= ~XkbAX_StickyKeysFBMask; -+ } -+ -+ /* Enable MouseKeys */ -+ XtSetArg(args[0], XtNstate, &state); -+ XtGetValues(mouse, args, 1); -+ if (state) { -+ xkb_info->config.initial_ctrls |= XkbMouseKeysAccelMask; -+ xkb_info->xkb->ctrls->enabled_ctrls |= XkbMouseKeysMask | -+ XkbMouseKeysAccelMask; -+ xkb_info->config.mk_delay = -+ xkb_info->xkb->ctrls->mk_delay = mouseDelay->value * 100; -+ xkb_info->config.mk_interval = -+ xkb_info->xkb->ctrls->mk_interval = 40; -+ xkb_info->config.mk_time_to_max = -+ xkb_info->xkb->ctrls->mk_time_to_max = -+ (mouseTime->value * 1000) / xkb_info->xkb->ctrls->mk_interval; -+ xkb_info->config.mk_max_speed = -+ xkb_info->xkb->ctrls->mk_max_speed = -+ mouseSpeed->value * mouseTime->value; -+ xkb_info->config.mk_curve = xkb_info->xkb->ctrls->mk_curve = 0; -+ } -+ else { -+ xkb_info->config.initial_ctrls &= ~(XkbMouseKeysMask | -+ XkbMouseKeysAccelMask); -+ xkb_info->xkb->ctrls->enabled_ctrls &= ~(XkbMouseKeysMask | -+ XkbMouseKeysAccelMask); -+ } -+ -+ /* Enable RepeatKeys */ -+ XtSetArg(args[0], XtNstate, &state); -+ XtGetValues(repeat, args, 1); -+ if (state) { -+ xkb_info->config.initial_ctrls |= XkbRepeatKeysMask; -+ xkb_info->xkb->ctrls->enabled_ctrls |= XkbRepeatKeysMask; -+ xkb_info->config.repeat_interval = -+ xkb_info->xkb->ctrls->repeat_interval = repeatRate->value * 1000; -+ xkb_info->config.repeat_delay = -+ xkb_info->xkb->ctrls->repeat_delay = repeatDelay->value * 1000; -+ } -+ else { -+ xkb_info->config.initial_ctrls &= ~XkbRepeatKeysMask; -+ xkb_info->xkb->ctrls->enabled_ctrls &= ~XkbRepeatKeysMask; -+ } - -- /* Timeout */ -- XtSetArg(args[0], XtNstate, &state); -- XtGetValues(timeoutToggle, args, 1); -- if (state) -- xkb_info->config.ax_timeout = -- xkb_info->xkb->ctrls->ax_timeout = timeout->value * 60; -- else -- xkb_info->config.ax_timeout = -- xkb_info->xkb->ctrls->ax_timeout = 65535; -- -- /* Enable StickyKeys */ -- XtSetArg(args[0], XtNstate, &state); -- XtGetValues(sticky, args, 1); -- if (state) { -- xkb_info->config.initial_ctrls |= XkbStickyKeysMask; -- xkb_info->xkb->ctrls->enabled_ctrls |= XkbStickyKeysMask; -- } -- else { -- xkb_info->config.initial_ctrls &= ~XkbStickyKeysMask; -- xkb_info->xkb->ctrls->enabled_ctrls &= ~XkbStickyKeysMask; -- } -- XtSetArg(args[0], XtNstate, &state); -- XtGetValues(stickyAuto, args, 1); -- if (state) { -- xkb_info->config.initial_opts &= ~XkbAX_TwoKeysMask; -- xkb_info->config.initial_opts &= ~XkbAX_LatchToLockMask; -- xkb_info->xkb->ctrls->ax_options &= ~XkbAX_TwoKeysMask; -- xkb_info->xkb->ctrls->ax_options &= ~XkbAX_LatchToLockMask; -- } -- else { -- xkb_info->config.initial_opts &= ~XkbAX_TwoKeysMask; -- xkb_info->config.initial_opts |= XkbAX_LatchToLockMask; -- xkb_info->xkb->ctrls->ax_options &= ~XkbAX_TwoKeysMask; -- xkb_info->xkb->ctrls->ax_options |= XkbAX_LatchToLockMask; -- } -- XtSetArg(args[0], XtNstate, &state); -- XtGetValues(stickyBeep, args, 1); -- if (state) { -- xkb_info->config.initial_opts |= XkbAX_StickyKeysFBMask; -- xkb_info->xkb->ctrls->ax_options |= XkbAX_StickyKeysFBMask; -- } -- else { -- xkb_info->config.initial_opts &= ~XkbAX_StickyKeysFBMask; -- xkb_info->xkb->ctrls->ax_options &= ~XkbAX_StickyKeysFBMask; -- } -- -- /* Enable MouseKeys */ -- XtSetArg(args[0], XtNstate, &state); -- XtGetValues(mouse, args, 1); -- if (state) { -- xkb_info->config.initial_ctrls |= XkbMouseKeysMask | -- XkbMouseKeysAccelMask; -- xkb_info->xkb->ctrls->enabled_ctrls |= XkbMouseKeysMask | -- XkbMouseKeysAccelMask; -- xkb_info->config.mk_delay = -- xkb_info->xkb->ctrls->mk_delay = mouseDelay->value * 100; -- xkb_info->config.mk_interval = -- xkb_info->xkb->ctrls->mk_interval = 40; -- xkb_info->config.mk_time_to_max = -- xkb_info->xkb->ctrls->mk_time_to_max = -- (mouseTime->value * 1000) / xkb_info->xkb->ctrls->mk_interval; -- xkb_info->config.mk_max_speed = -- xkb_info->xkb->ctrls->mk_max_speed = -- mouseSpeed->value * mouseTime->value; -- xkb_info->config.mk_curve = xkb_info->xkb->ctrls->mk_curve = 0; -- } -- else { -- xkb_info->config.initial_ctrls &= ~(XkbMouseKeysMask | -- XkbMouseKeysAccelMask); -- xkb_info->xkb->ctrls->enabled_ctrls &= ~(XkbMouseKeysMask | -- XkbMouseKeysAccelMask); -- } -- -- /* Enable RepeatKeys */ -- XtSetArg(args[0], XtNstate, &state); -- XtGetValues(repeat, args, 1); -- if (state) { -- xkb_info->config.initial_ctrls |= XkbRepeatKeysMask; -- xkb_info->xkb->ctrls->enabled_ctrls |= XkbRepeatKeysMask; -- xkb_info->config.repeat_interval = -- xkb_info->xkb->ctrls->repeat_interval = repeatRate->value * 1000; -- xkb_info->config.repeat_delay = -- xkb_info->xkb->ctrls->repeat_delay = repeatDelay->value * 1000; -- } -- else { -- xkb_info->config.initial_ctrls &= ~XkbRepeatKeysMask; -- xkb_info->xkb->ctrls->enabled_ctrls &= ~XkbRepeatKeysMask; -- } -- -- /* Enable SlowKeys */ -- XtSetArg(args[0], XtNstate, &state); -- XtGetValues(slowToggle, args, 1); -- if (state) { -- xkb_info->config.initial_ctrls |= XkbSlowKeysMask; -- xkb_info->xkb->ctrls->enabled_ctrls |= XkbSlowKeysMask; -- xkb_info->config.slow_keys_delay = -- xkb_info->xkb->ctrls->slow_keys_delay = slow->value * 1000; -- } -- else { -- xkb_info->config.initial_ctrls &= ~XkbSlowKeysMask; -- xkb_info->xkb->ctrls->enabled_ctrls &= ~XkbSlowKeysMask; -- } -- XtSetArg(args[0], XtNstate, &state); -- XtGetValues(slowPressed, args, 1); -- if (state) { -- xkb_info->config.initial_opts |= XkbAX_SKPressFBMask; -- xkb_info->xkb->ctrls->ax_options |= XkbAX_SKPressFBMask; -- } -- else { -- xkb_info->config.initial_opts &= ~XkbAX_SKPressFBMask; -- xkb_info->xkb->ctrls->ax_options &= ~XkbAX_SKPressFBMask; -- } -- XtSetArg(args[0], XtNstate, &state); -- XtGetValues(slowAccepted, args, 1); -- if (state) { -- xkb_info->config.initial_opts |= XkbAX_SKAcceptFBMask; -- xkb_info->xkb->ctrls->ax_options |= XkbAX_SKAcceptFBMask; -- } -- else { -- xkb_info->config.initial_opts &= ~XkbAX_SKAcceptFBMask; -- xkb_info->xkb->ctrls->ax_options &= ~XkbAX_SKAcceptFBMask; -- } -- -- /* Enable BounceKeys */ -- XtSetArg(args[0], XtNstate, &state); -- XtGetValues(bounceToggle, args, 1); -- if (state) { -- xkb_info->config.initial_ctrls |= XkbBounceKeysMask; -- xkb_info->xkb->ctrls->enabled_ctrls |= XkbBounceKeysMask; -- xkb_info->config.debounce_delay = -- xkb_info->xkb->ctrls->debounce_delay = bounce->value * 1000; -- } -- else { -- xkb_info->config.initial_ctrls &= ~XkbBounceKeysMask; -- xkb_info->xkb->ctrls->enabled_ctrls &= ~XkbBounceKeysMask; -- } -- } -- else { -- xkb_info->config.initial_ctrls &= -- ~(XkbAccessXKeysMask | XkbStickyKeysMask | XkbMouseKeysMask | -- XkbMouseKeysAccelMask | XkbRepeatKeysMask | XkbSlowKeysMask | -- XkbBounceKeysMask); -- xkb_info->config.initial_opts &= -- ~(XkbAX_TwoKeysMask | XkbAX_LatchToLockMask | XkbAX_StickyKeysFBMask | -- XkbAX_SKPressFBMask | XkbAX_SKAcceptFBMask); -- -- xkb_info->xkb->ctrls->enabled_ctrls &= -- ~(XkbAccessXKeysMask | XkbStickyKeysMask | XkbMouseKeysMask | -- XkbMouseKeysAccelMask | XkbRepeatKeysMask | XkbSlowKeysMask | -- XkbBounceKeysMask); -- xkb_info->xkb->ctrls->ax_options &= -- ~(XkbAX_TwoKeysMask | XkbAX_LatchToLockMask | XkbAX_StickyKeysFBMask | -- XkbAX_SKPressFBMask | XkbAX_SKAcceptFBMask); -+ /* Enable SlowKeys */ -+ XtSetArg(args[0], XtNstate, &state); -+ XtGetValues(slowToggle, args, 1); -+ if (state) { -+ xkb_info->config.initial_ctrls |= XkbSlowKeysMask; -+ xkb_info->xkb->ctrls->enabled_ctrls |= XkbSlowKeysMask; -+ xkb_info->config.slow_keys_delay = -+ xkb_info->xkb->ctrls->slow_keys_delay = slow->value * 1000; -+ } -+ else { -+ xkb_info->config.initial_ctrls &= ~XkbSlowKeysMask; -+ xkb_info->xkb->ctrls->enabled_ctrls &= ~XkbSlowKeysMask; -+ } -+ XtSetArg(args[0], XtNstate, &state); -+ XtGetValues(slowPressed, args, 1); -+ if (state) { -+ xkb_info->config.initial_opts |= XkbAX_SKPressFBMask; -+ xkb_info->xkb->ctrls->ax_options |= XkbAX_SKPressFBMask; -+ } -+ else { -+ xkb_info->config.initial_opts &= ~XkbAX_SKPressFBMask; -+ xkb_info->xkb->ctrls->ax_options &= ~XkbAX_SKPressFBMask; -+ } -+ XtSetArg(args[0], XtNstate, &state); -+ XtGetValues(slowAccepted, args, 1); -+ if (state) { -+ xkb_info->config.initial_opts |= XkbAX_SKAcceptFBMask; -+ xkb_info->xkb->ctrls->ax_options |= XkbAX_SKAcceptFBMask; -+ } -+ else { -+ xkb_info->config.initial_opts &= ~XkbAX_SKAcceptFBMask; -+ xkb_info->xkb->ctrls->ax_options &= ~XkbAX_SKAcceptFBMask; -+ } -+ -+ /* Enable BounceKeys */ -+ XtSetArg(args[0], XtNstate, &state); -+ XtGetValues(bounceToggle, args, 1); -+ if (state) { -+ xkb_info->config.initial_ctrls |= XkbBounceKeysMask; -+ xkb_info->xkb->ctrls->enabled_ctrls |= XkbBounceKeysMask; -+ xkb_info->config.debounce_delay = -+ xkb_info->xkb->ctrls->debounce_delay = bounce->value * 1000; -+ } -+ else { -+ xkb_info->config.initial_ctrls &= ~XkbBounceKeysMask; -+ xkb_info->xkb->ctrls->enabled_ctrls &= ~XkbBounceKeysMask; - } - - XkbSetControls(DPY, XkbAllControlsMask, xkb_info->xkb); -Index: programs/Xserver/hw/xfree86/xf86cfg/expert.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/xf86cfg/expert.c,v -retrieving revision 1.5 -retrieving revision 1.5.2.1 -diff -U3 -r1.5 -r1.5.2.1 ---- programs/Xserver/hw/xfree86/xf86cfg/expert.c 2000/12/02 15:31:02 1.5 -+++ programs/Xserver/hw/xfree86/xf86cfg/expert.c 2001/02/09 20:45:12 1.5.2.1 -@@ -26,7 +26,7 @@ - * - * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> - * -- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/expert.c,v 1.5 2000/12/02 15:31:02 tsi Exp $ -+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/expert.c,v 1.5.2.1 2001/02/09 20:45:12 paulo Exp $ - */ - - #include "config.h" -@@ -4615,6 +4615,9 @@ - XtNtreeParent, config, NULL, 0); - node->next = NewNode(mainNode, flags, NULL, config, NULL); - node = node->next; -+ if (XF86Config->conf_flags == NULL) -+ XF86Config->conf_flags = (XF86ConfFlagsPtr) -+ XtCalloc(1, sizeof(XF86ConfFlagsRec)); - XtAddCallback(flags, XtNcallback, OptionsCallback, - (XtPointer)&(XF86Config->conf_flags->flg_option_lst)); - -Index: programs/Xserver/hw/xfree86/xf86cfg/interface.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c,v -retrieving revision 1.13 -retrieving revision 1.13.2.1 -diff -U3 -r1.13 -r1.13.2.1 ---- programs/Xserver/hw/xfree86/xf86cfg/interface.c 2000/12/09 02:23:26 1.13 -+++ programs/Xserver/hw/xfree86/xf86cfg/interface.c 2001/02/09 20:45:13 1.13.2.1 -@@ -26,7 +26,7 @@ - * - * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> - * -- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c,v 1.13 2000/12/09 02:23:26 dawes Exp $ -+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c,v 1.13.2.1 2001/02/09 20:45:13 paulo Exp $ - */ - - #include <X11/IntrinsicP.h> -@@ -61,7 +61,11 @@ - #include "stubs.h" - - #define randomize() srand((unsigned)time((time_t*)NULL)) -+#ifdef PROJECT_ROOT -+#define DefaultXFree86Dir PROJECT_ROOT -+#else - #define DefaultXFree86Dir "/usr/X11R6" -+#endif - - /* - * Prototypes -Index: programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.c,v -retrieving revision 1.4 -retrieving revision 1.4.2.1 -diff -U3 -r1.4 -r1.4.2.1 ---- programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.c 2000/11/30 20:55:18 1.4 -+++ programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.c 2001/02/09 20:45:13 1.4.2.1 -@@ -26,7 +26,7 @@ - * - * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> - * -- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.c,v 1.4 2000/11/30 20:55:18 paulo Exp $ -+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.c,v 1.4.2.1 2001/02/09 20:45:13 paulo Exp $ - */ - - #include "xf86config.h" -@@ -275,6 +275,7 @@ - range[i].lo = range[i].hi = val; - if (++i >= nrange || *str == '\0') - break; -+ continue; - } - else if (*str != '-') - return (0); -Index: programs/Xserver/xkb/Imakefile -=================================================================== -RCS file: /cvs/xc/programs/Xserver/xkb/Imakefile,v -retrieving revision 3.14 -retrieving revision 3.14.2.1 -diff -U3 -r3.14 -r3.14.2.1 ---- programs/Xserver/xkb/Imakefile 2000/10/20 14:59:09 3.14 -+++ programs/Xserver/xkb/Imakefile 2001/01/22 19:49:33 3.14.2.1 -@@ -1,5 +1,5 @@ - XCOMM $TOG: Imakefile /main/12 1997/07/16 14:51:50 kaleb $ --XCOMM $XFree86: xc/programs/Xserver/xkb/Imakefile,v 3.14 2000/10/20 14:59:09 alanh Exp $ -+XCOMM $XFree86: xc/programs/Xserver/xkb/Imakefile,v 3.14.2.1 2001/01/22 19:49:33 dawes Exp $ - #define SGIHyperOpt - #include <Server.tmpl> - -@@ -67,6 +67,8 @@ - LinkSourceFile(XKBAlloc.c,$(XLIBSRC)) - LinkSourceFile(XKBGAlloc.c,$(XLIBSRC)) - -+#if UseConfDirForXkb - LinkConfDirectory(xkb,.,xkb,.) -+#endif - - DependTarget() -Index: programs/Xserver/xkb/xkbActions.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/xkb/xkbActions.c,v -retrieving revision 3.3 -retrieving revision 3.3.2.1 -diff -U3 -r3.3 -r3.3.2.1 ---- programs/Xserver/xkb/xkbActions.c 2000/04/04 19:25:23 3.3 -+++ programs/Xserver/xkb/xkbActions.c 2001/02/09 20:45:15 3.3.2.1 -@@ -24,7 +24,7 @@ - THE USE OR PERFORMANCE OF THIS SOFTWARE. - - ********************************************************/ --/* $XFree86: xc/programs/Xserver/xkb/xkbActions.c,v 3.3 2000/04/04 19:25:23 dawes Exp $ */ -+/* $XFree86: xc/programs/Xserver/xkb/xkbActions.c,v 3.3.2.1 2001/02/09 20:45:15 paulo Exp $ */ - - #include <stdio.h> - #include <math.h> -@@ -1318,6 +1318,9 @@ - } - else CoreProcessPointerEvent(xE,dev,count); - } -+ else if (keyEvent) -+ FixKeyState(xE,dev); -+ - xkbi->prev_state= oldState; - XkbComputeDerivedState(xkbi); - keyc->prev_state= keyc->state; -Index: programs/xdm/Imakefile -=================================================================== -RCS file: /cvs/xc/programs/xdm/Imakefile,v -retrieving revision 3.38 -retrieving revision 3.38.2.1 -diff -U3 -r3.38 -r3.38.2.1 ---- programs/xdm/Imakefile 2000/11/14 23:58:32 3.38 -+++ programs/xdm/Imakefile 2001/02/10 19:06:32 3.38.2.1 -@@ -2,7 +2,7 @@ - XCOMM - XCOMM - XCOMM --XCOMM $XFree86: xc/programs/xdm/Imakefile,v 3.38 2000/11/14 23:58:32 dawes Exp $ -+XCOMM $XFree86: xc/programs/xdm/Imakefile,v 3.38.2.1 2001/02/10 19:06:32 herrb Exp $ - #define IHaveSubdirs - #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' - -@@ -22,6 +22,10 @@ - #define LinuxShadowSuite NO - #endif - -+#if HasSnprintf -+SNPRINTF_DEFINES = -DHAS_SNPRINTF -+#endif -+ - #if HasXdmAuth - XDMAUTH_DEFINES = -DHASXDMAUTH - XDMAUTHOBJS = xdmauth.o -@@ -195,7 +199,7 @@ - OSMINORVERSION = OSMinorVersion - CONN_DEFINES = $(CONNECTION_FLAGS) - DEFINES = -DBINDIR=\"$(BINDIR)\" -DXDMDIR=\"$(XDMDIR)\" \ -- $(SIGNAL_DEFINES) $(CRYPT_DEFINES) \ -+ $(SIGNAL_DEFINES) $(CRYPT_DEFINES) $(SNPRINTF_DEFINES) \ - $(XDMAUTH_DEFINES) $(RPC_DEFINES) $(KRB5_DEFINES) \ - $(PWD_DEFINES) $(PAM_DEFINES) $(CONN_DEFINES) \ - $(GREET_DEFINES) $(FRAGILE_DEFINES) $(RANDOM_DEFINES) \ -Index: programs/xdm/xdmcp.c -=================================================================== -RCS file: /cvs/xc/programs/xdm/xdmcp.c,v -retrieving revision 3.11 -retrieving revision 3.11.2.1 -diff -U3 -r3.11 -r3.11.2.1 ---- programs/xdm/xdmcp.c 2000/11/27 00:10:06 3.11 -+++ programs/xdm/xdmcp.c 2001/02/10 19:06:32 3.11.2.1 -@@ -22,7 +22,7 @@ - from The Open Group. - - */ --/* $XFree86: xc/programs/xdm/xdmcp.c,v 3.11 2000/11/27 00:10:06 dawes Exp $ */ -+/* $XFree86: xc/programs/xdm/xdmcp.c,v 3.11.2.1 2001/02/10 19:06:32 herrb Exp $ */ - - /* - * xdm - display manager daemon -@@ -1128,8 +1128,15 @@ - XdmcpHeader header; - ARRAY8 status; - -+#ifdef HAS_SNPRINTF -+ snprintf (buf, sizeof(buf), -+ "Session %ld failed for display %.100s: %.100s", -+ (long) sessionID, name, reason); -+#else -+ /* XXX insecure */ - sprintf (buf, "Session %ld failed for display %.100s: %.100s", - (long) sessionID, name, reason); -+#endif - Debug ("Send failed %ld %s\n", (long) sessionID, buf); - status.length = strlen (buf); - status.data = (CARD8Ptr) buf; -Index: programs/xedit/c-mode.c -=================================================================== -RCS file: /cvs/xc/programs/xedit/c-mode.c,v -retrieving revision 1.4 -retrieving revision 1.4.2.1 -diff -U3 -r1.4 -r1.4.2.1 ---- programs/xedit/c-mode.c 1999/09/27 06:30:08 1.4 -+++ programs/xedit/c-mode.c 2001/02/09 20:45:21 1.4.2.1 -@@ -27,7 +27,7 @@ - * Author: Paulo César Pereira de Andrade - */ - --/* $XFree86: xc/programs/xedit/c-mode.c,v 1.4 1999/09/27 06:30:08 dawes Exp $ */ -+/* $XFree86: xc/programs/xedit/c-mode.c,v 1.4.2.1 2001/02/09 20:45:21 paulo Exp $ */ - - #include "xedit.h" - #include <X11/IntrinsicP.h> -@@ -383,7 +383,7 @@ - rtmp = MAX(rtmp, pright); - } - right = anchor->position + entity->offset; -- while (entity && ++count < 3) { -+ while (entity && count++ < 3) { - if (entity->property == Qerror) { - right = anchor->position + entity->offset + entity->length; - count = 0; -Index: programs/xedit/ispell.c -=================================================================== -RCS file: /cvs/xc/programs/xedit/ispell.c,v -retrieving revision 1.14 -retrieving revision 1.14.2.1 -diff -U3 -r1.14 -r1.14.2.1 ---- programs/xedit/ispell.c 2000/09/26 15:57:24 1.14 -+++ programs/xedit/ispell.c 2001/02/09 21:48:14 1.14.2.1 -@@ -27,7 +27,7 @@ - * Author: Paulo César Pereira de Andrade - */ - --/* $XFree86: xc/programs/xedit/ispell.c,v 1.14 2000/09/26 15:57:24 tsi Exp $ */ -+/* $XFree86: xc/programs/xedit/ispell.c,v 1.14.2.1 2001/02/09 21:48:14 paulo Exp $ */ - - #include "xedit.h" - #ifndef X_NOT_STDC_ENV -@@ -339,14 +339,31 @@ - static void - IspellSetRepeated(Bool state) - { -+ static char *mispelled, *repeated; -+ Arg args[1]; -+ -+ if (mispelled == NULL) { -+ XtSetArg(args[0], XtNlabel, &mispelled); -+ XtGetValues(ispell.mispelled, args, 1); -+ mispelled = XtNewString(mispelled); -+ } -+ if (repeated == NULL) { -+ XtSetArg(args[0], XtNlabel, &repeated); -+ XtGetValues(ispell.repeated, args, 1); -+ repeated = XtNewString(repeated); -+ } - XtSetSensitive(ispell.replaceAll, !state); - XtSetSensitive(ispell.ignoreAll, !state); - XtSetSensitive(ispell.add, !state); - XtSetSensitive(ispell.addUncap, !state); -- if (state && XtIsManaged(ispell.mispelled)) -- XtChangeManagedSet(&ispell.mispelled, 1, NULL, NULL, &ispell.repeated, 1); -- else if (!state && XtIsManaged(ispell.repeated)) -- XtChangeManagedSet(&ispell.repeated, 1, NULL, NULL, &ispell.mispelled, 1); -+ if (!state) { -+ XtSetArg(args[0], XtNlabel, mispelled); -+ XtSetValues(ispell.mispelled, args, 1); -+ } -+ else { -+ XtSetArg(args[0], XtNlabel, repeated); -+ XtSetValues(ispell.mispelled, args, 1); -+ } - } - - static void -Index: programs/xkbcomp/rules/xfree86.lst -=================================================================== -RCS file: /cvs/xc/programs/xkbcomp/rules/xfree86.lst,v -retrieving revision 3.20 -retrieving revision 3.20.2.1 -diff -U3 -r3.20 -r3.20.2.1 ---- programs/xkbcomp/rules/xfree86.lst 2000/12/06 20:18:08 3.20 -+++ programs/xkbcomp/rules/xfree86.lst 2001/02/09 20:45:08 3.20.2.1 -@@ -4,7 +4,7 @@ - // Rules descriptions for XFree86 - // Copyright 1996 by Joseph Moss - // --// $XFree86: xc/programs/xkbcomp/rules/xfree86.lst,v 3.20 2000/12/06 20:18:08 eich Exp $ -+// $XFree86: xc/programs/xkbcomp/rules/xfree86.lst,v 3.20.2.1 2001/02/09 20:45:08 paulo Exp $ - - ! model - pc101 Generic 101-key PC -@@ -38,6 +38,7 @@ - ca Canadian - cs Czechoslovakian - dk Danish -+ dvorak Dvorak - ee Estonian - fi Finnish - fr French -@@ -64,7 +65,7 @@ - es Spanish - se Swedish - th Thai -- uk Ukrainian -+ ua Ukrainian - gb United Kingdom - vn Vietnamese - nec/jp PC-98xx Series -Index: programs/xload/Imakefile -=================================================================== -RCS file: /cvs/xc/programs/xload/Imakefile,v -retrieving revision 1.5 -retrieving revision 1.5.2.1 -diff -U3 -r1.5 -r1.5.2.1 ---- programs/xload/Imakefile 2000/11/14 18:20:39 1.5 -+++ programs/xload/Imakefile 2001/01/22 19:49:35 1.5.2.1 -@@ -1,5 +1,5 @@ - XCOMM $XConsortium: Imakefile /main/30 1996/03/09 09:37:57 kaleb $ --XCOMM $XFree86: xc/programs/xload/Imakefile,v 1.5 2000/11/14 18:20:39 dawes Exp $ -+XCOMM $XFree86: xc/programs/xload/Imakefile,v 1.5.2.1 2001/01/22 19:49:35 dawes Exp $ - DEPLIBS = XawClientDepLibs - LOCAL_LIBRARIES = XawClientLibs - -@@ -27,7 +27,7 @@ - AllTarget(ProgramTargetName(xload)) - NormalProgramTarget(xload,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),NullParameter) - --#if defined(OSF1Architecture) || defined(NetBSDArchitecture) || (defined(FreeBSDArchitecture) && OSMajorVersion > 1) || defined(OpenBSDArchitecture) -+#if !InstallXloadSetGID - InstallProgram(xload,$(BINDIR)) - #else - InstallProgramWithFlags(xload,$(BINDIR),$(INSTKMEMFLAGS)) -Index: programs/xman/Imakefile -=================================================================== -RCS file: /cvs/xc/programs/xman/Imakefile,v -retrieving revision 1.1 -retrieving revision 1.1.2.1 -diff -U3 -r1.1 -r1.1.2.1 ---- programs/xman/Imakefile 2000/02/12 03:55:14 1.1 -+++ programs/xman/Imakefile 2001/01/27 20:09:05 1.1.2.1 -@@ -1,5 +1,5 @@ - XCOMM $XConsortium: Imakefile,v 1.22 91/09/09 16:02:18 rws Exp $ --XCOMM $XFree86: xc/programs/xman/Imakefile,v 1.1 2000/02/12 03:55:14 dawes Exp $ -+XCOMM $XFree86: xc/programs/xman/Imakefile,v 1.1.2.1 2001/01/27 20:09:05 herrb Exp $ - - #ifdef XmanSearchPath - XMANSYSPATH = XmanSearchPath -@@ -11,10 +11,13 @@ - #endif - MANPATHS = $(SYSMANPATH) $(LOCALMANPATH) - HELPFILE = -DHELPFILE=\"$(LIBDIR)$(PATHSEP)xman.help\" -+#if HasMkstemp -+MKSTEMP = -DHAS_MKSTEMP -+#endif - - OSMAJORVERSION = OSMajorVersion - OSMINORVERSION = OSMinorVersion -- DEFINES = -DOSMAJORVERSION=$(OSMAJORVERSION) -DOSMINORVERSION=$(OSMINORVERSION) $(HELPFILE) $(MANPATHS) -+ DEFINES = -DOSMAJORVERSION=$(OSMAJORVERSION) -DOSMINORVERSION=$(OSMINORVERSION) $(HELPFILE) $(MANPATHS) $(MKSTEMP) - DEPLIBS = XawClientDepLibs - LOCAL_LIBRARIES = XawClientLibs - SRCS = ScrollByL.c handler.c man.c buttons.c help.c \ -Index: programs/xman/misc.c -=================================================================== -RCS file: /cvs/xc/programs/xman/misc.c,v -retrieving revision 1.4 -retrieving revision 1.4.2.1 -diff -U3 -r1.4 -r1.4.2.1 ---- programs/xman/misc.c 2000/06/13 23:15:53 1.4 -+++ programs/xman/misc.c 2001/01/27 20:09:06 1.4.2.1 -@@ -28,7 +28,7 @@ - from the X Consortium. - - */ --/* $XFree86: xc/programs/xman/misc.c,v 1.4 2000/06/13 23:15:53 dawes Exp $ */ -+/* $XFree86: xc/programs/xman/misc.c,v 1.4.2.1 2001/01/27 20:09:06 herrb Exp $ */ - - /* - * xman - X window system manual page display program. -@@ -45,8 +45,18 @@ - #include <X11/Shell.h> - - static FILE * Uncompress(ManpageGlobals * man_globals, char * filename); --static Boolean UncompressNamed(ManpageGlobals * man_globals, char * filename, char * output); --static Boolean UncompressUnformatted(ManpageGlobals * man_globals, char * entry, char * filename); -+#ifndef HAS_MKSTEMP -+static Boolean UncompressNamed(ManpageGlobals * man_globals, char * filename, -+ char * output); -+static Boolean UncompressUnformatted(ManpageGlobals * man_globals, -+ char * entry, char * filename); -+#else -+static Boolean UncompressNamed(ManpageGlobals * man_globals, char * filename, -+ char * output, FILE ** output_fd); -+static Boolean UncompressUnformatted(ManpageGlobals * man_globals, -+ char * entry, char * filename, -+ FILE **file); -+#endif - - #if defined(ISC) || defined(SCO) - static char *uncompress_format = NULL; -@@ -279,14 +289,23 @@ - char tmp_file[BUFSIZ], error_buf[BUFSIZ]; - FILE * file; - -+#ifndef HAS_MKSTEMP - if ( !UncompressNamed(man_globals, filename, tmp_file) ) - return(NULL); - - else if ((file = fopen(tmp_file, "r")) == NULL) { -- sprintf(error_buf, "Something went wrong in retrieving the %s", -- "uncompressed manual page try cleaning up /tmp."); -- PopupWarning(man_globals, error_buf); -+ sprintf(error_buf, "Something went wrong in retrieving the %s", -+ "uncompressed manual page try cleaning up /tmp."); -+ PopupWarning(man_globals, error_buf); - } -+#else -+ if (!UncompressNamed(man_globals, filename, tmp_file, &file)) { -+ sprintf(error_buf, "Something went wrong in retrieving the %s", -+ "uncompressed manual page try cleaning up /tmp."); -+ PopupWarning(man_globals, error_buf); -+ return(NULL); -+ } -+#endif - - unlink(tmp_file); /* remove name in tree, it will remain - until we close the fd, however. */ -@@ -302,11 +321,20 @@ - * Returns:; TRUE if the file was found. - */ - -+#ifndef HAS_MKSTEMP - static Boolean - UncompressNamed(ManpageGlobals * man_globals, char * filename, char * output) -+#else -+static Boolean -+UncompressNamed(ManpageGlobals * man_globals, char * filename, char * output, -+ FILE ** output_fd) -+#endif - { - char tmp[BUFSIZ], cmdbuf[BUFSIZ], error_buf[BUFSIZ]; - struct stat junk; -+#ifdef HAS_MKSTEMP -+ int fd; -+#endif - - if (stat(filename, &junk) != 0) { /* Check for existance of the file. */ - if (errno != ENOENT) { -@@ -323,7 +351,16 @@ - */ - - strcpy(tmp, MANTEMP); /* get a temp file. */ -+#ifndef HAS_MKSTEMP - (void) mktemp(tmp); -+#else -+ fd = mkstemp(tmp); -+ if (fd < 0) { -+ PopupWarning(man_globals, "Error creating a temp file"); -+ return FALSE; -+ } -+ *output_fd = fdopen(fd, "r"); -+#endif - strcpy(output, tmp); - - #ifdef GZIP_EXTENSION -@@ -357,6 +394,9 @@ - Format(ManpageGlobals * man_globals, char * entry) - { - FILE * file; -+#ifdef HAS_MKSTEMP -+ int fd; -+#endif - Widget manpage = man_globals->manpagewidgets.manpage; - char cmdbuf[BUFSIZ], tmp[BUFSIZ], filename[BUFSIZ], error_buf[BUFSIZ]; - char path[BUFSIZ]; -@@ -364,7 +404,11 @@ - Position x,y; /* location to pop up the - "would you like to save" widget. */ - -+#ifndef HAS_MKSTEMP - if ( !UncompressUnformatted(man_globals, entry, filename) ) { -+#else -+ if ( !UncompressUnformatted(man_globals, entry, filename, &file) ) { -+#endif - /* We Really could not find it, this should never happen, yea right. */ - sprintf(error_buf, "Could not open manual page, %s", entry); - PopupWarning(man_globals, error_buf); -@@ -372,7 +416,11 @@ - return(NULL); - } - -+#ifndef HAS_MKSTEMP - if ((file = fopen(filename, "r")) != NULL) { -+#else -+ if (file != NULL) { -+#endif - char line[BUFSIZ]; - - if (fgets(line, sizeof(line), file) != NULL) { -@@ -408,13 +456,23 @@ - XFlush(XtDisplay(man_globals->standby)); - - strcpy(tmp,MANTEMP); /* Get a temp file. */ -+#ifndef HAS_MKSTEMP - (void) mktemp(tmp); -+#else -+ fd = mkstemp(tmp); -+ file = fdopen(fd, "r"); -+#endif - strcpy(man_globals->tempfile, tmp); - - ParseEntry(entry, path, NULL, NULL); - -+#ifndef HAS_MKSTEMP - sprintf(cmdbuf,"cd %s ; %s %s %s > %s %s", path, TBL, - filename, FORMAT, man_globals->tempfile, "2> /dev/null"); -+#else -+ sprintf(cmdbuf,"cd %s ; %s %s %s >> %s %s", path, TBL, -+ filename, FORMAT, man_globals->tempfile, "2> /dev/null"); -+#endif - - if(system(cmdbuf) != 0) { /* execute search. */ - sprintf(error_buf, -@@ -423,12 +481,14 @@ - file = NULL; - } - else { -+#ifndef HAS_MKSTEMP - if ((file = fopen(man_globals->tempfile,"r")) == NULL) { - sprintf(error_buf, "Something went wrong in retrieving the %s", - "temp file, try cleaning up /tmp"); - PopupWarning(man_globals, error_buf); - } - else { -+#endif - - XtPopdown( XtParent(man_globals->standby) ); - -@@ -460,7 +520,9 @@ - else - unlink(man_globals->tempfile); - } -+#ifndef HAS_MKSTEMP - } -+#endif - } - - if (man_globals->compress || man_globals->gzip) /* If the original -@@ -481,7 +543,13 @@ - */ - - static Boolean --UncompressUnformatted(ManpageGlobals * man_globals, char * entry, char * filename) -+#ifndef HAS_MKSTEMP -+UncompressUnformatted(ManpageGlobals * man_globals, char * entry, -+ char * filename) -+#else -+UncompressUnformatted(ManpageGlobals * man_globals, char * entry, -+ char * filename, FILE **file) -+#endif - { - char path[BUFSIZ], page[BUFSIZ], section[BUFSIZ], input[BUFSIZ]; - int len_cat = strlen(CAT), len_man = strlen(MAN); -@@ -505,7 +573,11 @@ - * Then for compressed files in an uncompressed directory. - */ - sprintf(input, "%s.%s", filename, COMPRESSION_EXTENSION); -+#ifndef HAS_MKSTEMP - if ( UncompressNamed(man_globals, input, filename) ) { -+#else -+ if ( UncompressNamed(man_globals, input, filename, file) ) { -+#endif - man_globals->compress = TRUE; - sprintf(man_globals->save_file, "%s/%s%s/%s.%s", path, - CAT, section + len_cat, page, COMPRESSION_EXTENSION); -@@ -514,7 +586,11 @@ - #ifdef GZIP_EXTENSION - else { - sprintf(input, "%s.%s", filename, GZIP_EXTENSION); -+#ifndef HAS_MKSTEMP - if ( UncompressNamed(man_globals, input, filename) ) { -+#else -+ if ( UncompressNamed(man_globals, input, filename, file) ) { -+#endif - man_globals->compress = TRUE; - man_globals->gzip = TRUE; - sprintf(man_globals->save_file, "%s/%s%s/%s.%s", path, -@@ -542,7 +618,11 @@ - */ - - sprintf(input, "%s.%s", filename, COMPRESSION_EXTENSION); -+#ifndef HAS_MKSTEMP - if ( UncompressNamed(man_globals, input, filename) ) { -+#else -+ if ( UncompressNamed(man_globals, input, filename, file) ) { -+#endif - man_globals->compress = TRUE; - sprintf(man_globals->save_file, "%s/%s%s/%s.%s", path, - CAT, section + len_cat, page, COMPRESSION_EXTENSION); -@@ -551,7 +631,11 @@ - #ifdef GZIP_EXTENSION - else { - sprintf(input, "%s.%s", filename, GZIP_EXTENSION); -+#ifndef HAS_MKSTEMP - if ( UncompressNamed(man_globals, input, filename) ) { -+#else -+ if ( UncompressNamed(man_globals, input, filename, file) ) { -+#endif - man_globals->compress = TRUE; - man_globals->gzip = TRUE; - sprintf(man_globals->save_file, "%s/%s%s/%s.%s", path, -@@ -566,7 +650,11 @@ - - sprintf(input, "%s/%s%s.%s/%s", path, - MAN, section + len_man, COMPRESSION_EXTENSION, page); -+#ifndef HAS_MKSTEMP - if ( UncompressNamed(man_globals, input, filename) ) { -+#else -+ if ( UncompressNamed(man_globals, input, filename, file) ) { -+#endif - man_globals->compress = TRUE; - sprintf(man_globals->save_file, "%s/%s%s.%s/%s", path, - CAT, section + len_cat, COMPRESSION_EXTENSION, page); -Index: programs/xman/search.c -=================================================================== -RCS file: /cvs/xc/programs/xman/search.c,v -retrieving revision 1.4 -retrieving revision 1.4.2.1 -diff -U3 -r1.4 -r1.4.2.1 ---- programs/xman/search.c 2000/06/13 23:15:53 1.4 -+++ programs/xman/search.c 2001/01/27 20:09:06 1.4.2.1 -@@ -28,7 +28,7 @@ - from the X Consortium. - - */ --/* $XFree86: xc/programs/xman/search.c,v 1.4 2000/06/13 23:15:53 dawes Exp $ */ -+/* $XFree86: xc/programs/xman/search.c,v 1.4.2.1 2001/01/27 20:09:06 herrb Exp $ */ - - - #include "globals.h" -@@ -149,11 +149,14 @@ - FILE * - DoSearch(ManpageGlobals * man_globals, int type) - { -- char cmdbuf[BUFSIZ],*mantmp; -+ char cmdbuf[BUFSIZ],*mantmp, *manpath; - char tmp[BUFSIZ],path[BUFSIZ]; - char string_buf[BUFSIZ], cmp_str[BUFSIZ], error_buf[BUFSIZ]; - char * search_string = SearchString(man_globals); - FILE * file; -+#ifdef HAS_MKSTEMP -+ int fd; -+#endif - int count; - Boolean flag; - -@@ -171,13 +174,37 @@ - return(NULL); - } - -- strcpy(tmp, MANTEMP); /* get a temp file. */ -- (void) mktemp(tmp); -- mantmp = tmp; -- - if (type == APROPOS) { - char label[BUFSIZ]; - -+ strcpy(tmp, MANTEMP); /* get a temp file. */ -+#ifdef HAS_MKSTEMP -+ fd = mkstemp(tmp); -+ if (fd < 0) { -+ PopupWarning(man_globals, "Cant create temp file"); -+ return NULL; -+ } -+#else -+ (void)mktemp(tmp); -+#endif -+ mantmp = tmp; -+ -+ manpath=getenv("MANPATH"); -+ if (manpath == NULL || streq(manpath,"") ) { -+#ifdef MANCONF -+ if (!ReadManConfig(path)) -+#endif -+ { -+ strcpy(path,SYSMANPATH); -+#ifdef LOCALMANPATH -+ strcat(path,":"); -+ strcat(path,LOCALMANPATH); -+#endif -+ } -+ } else { -+ strcpy(path,manpath); -+ } -+ - sprintf(label,"Results of apropos search on: %s", search_string); - - #ifdef NO_MANPATH_SUPPORT /* not quite correct, but the best I can do. */ -@@ -191,7 +218,11 @@ - PopupWarning(man_globals, error_buf); - } - -+#ifdef HAS_MKSTEMP -+ if ((file = fdopen(fd, "r")) == NULL) -+#else - if((file = fopen(mantmp,"r")) == NULL) -+#endif - PrintError("lost temp file? out of temp space?"); - - /* -Index: programs/xman/vendor.h -=================================================================== -RCS file: /cvs/xc/programs/xman/vendor.h,v -retrieving revision 1.5 -retrieving revision 1.5.2.1 -diff -U3 -r1.5 -r1.5.2.1 ---- programs/xman/vendor.h 2000/08/01 18:53:07 1.5 -+++ programs/xman/vendor.h 2001/01/27 20:09:07 1.5.2.1 -@@ -28,7 +28,7 @@ - from the X Consortium. - - */ --/* $XFree86: xc/programs/xman/vendor.h,v 1.5 2000/08/01 18:53:07 dawes Exp $ */ -+/* $XFree86: xc/programs/xman/vendor.h,v 1.5.2.1 2001/01/27 20:09:07 herrb Exp $ */ - - /* Vendor-specific definitions */ - -@@ -135,10 +135,18 @@ - # define NO_COMPRESS - # else - # define COMPRESSION_EXTENSION "Z" --# define UNCOMPRESS_FORMAT "zcat < %s > %s" -+# ifndef HAS_MKSTEMP -+# define UNCOMPRESS_FORMAT "zcat < %s > %s" -+# else -+# define UNCOMPRESS_FORMAT "zcat < %s >> %s" -+# endif - # define COMPRESS "compress" - # define GZIP_EXTENSION "gz" --# define GUNZIP_FORMAT "gzip -c -d < %s > %s" -+# ifndef HAS_MKSTEMP -+# define GUNZIP_FORMAT "gzip -c -d < %s > %s" -+# else -+# define GUNZIP_FORMAT "gzip -c -d < %s >> %s" -+# endif - # define GZIP_COMPRESS "gzip" - # endif /* ISC */ - # endif /* UTEK */ -@@ -154,10 +162,19 @@ - # define NO_MANPATH_SUPPORT - #endif - --#ifdef NO_MANPATH_SUPPORT --# define APROPOS_FORMAT ("man -k %s | pr -h Apropos >> %s") -+#ifndef HAS_MKSTEMP -+# ifdef NO_MANPATH_SUPPORT -+# define APROPOS_FORMAT ("man -k %s | pr -h Apropos > %s") -+# else -+# define APROPOS_FORMAT ("man -M %s -k %s | pr -h Apropos > %s") -+# endif - #else --# define APROPOS_FORMAT ("man -M %s -k %s | pr -h Apropos > %s") -+/* with mkstemp the temp output file is already created */ -+# ifdef NO_MANPATH_SUPPORT -+# define APROPOS_FORMAT ("man -k %s | pr -h Apropos >> %s") -+# else -+# define APROPOS_FORMAT ("man -M %s -k %s | pr -h Apropos >> %s") -+# endif - #endif - - #ifdef ultrix diff --git a/x11-base/xfree/files/4.0.2/xfree-4.0.2.dif.gz b/x11-base/xfree/files/4.0.2/xfree-4.0.2.dif.gz Binary files differdeleted file mode 100644 index 9869dee865ca..000000000000 --- a/x11-base/xfree/files/4.0.2/xfree-4.0.2.dif.gz +++ /dev/null diff --git a/x11-base/xfree/files/digest-xfree-4.0.1-r1 b/x11-base/xfree/files/digest-xfree-4.0.1-r1 deleted file mode 100644 index 0bf6ed1afdd8..000000000000 --- a/x11-base/xfree/files/digest-xfree-4.0.1-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 b2ad4a077ac7c09d85e6a0fc0728a536 X401src-1.tgz -MD5 a3363a076f355ddbba68c7f0557438ff X401src-2.tgz -MD5 13c9bb425218082d74c2c7a87a70350c X401src-3.tgz diff --git a/x11-base/xfree/files/digest-xfree-4.0.2 b/x11-base/xfree/files/digest-xfree-4.0.2 deleted file mode 100644 index fa722bc46687..000000000000 --- a/x11-base/xfree/files/digest-xfree-4.0.2 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 d314c311aa4a29d74695b0e39b6d80c4 X402src-1.tgz -MD5 7dc2f848c7466f6704c8dfc3492628ae X402src-2.tgz -MD5 3126d1ef38e3ece0260804ed3c691144 X402src-3.tgz -MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz diff --git a/x11-base/xfree/files/digest-xfree-4.0.2-r1 b/x11-base/xfree/files/digest-xfree-4.0.2-r1 deleted file mode 100644 index ae878f893b5c..000000000000 --- a/x11-base/xfree/files/digest-xfree-4.0.2-r1 +++ /dev/null @@ -1,5 +0,0 @@ -MD5 d314c311aa4a29d74695b0e39b6d80c4 X402src-1.tgz -MD5 7dc2f848c7466f6704c8dfc3492628ae X402src-2.tgz -MD5 3126d1ef38e3ece0260804ed3c691144 X402src-3.tgz -MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz -MD5 13b815bea773260e2f278145abd7261f gatos.tar.gz diff --git a/x11-base/xfree/files/digest-xfree-4.0.2-r2 b/x11-base/xfree/files/digest-xfree-4.0.2-r2 deleted file mode 100644 index ae878f893b5c..000000000000 --- a/x11-base/xfree/files/digest-xfree-4.0.2-r2 +++ /dev/null @@ -1,5 +0,0 @@ -MD5 d314c311aa4a29d74695b0e39b6d80c4 X402src-1.tgz -MD5 7dc2f848c7466f6704c8dfc3492628ae X402src-2.tgz -MD5 3126d1ef38e3ece0260804ed3c691144 X402src-3.tgz -MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz -MD5 13b815bea773260e2f278145abd7261f gatos.tar.gz diff --git a/x11-base/xfree/files/digest-xfree-4.0.2-r3 b/x11-base/xfree/files/digest-xfree-4.0.2-r3 deleted file mode 100644 index ae878f893b5c..000000000000 --- a/x11-base/xfree/files/digest-xfree-4.0.2-r3 +++ /dev/null @@ -1,5 +0,0 @@ -MD5 d314c311aa4a29d74695b0e39b6d80c4 X402src-1.tgz -MD5 7dc2f848c7466f6704c8dfc3492628ae X402src-2.tgz -MD5 3126d1ef38e3ece0260804ed3c691144 X402src-3.tgz -MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz -MD5 13b815bea773260e2f278145abd7261f gatos.tar.gz diff --git a/x11-base/xfree/files/digest-xfree-4.0.3 b/x11-base/xfree/files/digest-xfree-4.0.3 deleted file mode 100644 index f2f5cc051e64..000000000000 --- a/x11-base/xfree/files/digest-xfree-4.0.3 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 d314c311aa4a29d74695b0e39b6d80c4 X402src-1.tgz -MD5 7dc2f848c7466f6704c8dfc3492628ae X402src-2.tgz -MD5 3126d1ef38e3ece0260804ed3c691144 X402src-3.tgz -MD5 c8bb56df966dd0a51d2291bca36e0ea4 4.0.2-4.0.3.diff.gz -MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz -MD5 83a6a0dcc609831cd25ffa7f792f5b24 gatos.tar.gz diff --git a/x11-base/xfree/files/digest-xfree-4.0.3-r1 b/x11-base/xfree/files/digest-xfree-4.0.3-r1 deleted file mode 100644 index f2f5cc051e64..000000000000 --- a/x11-base/xfree/files/digest-xfree-4.0.3-r1 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 d314c311aa4a29d74695b0e39b6d80c4 X402src-1.tgz -MD5 7dc2f848c7466f6704c8dfc3492628ae X402src-2.tgz -MD5 3126d1ef38e3ece0260804ed3c691144 X402src-3.tgz -MD5 c8bb56df966dd0a51d2291bca36e0ea4 4.0.2-4.0.3.diff.gz -MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz -MD5 83a6a0dcc609831cd25ffa7f792f5b24 gatos.tar.gz diff --git a/x11-base/xfree/files/digest-xfree-4.0.3-r2 b/x11-base/xfree/files/digest-xfree-4.0.3-r2 deleted file mode 100644 index 7bd7ecbe0d10..000000000000 --- a/x11-base/xfree/files/digest-xfree-4.0.3-r2 +++ /dev/null @@ -1,5 +0,0 @@ -MD5 d314c311aa4a29d74695b0e39b6d80c4 X402src-1.tgz -MD5 7dc2f848c7466f6704c8dfc3492628ae X402src-2.tgz -MD5 3126d1ef38e3ece0260804ed3c691144 X402src-3.tgz -MD5 c8bb56df966dd0a51d2291bca36e0ea4 4.0.2-4.0.3.diff.gz -MD5 a70e4d28c241374868a099127c668949 truetype.tar.gz diff --git a/x11-base/xfree/xfree-4.0.1-r1.ebuild b/x11-base/xfree/xfree-4.0.1-r1.ebuild deleted file mode 100644 index 85497dcd297b..000000000000 --- a/x11-base/xfree/xfree-4.0.1-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.0.1-r1.ebuild,v 1.7 2000/12/21 08:22:29 achim Exp $ - -P=xfree-4.0.1 -A="X401src-1.tgz X401src-2.tgz X401src-3.tgz" -S=${WORKDIR}/xc -DESCRIPTION="Xfree - 4.0.1" -SRC_URI="ftp://ftp.xfree.org/pub/XFree86/4.0.1/source/X401src-1.tgz -ftp://ftp.xfree.org/pub/XFree86/4.0.1/source/X401src-2.tgz -ftp://ftp.xfree.org/pub/XFree86/4.0.1/source/X401src-3.tgz" - -DEPEND=">=sys-apps/bash-2.04 - >=sys-libs/glibc-2.1.3 - >=sys-libs/gpm-1.19.3 - >=sys-libs/ncurses-5.1" - - -src_unpack () { - unpack ${A} - cp ${FILESDIR}/${PV}/site.def ${S}/config/cf/host.def -} - -src_compile() { - cd ${S} - try make World -} - -src_install() { - try make install DESTDIR=${D} - try make install.man DESTDIR=${D} - preplib /usr/X11R6 -} - - - - diff --git a/x11-base/xfree/xfree-4.0.2-r1.ebuild b/x11-base/xfree/xfree-4.0.2-r1.ebuild deleted file mode 100644 index da3c9536c805..000000000000 --- a/x11-base/xfree/xfree-4.0.2-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.0.2-r1.ebuild,v 1.3 2001/02/10 11:17:25 achim Exp $ - -A="X402src-1.tgz X402src-2.tgz X402src-3.tgz truetype.tar.gz gatos.tar.gz" -S=${WORKDIR}/xc -DESCRIPTION="Xfree - 4.0.2 with Antialias support and ATI TV and Overlay support from the LiVID project" -SRC_PATH0="ftp://ftp.xfree.org/pub/XFree86/4.0.2/source" -SRC_PATH1="ftp://download.sourceforge.net/pub/mirrors/XFree86/4.0.2/source" -SRC_URI="$SRC_PATH0/X402src-1.tgz $SRC_PATH0/X402src-2.tgz $SRC_PATH0/X402src-3.tgz - $SRC_PATH1/X402src-1.tgz $SRC_PATH1/X402src-2.tgz $SRC_PATH1/X402src-3.tgz - http://keithp.com/~keithp/fonts/truetype.tar.gz - http://www.linuxvideo.org/devel/data/gatos.tar.gz" - -HOMEPAGE="http://www.xfree.org - http://www.linuxvideo.org/gatos/" - -DEPEND=">=sys-apps/bash-2.04 - >=media-libs/freetype-2.0.1 - >=sys-libs/glibc-2.1.3 - >=sys-libs/gpm-1.19.3 - >=sys-libs/ncurses-5.1" - - -src_unpack () { - - unpack ${A} - cp ${FILESDIR}/${PV}/site.def ${S}/config/cf/host.def - echo "#define DefaultGcc2i386Opt ${CFLAGS}" >> ${S}/config/cf/host.def - ( cd ${S}/programs/Xserver/hw/xfree86/loader; patch -p0 < ${WORKDIR}/gatos-ati/ati_xv/loader.patch ) - ( cd ${S}/programs/Xserver/hw/xfree86/i2c; patch -p1 < ${WORKDIR}/gatos-ati/ati_xv/i2c.patch ) - -} - -src_compile() { - - cd ${S} - try make World - cd ${WORKDIR}/gatos-ati/ati_xv/ati.2 - try xmkmf ${S} - try make -} - -src_install() { - - try make install DESTDIR=${D} - try make install.man DESTDIR=${D} - - cd ${WORKDIR}/gatos-ati/ati_xv/ati.2 - try make install DESTDIR=${D} - - insinto /usr/X11R6/lib/X11 - doins ${FILESDIR}/${PV}/XftConfig - cd ${D}/usr/X11R6/lib/X11/fonts - tar xzf ${DISTDIR}/truetype.tar.gz - preplib /usr/X11R6 - insinto /etc/env.d - doins ${FILESDIR}/10xfree - insinto /etc/X11/xinit - doins ${FILESDIR}/xinitrc - insinto /etc/X11/xdm - doins ${FILESDIR}/Xsession - -} - - - - diff --git a/x11-base/xfree/xfree-4.0.2-r2.ebuild b/x11-base/xfree/xfree-4.0.2-r2.ebuild deleted file mode 100644 index 0d59fccbd9f1..000000000000 --- a/x11-base/xfree/xfree-4.0.2-r2.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.0.2-r2.ebuild,v 1.2 2001/02/15 18:17:32 achim Exp $ - -A="X402src-1.tgz X402src-2.tgz X402src-3.tgz truetype.tar.gz gatos.tar.gz" -S=${WORKDIR}/xc -DESCRIPTION="Xfree - 4.0.2 with Antialias support and ATI TV and Overlay support from the LiVID project" -SRC_PATH0="ftp://ftp.xfree.org/pub/XFree86/4.0.2/source" -SRC_PATH1="ftp://download.sourceforge.net/pub/mirrors/XFree86/4.0.2/source" -SRC_URI="$SRC_PATH0/X402src-1.tgz $SRC_PATH0/X402src-2.tgz $SRC_PATH0/X402src-3.tgz - $SRC_PATH1/X402src-1.tgz $SRC_PATH1/X402src-2.tgz $SRC_PATH1/X402src-3.tgz - http://keithp.com/~keithp/fonts/truetype.tar.gz - http://www.linuxvideo.org/devel/data/gatos.tar.gz" - -HOMEPAGE="http://www.xfree.org - http://www.linuxvideo.org/gatos/" - -DEPEND=">=media-libs/freetype-2.0.1 - >=sys-libs/ncurses-5.1 - >=sys-libs/zlib-1.1.3-r2 - >=sys-devel/flex-2.5.4a-r2 - sys-devel/perl" - - -src_unpack () { - - unpack ${A} - cp ${FILESDIR}/${PV}/site.def ${S}/config/cf/host.def - gzip -dc ${FILESDIR}/${PV}/${P}.dif.gz | patch -p0 - echo "#define DefaultGcc2i386Opt ${CFLAGS}" >> ${S}/config/cf/host.def - ( cd ${S}/programs/Xserver/hw/xfree86/loader; patch -p0 < ${WORKDIR}/gatos-ati/ati_xv/loader.patch ) - ( cd ${S}/programs/Xserver/hw/xfree86/i2c; patch -p1 < ${WORKDIR}/gatos-ati/ati_xv/i2c.patch ) - -} - -src_compile() { - - try make World - cd ${WORKDIR}/gatos-ati/ati_xv/ati.2 - export PATH=${S}/config/imake/bootstrap:$PATH - try ${S}/config/util/xmkmf ${S} - try make -} - -src_install() { - - try make install DESTDIR=${D} - try make install.man DESTDIR=${D} MANPATH=/usr/X11R6/share/man - - cd ${WORKDIR}/gatos-ati/ati_xv/ati.2 - - try make install DESTDIR=${D} - - insinto /usr/X11R6/lib/X11 - doins ${FILESDIR}/${PV}/XftConfig - cd ${D}/usr/X11R6/lib/X11/fonts - tar xzf ${DISTDIR}/truetype.tar.gz - preplib /usr/X11R6 - insinto /etc/env.d - doins ${FILESDIR}/10xfree - insinto /etc/X11/xinit - doins ${FILESDIR}/xinitrc - insinto /etc/X11/xdm - doins ${FILESDIR}/Xsession - -} - - - - diff --git a/x11-base/xfree/xfree-4.0.2-r3.ebuild b/x11-base/xfree/xfree-4.0.2-r3.ebuild deleted file mode 100644 index c2203aeab2b5..000000000000 --- a/x11-base/xfree/xfree-4.0.2-r3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.0.2-r3.ebuild,v 1.1 2001/03/09 10:26:59 achim Exp $ - -A="X402src-1.tgz X402src-2.tgz X402src-3.tgz truetype.tar.gz gatos.tar.gz" -S=${WORKDIR}/xc -DESCRIPTION="Xfree - 4.0.2 with Antialias support and ATI TV and Overlay support from the LiVID project" -SRC_PATH0="ftp://ftp.xfree.org/pub/XFree86/4.0.2/source" -SRC_PATH1="ftp://download.sourceforge.net/pub/mirrors/XFree86/4.0.2/source" -SRC_URI="$SRC_PATH0/X402src-1.tgz $SRC_PATH0/X402src-2.tgz $SRC_PATH0/X402src-3.tgz - $SRC_PATH1/X402src-1.tgz $SRC_PATH1/X402src-2.tgz $SRC_PATH1/X402src-3.tgz - http://keithp.com/~keithp/fonts/truetype.tar.gz - http://www.linuxvideo.org/devel/data/gatos.tar.gz" - -HOMEPAGE="http://www.xfree.org - http://www.linuxvideo.org/gatos/" - -DEPEND=">=media-libs/freetype-2.0.1 - >=sys-libs/ncurses-5.1 - >=sys-libs/zlib-1.1.3-r2 - >=sys-devel/flex-2.5.4a-r2 - sys-devel/perl" - - -src_unpack () { - - unpack ${A} - cd ${S} - patch -p0 < ${FILESDIR}/${PV}/${PF}.diff - patch -p1 < ${FILESDIR}/${PV}/glibc-2.2.2-ClockP.diff - cp ${FILESDIR}/${PV}/site.def config/cf/host.def - echo "#define DefaultGcc2i386Opt ${CFLAGS}" >> config/cf/host.def - ( cd ${S}/programs/Xserver/hw/xfree86/loader; patch -p0 < ${WORKDIR}/gatos-ati/ati_xv/loader.patch ) - ( cd ${S}/programs/Xserver/hw/xfree86/i2c; patch -p1 < ${WORKDIR}/gatos-ati/ati_xv/i2c.patch ) - -} - -src_compile() { - - try make World - cd ${WORKDIR}/gatos-ati/ati_xv/ati.2 - export PATH=${S}/config/imake/bootstrap:$PATH - try ${S}/config/util/xmkmf ${S} - try make -} - -src_install() { - - try make install DESTDIR=${D} - try make install.man DESTDIR=${D} - # MANPATH=/usr/X11R6/share/man - - cd ${WORKDIR}/gatos-ati/ati_xv/ati.2 - - try make install DESTDIR=${D} - - insinto /usr/X11R6/lib/X11 - doins ${FILESDIR}/${PV}/XftConfig - cd ${D}/usr/X11R6/lib/X11/fonts - tar xzf ${DISTDIR}/truetype.tar.gz - preplib /usr/X11R6 - insinto /etc/env.d - doins ${FILESDIR}/10xfree - insinto /etc/X11/xinit - doins ${FILESDIR}/xinitrc - insinto /etc/X11/xdm - doins ${FILESDIR}/Xsession - -} - - - - diff --git a/x11-base/xfree/xfree-4.0.2.ebuild b/x11-base/xfree/xfree-4.0.2.ebuild deleted file mode 100644 index 4945571911fc..000000000000 --- a/x11-base/xfree/xfree-4.0.2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.0.2.ebuild,v 1.8 2001/01/16 11:55:31 achim Exp $ - -A="X402src-1.tgz X402src-2.tgz X402src-3.tgz truetype.tar.gz" -S=${WORKDIR}/xc -DESCRIPTION="Xfree - 4.0.2" -SRC_PATH0="ftp://ftp.xfree.org/pub/XFree86/4.0.2/source" -SRC_PATH1="ftp://download.sourceforge.net/pub/mirrors/XFree86/4.0.2/source" -SRC_URI="$SRC_PATH0/X402src-1.tgz $SRC_PATH0/X402src-2.tgz $SRC_PATH0/X402src-3.tgz - http://keithp.com/~keithp/fonts/truetype.tar.gz" -# $SRC_PATH1/X402src-1.tgz $SRC_PATH1/X402src-2.tgz $SRC_PATH1/X402src-3.tgz -DEPEND=">=sys-apps/bash-2.04 - >=media-libs/freetype-2.0.1 - >=sys-libs/glibc-2.1.3 - >=sys-libs/gpm-1.19.3 - >=sys-libs/ncurses-5.1" - - -src_unpack () { - unpack ${A} - cp ${FILESDIR}/${PV}/site.def ${S}/config/cf/host.def -} - -src_compile() { - cd ${S} - try make World -} - -src_install() { - try make install DESTDIR=${D} - try make install.man DESTDIR=${D} - insinto /usr/X11R6/lib/X11 - doins ${FILESDIR}/${PV}/XftConfig - cd ${D}/usr/X11R6/lib/X11/fonts - tar xzf ${DISTDIR}/truetype.tar.gz - preplib /usr/X11R6 - insinto /etc/env.d - doins ${FILESDIR}/10xfree - insinto /etc/X11/xinit - doins ${FILESDIR}/xinitrc - insinto /etc/X11/xdm - doins ${FILESDIR}/Xsession -} - - - - diff --git a/x11-base/xfree/xfree-4.0.3-r2.ebuild b/x11-base/xfree/xfree-4.0.3-r2.ebuild deleted file mode 100644 index 08b6d7cf3de6..000000000000 --- a/x11-base/xfree/xfree-4.0.3-r2.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.0.3-r2.ebuild,v 1.2 2001/04/24 15:51:05 achim Exp $ - -A="X402src-1.tgz X402src-2.tgz X402src-3.tgz 4.0.2-4.0.3.diff.gz truetype.tar.gz" -S=${WORKDIR}/xc -DESCRIPTION="Xfree - 4.0.3 with Antialias support and ATI TV and Overlay support from the LiVID project" -SRC_PATH0="ftp://ftp.xfree.org/pub/XFree86/4.0.2/source" -SRC_PATH1="ftp://ftp1.sourceforge.net/pub/mirrors/XFree86/4.0.2/source" - -SRC_URI="$SRC_PATH0/X402src-1.tgz $SRC_PATH0/X402src-2.tgz $SRC_PATH0/X402src-3.tgz - $SRC_PATH1/X402src-1.tgz $SRC_PATH1/X402src-2.tgz $SRC_PATH1/X402src-3.tgz - ftp://ftp.xfree.org/pub/XFree86/4.0.3/patches/4.0.2-4.0.3.diff.gz - ftp://ftp1.sourceforge.net/pub/mirrors/XFree86/4.0.3/patches/4.0.2-4.0.3.diff.gz - http://keithp.com/~keithp/fonts/truetype.tar.gz" -# http://www.linuxvideo.org/devel/data/gatos.tar.gz" - -HOMEPAGE="http://www.xfree.org - http://www.linuxvideo.org/gatos/" - -DEPEND=">=media-libs/freetype-2.0.1 - >=sys-libs/ncurses-5.1 - >=sys-libs/zlib-1.1.3-r2 - >=sys-devel/flex-2.5.4a-r2 - sys-devel/perl" - -PROVIDE="virtual/x11 virtual/opengl" - -src_unpack () { - - unpack X402src-{1,2,3}.tgz - #gatos.tar.gz - cd ${S} - gzip -dc ${DISTDIR}/4.0.2-4.0.3.diff.gz | patch -p1 - patch -p1 < ${FILESDIR}/${PV}/glibc-2.2.2-ClockP.diff - cp ${FILESDIR}/${PV}/site.def config/cf/host.def - echo "#define DefaultGcc2i386Opt ${CFLAGS}" >> config/cf/host.def - #( cd ${S}/programs/Xserver/hw/xfree86/loader; patch -p0 < ${WORKDIR}/gatos-ati/ati_xv/loader.patch ) - #( cd ${S}/programs/Xserver/hw/xfree86/i2c; patch -p1 < ${WORKDIR}/gatos-ati/ati_xv/i2c.patch ) - -} - -src_compile() { - - try make World - #cd ${WORKDIR}/gatos-ati/ati_xv/ati.2 - #export PATH=${S}/config/imake/bootstrap:$PATH - #try ${S}/config/util/xmkmf ${S} - #try make -} - -src_install() { - - try make install DESTDIR=${D} - try make install.man DESTDIR=${D} - # MANPATH=/usr/X11R6/share/man - - #cd ${WORKDIR}/gatos-ati/ati_xv/ati.2 - - #try make install DESTDIR=${D} - - insinto /usr/X11R6/lib/X11 - doins ${FILESDIR}/${PV}/XftConfig - cd ${D}/usr/X11R6/lib/X11/fonts - tar xzf ${DISTDIR}/truetype.tar.gz - - dosym /usr/X11R6/lib/libGL.so.1.2 /usr/lib/libMesaGL.so.3 - - insinto /etc/env.d - doins ${FILESDIR}/10xfree - insinto /etc/X11/xinit - doins ${FILESDIR}/xinitrc - insinto /etc/X11/xdm - doins ${FILESDIR}/Xsession - -} - - - - diff --git a/x11-base/xfree/xfree-4.0.3.ebuild b/x11-base/xfree/xfree-4.0.3.ebuild deleted file mode 100644 index dfd0939c183a..000000000000 --- a/x11-base/xfree/xfree-4.0.3.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.0.3.ebuild,v 1.1 2001/04/05 00:03:37 achim Exp $ - -A="X402src-1.tgz X402src-2.tgz X402src-3.tgz 4.0.2-4.0.3.diff.gz truetype.tar.gz gatos.tar.gz" -S=${WORKDIR}/xc -DESCRIPTION="Xfree - 4.0.3 with Antialias support and ATI TV and Overlay support from the LiVID project" -SRC_PATH0="ftp://ftp.xfree.org/pub/XFree86/4.0.2/source" -SRC_PATH1="ftp://ftp1.sourceforge.net/pub/mirrors/XFree86/4.0.2/source" - -SRC_URI="$SRC_PATH0/X402src-1.tgz $SRC_PATH0/X402src-2.tgz $SRC_PATH0/X402src-3.tgz - $SRC_PATH1/X402src-1.tgz $SRC_PATH1/X402src-2.tgz $SRC_PATH1/X402src-3.tgz - ftp://ftp.xfree.org/pub/XFree86/4.0.3/patches/4.0.2-4.0.3.diff.gz - ftp://ftp1.sourceforge.net/pub/mirrors/XFree86/4.0.3/patches/4.0.2-4.0.3.diff.gz - http://keithp.com/~keithp/fonts/truetype.tar.gz - http://www.linuxvideo.org/devel/data/gatos.tar.gz" - -HOMEPAGE="http://www.xfree.org - http://www.linuxvideo.org/gatos/" - -DEPEND=">=media-libs/freetype-2.0.1 - >=sys-libs/ncurses-5.1 - >=sys-libs/zlib-1.1.3-r2 - >=sys-devel/flex-2.5.4a-r2 - sys-devel/perl" - - -src_unpack () { - - unpack X402src-{1,2,3}.tgz gatos.tar.gz - cd ${S} - gzip -dc ${DISTDIR}/4.0.2-4.0.3.diff.gz | patch -p1 - patch -p1 < ${FILESDIR}/${PV}/glibc-2.2.2-ClockP.diff - cp ${FILESDIR}/${PV}/site.def config/cf/host.def - echo "#define DefaultGcc2i386Opt ${CFLAGS}" >> config/cf/host.def - ( cd ${S}/programs/Xserver/hw/xfree86/loader; patch -p0 < ${WORKDIR}/gatos-ati/ati_xv/loader.patch ) - ( cd ${S}/programs/Xserver/hw/xfree86/i2c; patch -p1 < ${WORKDIR}/gatos-ati/ati_xv/i2c.patch ) - -} - -src_compile() { - - try make World - cd ${WORKDIR}/gatos-ati/ati_xv/ati.2 - export PATH=${S}/config/imake/bootstrap:$PATH - try ${S}/config/util/xmkmf ${S} - try make -} - -src_install() { - - try make install DESTDIR=${D} - try make install.man DESTDIR=${D} - # MANPATH=/usr/X11R6/share/man - - cd ${WORKDIR}/gatos-ati/ati_xv/ati.2 - - try make install DESTDIR=${D} - - insinto /usr/X11R6/lib/X11 - doins ${FILESDIR}/${PV}/XftConfig - cd ${D}/usr/X11R6/lib/X11/fonts - tar xzf ${DISTDIR}/truetype.tar.gz - preplib /usr/X11R6 - insinto /etc/env.d - doins ${FILESDIR}/10xfree - insinto /etc/X11/xinit - doins ${FILESDIR}/xinitrc - insinto /etc/X11/xdm - doins ${FILESDIR}/Xsession - -} - - - - diff --git a/x11-libs/fltk/files/digest-fltk-1.0.10 b/x11-libs/fltk/files/digest-fltk-1.0.10 deleted file mode 100644 index b525bdcfb13f..000000000000 --- a/x11-libs/fltk/files/digest-fltk-1.0.10 +++ /dev/null @@ -1 +0,0 @@ -MD5 e76cc38b6c0bdb046a8ac5cd31a7e65e fltk-1.0.10-source.tar.bz2 diff --git a/x11-libs/gtk+/files/digest-gtk+-1.2.10 b/x11-libs/gtk+/files/digest-gtk+-1.2.10 deleted file mode 100644 index 7c7d628a46aa..000000000000 --- a/x11-libs/gtk+/files/digest-gtk+-1.2.10 +++ /dev/null @@ -1 +0,0 @@ -MD5 4d5cb2fc7fb7830e4af9747a36bfce20 gtk+-1.2.10.tar.gz diff --git a/x11-libs/gtk+/files/digest-gtk+-1.2.8-r3 b/x11-libs/gtk+/files/digest-gtk+-1.2.8-r3 deleted file mode 100644 index 7fc9e80637ce..000000000000 --- a/x11-libs/gtk+/files/digest-gtk+-1.2.8-r3 +++ /dev/null @@ -1 +0,0 @@ -MD5 d947ecc5780b4367d4c50fbb019d0216 gtk+-1.2.8.tar.gz diff --git a/x11-libs/gtk+/files/digest-gtk+-1.2.9 b/x11-libs/gtk+/files/digest-gtk+-1.2.9 deleted file mode 100644 index a2e0ece009b6..000000000000 --- a/x11-libs/gtk+/files/digest-gtk+-1.2.9 +++ /dev/null @@ -1 +0,0 @@ -MD5 6246b4defcdeb85cf6ce32d644c29b95 gtk+-1.2.9.tar.gz diff --git a/x11-libs/gtk+/gtk+-1.2.10.ebuild b/x11-libs/gtk+/gtk+-1.2.10.ebuild deleted file mode 100644 index 1e90358ce67b..000000000000 --- a/x11-libs/gtk+/gtk+-1.2.10.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10.ebuild,v 1.1 2001/04/08 16:26:14 pete Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="gtk" -SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/${A} - ftp://ftp.gnome.org/pub/GNOME/stable/sources/gtk+/${A} - http://ftp.gnome.org/pub/GNOME/stable/sources/gtk+/${A}" -HOMEPAGE="http://www.gtk.org/" - -DEPEND="virtual/glibc - >=dev-libs/glib-1.2.10 - >=x11-base/xfree-4.0.1" - -src_compile() { - local myconf - - if [ "${DEBUG}" ] - then - myconf="--enable-debug=yes" - else - myconf="--enable-debug=no" - fi - - try ./configure --host=${CHOST} --prefix=/usr/X11R6 ${myconf} - --infodir=/usr/X11R6/share/info --mandir=/usr/X11R6/share/man --sysconfdir=/etc/X11 \ - --with-xinput=xfree --with-x - try make -} - -src_install() { - try make install DESTDIR=${D} - - preplib /usr/X11R6 - - dodoc AUTHORS COPYING ChangeLog* HACKING - dodoc NEWS* README* TODO - docinto docs - cd docs - dodoc *.txt *.gif text/* - cd html - docinto html - dodoc *.html *.gif - - #install nice, clean-looking default gtk+ style - insinto /etc/X11/gtk - doins ${FILESDIR}/gtkrc -} - - - - diff --git a/x11-libs/gtk+/gtk+-1.2.8-r3.ebuild b/x11-libs/gtk+/gtk+-1.2.8-r3.ebuild deleted file mode 100644 index 4ed89339666b..000000000000 --- a/x11-libs/gtk+/gtk+-1.2.8-r3.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.8-r3.ebuild,v 1.2 2000/12/19 00:56:45 achim Exp $ - -P=gtk+-1.2.8 -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="gtk" -SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/"${A} -HOMEPAGE="http://www.gtk.org" - -DEPEND=">=sys-apps/bash-2.04 - >=sys-libs/glibc-2.1.3 - >=dev-libs/glib-1.2.8 - >=x11-base/xfree-4.0.1" - -src_compile() { - cd ${S} - try ./configure --host=${CHOST} --prefix=/usr/X11R6 --infodir=/usr/info --sysconfdir=/etc/X11 --with-xinput=xfree --with-catgets --with-x - try make -} - -src_install() { - cd ${S} - try make install prefix=${D}/usr/X11R6 sysconfdir=${D}/etc/X11 \ - infodir=${D}/usr/info - preplib /usr/X11R6 - into /usr - dodoc AUTHORS COPYING ChangeLog* HACKING - dodoc NEWS* README* TODO - docinto docs - cd docs - dodoc *.txt *.gif text/* - cd html - docinto html - dodoc *.html *.gif - #install nice, clean-looking default gtk+ style - insinto /etc/X11/gtk - doins ${FILESDIR}/gtkrc -} - -pkg_postinst() { - ldconfig -r ${ROOT} -} - - - diff --git a/x11-libs/gtk+/gtk+-1.2.9.ebuild b/x11-libs/gtk+/gtk+-1.2.9.ebuild deleted file mode 100644 index e1ddc4a24ec5..000000000000 --- a/x11-libs/gtk+/gtk+-1.2.9.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.9.ebuild,v 1.1 2001/03/09 10:26:59 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="gtk" -SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/${A}" -HOMEPAGE="http://www.gtk.org" - -DEPEND="virtual/glibc - >=dev-libs/glib-1.2.9 - >=x11-base/xfree-4.0.1" - -src_compile() { - - try ./configure --host=${CHOST} --prefix=/usr/X11R6 \ - --infodir=/usr/X11R6/share/info --mandir=/usr/X11R6/share/man --sysconfdir=/etc/X11 \ - --with-xinput=xfree --with-x - try make -} - -src_install() { - - try make install prefix=${D}/usr/X11R6 sysconfdir=${D}/etc/X11 \ - infodir=${D}/usr/X11R6/share/info mandir=${D}/usr/X11R6/share/man - - preplib /usr/X11R6 - - dodoc AUTHORS COPYING ChangeLog* HACKING - dodoc NEWS* README* TODO - docinto docs - cd docs - dodoc *.txt *.gif text/* - cd html - docinto html - dodoc *.html *.gif - - #install nice, clean-looking default gtk+ style - insinto /etc/X11/gtk - doins ${FILESDIR}/gtkrc -} - - - - diff --git a/x11-libs/libPropList/files/digest-libPropList-0.10.1-r1 b/x11-libs/libPropList/files/digest-libPropList-0.10.1-r1 deleted file mode 100644 index 1c2850d782cc..000000000000 --- a/x11-libs/libPropList/files/digest-libPropList-0.10.1-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 ff32a4edbf9d0861012b2f10fd302ad5 libPropList-0.10.1.tar.gz diff --git a/x11-libs/libPropList/libPropList-0.10.1-r1.ebuild b/x11-libs/libPropList/libPropList-0.10.1-r1.ebuild deleted file mode 100644 index 785456ea6357..000000000000 --- a/x11-libs/libPropList/libPropList-0.10.1-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libPropList/libPropList-0.10.1-r1.ebuild,v 1.4 2000/11/01 04:44:24 achim Exp $ - -P=libPropList-0.10.1 -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="libPropList" -SRC_URI="ftp://ftp.windowmaker.org/pub/release/srcs/current/"${A} -HOMEPAGE="http://www.windowmaker.org/" - -DEPEND=">=sys-libs/glibc-2.1.3" - -src_compile() { - cd ${S} - try ./configure --host=${CHOST} --prefix=/usr/X11R6 - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/usr/X11R6 install - dodoc AUTHORS COPYING* ChangeLog README TODO -} - - - - diff --git a/x11-libs/openmotif/files/digest-openmotif-2.1.30 b/x11-libs/openmotif/files/digest-openmotif-2.1.30 deleted file mode 100644 index a44b9d9cae43..000000000000 --- a/x11-libs/openmotif/files/digest-openmotif-2.1.30 +++ /dev/null @@ -1 +0,0 @@ -MD5 950f0d409e0ce508fa3995790c1106c7 openmotif-2.1.30-4_MLI.src.tar.gz diff --git a/x11-libs/openmotif/openmotif-2.1.30.ebuild b/x11-libs/openmotif/openmotif-2.1.30.ebuild deleted file mode 100644 index 079ef804a8da..000000000000 --- a/x11-libs/openmotif/openmotif-2.1.30.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30.ebuild,v 1.1 2000/12/09 15:38:34 drobbins Exp $ - -A=openmotif-2.1.30-4_MLI.src.tar.gz -S=${WORKDIR}/motif -DESCRIPTION="Open Motif (Metrolink Bug Fix Release)" -SRC_URI="ftp://ftp.metrolink.com/pub/openmotif/2.1.30-4/"${A} -HOMEPAGE="http://www.metrolink.com/openmotif/" - -DEPEND=">=sys-apps/bash-2.04 - >=sys-libs/glibc-2.1.3 - >=x11-base/xfree-4.0.1" - -src_unpack() { - unpack ${A} - cp ${O}/files/site.def ${S}/config/cf/ -} - -src_compile() { - cd ${S} - mkdir -p imports/x11 - cd imports/x11 - ln -s /usr/X11R6/bin bin - ln -s /usr/X11R6/include include - ln -s /usr/X11R6/lib lib - cd ${S} - try make World -} - -src_install() { -# cd ${S}/bindings -# cp Makefile Makefile.orig -# sed -e "s:sun_mit:sun_at:" -e "s:sun_news:sun:" Makefile.orig > Makefile - cd ${S} - try make DESTDIR=${D} VARDIR=${D}/var/X11/ install -} - - - - - - - diff --git a/x11-libs/qt-x11/files/digest-qt-x11-2.2.2 b/x11-libs/qt-x11/files/digest-qt-x11-2.2.2 deleted file mode 100644 index 57a2d90993cc..000000000000 --- a/x11-libs/qt-x11/files/digest-qt-x11-2.2.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 682e8f62af48770aea52036eb6329792 qt-x11-2.2.2.tar.gz diff --git a/x11-libs/qt-x11/files/digest-qt-x11-2.2.3 b/x11-libs/qt-x11/files/digest-qt-x11-2.2.3 deleted file mode 100644 index 87ccecf82ae7..000000000000 --- a/x11-libs/qt-x11/files/digest-qt-x11-2.2.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 964ca0e7e641271a2f5706a0e4383fcf qt-x11-2.2.3.tar.gz diff --git a/x11-libs/qt-x11/files/digest-qt-x11-2.2.3a b/x11-libs/qt-x11/files/digest-qt-x11-2.2.3a deleted file mode 100644 index 87ccecf82ae7..000000000000 --- a/x11-libs/qt-x11/files/digest-qt-x11-2.2.3a +++ /dev/null @@ -1 +0,0 @@ -MD5 964ca0e7e641271a2f5706a0e4383fcf qt-x11-2.2.3.tar.gz diff --git a/x11-libs/qt-x11/files/digest-qt-x11-2.2.4 b/x11-libs/qt-x11/files/digest-qt-x11-2.2.4 deleted file mode 100644 index 8904204f84f4..000000000000 --- a/x11-libs/qt-x11/files/digest-qt-x11-2.2.4 +++ /dev/null @@ -1 +0,0 @@ -MD5 0a5cb173ded05c6b6ea620396d16889d qt-x11-2.2.4.tar.gz diff --git a/x11-libs/qt-x11/files/qt-2.2.3.diff.gz b/x11-libs/qt-x11/files/qt-2.2.3.diff.gz Binary files differdeleted file mode 100644 index 7b1fa1597faf..000000000000 --- a/x11-libs/qt-x11/files/qt-2.2.3.diff.gz +++ /dev/null diff --git a/x11-libs/qt-x11/qt-x11-2.2.2.ebuild b/x11-libs/qt-x11/qt-x11-2.2.2.ebuild deleted file mode 100644 index 164a86ba2b95..000000000000 --- a/x11-libs/qt-x11/qt-x11-2.2.2.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-x11/qt-x11-2.2.2.ebuild,v 1.2 2001/04/23 19:59:44 drobbins Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/qt-2.2.2 -DESCRIPTION="QT 2.2" -SRC_PATH="kde/stable/2.0/distribution/tar/generic/src/${A}" -SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/${A}" -HOMEPAGE="http://www.kde.org/" - -DEPEND=">=media-libs/libpng-1.0.7 - >=media-libs/libmng-0.9.3 - virtual/opengl - >=media-sound/nas-1.4.1 - virtual/x11" - -export QTDIR=${S} - -src_unpack() { - unpack ${A} - cd ${S} - cp configure configure.orig - sed -e "s:read acceptance:acceptance=yes:" configure.orig > configure -} - -src_compile() { - cd ${S} - export LDFLAGS="-ldl" - ./configure -sm -thread -system-zlib -system-jpeg -system-nas-sound \ - -system-libmng -system-libpng -gif -platform linux-g++ -ldl -lpthread - cd ${S}/src - cp Makefile Makefile.orig - sed -e "s/-O2/${CFLAGS}/" Makefile.orig > Makefile - cd ${S}/tools - cp Makefile Makefile.orig - sed -e "s/-O2/${CFLAGS}/" Makefile.orig > Makefile - cd ${S}/src/moc - cp Makefile Makefile.orig - sed -e "s/-pipe -O2/${CFLAGS}/" Makefile.orig > Makefile - cd ${S} - try make symlinks src-moc src-mt sub-src sub-tools -} - -src_install() { - - QTBASE=/usr/X11R6/lib - cd ${S} - dodir $QTBASE/${P} - into $QTBASE/${P} - dobin bin/* - dolib.so lib/libqt.so.${PV} - dolib.so lib/libqt-mt.so.${PV} - dolib.so lib/libqutil.so.1.0.0 - preplib $QTBASE/lib/${P} - dosym libqt.so.${PV} $QTBASE/${P}/lib/libqt.so - dosym libqt-mt.so.${PV} $QTBASE/${P}/lib/libqt-mt.so - dosym libqutil.so.1.0.0 $QTBASE/${P}/lib/libqutil.so - cd ${D}${QTBASE} - ln -sf qt-x11-${PV} qt - cd ${S} - dodir ${QTBASE}/${P}/include - cp include/* ${D}${QTBASE}/${P}/include/ - doman doc/man/man3/* - - dodoc ANNOUNCE FAQ LICENSE.QPL MANIFEST PLATFORMS - dodoc PORTING README* - cp -af ${S}/doc/html ${D}/usr/doc/${P} - -} - - - - diff --git a/x11-libs/qt-x11/qt-x11-2.2.3.ebuild b/x11-libs/qt-x11/qt-x11-2.2.3.ebuild deleted file mode 100644 index e98613454f27..000000000000 --- a/x11-libs/qt-x11/qt-x11-2.2.3.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-x11/qt-x11-2.2.3.ebuild,v 1.6 2001/04/23 19:59:44 drobbins Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/qt-${PV} -DESCRIPTION="QT 2.2" -SRC_PATH="kde/stable/2.0/distribution/tar/generic/src/${A}" -SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/${A}" -HOMEPAGE="http://www.kde.org/" - -DEPEND=">=media-libs/libpng-1.0.7 - >=media-libs/libmng-0.9.3 - virtual/opengl - >=media-sound/nas-1.4.1 - virtual/x11" - -export QTDIR=${S} - -src_unpack() { - unpack ${A} - cd ${S} - cp configure configure.orig - sed -e "s:read acceptance:acceptance=yes:" configure.orig > configure -} - -src_compile() { - cd ${S} - export LDFLAGS="-ldl" - ./configure -sm -thread -system-zlib -system-jpeg -system-nas-sound \ - -system-libmng -system-libpng -gif -platform linux-g++ -ldl -lpthread - cd ${S}/src - cp Makefile Makefile.orig - sed -e "s/-O2/${CFLAGS}/" Makefile.orig > Makefile - cd ${S}/tools - cp Makefile Makefile.orig - sed -e "s/-O2/${CFLAGS}/" Makefile.orig > Makefile - cd ${S}/src/moc - cp Makefile Makefile.orig - sed -e "s/-pipe -O2/${CFLAGS}/" Makefile.orig > Makefile - cd ${S} - try make symlinks src-moc src-mt sub-src sub-tools -} - -src_install() { - - QTBASE=/usr/X11R6/lib - cd ${S} - dodir $QTBASE/${P} - into $QTBASE/${P} - dobin bin/* - dolib.so lib/libqt.so.${PV} - dolib.so lib/libqt-mt.so.${PV} - dolib.so lib/libqutil.so.1.0.0 - preplib $QTBASE/${P} - dosym libqt.so.${PV} $QTBASE/${P}/lib/libqt.so - dosym libqt-mt.so.${PV} $QTBASE/${P}/lib/libqt-mt.so - dosym libqutil.so.1.0.0 $QTBASE/${P}/lib/libqutil.so - cd ${D}${QTBASE} - ln -sf qt-x11-${PV} qt - cd ${S} - dodir ${QTBASE}/${P}/include - cp include/* ${D}${QTBASE}/${P}/include/ - doman doc/man/man3/* - - dodoc ANNOUNCE FAQ LICENSE.QPL MANIFEST PLATFORMS - dodoc PORTING README* - cp -af ${S}/doc/html ${D}/usr/doc/${P} - insinto /etc/env.d - doins ${FILESDIR}/90qt - -} - - - - diff --git a/x11-libs/qt-x11/qt-x11-2.2.3a.ebuild b/x11-libs/qt-x11/qt-x11-2.2.3a.ebuild deleted file mode 100644 index 66a4f4d49a4a..000000000000 --- a/x11-libs/qt-x11/qt-x11-2.2.3a.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-x11/qt-x11-2.2.3a.ebuild,v 1.2 2001/04/23 19:59:44 drobbins Exp $ - -A=${PN}-2.2.3.tar.gz -S=${WORKDIR}/qt-2.2.3 -DESCRIPTION="QT 2.2" -SRC_PATH="kde/stable/2.0/distribution/tar/generic/src/${A}" -SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/${A}" -HOMEPAGE="http://www.kde.org/" - -DEPEND=">=media-libs/libpng-1.0.7 - >=media-libs/libmng-0.9.3 - virtual/opengl - >=media-sound/nas-1.4.1 - virtual/x11" - -export QTDIR=${S} - -src_unpack() { - unpack ${A} - cd ${S} - gzip -dc ${FILESDIR}/qt-2.2.3.diff.gz | patch -p0 - cp configure configure.orig - sed -e "s:read acceptance:acceptance=yes:" configure.orig > configure -} - -src_compile() { - cd ${S} - export LDFLAGS="-ldl" - ./configure -sm -thread -system-zlib -system-jpeg -system-nas-sound \ - -system-libmng -system-libpng -gif -platform linux-g++ -ldl -lpthread - cd ${S}/src - cp Makefile Makefile.orig - sed -e "s/-O2/${CFLAGS}/" Makefile.orig > Makefile - cd ${S}/tools - cp Makefile Makefile.orig - sed -e "s/-O2/${CFLAGS}/" Makefile.orig > Makefile - cd ${S}/src/moc - cp Makefile Makefile.orig - sed -e "s/-pipe -O2/${CFLAGS}/" Makefile.orig > Makefile - cd ${S} - try make symlinks src-moc src-mt sub-src sub-tools -} - -src_install() { - - QTBASE=/usr/X11R6/lib - cd ${S} - dodir $QTBASE/${P} - into $QTBASE/${P} - dobin bin/* - dolib.so lib/libqt.so.${PV} - dolib.so lib/libqt-mt.so.${PV} - dolib.so lib/libqutil.so.1.0.0 - preplib $QTBASE/lib/${P} - dosym libqt.so.${PV} $QTBASE/${P}/lib/libqt.so - dosym libqt-mt.so.${PV} $QTBASE/${P}/lib/libqt-mt.so - dosym libqutil.so.1.0.0 $QTBASE/${P}/lib/libqutil.so - cd ${D}${QTBASE} - ln -sf qt-x11-${PV} qt - cd ${S} - dodir ${QTBASE}/${P}/include - cp include/* ${D}${QTBASE}/${P}/include/ - doman doc/man/man3/* - - dodoc ANNOUNCE FAQ LICENSE.QPL MANIFEST PLATFORMS - dodoc PORTING README* - cp -af ${S}/doc/html ${D}/usr/doc/${P} - -} - - - - diff --git a/x11-libs/qt-x11/qt-x11-2.2.4-r1.ebuild b/x11-libs/qt-x11/qt-x11-2.2.4-r1.ebuild deleted file mode 100644 index 391619b60094..000000000000 --- a/x11-libs/qt-x11/qt-x11-2.2.4-r1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-x11/qt-x11-2.2.4-r1.ebuild,v 1.2 2001/04/23 19:59:44 drobbins Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/qt-${PV} -DESCRIPTION="QT 2.2" -SRC_PATH="kde/stable/2.0/distribution/tar/generic/src/${A}" -SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/${A}" -HOMEPAGE="http://www.kde.org/" - -DEPEND=">=media-libs/libpng-1.0.9 - >=media-libs/libmng-1.0.0 - >=media-libs/jpeg-6b - opengl? ( virtual/opengl ) - nas? ( >=media-sound/nas-1.4.1 ) - virtual/x11" - -export QTDIR=${S} - -src_unpack() { - unpack ${A} - cd ${S} - cp configure configure.orig - sed -e "s:read acceptance:acceptance=yes:" configure.orig > configure -} - -src_compile() { - - export LDFLAGS="-ldl" - local myconf - - if [ -z "`use opengl`" ] - then - myconf="-no-opengl" - fi - - if [ "`use nas`" ] - then - myconf="${myconf} -system-nas-sound" - else - myconf="${myconf} -no-nas-sound" - fi - - if [ "`use gif`" ] - then - myconf="${myconf} -gif" - fi - - if [ "$DEBUG" ] - then - myconf="${myconf} -debug" - else - myconf="${myconf} -release" - fi - - ./configure -sm -thread -system-zlib -system-jpeg ${myconf} \ - -system-libmng -system-libpng -gif -platform linux-g++ -ldl -lpthread - - cd ${S}/src - cp Makefile Makefile.orig - sed -e "s/-O2/${CFLAGS}/" Makefile.orig > Makefile - cd ${S}/tools - cp Makefile Makefile.orig - sed -e "s/-O2/${CFLAGS}/" Makefile.orig > Makefile - cd ${S}/src/moc - cp Makefile Makefile.orig - sed -e "s/-pipe -O2/${CFLAGS}/" Makefile.orig > Makefile - cd ${S} - try make symlinks src-moc src-mt sub-src sub-tools -} - -src_install() { - - QTBASE=/usr/X11R6/lib - cd ${S} - dodir $QTBASE/${P} - into $QTBASE/${P} - dobin bin/* - dolib.so lib/libqt.so.${PV} - dolib.so lib/libqt-mt.so.${PV} - dolib.so lib/libqutil.so.1.0.0 - preplib $QTBASE/${P} - dosym libqt.so.${PV} $QTBASE/${P}/lib/libqt.so - dosym libqt-mt.so.${PV} $QTBASE/${P}/lib/libqt-mt.so - dosym libqutil.so.1.0.0 $QTBASE/${P}/lib/libqutil.so - cd ${D}${QTBASE} - ln -sf qt-x11-${PV} qt - cd ${S} - dodir ${QTBASE}/${P}/include - cp include/* ${D}${QTBASE}/${P}/include/ - doman doc/man/man3/* - - dodoc ANNOUNCE FAQ LICENSE.QPL MANIFEST PLATFORMS - dodoc PORTING README* - cp -af ${S}/doc/html ${D}/usr/doc/${P} - insinto /etc/env.d - doins ${FILESDIR}/90qt - -} - - - - diff --git a/x11-wm/enlightenment/enlightenment-0.16.5.ebuild b/x11-wm/enlightenment/enlightenment-0.16.5.ebuild deleted file mode 100644 index f7c048e408e8..000000000000 --- a/x11-wm/enlightenment/enlightenment-0.16.5.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.16.5.ebuild,v 1.1 2000/11/26 22:48:36 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Enlightenment Window Manager" -SRC_URI="ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/"${A} -HOMEPAGE="http://www.enlightenment.org/" - -DEPEND=">=media-libs/fnlib-0.5 - >=media-sound/esound-0.2.19 - >=media-libs/freetype-1.3.1 - >=gnome-base/libghttp-1.0.7" - -src_unpack() { - unpack ${A} -} - -src_compile() { - cd ${S} - try CFLAGS="\"${CFLAGS} -I/opt/gnome/include\"" LDFLAGS="-L/opt/gnome/lib" \ - ./configure --host=${CHOST} --prefix=/usr/X11R6 --with-catgets - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/usr/X11R6 localedir=${D}/usr/X11R6/enlightenment/locale \ - gnulocaledir=${D}/usr/X11R6/enlightenment/locale install - - dodoc AUTHORS ChangeLog COPYING NEWS README - docinto sample-scripts - dodoc sample-scripts/* -} - - - diff --git a/x11-wm/enlightenment/files/digest-enlightenment-0.16.5 b/x11-wm/enlightenment/files/digest-enlightenment-0.16.5 deleted file mode 100644 index 96494ff73e9c..000000000000 --- a/x11-wm/enlightenment/files/digest-enlightenment-0.16.5 +++ /dev/null @@ -1 +0,0 @@ -MD5 3902b7c9cfaa8f70ca8079b348de0ed5 enlightenment-0.16.5.tar.gz diff --git a/x11-wm/pwm/files/digest-pwm-1.0 b/x11-wm/pwm/files/digest-pwm-1.0 deleted file mode 100644 index 7b699abc4c66..000000000000 --- a/x11-wm/pwm/files/digest-pwm-1.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 9a1efe73f597a3303aa94b8d0136779d pwm-1.0.tar.gz diff --git a/x11-wm/pwm/pwm-1.0.ebuild b/x11-wm/pwm/pwm-1.0.ebuild deleted file mode 100644 index d08dac06fbcf..000000000000 --- a/x11-wm/pwm/pwm-1.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Ryan Tolboom <ryan@intphsys.com> -# $Header: /var/cvsroot/gentoo-x86/x11-wm/pwm/pwm-1.0.ebuild,v 1.1 2001/02/06 07:19:50 achim Exp $ - -S=${WORKDIR}/pwm-1.0 -SRC_URI="http://www.students.tut.fi/~tuomov/dl/pwm-1.0.tar.gz" - -HOMEPAGE="http://www.students.tut.fi/~tuomov/pwm" - -DESCRIPTION="A lightweight window manager" - -DEPEND=">=x11-base/xfree-4.0.1" - - -src_unpack() { - - unpack ${A} - cd ${S} - cp config.h config.orig - sed -e "s:PREFIX\"/etc/pwm/\":\"/etc/X11/pwm/\":" \ - config.orig > config.h - cp system.mk system.orig - sed -e "s:-g -O2:${CFLAGS}:" system.orig > system.mk - -} - -src_compile() { - - try make - -} - -src_install() { - - try make PREFIX=${D}/usr/X11R6 ETCDIR=${D}/etc/X11 DOCDIR=${D}/usr/doc/${PF} install - dodoc config.txt - -} diff --git a/x11-wm/sawfish/files/digest-sawfish-0.34 b/x11-wm/sawfish/files/digest-sawfish-0.34 deleted file mode 100644 index 4ab020659dac..000000000000 --- a/x11-wm/sawfish/files/digest-sawfish-0.34 +++ /dev/null @@ -1 +0,0 @@ -MD5 ea8100ac8ed88622b85b5b620a5a483c sawfish-0.34.tar.gz diff --git a/x11-wm/sawfish/files/digest-sawfish-0.35 b/x11-wm/sawfish/files/digest-sawfish-0.35 deleted file mode 100644 index fb2e444e44b7..000000000000 --- a/x11-wm/sawfish/files/digest-sawfish-0.35 +++ /dev/null @@ -1 +0,0 @@ -MD5 feaa1f28eead003bdc9b5d397a5ff581 sawfish-0.35.tar.gz diff --git a/x11-wm/sawfish/files/digest-sawfish-0.37.3 b/x11-wm/sawfish/files/digest-sawfish-0.37.3 deleted file mode 100644 index aa193f4361f1..000000000000 --- a/x11-wm/sawfish/files/digest-sawfish-0.37.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 b8207fe7b49bc1f0fa57e39d40ddd213 sawfish-0.37.3.tar.gz diff --git a/x11-wm/sawfish/files/digest-sawfish-0.37.3-r1 b/x11-wm/sawfish/files/digest-sawfish-0.37.3-r1 deleted file mode 100644 index aa193f4361f1..000000000000 --- a/x11-wm/sawfish/files/digest-sawfish-0.37.3-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 b8207fe7b49bc1f0fa57e39d40ddd213 sawfish-0.37.3.tar.gz diff --git a/x11-wm/sawfish/sawfish-0.35.ebuild b/x11-wm/sawfish/sawfish-0.35.ebuild deleted file mode 100644 index e2e818091e61..000000000000 --- a/x11-wm/sawfish/sawfish-0.35.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-0.35.ebuild,v 1.1 2001/01/09 19:58:50 drobbins Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Extensible window manager using a Lisp-based scripting language" -SRC_URI="ftp://sawmill.sourceforge.net/pub/sawmill/"${A} -HOMEPAGE="http://sawmill.sourceforge.net/" -DEPEND=">=dev-libs/rep-gtk-0.14 - >=media-sound/esound-0.2.19 - >=media-libs/imlib-0.9.8.1 - gnome? ( >=gnome-base/gnome-core-1.2.2.1 - >=gnome-base/libglade-0.14 )" - -src_unpack() { - unpack ${A} -} - -src_compile() { - cd ${S} - if [ -n "`use gnome`" ] - then - try ./configure --host=${CHOST} --prefix=/usr/X11R6 --with-audiofile --with-esd \ - --with-gnome-prefix=/opt/gnome - else - try ./configure --host=${CHOST} --prefix=/usr/X11R6 --with-audiofile --with-esd - fi - #pmake doesn't work, stick with make - try make -} - -src_install() { - cd ${S} - try make DESTDIR=${D} install - dodoc AUTHORS BUGS COPYING ChangeLog DOC FAQ NEWS README THANKS TODO -} - - - diff --git a/x11-wm/sawfish/sawfish-0.37.3-r1.ebuild b/x11-wm/sawfish/sawfish-0.37.3-r1.ebuild deleted file mode 100644 index 81c4bdbce26a..000000000000 --- a/x11-wm/sawfish/sawfish-0.37.3-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-0.37.3-r1.ebuild,v 1.1 2001/03/06 06:05:34 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Extensible window manager using a Lisp-based scripting language" -SRC_URI="ftp://sawmill.sourceforge.net/pub/sawmill/"${A} -HOMEPAGE="http://sawmill.sourceforge.net/" -DEPEND=">=dev-libs/rep-gtk-0.15-r1 - esd? ( >=media-sound/esound-0.2.22 ) - readline? ( >=sys-libs/readline-4.1 ) - nls? ( sys-devel/gettext ) - >=media-libs/audiofile-0.2.1 - >=media-libs/imlib-1.9.9 - gnome? ( >=gnome-base/gnome-core-1.3.1 - >=gnome-base/libglade-0.15-r1 )" - -src_compile() { - - local myconf - if [ "`use esd`" ] - then - myconf="--with-esd" - else - myconf="--without-esd" - fi - if [ "`use gnome`" ] - then - myconf="${myconf} --with-gnome-prefix=/opt/gnome --enable-gnome-widgets --enable-capplet" - else - myconf="${myconf} --disable-gnome-widgets --disable-capplet" - fi - if [ "`use readline`" ] - then - myconf="${myconf} --with-readline" - else - myconf="${myconf} --without-readline" - fi - if [ -z "`use nls`" ] - then - myconf="${myconf} --disable-linguas" - fi - - try ./configure --host=${CHOST} --prefix=/usr/X11R6 --infodir=/usr/X11R6/share/info --libexecdir=/usr/X11R6/lib --with-audiofile ${myconf} - - #pmake doesn't work, stick with make - try make -} - -src_install() { - - try make DESTDIR=${D} install - dodoc AUTHORS BUGS COPYING ChangeLog DOC FAQ NEWS README THANKS TODO - -} - - - diff --git a/x11-wm/sawfish/sawfish-0.37.3.ebuild b/x11-wm/sawfish/sawfish-0.37.3.ebuild deleted file mode 100644 index 3d6838db411b..000000000000 --- a/x11-wm/sawfish/sawfish-0.37.3.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-0.37.3.ebuild,v 1.1 2001/02/28 01:45:35 drobbins Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Extensible window manager using a Lisp-based scripting language" -SRC_URI="ftp://sawmill.sourceforge.net/pub/sawmill/"${A} -HOMEPAGE="http://sawmill.sourceforge.net/" -DEPEND=">=dev-libs/rep-gtk-0.14 - >=media-sound/esound-0.2.19 - >=media-libs/imlib-0.9.8.1 - gnome? ( >=gnome-base/gnome-core-1.2.2.1 - >=gnome-base/libglade-0.14 )" - -src_unpack() { - unpack ${A} -} - -src_compile() { - cd ${S} - if [ -n "`use gnome`" ] - then - try ./configure --host=${CHOST} --prefix=/usr/X11R6 --with-audiofile --with-esd \ - --with-gnome-prefix=/opt/gnome - else - try ./configure --host=${CHOST} --prefix=/usr/X11R6 --with-audiofile --with-esd - fi - #pmake doesn't work, stick with make - try make -} - -src_install() { - cd ${S} - try make DESTDIR=${D} install - dodoc AUTHORS BUGS COPYING ChangeLog DOC FAQ NEWS README THANKS TODO -} - - - |