diff options
| author |   Achim Gottinger <achim@gentoo.org> | 2001-06-09 02:10:54 +0000 |
|---|---|---|
| committer | Achim Gottinger <achim@gentoo.org> | 2001-06-09 02:10:54 +0000 |
| commit | 3b85f6dfe5c5a53951d993f35d74fe88597ee623 (patch) | |
| tree | b0ddc2a1d67e12d8db8eeca758d016248d77d1a8 | |
| parent | Some cleanup (diff) | |
| download | gentoo-2-3b85f6dfe5c5a53951d993f35d74fe88597ee623.tar.gz gentoo-2-3b85f6dfe5c5a53951d993f35d74fe88597ee623.tar.bz2 gentoo-2-3b85f6dfe5c5a53951d993f35d74fe88597ee623.zip | |
*** empty log message ***
341 files changed, 0 insertions, 38926 deletions
diff --git a/app-misc/gtkdiff/files/digest-gtkdiff-1.7.0 b/app-misc/gtkdiff/files/digest-gtkdiff-1.7.0 deleted file mode 100644 index 7fec77a96829..000000000000 --- a/app-misc/gtkdiff/files/digest-gtkdiff-1.7.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 35b6b1f21b550366a1928387f67ca11f gtkdiff-1.7.0.tar.gz diff --git a/app-misc/gtkdiff/gtkdiff-1.7.0.ebuild b/app-misc/gtkdiff/gtkdiff-1.7.0.ebuild deleted file mode 100644 index 93f8fecfe2ad..000000000000 --- a/app-misc/gtkdiff/gtkdiff-1.7.0.ebuild +++ /dev/null @@ -1,28 +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/app-misc/gtkdiff/gtkdiff-1.7.0.ebuild,v 1.2 2000/11/27 15:12:34 achim Exp $ - -S=${WORKDIR}/${P} -DESCRIPTION="GTK Frontend for diff" -SRC_URI="http://www.ainet.or.jp/~inoue/software/gtkdiff/${P}.tar.gz" -HOMEPAGE="http://www.ainet.or.jp/~inoue/software/gtkdiff/index-e.html" - -DEPEND=">=gnome-base/gnome-libs-1.2.8" - -src_compile() { - - cd ${S} - local myconf - try ./configure --prefix=/opt/gnome --host=${CHOST} - try make - -} - -src_install () { - - cd ${S} - try make prefix=${D}/opt/gnome install - dodoc AUTHORS COPYING ChangeLog NEWS README TODO -} - diff --git a/app-misc/krusader/files/digest-krusader-0.79.1 b/app-misc/krusader/files/digest-krusader-0.79.1 deleted file mode 100644 index 491ce571226d..000000000000 --- a/app-misc/krusader/files/digest-krusader-0.79.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 752100bbebbdfd5def66eb66e56c83a8 krusader-0.79-1.tar.gz diff --git a/app-misc/krusader/files/digest-krusader-0.90 b/app-misc/krusader/files/digest-krusader-0.90 deleted file mode 100644 index 491ce571226d..000000000000 --- a/app-misc/krusader/files/digest-krusader-0.90 +++ /dev/null @@ -1 +0,0 @@ -MD5 752100bbebbdfd5def66eb66e56c83a8 krusader-0.79-1.tar.gz diff --git a/app-misc/krusader/krusader-0.79.1.ebuild b/app-misc/krusader/krusader-0.79.1.ebuild deleted file mode 100644 index 0611f6305744..000000000000 --- a/app-misc/krusader/krusader-0.79.1.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 Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/app-misc/krusader/krusader-0.79.1.ebuild,v 1.1 2001/04/28 18:21:31 achim Exp $ - -A=${PN}-0.79-1.tar.gz -S=${WORKDIR}/${PN}-0.79 -DESCRIPTION="A Filemanager for KDE" -SRC_URI="http://krusader.sourceforge.net/distributions/${A}" -HOMEPAGE="http:/krusader.sourceforge.net/" - -DEPEND=">=kde-base/kdelibs-2.0 - >=app-text/openjade-1.3 - >=app-text/sgml-common-0.3" -RDEPEND=">=kde-base/kdelibs-2.0" - -src_compile() { - try ./configure --prefix=${KDEDIR} --host=${CHOST} - try make -} - -src_install () { - - try make DESTDIR=${D} install - -} - diff --git a/app-misc/krusader/krusader-0.90.ebuild b/app-misc/krusader/krusader-0.90.ebuild deleted file mode 100644 index fa26cb4b5463..000000000000 --- a/app-misc/krusader/krusader-0.90.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 Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/app-misc/krusader/krusader-0.90.ebuild,v 1.1 2001/05/06 16:07:20 achim Exp $ - -A=${PN}-0.79-1.tar.gz -S=${WORKDIR}/${PN}-0.79 -DESCRIPTION="A Filemanager for KDE" -SRC_URI="http://krusader.sourceforge.net/distributions/${A}" -HOMEPAGE="http:/krusader.sourceforge.net/" - -DEPEND=">=kde-base/kdelibs-2.0 - >=app-text/openjade-1.3 - >=app-text/sgml-common-0.3" -RDEPEND=">=kde-base/kdelibs-2.0" - -src_compile() { - try ./configure --prefix=${KDEDIR} --host=${CHOST} - try make -} - -src_install () { - - try make DESTDIR=${D} install - -} - diff --git a/app-office/abiword/abiword-0.7.12.ebuild b/app-office/abiword/abiword-0.7.12.ebuild deleted file mode 100644 index d42d97877239..000000000000 --- a/app-office/abiword/abiword-0.7.12.ebuild +++ /dev/null @@ -1,52 +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/app-office/abiword/abiword-0.7.12.ebuild,v 1.3 2001/05/18 17:13:55 achim Exp $ - -A="abi-${PV}.tar.gz abidistfiles.tar.gz expat.tar.gz - unixfonts.tar.gz wv.tar.gz" -S=${WORKDIR}/abi-${PV} -DESCRIPTION="Framework for creating database applications" -SRC_URI="http://download.abisource.com/releases/${PV}/src/abi-${PV}.tar.gz - http://download.abisource.com/releases/${PV}/src/abidistfiles.tar.gz - http://download.abisource.com/releases/${PV}/src/expat.tar.gz - http://download.abisource.com/releases/${PV}/src/unixfonts.tar.gz - http://download.abisource.com/releases/${PV}/src/wv.tar.gz" - - -HOMEPAGE="http://www.gnome.org/gnome-office/abiword.shtml/" - -DEPEND=">=sys-libs/glibc-2.1.3 - >=sys-devel/gcc-2.95.2 - =media-libs/freetype-1.3.1-r2 - >=media-libs/libpng-1.0.7 - >=dev-libs/glib-1.2.8 - >=x11-libs/gtk+-1.2.8 - virtual/x11" - - -src_unpack() { - unpack ${A} - cd ${S} -} - -src_compile() { - cd ${S} - try make prefix=/opt/gnome/ UNIX_CAN_BUILD_STATIC=0 -} - -src_install() { - cd ${S} - try make prefix=${D}/opt/gnome UNIX_CAN_BUILD_STATIC=0 install - cp ${D}/opt/gnome/AbiSuite/bin/AbiWord AbiWord.orig - sed -e "s:${D}::" AbiWord.orig > ${D}/opt/gnome/AbiSuite/bin/AbiWord - cd ${D}/opt/gnome/bin - rm -f abiword - rm -f AbiWord - ln -s ../AbiSuite/bin/AbiWord AbiWord - ln -s ../AbiSuite/bin/AbiWord abiword -} - - - - diff --git a/app-office/abiword/files/digest-abiword-0.7.12 b/app-office/abiword/files/digest-abiword-0.7.12 deleted file mode 100644 index 0f5b09d39a03..000000000000 --- a/app-office/abiword/files/digest-abiword-0.7.12 +++ /dev/null @@ -1,5 +0,0 @@ -MD5 3c7eb8cfaef1971d97a44b2fba1fa7a9 abi-0.7.12.tar.gz -MD5 b750d05cb417ed0835e7c0e298f71ae6 abidistfiles.tar.gz -MD5 e7a3a3d7963aec7ac55bfa343d36e2cd expat.tar.gz -MD5 618cfbc3de9b73407d47ba283b5955a9 unixfonts.tar.gz -MD5 adc023021a296260d4607a5e8ae01018 wv.tar.gz diff --git a/app-office/dia/dia-0.86-r1.ebuild b/app-office/dia/dia-0.86-r1.ebuild deleted file mode 100644 index e7f74946a43a..000000000000 --- a/app-office/dia/dia-0.86-r1.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/app-office/dia/dia-0.86-r1.ebuild,v 1.4 2000/11/25 17:05:13 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Diagram Creation Program" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/gnome-office/dia.shtml" - -DEPEND=">=gnome-base/gnome-print-0.24 - >=app-arch/rpm-3.0.5" - - -src_compile() { - - cd ${S} - local myconf -# if [ "`use bonobo`" ] -# then -# myconf="--enable-bonobo" -# fi - try ./configure --host=${CHOST} --prefix=/opt/gnome \ - --enable-gnome --enable-gnome-print ${myconf} - # bonobo support does not work yet - try make - -} - -src_install () { - - cd ${S} - try make prefix=${D}/opt/gnome install - dodoc AUTHORS COPYING ChangeLog README NEWS TODO KNOWN_BUGS -} - - - - - diff --git a/app-office/dia/dia-0.87.ebuild b/app-office/dia/dia-0.87.ebuild deleted file mode 100644 index 6bf682aebd35..000000000000 --- a/app-office/dia/dia-0.87.ebuild +++ /dev/null @@ -1,46 +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/app-office/dia/dia-0.87.ebuild,v 1.2 2001/05/10 03:51:37 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Diagram Creation Program" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/gnome-office/dia.shtml" - -DEPEND=">=gnome-base/gnome-print-0.24 - >=app-arch/rpm-3.0.5 - bonobo? ( gnome-base/bonobo ) - python? ( dev-lang/python-2.0 )" - - -src_compile() { - - local myconf - if [ "`use bonobo`" ] - then - myconf="--enable-bonobo" - fi -# if [ "`use python`" ] -# then -# myconf="$myconf --with-python" -# fi - try ./configure --host=${CHOST} --prefix=/opt/gnome \ - --sysconfdir=/etc/opt/gnome \ - --enable-gnome --enable-gnome-print ${myconf} - try make - -} - -src_install () { - - try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome install - dodoc AUTHORS COPYING ChangeLog README NEWS TODO KNOWN_BUGS - -} - - - - - diff --git a/app-office/dia/files/digest-dia-0.86-r1 b/app-office/dia/files/digest-dia-0.86-r1 deleted file mode 100644 index 77e2182066bb..000000000000 --- a/app-office/dia/files/digest-dia-0.86-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 66c32ceb8d034137be88d4b649e405a2 dia-0.86.tar.gz diff --git a/app-office/dia/files/digest-dia-0.87 b/app-office/dia/files/digest-dia-0.87 deleted file mode 100644 index 3823bcf7891c..000000000000 --- a/app-office/dia/files/digest-dia-0.87 +++ /dev/null @@ -1 +0,0 @@ -MD5 36a2c19544b3537632af06bfa67eb45f dia-0.87.tar.gz diff --git a/app-office/gnucash/files/digest-gnucash-1.4.7-r2 b/app-office/gnucash/files/digest-gnucash-1.4.7-r2 deleted file mode 100644 index e3da7b94cfcb..000000000000 --- a/app-office/gnucash/files/digest-gnucash-1.4.7-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 49dbbcd4c7dd8354a2566dd76ca5eb69 gnucash-1.4.7.tar.gz diff --git a/app-office/gnucash/gnucash-1.4.7-r2.ebuild b/app-office/gnucash/gnucash-1.4.7-r2.ebuild deleted file mode 100644 index 7e110d6dbb20..000000000000 --- a/app-office/gnucash/gnucash-1.4.7-r2.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/app-office/gnucash/gnucash-1.4.7-r2.ebuild,v 1.4 2001/04/29 18:42:54 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="A personal finance manager" -SRC_URI="http://download.sourceforge.net/gnucash/${A}" -HOMEPAGE="http://gnucash.sourceforge.net" - -DEPEND=">=gnome-base/gnome-libs-1.2.4 - >=gnome-base/libxml-1.8.10 - >=sys-devel/perl-4 - >=dev-lang/swig-1.3_alpha4 - >=dev-libs/slib-2.3.8 - nls? ( sys-devel/gettext )" - -src_compile() { - - local myconf - if [ -z "`use nls`" ] ; then - myconf="--disable-nls" - fi - try ./configure --prefix=/opt/gnome --host=${CHOST} $myconf - try make - -} - -src_install () { - - try make DESTDIR=${D} install - dodoc AUTHORS COPYING ChangeLog NEWS REDAME TODO - - -} - - diff --git a/app-office/gnumeric/files/digest-gnumeric-0.64-r1 b/app-office/gnumeric/files/digest-gnumeric-0.64-r1 deleted file mode 100644 index b478595faf00..000000000000 --- a/app-office/gnumeric/files/digest-gnumeric-0.64-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 49673e41e314dacc54ea5aa74c0792ea gnumeric-0.64.tar.gz diff --git a/app-office/gnumeric/gnumeric-0.64-r1.ebuild b/app-office/gnumeric/gnumeric-0.64-r1.ebuild deleted file mode 100644 index af36f7fce3a9..000000000000 --- a/app-office/gnumeric/gnumeric-0.64-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/app-office/gnumeric/gnumeric-0.64-r1.ebuild,v 1.1 2001/05/17 13:29:30 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="gnumeric" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnumeric/"${A} -HOMEPAGE="http://www.gnome.org/gnome-office/gnumeric.shtml" - -DEPEND=">=sys-devel/perl-5 - >=dev-lang/python-2.0 - >=gnome-base/gal-0.3.0 - >=gnome-libs/gb-0.0.17 - >=gnome-libs/libole2-0.1.7 - bonobo? ( >=gnome-base/bonobo-0.28 - >=gnome-libs/libgda-0.2.0 ) " - -src_unpack() { - unpack ${A} - cd ${S} - cp configure configure.orig - sed -e 's:"%d,:"%d",:' configure.orig > configure -} - -src_compile() { - cd ${S} - local myconf - if [ "`use bonobo`" ] - then - myconf="--with-bonobo" - fi - LDFLAGS="-L/opt/gnome/lib -lunicode" try ./configure --host=${CHOST} --prefix=/opt/gnome \ - ${myconf} --with-gb - cd ${S} - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/opt/gnome PREFIX=${D}/usr install - dodoc AUTHORS COPYING *ChangeLog HACKING NEWS README TODO - -} - - - - - - diff --git a/app-office/koffice/files/digest-koffice-2.0.1 b/app-office/koffice/files/digest-koffice-2.0.1 deleted file mode 100644 index 4a54c9603eae..000000000000 --- a/app-office/koffice/files/digest-koffice-2.0.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 77e6f47ba41d610793bcfc768dc3441e koffice-2.0.1.tar.bz2 diff --git a/app-office/koffice/files/digest-koffice-2.1.1_beta1 b/app-office/koffice/files/digest-koffice-2.1.1_beta1 deleted file mode 100644 index 5f872d73a640..000000000000 --- a/app-office/koffice/files/digest-koffice-2.1.1_beta1 +++ /dev/null @@ -1 +0,0 @@ -MD5 dc97d2b97122c9740377bb6339492e92 koffice-1.1-beta1.tar.bz2 diff --git a/app-office/koffice/koffice-2.0.1.ebuild b/app-office/koffice/koffice-2.0.1.ebuild deleted file mode 100644 index 13a059f55067..000000000000 --- a/app-office/koffice/koffice-2.0.1.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/app-office/koffice/koffice-2.0.1.ebuild,v 1.5 2001/04/30 11:15:14 achim Exp $ - -A=${P}.tar.bz2 -S=${WORKDIR}/${P} -DESCRIPTION="KDE ${PV} - KOffice" -SRC_PATH="kde/stable/${PV}/distribution/tar/generic/src/${A}" -SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH - ftp://ftp.sourceforge.net/pub/mirrors/$SRC_PATH" - -HOMEPAGE="http://www.kde.org/" - -DEPEND=">=kde-base/kdelibs-${PV}" -RDEPEND=$DEPEND - -src_compile() { - QTBASE=/usr/X11R6/lib/qt - try ./configure --prefix=$KDEDIR --host=${CHOST} \ - --with-qt-dir=$QTBASE - try make -} - -src_install() { - try make install DESTDIR=${D} - dodoc ChangeLog COPYING AUTHORS NEWS README -} - diff --git a/app-office/koffice/koffice-2.1.1_beta1.ebuild b/app-office/koffice/koffice-2.1.1_beta1.ebuild deleted file mode 100644 index 2cf8e446acc4..000000000000 --- a/app-office/koffice/koffice-2.1.1_beta1.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/app-office/koffice/koffice-2.1.1_beta1.ebuild,v 1.2 2001/05/12 12:13:25 achim Exp $ - -P=${PN}-1.1-beta1 -A=${P}.tar.bz2 -S=${WORKDIR}/${P} -DESCRIPTION="KDE ${PV} - KOffice" -SRC_PATH="kde/unstable/${P}/src/${A}" -SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH - ftp://ftp.sourceforge.net/pub/mirrors/$SRC_PATH" - -HOMEPAGE="http://www.kde.org/" - -DEPEND=">=kde-base/kdelibs-2.1.1 - >=dev-lang/python-2.0-r2" - -RDEPEND=$DEPEND - -src_compile() { - QTBASE=/usr/X11R6/lib/qt - try ./configure --prefix=$KDEDIR --host=${CHOST} \ - --with-qt-dir=$QTBASE - if [ "`use readline`" ] - then - LIBPYTHON="-lpython2.0 -lm -lutil -ldl -lz -lreadline -lncurses -lcrypt" - fi - if [ "`use berkdb`" ] - then - LIBPYTHON="$LIBPYTHON -L/usr/lib -ldb-3.2" - fi - echo $LIBPYTHON - # I use sed to patch a makefile to compile with python - for i in connector text zoom selector - do - cd ${S}/kivio/plugins/kivio${i}tool - cp Makefile Makefile.orig - sed -e "s:^LDFLAGS =.*:LDFLAGS = $LIBPYTHON:" Makefile.orig > Makefile - done - cd ${S} - - try LIBPYTHON=\"$LIBPYTHON\" make -} - -src_install() { - try make install DESTDIR=${D} - dodoc ChangeLog COPYING AUTHORS NEWS README -} - diff --git a/dev-libs/libole2/files/digest-libole2-0.1.7 b/dev-libs/libole2/files/digest-libole2-0.1.7 deleted file mode 100644 index 232a7a4560bd..000000000000 --- a/dev-libs/libole2/files/digest-libole2-0.1.7 +++ /dev/null @@ -1 +0,0 @@ -MD5 2e719211feea43b4b18b6ab7c37786f1 libole2-0.1.7.tar.gz diff --git a/dev-libs/libole2/libole2-0.1.7.ebuild b/dev-libs/libole2/libole2-0.1.7.ebuild deleted file mode 100644 index ba8cd5502bbf..000000000000 --- a/dev-libs/libole2/libole2-0.1.7.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 - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="libole2" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/" - -DEPEND=">=dev-libs/glib-1.2.8" - -src_unpack() { - unpack ${A} -} - -src_compile() { - cd ${S} - try ./configure --host=${CHOST} --prefix=/opt/gnome - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/opt/gnome install - - dodoc AUTHORS COPYING ChangeLog NEWS README* TODO -} - - - diff --git a/dev-libs/libxml/files/digest-libxml-1.8.11 b/dev-libs/libxml/files/digest-libxml-1.8.11 deleted file mode 100644 index 9bc72cc881d1..000000000000 --- a/dev-libs/libxml/files/digest-libxml-1.8.11 +++ /dev/null @@ -1 +0,0 @@ -MD5 ddbbe7e76fe51d24bd8f6f961ea69c31 libxml-1.8.11.tar.gz diff --git a/dev-libs/libxml/libxml-1.8.11.ebuild b/dev-libs/libxml/libxml-1.8.11.ebuild deleted file mode 100644 index 87fa924946be..000000000000 --- a/dev-libs/libxml/libxml-1.8.11.ebuild +++ /dev/null @@ -1,37 +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/dev-libs/libxml/libxml-1.8.11.ebuild,v 1.3 2001/05/29 17:28:19 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="libxml" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A} - ftp://gnome.eazel.com/pub/gnome/stable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/" - -DEPEND=">=gnome-base/gnome-env-1.0 - >=sys-libs/ncurses-5.2 - >=sys-libs/readline-4.1" - -RDEPEND=">=gnome-base/gnome-env-1.0 - >=sys-libs/ncurses-5.2" - -src_compile() { - cd ${S} - LDFLAGS="-lncurses" try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome - try make -} - -src_install() { - cd ${S} - try make install prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome - dodoc AUTHORS COPYING* ChangeLog NEWS README -} - - - - - - - diff --git a/dev-libs/libxml2/files/digest-libxml2-2.3.5 b/dev-libs/libxml2/files/digest-libxml2-2.3.5 deleted file mode 100644 index 5ae128f55bf7..000000000000 --- a/dev-libs/libxml2/files/digest-libxml2-2.3.5 +++ /dev/null @@ -1 +0,0 @@ -MD5 42f661fb90a50d768c3c94da9608f694 libxml2-2.3.5.tar.gz diff --git a/dev-libs/libxml2/libxml2-2.3.5.ebuild b/dev-libs/libxml2/libxml2-2.3.5.ebuild deleted file mode 100644 index d68c720246e5..000000000000 --- a/dev-libs/libxml2/libxml2-2.3.5.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 Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.3.5.ebuild,v 1.2 2001/05/29 17:28:19 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="libxml" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/libxml/${A} - ftp://gnome.eazel.com/pub/gnome/stable/sources/libxml/${A}" -HOMEPAGE="http://www.gnome.org/" - -DEPEND="virtual/glibc - >=sys-libs/ncurses-5.2 - >=sys-libs/readline-4.1 - gnome-base/gnome-env" - -src_compile() { - try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome - try make -} - -src_install() { - try make install prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome mandir=${D}/opt/gnome/share/man - dodoc AUTHORS COPYING* ChangeLog NEWS README -} - - - - - - - diff --git a/dev-libs/libxslt/files/digest-libxslt-0.5.0 b/dev-libs/libxslt/files/digest-libxslt-0.5.0 deleted file mode 100644 index fd379033d9fb..000000000000 --- a/dev-libs/libxslt/files/digest-libxslt-0.5.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 30caf75722a04d8dd15fc64c1a616a19 libxslt-0.5.0.tar.gz diff --git a/dev-libs/libxslt/libxslt-0.5.0.ebuild b/dev-libs/libxslt/libxslt-0.5.0.ebuild deleted file mode 100644 index de3f645e59e9..000000000000 --- a/dev-libs/libxslt/libxslt-0.5.0.ebuild +++ /dev/null @@ -1,28 +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/dev-libs/libxslt/libxslt-0.5.0.ebuild,v 1.1 2001/03/15 21:01:34 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="libxslt" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${A} - ftp://gnome.eazel.com/pub/gnome/unstable/sources/${PN}/${A}" - -HOMEPAGE="http://www.gnome.org/" - -DEPEND="virtual/glibc - >=gnome-libs/libxml2-2.3.4" - -src_compile() { - - try ./configure --host=${CHOST} --prefix=/opt/gnome - try make -} - -src_install() { - - try make prefix=${D}/opt/gnome install - dodoc AUTHORS COPYING* ChangeLog README NEWS TODO -} - diff --git a/dev-util/kdbg/files/digest-kdbg-1.2.0-r1 b/dev-util/kdbg/files/digest-kdbg-1.2.0-r1 deleted file mode 100644 index 0f00cae5362f..000000000000 --- a/dev-util/kdbg/files/digest-kdbg-1.2.0-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 bc01765e0b0a02331144b558346467e1 kdbg-1.2.0.tar.gz diff --git a/dev-util/kdbg/kdbg-1.2.0-r1.ebuild b/dev-util/kdbg/kdbg-1.2.0-r1.ebuild deleted file mode 100644 index fabffe50c11a..000000000000 --- a/dev-util/kdbg/kdbg-1.2.0-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Your Name <your email> -# $Header: /var/cvsroot/gentoo-x86/dev-util/kdbg/kdbg-1.2.0-r1.ebuild,v 1.1 2001/04/28 07:05:39 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="A Graphical Debugger Interface to gdb" -SRC_URI="ftp://ftp.eudaptics.com/pub/people/jsixt/${A}" -HOMEPAGE="http://members.nextra.at/johsixt/kdbg.html" - -DEPEND=">=kde-base/kdelibs-2.0.1" - -src_compile() { - - try ./configure --prefix=${KDEDIR} --with-kde-version=2 --host=${CHOST} - try make - -} - -src_install () { - - try make DESTDIR=${D} install - - dodoc BUGS COPYING ChangeLog README TODO - -} - diff --git a/gnome-apps/gnome-media/files/digest-gnome-media-1.2.0-r1 b/gnome-apps/gnome-media/files/digest-gnome-media-1.2.0-r1 deleted file mode 100644 index dc9b54708010..000000000000 --- a/gnome-apps/gnome-media/files/digest-gnome-media-1.2.0-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 c7cda6054b47f71aa46aaabe9db6fb4c gnome-media-1.2.0.tar.gz diff --git a/gnome-apps/gnome-media/files/digest-gnome-media-1.2.1 b/gnome-apps/gnome-media/files/digest-gnome-media-1.2.1 deleted file mode 100644 index 83fa082abca7..000000000000 --- a/gnome-apps/gnome-media/files/digest-gnome-media-1.2.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 bb9af054f20ff1a47cde14a16a97f739 gnome-media-1.2.1.tar.bz2 diff --git a/gnome-apps/gnome-media/gnome-media-1.2.0-r1.ebuild b/gnome-apps/gnome-media/gnome-media-1.2.0-r1.ebuild deleted file mode 100644 index 6906120b2a1a..000000000000 --- a/gnome-apps/gnome-media/gnome-media-1.2.0-r1.ebuild +++ /dev/null @@ -1,31 +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/gnome-apps/gnome-media/gnome-media-1.2.0-r1.ebuild,v 1.3 2001/01/20 01:13:36 achim Exp $ - -P=gnome-media-1.2.0 -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="gnome-media" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-media/"${A} -HOMEPAGE="http://www.gnome.org/" - -DEPEND=">=gnome-base/gnome-core-1.2.4" - -src_compile() { - cd ${S} - try ./configure --host=${CHOST} --prefix=/opt/gnome \ - --with-ncurses - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/opt/gnome install - dodoc AUTHORS COPYING* ChangeLog NEWS - dodoc README* -} - - - - diff --git a/gnome-apps/gnome-utils/files/digest-gnome-utils-1.2.1-r1 b/gnome-apps/gnome-utils/files/digest-gnome-utils-1.2.1-r1 deleted file mode 100644 index 707d32f34249..000000000000 --- a/gnome-apps/gnome-utils/files/digest-gnome-utils-1.2.1-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 d95a0a6d43b62075c7f5dbe6c81101c0 gnome-utils-1.2.1.tar.gz diff --git a/gnome-apps/gnome-utils/gnome-utils-1.2.1-r1.ebuild b/gnome-apps/gnome-utils/gnome-utils-1.2.1-r1.ebuild deleted file mode 100644 index 2d569561b6eb..000000000000 --- a/gnome-apps/gnome-utils/gnome-utils-1.2.1-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/gnome-apps/gnome-utils/gnome-utils-1.2.1-r1.ebuild,v 1.2 2000/11/25 18:30:59 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="gnome-utils" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/"${A} -HOMEPAGE="http://www.gnome.org/" - -DEPEND=">=gnome-base/gnome-core-1.2.4 - >=gnome-base/libgtop-1.0.10" - -src_compile() { - cd ${S} - try ./configure --host=${CHOST} --prefix=/opt/gnome \ - --with-ncurses - try make -} - -src_install() { - cd ${S} - dodir /opt/gnome/bin - try make prefix=${D}/opt/gnome install - dodoc AUTHORS COPYING* ChangeLog NEWS - dodoc README* -} - - - - diff --git a/gnome-apps/gnucash/files/digest-gnucash-1.4.7-r2 b/gnome-apps/gnucash/files/digest-gnucash-1.4.7-r2 deleted file mode 100644 index e3da7b94cfcb..000000000000 --- a/gnome-apps/gnucash/files/digest-gnucash-1.4.7-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 49dbbcd4c7dd8354a2566dd76ca5eb69 gnucash-1.4.7.tar.gz diff --git a/gnome-apps/gnucash/gnucash-1.4.7-r2.ebuild b/gnome-apps/gnucash/gnucash-1.4.7-r2.ebuild deleted file mode 100644 index fca008aca0e6..000000000000 --- a/gnome-apps/gnucash/gnucash-1.4.7-r2.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/gnome-apps/gnucash/gnucash-1.4.7-r2.ebuild,v 1.4 2001/04/29 18:42:54 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="A personal finance manager" -SRC_URI="http://download.sourceforge.net/gnucash/${A}" -HOMEPAGE="http://gnucash.sourceforge.net" - -DEPEND=">=gnome-base/gnome-libs-1.2.4 - >=gnome-base/libxml-1.8.10 - >=sys-devel/perl-4 - >=dev-lang/swig-1.3_alpha4 - >=dev-libs/slib-2.3.8 - nls? ( sys-devel/gettext )" - -src_compile() { - - local myconf - if [ -z "`use nls`" ] ; then - myconf="--disable-nls" - fi - try ./configure --prefix=/opt/gnome --host=${CHOST} $myconf - try make - -} - -src_install () { - - try make DESTDIR=${D} install - dodoc AUTHORS COPYING ChangeLog NEWS REDAME TODO - - -} - - diff --git a/gnome-apps/gqview/files/digest-gqview-0.10.1 b/gnome-apps/gqview/files/digest-gqview-0.10.1 deleted file mode 100644 index bd221dd399a4..000000000000 --- a/gnome-apps/gqview/files/digest-gqview-0.10.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 543729c6d4fd4dcb75bca93cc826e54f gqview-0.10.1.tar.gz diff --git a/gnome-apps/gqview/gqview-0.10.1.ebuild b/gnome-apps/gqview/gqview-0.10.1.ebuild deleted file mode 100644 index b028ca7206e6..000000000000 --- a/gnome-apps/gqview/gqview-0.10.1.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 Your Name <your email> -# $Header: /var/cvsroot/gentoo-x86/gnome-apps/gqview/gqview-0.10.1.ebuild,v 1.2 2001/05/16 14:16:48 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="A GNOME image browser" -SRC_URI="http://download.sourceforge.net/gqview/${A}" -HOMEPAGE="http://gqview.sourceforge.net" - -DEPEND="virtual/glibc - gnome-base/gdk-pixbuf - nls? ( sys-devel/gettext )" - -src_compile() { - local myconf - if [ -z "`use nls`" ] - then - myconf="--disable-nls" - fi - - try ./configure --prefix=/opt/gnome --mandir=/opt/gnome/share/man \ - --host=${CHOST} ${myconf} - try make - -} - -src_install () { - - try make prefix=${D}/opt/gnome mandir=${D}/opt/gnome/share/man \ - GNOME_DATADIR=${D}/opt/gnome/share install - -} - diff --git a/gnome-apps/gtkdiff/files/digest-gtkdiff-1.7.0 b/gnome-apps/gtkdiff/files/digest-gtkdiff-1.7.0 deleted file mode 100644 index 7fec77a96829..000000000000 --- a/gnome-apps/gtkdiff/files/digest-gtkdiff-1.7.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 35b6b1f21b550366a1928387f67ca11f gtkdiff-1.7.0.tar.gz diff --git a/gnome-apps/gtkdiff/gtkdiff-1.7.0.ebuild b/gnome-apps/gtkdiff/gtkdiff-1.7.0.ebuild deleted file mode 100644 index a58a88943091..000000000000 --- a/gnome-apps/gtkdiff/gtkdiff-1.7.0.ebuild +++ /dev/null @@ -1,28 +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/gnome-apps/gtkdiff/gtkdiff-1.7.0.ebuild,v 1.2 2000/11/27 15:12:34 achim Exp $ - -S=${WORKDIR}/${P} -DESCRIPTION="GTK Frontend for diff" -SRC_URI="http://www.ainet.or.jp/~inoue/software/gtkdiff/${P}.tar.gz" -HOMEPAGE="http://www.ainet.or.jp/~inoue/software/gtkdiff/index-e.html" - -DEPEND=">=gnome-base/gnome-libs-1.2.8" - -src_compile() { - - cd ${S} - local myconf - try ./configure --prefix=/opt/gnome --host=${CHOST} - try make - -} - -src_install () { - - cd ${S} - try make prefix=${D}/opt/gnome install - dodoc AUTHORS COPYING ChangeLog NEWS README TODO -} - diff --git a/gnome-apps/gtop/files/digest-gtop-1.0.10 b/gnome-apps/gtop/files/digest-gtop-1.0.10 deleted file mode 100644 index 7d8c9bfcc0bc..000000000000 --- a/gnome-apps/gtop/files/digest-gtop-1.0.10 +++ /dev/null @@ -1 +0,0 @@ -MD5 8e4eff1614a66123709b16d99d7e01c6 gtop-1.0.10.tar.gz diff --git a/gnome-apps/gtop/gtop-1.0.10.ebuild b/gnome-apps/gtop/gtop-1.0.10.ebuild deleted file mode 100644 index 6ab8b4591aba..000000000000 --- a/gnome-apps/gtop/gtop-1.0.10.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/gnome-apps/gtop/gtop-1.0.10.ebuild,v 1.1 2000/11/25 13:01:57 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="gtop" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}" -HOMEPGAE="http://www.gnome.org/" - -DEPEND=">=gnome-base/libgtop-1.0.9" - -src_compile() { - cd ${S} - try ./configure --host=${CHOST} --prefix=/opt/gnome - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/opt/gnome install - dodoc AUTHORS COPYING ChangeLog NEWS README TODO - -} - - - - diff --git a/gnome-apps/gupsc/files/digest-gupsc-0.3.0-r1 b/gnome-apps/gupsc/files/digest-gupsc-0.3.0-r1 deleted file mode 100644 index 984ee520751b..000000000000 --- a/gnome-apps/gupsc/files/digest-gupsc-0.3.0-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 f201a31442586340cd773ac95ffeb53c gupsc-0.3.0.tar.bz2 diff --git a/gnome-apps/gupsc/gupsc-0.3.0-r1.ebuild b/gnome-apps/gupsc/gupsc-0.3.0-r1.ebuild deleted file mode 100644 index e100eff19aa4..000000000000 --- a/gnome-apps/gupsc/gupsc-0.3.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/gnome-apps/gupsc/gupsc-0.3.0-r1.ebuild,v 1.1 2000/11/25 15:21:44 achim Exp $ - -P=gupsc-0.3.0 -A=${P}.tar.bz2 -S=${WORKDIR}/${P} -DESCRIPTION="A Gnome client for the Network UPS Tools (nut)" -SRC_URI="http://www.stud.ifi.uio.no/~hennikul/gupsc/download/"${A} -HOMEPAGE="http://www.stud.ifi.uio.no/~hennikul/gupsc/" - -DEPEND=">=gnome-base/gnome-libs-1.2.4" - -src_unpack() { - unpack ${A} -} - -src_compile() { - cd ${S} - try ./configure --host=${CHOST} --prefix=/opt/gnome - try make -} - -src_install() { - cd ${S} - try make DESTDIR=${D} install - dodoc AUTHORS COPYING ChangeLog NEWS README TODO -} - - - diff --git a/gnome-apps/mc/files/digest-mc-4.5.53 b/gnome-apps/mc/files/digest-mc-4.5.53 deleted file mode 100644 index e054f7378d97..000000000000 --- a/gnome-apps/mc/files/digest-mc-4.5.53 +++ /dev/null @@ -1 +0,0 @@ -MD5 90652e48aaf2e5f937262de8436b7f56 mc-4.5.53.tar.gz diff --git a/gnome-apps/mc/files/digest-mc-4.5.53-r1 b/gnome-apps/mc/files/digest-mc-4.5.53-r1 deleted file mode 100644 index e054f7378d97..000000000000 --- a/gnome-apps/mc/files/digest-mc-4.5.53-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 90652e48aaf2e5f937262de8436b7f56 mc-4.5.53.tar.gz diff --git a/gnome-apps/mc/mc-4.5.53-r1.ebuild b/gnome-apps/mc/mc-4.5.53-r1.ebuild deleted file mode 100644 index 723e910275f6..000000000000 --- a/gnome-apps/mc/mc-4.5.53-r1.ebuild +++ /dev/null @@ -1,68 +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/gnome-apps/mc/mc-4.5.53-r1.ebuild,v 1.1 2001/05/05 17:42:37 achim Exp $ - -#P= -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="GNOME Midnight Commander" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/mc/" - -DEPEND="virtual/glibc - >=sys-libs/gpm-1.19.3 - pam? ( >=sys-libs/pam-0.72 ) - slang? ( >=sys-libs/slang-1.4.2 ) - >=sys-apps/e2fsprogs-1.19 - gnome? ( >=gnome-base/gnome-libs-1.2.4 ) - -" -RDEPEND="virtual/x11-web-browser" - -src_unpack() { - unpack ${A} - cd ${S}/vfs - cp smbfs.c smbfs.c.orig - sed -e "s:/etc/smb\.conf:/etc/smb/smb\.conf:" smbfs.c.orig > smbfs.c -} - -src_compile() { - local myconf - if [ "`use pam`" ] ; then - myconf="--with-pam" - else - myconf="--without-pam" - fi - if [ "`use slang`" ] ; then - myconf="$myconf --with-slang" - else - myconf="$myconf --with-included-slang" - fi - if [ "`use gnome`" ] ; then - myconf="$myconf --with-gnome --prefix=/opt/gnome" - else - myconf="$myconf --without-gnome --prefix=/usr" - fi - LDFLAGS="-lcrypt -lncurses" try ./configure --host=${CHOST} \ - --with-samba --with-vfs --with-netrc $myconf - try make -} - -src_install() { - - if [ "`use gnome`" ] ; then - try make prefix=${D}/opt/gnome install - else - try make prefix=${D}/usr install - fi - - dodoc ABOUT-NLS COPYING* FAQ INSTALL* NEWS - dodoc README* -} - - - - - - diff --git a/gnome-apps/mc/mc-4.5.53.ebuild b/gnome-apps/mc/mc-4.5.53.ebuild deleted file mode 100644 index faae8c14ef27..000000000000 --- a/gnome-apps/mc/mc-4.5.53.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/gnome-apps/mc/mc-4.5.53.ebuild,v 1.1 2001/04/15 21:45:13 pete Exp $ - -#P= -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="GNOME Midnight Commander" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/mc/" - -DEPEND=">=sys-libs/pam-0.72 - >=sys-libs/slang-1.4.2 - >=sys-apps/e2fsprogs-1.19 - >=gnome-base/gnome-libs-1.2.4 -" -RDEPEND="virtual/x11-web-browser" - -src_unpack() { - unpack ${A} - cd ${S}/vfs - cp smbfs.c smbfs.c.orig - sed -e "s:/etc/smb\.conf:/etc/smb/smb\.conf:" smbfs.c.orig > smbfs.c -} - -src_compile() { - cd ${S} - LDFLAGS="-lcrypt -lncurses" try ./configure --host=${CHOST} --prefix=/opt/gnome \ - --with-samba --with-ldap --with-pam --with-vfs \ - --with-netrc --with-slang - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/opt/gnome install - prepman /opt/gnome - - dodoc ABOUT-NLS COPYING* FAQ INSTALL* NEWS - dodoc README* -} - - - - - - diff --git a/gnome-apps/nautilus/files/digest-nautilus-1.0 b/gnome-apps/nautilus/files/digest-nautilus-1.0 deleted file mode 100644 index de51bf4ccba2..000000000000 --- a/gnome-apps/nautilus/files/digest-nautilus-1.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 5eb7c2bff516e1e02f2ec5b5c6fc8b1e nautilus-1.0.tar.gz diff --git a/gnome-apps/nautilus/files/digest-nautilus-1.0.2 b/gnome-apps/nautilus/files/digest-nautilus-1.0.2 deleted file mode 100644 index 0db2edf4c770..000000000000 --- a/gnome-apps/nautilus/files/digest-nautilus-1.0.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 9c6b11436e11d7dc184dd5748e7e82ac nautilus-1.0.2.tar.gz diff --git a/gnome-apps/nautilus/nautilus-1.0.2.ebuild b/gnome-apps/nautilus/nautilus-1.0.2.ebuild deleted file mode 100644 index 0d052b10ba8b..000000000000 --- a/gnome-apps/nautilus/nautilus-1.0.2.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 Achim Gottinger <achim@gentoo.org> -# Updated by Sebastian Werner <sebastian@werner-productions.de> -# /home/cvsroot/gentoo-x86/gnome-apps/nautilus/nautilus-1.0.ebuild,v 1.3 2001/04/29 18:42:54 achim Exp - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="nautilus" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A} - ftp://gnome.eazel.com/pub/gnome/stable/sources/${PN}/${A}" - -HOMEPAGE="http://www.gnome.org/" - -DEPEND="nls? ( sys-devel/gettext ) - mozilla? ( >=net-www/mozilla-0.8-r1 ) - >=media-libs/freetype-2.0.1 - >=sys-libs/pam-0.73 - >=gnome-base/bonobo-1.0.2 - >=gnome-base/libghttp-1.0.9 - >=gnome-base/scrollkeeper-0.2 - >=gnome-base/control-center-1.4.0 - >=gnome-libs/medusa-0.5.0 - >=gnome-libs/ammonite-1.0.0" - -src_compile() { - local myconf - if [ -z "`use nls`" ] - then - myconf="--disable-nls" - fi - if [ "`use mozilla`" ] - then -# MOZILLA=${S}/../../../mozilla-0.8-r2/work/mozilla/dist - MOZILLA=/opt/mozilla - myconf="${myconf} --with-mozilla-lib-place=$MOZILLA \ - --with-mozilla-include-place=$MOZILLA/include" - export MOZILLA_FIVE_HOME=$MOZILLA - export LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME -# export CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-rtti" - else - myconf="${myconf} --disable-mozilla-component" - fi - try ./configure --host=${CHOST} --prefix=/opt/gnome \ - --sysconfdir=/etc/opt/gnome --infodir=/opt/gnome/share/info \ - --mandir=/opt/gnome/share/man --enable-eazel-services=1 ${myconf} - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome \ - mandir=${D}/opt/gnome/share/man infodir=${D}/opt/gnome/share/info install - dodoc AUTHORS COPYING* ChangeLog* NEWS TODO -} - - - - - diff --git a/gnome-apps/nautilus/nautilus-1.0.ebuild b/gnome-apps/nautilus/nautilus-1.0.ebuild deleted file mode 100644 index cbbcd721b29d..000000000000 --- a/gnome-apps/nautilus/nautilus-1.0.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/gnome-apps/nautilus/nautilus-1.0.ebuild,v 1.3 2001/04/29 18:42:54 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="nautlilus" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${A} - ftp://gnome.eazel.com/pub/gnome/unstable/sources/${PN}/${A}" - -HOMEPAGE="http://www.gnome.org/" - -DEPEND="nls? ( sys-devel/gettext ) - mozilla? ( >=net-www/mozilla-0.8-r1 ) - >=media-libs/freetype-2.0.1 - >=sys-libs/pam-0.73 - >=gnome-base/bonobo-0.37 - >=gnome-base/libghttp-1.0.9 - >=gnome-base/scrollkeeper-0.1.2 - >=gnome-base/control-center-1.4.0 - >=gnome-libs/medusa-0.3.2 - >=gnome-libs/ammonite-0.8.6" - -src_compile() { - local myconf - if [ -z "`use nls`" ] - then - myconf="--disable-nls" - fi - if [ "`use mozilla`" ] - then -# MOZILLA=${S}/../../../mozilla-0.8-r2/work/mozilla/dist - MOZILLA=/opt/mozilla - myconf="${myconf} --with-mozilla-lib-place=$MOZILLA \ - --with-mozilla-include-place=$MOZILLA/include" - export MOZILLA_FIVE_HOME=$MOZILLA - export LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME - export CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-rtti" - else - myconf="${myconf} --disable-mozilla-component" - fi - try ./configure --host=${CHOST} --prefix=/opt/gnome \ - --sysconfdir=/etc/opt/gnome --infodir=/opt/gnome/share/info \ - --mandir=/opt/gnome/share/man --enable-eazel-services=1 ${myconf} - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome \ - mandir=${D}/opt/gnome/share/man infodir=${D}/opt/gnome/share/info install - dodoc AUTHORS COPYING* ChangeLog* NEWS TODO -} - - - - - diff --git a/gnome-base/ORBit/ORBit-0.5.7-r1.ebuild b/gnome-base/ORBit/ORBit-0.5.7-r1.ebuild deleted file mode 100644 index 5c9d3d1b5d4a..000000000000 --- a/gnome-base/ORBit/ORBit-0.5.7-r1.ebuild +++ /dev/null @@ -1,46 +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/gnome-base/ORBit/ORBit-0.5.7-r1.ebuild,v 1.1 2001/04/13 16:59:03 pete Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="A high-performance, lightweight CORBA ORB aiming for CORBA 2.2 compliance" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A} - http://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A} - ftp://gnome.eazel.com/pub/gnome/stable/sources/${PN}/${A}" -HOMEPAGE="http://www.labs.redhat.com/orbit/" - -DEPEND="virtual/glibc - >=sys-apps/tcp-wrappers-7.6 - >=dev-libs/glib-1.2.8 - >=gnome-base/gnome-env-1.0" - -RDEPEND="virtual/glibc - >=dev-libs/glib-1.2.8" - -src_compile() { - - try ./configure --host=${CHOST} --prefix=/opt/gnome \ - --sysconfdir=/etc/opt/gnome --infodir=/opt/gnome/share/info - try make -} - -src_install() { - - try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome \ - infodir=${D}/opt/gnome/share/info install - - dodoc AUTHORS COPYING* ChangeLog README NEWS TODO - dodoc docs/*.txt docs/IDEA1 - docinto idl - cd libIDL - dodoc AUTHORS BUGS COPYING NEWS README* - docinto popt - cd ../popt - dodoc CHANGES COPYING README -} - - - - diff --git a/gnome-base/ORBit/files/digest-ORBit-0.5.7-r1 b/gnome-base/ORBit/files/digest-ORBit-0.5.7-r1 deleted file mode 100644 index 460bf1768b9d..000000000000 --- a/gnome-base/ORBit/files/digest-ORBit-0.5.7-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 458e9c84482f0b1d42c304ff9d363054 ORBit-0.5.7.tar.gz diff --git a/gnome-base/bonobo/bonobo-1.0.1.ebuild b/gnome-base/bonobo/bonobo-1.0.1.ebuild deleted file mode 100644 index 9583ae9fefc6..000000000000 --- a/gnome-base/bonobo/bonobo-1.0.1.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 Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/gnome-base/bonobo/bonobo-1.0.1.ebuild,v 1.2 2001/04/15 18:57:14 pete Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="A set of language and system independant CORBA interfaces" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${A} - ftp://gnome.eazel.com/pub/gnome/unstable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/" - -DEPEND="nls? ( sys-devel/gettext ) - >=gnome-base/oaf-0.6.4 - >=gnome-base/gnome-print-0.25" - -src_compile() { - local myconf - if [ -z "`use nls`" ] - then - myconf="--disable-nls" - fi - - # on of the samples in the package need to be regenerated from the idl files - rm -f ${S}/samples/bonobo-class/Bonobo_Sample_Echo.h - rm -f ${S}/samples/bonobo-class/Bonobo_Sample_Echo-*.c - - try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome ${myconf} - try make -} - -src_install() { - - try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome install - - dodoc AUTHORS COPYING* ChangeLog README - dodoc NEWS TODO -} - - - - - - - diff --git a/gnome-base/bonobo/bonobo-1.0.2.ebuild b/gnome-base/bonobo/bonobo-1.0.2.ebuild deleted file mode 100644 index e684df29b838..000000000000 --- a/gnome-base/bonobo/bonobo-1.0.2.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 Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/gnome-base/bonobo/bonobo-1.0.2.ebuild,v 1.1 2001/05/05 16:41:25 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="A set of language and system independant CORBA interfaces" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${A} - ftp://gnome.eazel.com/pub/gnome/unstable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/" - -DEPEND="nls? ( sys-devel/gettext ) - >=gnome-base/oaf-0.6.4 - >=gnome-base/gnome-print-0.25" - -src_compile() { - local myconf - if [ -z "`use nls`" ] - then - myconf="--disable-nls" - fi - - # on of the samples in the package need to be regenerated from the idl files - rm -f ${S}/samples/bonobo-class/Bonobo_Sample_Echo.h - rm -f ${S}/samples/bonobo-class/Bonobo_Sample_Echo-*.c - - try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome ${myconf} - try make -} - -src_install() { - - try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome install - - dodoc AUTHORS COPYING* ChangeLog README - dodoc NEWS TODO -} - - - - - - - diff --git a/gnome-base/bonobo/files/digest-bonobo-1.0.1 b/gnome-base/bonobo/files/digest-bonobo-1.0.1 deleted file mode 100644 index 60172fad2b5b..000000000000 --- a/gnome-base/bonobo/files/digest-bonobo-1.0.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 0a8c712246af46a022c3da5476ab2b3f bonobo-1.0.1.tar.gz diff --git a/gnome-base/bonobo/files/digest-bonobo-1.0.2 b/gnome-base/bonobo/files/digest-bonobo-1.0.2 deleted file mode 100644 index 3e7719bf5b0d..000000000000 --- a/gnome-base/bonobo/files/digest-bonobo-1.0.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 950e76b5b916739e1701b0db533782ce bonobo-1.0.2.tar.gz diff --git a/gnome-base/gal/files/digest-gal-0.5 b/gnome-base/gal/files/digest-gal-0.5 deleted file mode 100644 index ac86b87ddc12..000000000000 --- a/gnome-base/gal/files/digest-gal-0.5 +++ /dev/null @@ -1 +0,0 @@ -MD5 1aaf233130fa116334da2edc516b8958 gal-0.5.tar.gz diff --git a/gnome-base/gal/gal-0.5.ebuild b/gnome-base/gal/gal-0.5.ebuild deleted file mode 100644 index 84c0f5a2bc32..000000000000 --- a/gnome-base/gal/gal-0.5.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 - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="The Gnome Application Libraries" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${A} - ftp://gnome.eazel.com/pub/gnome/unstable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/" - -DEPEND="nls? ( sys-devel/gettext ) - >=gnome-base/gnome-vfs-0.6.2 - >=gnome-base/libglade-0.14 - >=gnome-base/libunicode-0.4 - >=gnome-base/gnome-print-0.25" - -RDEPEND="virtual/glibc" - - -src_compile() { - local myconf - if [ -z "`use nls`" ] - then - myconf="--disable-nls" - fi - try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome ${myconf} - try make -} - -src_install() { - - try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome install - - dodoc AUTHORS COPYING ChangeLog NEWS README - -} - - - - - diff --git a/gnome-base/gconf/files/digest-gconf-1.0.0 b/gnome-base/gconf/files/digest-gconf-1.0.0 deleted file mode 100644 index 054aea0ecba9..000000000000 --- a/gnome-base/gconf/files/digest-gconf-1.0.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 cdd363895dbc3d56412cb40ee1c2999b GConf-1.0.0.tar.gz diff --git a/gnome-base/gconf/files/gconf-1.0.0-gentoo-intl.diff b/gnome-base/gconf/files/gconf-1.0.0-gentoo-intl.diff deleted file mode 100644 index 1c23bb448241..000000000000 --- a/gnome-base/gconf/files/gconf-1.0.0-gentoo-intl.diff +++ /dev/null @@ -1,5073 +0,0 @@ -diff -Pur GConf-1.0.0.orig/intl/ChangeLog GConf-1.0.0/intl/ChangeLog ---- GConf-1.0.0.orig/intl/ChangeLog Wed Dec 31 19:00:00 1969 -+++ GConf-1.0.0/intl/ChangeLog Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,1086 @@ -+1998-04-29 Ulrich Drepper <drepper@cygnus.com> -+ -+ * intl/localealias.c (read_alias_file): Use unsigned char for -+ local variables. Remove unused variable tp. -+ * intl/l10nflist.c (_nl_normalize_codeset): Use unsigned char * -+ for type of codeset. For loosing Solaris systems. -+ * intl/loadinfo.h: Adapt prototype of _nl_normalize_codeset. -+ * intl/bindtextdom.c (BINDTEXTDOMAIN): Don't define local variable -+ len if not needed. -+ Patches by Jim Meyering. -+ -+1998-04-28 Ulrich Drepper <drepper@cygnus.com> -+ -+ * loadmsgcat.c (_nl_load_domain): Don't assign the element use_mmap if -+ mmap is not supported. -+ -+ * hash-string.h: Don't include <values.h>. -+ -+1998-04-27 Ulrich Drepper <drepper@cygnus.com> -+ -+ * textdomain.c: Use strdup is available. -+ -+ * localealias.c: Define HAVE_MEMPCPY so that we can use this -+ function. Define and use semapahores to protect modfication of -+ global objects when compiling for glibc. Add code to allow -+ freeing alias table. -+ -+ * l10nflist.c: Don't assume stpcpy not being a macro. -+ -+ * gettextP.h: Define internal_function macri if not already done. -+ Use glibc byte-swap macros instead of defining SWAP when compiled -+ for glibc. -+ (struct loaded_domain): Add elements to allow unloading. -+ -+ * Makefile.in (distclean): Don't remove libintl.h here. -+ -+ * bindtextdomain.c: Carry over changes from glibc. Use strdup if -+ available. -+ -+ * dcgettext.c: Don't assume stpcpy not being a macro. Mark internal -+ functions. Add memory freeing code for glibc. -+ -+ * dgettext.c: Update copyright. -+ -+ * explodename.c: Include stdlib.h and string.h only if they exist. -+ Use strings.h eventually. -+ -+ * finddomain.c: Mark internal functions. Use strdup if available. -+ Add memory freeing code for glibc. -+ -+1997-10-10 20:00 Ulrich Drepper <drepper@cygnus.com> -+ -+ * libgettext.h: Fix dummy textdomain and bindtextdomain macros. -+ They should return reasonable values. -+ Reported by Tom Tromey <tromey@cygnus.com>. -+ -+1997-09-16 03:33 Ulrich Drepper <drepper@cygnus.com> -+ -+ * libgettext.h: Define PARAMS also to `args' if __cplusplus is defined. -+ * intlh.inst.in: Likewise. -+ Reported by Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>. -+ -+ * libintl.glibc: Update from current glibc version. -+ -+1997-09-06 02:10 Ulrich Drepper <drepper@cygnus.com> -+ -+ * intlh.inst.in: Reformat copyright. -+ -+1997-08-19 15:22 Ulrich Drepper <drepper@cygnus.com> -+ -+ * dcgettext.c (DCGETTEXT): Remove wrong comment. -+ -+1997-08-16 00:13 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (install-data): Don't change directory to install. -+ -+1997-08-01 14:30 Ulrich Drepper <drepper@cygnus.com> -+ -+ * cat-compat.c: Fix copyright. -+ -+ * localealias.c: Don't define strchr unless !HAVE_STRCHR. -+ -+ * loadmsgcat.c: Update copyright. Fix typos. -+ -+ * l10nflist.c: Don't define strchr unless !HAVE_STRCHR. -+ (_nl_make_l10nflist): Handle sponsor and revision correctly. -+ -+ * gettext.c: Update copyright. -+ * gettext.h: Likewise. -+ * hash-string.h: Likewise. -+ -+ * finddomain.c: Remoave dead code. Define strchr only if -+ !HAVE_STRCHR. -+ -+ * explodename.c: Include <sys/types.h>. -+ -+ * explodename.c: Reformat copyright text. -+ (_nl_explode_name): Fix typo. -+ -+ * dcgettext.c: Define and use __set_errno. -+ (guess_category_value): Don't use setlocale if HAVE_LC_MESSAGES is -+ not defined. -+ -+ * bindtextdom.c: Pretty printing. -+ -+1997-05-01 02:25 Ulrich Drepper <drepper@cygnus.com> -+ -+ * dcgettext.c (guess_category_value): Don't depend on -+ HAVE_LC_MESSAGES. We don't need the macro here. -+ Patch by Bruno Haible <haible@ilog.fr>. -+ -+ * cat-compat.c (textdomain): DoN't refer to HAVE_SETLOCALE_NULL -+ macro. Instead use HAVE_LOCALE_NULL and define it when using -+ glibc, as in dcgettext.c. -+ Patch by Bruno Haible <haible@ilog.fr>. -+ -+ * Makefile.in (CPPFLAGS): New variable. Reported by Franc,ois -+ Pinard. -+ -+Mon Mar 10 06:51:17 1997 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in: Implement handling of libtool. -+ -+ * gettextP.h: Change data structures for use of generic lowlevel -+ i18n file handling. -+ -+Wed Dec 4 20:21:18 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * textdomain.c: Put parentheses around arguments of memcpy macro -+ definition. -+ * localealias.c: Likewise. -+ * l10nflist.c: Likewise. -+ * finddomain.c: Likewise. -+ * bindtextdom.c: Likewise. -+ Reported by Thomas Esken. -+ -+Mon Nov 25 22:57:51 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * textdomain.c: Move definition of `memcpy` macro to right -+ position. -+ -+Fri Nov 22 04:01:58 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * finddomain.c [!HAVE_STRING_H && !_LIBC]: Define memcpy using -+ bcopy if not already defined. Reported by Thomas Esken. -+ * bindtextdom.c: Likewise. -+ * l10nflist.c: Likewise. -+ * localealias.c: Likewise. -+ * textdomain.c: Likewise. -+ -+Tue Oct 29 11:10:27 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (libdir): Change to use exec_prefix instead of -+ prefix. Reported by Knut-HåvardAksnes <etokna@eto.ericsson.se>. -+ -+Sat Aug 31 03:07:09 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * l10nflist.c (_nl_normalize_codeset): We convert to lower case, -+ so don't prepend uppercase `ISO' for only numeric arg. -+ -+Fri Jul 19 00:15:46 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * l10nflist.c: Move inclusion of argz.h, ctype.h, stdlib.h after -+ definition of _GNU_SOURCE. Patch by Roland McGrath. -+ -+ * Makefile.in (uninstall): Fix another bug with `for' loop and -+ empty arguments. Patch by Jim Meyering. Correct name os -+ uninstalled files: no intl- prefix anymore. -+ -+ * Makefile.in (install-data): Again work around shells which -+ cannot handle mpty for list. Reported by Jim Meyering. -+ -+Sat Jul 13 18:11:35 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (install): Split goal. Now depend on install-exec -+ and install-data. -+ (install-exec, install-data): New goals. Created from former -+ install goal. -+ Reported by Karl Berry. -+ -+Sat Jun 22 04:58:14 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (MKINSTALLDIRS): New variable. Path to -+ mkinstalldirs script. -+ (install): use MKINSTALLDIRS variable or if the script is not present -+ try to find it in the $top_scrdir). -+ -+Wed Jun 19 02:56:56 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * l10nflist.c: Linux libc *partly* includes the argz_* functions. -+ Grr. Work around by renaming the static version and use macros -+ for renaming. -+ -+Tue Jun 18 20:11:17 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * l10nflist.c: Correct presence test macros of __argz_* functions. -+ -+ * l10nflist.c: Include <argz.h> based on test of it instead when -+ __argz_* functions are available. -+ Reported by Andreas Schwab. -+ -+Thu Jun 13 15:17:44 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * explodename.c, l10nflist.c: Define NULL for dumb systems. -+ -+Tue Jun 11 17:05:13 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * intlh.inst.in, libgettext.h (dcgettext): Rename local variable -+ result to __result to prevent name clash. -+ -+ * l10nflist.c, localealias.c, dcgettext.c: Define _GNU_SOURCE to -+ get prototype for stpcpy and strcasecmp. -+ -+ * intlh.inst.in, libgettext.h: Move declaration of -+ `_nl_msg_cat_cntr' outside __extension__ block to prevent warning -+ from gcc's -Wnested-extern option. -+ -+Fri Jun 7 01:58:00 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (install): Remove comment. -+ -+Thu Jun 6 17:28:17 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (install): Work around for another Buglix stupidity. -+ Always use an `else' close for `if's. Reported by Nelson Beebe. -+ -+ * Makefile.in (intlh.inst): Correct typo in phony rule. -+ Reported by Nelson Beebe. -+ -+Thu Jun 6 01:49:52 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * dcgettext.c (read_alias_file): Rename variable alloca_list to -+ block_list as the macro calls assume. -+ Patch by Eric Backus. -+ -+ * localealias.c [!HAVE_ALLOCA]: Define alloca as macro using -+ malloc. -+ (read_alias_file): Rename varriabe alloca_list to block_list as the -+ macro calls assume. -+ Patch by Eric Backus. -+ -+ * l10nflist.c: Correct conditional for <argz.h> inclusion. -+ Reported by Roland McGrath. -+ -+ * Makefile.in (all): Depend on all-@USE_INCLUDED_LIBINTL@, not -+ all-@USE_NLS@. -+ -+ * Makefile.in (install): intlh.inst comes from local dir, not -+ $(srcdir). -+ -+ * Makefile.in (intlh.inst): Special handling of this goal. If -+ used in gettext, this is really a rul to construct this file. If -+ used in any other package it is defined as a .PHONY rule with -+ empty body. -+ -+ * finddomain.c: Extract locale file information handling into -+ l10nfile.c. Rename local stpcpy__ function to stpcpy. -+ -+ * dcgettext.c (stpcpy): Add local definition. -+ -+ * l10nflist.c: Solve some portability problems. Patches partly by -+ Thomas Esken. Add local definition of stpcpy. -+ -+Tue Jun 4 02:47:49 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * intlh.inst.in: Don't depend including <locale.h> on -+ HAVE_LOCALE_H. Instead configure must rewrite this fiile -+ depending on the result of the configure run. -+ -+ * Makefile.in (install): libintl.inst is now called intlh.inst. -+ Add rules for updating intlh.inst from intlh.inst.in. -+ -+ * libintl.inst: Renamed to intlh.inst.in. -+ -+ * localealias.c, dcgettext.c [__GNUC__]: Define HAVE_ALLOCA to 1 -+ because gcc has __buitlin_alloca. -+ Reported by Roland McGrath. -+ -+Mon Jun 3 00:32:16 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (installcheck): New goal to fulfill needs of -+ automake's distcheck. -+ -+ * Makefile.in (install): Reorder commands so that VERSION is -+ found. -+ -+ * Makefile.in (gettextsrcdir): Now use subdirectory intl/ in -+ @datadir@/gettext. -+ (COMSRCS): Add l10nfile.c. -+ (OBJECTS): Add l10nfile.o. -+ (DISTFILES): Rename to DISTFILE.normal. Remove $(DISTFILES.common). -+ (DISTFILE.gettext): Remove $(DISTFILES.common). -+ (all-gettext): Remove goal. -+ (install): If $(PACKAGE) = gettext install, otherwose do nothing. No -+ package but gettext itself should install libintl.h + headers. -+ (dist): Extend goal to work for gettext, too. -+ (dist-gettext): Remove goal. -+ -+ * dcgettext.c [!HAVE_ALLOCA]: Define macro alloca by using malloc. -+ -+Sun Jun 2 17:33:06 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * loadmsgcat.c (_nl_load_domain): Parameter is now comes from -+ find_l10nfile. -+ -+Sat Jun 1 02:23:03 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * l10nflist.c (__argz_next): Add definition. -+ -+ * dcgettext.c [!HAVE_ALLOCA]: Add code for handling missing alloca -+ code. Use new l10nfile handling. -+ -+ * localealias.c [!HAVE_ALLOCA]: Add code for handling missing -+ alloca code. -+ -+ * l10nflist.c: Initial revision. -+ -+Tue Apr 2 18:51:18 1996 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (all-gettext): New goal. Same as all-yes. -+ -+Thu Mar 28 23:01:22 1996 Karl Eichwalder <ke@ke.central.de> -+ -+ * Makefile.in (gettextsrcdir): Define using @datadir@. -+ -+Tue Mar 26 12:39:14 1996 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c: Include <ctype.h>. Reported by Roland McGrath. -+ -+Sat Mar 23 02:00:35 1996 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (stpcpy): Rename to stpcpy__ to prevent clashing -+ with external declaration. -+ -+Sat Mar 2 00:47:09 1996 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (all-no): Rename from all_no. -+ -+Sat Feb 17 00:25:59 1996 Ulrich Drepper <drepper@myware> -+ -+ * gettextP.h [loaded_domain]: Array `successor' must now contain up -+ to 63 elements (because of codeset name normalization). -+ -+ * finddomain.c: Implement codeset name normalization. -+ -+Thu Feb 15 04:39:09 1996 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (all): Define to `all-@USE_NLS@'. -+ (all-yes, all_no): New goals. `all-no' is noop, `all-yes' -+ is former all. -+ -+Mon Jan 15 21:46:01 1996 Howard Gayle <howard@hal.com> -+ -+ * localealias.c (alias_compare): Increment string pointers in loop -+ of strcasecmp replacement. -+ -+Fri Dec 29 21:16:34 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (install-src): Who commented this goal out ? :-) -+ -+Fri Dec 29 15:08:16 1995 Ulrich Drepper <drepper@myware> -+ -+ * dcgettext.c (DCGETTEXT): Save `errno'. Failing system calls -+ should not effect it because a missing catalog is no error. -+ Reported by Harald K<o:>nig <koenig@tat.physik.uni-tuebingen.de>. -+ -+Tue Dec 19 22:09:13 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (Makefile): Explicitly use $(SHELL) for running -+ shell scripts. -+ -+Fri Dec 15 17:34:59 1995 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> -+ -+ * Makefile.in (install-src): Only install library and header when -+ we use the own implementation. Don't do it when using the -+ system's gettext or catgets functions. -+ -+ * dcgettext.c (find_msg): Must not swap domain->hash_size here. -+ -+Sat Dec 9 16:24:37 1995 Ulrich Drepper <drepper@myware> -+ -+ * localealias.c, libintl.inst, libgettext.h, hash-string.h, -+ gettextP.h, finddomain.c, dcgettext.c, cat-compat.c: -+ Use PARAMS instead of __P. Suggested by Roland McGrath. -+ -+Tue Dec 5 11:39:14 1995 Larry Schwimmer <rosebud@cyclone.stanford.edu> -+ -+ * libgettext.h: Use `#if !defined (_LIBINTL_H)' instead of `#if -+ !_LIBINTL_H' because Solaris defines _LIBINTL_H as empty. -+ -+Mon Dec 4 15:42:07 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (install-src): -+ Install libintl.inst instead of libintl.h.install. -+ -+Sat Dec 2 22:51:38 1995 Marcus Daniels <marcus@sysc.pdx.edu> -+ -+ * cat-compat.c (textdomain): -+ Reverse order in which files are tried you load. First -+ try local file, when this failed absolute path. -+ -+Wed Nov 29 02:03:53 1995 Nelson H. F. Beebe <beebe@math.utah.edu> -+ -+ * cat-compat.c (bindtextdomain): Add missing { }. -+ -+Sun Nov 26 18:21:41 1995 Ulrich Drepper <drepper@myware> -+ -+ * libintl.inst: Add missing __P definition. Reported by Nelson Beebe. -+ -+ * Makefile.in: -+ Add dummy `all' and `dvi' goals. Reported by Tom Tromey. -+ -+Sat Nov 25 16:12:01 1995 Franc,ois Pinard <pinard@iro.umontreal.ca> -+ -+ * hash-string.h: Capitalize arguments of macros. -+ -+Sat Nov 25 12:01:36 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (DISTFILES): Prevent files names longer than 13 -+ characters. libintl.h.glibc->libintl.glibc, -+ libintl.h.install->libintl.inst. Reported by Joshua R. Poulson. -+ -+Sat Nov 25 11:31:12 1995 Eric Backus <ericb@lsid.hp.com> -+ -+ * dcgettext.c: Fix bug in preprocessor conditionals. -+ -+Sat Nov 25 02:35:27 1995 Nelson H. F. Beebe <beebe@math.utah.edu> -+ -+ * libgettext.h: Solaris cc does not understand -+ #if !SYMBOL1 && !SYMBOL2. Sad but true. -+ -+Thu Nov 23 16:22:14 1995 Ulrich Drepper <drepper@myware> -+ -+ * hash-string.h (hash_string): -+ Fix for machine with >32 bit `unsigned long's. -+ -+ * dcgettext.c (DCGETTEXT): -+ Fix horrible bug in loop for alternative translation. -+ -+Thu Nov 23 01:45:29 1995 Ulrich Drepper <drepper@myware> -+ -+ * po2tbl.sed.in, linux-msg.sed, xopen-msg.sed: -+ Some further simplifications in message number generation. -+ -+Mon Nov 20 21:08:43 1995 Ulrich Drepper <drepper@myware> -+ -+ * libintl.h.glibc: Use __const instead of const in prototypes. -+ -+ * Makefile.in (install-src): -+ Install libintl.h.install instead of libintl.h. This -+ is a stripped-down version. Suggested by Peter Miller. -+ -+ * libintl.h.install, libintl.h.glibc: Initial revision. -+ -+ * localealias.c (_nl_expand_alias, read_alias_file): -+ Protect prototypes in type casts by __P. -+ -+Tue Nov 14 16:43:58 1995 Ulrich Drepper <drepper@myware> -+ -+ * hash-string.h: Correct prototype for hash_string. -+ -+Sun Nov 12 12:42:30 1995 Ulrich Drepper <drepper@myware> -+ -+ * hash-string.h (hash_string): Add prototype. -+ -+ * gettextP.h: Fix copyright. -+ (SWAP): Add prototype. -+ -+Wed Nov 8 22:56:33 1995 Ulrich Drepper <drepper@myware> -+ -+ * localealias.c (read_alias_file): Forgot sizeof. -+ Avoid calling *printf function. This introduces a big overhead. -+ Patch by Roland McGrath. -+ -+Tue Nov 7 14:21:08 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c, cat-compat.c: Wrong indentation in #if for stpcpy. -+ -+ * finddomain.c (stpcpy): -+ Define substitution function local. The macro was to flaky. -+ -+ * cat-compat.c: Fix typo. -+ -+ * xopen-msg.sed, linux-msg.sed: -+ While bringing message number to right place only accept digits. -+ -+ * linux-msg.sed, xopen-msg.sed: Now that the counter does not have -+ leading 0s we don't need to remove them. Reported by Marcus -+ Daniels. -+ -+ * Makefile.in (../po/cat-id-tbl.o): Use $(top_srdir) in -+ dependency. Reported by Marcus Daniels. -+ -+ * cat-compat.c: (stpcpy) [!_LIBC && !HAVE_STPCPY]: Define replacement. -+ Generally cleanup using #if instead of #ifndef. -+ -+ * Makefile.in: Correct typos in comment. By Franc,ois Pinard. -+ -+Mon Nov 6 00:27:02 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (install-src): Don't install libintl.h and libintl.a -+ if we use an available gettext implementation. -+ -+Sun Nov 5 22:02:08 1995 Ulrich Drepper <drepper@myware> -+ -+ * libgettext.h: Fix typo: HAVE_CATGETTS -> HAVE_CATGETS. Reported -+ by Franc,ois Pinard. -+ -+ * libgettext.h: Use #if instead of #ifdef/#ifndef. -+ -+ * finddomain.c: -+ Comments describing what has to be done should start with FIXME. -+ -+Sun Nov 5 19:38:01 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (DISTFILES): Split. Use DISTFILES with normal meaning. -+ DISTFILES.common names the files common to both dist goals. -+ DISTFILES.gettext are the files only distributed in GNU gettext. -+ -+Sun Nov 5 17:32:54 1995 Ulrich Drepper <drepper@myware> -+ -+ * dcgettext.c (DCGETTEXT): Correct searching in derived locales. -+ This was necessary since a change in _nl_find_msg several weeks -+ ago. I really don't know this is still not fixed. -+ -+Sun Nov 5 12:43:12 1995 Ulrich Drepper <drepper@myware> -+ -+ * loadmsgcat.c (_nl_load_domain): Test for FILENAME == NULL. This -+ might mark a special condition. -+ -+ * finddomain.c (make_entry_rec): Don't make illegal entry as decided. -+ -+ * Makefile.in (dist): Suppress error message when ln failed. -+ Get files from $(srcdir) explicitly. -+ -+ * libgettext.h (gettext_const): Rename to gettext_noop. -+ -+Fri Nov 3 07:36:50 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (make_entry_rec): -+ Protect against wrong locale names by testing mask. -+ -+ * libgettext.h (gettext_const): Add macro definition. -+ Capitalize macro arguments. -+ -+Thu Nov 2 23:15:51 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (_nl_find_domain): -+ Test for pointer != NULL before accessing value. -+ Reported by Tom Tromey. -+ -+ * gettext.c (NULL): -+ Define as (void*)0 instad of 0. Reported by Franc,ois Pinard. -+ -+Mon Oct 30 21:28:52 1995 Ulrich Drepper <drepper@myware> -+ -+ * po2tbl.sed.in: Serious typo bug fixed by Jim Meyering. -+ -+Sat Oct 28 23:20:47 1995 Ulrich Drepper <drepper@myware> -+ -+ * libgettext.h: Disable dcgettext optimization for Solaris 2.3. -+ -+ * localealias.c (alias_compare): -+ Peter Miller reported that tolower in some systems is -+ even dumber than I thought. Protect call by `isupper'. -+ -+Fri Oct 27 22:22:51 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (libdir, includedir): New variables. -+ (install-src): Install libintl.a and libintl.h in correct dirs. -+ -+Fri Oct 27 22:07:29 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (SOURCES): Fix typo: intrl.compat.c -> intl-compat.c. -+ -+ * po2tbl.sed.in: Patch for buggy SEDs by Christian von Roques. -+ -+ * localealias.c: -+ Fix typo and superflous test. Reported by Christian von Roques. -+ -+Fri Oct 6 11:52:05 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (_nl_find_domain): -+ Correct some remainder from the pre-CEN syntax. Now -+ we don't have a constant number of successors anymore. -+ -+Wed Sep 27 21:41:13 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (DISTFILES): Add libintl.h.glibc. -+ -+ * Makefile.in (dist-libc): Add goal for packing sources for glibc. -+ (COMSRCS, COMHDRS): Splitted to separate sources shared with glibc. -+ -+ * loadmsgcat.c: Forget to continue #if line. -+ -+ * localealias.c: -+ [_LIBC]: Rename strcasecmp to __strcasecmp to keep ANSI C name -+ space clean. -+ -+ * dcgettext.c, finddomain.c: Better comment to last change. -+ -+ * loadmsgcat.c: -+ [_LIBC]: Rename fstat, open, close, read, mmap, and munmap to -+ __fstat, __open, __close, __read, __mmap, and __munmap resp -+ to keep ANSI C name space clean. -+ -+ * finddomain.c: -+ [_LIBC]: Rename stpcpy to __stpcpy to keep ANSI C name space clean. -+ -+ * dcgettext.c: -+ [_LIBC]: Rename getced and stpcpy to __getcwd and __stpcpy resp to -+ keep ANSI C name space clean. -+ -+ * libgettext.h: -+ Include sys/types.h for those old SysV systems out there. -+ Reported by Francesco Potorti`. -+ -+ * loadmsgcat.c (use_mmap): Define if compiled for glibc. -+ -+ * bindtextdom.c: Include all those standard headers -+ unconditionally if _LIBC is defined. -+ -+ * finddomain.c: Fix 2 times defiend -> defined. -+ -+ * textdomain.c: Include libintl.h instead of libgettext.h when -+ compiling for glibc. Include all those standard headers -+ unconditionally if _LIBC is defined. -+ -+ * localealias.c, loadmsgcat.c: Prepare to be compiled in glibc. -+ -+ * gettext.c: -+ Include libintl.h instead of libgettext.h when compiling for glibc. -+ Get NULL from stddef.h if we compile for glibc. -+ -+ * finddomain.c: Include libintl.h instead of libgettext.h when -+ compiling for glibc. Include all those standard headers -+ unconditionally if _LIBC is defined. -+ -+ * dcgettext.c: Include all those standard headers unconditionally -+ if _LIBC is defined. -+ -+ * dgettext.c: If compiled in glibc include libintl.h instead of -+ libgettext.h. -+ (locale.h): Don't rely on HAVE_LOCALE_H when compiling for glibc. -+ -+ * dcgettext.c: If compiled in glibc include libintl.h instead of -+ libgettext.h. -+ (getcwd): Don't rely on HAVE_GETCWD when compiling for glibc. -+ -+ * bindtextdom.c: -+ If compiled in glibc include libintl.h instead of libgettext.h. -+ -+Mon Sep 25 22:23:06 1995 Ulrich Drepper <drepper@myware> -+ -+ * localealias.c (_nl_expand_alias): Don't call bsearch if NMAP <= 0. -+ Reported by Marcus Daniels. -+ -+ * cat-compat.c (bindtextdomain): -+ String used in putenv must not be recycled. -+ Reported by Marcus Daniels. -+ -+ * libgettext.h (__USE_GNU_GETTEXT): -+ Additional symbol to signal that we use GNU gettext -+ library. -+ -+ * cat-compat.c (bindtextdomain): -+ Fix bug with the strange stpcpy replacement. -+ Reported by Nelson Beebe. -+ -+Sat Sep 23 08:23:51 1995 Ulrich Drepper <drepper@myware> -+ -+ * cat-compat.c: Include <string.h> for stpcpy prototype. -+ -+ * localealias.c (read_alias_file): -+ While expand strdup code temporary variable `cp' hided -+ higher level variable with same name. Rename to `tp'. -+ -+ * textdomain.c (textdomain): -+ Avoid warning by using temporary variable in strdup code. -+ -+ * finddomain.c (_nl_find_domain): Remove unused variable `application'. -+ -+Thu Sep 21 15:51:44 1995 Ulrich Drepper <drepper@myware> -+ -+ * localealias.c (alias_compare): -+ Use strcasecmp() only if available. Else use -+ implementation in place. -+ -+ * intl-compat.c: -+ Wrapper functions now call *__ functions instead of __*. -+ -+ * libgettext.h: Declare prototypes for *__ functions instead for __*. -+ -+ * cat-compat.c, loadmsgcat.c: -+ Don't use xmalloc, xstrdup, and stpcpy. These functions are not part -+ of the standard libc and so prevent libintl.a from being used -+ standalone. -+ -+ * bindtextdom.c: -+ Don't use xmalloc, xstrdup, and stpcpy. These functions are not part -+ of the standard libc and so prevent libintl.a from being used -+ standalone. -+ Rename to bindtextdomain__ if not used in GNU C Library. -+ -+ * dgettext.c: -+ Rename function to dgettext__ if not used in GNU C Library. -+ -+ * gettext.c: -+ Don't use xmalloc, xstrdup, and stpcpy. These functions are not part -+ of the standard libc and so prevent libintl.a from being used -+ standalone. -+ Functions now called gettext__ if not used in GNU C Library. -+ -+ * dcgettext.c, localealias.c, textdomain.c, finddomain.c: -+ Don't use xmalloc, xstrdup, and stpcpy. These functions are not part -+ of the standard libc and so prevent libintl.a from being used -+ standalone. -+ -+Sun Sep 17 23:14:49 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c: Correct some bugs in handling of CEN standard -+ locale definitions. -+ -+Thu Sep 7 01:49:28 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c: Implement CEN syntax. -+ -+ * gettextP.h (loaded_domain): Extend number of successors to 31. -+ -+Sat Aug 19 19:25:29 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (aliaspath): Remove path to X11 locale dir. -+ -+ * Makefile.in: Make install-src depend on install. This helps -+ gettext to install the sources and other packages can use the -+ install goal. -+ -+Sat Aug 19 15:19:33 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (uninstall): Remove stuff installed by install-src. -+ -+Tue Aug 15 13:13:53 1995 Ulrich Drepper <drepper@myware> -+ -+ * VERSION.in: Initial revision. -+ -+ * Makefile.in (DISTFILES): -+ Add VERSION file. This is not necessary for gettext, but -+ for other packages using this library. -+ -+Tue Aug 15 06:16:44 1995 Ulrich Drepper <drepper@myware> -+ -+ * gettextP.h (_nl_find_domain): -+ New prototype after changing search strategy. -+ -+ * finddomain.c (_nl_find_domain): -+ We now try only to find a specified catalog. Fall back to other -+ catalogs listed in the locale list is now done in __dcgettext. -+ -+ * dcgettext.c (__dcgettext): -+ Now we provide message fall back even to different languages. -+ I.e. if a message is not available in one language all the other -+ in the locale list a tried. Formerly fall back was only possible -+ within one language. Implemented by moving one loop from -+ _nl_find_domain to here. -+ -+Mon Aug 14 23:45:50 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (gettextsrcdir): -+ Directory where source of GNU gettext library are made -+ available. -+ (INSTALL, INSTALL_DATA): Programs used for installing sources. -+ (gettext-src): New. Rule to install GNU gettext sources for use in -+ gettextize shell script. -+ -+Sun Aug 13 14:40:48 1995 Ulrich Drepper <drepper@myware> -+ -+ * loadmsgcat.c (_nl_load_domain): -+ Use mmap for loading only when munmap function is -+ also available. -+ -+ * Makefile.in (install): Depend on `all' goal. -+ -+Wed Aug 9 11:04:33 1995 Ulrich Drepper <drepper@myware> -+ -+ * localealias.c (read_alias_file): -+ Do not overwrite '\n' when terminating alias value string. -+ -+ * localealias.c (read_alias_file): -+ Handle long lines. Ignore the rest not fitting in -+ the buffer after the initial `fgets' call. -+ -+Wed Aug 9 00:54:29 1995 Ulrich Drepper <drepper@myware> -+ -+ * gettextP.h (_nl_load_domain): -+ Add prototype, replacing prototype for _nl_load_msg_cat. -+ -+ * finddomain.c (_nl_find_domain): -+ Remove unneeded variable filename and filename_len. -+ (expand_alias): Remove prototype because functions does not -+ exist anymore. -+ -+ * localealias.c (read_alias_file): -+ Change type of fname_len parameter to int. -+ (xmalloc): Add prototype. -+ -+ * loadmsgcat.c: Better prototypes for xmalloc. -+ -+Tue Aug 8 22:30:39 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (_nl_find_domain): -+ Allow alias name to be constructed from the four components. -+ -+ * Makefile.in (aliaspath): New variable. Set to preliminary value. -+ (SOURCES): Add localealias.c. -+ (OBJECTS): Add localealias.o. -+ -+ * gettextP.h: Add prototype for _nl_expand_alias. -+ -+ * finddomain.c: Aliasing handled in intl/localealias.c. -+ -+ * localealias.c: Aliasing for locale names. -+ -+ * bindtextdom.c: Better prototypes for xmalloc and xstrdup. -+ -+Mon Aug 7 23:47:42 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (DISTFILES): gettext.perl is now found in misc/. -+ -+ * cat-compat.c (bindtextdomain): -+ Correct implementation. dirname parameter was not used. -+ Reported by Marcus Daniels. -+ -+ * gettextP.h (loaded_domain): -+ New fields `successor' and `decided' for oo, lazy -+ message handling implementation. -+ -+ * dcgettext.c: -+ Adopt for oo, lazy message handliing. -+ Now we can inherit translations from less specific locales. -+ (find_msg): New function. -+ -+ * loadmsgcat.c, finddomain.c: -+ Complete rewrite. Implement oo, lazy message handling :-). -+ We now have an additional environment variable `LANGUAGE' with -+ a higher priority than LC_ALL for the LC_MESSAGE locale. -+ Here we can set a colon separated list of specifications each -+ of the form `language[_territory[.codeset]][@modifier]'. -+ -+Sat Aug 5 09:55:42 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (unistd.h): -+ Include to get _PC_PATH_MAX defined on system having it. -+ -+Fri Aug 4 22:42:00 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (stpcpy): Include prototype. -+ -+ * Makefile.in (dist): Remove `copying instead' message. -+ -+Wed Aug 2 18:52:03 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (ID, TAGS): Do not use $^. -+ -+Tue Aug 1 20:07:11 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (TAGS, ID): Use $^ as command argument. -+ (TAGS): Give etags -o option t write to current directory, -+ not $(srcdir). -+ (ID): Use $(srcdir) instead os $(top_srcdir)/src. -+ (distclean): Remove ID. -+ -+Sun Jul 30 11:51:46 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (gnulocaledir): -+ New variable, always using share/ for data directory. -+ (DEFS): Add GNULOCALEDIR, used in finddomain.c. -+ -+ * finddomain.c (_nl_default_dirname): -+ Set to GNULOCALEDIR, because it always has to point -+ to the directory where GNU gettext Library writes it to. -+ -+ * intl-compat.c (textdomain, bindtextdomain): -+ Undefine macros before function definition. -+ -+Sat Jul 22 01:10:02 1995 Ulrich Drepper <drepper@myware> -+ -+ * libgettext.h (_LIBINTL_H): -+ Protect definition in case where this file is included as -+ libgettext.h on Solaris machines. Add comment about this. -+ -+Wed Jul 19 02:36:42 1995 Ulrich Drepper <drepper@myware> -+ -+ * intl-compat.c (textdomain): Correct typo. -+ -+Wed Jul 19 01:51:35 1995 Ulrich Drepper <drepper@myware> -+ -+ * dcgettext.c (dcgettext): Function now called __dcgettext. -+ -+ * dgettext.c (dgettext): Now called __dgettext and calls -+ __dcgettext. -+ -+ * gettext.c (gettext): -+ Function now called __gettext and calls __dgettext. -+ -+ * textdomain.c (textdomain): Function now called __textdomain. -+ -+ * bindtextdom.c (bindtextdomain): Function now called -+ __bindtextdomain. -+ -+ * intl-compat.c: Initial revision. -+ -+ * Makefile.in (SOURCES): Add intl-compat.c. -+ (OBJECTS): We always compile the GNU gettext library functions. -+ OBJECTS contains all objects but cat-compat.o, ../po/cat-if-tbl.o, -+ and intl-compat.o. -+ (GETTOBJS): Contains now only intl-compat.o. -+ -+ * libgettext.h: -+ Re-include protection matches dualistic character of libgettext.h. -+ For all functions in GNU gettext library define __ counter part. -+ -+ * finddomain.c (strchr): Define as index if not found in C library. -+ (_nl_find_domain): For relative paths paste / in between. -+ -+Tue Jul 18 16:37:45 1995 Ulrich Drepper <drepper@myware> -+ -+ * loadmsgcat.c, finddomain.c: Add inclusion of sys/types.h. -+ -+ * xopen-msg.sed: Fix bug with `msgstr ""' lines. -+ A little bit better comments. -+ -+Tue Jul 18 01:18:27 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in: -+ po-mode.el, makelinks, combine-sh are now found in ../misc. -+ -+ * po-mode.el, makelinks, combine-sh, elisp-comp: -+ Moved to ../misc/. -+ -+ * libgettext.h, gettextP.h, gettext.h: Uniform test for __STDC__. -+ -+Sun Jul 16 22:33:02 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (INSTALL, INSTALL_DATA): New variables. -+ (install-data, uninstall): Install/uninstall .elc file. -+ -+ * po-mode.el (Installation comment): -+ Add .pox as possible extension of .po files. -+ -+Sun Jul 16 13:23:27 1995 Ulrich Drepper <drepper@myware> -+ -+ * elisp-comp: Complete new version by Franc,ois: This does not -+ fail when not compiling in the source directory. -+ -+Sun Jul 16 00:12:17 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (../po/cat-id-tbl.o): -+ Use $(MAKE) instead of make for recursive make. -+ -+ * Makefile.in (.el.elc): Use $(SHELL) instead of /bin/sh. -+ (install-exec): Add missing dummy goal. -+ (install-data, uninstall): @ in multi-line shell command at -+ beginning, not in front of echo. Reported by Eric Backus. -+ -+Sat Jul 15 00:21:28 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (DISTFILES): -+ Rename libgettext.perl to gettext.perl to fit in 14 chars -+ file systems. -+ -+ * gettext.perl: -+ Rename to gettext.perl to fit in 14 chars file systems. -+ -+Thu Jul 13 23:17:20 1995 Ulrich Drepper <drepper@myware> -+ -+ * cat-compat.c: If !STDC_HEADERS try to include malloc.h. -+ -+Thu Jul 13 20:55:02 1995 Ulrich Drepper <drepper@myware> -+ -+ * po2tbl.sed.in: Pretty printing. -+ -+ * linux-msg.sed, xopen-msg.sed: -+ Correct bugs with handling substitute flags in branches. -+ -+ * hash-string.h (hash_string): -+ Old K&R compilers don't under stand `unsigned char'. -+ -+ * gettext.h (nls_uint32): -+ Some old K&R compilers (eg HP) don't understand `unsigned int'. -+ -+ * cat-compat.c (msg_to_cat_id): De-ANSI-fy prototypes. -+ -+Thu Jul 13 01:34:33 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (ELCFILES): New variable. -+ (DISTFILES): Add elisp-comp. -+ Add implicit rule for .el -> .elc compilation. -+ (install-data): install $ELCFILES -+ (clean): renamed po-to-tbl and po-to-msg to po2tbl and po2msg resp. -+ -+ * elisp-comp: Initial revision -+ -+Wed Jul 12 16:14:52 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in: -+ cat-id-tbl.c is now found in po/. This enables us to use an identical -+ intl/ directory in all packages. -+ -+ * dcgettext.c (dcgettext): hashing does not work for table size <= 2. -+ -+ * textdomain.c: fix typo (#if def -> #if defined) -+ -+Tue Jul 11 18:44:43 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (stamp-cat-id): use top_srcdir to address source files -+ (DISTFILES,distclean): move tupdate.perl to src/ -+ -+ * po-to-tbl.sed.in: -+ add additional jump to clear change flag to recognize multiline strings -+ -+Tue Jul 11 01:32:50 1995 Ulrich Drepper <drepper@myware> -+ -+ * textdomain.c: Protect inclusion of stdlib.h and string.h. -+ -+ * loadmsgcat.c: Protect inclusion of stdlib.h. -+ -+ * libgettext.h: Protect inclusion of locale.h. -+ Allow use in C++ programs. -+ Define NULL is not happened already. -+ -+ * Makefile.in (DISTFILES): ship po-to-tbl.sed.in instead of -+ po-to-tbl.sed. -+ (distclean): remove po-to-tbl.sed and tupdate.perl. -+ -+ * tupdate.perl.in: Substitute Perl path even in exec line. -+ Don't include entries without translation from old .po file. -+ -+Tue Jul 4 00:41:51 1995 Ulrich Drepper <drepper@myware> -+ -+ * tupdate.perl.in: use "Updated: " in msgid "". -+ -+ * cat-compat.c: Fix typo (LOCALDIR -> LOCALEDIR). -+ Define getenv if !__STDC__. -+ -+ * bindtextdom.c: Protect stdlib.h and string.h inclusion. -+ Define free if !__STDC__. -+ -+ * finddomain.c: Change DEF_MSG_DOM_DIR to LOCALEDIR. -+ Define free if !__STDC__. -+ -+ * cat-compat.c: Change DEF_MSG_DOM_DIR to LOCALEDIR. -+ -+Mon Jul 3 23:56:30 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in: Use LOCALEDIR instead of DEF_MSG_DOM_DIR. -+ Remove unneeded $(srcdir) from Makefile.in dependency. -+ -+ * makelinks: Add copyright and short description. -+ -+ * po-mode.el: Last version for 0.7. -+ -+ * tupdate.perl.in: Fix die message. -+ -+ * dcgettext.c: Protect include of string.h. -+ -+ * gettext.c: Protect include of stdlib.h and further tries to get NULL. -+ -+ * finddomain.c: Some corrections in includes. -+ -+ * Makefile.in (INCLUDES): Prune list correct path to Makefile.in. -+ -+ * po-to-tbl.sed: Adopt for new .po file format. -+ -+ * linux-msg.sed, xopen-msg.sed: Adopt for new .po file format. -+ -+Sun Jul 2 23:55:03 1995 Ulrich Drepper <drepper@myware> -+ -+ * tupdate.perl.in: Complete rewrite for new .po file format. -+ -+Sun Jul 2 02:06:50 1995 Ulrich Drepper <drepper@myware> -+ -+ * First official release. This directory contains all the code -+ needed to internationalize own packages. It provides functions -+ which allow to use the X/Open catgets function with an interface -+ like the Uniforum gettext function. For system which does not -+ have neither of those a complete implementation is provided. -diff -Pur GConf-1.0.0.orig/intl/Makefile.in GConf-1.0.0/intl/Makefile.in ---- GConf-1.0.0.orig/intl/Makefile.in Wed Dec 31 19:00:00 1969 -+++ GConf-1.0.0/intl/Makefile.in Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,214 @@ -+# Makefile for directory with message catalog handling in GNU NLS Utilities. -+# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+# -+# This program 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 General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+PACKAGE = @PACKAGE@ -+VERSION = @VERSION@ -+ -+SHELL = /bin/sh -+ -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+top_builddir = .. -+VPATH = @srcdir@ -+ -+prefix = @prefix@ -+exec_prefix = @exec_prefix@ -+transform = @program_transform_name@ -+libdir = $(exec_prefix)/lib -+includedir = $(prefix)/include -+datadir = $(prefix)/@DATADIRNAME@ -+localedir = $(datadir)/locale -+gnulocaledir = $(prefix)/share/locale -+gettextsrcdir = @datadir@/gettext/intl -+aliaspath = $(localedir):. -+subdir = intl -+ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+MKINSTALLDIRS = @MKINSTALLDIRS@ -+ -+l = @l@ -+ -+AR = ar -+CC = @CC@ -+LIBTOOL = @LIBTOOL@ -+RANLIB = @RANLIB@ -+ -+DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \ -+-DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@ -+CPPFLAGS = @CPPFLAGS@ -+CFLAGS = @CFLAGS@ -+LDFLAGS = @LDFLAGS@ -+ -+COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) -+ -+HEADERS = $(COMHDRS) libgettext.h loadinfo.h -+COMHDRS = gettext.h gettextP.h hash-string.h -+SOURCES = $(COMSRCS) intl-compat.c cat-compat.c -+COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \ -+finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \ -+explodename.c -+OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \ -+finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \ -+explodename.$lo -+CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo -+GETTOBJS = intl-compat.$lo -+DISTFILES.common = ChangeLog Makefile.in linux-msg.sed po2tbl.sed.in \ -+xopen-msg.sed $(HEADERS) $(SOURCES) -+DISTFILES.normal = VERSION -+DISTFILES.gettext = libintl.glibc intlh.inst.in -+ -+.SUFFIXES: -+.SUFFIXES: .c .o .lo -+.c.o: -+ $(COMPILE) $< -+.c.lo: -+ $(LIBTOOL) --mode=compile $(COMPILE) $< -+ -+INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib -+ -+all: all-@USE_INCLUDED_LIBINTL@ -+ -+all-yes: libintl.$la intlh.inst -+all-no: -+ -+libintl.a: $(OBJECTS) -+ rm -f $@ -+ $(AR) cru $@ $(OBJECTS) -+ $(RANLIB) $@ -+ -+libintl.la: $(OBJECTS) -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \ -+ -version-info 1:0 -rpath $(libdir) -+ -+../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot -+ cd ../po && $(MAKE) cat-id-tbl.$lo -+ -+check: all -+ -+# This installation goal is only used in GNU gettext. Packages which -+# only use the library should use install instead. -+ -+# We must not install the libintl.h/libintl.a files if we are on a -+# system which has the gettext() function in its C library or in a -+# separate library or use the catgets interface. A special case is -+# where configure found a previously installed GNU gettext library. -+# If you want to use the one which comes with this version of the -+# package, you have to use `configure --with-included-gettext'. -+install: install-exec install-data -+install-exec: all -+ if test "$(PACKAGE)" = "gettext" \ -+ && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ -+ if test -r $(MKINSTALLDIRS); then \ -+ $(MKINSTALLDIRS) $(libdir) $(includedir); \ -+ else \ -+ $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \ -+ fi; \ -+ $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \ -+ $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \ -+ else \ -+ : ; \ -+ fi -+install-data: all -+ if test "$(PACKAGE)" = "gettext"; then \ -+ if test -r $(MKINSTALLDIRS); then \ -+ $(MKINSTALLDIRS) $(gettextsrcdir); \ -+ else \ -+ $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \ -+ fi; \ -+ $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \ -+ dists="$(DISTFILES.common)"; \ -+ for file in $$dists; do \ -+ $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \ -+ done; \ -+ else \ -+ : ; \ -+ fi -+ -+# Define this as empty until I found a useful application. -+installcheck: -+ -+uninstall: -+ dists="$(DISTFILES.common)"; \ -+ for file in $$dists; do \ -+ rm -f $(gettextsrcdir)/$$file; \ -+ done -+ -+info dvi: -+ -+$(OBJECTS): ../config.h libgettext.h -+bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h -+dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h -+ -+tags: TAGS -+ -+TAGS: $(HEADERS) $(SOURCES) -+ here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES) -+ -+id: ID -+ -+ID: $(HEADERS) $(SOURCES) -+ here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES) -+ -+ -+mostlyclean: -+ rm -f *.a *.o *.lo core core.* -+ -+clean: mostlyclean -+ -+distclean: clean -+ rm -f Makefile ID TAGS po2msg.sed po2tbl.sed -+ -+maintainer-clean: distclean -+ @echo "This command is intended for maintainers to use;" -+ @echo "it deletes files that may require special tools to rebuild." -+ -+ -+# GNU gettext needs not contain the file `VERSION' but contains some -+# other files which should not be distributed in other packages. -+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) -+dist distdir: Makefile $(DISTFILES) -+ if test "$(PACKAGE)" = gettext; then \ -+ additional="$(DISTFILES.gettext)"; \ -+ else \ -+ additional="$(DISTFILES.normal)"; \ -+ fi; \ -+ for file in $(DISTFILES.common) $$additional; do \ -+ ln $(srcdir)/$$file $(distdir) 2> /dev/null \ -+ || cp -p $(srcdir)/$$file $(distdir); \ -+ done -+ -+dist-libc: -+ tar zcvf intl-glibc.tar.gz $(COMSRCS) $(COMHDRS) libintl.h.glibc -+ -+Makefile: Makefile.in ../config.status -+ cd .. \ -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ -+# The dependency for intlh.inst is different in gettext and all other -+# packages. Because we cannot you GNU make features we have to solve -+# the problem while rewriting Makefile.in. -+@GT_YES@intlh.inst: intlh.inst.in ../config.status -+@GT_YES@ cd .. \ -+@GT_YES@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \ -+@GT_YES@ $(SHELL) ./config.status -+@GT_NO@.PHONY: intlh.inst -+@GT_NO@intlh.inst: -+ -+# Tell versions [3.59,3.63) of GNU make not to export all variables. -+# Otherwise a system limit (for SysV at least) may be exceeded. -+.NOEXPORT: -diff -Pur GConf-1.0.0.orig/intl/VERSION GConf-1.0.0/intl/VERSION ---- GConf-1.0.0.orig/intl/VERSION Wed Dec 31 19:00:00 1969 -+++ GConf-1.0.0/intl/VERSION Fri Mar 16 14:46:14 2001 -@@ -0,0 +1 @@ -+GNU gettext library from gettext-0.10.35 -diff -Pur GConf-1.0.0.orig/intl/bindtextdom.c GConf-1.0.0/intl/bindtextdom.c ---- GConf-1.0.0.orig/intl/bindtextdom.c Wed Dec 31 19:00:00 1969 -+++ GConf-1.0.0/intl/bindtextdom.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,203 @@ -+/* Implementation of the bindtextdomain(3) function -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#else -+# ifdef HAVE_MALLOC_H -+# include <malloc.h> -+# else -+void free (); -+# endif -+#endif -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# include <string.h> -+#else -+# include <strings.h> -+# ifndef memcpy -+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -+# endif -+#endif -+ -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+#include "gettext.h" -+#include "gettextP.h" -+ -+/* @@ end of prolog @@ */ -+ -+/* Contains the default location of the message catalogs. */ -+extern const char _nl_default_dirname[]; -+ -+/* List with bindings of specific domains. */ -+extern struct binding *_nl_domain_bindings; -+ -+ -+/* Names for the libintl functions are a problem. They must not clash -+ with existing names and they should follow ANSI C. But this source -+ code is also used in GNU C Library where the names have a __ -+ prefix. So we have to make a difference here. */ -+#ifdef _LIBC -+# define BINDTEXTDOMAIN __bindtextdomain -+# ifndef strdup -+# define strdup(str) __strdup (str) -+# endif -+#else -+# define BINDTEXTDOMAIN bindtextdomain__ -+#endif -+ -+/* Specify that the DOMAINNAME message catalog will be found -+ in DIRNAME rather than in the system locale data base. */ -+char * -+BINDTEXTDOMAIN (domainname, dirname) -+ const char *domainname; -+ const char *dirname; -+{ -+ struct binding *binding; -+ -+ /* Some sanity checks. */ -+ if (domainname == NULL || domainname[0] == '\0') -+ return NULL; -+ -+ for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) -+ { -+ int compare = strcmp (domainname, binding->domainname); -+ if (compare == 0) -+ /* We found it! */ -+ break; -+ if (compare < 0) -+ { -+ /* It is not in the list. */ -+ binding = NULL; -+ break; -+ } -+ } -+ -+ if (dirname == NULL) -+ /* The current binding has be to returned. */ -+ return binding == NULL ? (char *) _nl_default_dirname : binding->dirname; -+ -+ if (binding != NULL) -+ { -+ /* The domain is already bound. If the new value and the old -+ one are equal we simply do nothing. Otherwise replace the -+ old binding. */ -+ if (strcmp (dirname, binding->dirname) != 0) -+ { -+ char *new_dirname; -+ -+ if (strcmp (dirname, _nl_default_dirname) == 0) -+ new_dirname = (char *) _nl_default_dirname; -+ else -+ { -+#if defined _LIBC || defined HAVE_STRDUP -+ new_dirname = strdup (dirname); -+ if (new_dirname == NULL) -+ return NULL; -+#else -+ size_t len = strlen (dirname) + 1; -+ new_dirname = (char *) malloc (len); -+ if (new_dirname == NULL) -+ return NULL; -+ -+ memcpy (new_dirname, dirname, len); -+#endif -+ } -+ -+ if (binding->dirname != _nl_default_dirname) -+ free (binding->dirname); -+ -+ binding->dirname = new_dirname; -+ } -+ } -+ else -+ { -+ /* We have to create a new binding. */ -+#if !defined _LIBC && !defined HAVE_STRDUP -+ size_t len; -+#endif -+ struct binding *new_binding = -+ (struct binding *) malloc (sizeof (*new_binding)); -+ -+ if (new_binding == NULL) -+ return NULL; -+ -+#if defined _LIBC || defined HAVE_STRDUP -+ new_binding->domainname = strdup (domainname); -+ if (new_binding->domainname == NULL) -+ return NULL; -+#else -+ len = strlen (domainname) + 1; -+ new_binding->domainname = (char *) malloc (len); -+ if (new_binding->domainname == NULL) -+ return NULL; -+ memcpy (new_binding->domainname, domainname, len); -+#endif -+ -+ if (strcmp (dirname, _nl_default_dirname) == 0) -+ new_binding->dirname = (char *) _nl_default_dirname; -+ else -+ { -+#if defined _LIBC || defined HAVE_STRDUP -+ new_binding->dirname = strdup (dirname); -+ if (new_binding->dirname == NULL) -+ return NULL; -+#else -+ len = strlen (dirname) + 1; -+ new_binding->dirname = (char *) malloc (len); -+ if (new_binding->dirname == NULL) -+ return NULL; -+ memcpy (new_binding->dirname, dirname, len); -+#endif -+ } -+ -+ /* Now enqueue it. */ -+ if (_nl_domain_bindings == NULL -+ || strcmp (domainname, _nl_domain_bindings->domainname) < 0) -+ { -+ new_binding->next = _nl_domain_bindings; -+ _nl_domain_bindings = new_binding; -+ } -+ else -+ { -+ binding = _nl_domain_bindings; -+ while (binding->next != NULL -+ && strcmp (domainname, binding->next->domainname) > 0) -+ binding = binding->next; -+ -+ new_binding->next = binding->next; -+ binding->next = new_binding; -+ } -+ -+ binding = new_binding; -+ } -+ -+ return binding->dirname; -+} -+ -+#ifdef _LIBC -+/* Alias for function name in GNU C Library. */ -+weak_alias (__bindtextdomain, bindtextdomain); -+#endif -diff -Pur GConf-1.0.0.orig/intl/cat-compat.c GConf-1.0.0/intl/cat-compat.c ---- GConf-1.0.0.orig/intl/cat-compat.c Wed Dec 31 19:00:00 1969 -+++ GConf-1.0.0/intl/cat-compat.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,262 @@ -+/* Compatibility code for gettext-using-catgets interface. -+ Copyright (C) 1995, 1997 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <stdio.h> -+ -+#ifdef STDC_HEADERS -+# include <stdlib.h> -+# include <string.h> -+#else -+char *getenv (); -+# ifdef HAVE_MALLOC_H -+# include <malloc.h> -+# endif -+#endif -+ -+#ifdef HAVE_NL_TYPES_H -+# include <nl_types.h> -+#endif -+ -+#include "libgettext.h" -+ -+/* @@ end of prolog @@ */ -+ -+/* XPG3 defines the result of `setlocale (category, NULL)' as: -+ ``Directs `setlocale()' to query `category' and return the current -+ setting of `local'.'' -+ However it does not specify the exact format. And even worse: POSIX -+ defines this not at all. So we can use this feature only on selected -+ system (e.g. those using GNU C Library). */ -+#ifdef _LIBC -+# define HAVE_LOCALE_NULL -+#endif -+ -+/* The catalog descriptor. */ -+static nl_catd catalog = (nl_catd) -1; -+ -+/* Name of the default catalog. */ -+static const char default_catalog_name[] = "messages"; -+ -+/* Name of currently used catalog. */ -+static const char *catalog_name = default_catalog_name; -+ -+/* Get ID for given string. If not found return -1. */ -+static int msg_to_cat_id PARAMS ((const char *msg)); -+ -+/* Substitution for systems lacking this function in their C library. */ -+#if !_LIBC && !HAVE_STPCPY -+static char *stpcpy PARAMS ((char *dest, const char *src)); -+#endif -+ -+ -+/* Set currently used domain/catalog. */ -+char * -+textdomain (domainname) -+ const char *domainname; -+{ -+ nl_catd new_catalog; -+ char *new_name; -+ size_t new_name_len; -+ char *lang; -+ -+#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES \ -+ && defined HAVE_LOCALE_NULL -+ lang = setlocale (LC_MESSAGES, NULL); -+#else -+ lang = getenv ("LC_ALL"); -+ if (lang == NULL || lang[0] == '\0') -+ { -+ lang = getenv ("LC_MESSAGES"); -+ if (lang == NULL || lang[0] == '\0') -+ lang = getenv ("LANG"); -+ } -+#endif -+ if (lang == NULL || lang[0] == '\0') -+ lang = "C"; -+ -+ /* See whether name of currently used domain is asked. */ -+ if (domainname == NULL) -+ return (char *) catalog_name; -+ -+ if (domainname[0] == '\0') -+ domainname = default_catalog_name; -+ -+ /* Compute length of added path element. */ -+ new_name_len = sizeof (LOCALEDIR) - 1 + 1 + strlen (lang) -+ + sizeof ("/LC_MESSAGES/") - 1 + sizeof (PACKAGE) - 1 -+ + sizeof (".cat"); -+ -+ new_name = (char *) malloc (new_name_len); -+ if (new_name == NULL) -+ return NULL; -+ -+ strcpy (new_name, PACKAGE); -+ new_catalog = catopen (new_name, 0); -+ -+ if (new_catalog == (nl_catd) -1) -+ { -+ /* NLSPATH search didn't work, try absolute path */ -+ sprintf (new_name, "%s/%s/LC_MESSAGES/%s.cat", LOCALEDIR, lang, -+ PACKAGE); -+ new_catalog = catopen (new_name, 0); -+ -+ if (new_catalog == (nl_catd) -1) -+ { -+ free (new_name); -+ return (char *) catalog_name; -+ } -+ } -+ -+ /* Close old catalog. */ -+ if (catalog != (nl_catd) -1) -+ catclose (catalog); -+ if (catalog_name != default_catalog_name) -+ free ((char *) catalog_name); -+ -+ catalog = new_catalog; -+ catalog_name = new_name; -+ -+ return (char *) catalog_name; -+} -+ -+char * -+bindtextdomain (domainname, dirname) -+ const char *domainname; -+ const char *dirname; -+{ -+#if HAVE_SETENV || HAVE_PUTENV -+ char *old_val, *new_val, *cp; -+ size_t new_val_len; -+ -+ /* This does not make much sense here but to be compatible do it. */ -+ if (domainname == NULL) -+ return NULL; -+ -+ /* Compute length of added path element. If we use setenv we don't need -+ the first byts for NLSPATH=, but why complicate the code for this -+ peanuts. */ -+ new_val_len = sizeof ("NLSPATH=") - 1 + strlen (dirname) -+ + sizeof ("/%L/LC_MESSAGES/%N.cat"); -+ -+ old_val = getenv ("NLSPATH"); -+ if (old_val == NULL || old_val[0] == '\0') -+ { -+ old_val = NULL; -+ new_val_len += 1 + sizeof (LOCALEDIR) - 1 -+ + sizeof ("/%L/LC_MESSAGES/%N.cat"); -+ } -+ else -+ new_val_len += strlen (old_val); -+ -+ new_val = (char *) malloc (new_val_len); -+ if (new_val == NULL) -+ return NULL; -+ -+# if HAVE_SETENV -+ cp = new_val; -+# else -+ cp = stpcpy (new_val, "NLSPATH="); -+# endif -+ -+ cp = stpcpy (cp, dirname); -+ cp = stpcpy (cp, "/%L/LC_MESSAGES/%N.cat:"); -+ -+ if (old_val == NULL) -+ { -+# if __STDC__ -+ stpcpy (cp, LOCALEDIR "/%L/LC_MESSAGES/%N.cat"); -+# else -+ -+ cp = stpcpy (cp, LOCALEDIR); -+ stpcpy (cp, "/%L/LC_MESSAGES/%N.cat"); -+# endif -+ } -+ else -+ stpcpy (cp, old_val); -+ -+# if HAVE_SETENV -+ setenv ("NLSPATH", new_val, 1); -+ free (new_val); -+# else -+ putenv (new_val); -+ /* Do *not* free the environment entry we just entered. It is used -+ from now on. */ -+# endif -+ -+#endif -+ -+ return (char *) domainname; -+} -+ -+#undef gettext -+char * -+gettext (msg) -+ const char *msg; -+{ -+ int msgid; -+ -+ if (msg == NULL || catalog == (nl_catd) -1) -+ return (char *) msg; -+ -+ /* Get the message from the catalog. We always use set number 1. -+ The message ID is computed by the function `msg_to_cat_id' -+ which works on the table generated by `po-to-tbl'. */ -+ msgid = msg_to_cat_id (msg); -+ if (msgid == -1) -+ return (char *) msg; -+ -+ return catgets (catalog, 1, msgid, (char *) msg); -+} -+ -+/* Look through the table `_msg_tbl' which has `_msg_tbl_length' entries -+ for the one equal to msg. If it is found return the ID. In case when -+ the string is not found return -1. */ -+static int -+msg_to_cat_id (msg) -+ const char *msg; -+{ -+ int cnt; -+ -+ for (cnt = 0; cnt < _msg_tbl_length; ++cnt) -+ if (strcmp (msg, _msg_tbl[cnt]._msg) == 0) -+ return _msg_tbl[cnt]._msg_number; -+ -+ return -1; -+} -+ -+ -+/* @@ begin of epilog @@ */ -+ -+/* We don't want libintl.a to depend on any other library. So we -+ avoid the non-standard function stpcpy. In GNU C Library this -+ function is available, though. Also allow the symbol HAVE_STPCPY -+ to be defined. */ -+#if !_LIBC && !HAVE_STPCPY -+static char * -+stpcpy (dest, src) -+ char *dest; -+ const char *src; -+{ -+ while ((*dest++ = *src++) != '\0') -+ /* Do nothing. */ ; -+ return dest - 1; -+} -+#endif -diff -Pur GConf-1.0.0.orig/intl/dcgettext.c GConf-1.0.0/intl/dcgettext.c ---- GConf-1.0.0.orig/intl/dcgettext.c Wed Dec 31 19:00:00 1969 -+++ GConf-1.0.0/intl/dcgettext.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,624 @@ -+/* Implementation of the dcgettext(3) function. -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <sys/types.h> -+ -+#ifdef __GNUC__ -+# define alloca __builtin_alloca -+# define HAVE_ALLOCA 1 -+#else -+# if defined HAVE_ALLOCA_H || defined _LIBC -+# include <alloca.h> -+# else -+# ifdef _AIX -+ #pragma alloca -+# else -+# ifndef alloca -+char *alloca (); -+# endif -+# endif -+# endif -+#endif -+ -+#include <errno.h> -+#ifndef errno -+extern int errno; -+#endif -+#ifndef __set_errno -+# define __set_errno(val) errno = (val) -+#endif -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#else -+char *getenv (); -+# ifdef HAVE_MALLOC_H -+# include <malloc.h> -+# else -+void free (); -+# endif -+#endif -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# ifndef _GNU_SOURCE -+# define _GNU_SOURCE 1 -+# endif -+# include <string.h> -+#else -+# include <strings.h> -+#endif -+#if !HAVE_STRCHR && !defined _LIBC -+# ifndef strchr -+# define strchr index -+# endif -+#endif -+ -+#if defined HAVE_UNISTD_H || defined _LIBC -+# include <unistd.h> -+#endif -+ -+#include "gettext.h" -+#include "gettextP.h" -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+#include "hash-string.h" -+ -+/* @@ end of prolog @@ */ -+ -+#ifdef _LIBC -+/* Rename the non ANSI C functions. This is required by the standard -+ because some ANSI C functions will require linking with this object -+ file and the name space must not be polluted. */ -+# define getcwd __getcwd -+# ifndef stpcpy -+# define stpcpy __stpcpy -+# endif -+#else -+# if !defined HAVE_GETCWD -+char *getwd (); -+# define getcwd(buf, max) getwd (buf) -+# else -+char *getcwd (); -+# endif -+# ifndef HAVE_STPCPY -+static char *stpcpy PARAMS ((char *dest, const char *src)); -+# endif -+#endif -+ -+/* Amount to increase buffer size by in each try. */ -+#define PATH_INCR 32 -+ -+/* The following is from pathmax.h. */ -+/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define -+ PATH_MAX but might cause redefinition warnings when sys/param.h is -+ later included (as on MORE/BSD 4.3). */ -+#if defined(_POSIX_VERSION) || (defined(HAVE_LIMITS_H) && !defined(__GNUC__)) -+# include <limits.h> -+#endif -+ -+#ifndef _POSIX_PATH_MAX -+# define _POSIX_PATH_MAX 255 -+#endif -+ -+#if !defined(PATH_MAX) && defined(_PC_PATH_MAX) -+# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX)) -+#endif -+ -+/* Don't include sys/param.h if it already has been. */ -+#if defined(HAVE_SYS_PARAM_H) && !defined(PATH_MAX) && !defined(MAXPATHLEN) -+# include <sys/param.h> -+#endif -+ -+#if !defined(PATH_MAX) && defined(MAXPATHLEN) -+# define PATH_MAX MAXPATHLEN -+#endif -+ -+#ifndef PATH_MAX -+# define PATH_MAX _POSIX_PATH_MAX -+#endif -+ -+/* XPG3 defines the result of `setlocale (category, NULL)' as: -+ ``Directs `setlocale()' to query `category' and return the current -+ setting of `local'.'' -+ However it does not specify the exact format. And even worse: POSIX -+ defines this not at all. So we can use this feature only on selected -+ system (e.g. those using GNU C Library). */ -+#ifdef _LIBC -+# define HAVE_LOCALE_NULL -+#endif -+ -+/* Name of the default domain used for gettext(3) prior any call to -+ textdomain(3). The default value for this is "messages". */ -+const char _nl_default_default_domain[] = "messages"; -+ -+/* Value used as the default domain for gettext(3). */ -+const char *_nl_current_default_domain = _nl_default_default_domain; -+ -+/* Contains the default location of the message catalogs. */ -+const char _nl_default_dirname[] = GNULOCALEDIR; -+ -+/* List with bindings of specific domains created by bindtextdomain() -+ calls. */ -+struct binding *_nl_domain_bindings; -+ -+/* Prototypes for local functions. */ -+static char *find_msg PARAMS ((struct loaded_l10nfile *domain_file, -+ const char *msgid)) internal_function; -+static const char *category_to_name PARAMS ((int category)) internal_function; -+static const char *guess_category_value PARAMS ((int category, -+ const char *categoryname)) -+ internal_function; -+ -+ -+/* For those loosing systems which don't have `alloca' we have to add -+ some additional code emulating it. */ -+#ifdef HAVE_ALLOCA -+/* Nothing has to be done. */ -+# define ADD_BLOCK(list, address) /* nothing */ -+# define FREE_BLOCKS(list) /* nothing */ -+#else -+struct block_list -+{ -+ void *address; -+ struct block_list *next; -+}; -+# define ADD_BLOCK(list, addr) \ -+ do { \ -+ struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \ -+ /* If we cannot get a free block we cannot add the new element to \ -+ the list. */ \ -+ if (newp != NULL) { \ -+ newp->address = (addr); \ -+ newp->next = (list); \ -+ (list) = newp; \ -+ } \ -+ } while (0) -+# define FREE_BLOCKS(list) \ -+ do { \ -+ while (list != NULL) { \ -+ struct block_list *old = list; \ -+ list = list->next; \ -+ free (old); \ -+ } \ -+ } while (0) -+# undef alloca -+# define alloca(size) (malloc (size)) -+#endif /* have alloca */ -+ -+ -+/* Names for the libintl functions are a problem. They must not clash -+ with existing names and they should follow ANSI C. But this source -+ code is also used in GNU C Library where the names have a __ -+ prefix. So we have to make a difference here. */ -+#ifdef _LIBC -+# define DCGETTEXT __dcgettext -+#else -+# define DCGETTEXT dcgettext__ -+#endif -+ -+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY -+ locale. */ -+char * -+DCGETTEXT (domainname, msgid, category) -+ const char *domainname; -+ const char *msgid; -+ int category; -+{ -+#ifndef HAVE_ALLOCA -+ struct block_list *block_list = NULL; -+#endif -+ struct loaded_l10nfile *domain; -+ struct binding *binding; -+ const char *categoryname; -+ const char *categoryvalue; -+ char *dirname, *xdomainname; -+ char *single_locale; -+ char *retval; -+ int saved_errno = errno; -+ -+ /* If no real MSGID is given return NULL. */ -+ if (msgid == NULL) -+ return NULL; -+ -+ /* If DOMAINNAME is NULL, we are interested in the default domain. If -+ CATEGORY is not LC_MESSAGES this might not make much sense but the -+ defintion left this undefined. */ -+ if (domainname == NULL) -+ domainname = _nl_current_default_domain; -+ -+ /* First find matching binding. */ -+ for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) -+ { -+ int compare = strcmp (domainname, binding->domainname); -+ if (compare == 0) -+ /* We found it! */ -+ break; -+ if (compare < 0) -+ { -+ /* It is not in the list. */ -+ binding = NULL; -+ break; -+ } -+ } -+ -+ if (binding == NULL) -+ dirname = (char *) _nl_default_dirname; -+ else if (binding->dirname[0] == '/') -+ dirname = binding->dirname; -+ else -+ { -+ /* We have a relative path. Make it absolute now. */ -+ size_t dirname_len = strlen (binding->dirname) + 1; -+ size_t path_max; -+ char *ret; -+ -+ path_max = (unsigned) PATH_MAX; -+ path_max += 2; /* The getcwd docs say to do this. */ -+ -+ dirname = (char *) alloca (path_max + dirname_len); -+ ADD_BLOCK (block_list, dirname); -+ -+ __set_errno (0); -+ while ((ret = getcwd (dirname, path_max)) == NULL && errno == ERANGE) -+ { -+ path_max += PATH_INCR; -+ dirname = (char *) alloca (path_max + dirname_len); -+ ADD_BLOCK (block_list, dirname); -+ __set_errno (0); -+ } -+ -+ if (ret == NULL) -+ { -+ /* We cannot get the current working directory. Don't signal an -+ error but simply return the default string. */ -+ FREE_BLOCKS (block_list); -+ __set_errno (saved_errno); -+ return (char *) msgid; -+ } -+ -+ stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname); -+ } -+ -+ /* Now determine the symbolic name of CATEGORY and its value. */ -+ categoryname = category_to_name (category); -+ categoryvalue = guess_category_value (category, categoryname); -+ -+ xdomainname = (char *) alloca (strlen (categoryname) -+ + strlen (domainname) + 5); -+ ADD_BLOCK (block_list, xdomainname); -+ -+ stpcpy (stpcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"), -+ domainname), -+ ".mo"); -+ -+ /* Creating working area. */ -+ single_locale = (char *) alloca (strlen (categoryvalue) + 1); -+ ADD_BLOCK (block_list, single_locale); -+ -+ -+ /* Search for the given string. This is a loop because we perhaps -+ got an ordered list of languages to consider for th translation. */ -+ while (1) -+ { -+ /* Make CATEGORYVALUE point to the next element of the list. */ -+ while (categoryvalue[0] != '\0' && categoryvalue[0] == ':') -+ ++categoryvalue; -+ if (categoryvalue[0] == '\0') -+ { -+ /* The whole contents of CATEGORYVALUE has been searched but -+ no valid entry has been found. We solve this situation -+ by implicitly appending a "C" entry, i.e. no translation -+ will take place. */ -+ single_locale[0] = 'C'; -+ single_locale[1] = '\0'; -+ } -+ else -+ { -+ char *cp = single_locale; -+ while (categoryvalue[0] != '\0' && categoryvalue[0] != ':') -+ *cp++ = *categoryvalue++; -+ *cp = '\0'; -+ } -+ -+ /* If the current locale value is C (or POSIX) we don't load a -+ domain. Return the MSGID. */ -+ if (strcmp (single_locale, "C") == 0 -+ || strcmp (single_locale, "POSIX") == 0) -+ { -+ FREE_BLOCKS (block_list); -+ __set_errno (saved_errno); -+ return (char *) msgid; -+ } -+ -+ -+ /* Find structure describing the message catalog matching the -+ DOMAINNAME and CATEGORY. */ -+ domain = _nl_find_domain (dirname, single_locale, xdomainname); -+ -+ if (domain != NULL) -+ { -+ retval = find_msg (domain, msgid); -+ -+ if (retval == NULL) -+ { -+ int cnt; -+ -+ for (cnt = 0; domain->successor[cnt] != NULL; ++cnt) -+ { -+ retval = find_msg (domain->successor[cnt], msgid); -+ -+ if (retval != NULL) -+ break; -+ } -+ } -+ -+ if (retval != NULL) -+ { -+ FREE_BLOCKS (block_list); -+ __set_errno (saved_errno); -+ return retval; -+ } -+ } -+ } -+ /* NOTREACHED */ -+} -+ -+#ifdef _LIBC -+/* Alias for function name in GNU C Library. */ -+weak_alias (__dcgettext, dcgettext); -+#endif -+ -+ -+static char * -+internal_function -+find_msg (domain_file, msgid) -+ struct loaded_l10nfile *domain_file; -+ const char *msgid; -+{ -+ size_t top, act, bottom; -+ struct loaded_domain *domain; -+ -+ if (domain_file->decided == 0) -+ _nl_load_domain (domain_file); -+ -+ if (domain_file->data == NULL) -+ return NULL; -+ -+ domain = (struct loaded_domain *) domain_file->data; -+ -+ /* Locate the MSGID and its translation. */ -+ if (domain->hash_size > 2 && domain->hash_tab != NULL) -+ { -+ /* Use the hashing table. */ -+ nls_uint32 len = strlen (msgid); -+ nls_uint32 hash_val = hash_string (msgid); -+ nls_uint32 idx = hash_val % domain->hash_size; -+ nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2)); -+ nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]); -+ -+ if (nstr == 0) -+ /* Hash table entry is empty. */ -+ return NULL; -+ -+ if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len -+ && strcmp (msgid, -+ domain->data + W (domain->must_swap, -+ domain->orig_tab[nstr - 1].offset)) == 0) -+ return (char *) domain->data + W (domain->must_swap, -+ domain->trans_tab[nstr - 1].offset); -+ -+ while (1) -+ { -+ if (idx >= domain->hash_size - incr) -+ idx -= domain->hash_size - incr; -+ else -+ idx += incr; -+ -+ nstr = W (domain->must_swap, domain->hash_tab[idx]); -+ if (nstr == 0) -+ /* Hash table entry is empty. */ -+ return NULL; -+ -+ if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len -+ && strcmp (msgid, -+ domain->data + W (domain->must_swap, -+ domain->orig_tab[nstr - 1].offset)) -+ == 0) -+ return (char *) domain->data -+ + W (domain->must_swap, domain->trans_tab[nstr - 1].offset); -+ } -+ /* NOTREACHED */ -+ } -+ -+ /* Now we try the default method: binary search in the sorted -+ array of messages. */ -+ bottom = 0; -+ top = domain->nstrings; -+ while (bottom < top) -+ { -+ int cmp_val; -+ -+ act = (bottom + top) / 2; -+ cmp_val = strcmp (msgid, domain->data -+ + W (domain->must_swap, -+ domain->orig_tab[act].offset)); -+ if (cmp_val < 0) -+ top = act; -+ else if (cmp_val > 0) -+ bottom = act + 1; -+ else -+ break; -+ } -+ -+ /* If an translation is found return this. */ -+ return bottom >= top ? NULL : (char *) domain->data -+ + W (domain->must_swap, -+ domain->trans_tab[act].offset); -+} -+ -+ -+/* Return string representation of locale CATEGORY. */ -+static const char * -+internal_function -+category_to_name (category) -+ int category; -+{ -+ const char *retval; -+ -+ switch (category) -+ { -+#ifdef LC_COLLATE -+ case LC_COLLATE: -+ retval = "LC_COLLATE"; -+ break; -+#endif -+#ifdef LC_CTYPE -+ case LC_CTYPE: -+ retval = "LC_CTYPE"; -+ break; -+#endif -+#ifdef LC_MONETARY -+ case LC_MONETARY: -+ retval = "LC_MONETARY"; -+ break; -+#endif -+#ifdef LC_NUMERIC -+ case LC_NUMERIC: -+ retval = "LC_NUMERIC"; -+ break; -+#endif -+#ifdef LC_TIME -+ case LC_TIME: -+ retval = "LC_TIME"; -+ break; -+#endif -+#ifdef LC_MESSAGES -+ case LC_MESSAGES: -+ retval = "LC_MESSAGES"; -+ break; -+#endif -+#ifdef LC_RESPONSE -+ case LC_RESPONSE: -+ retval = "LC_RESPONSE"; -+ break; -+#endif -+#ifdef LC_ALL -+ case LC_ALL: -+ /* This might not make sense but is perhaps better than any other -+ value. */ -+ retval = "LC_ALL"; -+ break; -+#endif -+ default: -+ /* If you have a better idea for a default value let me know. */ -+ retval = "LC_XXX"; -+ } -+ -+ return retval; -+} -+ -+/* Guess value of current locale from value of the environment variables. */ -+static const char * -+internal_function -+guess_category_value (category, categoryname) -+ int category; -+ const char *categoryname; -+{ -+ const char *retval; -+ -+ /* The highest priority value is the `LANGUAGE' environment -+ variable. This is a GNU extension. */ -+ retval = getenv ("LANGUAGE"); -+ if (retval != NULL && retval[0] != '\0') -+ return retval; -+ -+ /* `LANGUAGE' is not set. So we have to proceed with the POSIX -+ methods of looking to `LC_ALL', `LC_xxx', and `LANG'. On some -+ systems this can be done by the `setlocale' function itself. */ -+#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL -+ return setlocale (category, NULL); -+#else -+ /* Setting of LC_ALL overwrites all other. */ -+ retval = getenv ("LC_ALL"); -+ if (retval != NULL && retval[0] != '\0') -+ return retval; -+ -+ /* Next comes the name of the desired category. */ -+ retval = getenv (categoryname); -+ if (retval != NULL && retval[0] != '\0') -+ return retval; -+ -+ /* Last possibility is the LANG environment variable. */ -+ retval = getenv ("LANG"); -+ if (retval != NULL && retval[0] != '\0') -+ return retval; -+ -+ /* We use C as the default domain. POSIX says this is implementation -+ defined. */ -+ return "C"; -+#endif -+} -+ -+/* @@ begin of epilog @@ */ -+ -+/* We don't want libintl.a to depend on any other library. So we -+ avoid the non-standard function stpcpy. In GNU C Library this -+ function is available, though. Also allow the symbol HAVE_STPCPY -+ to be defined. */ -+#if !_LIBC && !HAVE_STPCPY -+static char * -+stpcpy (dest, src) -+ char *dest; -+ const char *src; -+{ -+ while ((*dest++ = *src++) != '\0') -+ /* Do nothing. */ ; -+ return dest - 1; -+} -+#endif -+ -+ -+#ifdef _LIBC -+/* If we want to free all resources we have to do some work at -+ program's end. */ -+static void __attribute__ ((unused)) -+free_mem (void) -+{ -+ struct binding *runp; -+ -+ for (runp = _nl_domain_bindings; runp != NULL; runp = runp->next) -+ { -+ free (runp->domainname); -+ if (runp->dirname != _nl_default_dirname) -+ /* Yes, this is a pointer comparison. */ -+ free (runp->dirname); -+ } -+ -+ if (_nl_current_default_domain != _nl_default_default_domain) -+ /* Yes, again a pointer comparison. */ -+ free ((char *) _nl_current_default_domain); -+} -+ -+text_set_element (__libc_subfreeres, free_mem); -+#endif -diff -Pur GConf-1.0.0.orig/intl/dgettext.c GConf-1.0.0/intl/dgettext.c ---- GConf-1.0.0.orig/intl/dgettext.c Wed Dec 31 19:00:00 1969 -+++ GConf-1.0.0/intl/dgettext.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,59 @@ -+/* Implementation of the dgettext(3) function -+ Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#if defined HAVE_LOCALE_H || defined _LIBC -+# include <locale.h> -+#endif -+ -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+/* Names for the libintl functions are a problem. They must not clash -+ with existing names and they should follow ANSI C. But this source -+ code is also used in GNU C Library where the names have a __ -+ prefix. So we have to make a difference here. */ -+#ifdef _LIBC -+# define DGETTEXT __dgettext -+# define DCGETTEXT __dcgettext -+#else -+# define DGETTEXT dgettext__ -+# define DCGETTEXT dcgettext__ -+#endif -+ -+/* Look up MSGID in the DOMAINNAME message catalog of the current -+ LC_MESSAGES locale. */ -+char * -+DGETTEXT (domainname, msgid) -+ const char *domainname; -+ const char *msgid; -+{ -+ return DCGETTEXT (domainname, msgid, LC_MESSAGES); -+} -+ -+#ifdef _LIBC -+/* Alias for function name in GNU C Library. */ -+weak_alias (__dgettext, dgettext); -+#endif -diff -Pur GConf-1.0.0.orig/intl/explodename.c GConf-1.0.0/intl/explodename.c ---- GConf-1.0.0.orig/intl/explodename.c Wed Dec 31 19:00:00 1969 -+++ GConf-1.0.0/intl/explodename.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,188 @@ -+/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#endif -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# include <string.h> -+#else -+# include <strings.h> -+#endif -+#include <sys/types.h> -+ -+#include "loadinfo.h" -+ -+/* On some strange systems still no definition of NULL is found. Sigh! */ -+#ifndef NULL -+# if defined __STDC__ && __STDC__ -+# define NULL ((void *) 0) -+# else -+# define NULL 0 -+# endif -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+int -+_nl_explode_name (name, language, modifier, territory, codeset, -+ normalized_codeset, special, sponsor, revision) -+ char *name; -+ const char **language; -+ const char **modifier; -+ const char **territory; -+ const char **codeset; -+ const char **normalized_codeset; -+ const char **special; -+ const char **sponsor; -+ const char **revision; -+{ -+ enum { undecided, xpg, cen } syntax; -+ char *cp; -+ int mask; -+ -+ *modifier = NULL; -+ *territory = NULL; -+ *codeset = NULL; -+ *normalized_codeset = NULL; -+ *special = NULL; -+ *sponsor = NULL; -+ *revision = NULL; -+ -+ /* Now we determine the single parts of the locale name. First -+ look for the language. Termination symbols are `_' and `@' if -+ we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */ -+ mask = 0; -+ syntax = undecided; -+ *language = cp = name; -+ while (cp[0] != '\0' && cp[0] != '_' && cp[0] != '@' -+ && cp[0] != '+' && cp[0] != ',') -+ ++cp; -+ -+ if (*language == cp) -+ /* This does not make sense: language has to be specified. Use -+ this entry as it is without exploding. Perhaps it is an alias. */ -+ cp = strchr (*language, '\0'); -+ else if (cp[0] == '_') -+ { -+ /* Next is the territory. */ -+ cp[0] = '\0'; -+ *territory = ++cp; -+ -+ while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@' -+ && cp[0] != '+' && cp[0] != ',' && cp[0] != '_') -+ ++cp; -+ -+ mask |= TERRITORY; -+ -+ if (cp[0] == '.') -+ { -+ /* Next is the codeset. */ -+ syntax = xpg; -+ cp[0] = '\0'; -+ *codeset = ++cp; -+ -+ while (cp[0] != '\0' && cp[0] != '@') -+ ++cp; -+ -+ mask |= XPG_CODESET; -+ -+ if (*codeset != cp && (*codeset)[0] != '\0') -+ { -+ *normalized_codeset = _nl_normalize_codeset (*codeset, -+ cp - *codeset); -+ if (strcmp (*codeset, *normalized_codeset) == 0) -+ free ((char *) *normalized_codeset); -+ else -+ mask |= XPG_NORM_CODESET; -+ } -+ } -+ } -+ -+ if (cp[0] == '@' || (syntax != xpg && cp[0] == '+')) -+ { -+ /* Next is the modifier. */ -+ syntax = cp[0] == '@' ? xpg : cen; -+ cp[0] = '\0'; -+ *modifier = ++cp; -+ -+ while (syntax == cen && cp[0] != '\0' && cp[0] != '+' -+ && cp[0] != ',' && cp[0] != '_') -+ ++cp; -+ -+ mask |= XPG_MODIFIER | CEN_AUDIENCE; -+ } -+ -+ if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_')) -+ { -+ syntax = cen; -+ -+ if (cp[0] == '+') -+ { -+ /* Next is special application (CEN syntax). */ -+ cp[0] = '\0'; -+ *special = ++cp; -+ -+ while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_') -+ ++cp; -+ -+ mask |= CEN_SPECIAL; -+ } -+ -+ if (cp[0] == ',') -+ { -+ /* Next is sponsor (CEN syntax). */ -+ cp[0] = '\0'; -+ *sponsor = ++cp; -+ -+ while (cp[0] != '\0' && cp[0] != '_') -+ ++cp; -+ -+ mask |= CEN_SPONSOR; -+ } -+ -+ if (cp[0] == '_') -+ { -+ /* Next is revision (CEN syntax). */ -+ cp[0] = '\0'; -+ *revision = ++cp; -+ -+ mask |= CEN_REVISION; -+ } -+ } -+ -+ /* For CEN syntax values it might be important to have the -+ separator character in the file name, not for XPG syntax. */ -+ if (syntax == xpg) -+ { -+ if (*territory != NULL && (*territory)[0] == '\0') -+ mask &= ~TERRITORY; -+ -+ if (*codeset != NULL && (*codeset)[0] == '\0') -+ mask &= ~XPG_CODESET; -+ -+ if (*modifier != NULL && (*modifier)[0] == '\0') -+ mask &= ~XPG_MODIFIER; -+ } -+ -+ return mask; -+} -diff -Pur GConf-1.0.0.orig/intl/finddomain.c GConf-1.0.0/intl/finddomain.c ---- GConf-1.0.0.orig/intl/finddomain.c Wed Dec 31 19:00:00 1969 -+++ GConf-1.0.0/intl/finddomain.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,216 @@ -+/* Handle list of needed message catalogs -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <ctype.h> -+#include <errno.h> -+#include <stdio.h> -+#include <sys/types.h> -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#else -+# ifdef HAVE_MALLOC_H -+# include <malloc.h> -+# else -+void free (); -+# endif -+#endif -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# include <string.h> -+#else -+# include <strings.h> -+# ifndef memcpy -+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -+# endif -+#endif -+#if !HAVE_STRCHR && !defined _LIBC -+# ifndef strchr -+# define strchr index -+# endif -+#endif -+ -+#if defined HAVE_UNISTD_H || defined _LIBC -+# include <unistd.h> -+#endif -+ -+#include "gettext.h" -+#include "gettextP.h" -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+ -+/* @@ end of prolog @@ */ -+/* List of already loaded domains. */ -+static struct loaded_l10nfile *_nl_loaded_domains; -+ -+ -+/* Return a data structure describing the message catalog described by -+ the DOMAINNAME and CATEGORY parameters with respect to the currently -+ established bindings. */ -+struct loaded_l10nfile * -+internal_function -+_nl_find_domain (dirname, locale, domainname) -+ const char *dirname; -+ char *locale; -+ const char *domainname; -+{ -+ struct loaded_l10nfile *retval; -+ const char *language; -+ const char *modifier; -+ const char *territory; -+ const char *codeset; -+ const char *normalized_codeset; -+ const char *special; -+ const char *sponsor; -+ const char *revision; -+ const char *alias_value; -+ int mask; -+ -+ /* LOCALE can consist of up to four recognized parts for the XPG syntax: -+ -+ language[_territory[.codeset]][@modifier] -+ -+ and six parts for the CEN syntax: -+ -+ language[_territory][+audience][+special][,[sponsor][_revision]] -+ -+ Beside the first part all of them are allowed to be missing. If -+ the full specified locale is not found, the less specific one are -+ looked for. The various parts will be stripped off according to -+ the following order: -+ (1) revision -+ (2) sponsor -+ (3) special -+ (4) codeset -+ (5) normalized codeset -+ (6) territory -+ (7) audience/modifier -+ */ -+ -+ /* If we have already tested for this locale entry there has to -+ be one data set in the list of loaded domains. */ -+ retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, -+ strlen (dirname) + 1, 0, locale, NULL, NULL, -+ NULL, NULL, NULL, NULL, NULL, domainname, 0); -+ if (retval != NULL) -+ { -+ /* We know something about this locale. */ -+ int cnt; -+ -+ if (retval->decided == 0) -+ _nl_load_domain (retval); -+ -+ if (retval->data != NULL) -+ return retval; -+ -+ for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) -+ { -+ if (retval->successor[cnt]->decided == 0) -+ _nl_load_domain (retval->successor[cnt]); -+ -+ if (retval->successor[cnt]->data != NULL) -+ break; -+ } -+ return cnt >= 0 ? retval : NULL; -+ /* NOTREACHED */ -+ } -+ -+ /* See whether the locale value is an alias. If yes its value -+ *overwrites* the alias name. No test for the original value is -+ done. */ -+ alias_value = _nl_expand_alias (locale); -+ if (alias_value != NULL) -+ { -+#if defined _LIBC || defined HAVE_STRDUP -+ locale = strdup (alias_value); -+ if (locale == NULL) -+ return NULL; -+#else -+ size_t len = strlen (alias_value) + 1; -+ locale = (char *) malloc (len); -+ if (locale == NULL) -+ return NULL; -+ -+ memcpy (locale, alias_value, len); -+#endif -+ } -+ -+ /* Now we determine the single parts of the locale name. First -+ look for the language. Termination symbols are `_' and `@' if -+ we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */ -+ mask = _nl_explode_name (locale, &language, &modifier, &territory, -+ &codeset, &normalized_codeset, &special, -+ &sponsor, &revision); -+ -+ /* Create all possible locale entries which might be interested in -+ generalization. */ -+ retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, -+ strlen (dirname) + 1, mask, language, territory, -+ codeset, normalized_codeset, modifier, special, -+ sponsor, revision, domainname, 1); -+ if (retval == NULL) -+ /* This means we are out of core. */ -+ return NULL; -+ -+ if (retval->decided == 0) -+ _nl_load_domain (retval); -+ if (retval->data == NULL) -+ { -+ int cnt; -+ for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) -+ { -+ if (retval->successor[cnt]->decided == 0) -+ _nl_load_domain (retval->successor[cnt]); -+ if (retval->successor[cnt]->data != NULL) -+ break; -+ } -+ } -+ -+ /* The room for an alias was dynamically allocated. Free it now. */ -+ if (alias_value != NULL) -+ free (locale); -+ -+ return retval; -+} -+ -+ -+#ifdef _LIBC -+static void __attribute__ ((unused)) -+free_mem (void) -+{ -+ struct loaded_l10nfile *runp = _nl_loaded_domains; -+ -+ while (runp != NULL) -+ { -+ struct loaded_l10nfile *here = runp; -+ if (runp->data != NULL) -+ _nl_unload_domain ((struct loaded_domain *) runp->data); -+ runp = runp->next; -+ free (here); -+ } -+} -+ -+text_set_element (__libc_subfreeres, free_mem); -+#endif -diff -Pur GConf-1.0.0.orig/intl/gettext.c GConf-1.0.0/intl/gettext.c ---- GConf-1.0.0.orig/intl/gettext.c Wed Dec 31 19:00:00 1969 -+++ GConf-1.0.0/intl/gettext.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,70 @@ -+/* Implementation of gettext(3) function. -+ Copyright (C) 1995, 1997 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#ifdef _LIBC -+# define __need_NULL -+# include <stddef.h> -+#else -+# ifdef STDC_HEADERS -+# include <stdlib.h> /* Just for NULL. */ -+# else -+# ifdef HAVE_STRING_H -+# include <string.h> -+# else -+# define NULL ((void *) 0) -+# endif -+# endif -+#endif -+ -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+/* Names for the libintl functions are a problem. They must not clash -+ with existing names and they should follow ANSI C. But this source -+ code is also used in GNU C Library where the names have a __ -+ prefix. So we have to make a difference here. */ -+#ifdef _LIBC -+# define GETTEXT __gettext -+# define DGETTEXT __dgettext -+#else -+# define GETTEXT gettext__ -+# define DGETTEXT dgettext__ -+#endif -+ -+/* Look up MSGID in the current default message catalog for the current -+ LC_MESSAGES locale. If not found, returns MSGID itself (the default -+ text). */ -+char * -+GETTEXT (msgid) -+ const char *msgid; -+{ -+ return DGETTEXT (NULL, msgid); -+} -+ -+#ifdef _LIBC -+/* Alias for function name in GNU C Library. */ -+weak_alias (__gettext, gettext); -+#endif -diff -Pur GConf-1.0.0.orig/intl/gettext.h GConf-1.0.0/intl/gettext.h ---- GConf-1.0.0.orig/intl/gettext.h Wed Dec 31 19:00:00 1969 -+++ GConf-1.0.0/intl/gettext.h Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,105 @@ -+/* Internal header for GNU gettext internationalization functions. -+ Copyright (C) 1995, 1997 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 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. */ -+ -+#ifndef _GETTEXT_H -+#define _GETTEXT_H 1 -+ -+#include <stdio.h> -+ -+#if HAVE_LIMITS_H || _LIBC -+# include <limits.h> -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+/* The magic number of the GNU message catalog format. */ -+#define _MAGIC 0x950412de -+#define _MAGIC_SWAPPED 0xde120495 -+ -+/* Revision number of the currently used .mo (binary) file format. */ -+#define MO_REVISION_NUMBER 0 -+ -+/* The following contortions are an attempt to use the C preprocessor -+ to determine an unsigned integral type that is 32 bits wide. An -+ alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but -+ doing that would require that the configure script compile and *run* -+ the resulting executable. Locally running cross-compiled executables -+ is usually not possible. */ -+ -+#if __STDC__ -+# define UINT_MAX_32_BITS 4294967295U -+#else -+# define UINT_MAX_32_BITS 0xFFFFFFFF -+#endif -+ -+/* If UINT_MAX isn't defined, assume it's a 32-bit type. -+ This should be valid for all systems GNU cares about because -+ that doesn't include 16-bit systems, and only modern systems -+ (that certainly have <limits.h>) have 64+-bit integral types. */ -+ -+#ifndef UINT_MAX -+# define UINT_MAX UINT_MAX_32_BITS -+#endif -+ -+#if UINT_MAX == UINT_MAX_32_BITS -+typedef unsigned nls_uint32; -+#else -+# if USHRT_MAX == UINT_MAX_32_BITS -+typedef unsigned short nls_uint32; -+# else -+# if ULONG_MAX == UINT_MAX_32_BITS -+typedef unsigned long nls_uint32; -+# else -+ /* The following line is intended to throw an error. Using #error is -+ not portable enough. */ -+ "Cannot determine unsigned 32-bit data type." -+# endif -+# endif -+#endif -+ -+ -+/* Header for binary .mo file format. */ -+struct mo_file_header -+{ -+ /* The magic number. */ -+ nls_uint32 magic; -+ /* The revision number of the file format. */ -+ nls_uint32 revision; -+ /* The number of strings pairs. */ -+ nls_uint32 nstrings; -+ /* Offset of table with start offsets of original strings. */ -+ nls_uint32 orig_tab_offset; -+ /* Offset of table with start offsets of translation strings. */ -+ nls_uint32 trans_tab_offset; -+ /* Size of hashing table. */ -+ nls_uint32 hash_tab_size; -+ /* Offset of first hashing entry. */ -+ nls_uint32 hash_tab_offset; -+}; -+ -+struct string_desc -+{ -+ /* Length of addressed string. */ -+ nls_uint32 length; -+ /* Offset of string in file. */ -+ nls_uint32 offset; -+}; -+ -+/* @@ begin of epilog @@ */ -+ -+#endif /* gettext.h */ -diff -Pur GConf-1.0.0.orig/intl/gettextP.h GConf-1.0.0/intl/gettextP.h ---- GConf-1.0.0.orig/intl/gettextP.h Wed Dec 31 19:00:00 1969 -+++ GConf-1.0.0/intl/gettextP.h Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,89 @@ -+/* Header describing internals of gettext library -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifndef _GETTEXTP_H -+#define _GETTEXTP_H -+ -+#include "loadinfo.h" -+ -+/* @@ end of prolog @@ */ -+ -+#ifndef PARAMS -+# if __STDC__ -+# define PARAMS(args) args -+# else -+# define PARAMS(args) () -+# endif -+#endif -+ -+#ifndef internal_function -+# define internal_function -+#endif -+ -+#ifndef W -+# define W(flag, data) ((flag) ? SWAP (data) : (data)) -+#endif -+ -+ -+#ifdef _LIBC -+# include <byteswap.h> -+# define SWAP(i) bswap_32 (i) -+#else -+static nls_uint32 SWAP PARAMS ((nls_uint32 i)); -+ -+static inline nls_uint32 -+SWAP (i) -+ nls_uint32 i; -+{ -+ return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24); -+} -+#endif -+ -+ -+struct loaded_domain -+{ -+ const char *data; -+ int use_mmap; -+ size_t mmap_size; -+ int must_swap; -+ nls_uint32 nstrings; -+ struct string_desc *orig_tab; -+ struct string_desc *trans_tab; -+ nls_uint32 hash_size; -+ nls_uint32 *hash_tab; -+}; -+ -+struct binding -+{ -+ struct binding *next; -+ char *domainname; -+ char *dirname; -+}; -+ -+struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname, -+ char *__locale, -+ const char *__domainname)) -+ internal_function; -+void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain)) -+ internal_function; -+void _nl_unload_domain PARAMS ((struct loaded_domain *__domain)) -+ internal_function; -+ -+/* @@ begin of epilog @@ */ -+ -+#endif /* gettextP.h */ -diff -Pur GConf-1.0.0.orig/intl/hash-string.h GConf-1.0.0/intl/hash-string.h ---- GConf-1.0.0.orig/intl/hash-string.h Wed Dec 31 19:00:00 1969 -+++ GConf-1.0.0/intl/hash-string.h Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,59 @@ -+/* Implements a string hashing function. -+ Copyright (C) 1995, 1997 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 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. */ -+ -+/* @@ end of prolog @@ */ -+ -+#ifndef PARAMS -+# if __STDC__ -+# define PARAMS(Args) Args -+# else -+# define PARAMS(Args) () -+# endif -+#endif -+ -+/* We assume to have `unsigned long int' value with at least 32 bits. */ -+#define HASHWORDBITS 32 -+ -+ -+/* Defines the so called `hashpjw' function by P.J. Weinberger -+ [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools, -+ 1986, 1987 Bell Telephone Laboratories, Inc.] */ -+static unsigned long hash_string PARAMS ((const char *__str_param)); -+ -+static inline unsigned long -+hash_string (str_param) -+ const char *str_param; -+{ -+ unsigned long int hval, g; -+ const char *str = str_param; -+ -+ /* Compute the hash value for the given string. */ -+ hval = 0; -+ while (*str != '\0') -+ { -+ hval <<= 4; -+ hval += (unsigned long) *str++; -+ g = hval & ((unsigned long) 0xf << (HASHWORDBITS - 4)); -+ if (g != 0) -+ { -+ hval ^= g >> (HASHWORDBITS - 8); -+ hval ^= g; -+ } -+ } -+ return hval; -+} -diff -Pur GConf-1.0.0.orig/intl/intl-compat.c GConf-1.0.0/intl/intl-compat.c ---- GConf-1.0.0.orig/intl/intl-compat.c Wed Dec 31 19:00:00 1969 -+++ GConf-1.0.0/intl/intl-compat.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,76 @@ -+/* intl-compat.c - Stub functions to call gettext functions from GNU gettext -+ Library. -+ Copyright (C) 1995 Software Foundation, Inc. -+ -+This program is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 2, or (at your option) -+any later version. -+ -+This program 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 General Public License for more details. -+ -+You should have received a copy of the GNU General Public License -+along with this program; if not, write to the Free Software -+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include "libgettext.h" -+ -+/* @@ end of prolog @@ */ -+ -+ -+#undef gettext -+#undef dgettext -+#undef dcgettext -+#undef textdomain -+#undef bindtextdomain -+ -+ -+char * -+bindtextdomain (domainname, dirname) -+ const char *domainname; -+ const char *dirname; -+{ -+ return bindtextdomain__ (domainname, dirname); -+} -+ -+ -+char * -+dcgettext (domainname, msgid, category) -+ const char *domainname; -+ const char *msgid; -+ int category; -+{ -+ return dcgettext__ (domainname, msgid, category); -+} -+ -+ -+char * -+dgettext (domainname, msgid) -+ const char *domainname; -+ const char *msgid; -+{ -+ return dgettext__ (domainname, msgid); -+} -+ -+ -+char * -+gettext (msgid) -+ const char *msgid; -+{ -+ return gettext__ (msgid); -+} -+ -+ -+char * -+textdomain (domainname) -+ const char *domainname; -+{ -+ return textdomain__ (domainname); -+} -diff -Pur GConf-1.0.0.orig/intl/l10nflist.c GConf-1.0.0/intl/l10nflist.c ---- GConf-1.0.0.orig/intl/l10nflist.c Wed Dec 31 19:00:00 1969 -+++ GConf-1.0.0/intl/l10nflist.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,411 @@ -+/* Handle list of needed message catalogs -+ Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. -+ Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# ifndef _GNU_SOURCE -+# define _GNU_SOURCE 1 -+# endif -+# include <string.h> -+#else -+# include <strings.h> -+# ifndef memcpy -+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -+# endif -+#endif -+#if !HAVE_STRCHR && !defined _LIBC -+# ifndef strchr -+# define strchr index -+# endif -+#endif -+ -+#if defined _LIBC || defined HAVE_ARGZ_H -+# include <argz.h> -+#endif -+#include <ctype.h> -+#include <sys/types.h> -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#endif -+ -+#include "loadinfo.h" -+ -+/* On some strange systems still no definition of NULL is found. Sigh! */ -+#ifndef NULL -+# if defined __STDC__ && __STDC__ -+# define NULL ((void *) 0) -+# else -+# define NULL 0 -+# endif -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+#ifdef _LIBC -+/* Rename the non ANSI C functions. This is required by the standard -+ because some ANSI C functions will require linking with this object -+ file and the name space must not be polluted. */ -+# ifndef stpcpy -+# define stpcpy(dest, src) __stpcpy(dest, src) -+# endif -+#else -+# ifndef HAVE_STPCPY -+static char *stpcpy PARAMS ((char *dest, const char *src)); -+# endif -+#endif -+ -+/* Define function which are usually not available. */ -+ -+#if !defined _LIBC && !defined HAVE___ARGZ_COUNT -+/* Returns the number of strings in ARGZ. */ -+static size_t argz_count__ PARAMS ((const char *argz, size_t len)); -+ -+static size_t -+argz_count__ (argz, len) -+ const char *argz; -+ size_t len; -+{ -+ size_t count = 0; -+ while (len > 0) -+ { -+ size_t part_len = strlen (argz); -+ argz += part_len + 1; -+ len -= part_len + 1; -+ count++; -+ } -+ return count; -+} -+# undef __argz_count -+# define __argz_count(argz, len) argz_count__ (argz, len) -+#endif /* !_LIBC && !HAVE___ARGZ_COUNT */ -+ -+#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY -+/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's -+ except the last into the character SEP. */ -+static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep)); -+ -+static void -+argz_stringify__ (argz, len, sep) -+ char *argz; -+ size_t len; -+ int sep; -+{ -+ while (len > 0) -+ { -+ size_t part_len = strlen (argz); -+ argz += part_len; -+ len -= part_len + 1; -+ if (len > 0) -+ *argz++ = sep; -+ } -+} -+# undef __argz_stringify -+# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep) -+#endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */ -+ -+#if !defined _LIBC && !defined HAVE___ARGZ_NEXT -+static char *argz_next__ PARAMS ((char *argz, size_t argz_len, -+ const char *entry)); -+ -+static char * -+argz_next__ (argz, argz_len, entry) -+ char *argz; -+ size_t argz_len; -+ const char *entry; -+{ -+ if (entry) -+ { -+ if (entry < argz + argz_len) -+ entry = strchr (entry, '\0') + 1; -+ -+ return entry >= argz + argz_len ? NULL : (char *) entry; -+ } -+ else -+ if (argz_len > 0) -+ return argz; -+ else -+ return 0; -+} -+# undef __argz_next -+# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry) -+#endif /* !_LIBC && !HAVE___ARGZ_NEXT */ -+ -+ -+/* Return number of bits set in X. */ -+static int pop PARAMS ((int x)); -+ -+static inline int -+pop (x) -+ int x; -+{ -+ /* We assume that no more than 16 bits are used. */ -+ x = ((x & ~0x5555) >> 1) + (x & 0x5555); -+ x = ((x & ~0x3333) >> 2) + (x & 0x3333); -+ x = ((x >> 4) + x) & 0x0f0f; -+ x = ((x >> 8) + x) & 0xff; -+ -+ return x; -+} -+ -+ -+struct loaded_l10nfile * -+_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language, -+ territory, codeset, normalized_codeset, modifier, special, -+ sponsor, revision, filename, do_allocate) -+ struct loaded_l10nfile **l10nfile_list; -+ const char *dirlist; -+ size_t dirlist_len; -+ int mask; -+ const char *language; -+ const char *territory; -+ const char *codeset; -+ const char *normalized_codeset; -+ const char *modifier; -+ const char *special; -+ const char *sponsor; -+ const char *revision; -+ const char *filename; -+ int do_allocate; -+{ -+ char *abs_filename; -+ struct loaded_l10nfile *last = NULL; -+ struct loaded_l10nfile *retval; -+ char *cp; -+ size_t entries; -+ int cnt; -+ -+ /* Allocate room for the full file name. */ -+ abs_filename = (char *) malloc (dirlist_len -+ + strlen (language) -+ + ((mask & TERRITORY) != 0 -+ ? strlen (territory) + 1 : 0) -+ + ((mask & XPG_CODESET) != 0 -+ ? strlen (codeset) + 1 : 0) -+ + ((mask & XPG_NORM_CODESET) != 0 -+ ? strlen (normalized_codeset) + 1 : 0) -+ + (((mask & XPG_MODIFIER) != 0 -+ || (mask & CEN_AUDIENCE) != 0) -+ ? strlen (modifier) + 1 : 0) -+ + ((mask & CEN_SPECIAL) != 0 -+ ? strlen (special) + 1 : 0) -+ + (((mask & CEN_SPONSOR) != 0 -+ || (mask & CEN_REVISION) != 0) -+ ? (1 + ((mask & CEN_SPONSOR) != 0 -+ ? strlen (sponsor) + 1 : 0) -+ + ((mask & CEN_REVISION) != 0 -+ ? strlen (revision) + 1 : 0)) : 0) -+ + 1 + strlen (filename) + 1); -+ -+ if (abs_filename == NULL) -+ return NULL; -+ -+ retval = NULL; -+ last = NULL; -+ -+ /* Construct file name. */ -+ memcpy (abs_filename, dirlist, dirlist_len); -+ __argz_stringify (abs_filename, dirlist_len, ':'); -+ cp = abs_filename + (dirlist_len - 1); -+ *cp++ = '/'; -+ cp = stpcpy (cp, language); -+ -+ if ((mask & TERRITORY) != 0) -+ { -+ *cp++ = '_'; -+ cp = stpcpy (cp, territory); -+ } -+ if ((mask & XPG_CODESET) != 0) -+ { -+ *cp++ = '.'; -+ cp = stpcpy (cp, codeset); -+ } -+ if ((mask & XPG_NORM_CODESET) != 0) -+ { -+ *cp++ = '.'; -+ cp = stpcpy (cp, normalized_codeset); -+ } -+ if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0) -+ { -+ /* This component can be part of both syntaces but has different -+ leading characters. For CEN we use `+', else `@'. */ -+ *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@'; -+ cp = stpcpy (cp, modifier); -+ } -+ if ((mask & CEN_SPECIAL) != 0) -+ { -+ *cp++ = '+'; -+ cp = stpcpy (cp, special); -+ } -+ if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0) -+ { -+ *cp++ = ','; -+ if ((mask & CEN_SPONSOR) != 0) -+ cp = stpcpy (cp, sponsor); -+ if ((mask & CEN_REVISION) != 0) -+ { -+ *cp++ = '_'; -+ cp = stpcpy (cp, revision); -+ } -+ } -+ -+ *cp++ = '/'; -+ stpcpy (cp, filename); -+ -+ /* Look in list of already loaded domains whether it is already -+ available. */ -+ last = NULL; -+ for (retval = *l10nfile_list; retval != NULL; retval = retval->next) -+ if (retval->filename != NULL) -+ { -+ int compare = strcmp (retval->filename, abs_filename); -+ if (compare == 0) -+ /* We found it! */ -+ break; -+ if (compare < 0) -+ { -+ /* It's not in the list. */ -+ retval = NULL; -+ break; -+ } -+ -+ last = retval; -+ } -+ -+ if (retval != NULL || do_allocate == 0) -+ { -+ free (abs_filename); -+ return retval; -+ } -+ -+ retval = (struct loaded_l10nfile *) -+ malloc (sizeof (*retval) + (__argz_count (dirlist, dirlist_len) -+ * (1 << pop (mask)) -+ * sizeof (struct loaded_l10nfile *))); -+ if (retval == NULL) -+ return NULL; -+ -+ retval->filename = abs_filename; -+ retval->decided = (__argz_count (dirlist, dirlist_len) != 1 -+ || ((mask & XPG_CODESET) != 0 -+ && (mask & XPG_NORM_CODESET) != 0)); -+ retval->data = NULL; -+ -+ if (last == NULL) -+ { -+ retval->next = *l10nfile_list; -+ *l10nfile_list = retval; -+ } -+ else -+ { -+ retval->next = last->next; -+ last->next = retval; -+ } -+ -+ entries = 0; -+ /* If the DIRLIST is a real list the RETVAL entry corresponds not to -+ a real file. So we have to use the DIRLIST separation mechanism -+ of the inner loop. */ -+ cnt = __argz_count (dirlist, dirlist_len) == 1 ? mask - 1 : mask; -+ for (; cnt >= 0; --cnt) -+ if ((cnt & ~mask) == 0 -+ && ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0) -+ && ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0)) -+ { -+ /* Iterate over all elements of the DIRLIST. */ -+ char *dir = NULL; -+ -+ while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir)) -+ != NULL) -+ retval->successor[entries++] -+ = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, cnt, -+ language, territory, codeset, -+ normalized_codeset, modifier, special, -+ sponsor, revision, filename, 1); -+ } -+ retval->successor[entries] = NULL; -+ -+ return retval; -+} -+ -+/* Normalize codeset name. There is no standard for the codeset -+ names. Normalization allows the user to use any of the common -+ names. */ -+const char * -+_nl_normalize_codeset (codeset, name_len) -+ const unsigned char *codeset; -+ size_t name_len; -+{ -+ int len = 0; -+ int only_digit = 1; -+ char *retval; -+ char *wp; -+ size_t cnt; -+ -+ for (cnt = 0; cnt < name_len; ++cnt) -+ if (isalnum (codeset[cnt])) -+ { -+ ++len; -+ -+ if (isalpha (codeset[cnt])) -+ only_digit = 0; -+ } -+ -+ retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1); -+ -+ if (retval != NULL) -+ { -+ if (only_digit) -+ wp = stpcpy (retval, "iso"); -+ else -+ wp = retval; -+ -+ for (cnt = 0; cnt < name_len; ++cnt) -+ if (isalpha (codeset[cnt])) -+ *wp++ = tolower (codeset[cnt]); -+ else if (isdigit (codeset[cnt])) -+ *wp++ = codeset[cnt]; -+ -+ *wp = '\0'; -+ } -+ -+ return (const char *) retval; -+} -+ -+ -+/* @@ begin of epilog @@ */ -+ -+/* We don't want libintl.a to depend on any other library. So we -+ avoid the non-standard function stpcpy. In GNU C Library this -+ function is available, though. Also allow the symbol HAVE_STPCPY -+ to be defined. */ -+#if !_LIBC && !HAVE_STPCPY -+static char * -+stpcpy (dest, src) -+ char *dest; -+ const char *src; -+{ -+ while ((*dest++ = *src++) != '\0') -+ /* Do nothing. */ ; -+ return dest - 1; -+} -+#endif -diff -Pur GConf-1.0.0.orig/intl/libgettext.h GConf-1.0.0/intl/libgettext.h ---- GConf-1.0.0.orig/intl/libgettext.h Wed Dec 31 19:00:00 1969 -+++ GConf-1.0.0/intl/libgettext.h Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,182 @@ -+/* Message catalogs for internationalization. -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+/* Because on some systems (e.g. Solaris) we sometimes have to include -+ the systems libintl.h as well as this file we have more complex -+ include protection above. But the systems header might perhaps also -+ define _LIBINTL_H and therefore we have to protect the definition here. */ -+ -+#if !defined _LIBINTL_H || !defined _LIBGETTEXT_H -+#ifndef _LIBINTL_H -+# define _LIBINTL_H 1 -+#endif -+#define _LIBGETTEXT_H 1 -+ -+/* We define an additional symbol to signal that we use the GNU -+ implementation of gettext. */ -+#define __USE_GNU_GETTEXT 1 -+ -+#include <sys/types.h> -+ -+#if HAVE_LOCALE_H -+# include <locale.h> -+#endif -+ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+#ifndef PARAMS -+# if __STDC__ || defined __cplusplus -+# define PARAMS(args) args -+# else -+# define PARAMS(args) () -+# endif -+#endif -+ -+#ifndef NULL -+# if !defined __cplusplus || defined __GNUC__ -+# define NULL ((void *) 0) -+# else -+# define NULL (0) -+# endif -+#endif -+ -+#if !HAVE_LC_MESSAGES -+/* This value determines the behaviour of the gettext() and dgettext() -+ function. But some system does not have this defined. Define it -+ to a default value. */ -+# define LC_MESSAGES (-1) -+#endif -+ -+ -+/* Declarations for gettext-using-catgets interface. Derived from -+ Jim Meyering's libintl.h. */ -+struct _msg_ent -+{ -+ const char *_msg; -+ int _msg_number; -+}; -+ -+ -+#if HAVE_CATGETS -+/* These two variables are defined in the automatically by po-to-tbl.sed -+ generated file `cat-id-tbl.c'. */ -+extern const struct _msg_ent _msg_tbl[]; -+extern int _msg_tbl_length; -+#endif -+ -+ -+/* For automatical extraction of messages sometimes no real -+ translation is needed. Instead the string itself is the result. */ -+#define gettext_noop(Str) (Str) -+ -+/* Look up MSGID in the current default message catalog for the current -+ LC_MESSAGES locale. If not found, returns MSGID itself (the default -+ text). */ -+extern char *gettext PARAMS ((const char *__msgid)); -+extern char *gettext__ PARAMS ((const char *__msgid)); -+ -+/* Look up MSGID in the DOMAINNAME message catalog for the current -+ LC_MESSAGES locale. */ -+extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid)); -+extern char *dgettext__ PARAMS ((const char *__domainname, -+ const char *__msgid)); -+ -+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY -+ locale. */ -+extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid, -+ int __category)); -+extern char *dcgettext__ PARAMS ((const char *__domainname, -+ const char *__msgid, int __category)); -+ -+ -+/* Set the current default message catalog to DOMAINNAME. -+ If DOMAINNAME is null, return the current default. -+ If DOMAINNAME is "", reset to the default of "messages". */ -+extern char *textdomain PARAMS ((const char *__domainname)); -+extern char *textdomain__ PARAMS ((const char *__domainname)); -+ -+/* Specify that the DOMAINNAME message catalog will be found -+ in DIRNAME rather than in the system locale data base. */ -+extern char *bindtextdomain PARAMS ((const char *__domainname, -+ const char *__dirname)); -+extern char *bindtextdomain__ PARAMS ((const char *__domainname, -+ const char *__dirname)); -+ -+#if ENABLE_NLS -+ -+/* Solaris 2.3 has the gettext function but dcgettext is missing. -+ So we omit this optimization for Solaris 2.3. BTW, Solaris 2.4 -+ has dcgettext. */ -+# if !HAVE_CATGETS && (!HAVE_GETTEXT || HAVE_DCGETTEXT) -+ -+# define gettext(Msgid) \ -+ dgettext (NULL, Msgid) -+ -+# define dgettext(Domainname, Msgid) \ -+ dcgettext (Domainname, Msgid, LC_MESSAGES) -+ -+# if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ >= 7 -+/* This global variable is defined in loadmsgcat.c. We need a sign, -+ whether a new catalog was loaded, which can be associated with all -+ translations. */ -+extern int _nl_msg_cat_cntr; -+ -+# define dcgettext(Domainname, Msgid, Category) \ -+ (__extension__ \ -+ ({ \ -+ char *__result; \ -+ if (__builtin_constant_p (Msgid)) \ -+ { \ -+ static char *__translation__; \ -+ static int __catalog_counter__; \ -+ if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr) \ -+ { \ -+ __translation__ = \ -+ dcgettext__ (Domainname, Msgid, Category); \ -+ __catalog_counter__ = _nl_msg_cat_cntr; \ -+ } \ -+ __result = __translation__; \ -+ } \ -+ else \ -+ __result = dcgettext__ (Domainname, Msgid, Category); \ -+ __result; \ -+ })) -+# endif -+# endif -+ -+#else -+ -+# define gettext(Msgid) (Msgid) -+# define dgettext(Domainname, Msgid) (Msgid) -+# define dcgettext(Domainname, Msgid, Category) (Msgid) -+# define textdomain(Domainname) ((char *) Domainname) -+# define bindtextdomain(Domainname, Dirname) ((char *) Dirname) -+ -+#endif -+ -+/* @@ begin of epilog @@ */ -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif -diff -Pur GConf-1.0.0.orig/intl/linux-msg.sed GConf-1.0.0/intl/linux-msg.sed ---- GConf-1.0.0.orig/intl/linux-msg.sed Wed Dec 31 19:00:00 1969 -+++ GConf-1.0.0/intl/linux-msg.sed Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,100 @@ -+# po2msg.sed - Convert Uniforum style .po file to Linux style .msg file -+# Copyright (C) 1995 Free Software Foundation, Inc. -+# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+# -+# This program 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 General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+# -+# The first directive in the .msg should be the definition of the -+# message set number. We use always set number 1. -+# -+1 { -+ i\ -+$set 1 # Automatically created by po2msg.sed -+ h -+ s/.*/0/ -+ x -+} -+# -+# Mitch's old catalog format does not allow comments. -+# -+# We copy the original message as a comment into the .msg file. -+# -+/^msgid/ { -+ s/msgid[ ]*"// -+# -+# This does not work now with the new format. -+# /"$/! { -+# s/\\$// -+# s/$/ ... (more lines following)"/ -+# } -+ x -+# The following nice solution is by -+# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de> -+ td -+# Increment a decimal number in pattern space. -+# First hide trailing `9' digits. -+ :d -+ s/9\(_*\)$/_\1/ -+ td -+# Assure at least one digit is available. -+ s/^\(_*\)$/0\1/ -+# Increment the last digit. -+ s/8\(_*\)$/9\1/ -+ s/7\(_*\)$/8\1/ -+ s/6\(_*\)$/7\1/ -+ s/5\(_*\)$/6\1/ -+ s/4\(_*\)$/5\1/ -+ s/3\(_*\)$/4\1/ -+ s/2\(_*\)$/3\1/ -+ s/1\(_*\)$/2\1/ -+ s/0\(_*\)$/1\1/ -+# Convert the hidden `9' digits to `0's. -+ s/_/0/g -+ x -+ G -+ s/\(.*\)"\n\([0-9]*\)/$ #\2 Original Message:(\1)/p -+} -+# -+# The .msg file contains, other then the .po file, only the translations -+# but each given a unique ID. Starting from 1 and incrementing by 1 for -+# each message we assign them to the messages. -+# It is important that the .po file used to generate the cat-id-tbl.c file -+# (with po-to-tbl) is the same as the one used here. (At least the order -+# of declarations must not be changed.) -+# -+/^msgstr/ { -+ s/msgstr[ ]*"\(.*\)"/# \1/ -+# Clear substitution flag. -+ tb -+# Append the next line. -+ :b -+ N -+# Look whether second part is continuation line. -+ s/\(.*\n\)"\(.*\)"/\1\2/ -+# Yes, then branch. -+ ta -+ P -+ D -+# Note that D includes a jump to the start!! -+# We found a continuation line. But before printing insert '\'. -+ :a -+ s/\(.*\)\(\n.*\)/\1\\\2/ -+ P -+# We cannot use D here. -+ s/.*\n\(.*\)/\1/ -+ tb -+} -+d -diff -Pur GConf-1.0.0.orig/intl/loadinfo.h GConf-1.0.0/intl/loadinfo.h ---- GConf-1.0.0.orig/intl/loadinfo.h Wed Dec 31 19:00:00 1969 -+++ GConf-1.0.0/intl/loadinfo.h Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,76 @@ -+/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifndef PARAMS -+# if __STDC__ -+# define PARAMS(args) args -+# else -+# define PARAMS(args) () -+# endif -+#endif -+ -+/* Encoding of locale name parts. */ -+#define CEN_REVISION 1 -+#define CEN_SPONSOR 2 -+#define CEN_SPECIAL 4 -+#define XPG_NORM_CODESET 8 -+#define XPG_CODESET 16 -+#define TERRITORY 32 -+#define CEN_AUDIENCE 64 -+#define XPG_MODIFIER 128 -+ -+#define CEN_SPECIFIC (CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE) -+#define XPG_SPECIFIC (XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER) -+ -+ -+struct loaded_l10nfile -+{ -+ const char *filename; -+ int decided; -+ -+ const void *data; -+ -+ struct loaded_l10nfile *next; -+ struct loaded_l10nfile *successor[1]; -+}; -+ -+ -+extern const char *_nl_normalize_codeset PARAMS ((const unsigned char *codeset, -+ size_t name_len)); -+ -+extern struct loaded_l10nfile * -+_nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list, -+ const char *dirlist, size_t dirlist_len, int mask, -+ const char *language, const char *territory, -+ const char *codeset, -+ const char *normalized_codeset, -+ const char *modifier, const char *special, -+ const char *sponsor, const char *revision, -+ const char *filename, int do_allocate)); -+ -+ -+extern const char *_nl_expand_alias PARAMS ((const char *name)); -+ -+extern int _nl_explode_name PARAMS ((char *name, const char **language, -+ const char **modifier, -+ const char **territory, -+ const char **codeset, -+ const char **normalized_codeset, -+ const char **special, -+ const char **sponsor, -+ const char **revision)); -diff -Pur GConf-1.0.0.orig/intl/loadmsgcat.c GConf-1.0.0/intl/loadmsgcat.c ---- GConf-1.0.0.orig/intl/loadmsgcat.c Wed Dec 31 19:00:00 1969 -+++ GConf-1.0.0/intl/loadmsgcat.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,222 @@ -+/* Load needed message catalogs. -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <fcntl.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#endif -+ -+#if defined HAVE_UNISTD_H || defined _LIBC -+# include <unistd.h> -+#endif -+ -+#if (defined HAVE_MMAP && defined HAVE_MUNMAP) || defined _LIBC -+# include <sys/mman.h> -+#endif -+ -+#include "gettext.h" -+#include "gettextP.h" -+ -+/* @@ end of prolog @@ */ -+ -+#ifdef _LIBC -+/* Rename the non ISO C functions. This is required by the standard -+ because some ISO C functions will require linking with this object -+ file and the name space must not be polluted. */ -+# define open __open -+# define close __close -+# define read __read -+# define mmap __mmap -+# define munmap __munmap -+#endif -+ -+/* We need a sign, whether a new catalog was loaded, which can be associated -+ with all translations. This is important if the translations are -+ cached by one of GCC's features. */ -+int _nl_msg_cat_cntr = 0; -+ -+ -+/* Load the message catalogs specified by FILENAME. If it is no valid -+ message catalog do nothing. */ -+void -+internal_function -+_nl_load_domain (domain_file) -+ struct loaded_l10nfile *domain_file; -+{ -+ int fd; -+ size_t size; -+ struct stat st; -+ struct mo_file_header *data = (struct mo_file_header *) -1; -+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ -+ || defined _LIBC -+ int use_mmap = 0; -+#endif -+ struct loaded_domain *domain; -+ -+ domain_file->decided = 1; -+ domain_file->data = NULL; -+ -+ /* If the record does not represent a valid locale the FILENAME -+ might be NULL. This can happen when according to the given -+ specification the locale file name is different for XPG and CEN -+ syntax. */ -+ if (domain_file->filename == NULL) -+ return; -+ -+ /* Try to open the addressed file. */ -+ fd = open (domain_file->filename, O_RDONLY); -+ if (fd == -1) -+ return; -+ -+ /* We must know about the size of the file. */ -+ if (fstat (fd, &st) != 0 -+ || (size = (size_t) st.st_size) != st.st_size -+ || size < sizeof (struct mo_file_header)) -+ { -+ /* Something went wrong. */ -+ close (fd); -+ return; -+ } -+ -+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ -+ || defined _LIBC -+ /* Now we are ready to load the file. If mmap() is available we try -+ this first. If not available or it failed we try to load it. */ -+ data = (struct mo_file_header *) mmap (NULL, size, PROT_READ, -+ MAP_PRIVATE, fd, 0); -+ -+ if (data != (struct mo_file_header *) -1) -+ { -+ /* mmap() call was successful. */ -+ close (fd); -+ use_mmap = 1; -+ } -+#endif -+ -+ /* If the data is not yet available (i.e. mmap'ed) we try to load -+ it manually. */ -+ if (data == (struct mo_file_header *) -1) -+ { -+ size_t to_read; -+ char *read_ptr; -+ -+ data = (struct mo_file_header *) malloc (size); -+ if (data == NULL) -+ return; -+ -+ to_read = size; -+ read_ptr = (char *) data; -+ do -+ { -+ long int nb = (long int) read (fd, read_ptr, to_read); -+ if (nb == -1) -+ { -+ close (fd); -+ return; -+ } -+ -+ read_ptr += nb; -+ to_read -= nb; -+ } -+ while (to_read > 0); -+ -+ close (fd); -+ } -+ -+ /* Using the magic number we can test whether it really is a message -+ catalog file. */ -+ if (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED) -+ { -+ /* The magic number is wrong: not a message catalog file. */ -+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ -+ || defined _LIBC -+ if (use_mmap) -+ munmap ((caddr_t) data, size); -+ else -+#endif -+ free (data); -+ return; -+ } -+ -+ domain_file->data -+ = (struct loaded_domain *) malloc (sizeof (struct loaded_domain)); -+ if (domain_file->data == NULL) -+ return; -+ -+ domain = (struct loaded_domain *) domain_file->data; -+ domain->data = (char *) data; -+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ -+ || defined _LIBC -+ domain->use_mmap = use_mmap; -+#endif -+ domain->mmap_size = size; -+ domain->must_swap = data->magic != _MAGIC; -+ -+ /* Fill in the information about the available tables. */ -+ switch (W (domain->must_swap, data->revision)) -+ { -+ case 0: -+ domain->nstrings = W (domain->must_swap, data->nstrings); -+ domain->orig_tab = (struct string_desc *) -+ ((char *) data + W (domain->must_swap, data->orig_tab_offset)); -+ domain->trans_tab = (struct string_desc *) -+ ((char *) data + W (domain->must_swap, data->trans_tab_offset)); -+ domain->hash_size = W (domain->must_swap, data->hash_tab_size); -+ domain->hash_tab = (nls_uint32 *) -+ ((char *) data + W (domain->must_swap, data->hash_tab_offset)); -+ break; -+ default: -+ /* This is an illegal revision. */ -+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ -+ || defined _LIBC -+ if (use_mmap) -+ munmap ((caddr_t) data, size); -+ else -+#endif -+ free (data); -+ free (domain); -+ domain_file->data = NULL; -+ return; -+ } -+ -+ /* Show that one domain is changed. This might make some cached -+ translations invalid. */ -+ ++_nl_msg_cat_cntr; -+} -+ -+ -+#ifdef _LIBC -+void -+internal_function -+_nl_unload_domain (domain) -+ struct loaded_domain *domain; -+{ -+ if (domain->use_mmap) -+ munmap ((caddr_t) domain->data, domain->mmap_size); -+ else -+ free ((void *) domain->data); -+ -+ free (domain); -+} -+#endif -diff -Pur GConf-1.0.0.orig/intl/localealias.c GConf-1.0.0/intl/localealias.c ---- GConf-1.0.0.orig/intl/localealias.c Wed Dec 31 19:00:00 1969 -+++ GConf-1.0.0/intl/localealias.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,424 @@ -+/* Handle aliases for locale names. -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <ctype.h> -+#include <stdio.h> -+#include <sys/types.h> -+ -+#ifdef __GNUC__ -+# define alloca __builtin_alloca -+# define HAVE_ALLOCA 1 -+#else -+# if defined HAVE_ALLOCA_H || defined _LIBC -+# include <alloca.h> -+# else -+# ifdef _AIX -+ #pragma alloca -+# else -+# ifndef alloca -+char *alloca (); -+# endif -+# endif -+# endif -+#endif -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#else -+char *getenv (); -+# ifdef HAVE_MALLOC_H -+# include <malloc.h> -+# else -+void free (); -+# endif -+#endif -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# ifndef _GNU_SOURCE -+# define _GNU_SOURCE 1 -+# endif -+# include <string.h> -+#else -+# include <strings.h> -+# ifndef memcpy -+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -+# endif -+#endif -+#if !HAVE_STRCHR && !defined _LIBC -+# ifndef strchr -+# define strchr index -+# endif -+#endif -+ -+#include "gettext.h" -+#include "gettextP.h" -+ -+/* @@ end of prolog @@ */ -+ -+#ifdef _LIBC -+/* Rename the non ANSI C functions. This is required by the standard -+ because some ANSI C functions will require linking with this object -+ file and the name space must not be polluted. */ -+# define strcasecmp __strcasecmp -+ -+# define mempcpy __mempcpy -+# define HAVE_MEMPCPY 1 -+ -+/* We need locking here since we can be called from different places. */ -+# include <bits/libc-lock.h> -+ -+__libc_lock_define_initialized (static, lock); -+#endif -+ -+ -+/* For those loosing systems which don't have `alloca' we have to add -+ some additional code emulating it. */ -+#ifdef HAVE_ALLOCA -+/* Nothing has to be done. */ -+# define ADD_BLOCK(list, address) /* nothing */ -+# define FREE_BLOCKS(list) /* nothing */ -+#else -+struct block_list -+{ -+ void *address; -+ struct block_list *next; -+}; -+# define ADD_BLOCK(list, addr) \ -+ do { \ -+ struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \ -+ /* If we cannot get a free block we cannot add the new element to \ -+ the list. */ \ -+ if (newp != NULL) { \ -+ newp->address = (addr); \ -+ newp->next = (list); \ -+ (list) = newp; \ -+ } \ -+ } while (0) -+# define FREE_BLOCKS(list) \ -+ do { \ -+ while (list != NULL) { \ -+ struct block_list *old = list; \ -+ list = list->next; \ -+ free (old); \ -+ } \ -+ } while (0) -+# undef alloca -+# define alloca(size) (malloc (size)) -+#endif /* have alloca */ -+ -+ -+struct alias_map -+{ -+ const char *alias; -+ const char *value; -+}; -+ -+ -+static char *string_space = NULL; -+static size_t string_space_act = 0; -+static size_t string_space_max = 0; -+static struct alias_map *map; -+static size_t nmap = 0; -+static size_t maxmap = 0; -+ -+ -+/* Prototypes for local functions. */ -+static size_t read_alias_file PARAMS ((const char *fname, int fname_len)) -+ internal_function; -+static void extend_alias_table PARAMS ((void)); -+static int alias_compare PARAMS ((const struct alias_map *map1, -+ const struct alias_map *map2)); -+ -+ -+const char * -+_nl_expand_alias (name) -+ const char *name; -+{ -+ static const char *locale_alias_path = LOCALE_ALIAS_PATH; -+ struct alias_map *retval; -+ const char *result = NULL; -+ size_t added; -+ -+#ifdef _LIBC -+ __libc_lock_lock (lock); -+#endif -+ -+ do -+ { -+ struct alias_map item; -+ -+ item.alias = name; -+ -+ if (nmap > 0) -+ retval = (struct alias_map *) bsearch (&item, map, nmap, -+ sizeof (struct alias_map), -+ (int (*) PARAMS ((const void *, -+ const void *)) -+ ) alias_compare); -+ else -+ retval = NULL; -+ -+ /* We really found an alias. Return the value. */ -+ if (retval != NULL) -+ { -+ result = retval->value; -+ break; -+ } -+ -+ /* Perhaps we can find another alias file. */ -+ added = 0; -+ while (added == 0 && locale_alias_path[0] != '\0') -+ { -+ const char *start; -+ -+ while (locale_alias_path[0] == ':') -+ ++locale_alias_path; -+ start = locale_alias_path; -+ -+ while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ':') -+ ++locale_alias_path; -+ -+ if (start < locale_alias_path) -+ added = read_alias_file (start, locale_alias_path - start); -+ } -+ } -+ while (added != 0); -+ -+#ifdef _LIBC -+ __libc_lock_unlock (lock); -+#endif -+ -+ return result; -+} -+ -+ -+static size_t -+internal_function -+read_alias_file (fname, fname_len) -+ const char *fname; -+ int fname_len; -+{ -+#ifndef HAVE_ALLOCA -+ struct block_list *block_list = NULL; -+#endif -+ FILE *fp; -+ char *full_fname; -+ size_t added; -+ static const char aliasfile[] = "/locale.alias"; -+ -+ full_fname = (char *) alloca (fname_len + sizeof aliasfile); -+ ADD_BLOCK (block_list, full_fname); -+#ifdef HAVE_MEMPCPY -+ mempcpy (mempcpy (full_fname, fname, fname_len), -+ aliasfile, sizeof aliasfile); -+#else -+ memcpy (full_fname, fname, fname_len); -+ memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile); -+#endif -+ -+ fp = fopen (full_fname, "r"); -+ if (fp == NULL) -+ { -+ FREE_BLOCKS (block_list); -+ return 0; -+ } -+ -+ added = 0; -+ while (!feof (fp)) -+ { -+ /* It is a reasonable approach to use a fix buffer here because -+ a) we are only interested in the first two fields -+ b) these fields must be usable as file names and so must not -+ be that long -+ */ -+ unsigned char buf[BUFSIZ]; -+ unsigned char *alias; -+ unsigned char *value; -+ unsigned char *cp; -+ -+ if (fgets (buf, sizeof buf, fp) == NULL) -+ /* EOF reached. */ -+ break; -+ -+ /* Possibly not the whole line fits into the buffer. Ignore -+ the rest of the line. */ -+ if (strchr (buf, '\n') == NULL) -+ { -+ char altbuf[BUFSIZ]; -+ do -+ if (fgets (altbuf, sizeof altbuf, fp) == NULL) -+ /* Make sure the inner loop will be left. The outer loop -+ will exit at the `feof' test. */ -+ break; -+ while (strchr (altbuf, '\n') == NULL); -+ } -+ -+ cp = buf; -+ /* Ignore leading white space. */ -+ while (isspace (cp[0])) -+ ++cp; -+ -+ /* A leading '#' signals a comment line. */ -+ if (cp[0] != '\0' && cp[0] != '#') -+ { -+ alias = cp++; -+ while (cp[0] != '\0' && !isspace (cp[0])) -+ ++cp; -+ /* Terminate alias name. */ -+ if (cp[0] != '\0') -+ *cp++ = '\0'; -+ -+ /* Now look for the beginning of the value. */ -+ while (isspace (cp[0])) -+ ++cp; -+ -+ if (cp[0] != '\0') -+ { -+ size_t alias_len; -+ size_t value_len; -+ -+ value = cp++; -+ while (cp[0] != '\0' && !isspace (cp[0])) -+ ++cp; -+ /* Terminate value. */ -+ if (cp[0] == '\n') -+ { -+ /* This has to be done to make the following test -+ for the end of line possible. We are looking for -+ the terminating '\n' which do not overwrite here. */ -+ *cp++ = '\0'; -+ *cp = '\n'; -+ } -+ else if (cp[0] != '\0') -+ *cp++ = '\0'; -+ -+ if (nmap >= maxmap) -+ extend_alias_table (); -+ -+ alias_len = strlen (alias) + 1; -+ value_len = strlen (value) + 1; -+ -+ if (string_space_act + alias_len + value_len > string_space_max) -+ { -+ /* Increase size of memory pool. */ -+ size_t new_size = (string_space_max -+ + (alias_len + value_len > 1024 -+ ? alias_len + value_len : 1024)); -+ char *new_pool = (char *) realloc (string_space, new_size); -+ if (new_pool == NULL) -+ { -+ FREE_BLOCKS (block_list); -+ return added; -+ } -+ string_space = new_pool; -+ string_space_max = new_size; -+ } -+ -+ map[nmap].alias = memcpy (&string_space[string_space_act], -+ alias, alias_len); -+ string_space_act += alias_len; -+ -+ map[nmap].value = memcpy (&string_space[string_space_act], -+ value, value_len); -+ string_space_act += value_len; -+ -+ ++nmap; -+ ++added; -+ } -+ } -+ } -+ -+ /* Should we test for ferror()? I think we have to silently ignore -+ errors. --drepper */ -+ fclose (fp); -+ -+ if (added > 0) -+ qsort (map, nmap, sizeof (struct alias_map), -+ (int (*) PARAMS ((const void *, const void *))) alias_compare); -+ -+ FREE_BLOCKS (block_list); -+ return added; -+} -+ -+ -+static void -+extend_alias_table () -+{ -+ size_t new_size; -+ struct alias_map *new_map; -+ -+ new_size = maxmap == 0 ? 100 : 2 * maxmap; -+ new_map = (struct alias_map *) realloc (map, (new_size -+ * sizeof (struct alias_map))); -+ if (new_map == NULL) -+ /* Simply don't extend: we don't have any more core. */ -+ return; -+ -+ map = new_map; -+ maxmap = new_size; -+} -+ -+ -+#ifdef _LIBC -+static void __attribute__ ((unused)) -+free_mem (void) -+{ -+ if (string_space != NULL) -+ free (string_space); -+ if (map != NULL) -+ free (map); -+} -+text_set_element (__libc_subfreeres, free_mem); -+#endif -+ -+ -+static int -+alias_compare (map1, map2) -+ const struct alias_map *map1; -+ const struct alias_map *map2; -+{ -+#if defined _LIBC || defined HAVE_STRCASECMP -+ return strcasecmp (map1->alias, map2->alias); -+#else -+ const unsigned char *p1 = (const unsigned char *) map1->alias; -+ const unsigned char *p2 = (const unsigned char *) map2->alias; -+ unsigned char c1, c2; -+ -+ if (p1 == p2) -+ return 0; -+ -+ do -+ { -+ /* I know this seems to be odd but the tolower() function in -+ some systems libc cannot handle nonalpha characters. */ -+ c1 = isupper (*p1) ? tolower (*p1) : *p1; -+ c2 = isupper (*p2) ? tolower (*p2) : *p2; -+ if (c1 == '\0') -+ break; -+ ++p1; -+ ++p2; -+ } -+ while (c1 == c2); -+ -+ return c1 - c2; -+#endif -+} -diff -Pur GConf-1.0.0.orig/intl/po2tbl.sed.in GConf-1.0.0/intl/po2tbl.sed.in ---- GConf-1.0.0.orig/intl/po2tbl.sed.in Wed Dec 31 19:00:00 1969 -+++ GConf-1.0.0/intl/po2tbl.sed.in Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,102 @@ -+# po2tbl.sed - Convert Uniforum style .po file to lookup table for catgets -+# Copyright (C) 1995 Free Software Foundation, Inc. -+# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+# -+# This program 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 General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+1 { -+ i\ -+/* Automatically generated by po2tbl.sed from @PACKAGE NAME@.pot. */\ -+\ -+#if HAVE_CONFIG_H\ -+# include <config.h>\ -+#endif\ -+\ -+#include "libgettext.h"\ -+\ -+const struct _msg_ent _msg_tbl[] = { -+ h -+ s/.*/0/ -+ x -+} -+# -+# Write msgid entries in C array form. -+# -+/^msgid/ { -+ s/msgid[ ]*\(".*"\)/ {\1/ -+ tb -+# Append the next line -+ :b -+ N -+# Look whether second part is continuation line. -+ s/\(.*\)"\(\n\)"\(.*"\)/\1\2\3/ -+# Yes, then branch. -+ ta -+# Because we assume that the input file correctly formed the line -+# just read cannot be again be a msgid line. So it's safe to ignore -+# it. -+ s/\(.*\)\n.*/\1/ -+ bc -+# We found a continuation line. But before printing insert '\'. -+ :a -+ s/\(.*\)\(\n.*\)/\1\\\2/ -+ P -+# We cannot use D here. -+ s/.*\n\(.*\)/\1/ -+# Some buggy seds do not clear the `successful substitution since last ``t''' -+# flag on `N', so we do a `t' here to clear it. -+ tb -+# Not reached -+ :c -+ x -+# The following nice solution is by -+# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de> -+ td -+# Increment a decimal number in pattern space. -+# First hide trailing `9' digits. -+ :d -+ s/9\(_*\)$/_\1/ -+ td -+# Assure at least one digit is available. -+ s/^\(_*\)$/0\1/ -+# Increment the last digit. -+ s/8\(_*\)$/9\1/ -+ s/7\(_*\)$/8\1/ -+ s/6\(_*\)$/7\1/ -+ s/5\(_*\)$/6\1/ -+ s/4\(_*\)$/5\1/ -+ s/3\(_*\)$/4\1/ -+ s/2\(_*\)$/3\1/ -+ s/1\(_*\)$/2\1/ -+ s/0\(_*\)$/1\1/ -+# Convert the hidden `9' digits to `0's. -+ s/_/0/g -+ x -+ G -+ s/\(.*\)\n\([0-9]*\)/\1, \2},/ -+ s/\(.*\)"$/\1/ -+ p -+} -+# -+# Last line. -+# -+$ { -+ i\ -+};\ -+ -+ g -+ s/0*\(.*\)/int _msg_tbl_length = \1;/p -+} -+d -diff -Pur GConf-1.0.0.orig/intl/textdomain.c GConf-1.0.0/intl/textdomain.c ---- GConf-1.0.0.orig/intl/textdomain.c Wed Dec 31 19:00:00 1969 -+++ GConf-1.0.0/intl/textdomain.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,108 @@ -+/* Implementation of the textdomain(3) function. -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#endif -+ -+#if defined STDC_HEADERS || defined HAVE_STRING_H || defined _LIBC -+# include <string.h> -+#else -+# include <strings.h> -+# ifndef memcpy -+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -+# endif -+#endif -+ -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+/* Name of the default text domain. */ -+extern const char _nl_default_default_domain[]; -+ -+/* Default text domain in which entries for gettext(3) are to be found. */ -+extern const char *_nl_current_default_domain; -+ -+ -+/* Names for the libintl functions are a problem. They must not clash -+ with existing names and they should follow ANSI C. But this source -+ code is also used in GNU C Library where the names have a __ -+ prefix. So we have to make a difference here. */ -+#ifdef _LIBC -+# define TEXTDOMAIN __textdomain -+# ifndef strdup -+# define strdup(str) __strdup (str) -+# endif -+#else -+# define TEXTDOMAIN textdomain__ -+#endif -+ -+/* Set the current default message catalog to DOMAINNAME. -+ If DOMAINNAME is null, return the current default. -+ If DOMAINNAME is "", reset to the default of "messages". */ -+char * -+TEXTDOMAIN (domainname) -+ const char *domainname; -+{ -+ char *old; -+ -+ /* A NULL pointer requests the current setting. */ -+ if (domainname == NULL) -+ return (char *) _nl_current_default_domain; -+ -+ old = (char *) _nl_current_default_domain; -+ -+ /* If domain name is the null string set to default domain "messages". */ -+ if (domainname[0] == '\0' -+ || strcmp (domainname, _nl_default_default_domain) == 0) -+ _nl_current_default_domain = _nl_default_default_domain; -+ else -+ { -+ /* If the following malloc fails `_nl_current_default_domain' -+ will be NULL. This value will be returned and so signals we -+ are out of core. */ -+#if defined _LIBC || defined HAVE_STRDUP -+ _nl_current_default_domain = strdup (domainname); -+#else -+ size_t len = strlen (domainname) + 1; -+ char *cp = (char *) malloc (len); -+ if (cp != NULL) -+ memcpy (cp, domainname, len); -+ _nl_current_default_domain = cp; -+#endif -+ } -+ -+ if (old != _nl_default_default_domain) -+ free (old); -+ -+ return (char *) _nl_current_default_domain; -+} -+ -+#ifdef _LIBC -+/* Alias for function name in GNU C Library. */ -+weak_alias (__textdomain, textdomain); -+#endif -diff -Pur GConf-1.0.0.orig/intl/xopen-msg.sed GConf-1.0.0/intl/xopen-msg.sed ---- GConf-1.0.0.orig/intl/xopen-msg.sed Wed Dec 31 19:00:00 1969 -+++ GConf-1.0.0/intl/xopen-msg.sed Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,104 @@ -+# po2msg.sed - Convert Uniforum style .po file to X/Open style .msg file -+# Copyright (C) 1995 Free Software Foundation, Inc. -+# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+# -+# This program 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 General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+# -+# The first directive in the .msg should be the definition of the -+# message set number. We use always set number 1. -+# -+1 { -+ i\ -+$set 1 # Automatically created by po2msg.sed -+ h -+ s/.*/0/ -+ x -+} -+# -+# We copy all comments into the .msg file. Perhaps they can help. -+# -+/^#/ s/^#[ ]*/$ /p -+# -+# We copy the original message as a comment into the .msg file. -+# -+/^msgid/ { -+# Does not work now -+# /"$/! { -+# s/\\$// -+# s/$/ ... (more lines following)"/ -+# } -+ s/^msgid[ ]*"\(.*\)"$/$ Original Message: \1/ -+ p -+} -+# -+# The .msg file contains, other then the .po file, only the translations -+# but each given a unique ID. Starting from 1 and incrementing by 1 for -+# each message we assign them to the messages. -+# It is important that the .po file used to generate the cat-id-tbl.c file -+# (with po-to-tbl) is the same as the one used here. (At least the order -+# of declarations must not be changed.) -+# -+/^msgstr/ { -+ s/msgstr[ ]*"\(.*\)"/\1/ -+ x -+# The following nice solution is by -+# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de> -+ td -+# Increment a decimal number in pattern space. -+# First hide trailing `9' digits. -+ :d -+ s/9\(_*\)$/_\1/ -+ td -+# Assure at least one digit is available. -+ s/^\(_*\)$/0\1/ -+# Increment the last digit. -+ s/8\(_*\)$/9\1/ -+ s/7\(_*\)$/8\1/ -+ s/6\(_*\)$/7\1/ -+ s/5\(_*\)$/6\1/ -+ s/4\(_*\)$/5\1/ -+ s/3\(_*\)$/4\1/ -+ s/2\(_*\)$/3\1/ -+ s/1\(_*\)$/2\1/ -+ s/0\(_*\)$/1\1/ -+# Convert the hidden `9' digits to `0's. -+ s/_/0/g -+ x -+# Bring the line in the format `<number> <message>' -+ G -+ s/^[^\n]*$/& / -+ s/\(.*\)\n\([0-9]*\)/\2 \1/ -+# Clear flag from last substitution. -+ tb -+# Append the next line. -+ :b -+ N -+# Look whether second part is a continuation line. -+ s/\(.*\n\)"\(.*\)"/\1\2/ -+# Yes, then branch. -+ ta -+ P -+ D -+# Note that `D' includes a jump to the start!! -+# We found a continuation line. But before printing insert '\'. -+ :a -+ s/\(.*\)\(\n.*\)/\1\\\2/ -+ P -+# We cannot use the sed command `D' here -+ s/.*\n\(.*\)/\1/ -+ tb -+} -+d diff --git a/gnome-base/gconf/gconf-1.0.0.ebuild b/gnome-base/gconf/gconf-1.0.0.ebuild deleted file mode 100644 index c4965448b781..000000000000 --- a/gnome-base/gconf/gconf-1.0.0.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 - -P=GConf-${PV} -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Gconf" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/${A} - ftp://gnome.eazel.com/pub/gnome/unstable/sources/GConf/${A}" - -HOMEPAGE="http://www.gnome.org/" - -DEPEND="nls? ( sys-devel/gettext ) - >=gnome-base/gnome-env-1.0 - >=gnome-base/oaf-0.6.5 - >=x11-libs/gtk+-1.2.9 - >=dev-util/guile-1.4" - -src_unpack() { - unpack ${A} - # for some reason, the GConf package doesn't come w/ an intl directory, - # so I copied it from another package, and made a diff - cd ${S} - try patch -p1 < ${FILESDIR}/${PF}-gentoo-intl.diff -} - -src_compile() { - - local myconf - if [ -z "`use nls`" ] - then - myconf="--disable-nls" - fi - try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome ${myconf} - try make -} - -src_install() { - - try make DESTDIR=${D} install - dodoc AUTHORS COPYING ChangeLog NEWS README* TODO - -} - - - - - diff --git a/gnome-base/gdk-pixbuf/files/digest-gdk-pixbuf-0.10.1 b/gnome-base/gdk-pixbuf/files/digest-gdk-pixbuf-0.10.1 deleted file mode 100644 index e70af3d0571a..000000000000 --- a/gnome-base/gdk-pixbuf/files/digest-gdk-pixbuf-0.10.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 eb554077f6f176da32e263dcacfe34c4 gdk-pixbuf-0.10.1.tar.gz diff --git a/gnome-base/gdk-pixbuf/gdk-pixbuf-0.10.1.ebuild b/gnome-base/gdk-pixbuf/gdk-pixbuf-0.10.1.ebuild deleted file mode 100644 index 15a8230b0f24..000000000000 --- a/gnome-base/gdk-pixbuf/gdk-pixbuf-0.10.1.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/gnome-base/gdk-pixbuf/gdk-pixbuf-0.10.1.ebuild,v 1.1 2001/04/13 16:59:03 pete Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="GNOME Image Library" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/"${A} - -DEPEND=">=gnome-base/gnome-libs-1.2.13" - -src_compile() { - - try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome - try make -} - -src_install() { - - try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome install - dodoc AUTHORS COPYING* ChangeLog INSTALL README NEWS TODO -} - - - - - - diff --git a/gnome-base/gnome-core/files/digest-gnome-core-1.4.0.2 b/gnome-base/gnome-core/files/digest-gnome-core-1.4.0.2 deleted file mode 100644 index 9181321db4b0..000000000000 --- a/gnome-base/gnome-core/files/digest-gnome-core-1.4.0.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 fdd662a876b998dbaa1c3fed1a3944e6 gnome-core-1.4.0.2.tar.gz diff --git a/gnome-base/gnome-core/files/digest-gnome-core-1.4.0.3 b/gnome-base/gnome-core/files/digest-gnome-core-1.4.0.3 deleted file mode 100644 index 8b95b617b16e..000000000000 --- a/gnome-base/gnome-core/files/digest-gnome-core-1.4.0.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 0512beb2d3a70305f99107283d9c568f gnome-core-1.4.0.3.tar.gz diff --git a/gnome-base/gnome-core/files/gnome-core-1.4.0.1-gentoo.diff b/gnome-base/gnome-core/files/gnome-core-1.4.0.1-gentoo.diff deleted file mode 100644 index edabb9d210e5..000000000000 --- a/gnome-base/gnome-core/files/gnome-core-1.4.0.1-gentoo.diff +++ /dev/null @@ -1,65 +0,0 @@ -diff -urP gnome-core-1.4.0.1.orig/configure.in gnome-core-1.4.0.1/configure.in ---- gnome-core-1.4.0.1.orig/configure.in Wed Mar 28 11:49:10 2001 -+++ gnome-core-1.4.0.1/configure.in Sun Apr 15 14:04:14 2001 -@@ -283,6 +283,15 @@ - ]) - ]) - -+CPPFLAGS=`$GNOME_CONFIG --cflags print` -+LDFLAGS=`$GNOME_CONFIG --libs print` -+ -+lib_gnomeprint=false -+AC_CHECK_LIB(gnomeprint, main, lib_gnomeprint=true, [ -+ AC_MSG_WARN([GnomePrint not found (using GtkXmHTML) -+ ]) -+]) -+ - CPPFLAGS=$CPPFLAGS_save - LDFLAGS=$LDFLAGS_save - -@@ -291,22 +300,18 @@ - gtkhtml_enabled="$enableval", gtkhtml_enabled=no) - - if test "x$gtkhtml_enabled" = "xyes" ; then -- if test "x$lib_gtkhtml" = "xtrue" ; then -- AC_MSG_CHECKING(for static libgtkhtml) -- if test -e $GTK_HTML_PREFIX/lib/libgtkhtml.a ; then -- AC_MSG_RESULT(yes) -- AC_MSG_CHECKING(for static libgnomeprint) -- if test -e $GNOME_PRINT_PREFIX/lib/libgnomeprint.a ; then -- AC_MSG_RESULT(yes) -- help_use_gtkhtml=true -- else -- AC_MSG_RESULT(no) -- fi -- else -- AC_MSG_RESULT(no) -- fi -+ if test \( "x$lib_gtkhtml" = "xtrue" \) -a \( "x$lib_gnomeprint" = "xtrue" \) ; then -+ GTKHTML_CFLAGS=`$GNOME_CONFIG --cflags gtkhtml` -+ GTKHTML_LIBS=`$GNOME_CONFIG --libs gtkhtml` -+ GNOMEPRINT_CFLAGS=`$GNOME_CONFIG --cflags print` -+ GNOMEPRINT_LIBS=`$GNOME_CONFIG --libs print` -+ help_use_gtkhtml=true - fi - fi -+AC_SUBST(GTKHTML_CFLAGS) -+AC_SUBST(GTKHTML_LIBS) -+AC_SUBST(GNOMEPRINT_CFLAGS) -+AC_SUBST(GNOMEPRINT_LIBS) - - AC_MSG_CHECKING(which HTML widget to use) - if test "x$help_use_gtkhtml" = "xtrue" ; then -diff -urP gnome-core-1.4.0.1.orig/help-browser/Makefile.am gnome-core-1.4.0.1/help-browser/Makefile.am ---- gnome-core-1.4.0.1.orig/help-browser/Makefile.am Mon Feb 5 11:04:57 2001 -+++ gnome-core-1.4.0.1/help-browser/Makefile.am Sun Apr 15 12:50:28 2001 -@@ -16,8 +16,7 @@ - - if HELP_USE_GTKHTML - htmllibs = $(GNOME_XML_LIB) @PIXBUF_LIBS@ \ -- $(GTK_HTML_PREFIX)/lib/libgtkhtml.a \ -- $(GNOME_PRINT_PREFIX)/lib/libgnomeprint.a -+ $(GTKHTML_LIBS) $(GNOMEPRINT_LIBS) - else - htmllibs = $(GTKXMHTML_LIBS) - endif diff --git a/gnome-base/gnome-core/gnome-core-1.4.0.2.ebuild b/gnome-base/gnome-core/gnome-core-1.4.0.2.ebuild deleted file mode 100644 index 59b418218d96..000000000000 --- a/gnome-base/gnome-core/gnome-core-1.4.0.2.ebuild +++ /dev/null @@ -1,64 +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/gnome-base/gnome-core/gnome-core-1.4.0.2.ebuild,v 1.1 2001/04/30 19:34:26 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="gnome-core" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A} - ftp://gnome.eazel.com/pub/gnome/unstable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/" - -RDEPEND="gtkhtml? ( >=gnome-base/gtkhtml-0.7 ) - >=gnome-base/control-center-1.2.4 - >=gnome-base/glibwww-0.2-r1 - >=gnome-base/libghttp-1.0.9 - >=gnome-base/libglade-0.16-r1 - >=gnome-base/scrollkeeper-0.2" - -DEPEND="${RDEPEND} - >=dev-util/xml-i18n-tools-0.8 - >=sys-devel/autoconf-2.13 - >=sys-devel/automake-1.4" - -#src_unpack() { -# unpack ${A} -# cd ${S} -# patch -p1 < ${FILESDIR}/${PF}-gentoo.diff -# try NOCONFIGURE=yes srcdir=${S} bash macros/autogen.sh -#} - -src_compile() { - local myconf - local myldflags - if [ -z "`use nls`" ] - then - myconf="--disable-nls" - fi - if [ "`use gtkhtml`" ] - then - myconf="${myconf} --enable-gtkhtml-help" - fi - if [ "`use kde`" ] - then - myconf="${myconf} --with-kde-datadir=/opt/kde2/share" - fi - try ./configure --host=${CHOST} --mandir=/opt/gnome/share/man \ - --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome \ - ${myconf} - try make -} - -src_install() { - try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome mandir=${D}/opt/gnome/share/man install - dodoc AUTHORS COPYING* ChangeLog README NEWS -} - - - - - - - - diff --git a/gnome-base/gnome-core/gnome-core-1.4.0.3.ebuild b/gnome-base/gnome-core/gnome-core-1.4.0.3.ebuild deleted file mode 100644 index a7eee8cd3aa0..000000000000 --- a/gnome-base/gnome-core/gnome-core-1.4.0.3.ebuild +++ /dev/null @@ -1,64 +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/gnome-base/gnome-core/gnome-core-1.4.0.3.ebuild,v 1.1 2001/05/08 00:58:44 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="gnome-core" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A} - ftp://gnome.eazel.com/pub/gnome/unstable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/" - -RDEPEND="gtkhtml? ( >=gnome-base/gtkhtml-0.7 ) - >=gnome-base/control-center-1.2.4 - >=gnome-base/glibwww-0.2-r1 - >=gnome-base/libghttp-1.0.9 - >=gnome-base/libglade-0.16-r1 - >=gnome-base/scrollkeeper-0.2" - -DEPEND="${RDEPEND} - >=dev-util/xml-i18n-tools-0.8 - >=sys-devel/autoconf-2.13 - >=sys-devel/automake-1.4" - -#src_unpack() { -# unpack ${A} -# cd ${S} -# patch -p1 < ${FILESDIR}/${PF}-gentoo.diff -# try NOCONFIGURE=yes srcdir=${S} bash macros/autogen.sh -#} - -src_compile() { - local myconf - local myldflags - if [ -z "`use nls`" ] - then - myconf="--disable-nls" - fi - if [ "`use gtkhtml`" ] - then - myconf="${myconf} --enable-gtkhtml-help" - fi - if [ "`use kde`" ] - then - myconf="${myconf} --with-kde-datadir=/opt/kde2/share" - fi - try ./configure --host=${CHOST} --mandir=/opt/gnome/share/man \ - --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome \ - ${myconf} - try make -} - -src_install() { - try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome mandir=${D}/opt/gnome/share/man install - dodoc AUTHORS COPYING* ChangeLog README NEWS -} - - - - - - - - diff --git a/gnome-base/gnome-print/files/digest-gnome-print-0.28 b/gnome-base/gnome-print/files/digest-gnome-print-0.28 deleted file mode 100644 index 7e0748f8c52a..000000000000 --- a/gnome-base/gnome-print/files/digest-gnome-print-0.28 +++ /dev/null @@ -1 +0,0 @@ -MD5 a14fa46020e432661deddc3128fdfe99 gnome-print-0.28.tar.gz diff --git a/gnome-base/gnome-print/gnome-print-0.28.ebuild b/gnome-base/gnome-print/gnome-print-0.28.ebuild deleted file mode 100644 index 03498dfa930b..000000000000 --- a/gnome-base/gnome-print/gnome-print-0.28.ebuild +++ /dev/null @@ -1,37 +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/gnome-base/gnome-print/gnome-print-0.28.ebuild,v 1.2 2001/04/19 16:37:12 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="gnome-print" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/"${A} -HOMEPAGE="http://www.gnome.org/" - -DEPEND="nls? ( sys-devel/gettext ) - >=gnome-base/libxml-1.8.10 - >=gnome-base/gdk-pixbuf-0.9.0 - >=app-text/ghostscript-6.50-r2" - -src_compile() { - local myconf - if [ -z "`use nls`" ] - then - myconf="--disable-nls" - fi - try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome install - dosed /opt/gnome/share/fonts/fontmap - dodoc AUTHORS COPYING ChangeLog NEWS README TODO -} - - - - - diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-1.0 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-1.0 deleted file mode 100644 index f39d1bc086d6..000000000000 --- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-1.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 2ddec52e27f5e8f4939f37e9b34c0732 gnome-vfs-1.0.tar.gz diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-1.0-gentoo-intl.diff b/gnome-base/gnome-vfs/files/gnome-vfs-1.0-gentoo-intl.diff deleted file mode 100644 index ff13301430a9..000000000000 --- a/gnome-base/gnome-vfs/files/gnome-vfs-1.0-gentoo-intl.diff +++ /dev/null @@ -1,5073 +0,0 @@ -diff -urP gnome-vfs-1.0.orig/intl/ChangeLog gnome-vfs-1.0/intl/ChangeLog ---- gnome-vfs-1.0.orig/intl/ChangeLog Wed Dec 31 19:00:00 1969 -+++ gnome-vfs-1.0/intl/ChangeLog Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,1086 @@ -+1998-04-29 Ulrich Drepper <drepper@cygnus.com> -+ -+ * intl/localealias.c (read_alias_file): Use unsigned char for -+ local variables. Remove unused variable tp. -+ * intl/l10nflist.c (_nl_normalize_codeset): Use unsigned char * -+ for type of codeset. For loosing Solaris systems. -+ * intl/loadinfo.h: Adapt prototype of _nl_normalize_codeset. -+ * intl/bindtextdom.c (BINDTEXTDOMAIN): Don't define local variable -+ len if not needed. -+ Patches by Jim Meyering. -+ -+1998-04-28 Ulrich Drepper <drepper@cygnus.com> -+ -+ * loadmsgcat.c (_nl_load_domain): Don't assign the element use_mmap if -+ mmap is not supported. -+ -+ * hash-string.h: Don't include <values.h>. -+ -+1998-04-27 Ulrich Drepper <drepper@cygnus.com> -+ -+ * textdomain.c: Use strdup is available. -+ -+ * localealias.c: Define HAVE_MEMPCPY so that we can use this -+ function. Define and use semapahores to protect modfication of -+ global objects when compiling for glibc. Add code to allow -+ freeing alias table. -+ -+ * l10nflist.c: Don't assume stpcpy not being a macro. -+ -+ * gettextP.h: Define internal_function macri if not already done. -+ Use glibc byte-swap macros instead of defining SWAP when compiled -+ for glibc. -+ (struct loaded_domain): Add elements to allow unloading. -+ -+ * Makefile.in (distclean): Don't remove libintl.h here. -+ -+ * bindtextdomain.c: Carry over changes from glibc. Use strdup if -+ available. -+ -+ * dcgettext.c: Don't assume stpcpy not being a macro. Mark internal -+ functions. Add memory freeing code for glibc. -+ -+ * dgettext.c: Update copyright. -+ -+ * explodename.c: Include stdlib.h and string.h only if they exist. -+ Use strings.h eventually. -+ -+ * finddomain.c: Mark internal functions. Use strdup if available. -+ Add memory freeing code for glibc. -+ -+1997-10-10 20:00 Ulrich Drepper <drepper@cygnus.com> -+ -+ * libgettext.h: Fix dummy textdomain and bindtextdomain macros. -+ They should return reasonable values. -+ Reported by Tom Tromey <tromey@cygnus.com>. -+ -+1997-09-16 03:33 Ulrich Drepper <drepper@cygnus.com> -+ -+ * libgettext.h: Define PARAMS also to `args' if __cplusplus is defined. -+ * intlh.inst.in: Likewise. -+ Reported by Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>. -+ -+ * libintl.glibc: Update from current glibc version. -+ -+1997-09-06 02:10 Ulrich Drepper <drepper@cygnus.com> -+ -+ * intlh.inst.in: Reformat copyright. -+ -+1997-08-19 15:22 Ulrich Drepper <drepper@cygnus.com> -+ -+ * dcgettext.c (DCGETTEXT): Remove wrong comment. -+ -+1997-08-16 00:13 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (install-data): Don't change directory to install. -+ -+1997-08-01 14:30 Ulrich Drepper <drepper@cygnus.com> -+ -+ * cat-compat.c: Fix copyright. -+ -+ * localealias.c: Don't define strchr unless !HAVE_STRCHR. -+ -+ * loadmsgcat.c: Update copyright. Fix typos. -+ -+ * l10nflist.c: Don't define strchr unless !HAVE_STRCHR. -+ (_nl_make_l10nflist): Handle sponsor and revision correctly. -+ -+ * gettext.c: Update copyright. -+ * gettext.h: Likewise. -+ * hash-string.h: Likewise. -+ -+ * finddomain.c: Remoave dead code. Define strchr only if -+ !HAVE_STRCHR. -+ -+ * explodename.c: Include <sys/types.h>. -+ -+ * explodename.c: Reformat copyright text. -+ (_nl_explode_name): Fix typo. -+ -+ * dcgettext.c: Define and use __set_errno. -+ (guess_category_value): Don't use setlocale if HAVE_LC_MESSAGES is -+ not defined. -+ -+ * bindtextdom.c: Pretty printing. -+ -+1997-05-01 02:25 Ulrich Drepper <drepper@cygnus.com> -+ -+ * dcgettext.c (guess_category_value): Don't depend on -+ HAVE_LC_MESSAGES. We don't need the macro here. -+ Patch by Bruno Haible <haible@ilog.fr>. -+ -+ * cat-compat.c (textdomain): DoN't refer to HAVE_SETLOCALE_NULL -+ macro. Instead use HAVE_LOCALE_NULL and define it when using -+ glibc, as in dcgettext.c. -+ Patch by Bruno Haible <haible@ilog.fr>. -+ -+ * Makefile.in (CPPFLAGS): New variable. Reported by Franc,ois -+ Pinard. -+ -+Mon Mar 10 06:51:17 1997 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in: Implement handling of libtool. -+ -+ * gettextP.h: Change data structures for use of generic lowlevel -+ i18n file handling. -+ -+Wed Dec 4 20:21:18 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * textdomain.c: Put parentheses around arguments of memcpy macro -+ definition. -+ * localealias.c: Likewise. -+ * l10nflist.c: Likewise. -+ * finddomain.c: Likewise. -+ * bindtextdom.c: Likewise. -+ Reported by Thomas Esken. -+ -+Mon Nov 25 22:57:51 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * textdomain.c: Move definition of `memcpy` macro to right -+ position. -+ -+Fri Nov 22 04:01:58 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * finddomain.c [!HAVE_STRING_H && !_LIBC]: Define memcpy using -+ bcopy if not already defined. Reported by Thomas Esken. -+ * bindtextdom.c: Likewise. -+ * l10nflist.c: Likewise. -+ * localealias.c: Likewise. -+ * textdomain.c: Likewise. -+ -+Tue Oct 29 11:10:27 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (libdir): Change to use exec_prefix instead of -+ prefix. Reported by Knut-HåvardAksnes <etokna@eto.ericsson.se>. -+ -+Sat Aug 31 03:07:09 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * l10nflist.c (_nl_normalize_codeset): We convert to lower case, -+ so don't prepend uppercase `ISO' for only numeric arg. -+ -+Fri Jul 19 00:15:46 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * l10nflist.c: Move inclusion of argz.h, ctype.h, stdlib.h after -+ definition of _GNU_SOURCE. Patch by Roland McGrath. -+ -+ * Makefile.in (uninstall): Fix another bug with `for' loop and -+ empty arguments. Patch by Jim Meyering. Correct name os -+ uninstalled files: no intl- prefix anymore. -+ -+ * Makefile.in (install-data): Again work around shells which -+ cannot handle mpty for list. Reported by Jim Meyering. -+ -+Sat Jul 13 18:11:35 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (install): Split goal. Now depend on install-exec -+ and install-data. -+ (install-exec, install-data): New goals. Created from former -+ install goal. -+ Reported by Karl Berry. -+ -+Sat Jun 22 04:58:14 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (MKINSTALLDIRS): New variable. Path to -+ mkinstalldirs script. -+ (install): use MKINSTALLDIRS variable or if the script is not present -+ try to find it in the $top_scrdir). -+ -+Wed Jun 19 02:56:56 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * l10nflist.c: Linux libc *partly* includes the argz_* functions. -+ Grr. Work around by renaming the static version and use macros -+ for renaming. -+ -+Tue Jun 18 20:11:17 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * l10nflist.c: Correct presence test macros of __argz_* functions. -+ -+ * l10nflist.c: Include <argz.h> based on test of it instead when -+ __argz_* functions are available. -+ Reported by Andreas Schwab. -+ -+Thu Jun 13 15:17:44 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * explodename.c, l10nflist.c: Define NULL for dumb systems. -+ -+Tue Jun 11 17:05:13 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * intlh.inst.in, libgettext.h (dcgettext): Rename local variable -+ result to __result to prevent name clash. -+ -+ * l10nflist.c, localealias.c, dcgettext.c: Define _GNU_SOURCE to -+ get prototype for stpcpy and strcasecmp. -+ -+ * intlh.inst.in, libgettext.h: Move declaration of -+ `_nl_msg_cat_cntr' outside __extension__ block to prevent warning -+ from gcc's -Wnested-extern option. -+ -+Fri Jun 7 01:58:00 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (install): Remove comment. -+ -+Thu Jun 6 17:28:17 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (install): Work around for another Buglix stupidity. -+ Always use an `else' close for `if's. Reported by Nelson Beebe. -+ -+ * Makefile.in (intlh.inst): Correct typo in phony rule. -+ Reported by Nelson Beebe. -+ -+Thu Jun 6 01:49:52 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * dcgettext.c (read_alias_file): Rename variable alloca_list to -+ block_list as the macro calls assume. -+ Patch by Eric Backus. -+ -+ * localealias.c [!HAVE_ALLOCA]: Define alloca as macro using -+ malloc. -+ (read_alias_file): Rename varriabe alloca_list to block_list as the -+ macro calls assume. -+ Patch by Eric Backus. -+ -+ * l10nflist.c: Correct conditional for <argz.h> inclusion. -+ Reported by Roland McGrath. -+ -+ * Makefile.in (all): Depend on all-@USE_INCLUDED_LIBINTL@, not -+ all-@USE_NLS@. -+ -+ * Makefile.in (install): intlh.inst comes from local dir, not -+ $(srcdir). -+ -+ * Makefile.in (intlh.inst): Special handling of this goal. If -+ used in gettext, this is really a rul to construct this file. If -+ used in any other package it is defined as a .PHONY rule with -+ empty body. -+ -+ * finddomain.c: Extract locale file information handling into -+ l10nfile.c. Rename local stpcpy__ function to stpcpy. -+ -+ * dcgettext.c (stpcpy): Add local definition. -+ -+ * l10nflist.c: Solve some portability problems. Patches partly by -+ Thomas Esken. Add local definition of stpcpy. -+ -+Tue Jun 4 02:47:49 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * intlh.inst.in: Don't depend including <locale.h> on -+ HAVE_LOCALE_H. Instead configure must rewrite this fiile -+ depending on the result of the configure run. -+ -+ * Makefile.in (install): libintl.inst is now called intlh.inst. -+ Add rules for updating intlh.inst from intlh.inst.in. -+ -+ * libintl.inst: Renamed to intlh.inst.in. -+ -+ * localealias.c, dcgettext.c [__GNUC__]: Define HAVE_ALLOCA to 1 -+ because gcc has __buitlin_alloca. -+ Reported by Roland McGrath. -+ -+Mon Jun 3 00:32:16 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (installcheck): New goal to fulfill needs of -+ automake's distcheck. -+ -+ * Makefile.in (install): Reorder commands so that VERSION is -+ found. -+ -+ * Makefile.in (gettextsrcdir): Now use subdirectory intl/ in -+ @datadir@/gettext. -+ (COMSRCS): Add l10nfile.c. -+ (OBJECTS): Add l10nfile.o. -+ (DISTFILES): Rename to DISTFILE.normal. Remove $(DISTFILES.common). -+ (DISTFILE.gettext): Remove $(DISTFILES.common). -+ (all-gettext): Remove goal. -+ (install): If $(PACKAGE) = gettext install, otherwose do nothing. No -+ package but gettext itself should install libintl.h + headers. -+ (dist): Extend goal to work for gettext, too. -+ (dist-gettext): Remove goal. -+ -+ * dcgettext.c [!HAVE_ALLOCA]: Define macro alloca by using malloc. -+ -+Sun Jun 2 17:33:06 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * loadmsgcat.c (_nl_load_domain): Parameter is now comes from -+ find_l10nfile. -+ -+Sat Jun 1 02:23:03 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * l10nflist.c (__argz_next): Add definition. -+ -+ * dcgettext.c [!HAVE_ALLOCA]: Add code for handling missing alloca -+ code. Use new l10nfile handling. -+ -+ * localealias.c [!HAVE_ALLOCA]: Add code for handling missing -+ alloca code. -+ -+ * l10nflist.c: Initial revision. -+ -+Tue Apr 2 18:51:18 1996 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (all-gettext): New goal. Same as all-yes. -+ -+Thu Mar 28 23:01:22 1996 Karl Eichwalder <ke@ke.central.de> -+ -+ * Makefile.in (gettextsrcdir): Define using @datadir@. -+ -+Tue Mar 26 12:39:14 1996 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c: Include <ctype.h>. Reported by Roland McGrath. -+ -+Sat Mar 23 02:00:35 1996 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (stpcpy): Rename to stpcpy__ to prevent clashing -+ with external declaration. -+ -+Sat Mar 2 00:47:09 1996 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (all-no): Rename from all_no. -+ -+Sat Feb 17 00:25:59 1996 Ulrich Drepper <drepper@myware> -+ -+ * gettextP.h [loaded_domain]: Array `successor' must now contain up -+ to 63 elements (because of codeset name normalization). -+ -+ * finddomain.c: Implement codeset name normalization. -+ -+Thu Feb 15 04:39:09 1996 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (all): Define to `all-@USE_NLS@'. -+ (all-yes, all_no): New goals. `all-no' is noop, `all-yes' -+ is former all. -+ -+Mon Jan 15 21:46:01 1996 Howard Gayle <howard@hal.com> -+ -+ * localealias.c (alias_compare): Increment string pointers in loop -+ of strcasecmp replacement. -+ -+Fri Dec 29 21:16:34 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (install-src): Who commented this goal out ? :-) -+ -+Fri Dec 29 15:08:16 1995 Ulrich Drepper <drepper@myware> -+ -+ * dcgettext.c (DCGETTEXT): Save `errno'. Failing system calls -+ should not effect it because a missing catalog is no error. -+ Reported by Harald K<o:>nig <koenig@tat.physik.uni-tuebingen.de>. -+ -+Tue Dec 19 22:09:13 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (Makefile): Explicitly use $(SHELL) for running -+ shell scripts. -+ -+Fri Dec 15 17:34:59 1995 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> -+ -+ * Makefile.in (install-src): Only install library and header when -+ we use the own implementation. Don't do it when using the -+ system's gettext or catgets functions. -+ -+ * dcgettext.c (find_msg): Must not swap domain->hash_size here. -+ -+Sat Dec 9 16:24:37 1995 Ulrich Drepper <drepper@myware> -+ -+ * localealias.c, libintl.inst, libgettext.h, hash-string.h, -+ gettextP.h, finddomain.c, dcgettext.c, cat-compat.c: -+ Use PARAMS instead of __P. Suggested by Roland McGrath. -+ -+Tue Dec 5 11:39:14 1995 Larry Schwimmer <rosebud@cyclone.stanford.edu> -+ -+ * libgettext.h: Use `#if !defined (_LIBINTL_H)' instead of `#if -+ !_LIBINTL_H' because Solaris defines _LIBINTL_H as empty. -+ -+Mon Dec 4 15:42:07 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (install-src): -+ Install libintl.inst instead of libintl.h.install. -+ -+Sat Dec 2 22:51:38 1995 Marcus Daniels <marcus@sysc.pdx.edu> -+ -+ * cat-compat.c (textdomain): -+ Reverse order in which files are tried you load. First -+ try local file, when this failed absolute path. -+ -+Wed Nov 29 02:03:53 1995 Nelson H. F. Beebe <beebe@math.utah.edu> -+ -+ * cat-compat.c (bindtextdomain): Add missing { }. -+ -+Sun Nov 26 18:21:41 1995 Ulrich Drepper <drepper@myware> -+ -+ * libintl.inst: Add missing __P definition. Reported by Nelson Beebe. -+ -+ * Makefile.in: -+ Add dummy `all' and `dvi' goals. Reported by Tom Tromey. -+ -+Sat Nov 25 16:12:01 1995 Franc,ois Pinard <pinard@iro.umontreal.ca> -+ -+ * hash-string.h: Capitalize arguments of macros. -+ -+Sat Nov 25 12:01:36 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (DISTFILES): Prevent files names longer than 13 -+ characters. libintl.h.glibc->libintl.glibc, -+ libintl.h.install->libintl.inst. Reported by Joshua R. Poulson. -+ -+Sat Nov 25 11:31:12 1995 Eric Backus <ericb@lsid.hp.com> -+ -+ * dcgettext.c: Fix bug in preprocessor conditionals. -+ -+Sat Nov 25 02:35:27 1995 Nelson H. F. Beebe <beebe@math.utah.edu> -+ -+ * libgettext.h: Solaris cc does not understand -+ #if !SYMBOL1 && !SYMBOL2. Sad but true. -+ -+Thu Nov 23 16:22:14 1995 Ulrich Drepper <drepper@myware> -+ -+ * hash-string.h (hash_string): -+ Fix for machine with >32 bit `unsigned long's. -+ -+ * dcgettext.c (DCGETTEXT): -+ Fix horrible bug in loop for alternative translation. -+ -+Thu Nov 23 01:45:29 1995 Ulrich Drepper <drepper@myware> -+ -+ * po2tbl.sed.in, linux-msg.sed, xopen-msg.sed: -+ Some further simplifications in message number generation. -+ -+Mon Nov 20 21:08:43 1995 Ulrich Drepper <drepper@myware> -+ -+ * libintl.h.glibc: Use __const instead of const in prototypes. -+ -+ * Makefile.in (install-src): -+ Install libintl.h.install instead of libintl.h. This -+ is a stripped-down version. Suggested by Peter Miller. -+ -+ * libintl.h.install, libintl.h.glibc: Initial revision. -+ -+ * localealias.c (_nl_expand_alias, read_alias_file): -+ Protect prototypes in type casts by __P. -+ -+Tue Nov 14 16:43:58 1995 Ulrich Drepper <drepper@myware> -+ -+ * hash-string.h: Correct prototype for hash_string. -+ -+Sun Nov 12 12:42:30 1995 Ulrich Drepper <drepper@myware> -+ -+ * hash-string.h (hash_string): Add prototype. -+ -+ * gettextP.h: Fix copyright. -+ (SWAP): Add prototype. -+ -+Wed Nov 8 22:56:33 1995 Ulrich Drepper <drepper@myware> -+ -+ * localealias.c (read_alias_file): Forgot sizeof. -+ Avoid calling *printf function. This introduces a big overhead. -+ Patch by Roland McGrath. -+ -+Tue Nov 7 14:21:08 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c, cat-compat.c: Wrong indentation in #if for stpcpy. -+ -+ * finddomain.c (stpcpy): -+ Define substitution function local. The macro was to flaky. -+ -+ * cat-compat.c: Fix typo. -+ -+ * xopen-msg.sed, linux-msg.sed: -+ While bringing message number to right place only accept digits. -+ -+ * linux-msg.sed, xopen-msg.sed: Now that the counter does not have -+ leading 0s we don't need to remove them. Reported by Marcus -+ Daniels. -+ -+ * Makefile.in (../po/cat-id-tbl.o): Use $(top_srdir) in -+ dependency. Reported by Marcus Daniels. -+ -+ * cat-compat.c: (stpcpy) [!_LIBC && !HAVE_STPCPY]: Define replacement. -+ Generally cleanup using #if instead of #ifndef. -+ -+ * Makefile.in: Correct typos in comment. By Franc,ois Pinard. -+ -+Mon Nov 6 00:27:02 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (install-src): Don't install libintl.h and libintl.a -+ if we use an available gettext implementation. -+ -+Sun Nov 5 22:02:08 1995 Ulrich Drepper <drepper@myware> -+ -+ * libgettext.h: Fix typo: HAVE_CATGETTS -> HAVE_CATGETS. Reported -+ by Franc,ois Pinard. -+ -+ * libgettext.h: Use #if instead of #ifdef/#ifndef. -+ -+ * finddomain.c: -+ Comments describing what has to be done should start with FIXME. -+ -+Sun Nov 5 19:38:01 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (DISTFILES): Split. Use DISTFILES with normal meaning. -+ DISTFILES.common names the files common to both dist goals. -+ DISTFILES.gettext are the files only distributed in GNU gettext. -+ -+Sun Nov 5 17:32:54 1995 Ulrich Drepper <drepper@myware> -+ -+ * dcgettext.c (DCGETTEXT): Correct searching in derived locales. -+ This was necessary since a change in _nl_find_msg several weeks -+ ago. I really don't know this is still not fixed. -+ -+Sun Nov 5 12:43:12 1995 Ulrich Drepper <drepper@myware> -+ -+ * loadmsgcat.c (_nl_load_domain): Test for FILENAME == NULL. This -+ might mark a special condition. -+ -+ * finddomain.c (make_entry_rec): Don't make illegal entry as decided. -+ -+ * Makefile.in (dist): Suppress error message when ln failed. -+ Get files from $(srcdir) explicitly. -+ -+ * libgettext.h (gettext_const): Rename to gettext_noop. -+ -+Fri Nov 3 07:36:50 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (make_entry_rec): -+ Protect against wrong locale names by testing mask. -+ -+ * libgettext.h (gettext_const): Add macro definition. -+ Capitalize macro arguments. -+ -+Thu Nov 2 23:15:51 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (_nl_find_domain): -+ Test for pointer != NULL before accessing value. -+ Reported by Tom Tromey. -+ -+ * gettext.c (NULL): -+ Define as (void*)0 instad of 0. Reported by Franc,ois Pinard. -+ -+Mon Oct 30 21:28:52 1995 Ulrich Drepper <drepper@myware> -+ -+ * po2tbl.sed.in: Serious typo bug fixed by Jim Meyering. -+ -+Sat Oct 28 23:20:47 1995 Ulrich Drepper <drepper@myware> -+ -+ * libgettext.h: Disable dcgettext optimization for Solaris 2.3. -+ -+ * localealias.c (alias_compare): -+ Peter Miller reported that tolower in some systems is -+ even dumber than I thought. Protect call by `isupper'. -+ -+Fri Oct 27 22:22:51 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (libdir, includedir): New variables. -+ (install-src): Install libintl.a and libintl.h in correct dirs. -+ -+Fri Oct 27 22:07:29 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (SOURCES): Fix typo: intrl.compat.c -> intl-compat.c. -+ -+ * po2tbl.sed.in: Patch for buggy SEDs by Christian von Roques. -+ -+ * localealias.c: -+ Fix typo and superflous test. Reported by Christian von Roques. -+ -+Fri Oct 6 11:52:05 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (_nl_find_domain): -+ Correct some remainder from the pre-CEN syntax. Now -+ we don't have a constant number of successors anymore. -+ -+Wed Sep 27 21:41:13 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (DISTFILES): Add libintl.h.glibc. -+ -+ * Makefile.in (dist-libc): Add goal for packing sources for glibc. -+ (COMSRCS, COMHDRS): Splitted to separate sources shared with glibc. -+ -+ * loadmsgcat.c: Forget to continue #if line. -+ -+ * localealias.c: -+ [_LIBC]: Rename strcasecmp to __strcasecmp to keep ANSI C name -+ space clean. -+ -+ * dcgettext.c, finddomain.c: Better comment to last change. -+ -+ * loadmsgcat.c: -+ [_LIBC]: Rename fstat, open, close, read, mmap, and munmap to -+ __fstat, __open, __close, __read, __mmap, and __munmap resp -+ to keep ANSI C name space clean. -+ -+ * finddomain.c: -+ [_LIBC]: Rename stpcpy to __stpcpy to keep ANSI C name space clean. -+ -+ * dcgettext.c: -+ [_LIBC]: Rename getced and stpcpy to __getcwd and __stpcpy resp to -+ keep ANSI C name space clean. -+ -+ * libgettext.h: -+ Include sys/types.h for those old SysV systems out there. -+ Reported by Francesco Potorti`. -+ -+ * loadmsgcat.c (use_mmap): Define if compiled for glibc. -+ -+ * bindtextdom.c: Include all those standard headers -+ unconditionally if _LIBC is defined. -+ -+ * finddomain.c: Fix 2 times defiend -> defined. -+ -+ * textdomain.c: Include libintl.h instead of libgettext.h when -+ compiling for glibc. Include all those standard headers -+ unconditionally if _LIBC is defined. -+ -+ * localealias.c, loadmsgcat.c: Prepare to be compiled in glibc. -+ -+ * gettext.c: -+ Include libintl.h instead of libgettext.h when compiling for glibc. -+ Get NULL from stddef.h if we compile for glibc. -+ -+ * finddomain.c: Include libintl.h instead of libgettext.h when -+ compiling for glibc. Include all those standard headers -+ unconditionally if _LIBC is defined. -+ -+ * dcgettext.c: Include all those standard headers unconditionally -+ if _LIBC is defined. -+ -+ * dgettext.c: If compiled in glibc include libintl.h instead of -+ libgettext.h. -+ (locale.h): Don't rely on HAVE_LOCALE_H when compiling for glibc. -+ -+ * dcgettext.c: If compiled in glibc include libintl.h instead of -+ libgettext.h. -+ (getcwd): Don't rely on HAVE_GETCWD when compiling for glibc. -+ -+ * bindtextdom.c: -+ If compiled in glibc include libintl.h instead of libgettext.h. -+ -+Mon Sep 25 22:23:06 1995 Ulrich Drepper <drepper@myware> -+ -+ * localealias.c (_nl_expand_alias): Don't call bsearch if NMAP <= 0. -+ Reported by Marcus Daniels. -+ -+ * cat-compat.c (bindtextdomain): -+ String used in putenv must not be recycled. -+ Reported by Marcus Daniels. -+ -+ * libgettext.h (__USE_GNU_GETTEXT): -+ Additional symbol to signal that we use GNU gettext -+ library. -+ -+ * cat-compat.c (bindtextdomain): -+ Fix bug with the strange stpcpy replacement. -+ Reported by Nelson Beebe. -+ -+Sat Sep 23 08:23:51 1995 Ulrich Drepper <drepper@myware> -+ -+ * cat-compat.c: Include <string.h> for stpcpy prototype. -+ -+ * localealias.c (read_alias_file): -+ While expand strdup code temporary variable `cp' hided -+ higher level variable with same name. Rename to `tp'. -+ -+ * textdomain.c (textdomain): -+ Avoid warning by using temporary variable in strdup code. -+ -+ * finddomain.c (_nl_find_domain): Remove unused variable `application'. -+ -+Thu Sep 21 15:51:44 1995 Ulrich Drepper <drepper@myware> -+ -+ * localealias.c (alias_compare): -+ Use strcasecmp() only if available. Else use -+ implementation in place. -+ -+ * intl-compat.c: -+ Wrapper functions now call *__ functions instead of __*. -+ -+ * libgettext.h: Declare prototypes for *__ functions instead for __*. -+ -+ * cat-compat.c, loadmsgcat.c: -+ Don't use xmalloc, xstrdup, and stpcpy. These functions are not part -+ of the standard libc and so prevent libintl.a from being used -+ standalone. -+ -+ * bindtextdom.c: -+ Don't use xmalloc, xstrdup, and stpcpy. These functions are not part -+ of the standard libc and so prevent libintl.a from being used -+ standalone. -+ Rename to bindtextdomain__ if not used in GNU C Library. -+ -+ * dgettext.c: -+ Rename function to dgettext__ if not used in GNU C Library. -+ -+ * gettext.c: -+ Don't use xmalloc, xstrdup, and stpcpy. These functions are not part -+ of the standard libc and so prevent libintl.a from being used -+ standalone. -+ Functions now called gettext__ if not used in GNU C Library. -+ -+ * dcgettext.c, localealias.c, textdomain.c, finddomain.c: -+ Don't use xmalloc, xstrdup, and stpcpy. These functions are not part -+ of the standard libc and so prevent libintl.a from being used -+ standalone. -+ -+Sun Sep 17 23:14:49 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c: Correct some bugs in handling of CEN standard -+ locale definitions. -+ -+Thu Sep 7 01:49:28 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c: Implement CEN syntax. -+ -+ * gettextP.h (loaded_domain): Extend number of successors to 31. -+ -+Sat Aug 19 19:25:29 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (aliaspath): Remove path to X11 locale dir. -+ -+ * Makefile.in: Make install-src depend on install. This helps -+ gettext to install the sources and other packages can use the -+ install goal. -+ -+Sat Aug 19 15:19:33 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (uninstall): Remove stuff installed by install-src. -+ -+Tue Aug 15 13:13:53 1995 Ulrich Drepper <drepper@myware> -+ -+ * VERSION.in: Initial revision. -+ -+ * Makefile.in (DISTFILES): -+ Add VERSION file. This is not necessary for gettext, but -+ for other packages using this library. -+ -+Tue Aug 15 06:16:44 1995 Ulrich Drepper <drepper@myware> -+ -+ * gettextP.h (_nl_find_domain): -+ New prototype after changing search strategy. -+ -+ * finddomain.c (_nl_find_domain): -+ We now try only to find a specified catalog. Fall back to other -+ catalogs listed in the locale list is now done in __dcgettext. -+ -+ * dcgettext.c (__dcgettext): -+ Now we provide message fall back even to different languages. -+ I.e. if a message is not available in one language all the other -+ in the locale list a tried. Formerly fall back was only possible -+ within one language. Implemented by moving one loop from -+ _nl_find_domain to here. -+ -+Mon Aug 14 23:45:50 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (gettextsrcdir): -+ Directory where source of GNU gettext library are made -+ available. -+ (INSTALL, INSTALL_DATA): Programs used for installing sources. -+ (gettext-src): New. Rule to install GNU gettext sources for use in -+ gettextize shell script. -+ -+Sun Aug 13 14:40:48 1995 Ulrich Drepper <drepper@myware> -+ -+ * loadmsgcat.c (_nl_load_domain): -+ Use mmap for loading only when munmap function is -+ also available. -+ -+ * Makefile.in (install): Depend on `all' goal. -+ -+Wed Aug 9 11:04:33 1995 Ulrich Drepper <drepper@myware> -+ -+ * localealias.c (read_alias_file): -+ Do not overwrite '\n' when terminating alias value string. -+ -+ * localealias.c (read_alias_file): -+ Handle long lines. Ignore the rest not fitting in -+ the buffer after the initial `fgets' call. -+ -+Wed Aug 9 00:54:29 1995 Ulrich Drepper <drepper@myware> -+ -+ * gettextP.h (_nl_load_domain): -+ Add prototype, replacing prototype for _nl_load_msg_cat. -+ -+ * finddomain.c (_nl_find_domain): -+ Remove unneeded variable filename and filename_len. -+ (expand_alias): Remove prototype because functions does not -+ exist anymore. -+ -+ * localealias.c (read_alias_file): -+ Change type of fname_len parameter to int. -+ (xmalloc): Add prototype. -+ -+ * loadmsgcat.c: Better prototypes for xmalloc. -+ -+Tue Aug 8 22:30:39 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (_nl_find_domain): -+ Allow alias name to be constructed from the four components. -+ -+ * Makefile.in (aliaspath): New variable. Set to preliminary value. -+ (SOURCES): Add localealias.c. -+ (OBJECTS): Add localealias.o. -+ -+ * gettextP.h: Add prototype for _nl_expand_alias. -+ -+ * finddomain.c: Aliasing handled in intl/localealias.c. -+ -+ * localealias.c: Aliasing for locale names. -+ -+ * bindtextdom.c: Better prototypes for xmalloc and xstrdup. -+ -+Mon Aug 7 23:47:42 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (DISTFILES): gettext.perl is now found in misc/. -+ -+ * cat-compat.c (bindtextdomain): -+ Correct implementation. dirname parameter was not used. -+ Reported by Marcus Daniels. -+ -+ * gettextP.h (loaded_domain): -+ New fields `successor' and `decided' for oo, lazy -+ message handling implementation. -+ -+ * dcgettext.c: -+ Adopt for oo, lazy message handliing. -+ Now we can inherit translations from less specific locales. -+ (find_msg): New function. -+ -+ * loadmsgcat.c, finddomain.c: -+ Complete rewrite. Implement oo, lazy message handling :-). -+ We now have an additional environment variable `LANGUAGE' with -+ a higher priority than LC_ALL for the LC_MESSAGE locale. -+ Here we can set a colon separated list of specifications each -+ of the form `language[_territory[.codeset]][@modifier]'. -+ -+Sat Aug 5 09:55:42 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (unistd.h): -+ Include to get _PC_PATH_MAX defined on system having it. -+ -+Fri Aug 4 22:42:00 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (stpcpy): Include prototype. -+ -+ * Makefile.in (dist): Remove `copying instead' message. -+ -+Wed Aug 2 18:52:03 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (ID, TAGS): Do not use $^. -+ -+Tue Aug 1 20:07:11 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (TAGS, ID): Use $^ as command argument. -+ (TAGS): Give etags -o option t write to current directory, -+ not $(srcdir). -+ (ID): Use $(srcdir) instead os $(top_srcdir)/src. -+ (distclean): Remove ID. -+ -+Sun Jul 30 11:51:46 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (gnulocaledir): -+ New variable, always using share/ for data directory. -+ (DEFS): Add GNULOCALEDIR, used in finddomain.c. -+ -+ * finddomain.c (_nl_default_dirname): -+ Set to GNULOCALEDIR, because it always has to point -+ to the directory where GNU gettext Library writes it to. -+ -+ * intl-compat.c (textdomain, bindtextdomain): -+ Undefine macros before function definition. -+ -+Sat Jul 22 01:10:02 1995 Ulrich Drepper <drepper@myware> -+ -+ * libgettext.h (_LIBINTL_H): -+ Protect definition in case where this file is included as -+ libgettext.h on Solaris machines. Add comment about this. -+ -+Wed Jul 19 02:36:42 1995 Ulrich Drepper <drepper@myware> -+ -+ * intl-compat.c (textdomain): Correct typo. -+ -+Wed Jul 19 01:51:35 1995 Ulrich Drepper <drepper@myware> -+ -+ * dcgettext.c (dcgettext): Function now called __dcgettext. -+ -+ * dgettext.c (dgettext): Now called __dgettext and calls -+ __dcgettext. -+ -+ * gettext.c (gettext): -+ Function now called __gettext and calls __dgettext. -+ -+ * textdomain.c (textdomain): Function now called __textdomain. -+ -+ * bindtextdom.c (bindtextdomain): Function now called -+ __bindtextdomain. -+ -+ * intl-compat.c: Initial revision. -+ -+ * Makefile.in (SOURCES): Add intl-compat.c. -+ (OBJECTS): We always compile the GNU gettext library functions. -+ OBJECTS contains all objects but cat-compat.o, ../po/cat-if-tbl.o, -+ and intl-compat.o. -+ (GETTOBJS): Contains now only intl-compat.o. -+ -+ * libgettext.h: -+ Re-include protection matches dualistic character of libgettext.h. -+ For all functions in GNU gettext library define __ counter part. -+ -+ * finddomain.c (strchr): Define as index if not found in C library. -+ (_nl_find_domain): For relative paths paste / in between. -+ -+Tue Jul 18 16:37:45 1995 Ulrich Drepper <drepper@myware> -+ -+ * loadmsgcat.c, finddomain.c: Add inclusion of sys/types.h. -+ -+ * xopen-msg.sed: Fix bug with `msgstr ""' lines. -+ A little bit better comments. -+ -+Tue Jul 18 01:18:27 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in: -+ po-mode.el, makelinks, combine-sh are now found in ../misc. -+ -+ * po-mode.el, makelinks, combine-sh, elisp-comp: -+ Moved to ../misc/. -+ -+ * libgettext.h, gettextP.h, gettext.h: Uniform test for __STDC__. -+ -+Sun Jul 16 22:33:02 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (INSTALL, INSTALL_DATA): New variables. -+ (install-data, uninstall): Install/uninstall .elc file. -+ -+ * po-mode.el (Installation comment): -+ Add .pox as possible extension of .po files. -+ -+Sun Jul 16 13:23:27 1995 Ulrich Drepper <drepper@myware> -+ -+ * elisp-comp: Complete new version by Franc,ois: This does not -+ fail when not compiling in the source directory. -+ -+Sun Jul 16 00:12:17 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (../po/cat-id-tbl.o): -+ Use $(MAKE) instead of make for recursive make. -+ -+ * Makefile.in (.el.elc): Use $(SHELL) instead of /bin/sh. -+ (install-exec): Add missing dummy goal. -+ (install-data, uninstall): @ in multi-line shell command at -+ beginning, not in front of echo. Reported by Eric Backus. -+ -+Sat Jul 15 00:21:28 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (DISTFILES): -+ Rename libgettext.perl to gettext.perl to fit in 14 chars -+ file systems. -+ -+ * gettext.perl: -+ Rename to gettext.perl to fit in 14 chars file systems. -+ -+Thu Jul 13 23:17:20 1995 Ulrich Drepper <drepper@myware> -+ -+ * cat-compat.c: If !STDC_HEADERS try to include malloc.h. -+ -+Thu Jul 13 20:55:02 1995 Ulrich Drepper <drepper@myware> -+ -+ * po2tbl.sed.in: Pretty printing. -+ -+ * linux-msg.sed, xopen-msg.sed: -+ Correct bugs with handling substitute flags in branches. -+ -+ * hash-string.h (hash_string): -+ Old K&R compilers don't under stand `unsigned char'. -+ -+ * gettext.h (nls_uint32): -+ Some old K&R compilers (eg HP) don't understand `unsigned int'. -+ -+ * cat-compat.c (msg_to_cat_id): De-ANSI-fy prototypes. -+ -+Thu Jul 13 01:34:33 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (ELCFILES): New variable. -+ (DISTFILES): Add elisp-comp. -+ Add implicit rule for .el -> .elc compilation. -+ (install-data): install $ELCFILES -+ (clean): renamed po-to-tbl and po-to-msg to po2tbl and po2msg resp. -+ -+ * elisp-comp: Initial revision -+ -+Wed Jul 12 16:14:52 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in: -+ cat-id-tbl.c is now found in po/. This enables us to use an identical -+ intl/ directory in all packages. -+ -+ * dcgettext.c (dcgettext): hashing does not work for table size <= 2. -+ -+ * textdomain.c: fix typo (#if def -> #if defined) -+ -+Tue Jul 11 18:44:43 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (stamp-cat-id): use top_srcdir to address source files -+ (DISTFILES,distclean): move tupdate.perl to src/ -+ -+ * po-to-tbl.sed.in: -+ add additional jump to clear change flag to recognize multiline strings -+ -+Tue Jul 11 01:32:50 1995 Ulrich Drepper <drepper@myware> -+ -+ * textdomain.c: Protect inclusion of stdlib.h and string.h. -+ -+ * loadmsgcat.c: Protect inclusion of stdlib.h. -+ -+ * libgettext.h: Protect inclusion of locale.h. -+ Allow use in C++ programs. -+ Define NULL is not happened already. -+ -+ * Makefile.in (DISTFILES): ship po-to-tbl.sed.in instead of -+ po-to-tbl.sed. -+ (distclean): remove po-to-tbl.sed and tupdate.perl. -+ -+ * tupdate.perl.in: Substitute Perl path even in exec line. -+ Don't include entries without translation from old .po file. -+ -+Tue Jul 4 00:41:51 1995 Ulrich Drepper <drepper@myware> -+ -+ * tupdate.perl.in: use "Updated: " in msgid "". -+ -+ * cat-compat.c: Fix typo (LOCALDIR -> LOCALEDIR). -+ Define getenv if !__STDC__. -+ -+ * bindtextdom.c: Protect stdlib.h and string.h inclusion. -+ Define free if !__STDC__. -+ -+ * finddomain.c: Change DEF_MSG_DOM_DIR to LOCALEDIR. -+ Define free if !__STDC__. -+ -+ * cat-compat.c: Change DEF_MSG_DOM_DIR to LOCALEDIR. -+ -+Mon Jul 3 23:56:30 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in: Use LOCALEDIR instead of DEF_MSG_DOM_DIR. -+ Remove unneeded $(srcdir) from Makefile.in dependency. -+ -+ * makelinks: Add copyright and short description. -+ -+ * po-mode.el: Last version for 0.7. -+ -+ * tupdate.perl.in: Fix die message. -+ -+ * dcgettext.c: Protect include of string.h. -+ -+ * gettext.c: Protect include of stdlib.h and further tries to get NULL. -+ -+ * finddomain.c: Some corrections in includes. -+ -+ * Makefile.in (INCLUDES): Prune list correct path to Makefile.in. -+ -+ * po-to-tbl.sed: Adopt for new .po file format. -+ -+ * linux-msg.sed, xopen-msg.sed: Adopt for new .po file format. -+ -+Sun Jul 2 23:55:03 1995 Ulrich Drepper <drepper@myware> -+ -+ * tupdate.perl.in: Complete rewrite for new .po file format. -+ -+Sun Jul 2 02:06:50 1995 Ulrich Drepper <drepper@myware> -+ -+ * First official release. This directory contains all the code -+ needed to internationalize own packages. It provides functions -+ which allow to use the X/Open catgets function with an interface -+ like the Uniforum gettext function. For system which does not -+ have neither of those a complete implementation is provided. -diff -urP gnome-vfs-1.0.orig/intl/Makefile.in gnome-vfs-1.0/intl/Makefile.in ---- gnome-vfs-1.0.orig/intl/Makefile.in Wed Dec 31 19:00:00 1969 -+++ gnome-vfs-1.0/intl/Makefile.in Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,214 @@ -+# Makefile for directory with message catalog handling in GNU NLS Utilities. -+# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+# -+# This program 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 General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+PACKAGE = @PACKAGE@ -+VERSION = @VERSION@ -+ -+SHELL = /bin/sh -+ -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+top_builddir = .. -+VPATH = @srcdir@ -+ -+prefix = @prefix@ -+exec_prefix = @exec_prefix@ -+transform = @program_transform_name@ -+libdir = $(exec_prefix)/lib -+includedir = $(prefix)/include -+datadir = $(prefix)/@DATADIRNAME@ -+localedir = $(datadir)/locale -+gnulocaledir = $(prefix)/share/locale -+gettextsrcdir = @datadir@/gettext/intl -+aliaspath = $(localedir):. -+subdir = intl -+ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+MKINSTALLDIRS = @MKINSTALLDIRS@ -+ -+l = @l@ -+ -+AR = ar -+CC = @CC@ -+LIBTOOL = @LIBTOOL@ -+RANLIB = @RANLIB@ -+ -+DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \ -+-DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@ -+CPPFLAGS = @CPPFLAGS@ -+CFLAGS = @CFLAGS@ -+LDFLAGS = @LDFLAGS@ -+ -+COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) -+ -+HEADERS = $(COMHDRS) libgettext.h loadinfo.h -+COMHDRS = gettext.h gettextP.h hash-string.h -+SOURCES = $(COMSRCS) intl-compat.c cat-compat.c -+COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \ -+finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \ -+explodename.c -+OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \ -+finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \ -+explodename.$lo -+CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo -+GETTOBJS = intl-compat.$lo -+DISTFILES.common = ChangeLog Makefile.in linux-msg.sed po2tbl.sed.in \ -+xopen-msg.sed $(HEADERS) $(SOURCES) -+DISTFILES.normal = VERSION -+DISTFILES.gettext = libintl.glibc intlh.inst.in -+ -+.SUFFIXES: -+.SUFFIXES: .c .o .lo -+.c.o: -+ $(COMPILE) $< -+.c.lo: -+ $(LIBTOOL) --mode=compile $(COMPILE) $< -+ -+INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib -+ -+all: all-@USE_INCLUDED_LIBINTL@ -+ -+all-yes: libintl.$la intlh.inst -+all-no: -+ -+libintl.a: $(OBJECTS) -+ rm -f $@ -+ $(AR) cru $@ $(OBJECTS) -+ $(RANLIB) $@ -+ -+libintl.la: $(OBJECTS) -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \ -+ -version-info 1:0 -rpath $(libdir) -+ -+../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot -+ cd ../po && $(MAKE) cat-id-tbl.$lo -+ -+check: all -+ -+# This installation goal is only used in GNU gettext. Packages which -+# only use the library should use install instead. -+ -+# We must not install the libintl.h/libintl.a files if we are on a -+# system which has the gettext() function in its C library or in a -+# separate library or use the catgets interface. A special case is -+# where configure found a previously installed GNU gettext library. -+# If you want to use the one which comes with this version of the -+# package, you have to use `configure --with-included-gettext'. -+install: install-exec install-data -+install-exec: all -+ if test "$(PACKAGE)" = "gettext" \ -+ && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ -+ if test -r $(MKINSTALLDIRS); then \ -+ $(MKINSTALLDIRS) $(libdir) $(includedir); \ -+ else \ -+ $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \ -+ fi; \ -+ $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \ -+ $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \ -+ else \ -+ : ; \ -+ fi -+install-data: all -+ if test "$(PACKAGE)" = "gettext"; then \ -+ if test -r $(MKINSTALLDIRS); then \ -+ $(MKINSTALLDIRS) $(gettextsrcdir); \ -+ else \ -+ $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \ -+ fi; \ -+ $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \ -+ dists="$(DISTFILES.common)"; \ -+ for file in $$dists; do \ -+ $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \ -+ done; \ -+ else \ -+ : ; \ -+ fi -+ -+# Define this as empty until I found a useful application. -+installcheck: -+ -+uninstall: -+ dists="$(DISTFILES.common)"; \ -+ for file in $$dists; do \ -+ rm -f $(gettextsrcdir)/$$file; \ -+ done -+ -+info dvi: -+ -+$(OBJECTS): ../config.h libgettext.h -+bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h -+dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h -+ -+tags: TAGS -+ -+TAGS: $(HEADERS) $(SOURCES) -+ here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES) -+ -+id: ID -+ -+ID: $(HEADERS) $(SOURCES) -+ here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES) -+ -+ -+mostlyclean: -+ rm -f *.a *.o *.lo core core.* -+ -+clean: mostlyclean -+ -+distclean: clean -+ rm -f Makefile ID TAGS po2msg.sed po2tbl.sed -+ -+maintainer-clean: distclean -+ @echo "This command is intended for maintainers to use;" -+ @echo "it deletes files that may require special tools to rebuild." -+ -+ -+# GNU gettext needs not contain the file `VERSION' but contains some -+# other files which should not be distributed in other packages. -+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) -+dist distdir: Makefile $(DISTFILES) -+ if test "$(PACKAGE)" = gettext; then \ -+ additional="$(DISTFILES.gettext)"; \ -+ else \ -+ additional="$(DISTFILES.normal)"; \ -+ fi; \ -+ for file in $(DISTFILES.common) $$additional; do \ -+ ln $(srcdir)/$$file $(distdir) 2> /dev/null \ -+ || cp -p $(srcdir)/$$file $(distdir); \ -+ done -+ -+dist-libc: -+ tar zcvf intl-glibc.tar.gz $(COMSRCS) $(COMHDRS) libintl.h.glibc -+ -+Makefile: Makefile.in ../config.status -+ cd .. \ -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ -+# The dependency for intlh.inst is different in gettext and all other -+# packages. Because we cannot you GNU make features we have to solve -+# the problem while rewriting Makefile.in. -+@GT_YES@intlh.inst: intlh.inst.in ../config.status -+@GT_YES@ cd .. \ -+@GT_YES@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \ -+@GT_YES@ $(SHELL) ./config.status -+@GT_NO@.PHONY: intlh.inst -+@GT_NO@intlh.inst: -+ -+# Tell versions [3.59,3.63) of GNU make not to export all variables. -+# Otherwise a system limit (for SysV at least) may be exceeded. -+.NOEXPORT: -diff -urP gnome-vfs-1.0.orig/intl/VERSION gnome-vfs-1.0/intl/VERSION ---- gnome-vfs-1.0.orig/intl/VERSION Wed Dec 31 19:00:00 1969 -+++ gnome-vfs-1.0/intl/VERSION Fri Mar 16 14:46:14 2001 -@@ -0,0 +1 @@ -+GNU gettext library from gettext-0.10.35 -diff -urP gnome-vfs-1.0.orig/intl/bindtextdom.c gnome-vfs-1.0/intl/bindtextdom.c ---- gnome-vfs-1.0.orig/intl/bindtextdom.c Wed Dec 31 19:00:00 1969 -+++ gnome-vfs-1.0/intl/bindtextdom.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,203 @@ -+/* Implementation of the bindtextdomain(3) function -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#else -+# ifdef HAVE_MALLOC_H -+# include <malloc.h> -+# else -+void free (); -+# endif -+#endif -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# include <string.h> -+#else -+# include <strings.h> -+# ifndef memcpy -+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -+# endif -+#endif -+ -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+#include "gettext.h" -+#include "gettextP.h" -+ -+/* @@ end of prolog @@ */ -+ -+/* Contains the default location of the message catalogs. */ -+extern const char _nl_default_dirname[]; -+ -+/* List with bindings of specific domains. */ -+extern struct binding *_nl_domain_bindings; -+ -+ -+/* Names for the libintl functions are a problem. They must not clash -+ with existing names and they should follow ANSI C. But this source -+ code is also used in GNU C Library where the names have a __ -+ prefix. So we have to make a difference here. */ -+#ifdef _LIBC -+# define BINDTEXTDOMAIN __bindtextdomain -+# ifndef strdup -+# define strdup(str) __strdup (str) -+# endif -+#else -+# define BINDTEXTDOMAIN bindtextdomain__ -+#endif -+ -+/* Specify that the DOMAINNAME message catalog will be found -+ in DIRNAME rather than in the system locale data base. */ -+char * -+BINDTEXTDOMAIN (domainname, dirname) -+ const char *domainname; -+ const char *dirname; -+{ -+ struct binding *binding; -+ -+ /* Some sanity checks. */ -+ if (domainname == NULL || domainname[0] == '\0') -+ return NULL; -+ -+ for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) -+ { -+ int compare = strcmp (domainname, binding->domainname); -+ if (compare == 0) -+ /* We found it! */ -+ break; -+ if (compare < 0) -+ { -+ /* It is not in the list. */ -+ binding = NULL; -+ break; -+ } -+ } -+ -+ if (dirname == NULL) -+ /* The current binding has be to returned. */ -+ return binding == NULL ? (char *) _nl_default_dirname : binding->dirname; -+ -+ if (binding != NULL) -+ { -+ /* The domain is already bound. If the new value and the old -+ one are equal we simply do nothing. Otherwise replace the -+ old binding. */ -+ if (strcmp (dirname, binding->dirname) != 0) -+ { -+ char *new_dirname; -+ -+ if (strcmp (dirname, _nl_default_dirname) == 0) -+ new_dirname = (char *) _nl_default_dirname; -+ else -+ { -+#if defined _LIBC || defined HAVE_STRDUP -+ new_dirname = strdup (dirname); -+ if (new_dirname == NULL) -+ return NULL; -+#else -+ size_t len = strlen (dirname) + 1; -+ new_dirname = (char *) malloc (len); -+ if (new_dirname == NULL) -+ return NULL; -+ -+ memcpy (new_dirname, dirname, len); -+#endif -+ } -+ -+ if (binding->dirname != _nl_default_dirname) -+ free (binding->dirname); -+ -+ binding->dirname = new_dirname; -+ } -+ } -+ else -+ { -+ /* We have to create a new binding. */ -+#if !defined _LIBC && !defined HAVE_STRDUP -+ size_t len; -+#endif -+ struct binding *new_binding = -+ (struct binding *) malloc (sizeof (*new_binding)); -+ -+ if (new_binding == NULL) -+ return NULL; -+ -+#if defined _LIBC || defined HAVE_STRDUP -+ new_binding->domainname = strdup (domainname); -+ if (new_binding->domainname == NULL) -+ return NULL; -+#else -+ len = strlen (domainname) + 1; -+ new_binding->domainname = (char *) malloc (len); -+ if (new_binding->domainname == NULL) -+ return NULL; -+ memcpy (new_binding->domainname, domainname, len); -+#endif -+ -+ if (strcmp (dirname, _nl_default_dirname) == 0) -+ new_binding->dirname = (char *) _nl_default_dirname; -+ else -+ { -+#if defined _LIBC || defined HAVE_STRDUP -+ new_binding->dirname = strdup (dirname); -+ if (new_binding->dirname == NULL) -+ return NULL; -+#else -+ len = strlen (dirname) + 1; -+ new_binding->dirname = (char *) malloc (len); -+ if (new_binding->dirname == NULL) -+ return NULL; -+ memcpy (new_binding->dirname, dirname, len); -+#endif -+ } -+ -+ /* Now enqueue it. */ -+ if (_nl_domain_bindings == NULL -+ || strcmp (domainname, _nl_domain_bindings->domainname) < 0) -+ { -+ new_binding->next = _nl_domain_bindings; -+ _nl_domain_bindings = new_binding; -+ } -+ else -+ { -+ binding = _nl_domain_bindings; -+ while (binding->next != NULL -+ && strcmp (domainname, binding->next->domainname) > 0) -+ binding = binding->next; -+ -+ new_binding->next = binding->next; -+ binding->next = new_binding; -+ } -+ -+ binding = new_binding; -+ } -+ -+ return binding->dirname; -+} -+ -+#ifdef _LIBC -+/* Alias for function name in GNU C Library. */ -+weak_alias (__bindtextdomain, bindtextdomain); -+#endif -diff -urP gnome-vfs-1.0.orig/intl/cat-compat.c gnome-vfs-1.0/intl/cat-compat.c ---- gnome-vfs-1.0.orig/intl/cat-compat.c Wed Dec 31 19:00:00 1969 -+++ gnome-vfs-1.0/intl/cat-compat.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,262 @@ -+/* Compatibility code for gettext-using-catgets interface. -+ Copyright (C) 1995, 1997 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <stdio.h> -+ -+#ifdef STDC_HEADERS -+# include <stdlib.h> -+# include <string.h> -+#else -+char *getenv (); -+# ifdef HAVE_MALLOC_H -+# include <malloc.h> -+# endif -+#endif -+ -+#ifdef HAVE_NL_TYPES_H -+# include <nl_types.h> -+#endif -+ -+#include "libgettext.h" -+ -+/* @@ end of prolog @@ */ -+ -+/* XPG3 defines the result of `setlocale (category, NULL)' as: -+ ``Directs `setlocale()' to query `category' and return the current -+ setting of `local'.'' -+ However it does not specify the exact format. And even worse: POSIX -+ defines this not at all. So we can use this feature only on selected -+ system (e.g. those using GNU C Library). */ -+#ifdef _LIBC -+# define HAVE_LOCALE_NULL -+#endif -+ -+/* The catalog descriptor. */ -+static nl_catd catalog = (nl_catd) -1; -+ -+/* Name of the default catalog. */ -+static const char default_catalog_name[] = "messages"; -+ -+/* Name of currently used catalog. */ -+static const char *catalog_name = default_catalog_name; -+ -+/* Get ID for given string. If not found return -1. */ -+static int msg_to_cat_id PARAMS ((const char *msg)); -+ -+/* Substitution for systems lacking this function in their C library. */ -+#if !_LIBC && !HAVE_STPCPY -+static char *stpcpy PARAMS ((char *dest, const char *src)); -+#endif -+ -+ -+/* Set currently used domain/catalog. */ -+char * -+textdomain (domainname) -+ const char *domainname; -+{ -+ nl_catd new_catalog; -+ char *new_name; -+ size_t new_name_len; -+ char *lang; -+ -+#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES \ -+ && defined HAVE_LOCALE_NULL -+ lang = setlocale (LC_MESSAGES, NULL); -+#else -+ lang = getenv ("LC_ALL"); -+ if (lang == NULL || lang[0] == '\0') -+ { -+ lang = getenv ("LC_MESSAGES"); -+ if (lang == NULL || lang[0] == '\0') -+ lang = getenv ("LANG"); -+ } -+#endif -+ if (lang == NULL || lang[0] == '\0') -+ lang = "C"; -+ -+ /* See whether name of currently used domain is asked. */ -+ if (domainname == NULL) -+ return (char *) catalog_name; -+ -+ if (domainname[0] == '\0') -+ domainname = default_catalog_name; -+ -+ /* Compute length of added path element. */ -+ new_name_len = sizeof (LOCALEDIR) - 1 + 1 + strlen (lang) -+ + sizeof ("/LC_MESSAGES/") - 1 + sizeof (PACKAGE) - 1 -+ + sizeof (".cat"); -+ -+ new_name = (char *) malloc (new_name_len); -+ if (new_name == NULL) -+ return NULL; -+ -+ strcpy (new_name, PACKAGE); -+ new_catalog = catopen (new_name, 0); -+ -+ if (new_catalog == (nl_catd) -1) -+ { -+ /* NLSPATH search didn't work, try absolute path */ -+ sprintf (new_name, "%s/%s/LC_MESSAGES/%s.cat", LOCALEDIR, lang, -+ PACKAGE); -+ new_catalog = catopen (new_name, 0); -+ -+ if (new_catalog == (nl_catd) -1) -+ { -+ free (new_name); -+ return (char *) catalog_name; -+ } -+ } -+ -+ /* Close old catalog. */ -+ if (catalog != (nl_catd) -1) -+ catclose (catalog); -+ if (catalog_name != default_catalog_name) -+ free ((char *) catalog_name); -+ -+ catalog = new_catalog; -+ catalog_name = new_name; -+ -+ return (char *) catalog_name; -+} -+ -+char * -+bindtextdomain (domainname, dirname) -+ const char *domainname; -+ const char *dirname; -+{ -+#if HAVE_SETENV || HAVE_PUTENV -+ char *old_val, *new_val, *cp; -+ size_t new_val_len; -+ -+ /* This does not make much sense here but to be compatible do it. */ -+ if (domainname == NULL) -+ return NULL; -+ -+ /* Compute length of added path element. If we use setenv we don't need -+ the first byts for NLSPATH=, but why complicate the code for this -+ peanuts. */ -+ new_val_len = sizeof ("NLSPATH=") - 1 + strlen (dirname) -+ + sizeof ("/%L/LC_MESSAGES/%N.cat"); -+ -+ old_val = getenv ("NLSPATH"); -+ if (old_val == NULL || old_val[0] == '\0') -+ { -+ old_val = NULL; -+ new_val_len += 1 + sizeof (LOCALEDIR) - 1 -+ + sizeof ("/%L/LC_MESSAGES/%N.cat"); -+ } -+ else -+ new_val_len += strlen (old_val); -+ -+ new_val = (char *) malloc (new_val_len); -+ if (new_val == NULL) -+ return NULL; -+ -+# if HAVE_SETENV -+ cp = new_val; -+# else -+ cp = stpcpy (new_val, "NLSPATH="); -+# endif -+ -+ cp = stpcpy (cp, dirname); -+ cp = stpcpy (cp, "/%L/LC_MESSAGES/%N.cat:"); -+ -+ if (old_val == NULL) -+ { -+# if __STDC__ -+ stpcpy (cp, LOCALEDIR "/%L/LC_MESSAGES/%N.cat"); -+# else -+ -+ cp = stpcpy (cp, LOCALEDIR); -+ stpcpy (cp, "/%L/LC_MESSAGES/%N.cat"); -+# endif -+ } -+ else -+ stpcpy (cp, old_val); -+ -+# if HAVE_SETENV -+ setenv ("NLSPATH", new_val, 1); -+ free (new_val); -+# else -+ putenv (new_val); -+ /* Do *not* free the environment entry we just entered. It is used -+ from now on. */ -+# endif -+ -+#endif -+ -+ return (char *) domainname; -+} -+ -+#undef gettext -+char * -+gettext (msg) -+ const char *msg; -+{ -+ int msgid; -+ -+ if (msg == NULL || catalog == (nl_catd) -1) -+ return (char *) msg; -+ -+ /* Get the message from the catalog. We always use set number 1. -+ The message ID is computed by the function `msg_to_cat_id' -+ which works on the table generated by `po-to-tbl'. */ -+ msgid = msg_to_cat_id (msg); -+ if (msgid == -1) -+ return (char *) msg; -+ -+ return catgets (catalog, 1, msgid, (char *) msg); -+} -+ -+/* Look through the table `_msg_tbl' which has `_msg_tbl_length' entries -+ for the one equal to msg. If it is found return the ID. In case when -+ the string is not found return -1. */ -+static int -+msg_to_cat_id (msg) -+ const char *msg; -+{ -+ int cnt; -+ -+ for (cnt = 0; cnt < _msg_tbl_length; ++cnt) -+ if (strcmp (msg, _msg_tbl[cnt]._msg) == 0) -+ return _msg_tbl[cnt]._msg_number; -+ -+ return -1; -+} -+ -+ -+/* @@ begin of epilog @@ */ -+ -+/* We don't want libintl.a to depend on any other library. So we -+ avoid the non-standard function stpcpy. In GNU C Library this -+ function is available, though. Also allow the symbol HAVE_STPCPY -+ to be defined. */ -+#if !_LIBC && !HAVE_STPCPY -+static char * -+stpcpy (dest, src) -+ char *dest; -+ const char *src; -+{ -+ while ((*dest++ = *src++) != '\0') -+ /* Do nothing. */ ; -+ return dest - 1; -+} -+#endif -diff -urP gnome-vfs-1.0.orig/intl/dcgettext.c gnome-vfs-1.0/intl/dcgettext.c ---- gnome-vfs-1.0.orig/intl/dcgettext.c Wed Dec 31 19:00:00 1969 -+++ gnome-vfs-1.0/intl/dcgettext.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,624 @@ -+/* Implementation of the dcgettext(3) function. -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <sys/types.h> -+ -+#ifdef __GNUC__ -+# define alloca __builtin_alloca -+# define HAVE_ALLOCA 1 -+#else -+# if defined HAVE_ALLOCA_H || defined _LIBC -+# include <alloca.h> -+# else -+# ifdef _AIX -+ #pragma alloca -+# else -+# ifndef alloca -+char *alloca (); -+# endif -+# endif -+# endif -+#endif -+ -+#include <errno.h> -+#ifndef errno -+extern int errno; -+#endif -+#ifndef __set_errno -+# define __set_errno(val) errno = (val) -+#endif -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#else -+char *getenv (); -+# ifdef HAVE_MALLOC_H -+# include <malloc.h> -+# else -+void free (); -+# endif -+#endif -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# ifndef _GNU_SOURCE -+# define _GNU_SOURCE 1 -+# endif -+# include <string.h> -+#else -+# include <strings.h> -+#endif -+#if !HAVE_STRCHR && !defined _LIBC -+# ifndef strchr -+# define strchr index -+# endif -+#endif -+ -+#if defined HAVE_UNISTD_H || defined _LIBC -+# include <unistd.h> -+#endif -+ -+#include "gettext.h" -+#include "gettextP.h" -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+#include "hash-string.h" -+ -+/* @@ end of prolog @@ */ -+ -+#ifdef _LIBC -+/* Rename the non ANSI C functions. This is required by the standard -+ because some ANSI C functions will require linking with this object -+ file and the name space must not be polluted. */ -+# define getcwd __getcwd -+# ifndef stpcpy -+# define stpcpy __stpcpy -+# endif -+#else -+# if !defined HAVE_GETCWD -+char *getwd (); -+# define getcwd(buf, max) getwd (buf) -+# else -+char *getcwd (); -+# endif -+# ifndef HAVE_STPCPY -+static char *stpcpy PARAMS ((char *dest, const char *src)); -+# endif -+#endif -+ -+/* Amount to increase buffer size by in each try. */ -+#define PATH_INCR 32 -+ -+/* The following is from pathmax.h. */ -+/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define -+ PATH_MAX but might cause redefinition warnings when sys/param.h is -+ later included (as on MORE/BSD 4.3). */ -+#if defined(_POSIX_VERSION) || (defined(HAVE_LIMITS_H) && !defined(__GNUC__)) -+# include <limits.h> -+#endif -+ -+#ifndef _POSIX_PATH_MAX -+# define _POSIX_PATH_MAX 255 -+#endif -+ -+#if !defined(PATH_MAX) && defined(_PC_PATH_MAX) -+# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX)) -+#endif -+ -+/* Don't include sys/param.h if it already has been. */ -+#if defined(HAVE_SYS_PARAM_H) && !defined(PATH_MAX) && !defined(MAXPATHLEN) -+# include <sys/param.h> -+#endif -+ -+#if !defined(PATH_MAX) && defined(MAXPATHLEN) -+# define PATH_MAX MAXPATHLEN -+#endif -+ -+#ifndef PATH_MAX -+# define PATH_MAX _POSIX_PATH_MAX -+#endif -+ -+/* XPG3 defines the result of `setlocale (category, NULL)' as: -+ ``Directs `setlocale()' to query `category' and return the current -+ setting of `local'.'' -+ However it does not specify the exact format. And even worse: POSIX -+ defines this not at all. So we can use this feature only on selected -+ system (e.g. those using GNU C Library). */ -+#ifdef _LIBC -+# define HAVE_LOCALE_NULL -+#endif -+ -+/* Name of the default domain used for gettext(3) prior any call to -+ textdomain(3). The default value for this is "messages". */ -+const char _nl_default_default_domain[] = "messages"; -+ -+/* Value used as the default domain for gettext(3). */ -+const char *_nl_current_default_domain = _nl_default_default_domain; -+ -+/* Contains the default location of the message catalogs. */ -+const char _nl_default_dirname[] = GNULOCALEDIR; -+ -+/* List with bindings of specific domains created by bindtextdomain() -+ calls. */ -+struct binding *_nl_domain_bindings; -+ -+/* Prototypes for local functions. */ -+static char *find_msg PARAMS ((struct loaded_l10nfile *domain_file, -+ const char *msgid)) internal_function; -+static const char *category_to_name PARAMS ((int category)) internal_function; -+static const char *guess_category_value PARAMS ((int category, -+ const char *categoryname)) -+ internal_function; -+ -+ -+/* For those loosing systems which don't have `alloca' we have to add -+ some additional code emulating it. */ -+#ifdef HAVE_ALLOCA -+/* Nothing has to be done. */ -+# define ADD_BLOCK(list, address) /* nothing */ -+# define FREE_BLOCKS(list) /* nothing */ -+#else -+struct block_list -+{ -+ void *address; -+ struct block_list *next; -+}; -+# define ADD_BLOCK(list, addr) \ -+ do { \ -+ struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \ -+ /* If we cannot get a free block we cannot add the new element to \ -+ the list. */ \ -+ if (newp != NULL) { \ -+ newp->address = (addr); \ -+ newp->next = (list); \ -+ (list) = newp; \ -+ } \ -+ } while (0) -+# define FREE_BLOCKS(list) \ -+ do { \ -+ while (list != NULL) { \ -+ struct block_list *old = list; \ -+ list = list->next; \ -+ free (old); \ -+ } \ -+ } while (0) -+# undef alloca -+# define alloca(size) (malloc (size)) -+#endif /* have alloca */ -+ -+ -+/* Names for the libintl functions are a problem. They must not clash -+ with existing names and they should follow ANSI C. But this source -+ code is also used in GNU C Library where the names have a __ -+ prefix. So we have to make a difference here. */ -+#ifdef _LIBC -+# define DCGETTEXT __dcgettext -+#else -+# define DCGETTEXT dcgettext__ -+#endif -+ -+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY -+ locale. */ -+char * -+DCGETTEXT (domainname, msgid, category) -+ const char *domainname; -+ const char *msgid; -+ int category; -+{ -+#ifndef HAVE_ALLOCA -+ struct block_list *block_list = NULL; -+#endif -+ struct loaded_l10nfile *domain; -+ struct binding *binding; -+ const char *categoryname; -+ const char *categoryvalue; -+ char *dirname, *xdomainname; -+ char *single_locale; -+ char *retval; -+ int saved_errno = errno; -+ -+ /* If no real MSGID is given return NULL. */ -+ if (msgid == NULL) -+ return NULL; -+ -+ /* If DOMAINNAME is NULL, we are interested in the default domain. If -+ CATEGORY is not LC_MESSAGES this might not make much sense but the -+ defintion left this undefined. */ -+ if (domainname == NULL) -+ domainname = _nl_current_default_domain; -+ -+ /* First find matching binding. */ -+ for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) -+ { -+ int compare = strcmp (domainname, binding->domainname); -+ if (compare == 0) -+ /* We found it! */ -+ break; -+ if (compare < 0) -+ { -+ /* It is not in the list. */ -+ binding = NULL; -+ break; -+ } -+ } -+ -+ if (binding == NULL) -+ dirname = (char *) _nl_default_dirname; -+ else if (binding->dirname[0] == '/') -+ dirname = binding->dirname; -+ else -+ { -+ /* We have a relative path. Make it absolute now. */ -+ size_t dirname_len = strlen (binding->dirname) + 1; -+ size_t path_max; -+ char *ret; -+ -+ path_max = (unsigned) PATH_MAX; -+ path_max += 2; /* The getcwd docs say to do this. */ -+ -+ dirname = (char *) alloca (path_max + dirname_len); -+ ADD_BLOCK (block_list, dirname); -+ -+ __set_errno (0); -+ while ((ret = getcwd (dirname, path_max)) == NULL && errno == ERANGE) -+ { -+ path_max += PATH_INCR; -+ dirname = (char *) alloca (path_max + dirname_len); -+ ADD_BLOCK (block_list, dirname); -+ __set_errno (0); -+ } -+ -+ if (ret == NULL) -+ { -+ /* We cannot get the current working directory. Don't signal an -+ error but simply return the default string. */ -+ FREE_BLOCKS (block_list); -+ __set_errno (saved_errno); -+ return (char *) msgid; -+ } -+ -+ stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname); -+ } -+ -+ /* Now determine the symbolic name of CATEGORY and its value. */ -+ categoryname = category_to_name (category); -+ categoryvalue = guess_category_value (category, categoryname); -+ -+ xdomainname = (char *) alloca (strlen (categoryname) -+ + strlen (domainname) + 5); -+ ADD_BLOCK (block_list, xdomainname); -+ -+ stpcpy (stpcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"), -+ domainname), -+ ".mo"); -+ -+ /* Creating working area. */ -+ single_locale = (char *) alloca (strlen (categoryvalue) + 1); -+ ADD_BLOCK (block_list, single_locale); -+ -+ -+ /* Search for the given string. This is a loop because we perhaps -+ got an ordered list of languages to consider for th translation. */ -+ while (1) -+ { -+ /* Make CATEGORYVALUE point to the next element of the list. */ -+ while (categoryvalue[0] != '\0' && categoryvalue[0] == ':') -+ ++categoryvalue; -+ if (categoryvalue[0] == '\0') -+ { -+ /* The whole contents of CATEGORYVALUE has been searched but -+ no valid entry has been found. We solve this situation -+ by implicitly appending a "C" entry, i.e. no translation -+ will take place. */ -+ single_locale[0] = 'C'; -+ single_locale[1] = '\0'; -+ } -+ else -+ { -+ char *cp = single_locale; -+ while (categoryvalue[0] != '\0' && categoryvalue[0] != ':') -+ *cp++ = *categoryvalue++; -+ *cp = '\0'; -+ } -+ -+ /* If the current locale value is C (or POSIX) we don't load a -+ domain. Return the MSGID. */ -+ if (strcmp (single_locale, "C") == 0 -+ || strcmp (single_locale, "POSIX") == 0) -+ { -+ FREE_BLOCKS (block_list); -+ __set_errno (saved_errno); -+ return (char *) msgid; -+ } -+ -+ -+ /* Find structure describing the message catalog matching the -+ DOMAINNAME and CATEGORY. */ -+ domain = _nl_find_domain (dirname, single_locale, xdomainname); -+ -+ if (domain != NULL) -+ { -+ retval = find_msg (domain, msgid); -+ -+ if (retval == NULL) -+ { -+ int cnt; -+ -+ for (cnt = 0; domain->successor[cnt] != NULL; ++cnt) -+ { -+ retval = find_msg (domain->successor[cnt], msgid); -+ -+ if (retval != NULL) -+ break; -+ } -+ } -+ -+ if (retval != NULL) -+ { -+ FREE_BLOCKS (block_list); -+ __set_errno (saved_errno); -+ return retval; -+ } -+ } -+ } -+ /* NOTREACHED */ -+} -+ -+#ifdef _LIBC -+/* Alias for function name in GNU C Library. */ -+weak_alias (__dcgettext, dcgettext); -+#endif -+ -+ -+static char * -+internal_function -+find_msg (domain_file, msgid) -+ struct loaded_l10nfile *domain_file; -+ const char *msgid; -+{ -+ size_t top, act, bottom; -+ struct loaded_domain *domain; -+ -+ if (domain_file->decided == 0) -+ _nl_load_domain (domain_file); -+ -+ if (domain_file->data == NULL) -+ return NULL; -+ -+ domain = (struct loaded_domain *) domain_file->data; -+ -+ /* Locate the MSGID and its translation. */ -+ if (domain->hash_size > 2 && domain->hash_tab != NULL) -+ { -+ /* Use the hashing table. */ -+ nls_uint32 len = strlen (msgid); -+ nls_uint32 hash_val = hash_string (msgid); -+ nls_uint32 idx = hash_val % domain->hash_size; -+ nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2)); -+ nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]); -+ -+ if (nstr == 0) -+ /* Hash table entry is empty. */ -+ return NULL; -+ -+ if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len -+ && strcmp (msgid, -+ domain->data + W (domain->must_swap, -+ domain->orig_tab[nstr - 1].offset)) == 0) -+ return (char *) domain->data + W (domain->must_swap, -+ domain->trans_tab[nstr - 1].offset); -+ -+ while (1) -+ { -+ if (idx >= domain->hash_size - incr) -+ idx -= domain->hash_size - incr; -+ else -+ idx += incr; -+ -+ nstr = W (domain->must_swap, domain->hash_tab[idx]); -+ if (nstr == 0) -+ /* Hash table entry is empty. */ -+ return NULL; -+ -+ if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len -+ && strcmp (msgid, -+ domain->data + W (domain->must_swap, -+ domain->orig_tab[nstr - 1].offset)) -+ == 0) -+ return (char *) domain->data -+ + W (domain->must_swap, domain->trans_tab[nstr - 1].offset); -+ } -+ /* NOTREACHED */ -+ } -+ -+ /* Now we try the default method: binary search in the sorted -+ array of messages. */ -+ bottom = 0; -+ top = domain->nstrings; -+ while (bottom < top) -+ { -+ int cmp_val; -+ -+ act = (bottom + top) / 2; -+ cmp_val = strcmp (msgid, domain->data -+ + W (domain->must_swap, -+ domain->orig_tab[act].offset)); -+ if (cmp_val < 0) -+ top = act; -+ else if (cmp_val > 0) -+ bottom = act + 1; -+ else -+ break; -+ } -+ -+ /* If an translation is found return this. */ -+ return bottom >= top ? NULL : (char *) domain->data -+ + W (domain->must_swap, -+ domain->trans_tab[act].offset); -+} -+ -+ -+/* Return string representation of locale CATEGORY. */ -+static const char * -+internal_function -+category_to_name (category) -+ int category; -+{ -+ const char *retval; -+ -+ switch (category) -+ { -+#ifdef LC_COLLATE -+ case LC_COLLATE: -+ retval = "LC_COLLATE"; -+ break; -+#endif -+#ifdef LC_CTYPE -+ case LC_CTYPE: -+ retval = "LC_CTYPE"; -+ break; -+#endif -+#ifdef LC_MONETARY -+ case LC_MONETARY: -+ retval = "LC_MONETARY"; -+ break; -+#endif -+#ifdef LC_NUMERIC -+ case LC_NUMERIC: -+ retval = "LC_NUMERIC"; -+ break; -+#endif -+#ifdef LC_TIME -+ case LC_TIME: -+ retval = "LC_TIME"; -+ break; -+#endif -+#ifdef LC_MESSAGES -+ case LC_MESSAGES: -+ retval = "LC_MESSAGES"; -+ break; -+#endif -+#ifdef LC_RESPONSE -+ case LC_RESPONSE: -+ retval = "LC_RESPONSE"; -+ break; -+#endif -+#ifdef LC_ALL -+ case LC_ALL: -+ /* This might not make sense but is perhaps better than any other -+ value. */ -+ retval = "LC_ALL"; -+ break; -+#endif -+ default: -+ /* If you have a better idea for a default value let me know. */ -+ retval = "LC_XXX"; -+ } -+ -+ return retval; -+} -+ -+/* Guess value of current locale from value of the environment variables. */ -+static const char * -+internal_function -+guess_category_value (category, categoryname) -+ int category; -+ const char *categoryname; -+{ -+ const char *retval; -+ -+ /* The highest priority value is the `LANGUAGE' environment -+ variable. This is a GNU extension. */ -+ retval = getenv ("LANGUAGE"); -+ if (retval != NULL && retval[0] != '\0') -+ return retval; -+ -+ /* `LANGUAGE' is not set. So we have to proceed with the POSIX -+ methods of looking to `LC_ALL', `LC_xxx', and `LANG'. On some -+ systems this can be done by the `setlocale' function itself. */ -+#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL -+ return setlocale (category, NULL); -+#else -+ /* Setting of LC_ALL overwrites all other. */ -+ retval = getenv ("LC_ALL"); -+ if (retval != NULL && retval[0] != '\0') -+ return retval; -+ -+ /* Next comes the name of the desired category. */ -+ retval = getenv (categoryname); -+ if (retval != NULL && retval[0] != '\0') -+ return retval; -+ -+ /* Last possibility is the LANG environment variable. */ -+ retval = getenv ("LANG"); -+ if (retval != NULL && retval[0] != '\0') -+ return retval; -+ -+ /* We use C as the default domain. POSIX says this is implementation -+ defined. */ -+ return "C"; -+#endif -+} -+ -+/* @@ begin of epilog @@ */ -+ -+/* We don't want libintl.a to depend on any other library. So we -+ avoid the non-standard function stpcpy. In GNU C Library this -+ function is available, though. Also allow the symbol HAVE_STPCPY -+ to be defined. */ -+#if !_LIBC && !HAVE_STPCPY -+static char * -+stpcpy (dest, src) -+ char *dest; -+ const char *src; -+{ -+ while ((*dest++ = *src++) != '\0') -+ /* Do nothing. */ ; -+ return dest - 1; -+} -+#endif -+ -+ -+#ifdef _LIBC -+/* If we want to free all resources we have to do some work at -+ program's end. */ -+static void __attribute__ ((unused)) -+free_mem (void) -+{ -+ struct binding *runp; -+ -+ for (runp = _nl_domain_bindings; runp != NULL; runp = runp->next) -+ { -+ free (runp->domainname); -+ if (runp->dirname != _nl_default_dirname) -+ /* Yes, this is a pointer comparison. */ -+ free (runp->dirname); -+ } -+ -+ if (_nl_current_default_domain != _nl_default_default_domain) -+ /* Yes, again a pointer comparison. */ -+ free ((char *) _nl_current_default_domain); -+} -+ -+text_set_element (__libc_subfreeres, free_mem); -+#endif -diff -urP gnome-vfs-1.0.orig/intl/dgettext.c gnome-vfs-1.0/intl/dgettext.c ---- gnome-vfs-1.0.orig/intl/dgettext.c Wed Dec 31 19:00:00 1969 -+++ gnome-vfs-1.0/intl/dgettext.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,59 @@ -+/* Implementation of the dgettext(3) function -+ Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#if defined HAVE_LOCALE_H || defined _LIBC -+# include <locale.h> -+#endif -+ -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+/* Names for the libintl functions are a problem. They must not clash -+ with existing names and they should follow ANSI C. But this source -+ code is also used in GNU C Library where the names have a __ -+ prefix. So we have to make a difference here. */ -+#ifdef _LIBC -+# define DGETTEXT __dgettext -+# define DCGETTEXT __dcgettext -+#else -+# define DGETTEXT dgettext__ -+# define DCGETTEXT dcgettext__ -+#endif -+ -+/* Look up MSGID in the DOMAINNAME message catalog of the current -+ LC_MESSAGES locale. */ -+char * -+DGETTEXT (domainname, msgid) -+ const char *domainname; -+ const char *msgid; -+{ -+ return DCGETTEXT (domainname, msgid, LC_MESSAGES); -+} -+ -+#ifdef _LIBC -+/* Alias for function name in GNU C Library. */ -+weak_alias (__dgettext, dgettext); -+#endif -diff -urP gnome-vfs-1.0.orig/intl/explodename.c gnome-vfs-1.0/intl/explodename.c ---- gnome-vfs-1.0.orig/intl/explodename.c Wed Dec 31 19:00:00 1969 -+++ gnome-vfs-1.0/intl/explodename.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,188 @@ -+/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#endif -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# include <string.h> -+#else -+# include <strings.h> -+#endif -+#include <sys/types.h> -+ -+#include "loadinfo.h" -+ -+/* On some strange systems still no definition of NULL is found. Sigh! */ -+#ifndef NULL -+# if defined __STDC__ && __STDC__ -+# define NULL ((void *) 0) -+# else -+# define NULL 0 -+# endif -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+int -+_nl_explode_name (name, language, modifier, territory, codeset, -+ normalized_codeset, special, sponsor, revision) -+ char *name; -+ const char **language; -+ const char **modifier; -+ const char **territory; -+ const char **codeset; -+ const char **normalized_codeset; -+ const char **special; -+ const char **sponsor; -+ const char **revision; -+{ -+ enum { undecided, xpg, cen } syntax; -+ char *cp; -+ int mask; -+ -+ *modifier = NULL; -+ *territory = NULL; -+ *codeset = NULL; -+ *normalized_codeset = NULL; -+ *special = NULL; -+ *sponsor = NULL; -+ *revision = NULL; -+ -+ /* Now we determine the single parts of the locale name. First -+ look for the language. Termination symbols are `_' and `@' if -+ we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */ -+ mask = 0; -+ syntax = undecided; -+ *language = cp = name; -+ while (cp[0] != '\0' && cp[0] != '_' && cp[0] != '@' -+ && cp[0] != '+' && cp[0] != ',') -+ ++cp; -+ -+ if (*language == cp) -+ /* This does not make sense: language has to be specified. Use -+ this entry as it is without exploding. Perhaps it is an alias. */ -+ cp = strchr (*language, '\0'); -+ else if (cp[0] == '_') -+ { -+ /* Next is the territory. */ -+ cp[0] = '\0'; -+ *territory = ++cp; -+ -+ while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@' -+ && cp[0] != '+' && cp[0] != ',' && cp[0] != '_') -+ ++cp; -+ -+ mask |= TERRITORY; -+ -+ if (cp[0] == '.') -+ { -+ /* Next is the codeset. */ -+ syntax = xpg; -+ cp[0] = '\0'; -+ *codeset = ++cp; -+ -+ while (cp[0] != '\0' && cp[0] != '@') -+ ++cp; -+ -+ mask |= XPG_CODESET; -+ -+ if (*codeset != cp && (*codeset)[0] != '\0') -+ { -+ *normalized_codeset = _nl_normalize_codeset (*codeset, -+ cp - *codeset); -+ if (strcmp (*codeset, *normalized_codeset) == 0) -+ free ((char *) *normalized_codeset); -+ else -+ mask |= XPG_NORM_CODESET; -+ } -+ } -+ } -+ -+ if (cp[0] == '@' || (syntax != xpg && cp[0] == '+')) -+ { -+ /* Next is the modifier. */ -+ syntax = cp[0] == '@' ? xpg : cen; -+ cp[0] = '\0'; -+ *modifier = ++cp; -+ -+ while (syntax == cen && cp[0] != '\0' && cp[0] != '+' -+ && cp[0] != ',' && cp[0] != '_') -+ ++cp; -+ -+ mask |= XPG_MODIFIER | CEN_AUDIENCE; -+ } -+ -+ if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_')) -+ { -+ syntax = cen; -+ -+ if (cp[0] == '+') -+ { -+ /* Next is special application (CEN syntax). */ -+ cp[0] = '\0'; -+ *special = ++cp; -+ -+ while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_') -+ ++cp; -+ -+ mask |= CEN_SPECIAL; -+ } -+ -+ if (cp[0] == ',') -+ { -+ /* Next is sponsor (CEN syntax). */ -+ cp[0] = '\0'; -+ *sponsor = ++cp; -+ -+ while (cp[0] != '\0' && cp[0] != '_') -+ ++cp; -+ -+ mask |= CEN_SPONSOR; -+ } -+ -+ if (cp[0] == '_') -+ { -+ /* Next is revision (CEN syntax). */ -+ cp[0] = '\0'; -+ *revision = ++cp; -+ -+ mask |= CEN_REVISION; -+ } -+ } -+ -+ /* For CEN syntax values it might be important to have the -+ separator character in the file name, not for XPG syntax. */ -+ if (syntax == xpg) -+ { -+ if (*territory != NULL && (*territory)[0] == '\0') -+ mask &= ~TERRITORY; -+ -+ if (*codeset != NULL && (*codeset)[0] == '\0') -+ mask &= ~XPG_CODESET; -+ -+ if (*modifier != NULL && (*modifier)[0] == '\0') -+ mask &= ~XPG_MODIFIER; -+ } -+ -+ return mask; -+} -diff -urP gnome-vfs-1.0.orig/intl/finddomain.c gnome-vfs-1.0/intl/finddomain.c ---- gnome-vfs-1.0.orig/intl/finddomain.c Wed Dec 31 19:00:00 1969 -+++ gnome-vfs-1.0/intl/finddomain.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,216 @@ -+/* Handle list of needed message catalogs -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <ctype.h> -+#include <errno.h> -+#include <stdio.h> -+#include <sys/types.h> -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#else -+# ifdef HAVE_MALLOC_H -+# include <malloc.h> -+# else -+void free (); -+# endif -+#endif -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# include <string.h> -+#else -+# include <strings.h> -+# ifndef memcpy -+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -+# endif -+#endif -+#if !HAVE_STRCHR && !defined _LIBC -+# ifndef strchr -+# define strchr index -+# endif -+#endif -+ -+#if defined HAVE_UNISTD_H || defined _LIBC -+# include <unistd.h> -+#endif -+ -+#include "gettext.h" -+#include "gettextP.h" -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+ -+/* @@ end of prolog @@ */ -+/* List of already loaded domains. */ -+static struct loaded_l10nfile *_nl_loaded_domains; -+ -+ -+/* Return a data structure describing the message catalog described by -+ the DOMAINNAME and CATEGORY parameters with respect to the currently -+ established bindings. */ -+struct loaded_l10nfile * -+internal_function -+_nl_find_domain (dirname, locale, domainname) -+ const char *dirname; -+ char *locale; -+ const char *domainname; -+{ -+ struct loaded_l10nfile *retval; -+ const char *language; -+ const char *modifier; -+ const char *territory; -+ const char *codeset; -+ const char *normalized_codeset; -+ const char *special; -+ const char *sponsor; -+ const char *revision; -+ const char *alias_value; -+ int mask; -+ -+ /* LOCALE can consist of up to four recognized parts for the XPG syntax: -+ -+ language[_territory[.codeset]][@modifier] -+ -+ and six parts for the CEN syntax: -+ -+ language[_territory][+audience][+special][,[sponsor][_revision]] -+ -+ Beside the first part all of them are allowed to be missing. If -+ the full specified locale is not found, the less specific one are -+ looked for. The various parts will be stripped off according to -+ the following order: -+ (1) revision -+ (2) sponsor -+ (3) special -+ (4) codeset -+ (5) normalized codeset -+ (6) territory -+ (7) audience/modifier -+ */ -+ -+ /* If we have already tested for this locale entry there has to -+ be one data set in the list of loaded domains. */ -+ retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, -+ strlen (dirname) + 1, 0, locale, NULL, NULL, -+ NULL, NULL, NULL, NULL, NULL, domainname, 0); -+ if (retval != NULL) -+ { -+ /* We know something about this locale. */ -+ int cnt; -+ -+ if (retval->decided == 0) -+ _nl_load_domain (retval); -+ -+ if (retval->data != NULL) -+ return retval; -+ -+ for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) -+ { -+ if (retval->successor[cnt]->decided == 0) -+ _nl_load_domain (retval->successor[cnt]); -+ -+ if (retval->successor[cnt]->data != NULL) -+ break; -+ } -+ return cnt >= 0 ? retval : NULL; -+ /* NOTREACHED */ -+ } -+ -+ /* See whether the locale value is an alias. If yes its value -+ *overwrites* the alias name. No test for the original value is -+ done. */ -+ alias_value = _nl_expand_alias (locale); -+ if (alias_value != NULL) -+ { -+#if defined _LIBC || defined HAVE_STRDUP -+ locale = strdup (alias_value); -+ if (locale == NULL) -+ return NULL; -+#else -+ size_t len = strlen (alias_value) + 1; -+ locale = (char *) malloc (len); -+ if (locale == NULL) -+ return NULL; -+ -+ memcpy (locale, alias_value, len); -+#endif -+ } -+ -+ /* Now we determine the single parts of the locale name. First -+ look for the language. Termination symbols are `_' and `@' if -+ we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */ -+ mask = _nl_explode_name (locale, &language, &modifier, &territory, -+ &codeset, &normalized_codeset, &special, -+ &sponsor, &revision); -+ -+ /* Create all possible locale entries which might be interested in -+ generalization. */ -+ retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, -+ strlen (dirname) + 1, mask, language, territory, -+ codeset, normalized_codeset, modifier, special, -+ sponsor, revision, domainname, 1); -+ if (retval == NULL) -+ /* This means we are out of core. */ -+ return NULL; -+ -+ if (retval->decided == 0) -+ _nl_load_domain (retval); -+ if (retval->data == NULL) -+ { -+ int cnt; -+ for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) -+ { -+ if (retval->successor[cnt]->decided == 0) -+ _nl_load_domain (retval->successor[cnt]); -+ if (retval->successor[cnt]->data != NULL) -+ break; -+ } -+ } -+ -+ /* The room for an alias was dynamically allocated. Free it now. */ -+ if (alias_value != NULL) -+ free (locale); -+ -+ return retval; -+} -+ -+ -+#ifdef _LIBC -+static void __attribute__ ((unused)) -+free_mem (void) -+{ -+ struct loaded_l10nfile *runp = _nl_loaded_domains; -+ -+ while (runp != NULL) -+ { -+ struct loaded_l10nfile *here = runp; -+ if (runp->data != NULL) -+ _nl_unload_domain ((struct loaded_domain *) runp->data); -+ runp = runp->next; -+ free (here); -+ } -+} -+ -+text_set_element (__libc_subfreeres, free_mem); -+#endif -diff -urP gnome-vfs-1.0.orig/intl/gettext.c gnome-vfs-1.0/intl/gettext.c ---- gnome-vfs-1.0.orig/intl/gettext.c Wed Dec 31 19:00:00 1969 -+++ gnome-vfs-1.0/intl/gettext.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,70 @@ -+/* Implementation of gettext(3) function. -+ Copyright (C) 1995, 1997 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#ifdef _LIBC -+# define __need_NULL -+# include <stddef.h> -+#else -+# ifdef STDC_HEADERS -+# include <stdlib.h> /* Just for NULL. */ -+# else -+# ifdef HAVE_STRING_H -+# include <string.h> -+# else -+# define NULL ((void *) 0) -+# endif -+# endif -+#endif -+ -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+/* Names for the libintl functions are a problem. They must not clash -+ with existing names and they should follow ANSI C. But this source -+ code is also used in GNU C Library where the names have a __ -+ prefix. So we have to make a difference here. */ -+#ifdef _LIBC -+# define GETTEXT __gettext -+# define DGETTEXT __dgettext -+#else -+# define GETTEXT gettext__ -+# define DGETTEXT dgettext__ -+#endif -+ -+/* Look up MSGID in the current default message catalog for the current -+ LC_MESSAGES locale. If not found, returns MSGID itself (the default -+ text). */ -+char * -+GETTEXT (msgid) -+ const char *msgid; -+{ -+ return DGETTEXT (NULL, msgid); -+} -+ -+#ifdef _LIBC -+/* Alias for function name in GNU C Library. */ -+weak_alias (__gettext, gettext); -+#endif -diff -urP gnome-vfs-1.0.orig/intl/gettext.h gnome-vfs-1.0/intl/gettext.h ---- gnome-vfs-1.0.orig/intl/gettext.h Wed Dec 31 19:00:00 1969 -+++ gnome-vfs-1.0/intl/gettext.h Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,105 @@ -+/* Internal header for GNU gettext internationalization functions. -+ Copyright (C) 1995, 1997 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 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. */ -+ -+#ifndef _GETTEXT_H -+#define _GETTEXT_H 1 -+ -+#include <stdio.h> -+ -+#if HAVE_LIMITS_H || _LIBC -+# include <limits.h> -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+/* The magic number of the GNU message catalog format. */ -+#define _MAGIC 0x950412de -+#define _MAGIC_SWAPPED 0xde120495 -+ -+/* Revision number of the currently used .mo (binary) file format. */ -+#define MO_REVISION_NUMBER 0 -+ -+/* The following contortions are an attempt to use the C preprocessor -+ to determine an unsigned integral type that is 32 bits wide. An -+ alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but -+ doing that would require that the configure script compile and *run* -+ the resulting executable. Locally running cross-compiled executables -+ is usually not possible. */ -+ -+#if __STDC__ -+# define UINT_MAX_32_BITS 4294967295U -+#else -+# define UINT_MAX_32_BITS 0xFFFFFFFF -+#endif -+ -+/* If UINT_MAX isn't defined, assume it's a 32-bit type. -+ This should be valid for all systems GNU cares about because -+ that doesn't include 16-bit systems, and only modern systems -+ (that certainly have <limits.h>) have 64+-bit integral types. */ -+ -+#ifndef UINT_MAX -+# define UINT_MAX UINT_MAX_32_BITS -+#endif -+ -+#if UINT_MAX == UINT_MAX_32_BITS -+typedef unsigned nls_uint32; -+#else -+# if USHRT_MAX == UINT_MAX_32_BITS -+typedef unsigned short nls_uint32; -+# else -+# if ULONG_MAX == UINT_MAX_32_BITS -+typedef unsigned long nls_uint32; -+# else -+ /* The following line is intended to throw an error. Using #error is -+ not portable enough. */ -+ "Cannot determine unsigned 32-bit data type." -+# endif -+# endif -+#endif -+ -+ -+/* Header for binary .mo file format. */ -+struct mo_file_header -+{ -+ /* The magic number. */ -+ nls_uint32 magic; -+ /* The revision number of the file format. */ -+ nls_uint32 revision; -+ /* The number of strings pairs. */ -+ nls_uint32 nstrings; -+ /* Offset of table with start offsets of original strings. */ -+ nls_uint32 orig_tab_offset; -+ /* Offset of table with start offsets of translation strings. */ -+ nls_uint32 trans_tab_offset; -+ /* Size of hashing table. */ -+ nls_uint32 hash_tab_size; -+ /* Offset of first hashing entry. */ -+ nls_uint32 hash_tab_offset; -+}; -+ -+struct string_desc -+{ -+ /* Length of addressed string. */ -+ nls_uint32 length; -+ /* Offset of string in file. */ -+ nls_uint32 offset; -+}; -+ -+/* @@ begin of epilog @@ */ -+ -+#endif /* gettext.h */ -diff -urP gnome-vfs-1.0.orig/intl/gettextP.h gnome-vfs-1.0/intl/gettextP.h ---- gnome-vfs-1.0.orig/intl/gettextP.h Wed Dec 31 19:00:00 1969 -+++ gnome-vfs-1.0/intl/gettextP.h Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,89 @@ -+/* Header describing internals of gettext library -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifndef _GETTEXTP_H -+#define _GETTEXTP_H -+ -+#include "loadinfo.h" -+ -+/* @@ end of prolog @@ */ -+ -+#ifndef PARAMS -+# if __STDC__ -+# define PARAMS(args) args -+# else -+# define PARAMS(args) () -+# endif -+#endif -+ -+#ifndef internal_function -+# define internal_function -+#endif -+ -+#ifndef W -+# define W(flag, data) ((flag) ? SWAP (data) : (data)) -+#endif -+ -+ -+#ifdef _LIBC -+# include <byteswap.h> -+# define SWAP(i) bswap_32 (i) -+#else -+static nls_uint32 SWAP PARAMS ((nls_uint32 i)); -+ -+static inline nls_uint32 -+SWAP (i) -+ nls_uint32 i; -+{ -+ return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24); -+} -+#endif -+ -+ -+struct loaded_domain -+{ -+ const char *data; -+ int use_mmap; -+ size_t mmap_size; -+ int must_swap; -+ nls_uint32 nstrings; -+ struct string_desc *orig_tab; -+ struct string_desc *trans_tab; -+ nls_uint32 hash_size; -+ nls_uint32 *hash_tab; -+}; -+ -+struct binding -+{ -+ struct binding *next; -+ char *domainname; -+ char *dirname; -+}; -+ -+struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname, -+ char *__locale, -+ const char *__domainname)) -+ internal_function; -+void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain)) -+ internal_function; -+void _nl_unload_domain PARAMS ((struct loaded_domain *__domain)) -+ internal_function; -+ -+/* @@ begin of epilog @@ */ -+ -+#endif /* gettextP.h */ -diff -urP gnome-vfs-1.0.orig/intl/hash-string.h gnome-vfs-1.0/intl/hash-string.h ---- gnome-vfs-1.0.orig/intl/hash-string.h Wed Dec 31 19:00:00 1969 -+++ gnome-vfs-1.0/intl/hash-string.h Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,59 @@ -+/* Implements a string hashing function. -+ Copyright (C) 1995, 1997 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 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. */ -+ -+/* @@ end of prolog @@ */ -+ -+#ifndef PARAMS -+# if __STDC__ -+# define PARAMS(Args) Args -+# else -+# define PARAMS(Args) () -+# endif -+#endif -+ -+/* We assume to have `unsigned long int' value with at least 32 bits. */ -+#define HASHWORDBITS 32 -+ -+ -+/* Defines the so called `hashpjw' function by P.J. Weinberger -+ [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools, -+ 1986, 1987 Bell Telephone Laboratories, Inc.] */ -+static unsigned long hash_string PARAMS ((const char *__str_param)); -+ -+static inline unsigned long -+hash_string (str_param) -+ const char *str_param; -+{ -+ unsigned long int hval, g; -+ const char *str = str_param; -+ -+ /* Compute the hash value for the given string. */ -+ hval = 0; -+ while (*str != '\0') -+ { -+ hval <<= 4; -+ hval += (unsigned long) *str++; -+ g = hval & ((unsigned long) 0xf << (HASHWORDBITS - 4)); -+ if (g != 0) -+ { -+ hval ^= g >> (HASHWORDBITS - 8); -+ hval ^= g; -+ } -+ } -+ return hval; -+} -diff -urP gnome-vfs-1.0.orig/intl/intl-compat.c gnome-vfs-1.0/intl/intl-compat.c ---- gnome-vfs-1.0.orig/intl/intl-compat.c Wed Dec 31 19:00:00 1969 -+++ gnome-vfs-1.0/intl/intl-compat.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,76 @@ -+/* intl-compat.c - Stub functions to call gettext functions from GNU gettext -+ Library. -+ Copyright (C) 1995 Software Foundation, Inc. -+ -+This program is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 2, or (at your option) -+any later version. -+ -+This program 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 General Public License for more details. -+ -+You should have received a copy of the GNU General Public License -+along with this program; if not, write to the Free Software -+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include "libgettext.h" -+ -+/* @@ end of prolog @@ */ -+ -+ -+#undef gettext -+#undef dgettext -+#undef dcgettext -+#undef textdomain -+#undef bindtextdomain -+ -+ -+char * -+bindtextdomain (domainname, dirname) -+ const char *domainname; -+ const char *dirname; -+{ -+ return bindtextdomain__ (domainname, dirname); -+} -+ -+ -+char * -+dcgettext (domainname, msgid, category) -+ const char *domainname; -+ const char *msgid; -+ int category; -+{ -+ return dcgettext__ (domainname, msgid, category); -+} -+ -+ -+char * -+dgettext (domainname, msgid) -+ const char *domainname; -+ const char *msgid; -+{ -+ return dgettext__ (domainname, msgid); -+} -+ -+ -+char * -+gettext (msgid) -+ const char *msgid; -+{ -+ return gettext__ (msgid); -+} -+ -+ -+char * -+textdomain (domainname) -+ const char *domainname; -+{ -+ return textdomain__ (domainname); -+} -diff -urP gnome-vfs-1.0.orig/intl/l10nflist.c gnome-vfs-1.0/intl/l10nflist.c ---- gnome-vfs-1.0.orig/intl/l10nflist.c Wed Dec 31 19:00:00 1969 -+++ gnome-vfs-1.0/intl/l10nflist.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,411 @@ -+/* Handle list of needed message catalogs -+ Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. -+ Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# ifndef _GNU_SOURCE -+# define _GNU_SOURCE 1 -+# endif -+# include <string.h> -+#else -+# include <strings.h> -+# ifndef memcpy -+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -+# endif -+#endif -+#if !HAVE_STRCHR && !defined _LIBC -+# ifndef strchr -+# define strchr index -+# endif -+#endif -+ -+#if defined _LIBC || defined HAVE_ARGZ_H -+# include <argz.h> -+#endif -+#include <ctype.h> -+#include <sys/types.h> -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#endif -+ -+#include "loadinfo.h" -+ -+/* On some strange systems still no definition of NULL is found. Sigh! */ -+#ifndef NULL -+# if defined __STDC__ && __STDC__ -+# define NULL ((void *) 0) -+# else -+# define NULL 0 -+# endif -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+#ifdef _LIBC -+/* Rename the non ANSI C functions. This is required by the standard -+ because some ANSI C functions will require linking with this object -+ file and the name space must not be polluted. */ -+# ifndef stpcpy -+# define stpcpy(dest, src) __stpcpy(dest, src) -+# endif -+#else -+# ifndef HAVE_STPCPY -+static char *stpcpy PARAMS ((char *dest, const char *src)); -+# endif -+#endif -+ -+/* Define function which are usually not available. */ -+ -+#if !defined _LIBC && !defined HAVE___ARGZ_COUNT -+/* Returns the number of strings in ARGZ. */ -+static size_t argz_count__ PARAMS ((const char *argz, size_t len)); -+ -+static size_t -+argz_count__ (argz, len) -+ const char *argz; -+ size_t len; -+{ -+ size_t count = 0; -+ while (len > 0) -+ { -+ size_t part_len = strlen (argz); -+ argz += part_len + 1; -+ len -= part_len + 1; -+ count++; -+ } -+ return count; -+} -+# undef __argz_count -+# define __argz_count(argz, len) argz_count__ (argz, len) -+#endif /* !_LIBC && !HAVE___ARGZ_COUNT */ -+ -+#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY -+/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's -+ except the last into the character SEP. */ -+static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep)); -+ -+static void -+argz_stringify__ (argz, len, sep) -+ char *argz; -+ size_t len; -+ int sep; -+{ -+ while (len > 0) -+ { -+ size_t part_len = strlen (argz); -+ argz += part_len; -+ len -= part_len + 1; -+ if (len > 0) -+ *argz++ = sep; -+ } -+} -+# undef __argz_stringify -+# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep) -+#endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */ -+ -+#if !defined _LIBC && !defined HAVE___ARGZ_NEXT -+static char *argz_next__ PARAMS ((char *argz, size_t argz_len, -+ const char *entry)); -+ -+static char * -+argz_next__ (argz, argz_len, entry) -+ char *argz; -+ size_t argz_len; -+ const char *entry; -+{ -+ if (entry) -+ { -+ if (entry < argz + argz_len) -+ entry = strchr (entry, '\0') + 1; -+ -+ return entry >= argz + argz_len ? NULL : (char *) entry; -+ } -+ else -+ if (argz_len > 0) -+ return argz; -+ else -+ return 0; -+} -+# undef __argz_next -+# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry) -+#endif /* !_LIBC && !HAVE___ARGZ_NEXT */ -+ -+ -+/* Return number of bits set in X. */ -+static int pop PARAMS ((int x)); -+ -+static inline int -+pop (x) -+ int x; -+{ -+ /* We assume that no more than 16 bits are used. */ -+ x = ((x & ~0x5555) >> 1) + (x & 0x5555); -+ x = ((x & ~0x3333) >> 2) + (x & 0x3333); -+ x = ((x >> 4) + x) & 0x0f0f; -+ x = ((x >> 8) + x) & 0xff; -+ -+ return x; -+} -+ -+ -+struct loaded_l10nfile * -+_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language, -+ territory, codeset, normalized_codeset, modifier, special, -+ sponsor, revision, filename, do_allocate) -+ struct loaded_l10nfile **l10nfile_list; -+ const char *dirlist; -+ size_t dirlist_len; -+ int mask; -+ const char *language; -+ const char *territory; -+ const char *codeset; -+ const char *normalized_codeset; -+ const char *modifier; -+ const char *special; -+ const char *sponsor; -+ const char *revision; -+ const char *filename; -+ int do_allocate; -+{ -+ char *abs_filename; -+ struct loaded_l10nfile *last = NULL; -+ struct loaded_l10nfile *retval; -+ char *cp; -+ size_t entries; -+ int cnt; -+ -+ /* Allocate room for the full file name. */ -+ abs_filename = (char *) malloc (dirlist_len -+ + strlen (language) -+ + ((mask & TERRITORY) != 0 -+ ? strlen (territory) + 1 : 0) -+ + ((mask & XPG_CODESET) != 0 -+ ? strlen (codeset) + 1 : 0) -+ + ((mask & XPG_NORM_CODESET) != 0 -+ ? strlen (normalized_codeset) + 1 : 0) -+ + (((mask & XPG_MODIFIER) != 0 -+ || (mask & CEN_AUDIENCE) != 0) -+ ? strlen (modifier) + 1 : 0) -+ + ((mask & CEN_SPECIAL) != 0 -+ ? strlen (special) + 1 : 0) -+ + (((mask & CEN_SPONSOR) != 0 -+ || (mask & CEN_REVISION) != 0) -+ ? (1 + ((mask & CEN_SPONSOR) != 0 -+ ? strlen (sponsor) + 1 : 0) -+ + ((mask & CEN_REVISION) != 0 -+ ? strlen (revision) + 1 : 0)) : 0) -+ + 1 + strlen (filename) + 1); -+ -+ if (abs_filename == NULL) -+ return NULL; -+ -+ retval = NULL; -+ last = NULL; -+ -+ /* Construct file name. */ -+ memcpy (abs_filename, dirlist, dirlist_len); -+ __argz_stringify (abs_filename, dirlist_len, ':'); -+ cp = abs_filename + (dirlist_len - 1); -+ *cp++ = '/'; -+ cp = stpcpy (cp, language); -+ -+ if ((mask & TERRITORY) != 0) -+ { -+ *cp++ = '_'; -+ cp = stpcpy (cp, territory); -+ } -+ if ((mask & XPG_CODESET) != 0) -+ { -+ *cp++ = '.'; -+ cp = stpcpy (cp, codeset); -+ } -+ if ((mask & XPG_NORM_CODESET) != 0) -+ { -+ *cp++ = '.'; -+ cp = stpcpy (cp, normalized_codeset); -+ } -+ if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0) -+ { -+ /* This component can be part of both syntaces but has different -+ leading characters. For CEN we use `+', else `@'. */ -+ *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@'; -+ cp = stpcpy (cp, modifier); -+ } -+ if ((mask & CEN_SPECIAL) != 0) -+ { -+ *cp++ = '+'; -+ cp = stpcpy (cp, special); -+ } -+ if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0) -+ { -+ *cp++ = ','; -+ if ((mask & CEN_SPONSOR) != 0) -+ cp = stpcpy (cp, sponsor); -+ if ((mask & CEN_REVISION) != 0) -+ { -+ *cp++ = '_'; -+ cp = stpcpy (cp, revision); -+ } -+ } -+ -+ *cp++ = '/'; -+ stpcpy (cp, filename); -+ -+ /* Look in list of already loaded domains whether it is already -+ available. */ -+ last = NULL; -+ for (retval = *l10nfile_list; retval != NULL; retval = retval->next) -+ if (retval->filename != NULL) -+ { -+ int compare = strcmp (retval->filename, abs_filename); -+ if (compare == 0) -+ /* We found it! */ -+ break; -+ if (compare < 0) -+ { -+ /* It's not in the list. */ -+ retval = NULL; -+ break; -+ } -+ -+ last = retval; -+ } -+ -+ if (retval != NULL || do_allocate == 0) -+ { -+ free (abs_filename); -+ return retval; -+ } -+ -+ retval = (struct loaded_l10nfile *) -+ malloc (sizeof (*retval) + (__argz_count (dirlist, dirlist_len) -+ * (1 << pop (mask)) -+ * sizeof (struct loaded_l10nfile *))); -+ if (retval == NULL) -+ return NULL; -+ -+ retval->filename = abs_filename; -+ retval->decided = (__argz_count (dirlist, dirlist_len) != 1 -+ || ((mask & XPG_CODESET) != 0 -+ && (mask & XPG_NORM_CODESET) != 0)); -+ retval->data = NULL; -+ -+ if (last == NULL) -+ { -+ retval->next = *l10nfile_list; -+ *l10nfile_list = retval; -+ } -+ else -+ { -+ retval->next = last->next; -+ last->next = retval; -+ } -+ -+ entries = 0; -+ /* If the DIRLIST is a real list the RETVAL entry corresponds not to -+ a real file. So we have to use the DIRLIST separation mechanism -+ of the inner loop. */ -+ cnt = __argz_count (dirlist, dirlist_len) == 1 ? mask - 1 : mask; -+ for (; cnt >= 0; --cnt) -+ if ((cnt & ~mask) == 0 -+ && ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0) -+ && ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0)) -+ { -+ /* Iterate over all elements of the DIRLIST. */ -+ char *dir = NULL; -+ -+ while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir)) -+ != NULL) -+ retval->successor[entries++] -+ = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, cnt, -+ language, territory, codeset, -+ normalized_codeset, modifier, special, -+ sponsor, revision, filename, 1); -+ } -+ retval->successor[entries] = NULL; -+ -+ return retval; -+} -+ -+/* Normalize codeset name. There is no standard for the codeset -+ names. Normalization allows the user to use any of the common -+ names. */ -+const char * -+_nl_normalize_codeset (codeset, name_len) -+ const unsigned char *codeset; -+ size_t name_len; -+{ -+ int len = 0; -+ int only_digit = 1; -+ char *retval; -+ char *wp; -+ size_t cnt; -+ -+ for (cnt = 0; cnt < name_len; ++cnt) -+ if (isalnum (codeset[cnt])) -+ { -+ ++len; -+ -+ if (isalpha (codeset[cnt])) -+ only_digit = 0; -+ } -+ -+ retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1); -+ -+ if (retval != NULL) -+ { -+ if (only_digit) -+ wp = stpcpy (retval, "iso"); -+ else -+ wp = retval; -+ -+ for (cnt = 0; cnt < name_len; ++cnt) -+ if (isalpha (codeset[cnt])) -+ *wp++ = tolower (codeset[cnt]); -+ else if (isdigit (codeset[cnt])) -+ *wp++ = codeset[cnt]; -+ -+ *wp = '\0'; -+ } -+ -+ return (const char *) retval; -+} -+ -+ -+/* @@ begin of epilog @@ */ -+ -+/* We don't want libintl.a to depend on any other library. So we -+ avoid the non-standard function stpcpy. In GNU C Library this -+ function is available, though. Also allow the symbol HAVE_STPCPY -+ to be defined. */ -+#if !_LIBC && !HAVE_STPCPY -+static char * -+stpcpy (dest, src) -+ char *dest; -+ const char *src; -+{ -+ while ((*dest++ = *src++) != '\0') -+ /* Do nothing. */ ; -+ return dest - 1; -+} -+#endif -diff -urP gnome-vfs-1.0.orig/intl/libgettext.h gnome-vfs-1.0/intl/libgettext.h ---- gnome-vfs-1.0.orig/intl/libgettext.h Wed Dec 31 19:00:00 1969 -+++ gnome-vfs-1.0/intl/libgettext.h Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,182 @@ -+/* Message catalogs for internationalization. -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+/* Because on some systems (e.g. Solaris) we sometimes have to include -+ the systems libintl.h as well as this file we have more complex -+ include protection above. But the systems header might perhaps also -+ define _LIBINTL_H and therefore we have to protect the definition here. */ -+ -+#if !defined _LIBINTL_H || !defined _LIBGETTEXT_H -+#ifndef _LIBINTL_H -+# define _LIBINTL_H 1 -+#endif -+#define _LIBGETTEXT_H 1 -+ -+/* We define an additional symbol to signal that we use the GNU -+ implementation of gettext. */ -+#define __USE_GNU_GETTEXT 1 -+ -+#include <sys/types.h> -+ -+#if HAVE_LOCALE_H -+# include <locale.h> -+#endif -+ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+#ifndef PARAMS -+# if __STDC__ || defined __cplusplus -+# define PARAMS(args) args -+# else -+# define PARAMS(args) () -+# endif -+#endif -+ -+#ifndef NULL -+# if !defined __cplusplus || defined __GNUC__ -+# define NULL ((void *) 0) -+# else -+# define NULL (0) -+# endif -+#endif -+ -+#if !HAVE_LC_MESSAGES -+/* This value determines the behaviour of the gettext() and dgettext() -+ function. But some system does not have this defined. Define it -+ to a default value. */ -+# define LC_MESSAGES (-1) -+#endif -+ -+ -+/* Declarations for gettext-using-catgets interface. Derived from -+ Jim Meyering's libintl.h. */ -+struct _msg_ent -+{ -+ const char *_msg; -+ int _msg_number; -+}; -+ -+ -+#if HAVE_CATGETS -+/* These two variables are defined in the automatically by po-to-tbl.sed -+ generated file `cat-id-tbl.c'. */ -+extern const struct _msg_ent _msg_tbl[]; -+extern int _msg_tbl_length; -+#endif -+ -+ -+/* For automatical extraction of messages sometimes no real -+ translation is needed. Instead the string itself is the result. */ -+#define gettext_noop(Str) (Str) -+ -+/* Look up MSGID in the current default message catalog for the current -+ LC_MESSAGES locale. If not found, returns MSGID itself (the default -+ text). */ -+extern char *gettext PARAMS ((const char *__msgid)); -+extern char *gettext__ PARAMS ((const char *__msgid)); -+ -+/* Look up MSGID in the DOMAINNAME message catalog for the current -+ LC_MESSAGES locale. */ -+extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid)); -+extern char *dgettext__ PARAMS ((const char *__domainname, -+ const char *__msgid)); -+ -+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY -+ locale. */ -+extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid, -+ int __category)); -+extern char *dcgettext__ PARAMS ((const char *__domainname, -+ const char *__msgid, int __category)); -+ -+ -+/* Set the current default message catalog to DOMAINNAME. -+ If DOMAINNAME is null, return the current default. -+ If DOMAINNAME is "", reset to the default of "messages". */ -+extern char *textdomain PARAMS ((const char *__domainname)); -+extern char *textdomain__ PARAMS ((const char *__domainname)); -+ -+/* Specify that the DOMAINNAME message catalog will be found -+ in DIRNAME rather than in the system locale data base. */ -+extern char *bindtextdomain PARAMS ((const char *__domainname, -+ const char *__dirname)); -+extern char *bindtextdomain__ PARAMS ((const char *__domainname, -+ const char *__dirname)); -+ -+#if ENABLE_NLS -+ -+/* Solaris 2.3 has the gettext function but dcgettext is missing. -+ So we omit this optimization for Solaris 2.3. BTW, Solaris 2.4 -+ has dcgettext. */ -+# if !HAVE_CATGETS && (!HAVE_GETTEXT || HAVE_DCGETTEXT) -+ -+# define gettext(Msgid) \ -+ dgettext (NULL, Msgid) -+ -+# define dgettext(Domainname, Msgid) \ -+ dcgettext (Domainname, Msgid, LC_MESSAGES) -+ -+# if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ >= 7 -+/* This global variable is defined in loadmsgcat.c. We need a sign, -+ whether a new catalog was loaded, which can be associated with all -+ translations. */ -+extern int _nl_msg_cat_cntr; -+ -+# define dcgettext(Domainname, Msgid, Category) \ -+ (__extension__ \ -+ ({ \ -+ char *__result; \ -+ if (__builtin_constant_p (Msgid)) \ -+ { \ -+ static char *__translation__; \ -+ static int __catalog_counter__; \ -+ if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr) \ -+ { \ -+ __translation__ = \ -+ dcgettext__ (Domainname, Msgid, Category); \ -+ __catalog_counter__ = _nl_msg_cat_cntr; \ -+ } \ -+ __result = __translation__; \ -+ } \ -+ else \ -+ __result = dcgettext__ (Domainname, Msgid, Category); \ -+ __result; \ -+ })) -+# endif -+# endif -+ -+#else -+ -+# define gettext(Msgid) (Msgid) -+# define dgettext(Domainname, Msgid) (Msgid) -+# define dcgettext(Domainname, Msgid, Category) (Msgid) -+# define textdomain(Domainname) ((char *) Domainname) -+# define bindtextdomain(Domainname, Dirname) ((char *) Dirname) -+ -+#endif -+ -+/* @@ begin of epilog @@ */ -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif -diff -urP gnome-vfs-1.0.orig/intl/linux-msg.sed gnome-vfs-1.0/intl/linux-msg.sed ---- gnome-vfs-1.0.orig/intl/linux-msg.sed Wed Dec 31 19:00:00 1969 -+++ gnome-vfs-1.0/intl/linux-msg.sed Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,100 @@ -+# po2msg.sed - Convert Uniforum style .po file to Linux style .msg file -+# Copyright (C) 1995 Free Software Foundation, Inc. -+# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+# -+# This program 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 General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+# -+# The first directive in the .msg should be the definition of the -+# message set number. We use always set number 1. -+# -+1 { -+ i\ -+$set 1 # Automatically created by po2msg.sed -+ h -+ s/.*/0/ -+ x -+} -+# -+# Mitch's old catalog format does not allow comments. -+# -+# We copy the original message as a comment into the .msg file. -+# -+/^msgid/ { -+ s/msgid[ ]*"// -+# -+# This does not work now with the new format. -+# /"$/! { -+# s/\\$// -+# s/$/ ... (more lines following)"/ -+# } -+ x -+# The following nice solution is by -+# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de> -+ td -+# Increment a decimal number in pattern space. -+# First hide trailing `9' digits. -+ :d -+ s/9\(_*\)$/_\1/ -+ td -+# Assure at least one digit is available. -+ s/^\(_*\)$/0\1/ -+# Increment the last digit. -+ s/8\(_*\)$/9\1/ -+ s/7\(_*\)$/8\1/ -+ s/6\(_*\)$/7\1/ -+ s/5\(_*\)$/6\1/ -+ s/4\(_*\)$/5\1/ -+ s/3\(_*\)$/4\1/ -+ s/2\(_*\)$/3\1/ -+ s/1\(_*\)$/2\1/ -+ s/0\(_*\)$/1\1/ -+# Convert the hidden `9' digits to `0's. -+ s/_/0/g -+ x -+ G -+ s/\(.*\)"\n\([0-9]*\)/$ #\2 Original Message:(\1)/p -+} -+# -+# The .msg file contains, other then the .po file, only the translations -+# but each given a unique ID. Starting from 1 and incrementing by 1 for -+# each message we assign them to the messages. -+# It is important that the .po file used to generate the cat-id-tbl.c file -+# (with po-to-tbl) is the same as the one used here. (At least the order -+# of declarations must not be changed.) -+# -+/^msgstr/ { -+ s/msgstr[ ]*"\(.*\)"/# \1/ -+# Clear substitution flag. -+ tb -+# Append the next line. -+ :b -+ N -+# Look whether second part is continuation line. -+ s/\(.*\n\)"\(.*\)"/\1\2/ -+# Yes, then branch. -+ ta -+ P -+ D -+# Note that D includes a jump to the start!! -+# We found a continuation line. But before printing insert '\'. -+ :a -+ s/\(.*\)\(\n.*\)/\1\\\2/ -+ P -+# We cannot use D here. -+ s/.*\n\(.*\)/\1/ -+ tb -+} -+d -diff -urP gnome-vfs-1.0.orig/intl/loadinfo.h gnome-vfs-1.0/intl/loadinfo.h ---- gnome-vfs-1.0.orig/intl/loadinfo.h Wed Dec 31 19:00:00 1969 -+++ gnome-vfs-1.0/intl/loadinfo.h Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,76 @@ -+/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifndef PARAMS -+# if __STDC__ -+# define PARAMS(args) args -+# else -+# define PARAMS(args) () -+# endif -+#endif -+ -+/* Encoding of locale name parts. */ -+#define CEN_REVISION 1 -+#define CEN_SPONSOR 2 -+#define CEN_SPECIAL 4 -+#define XPG_NORM_CODESET 8 -+#define XPG_CODESET 16 -+#define TERRITORY 32 -+#define CEN_AUDIENCE 64 -+#define XPG_MODIFIER 128 -+ -+#define CEN_SPECIFIC (CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE) -+#define XPG_SPECIFIC (XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER) -+ -+ -+struct loaded_l10nfile -+{ -+ const char *filename; -+ int decided; -+ -+ const void *data; -+ -+ struct loaded_l10nfile *next; -+ struct loaded_l10nfile *successor[1]; -+}; -+ -+ -+extern const char *_nl_normalize_codeset PARAMS ((const unsigned char *codeset, -+ size_t name_len)); -+ -+extern struct loaded_l10nfile * -+_nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list, -+ const char *dirlist, size_t dirlist_len, int mask, -+ const char *language, const char *territory, -+ const char *codeset, -+ const char *normalized_codeset, -+ const char *modifier, const char *special, -+ const char *sponsor, const char *revision, -+ const char *filename, int do_allocate)); -+ -+ -+extern const char *_nl_expand_alias PARAMS ((const char *name)); -+ -+extern int _nl_explode_name PARAMS ((char *name, const char **language, -+ const char **modifier, -+ const char **territory, -+ const char **codeset, -+ const char **normalized_codeset, -+ const char **special, -+ const char **sponsor, -+ const char **revision)); -diff -urP gnome-vfs-1.0.orig/intl/loadmsgcat.c gnome-vfs-1.0/intl/loadmsgcat.c ---- gnome-vfs-1.0.orig/intl/loadmsgcat.c Wed Dec 31 19:00:00 1969 -+++ gnome-vfs-1.0/intl/loadmsgcat.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,222 @@ -+/* Load needed message catalogs. -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <fcntl.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#endif -+ -+#if defined HAVE_UNISTD_H || defined _LIBC -+# include <unistd.h> -+#endif -+ -+#if (defined HAVE_MMAP && defined HAVE_MUNMAP) || defined _LIBC -+# include <sys/mman.h> -+#endif -+ -+#include "gettext.h" -+#include "gettextP.h" -+ -+/* @@ end of prolog @@ */ -+ -+#ifdef _LIBC -+/* Rename the non ISO C functions. This is required by the standard -+ because some ISO C functions will require linking with this object -+ file and the name space must not be polluted. */ -+# define open __open -+# define close __close -+# define read __read -+# define mmap __mmap -+# define munmap __munmap -+#endif -+ -+/* We need a sign, whether a new catalog was loaded, which can be associated -+ with all translations. This is important if the translations are -+ cached by one of GCC's features. */ -+int _nl_msg_cat_cntr = 0; -+ -+ -+/* Load the message catalogs specified by FILENAME. If it is no valid -+ message catalog do nothing. */ -+void -+internal_function -+_nl_load_domain (domain_file) -+ struct loaded_l10nfile *domain_file; -+{ -+ int fd; -+ size_t size; -+ struct stat st; -+ struct mo_file_header *data = (struct mo_file_header *) -1; -+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ -+ || defined _LIBC -+ int use_mmap = 0; -+#endif -+ struct loaded_domain *domain; -+ -+ domain_file->decided = 1; -+ domain_file->data = NULL; -+ -+ /* If the record does not represent a valid locale the FILENAME -+ might be NULL. This can happen when according to the given -+ specification the locale file name is different for XPG and CEN -+ syntax. */ -+ if (domain_file->filename == NULL) -+ return; -+ -+ /* Try to open the addressed file. */ -+ fd = open (domain_file->filename, O_RDONLY); -+ if (fd == -1) -+ return; -+ -+ /* We must know about the size of the file. */ -+ if (fstat (fd, &st) != 0 -+ || (size = (size_t) st.st_size) != st.st_size -+ || size < sizeof (struct mo_file_header)) -+ { -+ /* Something went wrong. */ -+ close (fd); -+ return; -+ } -+ -+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ -+ || defined _LIBC -+ /* Now we are ready to load the file. If mmap() is available we try -+ this first. If not available or it failed we try to load it. */ -+ data = (struct mo_file_header *) mmap (NULL, size, PROT_READ, -+ MAP_PRIVATE, fd, 0); -+ -+ if (data != (struct mo_file_header *) -1) -+ { -+ /* mmap() call was successful. */ -+ close (fd); -+ use_mmap = 1; -+ } -+#endif -+ -+ /* If the data is not yet available (i.e. mmap'ed) we try to load -+ it manually. */ -+ if (data == (struct mo_file_header *) -1) -+ { -+ size_t to_read; -+ char *read_ptr; -+ -+ data = (struct mo_file_header *) malloc (size); -+ if (data == NULL) -+ return; -+ -+ to_read = size; -+ read_ptr = (char *) data; -+ do -+ { -+ long int nb = (long int) read (fd, read_ptr, to_read); -+ if (nb == -1) -+ { -+ close (fd); -+ return; -+ } -+ -+ read_ptr += nb; -+ to_read -= nb; -+ } -+ while (to_read > 0); -+ -+ close (fd); -+ } -+ -+ /* Using the magic number we can test whether it really is a message -+ catalog file. */ -+ if (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED) -+ { -+ /* The magic number is wrong: not a message catalog file. */ -+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ -+ || defined _LIBC -+ if (use_mmap) -+ munmap ((caddr_t) data, size); -+ else -+#endif -+ free (data); -+ return; -+ } -+ -+ domain_file->data -+ = (struct loaded_domain *) malloc (sizeof (struct loaded_domain)); -+ if (domain_file->data == NULL) -+ return; -+ -+ domain = (struct loaded_domain *) domain_file->data; -+ domain->data = (char *) data; -+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ -+ || defined _LIBC -+ domain->use_mmap = use_mmap; -+#endif -+ domain->mmap_size = size; -+ domain->must_swap = data->magic != _MAGIC; -+ -+ /* Fill in the information about the available tables. */ -+ switch (W (domain->must_swap, data->revision)) -+ { -+ case 0: -+ domain->nstrings = W (domain->must_swap, data->nstrings); -+ domain->orig_tab = (struct string_desc *) -+ ((char *) data + W (domain->must_swap, data->orig_tab_offset)); -+ domain->trans_tab = (struct string_desc *) -+ ((char *) data + W (domain->must_swap, data->trans_tab_offset)); -+ domain->hash_size = W (domain->must_swap, data->hash_tab_size); -+ domain->hash_tab = (nls_uint32 *) -+ ((char *) data + W (domain->must_swap, data->hash_tab_offset)); -+ break; -+ default: -+ /* This is an illegal revision. */ -+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ -+ || defined _LIBC -+ if (use_mmap) -+ munmap ((caddr_t) data, size); -+ else -+#endif -+ free (data); -+ free (domain); -+ domain_file->data = NULL; -+ return; -+ } -+ -+ /* Show that one domain is changed. This might make some cached -+ translations invalid. */ -+ ++_nl_msg_cat_cntr; -+} -+ -+ -+#ifdef _LIBC -+void -+internal_function -+_nl_unload_domain (domain) -+ struct loaded_domain *domain; -+{ -+ if (domain->use_mmap) -+ munmap ((caddr_t) domain->data, domain->mmap_size); -+ else -+ free ((void *) domain->data); -+ -+ free (domain); -+} -+#endif -diff -urP gnome-vfs-1.0.orig/intl/localealias.c gnome-vfs-1.0/intl/localealias.c ---- gnome-vfs-1.0.orig/intl/localealias.c Wed Dec 31 19:00:00 1969 -+++ gnome-vfs-1.0/intl/localealias.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,424 @@ -+/* Handle aliases for locale names. -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <ctype.h> -+#include <stdio.h> -+#include <sys/types.h> -+ -+#ifdef __GNUC__ -+# define alloca __builtin_alloca -+# define HAVE_ALLOCA 1 -+#else -+# if defined HAVE_ALLOCA_H || defined _LIBC -+# include <alloca.h> -+# else -+# ifdef _AIX -+ #pragma alloca -+# else -+# ifndef alloca -+char *alloca (); -+# endif -+# endif -+# endif -+#endif -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#else -+char *getenv (); -+# ifdef HAVE_MALLOC_H -+# include <malloc.h> -+# else -+void free (); -+# endif -+#endif -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# ifndef _GNU_SOURCE -+# define _GNU_SOURCE 1 -+# endif -+# include <string.h> -+#else -+# include <strings.h> -+# ifndef memcpy -+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -+# endif -+#endif -+#if !HAVE_STRCHR && !defined _LIBC -+# ifndef strchr -+# define strchr index -+# endif -+#endif -+ -+#include "gettext.h" -+#include "gettextP.h" -+ -+/* @@ end of prolog @@ */ -+ -+#ifdef _LIBC -+/* Rename the non ANSI C functions. This is required by the standard -+ because some ANSI C functions will require linking with this object -+ file and the name space must not be polluted. */ -+# define strcasecmp __strcasecmp -+ -+# define mempcpy __mempcpy -+# define HAVE_MEMPCPY 1 -+ -+/* We need locking here since we can be called from different places. */ -+# include <bits/libc-lock.h> -+ -+__libc_lock_define_initialized (static, lock); -+#endif -+ -+ -+/* For those loosing systems which don't have `alloca' we have to add -+ some additional code emulating it. */ -+#ifdef HAVE_ALLOCA -+/* Nothing has to be done. */ -+# define ADD_BLOCK(list, address) /* nothing */ -+# define FREE_BLOCKS(list) /* nothing */ -+#else -+struct block_list -+{ -+ void *address; -+ struct block_list *next; -+}; -+# define ADD_BLOCK(list, addr) \ -+ do { \ -+ struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \ -+ /* If we cannot get a free block we cannot add the new element to \ -+ the list. */ \ -+ if (newp != NULL) { \ -+ newp->address = (addr); \ -+ newp->next = (list); \ -+ (list) = newp; \ -+ } \ -+ } while (0) -+# define FREE_BLOCKS(list) \ -+ do { \ -+ while (list != NULL) { \ -+ struct block_list *old = list; \ -+ list = list->next; \ -+ free (old); \ -+ } \ -+ } while (0) -+# undef alloca -+# define alloca(size) (malloc (size)) -+#endif /* have alloca */ -+ -+ -+struct alias_map -+{ -+ const char *alias; -+ const char *value; -+}; -+ -+ -+static char *string_space = NULL; -+static size_t string_space_act = 0; -+static size_t string_space_max = 0; -+static struct alias_map *map; -+static size_t nmap = 0; -+static size_t maxmap = 0; -+ -+ -+/* Prototypes for local functions. */ -+static size_t read_alias_file PARAMS ((const char *fname, int fname_len)) -+ internal_function; -+static void extend_alias_table PARAMS ((void)); -+static int alias_compare PARAMS ((const struct alias_map *map1, -+ const struct alias_map *map2)); -+ -+ -+const char * -+_nl_expand_alias (name) -+ const char *name; -+{ -+ static const char *locale_alias_path = LOCALE_ALIAS_PATH; -+ struct alias_map *retval; -+ const char *result = NULL; -+ size_t added; -+ -+#ifdef _LIBC -+ __libc_lock_lock (lock); -+#endif -+ -+ do -+ { -+ struct alias_map item; -+ -+ item.alias = name; -+ -+ if (nmap > 0) -+ retval = (struct alias_map *) bsearch (&item, map, nmap, -+ sizeof (struct alias_map), -+ (int (*) PARAMS ((const void *, -+ const void *)) -+ ) alias_compare); -+ else -+ retval = NULL; -+ -+ /* We really found an alias. Return the value. */ -+ if (retval != NULL) -+ { -+ result = retval->value; -+ break; -+ } -+ -+ /* Perhaps we can find another alias file. */ -+ added = 0; -+ while (added == 0 && locale_alias_path[0] != '\0') -+ { -+ const char *start; -+ -+ while (locale_alias_path[0] == ':') -+ ++locale_alias_path; -+ start = locale_alias_path; -+ -+ while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ':') -+ ++locale_alias_path; -+ -+ if (start < locale_alias_path) -+ added = read_alias_file (start, locale_alias_path - start); -+ } -+ } -+ while (added != 0); -+ -+#ifdef _LIBC -+ __libc_lock_unlock (lock); -+#endif -+ -+ return result; -+} -+ -+ -+static size_t -+internal_function -+read_alias_file (fname, fname_len) -+ const char *fname; -+ int fname_len; -+{ -+#ifndef HAVE_ALLOCA -+ struct block_list *block_list = NULL; -+#endif -+ FILE *fp; -+ char *full_fname; -+ size_t added; -+ static const char aliasfile[] = "/locale.alias"; -+ -+ full_fname = (char *) alloca (fname_len + sizeof aliasfile); -+ ADD_BLOCK (block_list, full_fname); -+#ifdef HAVE_MEMPCPY -+ mempcpy (mempcpy (full_fname, fname, fname_len), -+ aliasfile, sizeof aliasfile); -+#else -+ memcpy (full_fname, fname, fname_len); -+ memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile); -+#endif -+ -+ fp = fopen (full_fname, "r"); -+ if (fp == NULL) -+ { -+ FREE_BLOCKS (block_list); -+ return 0; -+ } -+ -+ added = 0; -+ while (!feof (fp)) -+ { -+ /* It is a reasonable approach to use a fix buffer here because -+ a) we are only interested in the first two fields -+ b) these fields must be usable as file names and so must not -+ be that long -+ */ -+ unsigned char buf[BUFSIZ]; -+ unsigned char *alias; -+ unsigned char *value; -+ unsigned char *cp; -+ -+ if (fgets (buf, sizeof buf, fp) == NULL) -+ /* EOF reached. */ -+ break; -+ -+ /* Possibly not the whole line fits into the buffer. Ignore -+ the rest of the line. */ -+ if (strchr (buf, '\n') == NULL) -+ { -+ char altbuf[BUFSIZ]; -+ do -+ if (fgets (altbuf, sizeof altbuf, fp) == NULL) -+ /* Make sure the inner loop will be left. The outer loop -+ will exit at the `feof' test. */ -+ break; -+ while (strchr (altbuf, '\n') == NULL); -+ } -+ -+ cp = buf; -+ /* Ignore leading white space. */ -+ while (isspace (cp[0])) -+ ++cp; -+ -+ /* A leading '#' signals a comment line. */ -+ if (cp[0] != '\0' && cp[0] != '#') -+ { -+ alias = cp++; -+ while (cp[0] != '\0' && !isspace (cp[0])) -+ ++cp; -+ /* Terminate alias name. */ -+ if (cp[0] != '\0') -+ *cp++ = '\0'; -+ -+ /* Now look for the beginning of the value. */ -+ while (isspace (cp[0])) -+ ++cp; -+ -+ if (cp[0] != '\0') -+ { -+ size_t alias_len; -+ size_t value_len; -+ -+ value = cp++; -+ while (cp[0] != '\0' && !isspace (cp[0])) -+ ++cp; -+ /* Terminate value. */ -+ if (cp[0] == '\n') -+ { -+ /* This has to be done to make the following test -+ for the end of line possible. We are looking for -+ the terminating '\n' which do not overwrite here. */ -+ *cp++ = '\0'; -+ *cp = '\n'; -+ } -+ else if (cp[0] != '\0') -+ *cp++ = '\0'; -+ -+ if (nmap >= maxmap) -+ extend_alias_table (); -+ -+ alias_len = strlen (alias) + 1; -+ value_len = strlen (value) + 1; -+ -+ if (string_space_act + alias_len + value_len > string_space_max) -+ { -+ /* Increase size of memory pool. */ -+ size_t new_size = (string_space_max -+ + (alias_len + value_len > 1024 -+ ? alias_len + value_len : 1024)); -+ char *new_pool = (char *) realloc (string_space, new_size); -+ if (new_pool == NULL) -+ { -+ FREE_BLOCKS (block_list); -+ return added; -+ } -+ string_space = new_pool; -+ string_space_max = new_size; -+ } -+ -+ map[nmap].alias = memcpy (&string_space[string_space_act], -+ alias, alias_len); -+ string_space_act += alias_len; -+ -+ map[nmap].value = memcpy (&string_space[string_space_act], -+ value, value_len); -+ string_space_act += value_len; -+ -+ ++nmap; -+ ++added; -+ } -+ } -+ } -+ -+ /* Should we test for ferror()? I think we have to silently ignore -+ errors. --drepper */ -+ fclose (fp); -+ -+ if (added > 0) -+ qsort (map, nmap, sizeof (struct alias_map), -+ (int (*) PARAMS ((const void *, const void *))) alias_compare); -+ -+ FREE_BLOCKS (block_list); -+ return added; -+} -+ -+ -+static void -+extend_alias_table () -+{ -+ size_t new_size; -+ struct alias_map *new_map; -+ -+ new_size = maxmap == 0 ? 100 : 2 * maxmap; -+ new_map = (struct alias_map *) realloc (map, (new_size -+ * sizeof (struct alias_map))); -+ if (new_map == NULL) -+ /* Simply don't extend: we don't have any more core. */ -+ return; -+ -+ map = new_map; -+ maxmap = new_size; -+} -+ -+ -+#ifdef _LIBC -+static void __attribute__ ((unused)) -+free_mem (void) -+{ -+ if (string_space != NULL) -+ free (string_space); -+ if (map != NULL) -+ free (map); -+} -+text_set_element (__libc_subfreeres, free_mem); -+#endif -+ -+ -+static int -+alias_compare (map1, map2) -+ const struct alias_map *map1; -+ const struct alias_map *map2; -+{ -+#if defined _LIBC || defined HAVE_STRCASECMP -+ return strcasecmp (map1->alias, map2->alias); -+#else -+ const unsigned char *p1 = (const unsigned char *) map1->alias; -+ const unsigned char *p2 = (const unsigned char *) map2->alias; -+ unsigned char c1, c2; -+ -+ if (p1 == p2) -+ return 0; -+ -+ do -+ { -+ /* I know this seems to be odd but the tolower() function in -+ some systems libc cannot handle nonalpha characters. */ -+ c1 = isupper (*p1) ? tolower (*p1) : *p1; -+ c2 = isupper (*p2) ? tolower (*p2) : *p2; -+ if (c1 == '\0') -+ break; -+ ++p1; -+ ++p2; -+ } -+ while (c1 == c2); -+ -+ return c1 - c2; -+#endif -+} -diff -urP gnome-vfs-1.0.orig/intl/po2tbl.sed.in gnome-vfs-1.0/intl/po2tbl.sed.in ---- gnome-vfs-1.0.orig/intl/po2tbl.sed.in Wed Dec 31 19:00:00 1969 -+++ gnome-vfs-1.0/intl/po2tbl.sed.in Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,102 @@ -+# po2tbl.sed - Convert Uniforum style .po file to lookup table for catgets -+# Copyright (C) 1995 Free Software Foundation, Inc. -+# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+# -+# This program 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 General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+1 { -+ i\ -+/* Automatically generated by po2tbl.sed from @PACKAGE NAME@.pot. */\ -+\ -+#if HAVE_CONFIG_H\ -+# include <config.h>\ -+#endif\ -+\ -+#include "libgettext.h"\ -+\ -+const struct _msg_ent _msg_tbl[] = { -+ h -+ s/.*/0/ -+ x -+} -+# -+# Write msgid entries in C array form. -+# -+/^msgid/ { -+ s/msgid[ ]*\(".*"\)/ {\1/ -+ tb -+# Append the next line -+ :b -+ N -+# Look whether second part is continuation line. -+ s/\(.*\)"\(\n\)"\(.*"\)/\1\2\3/ -+# Yes, then branch. -+ ta -+# Because we assume that the input file correctly formed the line -+# just read cannot be again be a msgid line. So it's safe to ignore -+# it. -+ s/\(.*\)\n.*/\1/ -+ bc -+# We found a continuation line. But before printing insert '\'. -+ :a -+ s/\(.*\)\(\n.*\)/\1\\\2/ -+ P -+# We cannot use D here. -+ s/.*\n\(.*\)/\1/ -+# Some buggy seds do not clear the `successful substitution since last ``t''' -+# flag on `N', so we do a `t' here to clear it. -+ tb -+# Not reached -+ :c -+ x -+# The following nice solution is by -+# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de> -+ td -+# Increment a decimal number in pattern space. -+# First hide trailing `9' digits. -+ :d -+ s/9\(_*\)$/_\1/ -+ td -+# Assure at least one digit is available. -+ s/^\(_*\)$/0\1/ -+# Increment the last digit. -+ s/8\(_*\)$/9\1/ -+ s/7\(_*\)$/8\1/ -+ s/6\(_*\)$/7\1/ -+ s/5\(_*\)$/6\1/ -+ s/4\(_*\)$/5\1/ -+ s/3\(_*\)$/4\1/ -+ s/2\(_*\)$/3\1/ -+ s/1\(_*\)$/2\1/ -+ s/0\(_*\)$/1\1/ -+# Convert the hidden `9' digits to `0's. -+ s/_/0/g -+ x -+ G -+ s/\(.*\)\n\([0-9]*\)/\1, \2},/ -+ s/\(.*\)"$/\1/ -+ p -+} -+# -+# Last line. -+# -+$ { -+ i\ -+};\ -+ -+ g -+ s/0*\(.*\)/int _msg_tbl_length = \1;/p -+} -+d -diff -urP gnome-vfs-1.0.orig/intl/textdomain.c gnome-vfs-1.0/intl/textdomain.c ---- gnome-vfs-1.0.orig/intl/textdomain.c Wed Dec 31 19:00:00 1969 -+++ gnome-vfs-1.0/intl/textdomain.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,108 @@ -+/* Implementation of the textdomain(3) function. -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#endif -+ -+#if defined STDC_HEADERS || defined HAVE_STRING_H || defined _LIBC -+# include <string.h> -+#else -+# include <strings.h> -+# ifndef memcpy -+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -+# endif -+#endif -+ -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+/* Name of the default text domain. */ -+extern const char _nl_default_default_domain[]; -+ -+/* Default text domain in which entries for gettext(3) are to be found. */ -+extern const char *_nl_current_default_domain; -+ -+ -+/* Names for the libintl functions are a problem. They must not clash -+ with existing names and they should follow ANSI C. But this source -+ code is also used in GNU C Library where the names have a __ -+ prefix. So we have to make a difference here. */ -+#ifdef _LIBC -+# define TEXTDOMAIN __textdomain -+# ifndef strdup -+# define strdup(str) __strdup (str) -+# endif -+#else -+# define TEXTDOMAIN textdomain__ -+#endif -+ -+/* Set the current default message catalog to DOMAINNAME. -+ If DOMAINNAME is null, return the current default. -+ If DOMAINNAME is "", reset to the default of "messages". */ -+char * -+TEXTDOMAIN (domainname) -+ const char *domainname; -+{ -+ char *old; -+ -+ /* A NULL pointer requests the current setting. */ -+ if (domainname == NULL) -+ return (char *) _nl_current_default_domain; -+ -+ old = (char *) _nl_current_default_domain; -+ -+ /* If domain name is the null string set to default domain "messages". */ -+ if (domainname[0] == '\0' -+ || strcmp (domainname, _nl_default_default_domain) == 0) -+ _nl_current_default_domain = _nl_default_default_domain; -+ else -+ { -+ /* If the following malloc fails `_nl_current_default_domain' -+ will be NULL. This value will be returned and so signals we -+ are out of core. */ -+#if defined _LIBC || defined HAVE_STRDUP -+ _nl_current_default_domain = strdup (domainname); -+#else -+ size_t len = strlen (domainname) + 1; -+ char *cp = (char *) malloc (len); -+ if (cp != NULL) -+ memcpy (cp, domainname, len); -+ _nl_current_default_domain = cp; -+#endif -+ } -+ -+ if (old != _nl_default_default_domain) -+ free (old); -+ -+ return (char *) _nl_current_default_domain; -+} -+ -+#ifdef _LIBC -+/* Alias for function name in GNU C Library. */ -+weak_alias (__textdomain, textdomain); -+#endif -diff -urP gnome-vfs-1.0.orig/intl/xopen-msg.sed gnome-vfs-1.0/intl/xopen-msg.sed ---- gnome-vfs-1.0.orig/intl/xopen-msg.sed Wed Dec 31 19:00:00 1969 -+++ gnome-vfs-1.0/intl/xopen-msg.sed Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,104 @@ -+# po2msg.sed - Convert Uniforum style .po file to X/Open style .msg file -+# Copyright (C) 1995 Free Software Foundation, Inc. -+# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+# -+# This program 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 General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+# -+# The first directive in the .msg should be the definition of the -+# message set number. We use always set number 1. -+# -+1 { -+ i\ -+$set 1 # Automatically created by po2msg.sed -+ h -+ s/.*/0/ -+ x -+} -+# -+# We copy all comments into the .msg file. Perhaps they can help. -+# -+/^#/ s/^#[ ]*/$ /p -+# -+# We copy the original message as a comment into the .msg file. -+# -+/^msgid/ { -+# Does not work now -+# /"$/! { -+# s/\\$// -+# s/$/ ... (more lines following)"/ -+# } -+ s/^msgid[ ]*"\(.*\)"$/$ Original Message: \1/ -+ p -+} -+# -+# The .msg file contains, other then the .po file, only the translations -+# but each given a unique ID. Starting from 1 and incrementing by 1 for -+# each message we assign them to the messages. -+# It is important that the .po file used to generate the cat-id-tbl.c file -+# (with po-to-tbl) is the same as the one used here. (At least the order -+# of declarations must not be changed.) -+# -+/^msgstr/ { -+ s/msgstr[ ]*"\(.*\)"/\1/ -+ x -+# The following nice solution is by -+# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de> -+ td -+# Increment a decimal number in pattern space. -+# First hide trailing `9' digits. -+ :d -+ s/9\(_*\)$/_\1/ -+ td -+# Assure at least one digit is available. -+ s/^\(_*\)$/0\1/ -+# Increment the last digit. -+ s/8\(_*\)$/9\1/ -+ s/7\(_*\)$/8\1/ -+ s/6\(_*\)$/7\1/ -+ s/5\(_*\)$/6\1/ -+ s/4\(_*\)$/5\1/ -+ s/3\(_*\)$/4\1/ -+ s/2\(_*\)$/3\1/ -+ s/1\(_*\)$/2\1/ -+ s/0\(_*\)$/1\1/ -+# Convert the hidden `9' digits to `0's. -+ s/_/0/g -+ x -+# Bring the line in the format `<number> <message>' -+ G -+ s/^[^\n]*$/& / -+ s/\(.*\)\n\([0-9]*\)/\2 \1/ -+# Clear flag from last substitution. -+ tb -+# Append the next line. -+ :b -+ N -+# Look whether second part is a continuation line. -+ s/\(.*\n\)"\(.*\)"/\1\2/ -+# Yes, then branch. -+ ta -+ P -+ D -+# Note that `D' includes a jump to the start!! -+# We found a continuation line. But before printing insert '\'. -+ :a -+ s/\(.*\)\(\n.*\)/\1\\\2/ -+ P -+# We cannot use the sed command `D' here -+ s/.*\n\(.*\)/\1/ -+ tb -+} -+d diff --git a/gnome-base/gnome-vfs/gnome-vfs-1.0.ebuild b/gnome-base/gnome-vfs/gnome-vfs-1.0.ebuild deleted file mode 100644 index c66ec08fc15e..000000000000 --- a/gnome-base/gnome-vfs/gnome-vfs-1.0.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/gnome-base/gnome-vfs/gnome-vfs-1.0.ebuild,v 1.1 2001/04/13 16:59:03 pete Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="gnome-vfs" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${A} - ftp://gnome.eazel.com/pub/gnome/unstable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/" - -DEPEND="nls? ( sys-devel/gettext ) - >=gnome-base/gnome-env-1.0 - >=gnome-base/gconf-1.0.0 - >=gnome-base/gnome-libs-1.2.13" - - -src_unpack() { - unpack ${A} - cd ${S} - patch -p1 < ${FILESDIR}/${P}-gentoo-intl.diff -} - -src_compile() { - - local myconf - if [ -z "`use nls`" ] - then - myconf="--disable-nls" - fi - try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome \ - --mandir=/opt/gnome/share/man ${myconf} - try make - -} - -src_install() { - - try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome mandir=${D}/opt/gnome/share/man install - dodoc AUTHORS COPYING* ChangeLog NEWS README -} - - - - - diff --git a/gnome-base/gtkhtml/files/digest-gtkhtml-0.8.3 b/gnome-base/gtkhtml/files/digest-gtkhtml-0.8.3 deleted file mode 100644 index 8cd6570b4e8c..000000000000 --- a/gnome-base/gtkhtml/files/digest-gtkhtml-0.8.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 64514460001885497198b7e389c33077 gtkhtml-0.8.3.tar.gz diff --git a/gnome-base/gtkhtml/files/gtkhtml-0.8.3-gentoo.diff b/gnome-base/gtkhtml/files/gtkhtml-0.8.3-gentoo.diff deleted file mode 100644 index 1094dcf6c5ce..000000000000 --- a/gnome-base/gtkhtml/files/gtkhtml-0.8.3-gentoo.diff +++ /dev/null @@ -1,5092 +0,0 @@ -diff -urP gtkhtml-0.8.3.orig/intl/ChangeLog gtkhtml-0.8.3/intl/ChangeLog ---- gtkhtml-0.8.3.orig/intl/ChangeLog Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/ChangeLog Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,1086 @@ -+1998-04-29 Ulrich Drepper <drepper@cygnus.com> -+ -+ * intl/localealias.c (read_alias_file): Use unsigned char for -+ local variables. Remove unused variable tp. -+ * intl/l10nflist.c (_nl_normalize_codeset): Use unsigned char * -+ for type of codeset. For loosing Solaris systems. -+ * intl/loadinfo.h: Adapt prototype of _nl_normalize_codeset. -+ * intl/bindtextdom.c (BINDTEXTDOMAIN): Don't define local variable -+ len if not needed. -+ Patches by Jim Meyering. -+ -+1998-04-28 Ulrich Drepper <drepper@cygnus.com> -+ -+ * loadmsgcat.c (_nl_load_domain): Don't assign the element use_mmap if -+ mmap is not supported. -+ -+ * hash-string.h: Don't include <values.h>. -+ -+1998-04-27 Ulrich Drepper <drepper@cygnus.com> -+ -+ * textdomain.c: Use strdup is available. -+ -+ * localealias.c: Define HAVE_MEMPCPY so that we can use this -+ function. Define and use semapahores to protect modfication of -+ global objects when compiling for glibc. Add code to allow -+ freeing alias table. -+ -+ * l10nflist.c: Don't assume stpcpy not being a macro. -+ -+ * gettextP.h: Define internal_function macri if not already done. -+ Use glibc byte-swap macros instead of defining SWAP when compiled -+ for glibc. -+ (struct loaded_domain): Add elements to allow unloading. -+ -+ * Makefile.in (distclean): Don't remove libintl.h here. -+ -+ * bindtextdomain.c: Carry over changes from glibc. Use strdup if -+ available. -+ -+ * dcgettext.c: Don't assume stpcpy not being a macro. Mark internal -+ functions. Add memory freeing code for glibc. -+ -+ * dgettext.c: Update copyright. -+ -+ * explodename.c: Include stdlib.h and string.h only if they exist. -+ Use strings.h eventually. -+ -+ * finddomain.c: Mark internal functions. Use strdup if available. -+ Add memory freeing code for glibc. -+ -+1997-10-10 20:00 Ulrich Drepper <drepper@cygnus.com> -+ -+ * libgettext.h: Fix dummy textdomain and bindtextdomain macros. -+ They should return reasonable values. -+ Reported by Tom Tromey <tromey@cygnus.com>. -+ -+1997-09-16 03:33 Ulrich Drepper <drepper@cygnus.com> -+ -+ * libgettext.h: Define PARAMS also to `args' if __cplusplus is defined. -+ * intlh.inst.in: Likewise. -+ Reported by Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>. -+ -+ * libintl.glibc: Update from current glibc version. -+ -+1997-09-06 02:10 Ulrich Drepper <drepper@cygnus.com> -+ -+ * intlh.inst.in: Reformat copyright. -+ -+1997-08-19 15:22 Ulrich Drepper <drepper@cygnus.com> -+ -+ * dcgettext.c (DCGETTEXT): Remove wrong comment. -+ -+1997-08-16 00:13 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (install-data): Don't change directory to install. -+ -+1997-08-01 14:30 Ulrich Drepper <drepper@cygnus.com> -+ -+ * cat-compat.c: Fix copyright. -+ -+ * localealias.c: Don't define strchr unless !HAVE_STRCHR. -+ -+ * loadmsgcat.c: Update copyright. Fix typos. -+ -+ * l10nflist.c: Don't define strchr unless !HAVE_STRCHR. -+ (_nl_make_l10nflist): Handle sponsor and revision correctly. -+ -+ * gettext.c: Update copyright. -+ * gettext.h: Likewise. -+ * hash-string.h: Likewise. -+ -+ * finddomain.c: Remoave dead code. Define strchr only if -+ !HAVE_STRCHR. -+ -+ * explodename.c: Include <sys/types.h>. -+ -+ * explodename.c: Reformat copyright text. -+ (_nl_explode_name): Fix typo. -+ -+ * dcgettext.c: Define and use __set_errno. -+ (guess_category_value): Don't use setlocale if HAVE_LC_MESSAGES is -+ not defined. -+ -+ * bindtextdom.c: Pretty printing. -+ -+1997-05-01 02:25 Ulrich Drepper <drepper@cygnus.com> -+ -+ * dcgettext.c (guess_category_value): Don't depend on -+ HAVE_LC_MESSAGES. We don't need the macro here. -+ Patch by Bruno Haible <haible@ilog.fr>. -+ -+ * cat-compat.c (textdomain): DoN't refer to HAVE_SETLOCALE_NULL -+ macro. Instead use HAVE_LOCALE_NULL and define it when using -+ glibc, as in dcgettext.c. -+ Patch by Bruno Haible <haible@ilog.fr>. -+ -+ * Makefile.in (CPPFLAGS): New variable. Reported by Franc,ois -+ Pinard. -+ -+Mon Mar 10 06:51:17 1997 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in: Implement handling of libtool. -+ -+ * gettextP.h: Change data structures for use of generic lowlevel -+ i18n file handling. -+ -+Wed Dec 4 20:21:18 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * textdomain.c: Put parentheses around arguments of memcpy macro -+ definition. -+ * localealias.c: Likewise. -+ * l10nflist.c: Likewise. -+ * finddomain.c: Likewise. -+ * bindtextdom.c: Likewise. -+ Reported by Thomas Esken. -+ -+Mon Nov 25 22:57:51 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * textdomain.c: Move definition of `memcpy` macro to right -+ position. -+ -+Fri Nov 22 04:01:58 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * finddomain.c [!HAVE_STRING_H && !_LIBC]: Define memcpy using -+ bcopy if not already defined. Reported by Thomas Esken. -+ * bindtextdom.c: Likewise. -+ * l10nflist.c: Likewise. -+ * localealias.c: Likewise. -+ * textdomain.c: Likewise. -+ -+Tue Oct 29 11:10:27 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (libdir): Change to use exec_prefix instead of -+ prefix. Reported by Knut-HåvardAksnes <etokna@eto.ericsson.se>. -+ -+Sat Aug 31 03:07:09 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * l10nflist.c (_nl_normalize_codeset): We convert to lower case, -+ so don't prepend uppercase `ISO' for only numeric arg. -+ -+Fri Jul 19 00:15:46 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * l10nflist.c: Move inclusion of argz.h, ctype.h, stdlib.h after -+ definition of _GNU_SOURCE. Patch by Roland McGrath. -+ -+ * Makefile.in (uninstall): Fix another bug with `for' loop and -+ empty arguments. Patch by Jim Meyering. Correct name os -+ uninstalled files: no intl- prefix anymore. -+ -+ * Makefile.in (install-data): Again work around shells which -+ cannot handle mpty for list. Reported by Jim Meyering. -+ -+Sat Jul 13 18:11:35 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (install): Split goal. Now depend on install-exec -+ and install-data. -+ (install-exec, install-data): New goals. Created from former -+ install goal. -+ Reported by Karl Berry. -+ -+Sat Jun 22 04:58:14 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (MKINSTALLDIRS): New variable. Path to -+ mkinstalldirs script. -+ (install): use MKINSTALLDIRS variable or if the script is not present -+ try to find it in the $top_scrdir). -+ -+Wed Jun 19 02:56:56 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * l10nflist.c: Linux libc *partly* includes the argz_* functions. -+ Grr. Work around by renaming the static version and use macros -+ for renaming. -+ -+Tue Jun 18 20:11:17 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * l10nflist.c: Correct presence test macros of __argz_* functions. -+ -+ * l10nflist.c: Include <argz.h> based on test of it instead when -+ __argz_* functions are available. -+ Reported by Andreas Schwab. -+ -+Thu Jun 13 15:17:44 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * explodename.c, l10nflist.c: Define NULL for dumb systems. -+ -+Tue Jun 11 17:05:13 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * intlh.inst.in, libgettext.h (dcgettext): Rename local variable -+ result to __result to prevent name clash. -+ -+ * l10nflist.c, localealias.c, dcgettext.c: Define _GNU_SOURCE to -+ get prototype for stpcpy and strcasecmp. -+ -+ * intlh.inst.in, libgettext.h: Move declaration of -+ `_nl_msg_cat_cntr' outside __extension__ block to prevent warning -+ from gcc's -Wnested-extern option. -+ -+Fri Jun 7 01:58:00 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (install): Remove comment. -+ -+Thu Jun 6 17:28:17 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (install): Work around for another Buglix stupidity. -+ Always use an `else' close for `if's. Reported by Nelson Beebe. -+ -+ * Makefile.in (intlh.inst): Correct typo in phony rule. -+ Reported by Nelson Beebe. -+ -+Thu Jun 6 01:49:52 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * dcgettext.c (read_alias_file): Rename variable alloca_list to -+ block_list as the macro calls assume. -+ Patch by Eric Backus. -+ -+ * localealias.c [!HAVE_ALLOCA]: Define alloca as macro using -+ malloc. -+ (read_alias_file): Rename varriabe alloca_list to block_list as the -+ macro calls assume. -+ Patch by Eric Backus. -+ -+ * l10nflist.c: Correct conditional for <argz.h> inclusion. -+ Reported by Roland McGrath. -+ -+ * Makefile.in (all): Depend on all-@USE_INCLUDED_LIBINTL@, not -+ all-@USE_NLS@. -+ -+ * Makefile.in (install): intlh.inst comes from local dir, not -+ $(srcdir). -+ -+ * Makefile.in (intlh.inst): Special handling of this goal. If -+ used in gettext, this is really a rul to construct this file. If -+ used in any other package it is defined as a .PHONY rule with -+ empty body. -+ -+ * finddomain.c: Extract locale file information handling into -+ l10nfile.c. Rename local stpcpy__ function to stpcpy. -+ -+ * dcgettext.c (stpcpy): Add local definition. -+ -+ * l10nflist.c: Solve some portability problems. Patches partly by -+ Thomas Esken. Add local definition of stpcpy. -+ -+Tue Jun 4 02:47:49 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * intlh.inst.in: Don't depend including <locale.h> on -+ HAVE_LOCALE_H. Instead configure must rewrite this fiile -+ depending on the result of the configure run. -+ -+ * Makefile.in (install): libintl.inst is now called intlh.inst. -+ Add rules for updating intlh.inst from intlh.inst.in. -+ -+ * libintl.inst: Renamed to intlh.inst.in. -+ -+ * localealias.c, dcgettext.c [__GNUC__]: Define HAVE_ALLOCA to 1 -+ because gcc has __buitlin_alloca. -+ Reported by Roland McGrath. -+ -+Mon Jun 3 00:32:16 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (installcheck): New goal to fulfill needs of -+ automake's distcheck. -+ -+ * Makefile.in (install): Reorder commands so that VERSION is -+ found. -+ -+ * Makefile.in (gettextsrcdir): Now use subdirectory intl/ in -+ @datadir@/gettext. -+ (COMSRCS): Add l10nfile.c. -+ (OBJECTS): Add l10nfile.o. -+ (DISTFILES): Rename to DISTFILE.normal. Remove $(DISTFILES.common). -+ (DISTFILE.gettext): Remove $(DISTFILES.common). -+ (all-gettext): Remove goal. -+ (install): If $(PACKAGE) = gettext install, otherwose do nothing. No -+ package but gettext itself should install libintl.h + headers. -+ (dist): Extend goal to work for gettext, too. -+ (dist-gettext): Remove goal. -+ -+ * dcgettext.c [!HAVE_ALLOCA]: Define macro alloca by using malloc. -+ -+Sun Jun 2 17:33:06 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * loadmsgcat.c (_nl_load_domain): Parameter is now comes from -+ find_l10nfile. -+ -+Sat Jun 1 02:23:03 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * l10nflist.c (__argz_next): Add definition. -+ -+ * dcgettext.c [!HAVE_ALLOCA]: Add code for handling missing alloca -+ code. Use new l10nfile handling. -+ -+ * localealias.c [!HAVE_ALLOCA]: Add code for handling missing -+ alloca code. -+ -+ * l10nflist.c: Initial revision. -+ -+Tue Apr 2 18:51:18 1996 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (all-gettext): New goal. Same as all-yes. -+ -+Thu Mar 28 23:01:22 1996 Karl Eichwalder <ke@ke.central.de> -+ -+ * Makefile.in (gettextsrcdir): Define using @datadir@. -+ -+Tue Mar 26 12:39:14 1996 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c: Include <ctype.h>. Reported by Roland McGrath. -+ -+Sat Mar 23 02:00:35 1996 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (stpcpy): Rename to stpcpy__ to prevent clashing -+ with external declaration. -+ -+Sat Mar 2 00:47:09 1996 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (all-no): Rename from all_no. -+ -+Sat Feb 17 00:25:59 1996 Ulrich Drepper <drepper@myware> -+ -+ * gettextP.h [loaded_domain]: Array `successor' must now contain up -+ to 63 elements (because of codeset name normalization). -+ -+ * finddomain.c: Implement codeset name normalization. -+ -+Thu Feb 15 04:39:09 1996 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (all): Define to `all-@USE_NLS@'. -+ (all-yes, all_no): New goals. `all-no' is noop, `all-yes' -+ is former all. -+ -+Mon Jan 15 21:46:01 1996 Howard Gayle <howard@hal.com> -+ -+ * localealias.c (alias_compare): Increment string pointers in loop -+ of strcasecmp replacement. -+ -+Fri Dec 29 21:16:34 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (install-src): Who commented this goal out ? :-) -+ -+Fri Dec 29 15:08:16 1995 Ulrich Drepper <drepper@myware> -+ -+ * dcgettext.c (DCGETTEXT): Save `errno'. Failing system calls -+ should not effect it because a missing catalog is no error. -+ Reported by Harald K<o:>nig <koenig@tat.physik.uni-tuebingen.de>. -+ -+Tue Dec 19 22:09:13 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (Makefile): Explicitly use $(SHELL) for running -+ shell scripts. -+ -+Fri Dec 15 17:34:59 1995 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> -+ -+ * Makefile.in (install-src): Only install library and header when -+ we use the own implementation. Don't do it when using the -+ system's gettext or catgets functions. -+ -+ * dcgettext.c (find_msg): Must not swap domain->hash_size here. -+ -+Sat Dec 9 16:24:37 1995 Ulrich Drepper <drepper@myware> -+ -+ * localealias.c, libintl.inst, libgettext.h, hash-string.h, -+ gettextP.h, finddomain.c, dcgettext.c, cat-compat.c: -+ Use PARAMS instead of __P. Suggested by Roland McGrath. -+ -+Tue Dec 5 11:39:14 1995 Larry Schwimmer <rosebud@cyclone.stanford.edu> -+ -+ * libgettext.h: Use `#if !defined (_LIBINTL_H)' instead of `#if -+ !_LIBINTL_H' because Solaris defines _LIBINTL_H as empty. -+ -+Mon Dec 4 15:42:07 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (install-src): -+ Install libintl.inst instead of libintl.h.install. -+ -+Sat Dec 2 22:51:38 1995 Marcus Daniels <marcus@sysc.pdx.edu> -+ -+ * cat-compat.c (textdomain): -+ Reverse order in which files are tried you load. First -+ try local file, when this failed absolute path. -+ -+Wed Nov 29 02:03:53 1995 Nelson H. F. Beebe <beebe@math.utah.edu> -+ -+ * cat-compat.c (bindtextdomain): Add missing { }. -+ -+Sun Nov 26 18:21:41 1995 Ulrich Drepper <drepper@myware> -+ -+ * libintl.inst: Add missing __P definition. Reported by Nelson Beebe. -+ -+ * Makefile.in: -+ Add dummy `all' and `dvi' goals. Reported by Tom Tromey. -+ -+Sat Nov 25 16:12:01 1995 Franc,ois Pinard <pinard@iro.umontreal.ca> -+ -+ * hash-string.h: Capitalize arguments of macros. -+ -+Sat Nov 25 12:01:36 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (DISTFILES): Prevent files names longer than 13 -+ characters. libintl.h.glibc->libintl.glibc, -+ libintl.h.install->libintl.inst. Reported by Joshua R. Poulson. -+ -+Sat Nov 25 11:31:12 1995 Eric Backus <ericb@lsid.hp.com> -+ -+ * dcgettext.c: Fix bug in preprocessor conditionals. -+ -+Sat Nov 25 02:35:27 1995 Nelson H. F. Beebe <beebe@math.utah.edu> -+ -+ * libgettext.h: Solaris cc does not understand -+ #if !SYMBOL1 && !SYMBOL2. Sad but true. -+ -+Thu Nov 23 16:22:14 1995 Ulrich Drepper <drepper@myware> -+ -+ * hash-string.h (hash_string): -+ Fix for machine with >32 bit `unsigned long's. -+ -+ * dcgettext.c (DCGETTEXT): -+ Fix horrible bug in loop for alternative translation. -+ -+Thu Nov 23 01:45:29 1995 Ulrich Drepper <drepper@myware> -+ -+ * po2tbl.sed.in, linux-msg.sed, xopen-msg.sed: -+ Some further simplifications in message number generation. -+ -+Mon Nov 20 21:08:43 1995 Ulrich Drepper <drepper@myware> -+ -+ * libintl.h.glibc: Use __const instead of const in prototypes. -+ -+ * Makefile.in (install-src): -+ Install libintl.h.install instead of libintl.h. This -+ is a stripped-down version. Suggested by Peter Miller. -+ -+ * libintl.h.install, libintl.h.glibc: Initial revision. -+ -+ * localealias.c (_nl_expand_alias, read_alias_file): -+ Protect prototypes in type casts by __P. -+ -+Tue Nov 14 16:43:58 1995 Ulrich Drepper <drepper@myware> -+ -+ * hash-string.h: Correct prototype for hash_string. -+ -+Sun Nov 12 12:42:30 1995 Ulrich Drepper <drepper@myware> -+ -+ * hash-string.h (hash_string): Add prototype. -+ -+ * gettextP.h: Fix copyright. -+ (SWAP): Add prototype. -+ -+Wed Nov 8 22:56:33 1995 Ulrich Drepper <drepper@myware> -+ -+ * localealias.c (read_alias_file): Forgot sizeof. -+ Avoid calling *printf function. This introduces a big overhead. -+ Patch by Roland McGrath. -+ -+Tue Nov 7 14:21:08 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c, cat-compat.c: Wrong indentation in #if for stpcpy. -+ -+ * finddomain.c (stpcpy): -+ Define substitution function local. The macro was to flaky. -+ -+ * cat-compat.c: Fix typo. -+ -+ * xopen-msg.sed, linux-msg.sed: -+ While bringing message number to right place only accept digits. -+ -+ * linux-msg.sed, xopen-msg.sed: Now that the counter does not have -+ leading 0s we don't need to remove them. Reported by Marcus -+ Daniels. -+ -+ * Makefile.in (../po/cat-id-tbl.o): Use $(top_srdir) in -+ dependency. Reported by Marcus Daniels. -+ -+ * cat-compat.c: (stpcpy) [!_LIBC && !HAVE_STPCPY]: Define replacement. -+ Generally cleanup using #if instead of #ifndef. -+ -+ * Makefile.in: Correct typos in comment. By Franc,ois Pinard. -+ -+Mon Nov 6 00:27:02 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (install-src): Don't install libintl.h and libintl.a -+ if we use an available gettext implementation. -+ -+Sun Nov 5 22:02:08 1995 Ulrich Drepper <drepper@myware> -+ -+ * libgettext.h: Fix typo: HAVE_CATGETTS -> HAVE_CATGETS. Reported -+ by Franc,ois Pinard. -+ -+ * libgettext.h: Use #if instead of #ifdef/#ifndef. -+ -+ * finddomain.c: -+ Comments describing what has to be done should start with FIXME. -+ -+Sun Nov 5 19:38:01 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (DISTFILES): Split. Use DISTFILES with normal meaning. -+ DISTFILES.common names the files common to both dist goals. -+ DISTFILES.gettext are the files only distributed in GNU gettext. -+ -+Sun Nov 5 17:32:54 1995 Ulrich Drepper <drepper@myware> -+ -+ * dcgettext.c (DCGETTEXT): Correct searching in derived locales. -+ This was necessary since a change in _nl_find_msg several weeks -+ ago. I really don't know this is still not fixed. -+ -+Sun Nov 5 12:43:12 1995 Ulrich Drepper <drepper@myware> -+ -+ * loadmsgcat.c (_nl_load_domain): Test for FILENAME == NULL. This -+ might mark a special condition. -+ -+ * finddomain.c (make_entry_rec): Don't make illegal entry as decided. -+ -+ * Makefile.in (dist): Suppress error message when ln failed. -+ Get files from $(srcdir) explicitly. -+ -+ * libgettext.h (gettext_const): Rename to gettext_noop. -+ -+Fri Nov 3 07:36:50 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (make_entry_rec): -+ Protect against wrong locale names by testing mask. -+ -+ * libgettext.h (gettext_const): Add macro definition. -+ Capitalize macro arguments. -+ -+Thu Nov 2 23:15:51 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (_nl_find_domain): -+ Test for pointer != NULL before accessing value. -+ Reported by Tom Tromey. -+ -+ * gettext.c (NULL): -+ Define as (void*)0 instad of 0. Reported by Franc,ois Pinard. -+ -+Mon Oct 30 21:28:52 1995 Ulrich Drepper <drepper@myware> -+ -+ * po2tbl.sed.in: Serious typo bug fixed by Jim Meyering. -+ -+Sat Oct 28 23:20:47 1995 Ulrich Drepper <drepper@myware> -+ -+ * libgettext.h: Disable dcgettext optimization for Solaris 2.3. -+ -+ * localealias.c (alias_compare): -+ Peter Miller reported that tolower in some systems is -+ even dumber than I thought. Protect call by `isupper'. -+ -+Fri Oct 27 22:22:51 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (libdir, includedir): New variables. -+ (install-src): Install libintl.a and libintl.h in correct dirs. -+ -+Fri Oct 27 22:07:29 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (SOURCES): Fix typo: intrl.compat.c -> intl-compat.c. -+ -+ * po2tbl.sed.in: Patch for buggy SEDs by Christian von Roques. -+ -+ * localealias.c: -+ Fix typo and superflous test. Reported by Christian von Roques. -+ -+Fri Oct 6 11:52:05 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (_nl_find_domain): -+ Correct some remainder from the pre-CEN syntax. Now -+ we don't have a constant number of successors anymore. -+ -+Wed Sep 27 21:41:13 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (DISTFILES): Add libintl.h.glibc. -+ -+ * Makefile.in (dist-libc): Add goal for packing sources for glibc. -+ (COMSRCS, COMHDRS): Splitted to separate sources shared with glibc. -+ -+ * loadmsgcat.c: Forget to continue #if line. -+ -+ * localealias.c: -+ [_LIBC]: Rename strcasecmp to __strcasecmp to keep ANSI C name -+ space clean. -+ -+ * dcgettext.c, finddomain.c: Better comment to last change. -+ -+ * loadmsgcat.c: -+ [_LIBC]: Rename fstat, open, close, read, mmap, and munmap to -+ __fstat, __open, __close, __read, __mmap, and __munmap resp -+ to keep ANSI C name space clean. -+ -+ * finddomain.c: -+ [_LIBC]: Rename stpcpy to __stpcpy to keep ANSI C name space clean. -+ -+ * dcgettext.c: -+ [_LIBC]: Rename getced and stpcpy to __getcwd and __stpcpy resp to -+ keep ANSI C name space clean. -+ -+ * libgettext.h: -+ Include sys/types.h for those old SysV systems out there. -+ Reported by Francesco Potorti`. -+ -+ * loadmsgcat.c (use_mmap): Define if compiled for glibc. -+ -+ * bindtextdom.c: Include all those standard headers -+ unconditionally if _LIBC is defined. -+ -+ * finddomain.c: Fix 2 times defiend -> defined. -+ -+ * textdomain.c: Include libintl.h instead of libgettext.h when -+ compiling for glibc. Include all those standard headers -+ unconditionally if _LIBC is defined. -+ -+ * localealias.c, loadmsgcat.c: Prepare to be compiled in glibc. -+ -+ * gettext.c: -+ Include libintl.h instead of libgettext.h when compiling for glibc. -+ Get NULL from stddef.h if we compile for glibc. -+ -+ * finddomain.c: Include libintl.h instead of libgettext.h when -+ compiling for glibc. Include all those standard headers -+ unconditionally if _LIBC is defined. -+ -+ * dcgettext.c: Include all those standard headers unconditionally -+ if _LIBC is defined. -+ -+ * dgettext.c: If compiled in glibc include libintl.h instead of -+ libgettext.h. -+ (locale.h): Don't rely on HAVE_LOCALE_H when compiling for glibc. -+ -+ * dcgettext.c: If compiled in glibc include libintl.h instead of -+ libgettext.h. -+ (getcwd): Don't rely on HAVE_GETCWD when compiling for glibc. -+ -+ * bindtextdom.c: -+ If compiled in glibc include libintl.h instead of libgettext.h. -+ -+Mon Sep 25 22:23:06 1995 Ulrich Drepper <drepper@myware> -+ -+ * localealias.c (_nl_expand_alias): Don't call bsearch if NMAP <= 0. -+ Reported by Marcus Daniels. -+ -+ * cat-compat.c (bindtextdomain): -+ String used in putenv must not be recycled. -+ Reported by Marcus Daniels. -+ -+ * libgettext.h (__USE_GNU_GETTEXT): -+ Additional symbol to signal that we use GNU gettext -+ library. -+ -+ * cat-compat.c (bindtextdomain): -+ Fix bug with the strange stpcpy replacement. -+ Reported by Nelson Beebe. -+ -+Sat Sep 23 08:23:51 1995 Ulrich Drepper <drepper@myware> -+ -+ * cat-compat.c: Include <string.h> for stpcpy prototype. -+ -+ * localealias.c (read_alias_file): -+ While expand strdup code temporary variable `cp' hided -+ higher level variable with same name. Rename to `tp'. -+ -+ * textdomain.c (textdomain): -+ Avoid warning by using temporary variable in strdup code. -+ -+ * finddomain.c (_nl_find_domain): Remove unused variable `application'. -+ -+Thu Sep 21 15:51:44 1995 Ulrich Drepper <drepper@myware> -+ -+ * localealias.c (alias_compare): -+ Use strcasecmp() only if available. Else use -+ implementation in place. -+ -+ * intl-compat.c: -+ Wrapper functions now call *__ functions instead of __*. -+ -+ * libgettext.h: Declare prototypes for *__ functions instead for __*. -+ -+ * cat-compat.c, loadmsgcat.c: -+ Don't use xmalloc, xstrdup, and stpcpy. These functions are not part -+ of the standard libc and so prevent libintl.a from being used -+ standalone. -+ -+ * bindtextdom.c: -+ Don't use xmalloc, xstrdup, and stpcpy. These functions are not part -+ of the standard libc and so prevent libintl.a from being used -+ standalone. -+ Rename to bindtextdomain__ if not used in GNU C Library. -+ -+ * dgettext.c: -+ Rename function to dgettext__ if not used in GNU C Library. -+ -+ * gettext.c: -+ Don't use xmalloc, xstrdup, and stpcpy. These functions are not part -+ of the standard libc and so prevent libintl.a from being used -+ standalone. -+ Functions now called gettext__ if not used in GNU C Library. -+ -+ * dcgettext.c, localealias.c, textdomain.c, finddomain.c: -+ Don't use xmalloc, xstrdup, and stpcpy. These functions are not part -+ of the standard libc and so prevent libintl.a from being used -+ standalone. -+ -+Sun Sep 17 23:14:49 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c: Correct some bugs in handling of CEN standard -+ locale definitions. -+ -+Thu Sep 7 01:49:28 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c: Implement CEN syntax. -+ -+ * gettextP.h (loaded_domain): Extend number of successors to 31. -+ -+Sat Aug 19 19:25:29 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (aliaspath): Remove path to X11 locale dir. -+ -+ * Makefile.in: Make install-src depend on install. This helps -+ gettext to install the sources and other packages can use the -+ install goal. -+ -+Sat Aug 19 15:19:33 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (uninstall): Remove stuff installed by install-src. -+ -+Tue Aug 15 13:13:53 1995 Ulrich Drepper <drepper@myware> -+ -+ * VERSION.in: Initial revision. -+ -+ * Makefile.in (DISTFILES): -+ Add VERSION file. This is not necessary for gettext, but -+ for other packages using this library. -+ -+Tue Aug 15 06:16:44 1995 Ulrich Drepper <drepper@myware> -+ -+ * gettextP.h (_nl_find_domain): -+ New prototype after changing search strategy. -+ -+ * finddomain.c (_nl_find_domain): -+ We now try only to find a specified catalog. Fall back to other -+ catalogs listed in the locale list is now done in __dcgettext. -+ -+ * dcgettext.c (__dcgettext): -+ Now we provide message fall back even to different languages. -+ I.e. if a message is not available in one language all the other -+ in the locale list a tried. Formerly fall back was only possible -+ within one language. Implemented by moving one loop from -+ _nl_find_domain to here. -+ -+Mon Aug 14 23:45:50 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (gettextsrcdir): -+ Directory where source of GNU gettext library are made -+ available. -+ (INSTALL, INSTALL_DATA): Programs used for installing sources. -+ (gettext-src): New. Rule to install GNU gettext sources for use in -+ gettextize shell script. -+ -+Sun Aug 13 14:40:48 1995 Ulrich Drepper <drepper@myware> -+ -+ * loadmsgcat.c (_nl_load_domain): -+ Use mmap for loading only when munmap function is -+ also available. -+ -+ * Makefile.in (install): Depend on `all' goal. -+ -+Wed Aug 9 11:04:33 1995 Ulrich Drepper <drepper@myware> -+ -+ * localealias.c (read_alias_file): -+ Do not overwrite '\n' when terminating alias value string. -+ -+ * localealias.c (read_alias_file): -+ Handle long lines. Ignore the rest not fitting in -+ the buffer after the initial `fgets' call. -+ -+Wed Aug 9 00:54:29 1995 Ulrich Drepper <drepper@myware> -+ -+ * gettextP.h (_nl_load_domain): -+ Add prototype, replacing prototype for _nl_load_msg_cat. -+ -+ * finddomain.c (_nl_find_domain): -+ Remove unneeded variable filename and filename_len. -+ (expand_alias): Remove prototype because functions does not -+ exist anymore. -+ -+ * localealias.c (read_alias_file): -+ Change type of fname_len parameter to int. -+ (xmalloc): Add prototype. -+ -+ * loadmsgcat.c: Better prototypes for xmalloc. -+ -+Tue Aug 8 22:30:39 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (_nl_find_domain): -+ Allow alias name to be constructed from the four components. -+ -+ * Makefile.in (aliaspath): New variable. Set to preliminary value. -+ (SOURCES): Add localealias.c. -+ (OBJECTS): Add localealias.o. -+ -+ * gettextP.h: Add prototype for _nl_expand_alias. -+ -+ * finddomain.c: Aliasing handled in intl/localealias.c. -+ -+ * localealias.c: Aliasing for locale names. -+ -+ * bindtextdom.c: Better prototypes for xmalloc and xstrdup. -+ -+Mon Aug 7 23:47:42 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (DISTFILES): gettext.perl is now found in misc/. -+ -+ * cat-compat.c (bindtextdomain): -+ Correct implementation. dirname parameter was not used. -+ Reported by Marcus Daniels. -+ -+ * gettextP.h (loaded_domain): -+ New fields `successor' and `decided' for oo, lazy -+ message handling implementation. -+ -+ * dcgettext.c: -+ Adopt for oo, lazy message handliing. -+ Now we can inherit translations from less specific locales. -+ (find_msg): New function. -+ -+ * loadmsgcat.c, finddomain.c: -+ Complete rewrite. Implement oo, lazy message handling :-). -+ We now have an additional environment variable `LANGUAGE' with -+ a higher priority than LC_ALL for the LC_MESSAGE locale. -+ Here we can set a colon separated list of specifications each -+ of the form `language[_territory[.codeset]][@modifier]'. -+ -+Sat Aug 5 09:55:42 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (unistd.h): -+ Include to get _PC_PATH_MAX defined on system having it. -+ -+Fri Aug 4 22:42:00 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (stpcpy): Include prototype. -+ -+ * Makefile.in (dist): Remove `copying instead' message. -+ -+Wed Aug 2 18:52:03 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (ID, TAGS): Do not use $^. -+ -+Tue Aug 1 20:07:11 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (TAGS, ID): Use $^ as command argument. -+ (TAGS): Give etags -o option t write to current directory, -+ not $(srcdir). -+ (ID): Use $(srcdir) instead os $(top_srcdir)/src. -+ (distclean): Remove ID. -+ -+Sun Jul 30 11:51:46 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (gnulocaledir): -+ New variable, always using share/ for data directory. -+ (DEFS): Add GNULOCALEDIR, used in finddomain.c. -+ -+ * finddomain.c (_nl_default_dirname): -+ Set to GNULOCALEDIR, because it always has to point -+ to the directory where GNU gettext Library writes it to. -+ -+ * intl-compat.c (textdomain, bindtextdomain): -+ Undefine macros before function definition. -+ -+Sat Jul 22 01:10:02 1995 Ulrich Drepper <drepper@myware> -+ -+ * libgettext.h (_LIBINTL_H): -+ Protect definition in case where this file is included as -+ libgettext.h on Solaris machines. Add comment about this. -+ -+Wed Jul 19 02:36:42 1995 Ulrich Drepper <drepper@myware> -+ -+ * intl-compat.c (textdomain): Correct typo. -+ -+Wed Jul 19 01:51:35 1995 Ulrich Drepper <drepper@myware> -+ -+ * dcgettext.c (dcgettext): Function now called __dcgettext. -+ -+ * dgettext.c (dgettext): Now called __dgettext and calls -+ __dcgettext. -+ -+ * gettext.c (gettext): -+ Function now called __gettext and calls __dgettext. -+ -+ * textdomain.c (textdomain): Function now called __textdomain. -+ -+ * bindtextdom.c (bindtextdomain): Function now called -+ __bindtextdomain. -+ -+ * intl-compat.c: Initial revision. -+ -+ * Makefile.in (SOURCES): Add intl-compat.c. -+ (OBJECTS): We always compile the GNU gettext library functions. -+ OBJECTS contains all objects but cat-compat.o, ../po/cat-if-tbl.o, -+ and intl-compat.o. -+ (GETTOBJS): Contains now only intl-compat.o. -+ -+ * libgettext.h: -+ Re-include protection matches dualistic character of libgettext.h. -+ For all functions in GNU gettext library define __ counter part. -+ -+ * finddomain.c (strchr): Define as index if not found in C library. -+ (_nl_find_domain): For relative paths paste / in between. -+ -+Tue Jul 18 16:37:45 1995 Ulrich Drepper <drepper@myware> -+ -+ * loadmsgcat.c, finddomain.c: Add inclusion of sys/types.h. -+ -+ * xopen-msg.sed: Fix bug with `msgstr ""' lines. -+ A little bit better comments. -+ -+Tue Jul 18 01:18:27 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in: -+ po-mode.el, makelinks, combine-sh are now found in ../misc. -+ -+ * po-mode.el, makelinks, combine-sh, elisp-comp: -+ Moved to ../misc/. -+ -+ * libgettext.h, gettextP.h, gettext.h: Uniform test for __STDC__. -+ -+Sun Jul 16 22:33:02 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (INSTALL, INSTALL_DATA): New variables. -+ (install-data, uninstall): Install/uninstall .elc file. -+ -+ * po-mode.el (Installation comment): -+ Add .pox as possible extension of .po files. -+ -+Sun Jul 16 13:23:27 1995 Ulrich Drepper <drepper@myware> -+ -+ * elisp-comp: Complete new version by Franc,ois: This does not -+ fail when not compiling in the source directory. -+ -+Sun Jul 16 00:12:17 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (../po/cat-id-tbl.o): -+ Use $(MAKE) instead of make for recursive make. -+ -+ * Makefile.in (.el.elc): Use $(SHELL) instead of /bin/sh. -+ (install-exec): Add missing dummy goal. -+ (install-data, uninstall): @ in multi-line shell command at -+ beginning, not in front of echo. Reported by Eric Backus. -+ -+Sat Jul 15 00:21:28 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (DISTFILES): -+ Rename libgettext.perl to gettext.perl to fit in 14 chars -+ file systems. -+ -+ * gettext.perl: -+ Rename to gettext.perl to fit in 14 chars file systems. -+ -+Thu Jul 13 23:17:20 1995 Ulrich Drepper <drepper@myware> -+ -+ * cat-compat.c: If !STDC_HEADERS try to include malloc.h. -+ -+Thu Jul 13 20:55:02 1995 Ulrich Drepper <drepper@myware> -+ -+ * po2tbl.sed.in: Pretty printing. -+ -+ * linux-msg.sed, xopen-msg.sed: -+ Correct bugs with handling substitute flags in branches. -+ -+ * hash-string.h (hash_string): -+ Old K&R compilers don't under stand `unsigned char'. -+ -+ * gettext.h (nls_uint32): -+ Some old K&R compilers (eg HP) don't understand `unsigned int'. -+ -+ * cat-compat.c (msg_to_cat_id): De-ANSI-fy prototypes. -+ -+Thu Jul 13 01:34:33 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (ELCFILES): New variable. -+ (DISTFILES): Add elisp-comp. -+ Add implicit rule for .el -> .elc compilation. -+ (install-data): install $ELCFILES -+ (clean): renamed po-to-tbl and po-to-msg to po2tbl and po2msg resp. -+ -+ * elisp-comp: Initial revision -+ -+Wed Jul 12 16:14:52 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in: -+ cat-id-tbl.c is now found in po/. This enables us to use an identical -+ intl/ directory in all packages. -+ -+ * dcgettext.c (dcgettext): hashing does not work for table size <= 2. -+ -+ * textdomain.c: fix typo (#if def -> #if defined) -+ -+Tue Jul 11 18:44:43 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (stamp-cat-id): use top_srcdir to address source files -+ (DISTFILES,distclean): move tupdate.perl to src/ -+ -+ * po-to-tbl.sed.in: -+ add additional jump to clear change flag to recognize multiline strings -+ -+Tue Jul 11 01:32:50 1995 Ulrich Drepper <drepper@myware> -+ -+ * textdomain.c: Protect inclusion of stdlib.h and string.h. -+ -+ * loadmsgcat.c: Protect inclusion of stdlib.h. -+ -+ * libgettext.h: Protect inclusion of locale.h. -+ Allow use in C++ programs. -+ Define NULL is not happened already. -+ -+ * Makefile.in (DISTFILES): ship po-to-tbl.sed.in instead of -+ po-to-tbl.sed. -+ (distclean): remove po-to-tbl.sed and tupdate.perl. -+ -+ * tupdate.perl.in: Substitute Perl path even in exec line. -+ Don't include entries without translation from old .po file. -+ -+Tue Jul 4 00:41:51 1995 Ulrich Drepper <drepper@myware> -+ -+ * tupdate.perl.in: use "Updated: " in msgid "". -+ -+ * cat-compat.c: Fix typo (LOCALDIR -> LOCALEDIR). -+ Define getenv if !__STDC__. -+ -+ * bindtextdom.c: Protect stdlib.h and string.h inclusion. -+ Define free if !__STDC__. -+ -+ * finddomain.c: Change DEF_MSG_DOM_DIR to LOCALEDIR. -+ Define free if !__STDC__. -+ -+ * cat-compat.c: Change DEF_MSG_DOM_DIR to LOCALEDIR. -+ -+Mon Jul 3 23:56:30 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in: Use LOCALEDIR instead of DEF_MSG_DOM_DIR. -+ Remove unneeded $(srcdir) from Makefile.in dependency. -+ -+ * makelinks: Add copyright and short description. -+ -+ * po-mode.el: Last version for 0.7. -+ -+ * tupdate.perl.in: Fix die message. -+ -+ * dcgettext.c: Protect include of string.h. -+ -+ * gettext.c: Protect include of stdlib.h and further tries to get NULL. -+ -+ * finddomain.c: Some corrections in includes. -+ -+ * Makefile.in (INCLUDES): Prune list correct path to Makefile.in. -+ -+ * po-to-tbl.sed: Adopt for new .po file format. -+ -+ * linux-msg.sed, xopen-msg.sed: Adopt for new .po file format. -+ -+Sun Jul 2 23:55:03 1995 Ulrich Drepper <drepper@myware> -+ -+ * tupdate.perl.in: Complete rewrite for new .po file format. -+ -+Sun Jul 2 02:06:50 1995 Ulrich Drepper <drepper@myware> -+ -+ * First official release. This directory contains all the code -+ needed to internationalize own packages. It provides functions -+ which allow to use the X/Open catgets function with an interface -+ like the Uniforum gettext function. For system which does not -+ have neither of those a complete implementation is provided. -diff -urP gtkhtml-0.8.3.orig/intl/Makefile.in gtkhtml-0.8.3/intl/Makefile.in ---- gtkhtml-0.8.3.orig/intl/Makefile.in Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/Makefile.in Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,214 @@ -+# Makefile for directory with message catalog handling in GNU NLS Utilities. -+# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+# -+# This program 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 General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+PACKAGE = @PACKAGE@ -+VERSION = @VERSION@ -+ -+SHELL = /bin/sh -+ -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+top_builddir = .. -+VPATH = @srcdir@ -+ -+prefix = @prefix@ -+exec_prefix = @exec_prefix@ -+transform = @program_transform_name@ -+libdir = $(exec_prefix)/lib -+includedir = $(prefix)/include -+datadir = $(prefix)/@DATADIRNAME@ -+localedir = $(datadir)/locale -+gnulocaledir = $(prefix)/share/locale -+gettextsrcdir = @datadir@/gettext/intl -+aliaspath = $(localedir):. -+subdir = intl -+ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+MKINSTALLDIRS = @MKINSTALLDIRS@ -+ -+l = @l@ -+ -+AR = ar -+CC = @CC@ -+LIBTOOL = @LIBTOOL@ -+RANLIB = @RANLIB@ -+ -+DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \ -+-DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@ -+CPPFLAGS = @CPPFLAGS@ -+CFLAGS = @CFLAGS@ -+LDFLAGS = @LDFLAGS@ -+ -+COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) -+ -+HEADERS = $(COMHDRS) libgettext.h loadinfo.h -+COMHDRS = gettext.h gettextP.h hash-string.h -+SOURCES = $(COMSRCS) intl-compat.c cat-compat.c -+COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \ -+finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \ -+explodename.c -+OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \ -+finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \ -+explodename.$lo -+CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo -+GETTOBJS = intl-compat.$lo -+DISTFILES.common = ChangeLog Makefile.in linux-msg.sed po2tbl.sed.in \ -+xopen-msg.sed $(HEADERS) $(SOURCES) -+DISTFILES.normal = VERSION -+DISTFILES.gettext = libintl.glibc intlh.inst.in -+ -+.SUFFIXES: -+.SUFFIXES: .c .o .lo -+.c.o: -+ $(COMPILE) $< -+.c.lo: -+ $(LIBTOOL) --mode=compile $(COMPILE) $< -+ -+INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib -+ -+all: all-@USE_INCLUDED_LIBINTL@ -+ -+all-yes: libintl.$la intlh.inst -+all-no: -+ -+libintl.a: $(OBJECTS) -+ rm -f $@ -+ $(AR) cru $@ $(OBJECTS) -+ $(RANLIB) $@ -+ -+libintl.la: $(OBJECTS) -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \ -+ -version-info 1:0 -rpath $(libdir) -+ -+../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot -+ cd ../po && $(MAKE) cat-id-tbl.$lo -+ -+check: all -+ -+# This installation goal is only used in GNU gettext. Packages which -+# only use the library should use install instead. -+ -+# We must not install the libintl.h/libintl.a files if we are on a -+# system which has the gettext() function in its C library or in a -+# separate library or use the catgets interface. A special case is -+# where configure found a previously installed GNU gettext library. -+# If you want to use the one which comes with this version of the -+# package, you have to use `configure --with-included-gettext'. -+install: install-exec install-data -+install-exec: all -+ if test "$(PACKAGE)" = "gettext" \ -+ && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ -+ if test -r $(MKINSTALLDIRS); then \ -+ $(MKINSTALLDIRS) $(libdir) $(includedir); \ -+ else \ -+ $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \ -+ fi; \ -+ $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \ -+ $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \ -+ else \ -+ : ; \ -+ fi -+install-data: all -+ if test "$(PACKAGE)" = "gettext"; then \ -+ if test -r $(MKINSTALLDIRS); then \ -+ $(MKINSTALLDIRS) $(gettextsrcdir); \ -+ else \ -+ $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \ -+ fi; \ -+ $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \ -+ dists="$(DISTFILES.common)"; \ -+ for file in $$dists; do \ -+ $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \ -+ done; \ -+ else \ -+ : ; \ -+ fi -+ -+# Define this as empty until I found a useful application. -+installcheck: -+ -+uninstall: -+ dists="$(DISTFILES.common)"; \ -+ for file in $$dists; do \ -+ rm -f $(gettextsrcdir)/$$file; \ -+ done -+ -+info dvi: -+ -+$(OBJECTS): ../config.h libgettext.h -+bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h -+dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h -+ -+tags: TAGS -+ -+TAGS: $(HEADERS) $(SOURCES) -+ here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES) -+ -+id: ID -+ -+ID: $(HEADERS) $(SOURCES) -+ here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES) -+ -+ -+mostlyclean: -+ rm -f *.a *.o *.lo core core.* -+ -+clean: mostlyclean -+ -+distclean: clean -+ rm -f Makefile ID TAGS po2msg.sed po2tbl.sed -+ -+maintainer-clean: distclean -+ @echo "This command is intended for maintainers to use;" -+ @echo "it deletes files that may require special tools to rebuild." -+ -+ -+# GNU gettext needs not contain the file `VERSION' but contains some -+# other files which should not be distributed in other packages. -+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) -+dist distdir: Makefile $(DISTFILES) -+ if test "$(PACKAGE)" = gettext; then \ -+ additional="$(DISTFILES.gettext)"; \ -+ else \ -+ additional="$(DISTFILES.normal)"; \ -+ fi; \ -+ for file in $(DISTFILES.common) $$additional; do \ -+ ln $(srcdir)/$$file $(distdir) 2> /dev/null \ -+ || cp -p $(srcdir)/$$file $(distdir); \ -+ done -+ -+dist-libc: -+ tar zcvf intl-glibc.tar.gz $(COMSRCS) $(COMHDRS) libintl.h.glibc -+ -+Makefile: Makefile.in ../config.status -+ cd .. \ -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ -+# The dependency for intlh.inst is different in gettext and all other -+# packages. Because we cannot you GNU make features we have to solve -+# the problem while rewriting Makefile.in. -+@GT_YES@intlh.inst: intlh.inst.in ../config.status -+@GT_YES@ cd .. \ -+@GT_YES@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \ -+@GT_YES@ $(SHELL) ./config.status -+@GT_NO@.PHONY: intlh.inst -+@GT_NO@intlh.inst: -+ -+# Tell versions [3.59,3.63) of GNU make not to export all variables. -+# Otherwise a system limit (for SysV at least) may be exceeded. -+.NOEXPORT: -diff -urP gtkhtml-0.8.3.orig/intl/VERSION gtkhtml-0.8.3/intl/VERSION ---- gtkhtml-0.8.3.orig/intl/VERSION Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/VERSION Fri Mar 16 14:46:14 2001 -@@ -0,0 +1 @@ -+GNU gettext library from gettext-0.10.35 -diff -urP gtkhtml-0.8.3.orig/intl/bindtextdom.c gtkhtml-0.8.3/intl/bindtextdom.c ---- gtkhtml-0.8.3.orig/intl/bindtextdom.c Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/bindtextdom.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,203 @@ -+/* Implementation of the bindtextdomain(3) function -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#else -+# ifdef HAVE_MALLOC_H -+# include <malloc.h> -+# else -+void free (); -+# endif -+#endif -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# include <string.h> -+#else -+# include <strings.h> -+# ifndef memcpy -+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -+# endif -+#endif -+ -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+#include "gettext.h" -+#include "gettextP.h" -+ -+/* @@ end of prolog @@ */ -+ -+/* Contains the default location of the message catalogs. */ -+extern const char _nl_default_dirname[]; -+ -+/* List with bindings of specific domains. */ -+extern struct binding *_nl_domain_bindings; -+ -+ -+/* Names for the libintl functions are a problem. They must not clash -+ with existing names and they should follow ANSI C. But this source -+ code is also used in GNU C Library where the names have a __ -+ prefix. So we have to make a difference here. */ -+#ifdef _LIBC -+# define BINDTEXTDOMAIN __bindtextdomain -+# ifndef strdup -+# define strdup(str) __strdup (str) -+# endif -+#else -+# define BINDTEXTDOMAIN bindtextdomain__ -+#endif -+ -+/* Specify that the DOMAINNAME message catalog will be found -+ in DIRNAME rather than in the system locale data base. */ -+char * -+BINDTEXTDOMAIN (domainname, dirname) -+ const char *domainname; -+ const char *dirname; -+{ -+ struct binding *binding; -+ -+ /* Some sanity checks. */ -+ if (domainname == NULL || domainname[0] == '\0') -+ return NULL; -+ -+ for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) -+ { -+ int compare = strcmp (domainname, binding->domainname); -+ if (compare == 0) -+ /* We found it! */ -+ break; -+ if (compare < 0) -+ { -+ /* It is not in the list. */ -+ binding = NULL; -+ break; -+ } -+ } -+ -+ if (dirname == NULL) -+ /* The current binding has be to returned. */ -+ return binding == NULL ? (char *) _nl_default_dirname : binding->dirname; -+ -+ if (binding != NULL) -+ { -+ /* The domain is already bound. If the new value and the old -+ one are equal we simply do nothing. Otherwise replace the -+ old binding. */ -+ if (strcmp (dirname, binding->dirname) != 0) -+ { -+ char *new_dirname; -+ -+ if (strcmp (dirname, _nl_default_dirname) == 0) -+ new_dirname = (char *) _nl_default_dirname; -+ else -+ { -+#if defined _LIBC || defined HAVE_STRDUP -+ new_dirname = strdup (dirname); -+ if (new_dirname == NULL) -+ return NULL; -+#else -+ size_t len = strlen (dirname) + 1; -+ new_dirname = (char *) malloc (len); -+ if (new_dirname == NULL) -+ return NULL; -+ -+ memcpy (new_dirname, dirname, len); -+#endif -+ } -+ -+ if (binding->dirname != _nl_default_dirname) -+ free (binding->dirname); -+ -+ binding->dirname = new_dirname; -+ } -+ } -+ else -+ { -+ /* We have to create a new binding. */ -+#if !defined _LIBC && !defined HAVE_STRDUP -+ size_t len; -+#endif -+ struct binding *new_binding = -+ (struct binding *) malloc (sizeof (*new_binding)); -+ -+ if (new_binding == NULL) -+ return NULL; -+ -+#if defined _LIBC || defined HAVE_STRDUP -+ new_binding->domainname = strdup (domainname); -+ if (new_binding->domainname == NULL) -+ return NULL; -+#else -+ len = strlen (domainname) + 1; -+ new_binding->domainname = (char *) malloc (len); -+ if (new_binding->domainname == NULL) -+ return NULL; -+ memcpy (new_binding->domainname, domainname, len); -+#endif -+ -+ if (strcmp (dirname, _nl_default_dirname) == 0) -+ new_binding->dirname = (char *) _nl_default_dirname; -+ else -+ { -+#if defined _LIBC || defined HAVE_STRDUP -+ new_binding->dirname = strdup (dirname); -+ if (new_binding->dirname == NULL) -+ return NULL; -+#else -+ len = strlen (dirname) + 1; -+ new_binding->dirname = (char *) malloc (len); -+ if (new_binding->dirname == NULL) -+ return NULL; -+ memcpy (new_binding->dirname, dirname, len); -+#endif -+ } -+ -+ /* Now enqueue it. */ -+ if (_nl_domain_bindings == NULL -+ || strcmp (domainname, _nl_domain_bindings->domainname) < 0) -+ { -+ new_binding->next = _nl_domain_bindings; -+ _nl_domain_bindings = new_binding; -+ } -+ else -+ { -+ binding = _nl_domain_bindings; -+ while (binding->next != NULL -+ && strcmp (domainname, binding->next->domainname) > 0) -+ binding = binding->next; -+ -+ new_binding->next = binding->next; -+ binding->next = new_binding; -+ } -+ -+ binding = new_binding; -+ } -+ -+ return binding->dirname; -+} -+ -+#ifdef _LIBC -+/* Alias for function name in GNU C Library. */ -+weak_alias (__bindtextdomain, bindtextdomain); -+#endif -diff -urP gtkhtml-0.8.3.orig/intl/cat-compat.c gtkhtml-0.8.3/intl/cat-compat.c ---- gtkhtml-0.8.3.orig/intl/cat-compat.c Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/cat-compat.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,262 @@ -+/* Compatibility code for gettext-using-catgets interface. -+ Copyright (C) 1995, 1997 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <stdio.h> -+ -+#ifdef STDC_HEADERS -+# include <stdlib.h> -+# include <string.h> -+#else -+char *getenv (); -+# ifdef HAVE_MALLOC_H -+# include <malloc.h> -+# endif -+#endif -+ -+#ifdef HAVE_NL_TYPES_H -+# include <nl_types.h> -+#endif -+ -+#include "libgettext.h" -+ -+/* @@ end of prolog @@ */ -+ -+/* XPG3 defines the result of `setlocale (category, NULL)' as: -+ ``Directs `setlocale()' to query `category' and return the current -+ setting of `local'.'' -+ However it does not specify the exact format. And even worse: POSIX -+ defines this not at all. So we can use this feature only on selected -+ system (e.g. those using GNU C Library). */ -+#ifdef _LIBC -+# define HAVE_LOCALE_NULL -+#endif -+ -+/* The catalog descriptor. */ -+static nl_catd catalog = (nl_catd) -1; -+ -+/* Name of the default catalog. */ -+static const char default_catalog_name[] = "messages"; -+ -+/* Name of currently used catalog. */ -+static const char *catalog_name = default_catalog_name; -+ -+/* Get ID for given string. If not found return -1. */ -+static int msg_to_cat_id PARAMS ((const char *msg)); -+ -+/* Substitution for systems lacking this function in their C library. */ -+#if !_LIBC && !HAVE_STPCPY -+static char *stpcpy PARAMS ((char *dest, const char *src)); -+#endif -+ -+ -+/* Set currently used domain/catalog. */ -+char * -+textdomain (domainname) -+ const char *domainname; -+{ -+ nl_catd new_catalog; -+ char *new_name; -+ size_t new_name_len; -+ char *lang; -+ -+#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES \ -+ && defined HAVE_LOCALE_NULL -+ lang = setlocale (LC_MESSAGES, NULL); -+#else -+ lang = getenv ("LC_ALL"); -+ if (lang == NULL || lang[0] == '\0') -+ { -+ lang = getenv ("LC_MESSAGES"); -+ if (lang == NULL || lang[0] == '\0') -+ lang = getenv ("LANG"); -+ } -+#endif -+ if (lang == NULL || lang[0] == '\0') -+ lang = "C"; -+ -+ /* See whether name of currently used domain is asked. */ -+ if (domainname == NULL) -+ return (char *) catalog_name; -+ -+ if (domainname[0] == '\0') -+ domainname = default_catalog_name; -+ -+ /* Compute length of added path element. */ -+ new_name_len = sizeof (LOCALEDIR) - 1 + 1 + strlen (lang) -+ + sizeof ("/LC_MESSAGES/") - 1 + sizeof (PACKAGE) - 1 -+ + sizeof (".cat"); -+ -+ new_name = (char *) malloc (new_name_len); -+ if (new_name == NULL) -+ return NULL; -+ -+ strcpy (new_name, PACKAGE); -+ new_catalog = catopen (new_name, 0); -+ -+ if (new_catalog == (nl_catd) -1) -+ { -+ /* NLSPATH search didn't work, try absolute path */ -+ sprintf (new_name, "%s/%s/LC_MESSAGES/%s.cat", LOCALEDIR, lang, -+ PACKAGE); -+ new_catalog = catopen (new_name, 0); -+ -+ if (new_catalog == (nl_catd) -1) -+ { -+ free (new_name); -+ return (char *) catalog_name; -+ } -+ } -+ -+ /* Close old catalog. */ -+ if (catalog != (nl_catd) -1) -+ catclose (catalog); -+ if (catalog_name != default_catalog_name) -+ free ((char *) catalog_name); -+ -+ catalog = new_catalog; -+ catalog_name = new_name; -+ -+ return (char *) catalog_name; -+} -+ -+char * -+bindtextdomain (domainname, dirname) -+ const char *domainname; -+ const char *dirname; -+{ -+#if HAVE_SETENV || HAVE_PUTENV -+ char *old_val, *new_val, *cp; -+ size_t new_val_len; -+ -+ /* This does not make much sense here but to be compatible do it. */ -+ if (domainname == NULL) -+ return NULL; -+ -+ /* Compute length of added path element. If we use setenv we don't need -+ the first byts for NLSPATH=, but why complicate the code for this -+ peanuts. */ -+ new_val_len = sizeof ("NLSPATH=") - 1 + strlen (dirname) -+ + sizeof ("/%L/LC_MESSAGES/%N.cat"); -+ -+ old_val = getenv ("NLSPATH"); -+ if (old_val == NULL || old_val[0] == '\0') -+ { -+ old_val = NULL; -+ new_val_len += 1 + sizeof (LOCALEDIR) - 1 -+ + sizeof ("/%L/LC_MESSAGES/%N.cat"); -+ } -+ else -+ new_val_len += strlen (old_val); -+ -+ new_val = (char *) malloc (new_val_len); -+ if (new_val == NULL) -+ return NULL; -+ -+# if HAVE_SETENV -+ cp = new_val; -+# else -+ cp = stpcpy (new_val, "NLSPATH="); -+# endif -+ -+ cp = stpcpy (cp, dirname); -+ cp = stpcpy (cp, "/%L/LC_MESSAGES/%N.cat:"); -+ -+ if (old_val == NULL) -+ { -+# if __STDC__ -+ stpcpy (cp, LOCALEDIR "/%L/LC_MESSAGES/%N.cat"); -+# else -+ -+ cp = stpcpy (cp, LOCALEDIR); -+ stpcpy (cp, "/%L/LC_MESSAGES/%N.cat"); -+# endif -+ } -+ else -+ stpcpy (cp, old_val); -+ -+# if HAVE_SETENV -+ setenv ("NLSPATH", new_val, 1); -+ free (new_val); -+# else -+ putenv (new_val); -+ /* Do *not* free the environment entry we just entered. It is used -+ from now on. */ -+# endif -+ -+#endif -+ -+ return (char *) domainname; -+} -+ -+#undef gettext -+char * -+gettext (msg) -+ const char *msg; -+{ -+ int msgid; -+ -+ if (msg == NULL || catalog == (nl_catd) -1) -+ return (char *) msg; -+ -+ /* Get the message from the catalog. We always use set number 1. -+ The message ID is computed by the function `msg_to_cat_id' -+ which works on the table generated by `po-to-tbl'. */ -+ msgid = msg_to_cat_id (msg); -+ if (msgid == -1) -+ return (char *) msg; -+ -+ return catgets (catalog, 1, msgid, (char *) msg); -+} -+ -+/* Look through the table `_msg_tbl' which has `_msg_tbl_length' entries -+ for the one equal to msg. If it is found return the ID. In case when -+ the string is not found return -1. */ -+static int -+msg_to_cat_id (msg) -+ const char *msg; -+{ -+ int cnt; -+ -+ for (cnt = 0; cnt < _msg_tbl_length; ++cnt) -+ if (strcmp (msg, _msg_tbl[cnt]._msg) == 0) -+ return _msg_tbl[cnt]._msg_number; -+ -+ return -1; -+} -+ -+ -+/* @@ begin of epilog @@ */ -+ -+/* We don't want libintl.a to depend on any other library. So we -+ avoid the non-standard function stpcpy. In GNU C Library this -+ function is available, though. Also allow the symbol HAVE_STPCPY -+ to be defined. */ -+#if !_LIBC && !HAVE_STPCPY -+static char * -+stpcpy (dest, src) -+ char *dest; -+ const char *src; -+{ -+ while ((*dest++ = *src++) != '\0') -+ /* Do nothing. */ ; -+ return dest - 1; -+} -+#endif -diff -urP gtkhtml-0.8.3.orig/intl/dcgettext.c gtkhtml-0.8.3/intl/dcgettext.c ---- gtkhtml-0.8.3.orig/intl/dcgettext.c Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/dcgettext.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,624 @@ -+/* Implementation of the dcgettext(3) function. -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <sys/types.h> -+ -+#ifdef __GNUC__ -+# define alloca __builtin_alloca -+# define HAVE_ALLOCA 1 -+#else -+# if defined HAVE_ALLOCA_H || defined _LIBC -+# include <alloca.h> -+# else -+# ifdef _AIX -+ #pragma alloca -+# else -+# ifndef alloca -+char *alloca (); -+# endif -+# endif -+# endif -+#endif -+ -+#include <errno.h> -+#ifndef errno -+extern int errno; -+#endif -+#ifndef __set_errno -+# define __set_errno(val) errno = (val) -+#endif -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#else -+char *getenv (); -+# ifdef HAVE_MALLOC_H -+# include <malloc.h> -+# else -+void free (); -+# endif -+#endif -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# ifndef _GNU_SOURCE -+# define _GNU_SOURCE 1 -+# endif -+# include <string.h> -+#else -+# include <strings.h> -+#endif -+#if !HAVE_STRCHR && !defined _LIBC -+# ifndef strchr -+# define strchr index -+# endif -+#endif -+ -+#if defined HAVE_UNISTD_H || defined _LIBC -+# include <unistd.h> -+#endif -+ -+#include "gettext.h" -+#include "gettextP.h" -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+#include "hash-string.h" -+ -+/* @@ end of prolog @@ */ -+ -+#ifdef _LIBC -+/* Rename the non ANSI C functions. This is required by the standard -+ because some ANSI C functions will require linking with this object -+ file and the name space must not be polluted. */ -+# define getcwd __getcwd -+# ifndef stpcpy -+# define stpcpy __stpcpy -+# endif -+#else -+# if !defined HAVE_GETCWD -+char *getwd (); -+# define getcwd(buf, max) getwd (buf) -+# else -+char *getcwd (); -+# endif -+# ifndef HAVE_STPCPY -+static char *stpcpy PARAMS ((char *dest, const char *src)); -+# endif -+#endif -+ -+/* Amount to increase buffer size by in each try. */ -+#define PATH_INCR 32 -+ -+/* The following is from pathmax.h. */ -+/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define -+ PATH_MAX but might cause redefinition warnings when sys/param.h is -+ later included (as on MORE/BSD 4.3). */ -+#if defined(_POSIX_VERSION) || (defined(HAVE_LIMITS_H) && !defined(__GNUC__)) -+# include <limits.h> -+#endif -+ -+#ifndef _POSIX_PATH_MAX -+# define _POSIX_PATH_MAX 255 -+#endif -+ -+#if !defined(PATH_MAX) && defined(_PC_PATH_MAX) -+# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX)) -+#endif -+ -+/* Don't include sys/param.h if it already has been. */ -+#if defined(HAVE_SYS_PARAM_H) && !defined(PATH_MAX) && !defined(MAXPATHLEN) -+# include <sys/param.h> -+#endif -+ -+#if !defined(PATH_MAX) && defined(MAXPATHLEN) -+# define PATH_MAX MAXPATHLEN -+#endif -+ -+#ifndef PATH_MAX -+# define PATH_MAX _POSIX_PATH_MAX -+#endif -+ -+/* XPG3 defines the result of `setlocale (category, NULL)' as: -+ ``Directs `setlocale()' to query `category' and return the current -+ setting of `local'.'' -+ However it does not specify the exact format. And even worse: POSIX -+ defines this not at all. So we can use this feature only on selected -+ system (e.g. those using GNU C Library). */ -+#ifdef _LIBC -+# define HAVE_LOCALE_NULL -+#endif -+ -+/* Name of the default domain used for gettext(3) prior any call to -+ textdomain(3). The default value for this is "messages". */ -+const char _nl_default_default_domain[] = "messages"; -+ -+/* Value used as the default domain for gettext(3). */ -+const char *_nl_current_default_domain = _nl_default_default_domain; -+ -+/* Contains the default location of the message catalogs. */ -+const char _nl_default_dirname[] = GNULOCALEDIR; -+ -+/* List with bindings of specific domains created by bindtextdomain() -+ calls. */ -+struct binding *_nl_domain_bindings; -+ -+/* Prototypes for local functions. */ -+static char *find_msg PARAMS ((struct loaded_l10nfile *domain_file, -+ const char *msgid)) internal_function; -+static const char *category_to_name PARAMS ((int category)) internal_function; -+static const char *guess_category_value PARAMS ((int category, -+ const char *categoryname)) -+ internal_function; -+ -+ -+/* For those loosing systems which don't have `alloca' we have to add -+ some additional code emulating it. */ -+#ifdef HAVE_ALLOCA -+/* Nothing has to be done. */ -+# define ADD_BLOCK(list, address) /* nothing */ -+# define FREE_BLOCKS(list) /* nothing */ -+#else -+struct block_list -+{ -+ void *address; -+ struct block_list *next; -+}; -+# define ADD_BLOCK(list, addr) \ -+ do { \ -+ struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \ -+ /* If we cannot get a free block we cannot add the new element to \ -+ the list. */ \ -+ if (newp != NULL) { \ -+ newp->address = (addr); \ -+ newp->next = (list); \ -+ (list) = newp; \ -+ } \ -+ } while (0) -+# define FREE_BLOCKS(list) \ -+ do { \ -+ while (list != NULL) { \ -+ struct block_list *old = list; \ -+ list = list->next; \ -+ free (old); \ -+ } \ -+ } while (0) -+# undef alloca -+# define alloca(size) (malloc (size)) -+#endif /* have alloca */ -+ -+ -+/* Names for the libintl functions are a problem. They must not clash -+ with existing names and they should follow ANSI C. But this source -+ code is also used in GNU C Library where the names have a __ -+ prefix. So we have to make a difference here. */ -+#ifdef _LIBC -+# define DCGETTEXT __dcgettext -+#else -+# define DCGETTEXT dcgettext__ -+#endif -+ -+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY -+ locale. */ -+char * -+DCGETTEXT (domainname, msgid, category) -+ const char *domainname; -+ const char *msgid; -+ int category; -+{ -+#ifndef HAVE_ALLOCA -+ struct block_list *block_list = NULL; -+#endif -+ struct loaded_l10nfile *domain; -+ struct binding *binding; -+ const char *categoryname; -+ const char *categoryvalue; -+ char *dirname, *xdomainname; -+ char *single_locale; -+ char *retval; -+ int saved_errno = errno; -+ -+ /* If no real MSGID is given return NULL. */ -+ if (msgid == NULL) -+ return NULL; -+ -+ /* If DOMAINNAME is NULL, we are interested in the default domain. If -+ CATEGORY is not LC_MESSAGES this might not make much sense but the -+ defintion left this undefined. */ -+ if (domainname == NULL) -+ domainname = _nl_current_default_domain; -+ -+ /* First find matching binding. */ -+ for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) -+ { -+ int compare = strcmp (domainname, binding->domainname); -+ if (compare == 0) -+ /* We found it! */ -+ break; -+ if (compare < 0) -+ { -+ /* It is not in the list. */ -+ binding = NULL; -+ break; -+ } -+ } -+ -+ if (binding == NULL) -+ dirname = (char *) _nl_default_dirname; -+ else if (binding->dirname[0] == '/') -+ dirname = binding->dirname; -+ else -+ { -+ /* We have a relative path. Make it absolute now. */ -+ size_t dirname_len = strlen (binding->dirname) + 1; -+ size_t path_max; -+ char *ret; -+ -+ path_max = (unsigned) PATH_MAX; -+ path_max += 2; /* The getcwd docs say to do this. */ -+ -+ dirname = (char *) alloca (path_max + dirname_len); -+ ADD_BLOCK (block_list, dirname); -+ -+ __set_errno (0); -+ while ((ret = getcwd (dirname, path_max)) == NULL && errno == ERANGE) -+ { -+ path_max += PATH_INCR; -+ dirname = (char *) alloca (path_max + dirname_len); -+ ADD_BLOCK (block_list, dirname); -+ __set_errno (0); -+ } -+ -+ if (ret == NULL) -+ { -+ /* We cannot get the current working directory. Don't signal an -+ error but simply return the default string. */ -+ FREE_BLOCKS (block_list); -+ __set_errno (saved_errno); -+ return (char *) msgid; -+ } -+ -+ stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname); -+ } -+ -+ /* Now determine the symbolic name of CATEGORY and its value. */ -+ categoryname = category_to_name (category); -+ categoryvalue = guess_category_value (category, categoryname); -+ -+ xdomainname = (char *) alloca (strlen (categoryname) -+ + strlen (domainname) + 5); -+ ADD_BLOCK (block_list, xdomainname); -+ -+ stpcpy (stpcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"), -+ domainname), -+ ".mo"); -+ -+ /* Creating working area. */ -+ single_locale = (char *) alloca (strlen (categoryvalue) + 1); -+ ADD_BLOCK (block_list, single_locale); -+ -+ -+ /* Search for the given string. This is a loop because we perhaps -+ got an ordered list of languages to consider for th translation. */ -+ while (1) -+ { -+ /* Make CATEGORYVALUE point to the next element of the list. */ -+ while (categoryvalue[0] != '\0' && categoryvalue[0] == ':') -+ ++categoryvalue; -+ if (categoryvalue[0] == '\0') -+ { -+ /* The whole contents of CATEGORYVALUE has been searched but -+ no valid entry has been found. We solve this situation -+ by implicitly appending a "C" entry, i.e. no translation -+ will take place. */ -+ single_locale[0] = 'C'; -+ single_locale[1] = '\0'; -+ } -+ else -+ { -+ char *cp = single_locale; -+ while (categoryvalue[0] != '\0' && categoryvalue[0] != ':') -+ *cp++ = *categoryvalue++; -+ *cp = '\0'; -+ } -+ -+ /* If the current locale value is C (or POSIX) we don't load a -+ domain. Return the MSGID. */ -+ if (strcmp (single_locale, "C") == 0 -+ || strcmp (single_locale, "POSIX") == 0) -+ { -+ FREE_BLOCKS (block_list); -+ __set_errno (saved_errno); -+ return (char *) msgid; -+ } -+ -+ -+ /* Find structure describing the message catalog matching the -+ DOMAINNAME and CATEGORY. */ -+ domain = _nl_find_domain (dirname, single_locale, xdomainname); -+ -+ if (domain != NULL) -+ { -+ retval = find_msg (domain, msgid); -+ -+ if (retval == NULL) -+ { -+ int cnt; -+ -+ for (cnt = 0; domain->successor[cnt] != NULL; ++cnt) -+ { -+ retval = find_msg (domain->successor[cnt], msgid); -+ -+ if (retval != NULL) -+ break; -+ } -+ } -+ -+ if (retval != NULL) -+ { -+ FREE_BLOCKS (block_list); -+ __set_errno (saved_errno); -+ return retval; -+ } -+ } -+ } -+ /* NOTREACHED */ -+} -+ -+#ifdef _LIBC -+/* Alias for function name in GNU C Library. */ -+weak_alias (__dcgettext, dcgettext); -+#endif -+ -+ -+static char * -+internal_function -+find_msg (domain_file, msgid) -+ struct loaded_l10nfile *domain_file; -+ const char *msgid; -+{ -+ size_t top, act, bottom; -+ struct loaded_domain *domain; -+ -+ if (domain_file->decided == 0) -+ _nl_load_domain (domain_file); -+ -+ if (domain_file->data == NULL) -+ return NULL; -+ -+ domain = (struct loaded_domain *) domain_file->data; -+ -+ /* Locate the MSGID and its translation. */ -+ if (domain->hash_size > 2 && domain->hash_tab != NULL) -+ { -+ /* Use the hashing table. */ -+ nls_uint32 len = strlen (msgid); -+ nls_uint32 hash_val = hash_string (msgid); -+ nls_uint32 idx = hash_val % domain->hash_size; -+ nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2)); -+ nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]); -+ -+ if (nstr == 0) -+ /* Hash table entry is empty. */ -+ return NULL; -+ -+ if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len -+ && strcmp (msgid, -+ domain->data + W (domain->must_swap, -+ domain->orig_tab[nstr - 1].offset)) == 0) -+ return (char *) domain->data + W (domain->must_swap, -+ domain->trans_tab[nstr - 1].offset); -+ -+ while (1) -+ { -+ if (idx >= domain->hash_size - incr) -+ idx -= domain->hash_size - incr; -+ else -+ idx += incr; -+ -+ nstr = W (domain->must_swap, domain->hash_tab[idx]); -+ if (nstr == 0) -+ /* Hash table entry is empty. */ -+ return NULL; -+ -+ if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len -+ && strcmp (msgid, -+ domain->data + W (domain->must_swap, -+ domain->orig_tab[nstr - 1].offset)) -+ == 0) -+ return (char *) domain->data -+ + W (domain->must_swap, domain->trans_tab[nstr - 1].offset); -+ } -+ /* NOTREACHED */ -+ } -+ -+ /* Now we try the default method: binary search in the sorted -+ array of messages. */ -+ bottom = 0; -+ top = domain->nstrings; -+ while (bottom < top) -+ { -+ int cmp_val; -+ -+ act = (bottom + top) / 2; -+ cmp_val = strcmp (msgid, domain->data -+ + W (domain->must_swap, -+ domain->orig_tab[act].offset)); -+ if (cmp_val < 0) -+ top = act; -+ else if (cmp_val > 0) -+ bottom = act + 1; -+ else -+ break; -+ } -+ -+ /* If an translation is found return this. */ -+ return bottom >= top ? NULL : (char *) domain->data -+ + W (domain->must_swap, -+ domain->trans_tab[act].offset); -+} -+ -+ -+/* Return string representation of locale CATEGORY. */ -+static const char * -+internal_function -+category_to_name (category) -+ int category; -+{ -+ const char *retval; -+ -+ switch (category) -+ { -+#ifdef LC_COLLATE -+ case LC_COLLATE: -+ retval = "LC_COLLATE"; -+ break; -+#endif -+#ifdef LC_CTYPE -+ case LC_CTYPE: -+ retval = "LC_CTYPE"; -+ break; -+#endif -+#ifdef LC_MONETARY -+ case LC_MONETARY: -+ retval = "LC_MONETARY"; -+ break; -+#endif -+#ifdef LC_NUMERIC -+ case LC_NUMERIC: -+ retval = "LC_NUMERIC"; -+ break; -+#endif -+#ifdef LC_TIME -+ case LC_TIME: -+ retval = "LC_TIME"; -+ break; -+#endif -+#ifdef LC_MESSAGES -+ case LC_MESSAGES: -+ retval = "LC_MESSAGES"; -+ break; -+#endif -+#ifdef LC_RESPONSE -+ case LC_RESPONSE: -+ retval = "LC_RESPONSE"; -+ break; -+#endif -+#ifdef LC_ALL -+ case LC_ALL: -+ /* This might not make sense but is perhaps better than any other -+ value. */ -+ retval = "LC_ALL"; -+ break; -+#endif -+ default: -+ /* If you have a better idea for a default value let me know. */ -+ retval = "LC_XXX"; -+ } -+ -+ return retval; -+} -+ -+/* Guess value of current locale from value of the environment variables. */ -+static const char * -+internal_function -+guess_category_value (category, categoryname) -+ int category; -+ const char *categoryname; -+{ -+ const char *retval; -+ -+ /* The highest priority value is the `LANGUAGE' environment -+ variable. This is a GNU extension. */ -+ retval = getenv ("LANGUAGE"); -+ if (retval != NULL && retval[0] != '\0') -+ return retval; -+ -+ /* `LANGUAGE' is not set. So we have to proceed with the POSIX -+ methods of looking to `LC_ALL', `LC_xxx', and `LANG'. On some -+ systems this can be done by the `setlocale' function itself. */ -+#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL -+ return setlocale (category, NULL); -+#else -+ /* Setting of LC_ALL overwrites all other. */ -+ retval = getenv ("LC_ALL"); -+ if (retval != NULL && retval[0] != '\0') -+ return retval; -+ -+ /* Next comes the name of the desired category. */ -+ retval = getenv (categoryname); -+ if (retval != NULL && retval[0] != '\0') -+ return retval; -+ -+ /* Last possibility is the LANG environment variable. */ -+ retval = getenv ("LANG"); -+ if (retval != NULL && retval[0] != '\0') -+ return retval; -+ -+ /* We use C as the default domain. POSIX says this is implementation -+ defined. */ -+ return "C"; -+#endif -+} -+ -+/* @@ begin of epilog @@ */ -+ -+/* We don't want libintl.a to depend on any other library. So we -+ avoid the non-standard function stpcpy. In GNU C Library this -+ function is available, though. Also allow the symbol HAVE_STPCPY -+ to be defined. */ -+#if !_LIBC && !HAVE_STPCPY -+static char * -+stpcpy (dest, src) -+ char *dest; -+ const char *src; -+{ -+ while ((*dest++ = *src++) != '\0') -+ /* Do nothing. */ ; -+ return dest - 1; -+} -+#endif -+ -+ -+#ifdef _LIBC -+/* If we want to free all resources we have to do some work at -+ program's end. */ -+static void __attribute__ ((unused)) -+free_mem (void) -+{ -+ struct binding *runp; -+ -+ for (runp = _nl_domain_bindings; runp != NULL; runp = runp->next) -+ { -+ free (runp->domainname); -+ if (runp->dirname != _nl_default_dirname) -+ /* Yes, this is a pointer comparison. */ -+ free (runp->dirname); -+ } -+ -+ if (_nl_current_default_domain != _nl_default_default_domain) -+ /* Yes, again a pointer comparison. */ -+ free ((char *) _nl_current_default_domain); -+} -+ -+text_set_element (__libc_subfreeres, free_mem); -+#endif -diff -urP gtkhtml-0.8.3.orig/intl/dgettext.c gtkhtml-0.8.3/intl/dgettext.c ---- gtkhtml-0.8.3.orig/intl/dgettext.c Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/dgettext.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,59 @@ -+/* Implementation of the dgettext(3) function -+ Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#if defined HAVE_LOCALE_H || defined _LIBC -+# include <locale.h> -+#endif -+ -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+/* Names for the libintl functions are a problem. They must not clash -+ with existing names and they should follow ANSI C. But this source -+ code is also used in GNU C Library where the names have a __ -+ prefix. So we have to make a difference here. */ -+#ifdef _LIBC -+# define DGETTEXT __dgettext -+# define DCGETTEXT __dcgettext -+#else -+# define DGETTEXT dgettext__ -+# define DCGETTEXT dcgettext__ -+#endif -+ -+/* Look up MSGID in the DOMAINNAME message catalog of the current -+ LC_MESSAGES locale. */ -+char * -+DGETTEXT (domainname, msgid) -+ const char *domainname; -+ const char *msgid; -+{ -+ return DCGETTEXT (domainname, msgid, LC_MESSAGES); -+} -+ -+#ifdef _LIBC -+/* Alias for function name in GNU C Library. */ -+weak_alias (__dgettext, dgettext); -+#endif -diff -urP gtkhtml-0.8.3.orig/intl/explodename.c gtkhtml-0.8.3/intl/explodename.c ---- gtkhtml-0.8.3.orig/intl/explodename.c Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/explodename.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,188 @@ -+/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#endif -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# include <string.h> -+#else -+# include <strings.h> -+#endif -+#include <sys/types.h> -+ -+#include "loadinfo.h" -+ -+/* On some strange systems still no definition of NULL is found. Sigh! */ -+#ifndef NULL -+# if defined __STDC__ && __STDC__ -+# define NULL ((void *) 0) -+# else -+# define NULL 0 -+# endif -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+int -+_nl_explode_name (name, language, modifier, territory, codeset, -+ normalized_codeset, special, sponsor, revision) -+ char *name; -+ const char **language; -+ const char **modifier; -+ const char **territory; -+ const char **codeset; -+ const char **normalized_codeset; -+ const char **special; -+ const char **sponsor; -+ const char **revision; -+{ -+ enum { undecided, xpg, cen } syntax; -+ char *cp; -+ int mask; -+ -+ *modifier = NULL; -+ *territory = NULL; -+ *codeset = NULL; -+ *normalized_codeset = NULL; -+ *special = NULL; -+ *sponsor = NULL; -+ *revision = NULL; -+ -+ /* Now we determine the single parts of the locale name. First -+ look for the language. Termination symbols are `_' and `@' if -+ we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */ -+ mask = 0; -+ syntax = undecided; -+ *language = cp = name; -+ while (cp[0] != '\0' && cp[0] != '_' && cp[0] != '@' -+ && cp[0] != '+' && cp[0] != ',') -+ ++cp; -+ -+ if (*language == cp) -+ /* This does not make sense: language has to be specified. Use -+ this entry as it is without exploding. Perhaps it is an alias. */ -+ cp = strchr (*language, '\0'); -+ else if (cp[0] == '_') -+ { -+ /* Next is the territory. */ -+ cp[0] = '\0'; -+ *territory = ++cp; -+ -+ while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@' -+ && cp[0] != '+' && cp[0] != ',' && cp[0] != '_') -+ ++cp; -+ -+ mask |= TERRITORY; -+ -+ if (cp[0] == '.') -+ { -+ /* Next is the codeset. */ -+ syntax = xpg; -+ cp[0] = '\0'; -+ *codeset = ++cp; -+ -+ while (cp[0] != '\0' && cp[0] != '@') -+ ++cp; -+ -+ mask |= XPG_CODESET; -+ -+ if (*codeset != cp && (*codeset)[0] != '\0') -+ { -+ *normalized_codeset = _nl_normalize_codeset (*codeset, -+ cp - *codeset); -+ if (strcmp (*codeset, *normalized_codeset) == 0) -+ free ((char *) *normalized_codeset); -+ else -+ mask |= XPG_NORM_CODESET; -+ } -+ } -+ } -+ -+ if (cp[0] == '@' || (syntax != xpg && cp[0] == '+')) -+ { -+ /* Next is the modifier. */ -+ syntax = cp[0] == '@' ? xpg : cen; -+ cp[0] = '\0'; -+ *modifier = ++cp; -+ -+ while (syntax == cen && cp[0] != '\0' && cp[0] != '+' -+ && cp[0] != ',' && cp[0] != '_') -+ ++cp; -+ -+ mask |= XPG_MODIFIER | CEN_AUDIENCE; -+ } -+ -+ if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_')) -+ { -+ syntax = cen; -+ -+ if (cp[0] == '+') -+ { -+ /* Next is special application (CEN syntax). */ -+ cp[0] = '\0'; -+ *special = ++cp; -+ -+ while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_') -+ ++cp; -+ -+ mask |= CEN_SPECIAL; -+ } -+ -+ if (cp[0] == ',') -+ { -+ /* Next is sponsor (CEN syntax). */ -+ cp[0] = '\0'; -+ *sponsor = ++cp; -+ -+ while (cp[0] != '\0' && cp[0] != '_') -+ ++cp; -+ -+ mask |= CEN_SPONSOR; -+ } -+ -+ if (cp[0] == '_') -+ { -+ /* Next is revision (CEN syntax). */ -+ cp[0] = '\0'; -+ *revision = ++cp; -+ -+ mask |= CEN_REVISION; -+ } -+ } -+ -+ /* For CEN syntax values it might be important to have the -+ separator character in the file name, not for XPG syntax. */ -+ if (syntax == xpg) -+ { -+ if (*territory != NULL && (*territory)[0] == '\0') -+ mask &= ~TERRITORY; -+ -+ if (*codeset != NULL && (*codeset)[0] == '\0') -+ mask &= ~XPG_CODESET; -+ -+ if (*modifier != NULL && (*modifier)[0] == '\0') -+ mask &= ~XPG_MODIFIER; -+ } -+ -+ return mask; -+} -diff -urP gtkhtml-0.8.3.orig/intl/finddomain.c gtkhtml-0.8.3/intl/finddomain.c ---- gtkhtml-0.8.3.orig/intl/finddomain.c Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/finddomain.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,216 @@ -+/* Handle list of needed message catalogs -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <ctype.h> -+#include <errno.h> -+#include <stdio.h> -+#include <sys/types.h> -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#else -+# ifdef HAVE_MALLOC_H -+# include <malloc.h> -+# else -+void free (); -+# endif -+#endif -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# include <string.h> -+#else -+# include <strings.h> -+# ifndef memcpy -+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -+# endif -+#endif -+#if !HAVE_STRCHR && !defined _LIBC -+# ifndef strchr -+# define strchr index -+# endif -+#endif -+ -+#if defined HAVE_UNISTD_H || defined _LIBC -+# include <unistd.h> -+#endif -+ -+#include "gettext.h" -+#include "gettextP.h" -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+ -+/* @@ end of prolog @@ */ -+/* List of already loaded domains. */ -+static struct loaded_l10nfile *_nl_loaded_domains; -+ -+ -+/* Return a data structure describing the message catalog described by -+ the DOMAINNAME and CATEGORY parameters with respect to the currently -+ established bindings. */ -+struct loaded_l10nfile * -+internal_function -+_nl_find_domain (dirname, locale, domainname) -+ const char *dirname; -+ char *locale; -+ const char *domainname; -+{ -+ struct loaded_l10nfile *retval; -+ const char *language; -+ const char *modifier; -+ const char *territory; -+ const char *codeset; -+ const char *normalized_codeset; -+ const char *special; -+ const char *sponsor; -+ const char *revision; -+ const char *alias_value; -+ int mask; -+ -+ /* LOCALE can consist of up to four recognized parts for the XPG syntax: -+ -+ language[_territory[.codeset]][@modifier] -+ -+ and six parts for the CEN syntax: -+ -+ language[_territory][+audience][+special][,[sponsor][_revision]] -+ -+ Beside the first part all of them are allowed to be missing. If -+ the full specified locale is not found, the less specific one are -+ looked for. The various parts will be stripped off according to -+ the following order: -+ (1) revision -+ (2) sponsor -+ (3) special -+ (4) codeset -+ (5) normalized codeset -+ (6) territory -+ (7) audience/modifier -+ */ -+ -+ /* If we have already tested for this locale entry there has to -+ be one data set in the list of loaded domains. */ -+ retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, -+ strlen (dirname) + 1, 0, locale, NULL, NULL, -+ NULL, NULL, NULL, NULL, NULL, domainname, 0); -+ if (retval != NULL) -+ { -+ /* We know something about this locale. */ -+ int cnt; -+ -+ if (retval->decided == 0) -+ _nl_load_domain (retval); -+ -+ if (retval->data != NULL) -+ return retval; -+ -+ for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) -+ { -+ if (retval->successor[cnt]->decided == 0) -+ _nl_load_domain (retval->successor[cnt]); -+ -+ if (retval->successor[cnt]->data != NULL) -+ break; -+ } -+ return cnt >= 0 ? retval : NULL; -+ /* NOTREACHED */ -+ } -+ -+ /* See whether the locale value is an alias. If yes its value -+ *overwrites* the alias name. No test for the original value is -+ done. */ -+ alias_value = _nl_expand_alias (locale); -+ if (alias_value != NULL) -+ { -+#if defined _LIBC || defined HAVE_STRDUP -+ locale = strdup (alias_value); -+ if (locale == NULL) -+ return NULL; -+#else -+ size_t len = strlen (alias_value) + 1; -+ locale = (char *) malloc (len); -+ if (locale == NULL) -+ return NULL; -+ -+ memcpy (locale, alias_value, len); -+#endif -+ } -+ -+ /* Now we determine the single parts of the locale name. First -+ look for the language. Termination symbols are `_' and `@' if -+ we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */ -+ mask = _nl_explode_name (locale, &language, &modifier, &territory, -+ &codeset, &normalized_codeset, &special, -+ &sponsor, &revision); -+ -+ /* Create all possible locale entries which might be interested in -+ generalization. */ -+ retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, -+ strlen (dirname) + 1, mask, language, territory, -+ codeset, normalized_codeset, modifier, special, -+ sponsor, revision, domainname, 1); -+ if (retval == NULL) -+ /* This means we are out of core. */ -+ return NULL; -+ -+ if (retval->decided == 0) -+ _nl_load_domain (retval); -+ if (retval->data == NULL) -+ { -+ int cnt; -+ for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) -+ { -+ if (retval->successor[cnt]->decided == 0) -+ _nl_load_domain (retval->successor[cnt]); -+ if (retval->successor[cnt]->data != NULL) -+ break; -+ } -+ } -+ -+ /* The room for an alias was dynamically allocated. Free it now. */ -+ if (alias_value != NULL) -+ free (locale); -+ -+ return retval; -+} -+ -+ -+#ifdef _LIBC -+static void __attribute__ ((unused)) -+free_mem (void) -+{ -+ struct loaded_l10nfile *runp = _nl_loaded_domains; -+ -+ while (runp != NULL) -+ { -+ struct loaded_l10nfile *here = runp; -+ if (runp->data != NULL) -+ _nl_unload_domain ((struct loaded_domain *) runp->data); -+ runp = runp->next; -+ free (here); -+ } -+} -+ -+text_set_element (__libc_subfreeres, free_mem); -+#endif -diff -urP gtkhtml-0.8.3.orig/intl/gettext.c gtkhtml-0.8.3/intl/gettext.c ---- gtkhtml-0.8.3.orig/intl/gettext.c Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/gettext.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,70 @@ -+/* Implementation of gettext(3) function. -+ Copyright (C) 1995, 1997 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#ifdef _LIBC -+# define __need_NULL -+# include <stddef.h> -+#else -+# ifdef STDC_HEADERS -+# include <stdlib.h> /* Just for NULL. */ -+# else -+# ifdef HAVE_STRING_H -+# include <string.h> -+# else -+# define NULL ((void *) 0) -+# endif -+# endif -+#endif -+ -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+/* Names for the libintl functions are a problem. They must not clash -+ with existing names and they should follow ANSI C. But this source -+ code is also used in GNU C Library where the names have a __ -+ prefix. So we have to make a difference here. */ -+#ifdef _LIBC -+# define GETTEXT __gettext -+# define DGETTEXT __dgettext -+#else -+# define GETTEXT gettext__ -+# define DGETTEXT dgettext__ -+#endif -+ -+/* Look up MSGID in the current default message catalog for the current -+ LC_MESSAGES locale. If not found, returns MSGID itself (the default -+ text). */ -+char * -+GETTEXT (msgid) -+ const char *msgid; -+{ -+ return DGETTEXT (NULL, msgid); -+} -+ -+#ifdef _LIBC -+/* Alias for function name in GNU C Library. */ -+weak_alias (__gettext, gettext); -+#endif -diff -urP gtkhtml-0.8.3.orig/intl/gettext.h gtkhtml-0.8.3/intl/gettext.h ---- gtkhtml-0.8.3.orig/intl/gettext.h Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/gettext.h Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,105 @@ -+/* Internal header for GNU gettext internationalization functions. -+ Copyright (C) 1995, 1997 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 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. */ -+ -+#ifndef _GETTEXT_H -+#define _GETTEXT_H 1 -+ -+#include <stdio.h> -+ -+#if HAVE_LIMITS_H || _LIBC -+# include <limits.h> -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+/* The magic number of the GNU message catalog format. */ -+#define _MAGIC 0x950412de -+#define _MAGIC_SWAPPED 0xde120495 -+ -+/* Revision number of the currently used .mo (binary) file format. */ -+#define MO_REVISION_NUMBER 0 -+ -+/* The following contortions are an attempt to use the C preprocessor -+ to determine an unsigned integral type that is 32 bits wide. An -+ alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but -+ doing that would require that the configure script compile and *run* -+ the resulting executable. Locally running cross-compiled executables -+ is usually not possible. */ -+ -+#if __STDC__ -+# define UINT_MAX_32_BITS 4294967295U -+#else -+# define UINT_MAX_32_BITS 0xFFFFFFFF -+#endif -+ -+/* If UINT_MAX isn't defined, assume it's a 32-bit type. -+ This should be valid for all systems GNU cares about because -+ that doesn't include 16-bit systems, and only modern systems -+ (that certainly have <limits.h>) have 64+-bit integral types. */ -+ -+#ifndef UINT_MAX -+# define UINT_MAX UINT_MAX_32_BITS -+#endif -+ -+#if UINT_MAX == UINT_MAX_32_BITS -+typedef unsigned nls_uint32; -+#else -+# if USHRT_MAX == UINT_MAX_32_BITS -+typedef unsigned short nls_uint32; -+# else -+# if ULONG_MAX == UINT_MAX_32_BITS -+typedef unsigned long nls_uint32; -+# else -+ /* The following line is intended to throw an error. Using #error is -+ not portable enough. */ -+ "Cannot determine unsigned 32-bit data type." -+# endif -+# endif -+#endif -+ -+ -+/* Header for binary .mo file format. */ -+struct mo_file_header -+{ -+ /* The magic number. */ -+ nls_uint32 magic; -+ /* The revision number of the file format. */ -+ nls_uint32 revision; -+ /* The number of strings pairs. */ -+ nls_uint32 nstrings; -+ /* Offset of table with start offsets of original strings. */ -+ nls_uint32 orig_tab_offset; -+ /* Offset of table with start offsets of translation strings. */ -+ nls_uint32 trans_tab_offset; -+ /* Size of hashing table. */ -+ nls_uint32 hash_tab_size; -+ /* Offset of first hashing entry. */ -+ nls_uint32 hash_tab_offset; -+}; -+ -+struct string_desc -+{ -+ /* Length of addressed string. */ -+ nls_uint32 length; -+ /* Offset of string in file. */ -+ nls_uint32 offset; -+}; -+ -+/* @@ begin of epilog @@ */ -+ -+#endif /* gettext.h */ -diff -urP gtkhtml-0.8.3.orig/intl/gettextP.h gtkhtml-0.8.3/intl/gettextP.h ---- gtkhtml-0.8.3.orig/intl/gettextP.h Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/gettextP.h Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,89 @@ -+/* Header describing internals of gettext library -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifndef _GETTEXTP_H -+#define _GETTEXTP_H -+ -+#include "loadinfo.h" -+ -+/* @@ end of prolog @@ */ -+ -+#ifndef PARAMS -+# if __STDC__ -+# define PARAMS(args) args -+# else -+# define PARAMS(args) () -+# endif -+#endif -+ -+#ifndef internal_function -+# define internal_function -+#endif -+ -+#ifndef W -+# define W(flag, data) ((flag) ? SWAP (data) : (data)) -+#endif -+ -+ -+#ifdef _LIBC -+# include <byteswap.h> -+# define SWAP(i) bswap_32 (i) -+#else -+static nls_uint32 SWAP PARAMS ((nls_uint32 i)); -+ -+static inline nls_uint32 -+SWAP (i) -+ nls_uint32 i; -+{ -+ return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24); -+} -+#endif -+ -+ -+struct loaded_domain -+{ -+ const char *data; -+ int use_mmap; -+ size_t mmap_size; -+ int must_swap; -+ nls_uint32 nstrings; -+ struct string_desc *orig_tab; -+ struct string_desc *trans_tab; -+ nls_uint32 hash_size; -+ nls_uint32 *hash_tab; -+}; -+ -+struct binding -+{ -+ struct binding *next; -+ char *domainname; -+ char *dirname; -+}; -+ -+struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname, -+ char *__locale, -+ const char *__domainname)) -+ internal_function; -+void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain)) -+ internal_function; -+void _nl_unload_domain PARAMS ((struct loaded_domain *__domain)) -+ internal_function; -+ -+/* @@ begin of epilog @@ */ -+ -+#endif /* gettextP.h */ -diff -urP gtkhtml-0.8.3.orig/intl/hash-string.h gtkhtml-0.8.3/intl/hash-string.h ---- gtkhtml-0.8.3.orig/intl/hash-string.h Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/hash-string.h Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,59 @@ -+/* Implements a string hashing function. -+ Copyright (C) 1995, 1997 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 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. */ -+ -+/* @@ end of prolog @@ */ -+ -+#ifndef PARAMS -+# if __STDC__ -+# define PARAMS(Args) Args -+# else -+# define PARAMS(Args) () -+# endif -+#endif -+ -+/* We assume to have `unsigned long int' value with at least 32 bits. */ -+#define HASHWORDBITS 32 -+ -+ -+/* Defines the so called `hashpjw' function by P.J. Weinberger -+ [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools, -+ 1986, 1987 Bell Telephone Laboratories, Inc.] */ -+static unsigned long hash_string PARAMS ((const char *__str_param)); -+ -+static inline unsigned long -+hash_string (str_param) -+ const char *str_param; -+{ -+ unsigned long int hval, g; -+ const char *str = str_param; -+ -+ /* Compute the hash value for the given string. */ -+ hval = 0; -+ while (*str != '\0') -+ { -+ hval <<= 4; -+ hval += (unsigned long) *str++; -+ g = hval & ((unsigned long) 0xf << (HASHWORDBITS - 4)); -+ if (g != 0) -+ { -+ hval ^= g >> (HASHWORDBITS - 8); -+ hval ^= g; -+ } -+ } -+ return hval; -+} -diff -urP gtkhtml-0.8.3.orig/intl/intl-compat.c gtkhtml-0.8.3/intl/intl-compat.c ---- gtkhtml-0.8.3.orig/intl/intl-compat.c Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/intl-compat.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,76 @@ -+/* intl-compat.c - Stub functions to call gettext functions from GNU gettext -+ Library. -+ Copyright (C) 1995 Software Foundation, Inc. -+ -+This program is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 2, or (at your option) -+any later version. -+ -+This program 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 General Public License for more details. -+ -+You should have received a copy of the GNU General Public License -+along with this program; if not, write to the Free Software -+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include "libgettext.h" -+ -+/* @@ end of prolog @@ */ -+ -+ -+#undef gettext -+#undef dgettext -+#undef dcgettext -+#undef textdomain -+#undef bindtextdomain -+ -+ -+char * -+bindtextdomain (domainname, dirname) -+ const char *domainname; -+ const char *dirname; -+{ -+ return bindtextdomain__ (domainname, dirname); -+} -+ -+ -+char * -+dcgettext (domainname, msgid, category) -+ const char *domainname; -+ const char *msgid; -+ int category; -+{ -+ return dcgettext__ (domainname, msgid, category); -+} -+ -+ -+char * -+dgettext (domainname, msgid) -+ const char *domainname; -+ const char *msgid; -+{ -+ return dgettext__ (domainname, msgid); -+} -+ -+ -+char * -+gettext (msgid) -+ const char *msgid; -+{ -+ return gettext__ (msgid); -+} -+ -+ -+char * -+textdomain (domainname) -+ const char *domainname; -+{ -+ return textdomain__ (domainname); -+} -diff -urP gtkhtml-0.8.3.orig/intl/l10nflist.c gtkhtml-0.8.3/intl/l10nflist.c ---- gtkhtml-0.8.3.orig/intl/l10nflist.c Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/l10nflist.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,411 @@ -+/* Handle list of needed message catalogs -+ Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. -+ Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# ifndef _GNU_SOURCE -+# define _GNU_SOURCE 1 -+# endif -+# include <string.h> -+#else -+# include <strings.h> -+# ifndef memcpy -+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -+# endif -+#endif -+#if !HAVE_STRCHR && !defined _LIBC -+# ifndef strchr -+# define strchr index -+# endif -+#endif -+ -+#if defined _LIBC || defined HAVE_ARGZ_H -+# include <argz.h> -+#endif -+#include <ctype.h> -+#include <sys/types.h> -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#endif -+ -+#include "loadinfo.h" -+ -+/* On some strange systems still no definition of NULL is found. Sigh! */ -+#ifndef NULL -+# if defined __STDC__ && __STDC__ -+# define NULL ((void *) 0) -+# else -+# define NULL 0 -+# endif -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+#ifdef _LIBC -+/* Rename the non ANSI C functions. This is required by the standard -+ because some ANSI C functions will require linking with this object -+ file and the name space must not be polluted. */ -+# ifndef stpcpy -+# define stpcpy(dest, src) __stpcpy(dest, src) -+# endif -+#else -+# ifndef HAVE_STPCPY -+static char *stpcpy PARAMS ((char *dest, const char *src)); -+# endif -+#endif -+ -+/* Define function which are usually not available. */ -+ -+#if !defined _LIBC && !defined HAVE___ARGZ_COUNT -+/* Returns the number of strings in ARGZ. */ -+static size_t argz_count__ PARAMS ((const char *argz, size_t len)); -+ -+static size_t -+argz_count__ (argz, len) -+ const char *argz; -+ size_t len; -+{ -+ size_t count = 0; -+ while (len > 0) -+ { -+ size_t part_len = strlen (argz); -+ argz += part_len + 1; -+ len -= part_len + 1; -+ count++; -+ } -+ return count; -+} -+# undef __argz_count -+# define __argz_count(argz, len) argz_count__ (argz, len) -+#endif /* !_LIBC && !HAVE___ARGZ_COUNT */ -+ -+#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY -+/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's -+ except the last into the character SEP. */ -+static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep)); -+ -+static void -+argz_stringify__ (argz, len, sep) -+ char *argz; -+ size_t len; -+ int sep; -+{ -+ while (len > 0) -+ { -+ size_t part_len = strlen (argz); -+ argz += part_len; -+ len -= part_len + 1; -+ if (len > 0) -+ *argz++ = sep; -+ } -+} -+# undef __argz_stringify -+# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep) -+#endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */ -+ -+#if !defined _LIBC && !defined HAVE___ARGZ_NEXT -+static char *argz_next__ PARAMS ((char *argz, size_t argz_len, -+ const char *entry)); -+ -+static char * -+argz_next__ (argz, argz_len, entry) -+ char *argz; -+ size_t argz_len; -+ const char *entry; -+{ -+ if (entry) -+ { -+ if (entry < argz + argz_len) -+ entry = strchr (entry, '\0') + 1; -+ -+ return entry >= argz + argz_len ? NULL : (char *) entry; -+ } -+ else -+ if (argz_len > 0) -+ return argz; -+ else -+ return 0; -+} -+# undef __argz_next -+# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry) -+#endif /* !_LIBC && !HAVE___ARGZ_NEXT */ -+ -+ -+/* Return number of bits set in X. */ -+static int pop PARAMS ((int x)); -+ -+static inline int -+pop (x) -+ int x; -+{ -+ /* We assume that no more than 16 bits are used. */ -+ x = ((x & ~0x5555) >> 1) + (x & 0x5555); -+ x = ((x & ~0x3333) >> 2) + (x & 0x3333); -+ x = ((x >> 4) + x) & 0x0f0f; -+ x = ((x >> 8) + x) & 0xff; -+ -+ return x; -+} -+ -+ -+struct loaded_l10nfile * -+_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language, -+ territory, codeset, normalized_codeset, modifier, special, -+ sponsor, revision, filename, do_allocate) -+ struct loaded_l10nfile **l10nfile_list; -+ const char *dirlist; -+ size_t dirlist_len; -+ int mask; -+ const char *language; -+ const char *territory; -+ const char *codeset; -+ const char *normalized_codeset; -+ const char *modifier; -+ const char *special; -+ const char *sponsor; -+ const char *revision; -+ const char *filename; -+ int do_allocate; -+{ -+ char *abs_filename; -+ struct loaded_l10nfile *last = NULL; -+ struct loaded_l10nfile *retval; -+ char *cp; -+ size_t entries; -+ int cnt; -+ -+ /* Allocate room for the full file name. */ -+ abs_filename = (char *) malloc (dirlist_len -+ + strlen (language) -+ + ((mask & TERRITORY) != 0 -+ ? strlen (territory) + 1 : 0) -+ + ((mask & XPG_CODESET) != 0 -+ ? strlen (codeset) + 1 : 0) -+ + ((mask & XPG_NORM_CODESET) != 0 -+ ? strlen (normalized_codeset) + 1 : 0) -+ + (((mask & XPG_MODIFIER) != 0 -+ || (mask & CEN_AUDIENCE) != 0) -+ ? strlen (modifier) + 1 : 0) -+ + ((mask & CEN_SPECIAL) != 0 -+ ? strlen (special) + 1 : 0) -+ + (((mask & CEN_SPONSOR) != 0 -+ || (mask & CEN_REVISION) != 0) -+ ? (1 + ((mask & CEN_SPONSOR) != 0 -+ ? strlen (sponsor) + 1 : 0) -+ + ((mask & CEN_REVISION) != 0 -+ ? strlen (revision) + 1 : 0)) : 0) -+ + 1 + strlen (filename) + 1); -+ -+ if (abs_filename == NULL) -+ return NULL; -+ -+ retval = NULL; -+ last = NULL; -+ -+ /* Construct file name. */ -+ memcpy (abs_filename, dirlist, dirlist_len); -+ __argz_stringify (abs_filename, dirlist_len, ':'); -+ cp = abs_filename + (dirlist_len - 1); -+ *cp++ = '/'; -+ cp = stpcpy (cp, language); -+ -+ if ((mask & TERRITORY) != 0) -+ { -+ *cp++ = '_'; -+ cp = stpcpy (cp, territory); -+ } -+ if ((mask & XPG_CODESET) != 0) -+ { -+ *cp++ = '.'; -+ cp = stpcpy (cp, codeset); -+ } -+ if ((mask & XPG_NORM_CODESET) != 0) -+ { -+ *cp++ = '.'; -+ cp = stpcpy (cp, normalized_codeset); -+ } -+ if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0) -+ { -+ /* This component can be part of both syntaces but has different -+ leading characters. For CEN we use `+', else `@'. */ -+ *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@'; -+ cp = stpcpy (cp, modifier); -+ } -+ if ((mask & CEN_SPECIAL) != 0) -+ { -+ *cp++ = '+'; -+ cp = stpcpy (cp, special); -+ } -+ if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0) -+ { -+ *cp++ = ','; -+ if ((mask & CEN_SPONSOR) != 0) -+ cp = stpcpy (cp, sponsor); -+ if ((mask & CEN_REVISION) != 0) -+ { -+ *cp++ = '_'; -+ cp = stpcpy (cp, revision); -+ } -+ } -+ -+ *cp++ = '/'; -+ stpcpy (cp, filename); -+ -+ /* Look in list of already loaded domains whether it is already -+ available. */ -+ last = NULL; -+ for (retval = *l10nfile_list; retval != NULL; retval = retval->next) -+ if (retval->filename != NULL) -+ { -+ int compare = strcmp (retval->filename, abs_filename); -+ if (compare == 0) -+ /* We found it! */ -+ break; -+ if (compare < 0) -+ { -+ /* It's not in the list. */ -+ retval = NULL; -+ break; -+ } -+ -+ last = retval; -+ } -+ -+ if (retval != NULL || do_allocate == 0) -+ { -+ free (abs_filename); -+ return retval; -+ } -+ -+ retval = (struct loaded_l10nfile *) -+ malloc (sizeof (*retval) + (__argz_count (dirlist, dirlist_len) -+ * (1 << pop (mask)) -+ * sizeof (struct loaded_l10nfile *))); -+ if (retval == NULL) -+ return NULL; -+ -+ retval->filename = abs_filename; -+ retval->decided = (__argz_count (dirlist, dirlist_len) != 1 -+ || ((mask & XPG_CODESET) != 0 -+ && (mask & XPG_NORM_CODESET) != 0)); -+ retval->data = NULL; -+ -+ if (last == NULL) -+ { -+ retval->next = *l10nfile_list; -+ *l10nfile_list = retval; -+ } -+ else -+ { -+ retval->next = last->next; -+ last->next = retval; -+ } -+ -+ entries = 0; -+ /* If the DIRLIST is a real list the RETVAL entry corresponds not to -+ a real file. So we have to use the DIRLIST separation mechanism -+ of the inner loop. */ -+ cnt = __argz_count (dirlist, dirlist_len) == 1 ? mask - 1 : mask; -+ for (; cnt >= 0; --cnt) -+ if ((cnt & ~mask) == 0 -+ && ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0) -+ && ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0)) -+ { -+ /* Iterate over all elements of the DIRLIST. */ -+ char *dir = NULL; -+ -+ while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir)) -+ != NULL) -+ retval->successor[entries++] -+ = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, cnt, -+ language, territory, codeset, -+ normalized_codeset, modifier, special, -+ sponsor, revision, filename, 1); -+ } -+ retval->successor[entries] = NULL; -+ -+ return retval; -+} -+ -+/* Normalize codeset name. There is no standard for the codeset -+ names. Normalization allows the user to use any of the common -+ names. */ -+const char * -+_nl_normalize_codeset (codeset, name_len) -+ const unsigned char *codeset; -+ size_t name_len; -+{ -+ int len = 0; -+ int only_digit = 1; -+ char *retval; -+ char *wp; -+ size_t cnt; -+ -+ for (cnt = 0; cnt < name_len; ++cnt) -+ if (isalnum (codeset[cnt])) -+ { -+ ++len; -+ -+ if (isalpha (codeset[cnt])) -+ only_digit = 0; -+ } -+ -+ retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1); -+ -+ if (retval != NULL) -+ { -+ if (only_digit) -+ wp = stpcpy (retval, "iso"); -+ else -+ wp = retval; -+ -+ for (cnt = 0; cnt < name_len; ++cnt) -+ if (isalpha (codeset[cnt])) -+ *wp++ = tolower (codeset[cnt]); -+ else if (isdigit (codeset[cnt])) -+ *wp++ = codeset[cnt]; -+ -+ *wp = '\0'; -+ } -+ -+ return (const char *) retval; -+} -+ -+ -+/* @@ begin of epilog @@ */ -+ -+/* We don't want libintl.a to depend on any other library. So we -+ avoid the non-standard function stpcpy. In GNU C Library this -+ function is available, though. Also allow the symbol HAVE_STPCPY -+ to be defined. */ -+#if !_LIBC && !HAVE_STPCPY -+static char * -+stpcpy (dest, src) -+ char *dest; -+ const char *src; -+{ -+ while ((*dest++ = *src++) != '\0') -+ /* Do nothing. */ ; -+ return dest - 1; -+} -+#endif -diff -urP gtkhtml-0.8.3.orig/intl/libgettext.h gtkhtml-0.8.3/intl/libgettext.h ---- gtkhtml-0.8.3.orig/intl/libgettext.h Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/libgettext.h Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,182 @@ -+/* Message catalogs for internationalization. -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+/* Because on some systems (e.g. Solaris) we sometimes have to include -+ the systems libintl.h as well as this file we have more complex -+ include protection above. But the systems header might perhaps also -+ define _LIBINTL_H and therefore we have to protect the definition here. */ -+ -+#if !defined _LIBINTL_H || !defined _LIBGETTEXT_H -+#ifndef _LIBINTL_H -+# define _LIBINTL_H 1 -+#endif -+#define _LIBGETTEXT_H 1 -+ -+/* We define an additional symbol to signal that we use the GNU -+ implementation of gettext. */ -+#define __USE_GNU_GETTEXT 1 -+ -+#include <sys/types.h> -+ -+#if HAVE_LOCALE_H -+# include <locale.h> -+#endif -+ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+#ifndef PARAMS -+# if __STDC__ || defined __cplusplus -+# define PARAMS(args) args -+# else -+# define PARAMS(args) () -+# endif -+#endif -+ -+#ifndef NULL -+# if !defined __cplusplus || defined __GNUC__ -+# define NULL ((void *) 0) -+# else -+# define NULL (0) -+# endif -+#endif -+ -+#if !HAVE_LC_MESSAGES -+/* This value determines the behaviour of the gettext() and dgettext() -+ function. But some system does not have this defined. Define it -+ to a default value. */ -+# define LC_MESSAGES (-1) -+#endif -+ -+ -+/* Declarations for gettext-using-catgets interface. Derived from -+ Jim Meyering's libintl.h. */ -+struct _msg_ent -+{ -+ const char *_msg; -+ int _msg_number; -+}; -+ -+ -+#if HAVE_CATGETS -+/* These two variables are defined in the automatically by po-to-tbl.sed -+ generated file `cat-id-tbl.c'. */ -+extern const struct _msg_ent _msg_tbl[]; -+extern int _msg_tbl_length; -+#endif -+ -+ -+/* For automatical extraction of messages sometimes no real -+ translation is needed. Instead the string itself is the result. */ -+#define gettext_noop(Str) (Str) -+ -+/* Look up MSGID in the current default message catalog for the current -+ LC_MESSAGES locale. If not found, returns MSGID itself (the default -+ text). */ -+extern char *gettext PARAMS ((const char *__msgid)); -+extern char *gettext__ PARAMS ((const char *__msgid)); -+ -+/* Look up MSGID in the DOMAINNAME message catalog for the current -+ LC_MESSAGES locale. */ -+extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid)); -+extern char *dgettext__ PARAMS ((const char *__domainname, -+ const char *__msgid)); -+ -+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY -+ locale. */ -+extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid, -+ int __category)); -+extern char *dcgettext__ PARAMS ((const char *__domainname, -+ const char *__msgid, int __category)); -+ -+ -+/* Set the current default message catalog to DOMAINNAME. -+ If DOMAINNAME is null, return the current default. -+ If DOMAINNAME is "", reset to the default of "messages". */ -+extern char *textdomain PARAMS ((const char *__domainname)); -+extern char *textdomain__ PARAMS ((const char *__domainname)); -+ -+/* Specify that the DOMAINNAME message catalog will be found -+ in DIRNAME rather than in the system locale data base. */ -+extern char *bindtextdomain PARAMS ((const char *__domainname, -+ const char *__dirname)); -+extern char *bindtextdomain__ PARAMS ((const char *__domainname, -+ const char *__dirname)); -+ -+#if ENABLE_NLS -+ -+/* Solaris 2.3 has the gettext function but dcgettext is missing. -+ So we omit this optimization for Solaris 2.3. BTW, Solaris 2.4 -+ has dcgettext. */ -+# if !HAVE_CATGETS && (!HAVE_GETTEXT || HAVE_DCGETTEXT) -+ -+# define gettext(Msgid) \ -+ dgettext (NULL, Msgid) -+ -+# define dgettext(Domainname, Msgid) \ -+ dcgettext (Domainname, Msgid, LC_MESSAGES) -+ -+# if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ >= 7 -+/* This global variable is defined in loadmsgcat.c. We need a sign, -+ whether a new catalog was loaded, which can be associated with all -+ translations. */ -+extern int _nl_msg_cat_cntr; -+ -+# define dcgettext(Domainname, Msgid, Category) \ -+ (__extension__ \ -+ ({ \ -+ char *__result; \ -+ if (__builtin_constant_p (Msgid)) \ -+ { \ -+ static char *__translation__; \ -+ static int __catalog_counter__; \ -+ if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr) \ -+ { \ -+ __translation__ = \ -+ dcgettext__ (Domainname, Msgid, Category); \ -+ __catalog_counter__ = _nl_msg_cat_cntr; \ -+ } \ -+ __result = __translation__; \ -+ } \ -+ else \ -+ __result = dcgettext__ (Domainname, Msgid, Category); \ -+ __result; \ -+ })) -+# endif -+# endif -+ -+#else -+ -+# define gettext(Msgid) (Msgid) -+# define dgettext(Domainname, Msgid) (Msgid) -+# define dcgettext(Domainname, Msgid, Category) (Msgid) -+# define textdomain(Domainname) ((char *) Domainname) -+# define bindtextdomain(Domainname, Dirname) ((char *) Dirname) -+ -+#endif -+ -+/* @@ begin of epilog @@ */ -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif -diff -urP gtkhtml-0.8.3.orig/intl/linux-msg.sed gtkhtml-0.8.3/intl/linux-msg.sed ---- gtkhtml-0.8.3.orig/intl/linux-msg.sed Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/linux-msg.sed Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,100 @@ -+# po2msg.sed - Convert Uniforum style .po file to Linux style .msg file -+# Copyright (C) 1995 Free Software Foundation, Inc. -+# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+# -+# This program 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 General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+# -+# The first directive in the .msg should be the definition of the -+# message set number. We use always set number 1. -+# -+1 { -+ i\ -+$set 1 # Automatically created by po2msg.sed -+ h -+ s/.*/0/ -+ x -+} -+# -+# Mitch's old catalog format does not allow comments. -+# -+# We copy the original message as a comment into the .msg file. -+# -+/^msgid/ { -+ s/msgid[ ]*"// -+# -+# This does not work now with the new format. -+# /"$/! { -+# s/\\$// -+# s/$/ ... (more lines following)"/ -+# } -+ x -+# The following nice solution is by -+# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de> -+ td -+# Increment a decimal number in pattern space. -+# First hide trailing `9' digits. -+ :d -+ s/9\(_*\)$/_\1/ -+ td -+# Assure at least one digit is available. -+ s/^\(_*\)$/0\1/ -+# Increment the last digit. -+ s/8\(_*\)$/9\1/ -+ s/7\(_*\)$/8\1/ -+ s/6\(_*\)$/7\1/ -+ s/5\(_*\)$/6\1/ -+ s/4\(_*\)$/5\1/ -+ s/3\(_*\)$/4\1/ -+ s/2\(_*\)$/3\1/ -+ s/1\(_*\)$/2\1/ -+ s/0\(_*\)$/1\1/ -+# Convert the hidden `9' digits to `0's. -+ s/_/0/g -+ x -+ G -+ s/\(.*\)"\n\([0-9]*\)/$ #\2 Original Message:(\1)/p -+} -+# -+# The .msg file contains, other then the .po file, only the translations -+# but each given a unique ID. Starting from 1 and incrementing by 1 for -+# each message we assign them to the messages. -+# It is important that the .po file used to generate the cat-id-tbl.c file -+# (with po-to-tbl) is the same as the one used here. (At least the order -+# of declarations must not be changed.) -+# -+/^msgstr/ { -+ s/msgstr[ ]*"\(.*\)"/# \1/ -+# Clear substitution flag. -+ tb -+# Append the next line. -+ :b -+ N -+# Look whether second part is continuation line. -+ s/\(.*\n\)"\(.*\)"/\1\2/ -+# Yes, then branch. -+ ta -+ P -+ D -+# Note that D includes a jump to the start!! -+# We found a continuation line. But before printing insert '\'. -+ :a -+ s/\(.*\)\(\n.*\)/\1\\\2/ -+ P -+# We cannot use D here. -+ s/.*\n\(.*\)/\1/ -+ tb -+} -+d -diff -urP gtkhtml-0.8.3.orig/intl/loadinfo.h gtkhtml-0.8.3/intl/loadinfo.h ---- gtkhtml-0.8.3.orig/intl/loadinfo.h Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/loadinfo.h Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,76 @@ -+/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifndef PARAMS -+# if __STDC__ -+# define PARAMS(args) args -+# else -+# define PARAMS(args) () -+# endif -+#endif -+ -+/* Encoding of locale name parts. */ -+#define CEN_REVISION 1 -+#define CEN_SPONSOR 2 -+#define CEN_SPECIAL 4 -+#define XPG_NORM_CODESET 8 -+#define XPG_CODESET 16 -+#define TERRITORY 32 -+#define CEN_AUDIENCE 64 -+#define XPG_MODIFIER 128 -+ -+#define CEN_SPECIFIC (CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE) -+#define XPG_SPECIFIC (XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER) -+ -+ -+struct loaded_l10nfile -+{ -+ const char *filename; -+ int decided; -+ -+ const void *data; -+ -+ struct loaded_l10nfile *next; -+ struct loaded_l10nfile *successor[1]; -+}; -+ -+ -+extern const char *_nl_normalize_codeset PARAMS ((const unsigned char *codeset, -+ size_t name_len)); -+ -+extern struct loaded_l10nfile * -+_nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list, -+ const char *dirlist, size_t dirlist_len, int mask, -+ const char *language, const char *territory, -+ const char *codeset, -+ const char *normalized_codeset, -+ const char *modifier, const char *special, -+ const char *sponsor, const char *revision, -+ const char *filename, int do_allocate)); -+ -+ -+extern const char *_nl_expand_alias PARAMS ((const char *name)); -+ -+extern int _nl_explode_name PARAMS ((char *name, const char **language, -+ const char **modifier, -+ const char **territory, -+ const char **codeset, -+ const char **normalized_codeset, -+ const char **special, -+ const char **sponsor, -+ const char **revision)); -diff -urP gtkhtml-0.8.3.orig/intl/loadmsgcat.c gtkhtml-0.8.3/intl/loadmsgcat.c ---- gtkhtml-0.8.3.orig/intl/loadmsgcat.c Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/loadmsgcat.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,222 @@ -+/* Load needed message catalogs. -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <fcntl.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#endif -+ -+#if defined HAVE_UNISTD_H || defined _LIBC -+# include <unistd.h> -+#endif -+ -+#if (defined HAVE_MMAP && defined HAVE_MUNMAP) || defined _LIBC -+# include <sys/mman.h> -+#endif -+ -+#include "gettext.h" -+#include "gettextP.h" -+ -+/* @@ end of prolog @@ */ -+ -+#ifdef _LIBC -+/* Rename the non ISO C functions. This is required by the standard -+ because some ISO C functions will require linking with this object -+ file and the name space must not be polluted. */ -+# define open __open -+# define close __close -+# define read __read -+# define mmap __mmap -+# define munmap __munmap -+#endif -+ -+/* We need a sign, whether a new catalog was loaded, which can be associated -+ with all translations. This is important if the translations are -+ cached by one of GCC's features. */ -+int _nl_msg_cat_cntr = 0; -+ -+ -+/* Load the message catalogs specified by FILENAME. If it is no valid -+ message catalog do nothing. */ -+void -+internal_function -+_nl_load_domain (domain_file) -+ struct loaded_l10nfile *domain_file; -+{ -+ int fd; -+ size_t size; -+ struct stat st; -+ struct mo_file_header *data = (struct mo_file_header *) -1; -+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ -+ || defined _LIBC -+ int use_mmap = 0; -+#endif -+ struct loaded_domain *domain; -+ -+ domain_file->decided = 1; -+ domain_file->data = NULL; -+ -+ /* If the record does not represent a valid locale the FILENAME -+ might be NULL. This can happen when according to the given -+ specification the locale file name is different for XPG and CEN -+ syntax. */ -+ if (domain_file->filename == NULL) -+ return; -+ -+ /* Try to open the addressed file. */ -+ fd = open (domain_file->filename, O_RDONLY); -+ if (fd == -1) -+ return; -+ -+ /* We must know about the size of the file. */ -+ if (fstat (fd, &st) != 0 -+ || (size = (size_t) st.st_size) != st.st_size -+ || size < sizeof (struct mo_file_header)) -+ { -+ /* Something went wrong. */ -+ close (fd); -+ return; -+ } -+ -+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ -+ || defined _LIBC -+ /* Now we are ready to load the file. If mmap() is available we try -+ this first. If not available or it failed we try to load it. */ -+ data = (struct mo_file_header *) mmap (NULL, size, PROT_READ, -+ MAP_PRIVATE, fd, 0); -+ -+ if (data != (struct mo_file_header *) -1) -+ { -+ /* mmap() call was successful. */ -+ close (fd); -+ use_mmap = 1; -+ } -+#endif -+ -+ /* If the data is not yet available (i.e. mmap'ed) we try to load -+ it manually. */ -+ if (data == (struct mo_file_header *) -1) -+ { -+ size_t to_read; -+ char *read_ptr; -+ -+ data = (struct mo_file_header *) malloc (size); -+ if (data == NULL) -+ return; -+ -+ to_read = size; -+ read_ptr = (char *) data; -+ do -+ { -+ long int nb = (long int) read (fd, read_ptr, to_read); -+ if (nb == -1) -+ { -+ close (fd); -+ return; -+ } -+ -+ read_ptr += nb; -+ to_read -= nb; -+ } -+ while (to_read > 0); -+ -+ close (fd); -+ } -+ -+ /* Using the magic number we can test whether it really is a message -+ catalog file. */ -+ if (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED) -+ { -+ /* The magic number is wrong: not a message catalog file. */ -+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ -+ || defined _LIBC -+ if (use_mmap) -+ munmap ((caddr_t) data, size); -+ else -+#endif -+ free (data); -+ return; -+ } -+ -+ domain_file->data -+ = (struct loaded_domain *) malloc (sizeof (struct loaded_domain)); -+ if (domain_file->data == NULL) -+ return; -+ -+ domain = (struct loaded_domain *) domain_file->data; -+ domain->data = (char *) data; -+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ -+ || defined _LIBC -+ domain->use_mmap = use_mmap; -+#endif -+ domain->mmap_size = size; -+ domain->must_swap = data->magic != _MAGIC; -+ -+ /* Fill in the information about the available tables. */ -+ switch (W (domain->must_swap, data->revision)) -+ { -+ case 0: -+ domain->nstrings = W (domain->must_swap, data->nstrings); -+ domain->orig_tab = (struct string_desc *) -+ ((char *) data + W (domain->must_swap, data->orig_tab_offset)); -+ domain->trans_tab = (struct string_desc *) -+ ((char *) data + W (domain->must_swap, data->trans_tab_offset)); -+ domain->hash_size = W (domain->must_swap, data->hash_tab_size); -+ domain->hash_tab = (nls_uint32 *) -+ ((char *) data + W (domain->must_swap, data->hash_tab_offset)); -+ break; -+ default: -+ /* This is an illegal revision. */ -+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ -+ || defined _LIBC -+ if (use_mmap) -+ munmap ((caddr_t) data, size); -+ else -+#endif -+ free (data); -+ free (domain); -+ domain_file->data = NULL; -+ return; -+ } -+ -+ /* Show that one domain is changed. This might make some cached -+ translations invalid. */ -+ ++_nl_msg_cat_cntr; -+} -+ -+ -+#ifdef _LIBC -+void -+internal_function -+_nl_unload_domain (domain) -+ struct loaded_domain *domain; -+{ -+ if (domain->use_mmap) -+ munmap ((caddr_t) domain->data, domain->mmap_size); -+ else -+ free ((void *) domain->data); -+ -+ free (domain); -+} -+#endif -diff -urP gtkhtml-0.8.3.orig/intl/localealias.c gtkhtml-0.8.3/intl/localealias.c ---- gtkhtml-0.8.3.orig/intl/localealias.c Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/localealias.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,424 @@ -+/* Handle aliases for locale names. -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <ctype.h> -+#include <stdio.h> -+#include <sys/types.h> -+ -+#ifdef __GNUC__ -+# define alloca __builtin_alloca -+# define HAVE_ALLOCA 1 -+#else -+# if defined HAVE_ALLOCA_H || defined _LIBC -+# include <alloca.h> -+# else -+# ifdef _AIX -+ #pragma alloca -+# else -+# ifndef alloca -+char *alloca (); -+# endif -+# endif -+# endif -+#endif -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#else -+char *getenv (); -+# ifdef HAVE_MALLOC_H -+# include <malloc.h> -+# else -+void free (); -+# endif -+#endif -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# ifndef _GNU_SOURCE -+# define _GNU_SOURCE 1 -+# endif -+# include <string.h> -+#else -+# include <strings.h> -+# ifndef memcpy -+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -+# endif -+#endif -+#if !HAVE_STRCHR && !defined _LIBC -+# ifndef strchr -+# define strchr index -+# endif -+#endif -+ -+#include "gettext.h" -+#include "gettextP.h" -+ -+/* @@ end of prolog @@ */ -+ -+#ifdef _LIBC -+/* Rename the non ANSI C functions. This is required by the standard -+ because some ANSI C functions will require linking with this object -+ file and the name space must not be polluted. */ -+# define strcasecmp __strcasecmp -+ -+# define mempcpy __mempcpy -+# define HAVE_MEMPCPY 1 -+ -+/* We need locking here since we can be called from different places. */ -+# include <bits/libc-lock.h> -+ -+__libc_lock_define_initialized (static, lock); -+#endif -+ -+ -+/* For those loosing systems which don't have `alloca' we have to add -+ some additional code emulating it. */ -+#ifdef HAVE_ALLOCA -+/* Nothing has to be done. */ -+# define ADD_BLOCK(list, address) /* nothing */ -+# define FREE_BLOCKS(list) /* nothing */ -+#else -+struct block_list -+{ -+ void *address; -+ struct block_list *next; -+}; -+# define ADD_BLOCK(list, addr) \ -+ do { \ -+ struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \ -+ /* If we cannot get a free block we cannot add the new element to \ -+ the list. */ \ -+ if (newp != NULL) { \ -+ newp->address = (addr); \ -+ newp->next = (list); \ -+ (list) = newp; \ -+ } \ -+ } while (0) -+# define FREE_BLOCKS(list) \ -+ do { \ -+ while (list != NULL) { \ -+ struct block_list *old = list; \ -+ list = list->next; \ -+ free (old); \ -+ } \ -+ } while (0) -+# undef alloca -+# define alloca(size) (malloc (size)) -+#endif /* have alloca */ -+ -+ -+struct alias_map -+{ -+ const char *alias; -+ const char *value; -+}; -+ -+ -+static char *string_space = NULL; -+static size_t string_space_act = 0; -+static size_t string_space_max = 0; -+static struct alias_map *map; -+static size_t nmap = 0; -+static size_t maxmap = 0; -+ -+ -+/* Prototypes for local functions. */ -+static size_t read_alias_file PARAMS ((const char *fname, int fname_len)) -+ internal_function; -+static void extend_alias_table PARAMS ((void)); -+static int alias_compare PARAMS ((const struct alias_map *map1, -+ const struct alias_map *map2)); -+ -+ -+const char * -+_nl_expand_alias (name) -+ const char *name; -+{ -+ static const char *locale_alias_path = LOCALE_ALIAS_PATH; -+ struct alias_map *retval; -+ const char *result = NULL; -+ size_t added; -+ -+#ifdef _LIBC -+ __libc_lock_lock (lock); -+#endif -+ -+ do -+ { -+ struct alias_map item; -+ -+ item.alias = name; -+ -+ if (nmap > 0) -+ retval = (struct alias_map *) bsearch (&item, map, nmap, -+ sizeof (struct alias_map), -+ (int (*) PARAMS ((const void *, -+ const void *)) -+ ) alias_compare); -+ else -+ retval = NULL; -+ -+ /* We really found an alias. Return the value. */ -+ if (retval != NULL) -+ { -+ result = retval->value; -+ break; -+ } -+ -+ /* Perhaps we can find another alias file. */ -+ added = 0; -+ while (added == 0 && locale_alias_path[0] != '\0') -+ { -+ const char *start; -+ -+ while (locale_alias_path[0] == ':') -+ ++locale_alias_path; -+ start = locale_alias_path; -+ -+ while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ':') -+ ++locale_alias_path; -+ -+ if (start < locale_alias_path) -+ added = read_alias_file (start, locale_alias_path - start); -+ } -+ } -+ while (added != 0); -+ -+#ifdef _LIBC -+ __libc_lock_unlock (lock); -+#endif -+ -+ return result; -+} -+ -+ -+static size_t -+internal_function -+read_alias_file (fname, fname_len) -+ const char *fname; -+ int fname_len; -+{ -+#ifndef HAVE_ALLOCA -+ struct block_list *block_list = NULL; -+#endif -+ FILE *fp; -+ char *full_fname; -+ size_t added; -+ static const char aliasfile[] = "/locale.alias"; -+ -+ full_fname = (char *) alloca (fname_len + sizeof aliasfile); -+ ADD_BLOCK (block_list, full_fname); -+#ifdef HAVE_MEMPCPY -+ mempcpy (mempcpy (full_fname, fname, fname_len), -+ aliasfile, sizeof aliasfile); -+#else -+ memcpy (full_fname, fname, fname_len); -+ memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile); -+#endif -+ -+ fp = fopen (full_fname, "r"); -+ if (fp == NULL) -+ { -+ FREE_BLOCKS (block_list); -+ return 0; -+ } -+ -+ added = 0; -+ while (!feof (fp)) -+ { -+ /* It is a reasonable approach to use a fix buffer here because -+ a) we are only interested in the first two fields -+ b) these fields must be usable as file names and so must not -+ be that long -+ */ -+ unsigned char buf[BUFSIZ]; -+ unsigned char *alias; -+ unsigned char *value; -+ unsigned char *cp; -+ -+ if (fgets (buf, sizeof buf, fp) == NULL) -+ /* EOF reached. */ -+ break; -+ -+ /* Possibly not the whole line fits into the buffer. Ignore -+ the rest of the line. */ -+ if (strchr (buf, '\n') == NULL) -+ { -+ char altbuf[BUFSIZ]; -+ do -+ if (fgets (altbuf, sizeof altbuf, fp) == NULL) -+ /* Make sure the inner loop will be left. The outer loop -+ will exit at the `feof' test. */ -+ break; -+ while (strchr (altbuf, '\n') == NULL); -+ } -+ -+ cp = buf; -+ /* Ignore leading white space. */ -+ while (isspace (cp[0])) -+ ++cp; -+ -+ /* A leading '#' signals a comment line. */ -+ if (cp[0] != '\0' && cp[0] != '#') -+ { -+ alias = cp++; -+ while (cp[0] != '\0' && !isspace (cp[0])) -+ ++cp; -+ /* Terminate alias name. */ -+ if (cp[0] != '\0') -+ *cp++ = '\0'; -+ -+ /* Now look for the beginning of the value. */ -+ while (isspace (cp[0])) -+ ++cp; -+ -+ if (cp[0] != '\0') -+ { -+ size_t alias_len; -+ size_t value_len; -+ -+ value = cp++; -+ while (cp[0] != '\0' && !isspace (cp[0])) -+ ++cp; -+ /* Terminate value. */ -+ if (cp[0] == '\n') -+ { -+ /* This has to be done to make the following test -+ for the end of line possible. We are looking for -+ the terminating '\n' which do not overwrite here. */ -+ *cp++ = '\0'; -+ *cp = '\n'; -+ } -+ else if (cp[0] != '\0') -+ *cp++ = '\0'; -+ -+ if (nmap >= maxmap) -+ extend_alias_table (); -+ -+ alias_len = strlen (alias) + 1; -+ value_len = strlen (value) + 1; -+ -+ if (string_space_act + alias_len + value_len > string_space_max) -+ { -+ /* Increase size of memory pool. */ -+ size_t new_size = (string_space_max -+ + (alias_len + value_len > 1024 -+ ? alias_len + value_len : 1024)); -+ char *new_pool = (char *) realloc (string_space, new_size); -+ if (new_pool == NULL) -+ { -+ FREE_BLOCKS (block_list); -+ return added; -+ } -+ string_space = new_pool; -+ string_space_max = new_size; -+ } -+ -+ map[nmap].alias = memcpy (&string_space[string_space_act], -+ alias, alias_len); -+ string_space_act += alias_len; -+ -+ map[nmap].value = memcpy (&string_space[string_space_act], -+ value, value_len); -+ string_space_act += value_len; -+ -+ ++nmap; -+ ++added; -+ } -+ } -+ } -+ -+ /* Should we test for ferror()? I think we have to silently ignore -+ errors. --drepper */ -+ fclose (fp); -+ -+ if (added > 0) -+ qsort (map, nmap, sizeof (struct alias_map), -+ (int (*) PARAMS ((const void *, const void *))) alias_compare); -+ -+ FREE_BLOCKS (block_list); -+ return added; -+} -+ -+ -+static void -+extend_alias_table () -+{ -+ size_t new_size; -+ struct alias_map *new_map; -+ -+ new_size = maxmap == 0 ? 100 : 2 * maxmap; -+ new_map = (struct alias_map *) realloc (map, (new_size -+ * sizeof (struct alias_map))); -+ if (new_map == NULL) -+ /* Simply don't extend: we don't have any more core. */ -+ return; -+ -+ map = new_map; -+ maxmap = new_size; -+} -+ -+ -+#ifdef _LIBC -+static void __attribute__ ((unused)) -+free_mem (void) -+{ -+ if (string_space != NULL) -+ free (string_space); -+ if (map != NULL) -+ free (map); -+} -+text_set_element (__libc_subfreeres, free_mem); -+#endif -+ -+ -+static int -+alias_compare (map1, map2) -+ const struct alias_map *map1; -+ const struct alias_map *map2; -+{ -+#if defined _LIBC || defined HAVE_STRCASECMP -+ return strcasecmp (map1->alias, map2->alias); -+#else -+ const unsigned char *p1 = (const unsigned char *) map1->alias; -+ const unsigned char *p2 = (const unsigned char *) map2->alias; -+ unsigned char c1, c2; -+ -+ if (p1 == p2) -+ return 0; -+ -+ do -+ { -+ /* I know this seems to be odd but the tolower() function in -+ some systems libc cannot handle nonalpha characters. */ -+ c1 = isupper (*p1) ? tolower (*p1) : *p1; -+ c2 = isupper (*p2) ? tolower (*p2) : *p2; -+ if (c1 == '\0') -+ break; -+ ++p1; -+ ++p2; -+ } -+ while (c1 == c2); -+ -+ return c1 - c2; -+#endif -+} -diff -urP gtkhtml-0.8.3.orig/intl/po2tbl.sed.in gtkhtml-0.8.3/intl/po2tbl.sed.in ---- gtkhtml-0.8.3.orig/intl/po2tbl.sed.in Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/po2tbl.sed.in Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,102 @@ -+# po2tbl.sed - Convert Uniforum style .po file to lookup table for catgets -+# Copyright (C) 1995 Free Software Foundation, Inc. -+# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+# -+# This program 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 General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+1 { -+ i\ -+/* Automatically generated by po2tbl.sed from @PACKAGE NAME@.pot. */\ -+\ -+#if HAVE_CONFIG_H\ -+# include <config.h>\ -+#endif\ -+\ -+#include "libgettext.h"\ -+\ -+const struct _msg_ent _msg_tbl[] = { -+ h -+ s/.*/0/ -+ x -+} -+# -+# Write msgid entries in C array form. -+# -+/^msgid/ { -+ s/msgid[ ]*\(".*"\)/ {\1/ -+ tb -+# Append the next line -+ :b -+ N -+# Look whether second part is continuation line. -+ s/\(.*\)"\(\n\)"\(.*"\)/\1\2\3/ -+# Yes, then branch. -+ ta -+# Because we assume that the input file correctly formed the line -+# just read cannot be again be a msgid line. So it's safe to ignore -+# it. -+ s/\(.*\)\n.*/\1/ -+ bc -+# We found a continuation line. But before printing insert '\'. -+ :a -+ s/\(.*\)\(\n.*\)/\1\\\2/ -+ P -+# We cannot use D here. -+ s/.*\n\(.*\)/\1/ -+# Some buggy seds do not clear the `successful substitution since last ``t''' -+# flag on `N', so we do a `t' here to clear it. -+ tb -+# Not reached -+ :c -+ x -+# The following nice solution is by -+# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de> -+ td -+# Increment a decimal number in pattern space. -+# First hide trailing `9' digits. -+ :d -+ s/9\(_*\)$/_\1/ -+ td -+# Assure at least one digit is available. -+ s/^\(_*\)$/0\1/ -+# Increment the last digit. -+ s/8\(_*\)$/9\1/ -+ s/7\(_*\)$/8\1/ -+ s/6\(_*\)$/7\1/ -+ s/5\(_*\)$/6\1/ -+ s/4\(_*\)$/5\1/ -+ s/3\(_*\)$/4\1/ -+ s/2\(_*\)$/3\1/ -+ s/1\(_*\)$/2\1/ -+ s/0\(_*\)$/1\1/ -+# Convert the hidden `9' digits to `0's. -+ s/_/0/g -+ x -+ G -+ s/\(.*\)\n\([0-9]*\)/\1, \2},/ -+ s/\(.*\)"$/\1/ -+ p -+} -+# -+# Last line. -+# -+$ { -+ i\ -+};\ -+ -+ g -+ s/0*\(.*\)/int _msg_tbl_length = \1;/p -+} -+d -diff -urP gtkhtml-0.8.3.orig/intl/textdomain.c gtkhtml-0.8.3/intl/textdomain.c ---- gtkhtml-0.8.3.orig/intl/textdomain.c Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/textdomain.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,108 @@ -+/* Implementation of the textdomain(3) function. -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#endif -+ -+#if defined STDC_HEADERS || defined HAVE_STRING_H || defined _LIBC -+# include <string.h> -+#else -+# include <strings.h> -+# ifndef memcpy -+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -+# endif -+#endif -+ -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+/* Name of the default text domain. */ -+extern const char _nl_default_default_domain[]; -+ -+/* Default text domain in which entries for gettext(3) are to be found. */ -+extern const char *_nl_current_default_domain; -+ -+ -+/* Names for the libintl functions are a problem. They must not clash -+ with existing names and they should follow ANSI C. But this source -+ code is also used in GNU C Library where the names have a __ -+ prefix. So we have to make a difference here. */ -+#ifdef _LIBC -+# define TEXTDOMAIN __textdomain -+# ifndef strdup -+# define strdup(str) __strdup (str) -+# endif -+#else -+# define TEXTDOMAIN textdomain__ -+#endif -+ -+/* Set the current default message catalog to DOMAINNAME. -+ If DOMAINNAME is null, return the current default. -+ If DOMAINNAME is "", reset to the default of "messages". */ -+char * -+TEXTDOMAIN (domainname) -+ const char *domainname; -+{ -+ char *old; -+ -+ /* A NULL pointer requests the current setting. */ -+ if (domainname == NULL) -+ return (char *) _nl_current_default_domain; -+ -+ old = (char *) _nl_current_default_domain; -+ -+ /* If domain name is the null string set to default domain "messages". */ -+ if (domainname[0] == '\0' -+ || strcmp (domainname, _nl_default_default_domain) == 0) -+ _nl_current_default_domain = _nl_default_default_domain; -+ else -+ { -+ /* If the following malloc fails `_nl_current_default_domain' -+ will be NULL. This value will be returned and so signals we -+ are out of core. */ -+#if defined _LIBC || defined HAVE_STRDUP -+ _nl_current_default_domain = strdup (domainname); -+#else -+ size_t len = strlen (domainname) + 1; -+ char *cp = (char *) malloc (len); -+ if (cp != NULL) -+ memcpy (cp, domainname, len); -+ _nl_current_default_domain = cp; -+#endif -+ } -+ -+ if (old != _nl_default_default_domain) -+ free (old); -+ -+ return (char *) _nl_current_default_domain; -+} -+ -+#ifdef _LIBC -+/* Alias for function name in GNU C Library. */ -+weak_alias (__textdomain, textdomain); -+#endif -diff -urP gtkhtml-0.8.3.orig/intl/xopen-msg.sed gtkhtml-0.8.3/intl/xopen-msg.sed ---- gtkhtml-0.8.3.orig/intl/xopen-msg.sed Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/xopen-msg.sed Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,104 @@ -+# po2msg.sed - Convert Uniforum style .po file to X/Open style .msg file -+# Copyright (C) 1995 Free Software Foundation, Inc. -+# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+# -+# This program 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 General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+# -+# The first directive in the .msg should be the definition of the -+# message set number. We use always set number 1. -+# -+1 { -+ i\ -+$set 1 # Automatically created by po2msg.sed -+ h -+ s/.*/0/ -+ x -+} -+# -+# We copy all comments into the .msg file. Perhaps they can help. -+# -+/^#/ s/^#[ ]*/$ /p -+# -+# We copy the original message as a comment into the .msg file. -+# -+/^msgid/ { -+# Does not work now -+# /"$/! { -+# s/\\$// -+# s/$/ ... (more lines following)"/ -+# } -+ s/^msgid[ ]*"\(.*\)"$/$ Original Message: \1/ -+ p -+} -+# -+# The .msg file contains, other then the .po file, only the translations -+# but each given a unique ID. Starting from 1 and incrementing by 1 for -+# each message we assign them to the messages. -+# It is important that the .po file used to generate the cat-id-tbl.c file -+# (with po-to-tbl) is the same as the one used here. (At least the order -+# of declarations must not be changed.) -+# -+/^msgstr/ { -+ s/msgstr[ ]*"\(.*\)"/\1/ -+ x -+# The following nice solution is by -+# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de> -+ td -+# Increment a decimal number in pattern space. -+# First hide trailing `9' digits. -+ :d -+ s/9\(_*\)$/_\1/ -+ td -+# Assure at least one digit is available. -+ s/^\(_*\)$/0\1/ -+# Increment the last digit. -+ s/8\(_*\)$/9\1/ -+ s/7\(_*\)$/8\1/ -+ s/6\(_*\)$/7\1/ -+ s/5\(_*\)$/6\1/ -+ s/4\(_*\)$/5\1/ -+ s/3\(_*\)$/4\1/ -+ s/2\(_*\)$/3\1/ -+ s/1\(_*\)$/2\1/ -+ s/0\(_*\)$/1\1/ -+# Convert the hidden `9' digits to `0's. -+ s/_/0/g -+ x -+# Bring the line in the format `<number> <message>' -+ G -+ s/^[^\n]*$/& / -+ s/\(.*\)\n\([0-9]*\)/\2 \1/ -+# Clear flag from last substitution. -+ tb -+# Append the next line. -+ :b -+ N -+# Look whether second part is a continuation line. -+ s/\(.*\n\)"\(.*\)"/\1\2/ -+# Yes, then branch. -+ ta -+ P -+ D -+# Note that `D' includes a jump to the start!! -+# We found a continuation line. But before printing insert '\'. -+ :a -+ s/\(.*\)\(\n.*\)/\1\\\2/ -+ P -+# We cannot use the sed command `D' here -+ s/.*\n\(.*\)/\1/ -+ tb -+} -+d -diff -urP gtkhtml-0.8.3.orig/src/Makefile.am gtkhtml-0.8.3/src/Makefile.am ---- gtkhtml-0.8.3.orig/src/Makefile.am Wed Jan 24 07:10:23 2001 -+++ gtkhtml-0.8.3/src/Makefile.am Sun Apr 15 11:14:19 2001 -@@ -95,6 +95,7 @@ - htmltypes.h \ - htmlundo.h \ - htmlundo-action.h \ -+ htmlurl.h \ - htmlvspace.h \ - gtkhtml-keybinding.h \ - htmliframe.h \ -@@ -187,7 +188,6 @@ - - testgtkhtml_SOURCES = \ - testgtkhtml.c \ -- htmlurl.h \ - htmlurl.c - - testgtkhtml_CFLAGS = $(GLIBWWW_CFLAGS) diff --git a/gnome-base/gtkhtml/gtkhtml-0.8.3.ebuild b/gnome-base/gtkhtml/gtkhtml-0.8.3.ebuild deleted file mode 100644 index 02e1ef672357..000000000000 --- a/gnome-base/gtkhtml/gtkhtml-0.8.3.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/gnome-base/gtkhtml/gtkhtml-0.8.3.ebuild,v 1.1 2001/04/15 18:57:14 pete Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="gtkhtml" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/gtkhtml/${A} - ftp://gnome.eazel.com/pub/gnome/unstable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/" - -RDEPEND=">=gnome-base/gal-0.5 - >=gnome-base/gconf-1.0 - >=gnome-base/control-center-1.2.4 - >=gnome-base/glibwww-0.2-r1 - >=gnome-base/libghttp-1.0.9" - -DEPEND="${RDEPEND} - >=sys-devel/automake-1.4" - -src_unpack() { - unpack ${A} - cd ${S} - patch -p1 < ${FILESDIR}/${P}-gentoo.diff -# try aclocal -I macros -# try autoconf - try automake -} - -src_compile() { - - local myconf - - if [ -z "`use nls`" ] - then - myconf="--disable-nls" - fi - - if [ "`use bonobo`" ] - then - myconf="${myconf} --with-bonobo" - else - myconf="${myconf} --without-bonobo" - fi - - try ./configure --host=${CHOST} --prefix=/opt/gnome \ - --sysconfdir=/etc/opt/gnome ${myconf} --with-gconf - - try make -} - -src_install() { - - try make DESTDIR=${D} install - #insinto /opt/gnome/include/gtkhtml - #doins src/htmlurl.h - dodoc AUTHORS COPYING* ChangeLog README - dodoc NEWS TODO - -} - - - - - - - - - - - - - diff --git a/gnome-base/libxml/files/digest-libxml-1.8.11 b/gnome-base/libxml/files/digest-libxml-1.8.11 deleted file mode 100644 index 9bc72cc881d1..000000000000 --- a/gnome-base/libxml/files/digest-libxml-1.8.11 +++ /dev/null @@ -1 +0,0 @@ -MD5 ddbbe7e76fe51d24bd8f6f961ea69c31 libxml-1.8.11.tar.gz diff --git a/gnome-base/libxml/libxml-1.8.11.ebuild b/gnome-base/libxml/libxml-1.8.11.ebuild deleted file mode 100644 index 40e90bea6a5e..000000000000 --- a/gnome-base/libxml/libxml-1.8.11.ebuild +++ /dev/null @@ -1,37 +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/gnome-base/libxml/libxml-1.8.11.ebuild,v 1.3 2001/05/29 17:28:19 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="libxml" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A} - ftp://gnome.eazel.com/pub/gnome/stable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/" - -DEPEND=">=gnome-base/gnome-env-1.0 - >=sys-libs/ncurses-5.2 - >=sys-libs/readline-4.1" - -RDEPEND=">=gnome-base/gnome-env-1.0 - >=sys-libs/ncurses-5.2" - -src_compile() { - cd ${S} - LDFLAGS="-lncurses" try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome - try make -} - -src_install() { - cd ${S} - try make install prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome - dodoc AUTHORS COPYING* ChangeLog NEWS README -} - - - - - - - diff --git a/gnome-base/mc/files/digest-mc-4.5.53 b/gnome-base/mc/files/digest-mc-4.5.53 deleted file mode 100644 index e054f7378d97..000000000000 --- a/gnome-base/mc/files/digest-mc-4.5.53 +++ /dev/null @@ -1 +0,0 @@ -MD5 90652e48aaf2e5f937262de8436b7f56 mc-4.5.53.tar.gz diff --git a/gnome-base/mc/files/digest-mc-4.5.53-r1 b/gnome-base/mc/files/digest-mc-4.5.53-r1 deleted file mode 100644 index e054f7378d97..000000000000 --- a/gnome-base/mc/files/digest-mc-4.5.53-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 90652e48aaf2e5f937262de8436b7f56 mc-4.5.53.tar.gz diff --git a/gnome-base/mc/mc-4.5.53-r1.ebuild b/gnome-base/mc/mc-4.5.53-r1.ebuild deleted file mode 100644 index 21a7367804e3..000000000000 --- a/gnome-base/mc/mc-4.5.53-r1.ebuild +++ /dev/null @@ -1,68 +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/gnome-base/mc/mc-4.5.53-r1.ebuild,v 1.1 2001/05/05 17:42:37 achim Exp $ - -#P= -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="GNOME Midnight Commander" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/mc/" - -DEPEND="virtual/glibc - >=sys-libs/gpm-1.19.3 - pam? ( >=sys-libs/pam-0.72 ) - slang? ( >=sys-libs/slang-1.4.2 ) - >=sys-apps/e2fsprogs-1.19 - gnome? ( >=gnome-base/gnome-libs-1.2.4 ) - -" -RDEPEND="virtual/x11-web-browser" - -src_unpack() { - unpack ${A} - cd ${S}/vfs - cp smbfs.c smbfs.c.orig - sed -e "s:/etc/smb\.conf:/etc/smb/smb\.conf:" smbfs.c.orig > smbfs.c -} - -src_compile() { - local myconf - if [ "`use pam`" ] ; then - myconf="--with-pam" - else - myconf="--without-pam" - fi - if [ "`use slang`" ] ; then - myconf="$myconf --with-slang" - else - myconf="$myconf --with-included-slang" - fi - if [ "`use gnome`" ] ; then - myconf="$myconf --with-gnome --prefix=/opt/gnome" - else - myconf="$myconf --without-gnome --prefix=/usr" - fi - LDFLAGS="-lcrypt -lncurses" try ./configure --host=${CHOST} \ - --with-samba --with-vfs --with-netrc $myconf - try make -} - -src_install() { - - if [ "`use gnome`" ] ; then - try make prefix=${D}/opt/gnome install - else - try make prefix=${D}/usr install - fi - - dodoc ABOUT-NLS COPYING* FAQ INSTALL* NEWS - dodoc README* -} - - - - - - diff --git a/gnome-base/mc/mc-4.5.53.ebuild b/gnome-base/mc/mc-4.5.53.ebuild deleted file mode 100644 index 64912ab97c00..000000000000 --- a/gnome-base/mc/mc-4.5.53.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/gnome-base/mc/mc-4.5.53.ebuild,v 1.1 2001/04/15 21:45:13 pete Exp $ - -#P= -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="GNOME Midnight Commander" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/mc/" - -DEPEND=">=sys-libs/pam-0.72 - >=sys-libs/slang-1.4.2 - >=sys-apps/e2fsprogs-1.19 - >=gnome-base/gnome-libs-1.2.4 -" -RDEPEND="virtual/x11-web-browser" - -src_unpack() { - unpack ${A} - cd ${S}/vfs - cp smbfs.c smbfs.c.orig - sed -e "s:/etc/smb\.conf:/etc/smb/smb\.conf:" smbfs.c.orig > smbfs.c -} - -src_compile() { - cd ${S} - LDFLAGS="-lcrypt -lncurses" try ./configure --host=${CHOST} --prefix=/opt/gnome \ - --with-samba --with-ldap --with-pam --with-vfs \ - --with-netrc --with-slang - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/opt/gnome install - prepman /opt/gnome - - dodoc ABOUT-NLS COPYING* FAQ INSTALL* NEWS - dodoc README* -} - - - - - - diff --git a/gnome-base/nautilus/files/digest-nautilus-1.0 b/gnome-base/nautilus/files/digest-nautilus-1.0 deleted file mode 100644 index de51bf4ccba2..000000000000 --- a/gnome-base/nautilus/files/digest-nautilus-1.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 5eb7c2bff516e1e02f2ec5b5c6fc8b1e nautilus-1.0.tar.gz diff --git a/gnome-base/nautilus/files/digest-nautilus-1.0.2 b/gnome-base/nautilus/files/digest-nautilus-1.0.2 deleted file mode 100644 index 0db2edf4c770..000000000000 --- a/gnome-base/nautilus/files/digest-nautilus-1.0.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 9c6b11436e11d7dc184dd5748e7e82ac nautilus-1.0.2.tar.gz diff --git a/gnome-base/nautilus/nautilus-1.0.2.ebuild b/gnome-base/nautilus/nautilus-1.0.2.ebuild deleted file mode 100644 index 0d052b10ba8b..000000000000 --- a/gnome-base/nautilus/nautilus-1.0.2.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 Achim Gottinger <achim@gentoo.org> -# Updated by Sebastian Werner <sebastian@werner-productions.de> -# /home/cvsroot/gentoo-x86/gnome-apps/nautilus/nautilus-1.0.ebuild,v 1.3 2001/04/29 18:42:54 achim Exp - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="nautilus" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A} - ftp://gnome.eazel.com/pub/gnome/stable/sources/${PN}/${A}" - -HOMEPAGE="http://www.gnome.org/" - -DEPEND="nls? ( sys-devel/gettext ) - mozilla? ( >=net-www/mozilla-0.8-r1 ) - >=media-libs/freetype-2.0.1 - >=sys-libs/pam-0.73 - >=gnome-base/bonobo-1.0.2 - >=gnome-base/libghttp-1.0.9 - >=gnome-base/scrollkeeper-0.2 - >=gnome-base/control-center-1.4.0 - >=gnome-libs/medusa-0.5.0 - >=gnome-libs/ammonite-1.0.0" - -src_compile() { - local myconf - if [ -z "`use nls`" ] - then - myconf="--disable-nls" - fi - if [ "`use mozilla`" ] - then -# MOZILLA=${S}/../../../mozilla-0.8-r2/work/mozilla/dist - MOZILLA=/opt/mozilla - myconf="${myconf} --with-mozilla-lib-place=$MOZILLA \ - --with-mozilla-include-place=$MOZILLA/include" - export MOZILLA_FIVE_HOME=$MOZILLA - export LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME -# export CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-rtti" - else - myconf="${myconf} --disable-mozilla-component" - fi - try ./configure --host=${CHOST} --prefix=/opt/gnome \ - --sysconfdir=/etc/opt/gnome --infodir=/opt/gnome/share/info \ - --mandir=/opt/gnome/share/man --enable-eazel-services=1 ${myconf} - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome \ - mandir=${D}/opt/gnome/share/man infodir=${D}/opt/gnome/share/info install - dodoc AUTHORS COPYING* ChangeLog* NEWS TODO -} - - - - - diff --git a/gnome-base/nautilus/nautilus-1.0.ebuild b/gnome-base/nautilus/nautilus-1.0.ebuild deleted file mode 100644 index e9212c0dba94..000000000000 --- a/gnome-base/nautilus/nautilus-1.0.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/gnome-base/nautilus/nautilus-1.0.ebuild,v 1.3 2001/04/29 18:42:54 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="nautlilus" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${A} - ftp://gnome.eazel.com/pub/gnome/unstable/sources/${PN}/${A}" - -HOMEPAGE="http://www.gnome.org/" - -DEPEND="nls? ( sys-devel/gettext ) - mozilla? ( >=net-www/mozilla-0.8-r1 ) - >=media-libs/freetype-2.0.1 - >=sys-libs/pam-0.73 - >=gnome-base/bonobo-0.37 - >=gnome-base/libghttp-1.0.9 - >=gnome-base/scrollkeeper-0.1.2 - >=gnome-base/control-center-1.4.0 - >=gnome-libs/medusa-0.3.2 - >=gnome-libs/ammonite-0.8.6" - -src_compile() { - local myconf - if [ -z "`use nls`" ] - then - myconf="--disable-nls" - fi - if [ "`use mozilla`" ] - then -# MOZILLA=${S}/../../../mozilla-0.8-r2/work/mozilla/dist - MOZILLA=/opt/mozilla - myconf="${myconf} --with-mozilla-lib-place=$MOZILLA \ - --with-mozilla-include-place=$MOZILLA/include" - export MOZILLA_FIVE_HOME=$MOZILLA - export LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME - export CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-rtti" - else - myconf="${myconf} --disable-mozilla-component" - fi - try ./configure --host=${CHOST} --prefix=/opt/gnome \ - --sysconfdir=/etc/opt/gnome --infodir=/opt/gnome/share/info \ - --mandir=/opt/gnome/share/man --enable-eazel-services=1 ${myconf} - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome \ - mandir=${D}/opt/gnome/share/man infodir=${D}/opt/gnome/share/info install - dodoc AUTHORS COPYING* ChangeLog* NEWS TODO -} - - - - - diff --git a/gnome-extra/gal/files/digest-gal-0.5 b/gnome-extra/gal/files/digest-gal-0.5 deleted file mode 100644 index ac86b87ddc12..000000000000 --- a/gnome-extra/gal/files/digest-gal-0.5 +++ /dev/null @@ -1 +0,0 @@ -MD5 1aaf233130fa116334da2edc516b8958 gal-0.5.tar.gz diff --git a/gnome-extra/gal/gal-0.5.ebuild b/gnome-extra/gal/gal-0.5.ebuild deleted file mode 100644 index 84c0f5a2bc32..000000000000 --- a/gnome-extra/gal/gal-0.5.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 - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="The Gnome Application Libraries" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${A} - ftp://gnome.eazel.com/pub/gnome/unstable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/" - -DEPEND="nls? ( sys-devel/gettext ) - >=gnome-base/gnome-vfs-0.6.2 - >=gnome-base/libglade-0.14 - >=gnome-base/libunicode-0.4 - >=gnome-base/gnome-print-0.25" - -RDEPEND="virtual/glibc" - - -src_compile() { - local myconf - if [ -z "`use nls`" ] - then - myconf="--disable-nls" - fi - try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome ${myconf} - try make -} - -src_install() { - - try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome install - - dodoc AUTHORS COPYING ChangeLog NEWS README - -} - - - - - diff --git a/gnome-extra/gb/files/digest-gb-0.0.17 b/gnome-extra/gb/files/digest-gb-0.0.17 deleted file mode 100644 index 3f9cee74eff4..000000000000 --- a/gnome-extra/gb/files/digest-gb-0.0.17 +++ /dev/null @@ -1 +0,0 @@ -MD5 3cd9606630275cf9b5571afcc4423c91 gb-0.0.17.tar.gz diff --git a/gnome-extra/gb/gb-0.0.17.ebuild b/gnome-extra/gb/gb-0.0.17.ebuild deleted file mode 100644 index 8b4fb871f777..000000000000 --- a/gnome-extra/gb/gb-0.0.17.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 - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="GNOME Basic" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/" - -DEPEND=">=gnome-base/gnome-libs-1.2.8" - -src_unpack() { - unpack ${A} -} - -src_compile() { - cd ${S} - try ./configure --host=${CHOST} --prefix=/opt/gnome - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/opt/gnome install - - dodoc AUTHORS COPYING ChangeLog NEWS README* TODO -} - - - diff --git a/gnome-extra/gnome-db/files/digest-gnome-db-0.2.3 b/gnome-extra/gnome-db/files/digest-gnome-db-0.2.3 deleted file mode 100644 index 60f6b82e1251..000000000000 --- a/gnome-extra/gnome-db/files/digest-gnome-db-0.2.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 0e47c245288df8544181d6bbdefd9aec gnome-db-0.2.3.tar.gz diff --git a/gnome-extra/gnome-db/gnome-db-0.2.3.ebuild b/gnome-extra/gnome-db/gnome-db-0.2.3.ebuild deleted file mode 100644 index 38d1edc2a426..000000000000 --- a/gnome-extra/gnome-db/gnome-db-0.2.3.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/gnome-extra/gnome-db/gnome-db-0.2.3.ebuild,v 1.1 2001/04/29 16:17:43 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Framework for creating database applications" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/gnome-office/gnomedb.shtml" - -DEPEND=">=gnome-base/gtkhtml-0.8 - >=gnome-base/bonobo-0.30 - >=gnome-libs/libgda-0.2.3" - -src_compile() { - - try ./configure --host=${CHOST} --prefix=/opt/gnome --disable-bonobotest - try make -} - -src_install() { - try make prefix=${D}/opt/gnome \ - GNOME_sysconfdir=${D}/opt/gnome/etc \ - GNOME_datadir=${D}/opt/gnome/share \ - GNOMEDB_oafinfodir=${D}/opt/gnome/share/oaf \ - install - dodoc AUTHORS COPYING ChangeLog README -} - - - diff --git a/gnome-extra/gnome-media/files/digest-gnome-media-1.2.0-r1 b/gnome-extra/gnome-media/files/digest-gnome-media-1.2.0-r1 deleted file mode 100644 index dc9b54708010..000000000000 --- a/gnome-extra/gnome-media/files/digest-gnome-media-1.2.0-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 c7cda6054b47f71aa46aaabe9db6fb4c gnome-media-1.2.0.tar.gz diff --git a/gnome-extra/gnome-media/files/digest-gnome-media-1.2.1 b/gnome-extra/gnome-media/files/digest-gnome-media-1.2.1 deleted file mode 100644 index 83fa082abca7..000000000000 --- a/gnome-extra/gnome-media/files/digest-gnome-media-1.2.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 bb9af054f20ff1a47cde14a16a97f739 gnome-media-1.2.1.tar.bz2 diff --git a/gnome-extra/gnome-media/gnome-media-1.2.0-r1.ebuild b/gnome-extra/gnome-media/gnome-media-1.2.0-r1.ebuild deleted file mode 100644 index 5e693c69d2cc..000000000000 --- a/gnome-extra/gnome-media/gnome-media-1.2.0-r1.ebuild +++ /dev/null @@ -1,31 +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/gnome-extra/gnome-media/gnome-media-1.2.0-r1.ebuild,v 1.3 2001/01/20 01:13:36 achim Exp $ - -P=gnome-media-1.2.0 -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="gnome-media" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-media/"${A} -HOMEPAGE="http://www.gnome.org/" - -DEPEND=">=gnome-base/gnome-core-1.2.4" - -src_compile() { - cd ${S} - try ./configure --host=${CHOST} --prefix=/opt/gnome \ - --with-ncurses - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/opt/gnome install - dodoc AUTHORS COPYING* ChangeLog NEWS - dodoc README* -} - - - - diff --git a/gnome-extra/gnome-pim/files/digest-gnome-pim-1.2.0-r1 b/gnome-extra/gnome-pim/files/digest-gnome-pim-1.2.0-r1 deleted file mode 100644 index f1809eaa3611..000000000000 --- a/gnome-extra/gnome-pim/files/digest-gnome-pim-1.2.0-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 d0af4da54851fa996b59d4f738ff2920 gnome-pim-1.2.0.tar.gz diff --git a/gnome-extra/gnome-pim/gnome-pim-1.2.0-r1.ebuild b/gnome-extra/gnome-pim/gnome-pim-1.2.0-r1.ebuild deleted file mode 100644 index 8345151ed196..000000000000 --- a/gnome-extra/gnome-pim/gnome-pim-1.2.0-r1.ebuild +++ /dev/null @@ -1,30 +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/gnome-extra/gnome-pim/gnome-pim-1.2.0-r1.ebuild,v 1.2 2000/11/25 18:59:38 achim Exp $ - -P=gnome-pim-1.2.0 -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="gnome-pim" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-pim/"${A} -HOMEPGAE="http://www.gnome.org/gnome-office/gnome-pim.shtml" - -DEPEND=">=gnome-base/gnome-core-1.2.4" -RDEPEND=">gnome-base/gnome-libs-1.2.8" - -src_compile() { - cd ${S} - try ./configure --host=${CHOST} --prefix=/opt/gnome - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/opt/gnome install - dodoc AUTHORS COPYING* ChangeLog NEWS - dodoc README* -} - - - diff --git a/gnome-extra/gnome-utils/files/digest-gnome-utils-1.2.1-r1 b/gnome-extra/gnome-utils/files/digest-gnome-utils-1.2.1-r1 deleted file mode 100644 index 707d32f34249..000000000000 --- a/gnome-extra/gnome-utils/files/digest-gnome-utils-1.2.1-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 d95a0a6d43b62075c7f5dbe6c81101c0 gnome-utils-1.2.1.tar.gz diff --git a/gnome-extra/gnome-utils/gnome-utils-1.2.1-r1.ebuild b/gnome-extra/gnome-utils/gnome-utils-1.2.1-r1.ebuild deleted file mode 100644 index 66d584a837d1..000000000000 --- a/gnome-extra/gnome-utils/gnome-utils-1.2.1-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/gnome-extra/gnome-utils/gnome-utils-1.2.1-r1.ebuild,v 1.2 2000/11/25 18:30:59 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="gnome-utils" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/"${A} -HOMEPAGE="http://www.gnome.org/" - -DEPEND=">=gnome-base/gnome-core-1.2.4 - >=gnome-base/libgtop-1.0.10" - -src_compile() { - cd ${S} - try ./configure --host=${CHOST} --prefix=/opt/gnome \ - --with-ncurses - try make -} - -src_install() { - cd ${S} - dodir /opt/gnome/bin - try make prefix=${D}/opt/gnome install - dodoc AUTHORS COPYING* ChangeLog NEWS - dodoc README* -} - - - - diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-0.8.3 b/gnome-extra/gtkhtml/files/digest-gtkhtml-0.8.3 deleted file mode 100644 index 8cd6570b4e8c..000000000000 --- a/gnome-extra/gtkhtml/files/digest-gtkhtml-0.8.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 64514460001885497198b7e389c33077 gtkhtml-0.8.3.tar.gz diff --git a/gnome-extra/gtkhtml/files/gtkhtml-0.8.3-gentoo.diff b/gnome-extra/gtkhtml/files/gtkhtml-0.8.3-gentoo.diff deleted file mode 100644 index 1094dcf6c5ce..000000000000 --- a/gnome-extra/gtkhtml/files/gtkhtml-0.8.3-gentoo.diff +++ /dev/null @@ -1,5092 +0,0 @@ -diff -urP gtkhtml-0.8.3.orig/intl/ChangeLog gtkhtml-0.8.3/intl/ChangeLog ---- gtkhtml-0.8.3.orig/intl/ChangeLog Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/ChangeLog Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,1086 @@ -+1998-04-29 Ulrich Drepper <drepper@cygnus.com> -+ -+ * intl/localealias.c (read_alias_file): Use unsigned char for -+ local variables. Remove unused variable tp. -+ * intl/l10nflist.c (_nl_normalize_codeset): Use unsigned char * -+ for type of codeset. For loosing Solaris systems. -+ * intl/loadinfo.h: Adapt prototype of _nl_normalize_codeset. -+ * intl/bindtextdom.c (BINDTEXTDOMAIN): Don't define local variable -+ len if not needed. -+ Patches by Jim Meyering. -+ -+1998-04-28 Ulrich Drepper <drepper@cygnus.com> -+ -+ * loadmsgcat.c (_nl_load_domain): Don't assign the element use_mmap if -+ mmap is not supported. -+ -+ * hash-string.h: Don't include <values.h>. -+ -+1998-04-27 Ulrich Drepper <drepper@cygnus.com> -+ -+ * textdomain.c: Use strdup is available. -+ -+ * localealias.c: Define HAVE_MEMPCPY so that we can use this -+ function. Define and use semapahores to protect modfication of -+ global objects when compiling for glibc. Add code to allow -+ freeing alias table. -+ -+ * l10nflist.c: Don't assume stpcpy not being a macro. -+ -+ * gettextP.h: Define internal_function macri if not already done. -+ Use glibc byte-swap macros instead of defining SWAP when compiled -+ for glibc. -+ (struct loaded_domain): Add elements to allow unloading. -+ -+ * Makefile.in (distclean): Don't remove libintl.h here. -+ -+ * bindtextdomain.c: Carry over changes from glibc. Use strdup if -+ available. -+ -+ * dcgettext.c: Don't assume stpcpy not being a macro. Mark internal -+ functions. Add memory freeing code for glibc. -+ -+ * dgettext.c: Update copyright. -+ -+ * explodename.c: Include stdlib.h and string.h only if they exist. -+ Use strings.h eventually. -+ -+ * finddomain.c: Mark internal functions. Use strdup if available. -+ Add memory freeing code for glibc. -+ -+1997-10-10 20:00 Ulrich Drepper <drepper@cygnus.com> -+ -+ * libgettext.h: Fix dummy textdomain and bindtextdomain macros. -+ They should return reasonable values. -+ Reported by Tom Tromey <tromey@cygnus.com>. -+ -+1997-09-16 03:33 Ulrich Drepper <drepper@cygnus.com> -+ -+ * libgettext.h: Define PARAMS also to `args' if __cplusplus is defined. -+ * intlh.inst.in: Likewise. -+ Reported by Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>. -+ -+ * libintl.glibc: Update from current glibc version. -+ -+1997-09-06 02:10 Ulrich Drepper <drepper@cygnus.com> -+ -+ * intlh.inst.in: Reformat copyright. -+ -+1997-08-19 15:22 Ulrich Drepper <drepper@cygnus.com> -+ -+ * dcgettext.c (DCGETTEXT): Remove wrong comment. -+ -+1997-08-16 00:13 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (install-data): Don't change directory to install. -+ -+1997-08-01 14:30 Ulrich Drepper <drepper@cygnus.com> -+ -+ * cat-compat.c: Fix copyright. -+ -+ * localealias.c: Don't define strchr unless !HAVE_STRCHR. -+ -+ * loadmsgcat.c: Update copyright. Fix typos. -+ -+ * l10nflist.c: Don't define strchr unless !HAVE_STRCHR. -+ (_nl_make_l10nflist): Handle sponsor and revision correctly. -+ -+ * gettext.c: Update copyright. -+ * gettext.h: Likewise. -+ * hash-string.h: Likewise. -+ -+ * finddomain.c: Remoave dead code. Define strchr only if -+ !HAVE_STRCHR. -+ -+ * explodename.c: Include <sys/types.h>. -+ -+ * explodename.c: Reformat copyright text. -+ (_nl_explode_name): Fix typo. -+ -+ * dcgettext.c: Define and use __set_errno. -+ (guess_category_value): Don't use setlocale if HAVE_LC_MESSAGES is -+ not defined. -+ -+ * bindtextdom.c: Pretty printing. -+ -+1997-05-01 02:25 Ulrich Drepper <drepper@cygnus.com> -+ -+ * dcgettext.c (guess_category_value): Don't depend on -+ HAVE_LC_MESSAGES. We don't need the macro here. -+ Patch by Bruno Haible <haible@ilog.fr>. -+ -+ * cat-compat.c (textdomain): DoN't refer to HAVE_SETLOCALE_NULL -+ macro. Instead use HAVE_LOCALE_NULL and define it when using -+ glibc, as in dcgettext.c. -+ Patch by Bruno Haible <haible@ilog.fr>. -+ -+ * Makefile.in (CPPFLAGS): New variable. Reported by Franc,ois -+ Pinard. -+ -+Mon Mar 10 06:51:17 1997 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in: Implement handling of libtool. -+ -+ * gettextP.h: Change data structures for use of generic lowlevel -+ i18n file handling. -+ -+Wed Dec 4 20:21:18 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * textdomain.c: Put parentheses around arguments of memcpy macro -+ definition. -+ * localealias.c: Likewise. -+ * l10nflist.c: Likewise. -+ * finddomain.c: Likewise. -+ * bindtextdom.c: Likewise. -+ Reported by Thomas Esken. -+ -+Mon Nov 25 22:57:51 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * textdomain.c: Move definition of `memcpy` macro to right -+ position. -+ -+Fri Nov 22 04:01:58 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * finddomain.c [!HAVE_STRING_H && !_LIBC]: Define memcpy using -+ bcopy if not already defined. Reported by Thomas Esken. -+ * bindtextdom.c: Likewise. -+ * l10nflist.c: Likewise. -+ * localealias.c: Likewise. -+ * textdomain.c: Likewise. -+ -+Tue Oct 29 11:10:27 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (libdir): Change to use exec_prefix instead of -+ prefix. Reported by Knut-HåvardAksnes <etokna@eto.ericsson.se>. -+ -+Sat Aug 31 03:07:09 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * l10nflist.c (_nl_normalize_codeset): We convert to lower case, -+ so don't prepend uppercase `ISO' for only numeric arg. -+ -+Fri Jul 19 00:15:46 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * l10nflist.c: Move inclusion of argz.h, ctype.h, stdlib.h after -+ definition of _GNU_SOURCE. Patch by Roland McGrath. -+ -+ * Makefile.in (uninstall): Fix another bug with `for' loop and -+ empty arguments. Patch by Jim Meyering. Correct name os -+ uninstalled files: no intl- prefix anymore. -+ -+ * Makefile.in (install-data): Again work around shells which -+ cannot handle mpty for list. Reported by Jim Meyering. -+ -+Sat Jul 13 18:11:35 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (install): Split goal. Now depend on install-exec -+ and install-data. -+ (install-exec, install-data): New goals. Created from former -+ install goal. -+ Reported by Karl Berry. -+ -+Sat Jun 22 04:58:14 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (MKINSTALLDIRS): New variable. Path to -+ mkinstalldirs script. -+ (install): use MKINSTALLDIRS variable or if the script is not present -+ try to find it in the $top_scrdir). -+ -+Wed Jun 19 02:56:56 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * l10nflist.c: Linux libc *partly* includes the argz_* functions. -+ Grr. Work around by renaming the static version and use macros -+ for renaming. -+ -+Tue Jun 18 20:11:17 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * l10nflist.c: Correct presence test macros of __argz_* functions. -+ -+ * l10nflist.c: Include <argz.h> based on test of it instead when -+ __argz_* functions are available. -+ Reported by Andreas Schwab. -+ -+Thu Jun 13 15:17:44 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * explodename.c, l10nflist.c: Define NULL for dumb systems. -+ -+Tue Jun 11 17:05:13 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * intlh.inst.in, libgettext.h (dcgettext): Rename local variable -+ result to __result to prevent name clash. -+ -+ * l10nflist.c, localealias.c, dcgettext.c: Define _GNU_SOURCE to -+ get prototype for stpcpy and strcasecmp. -+ -+ * intlh.inst.in, libgettext.h: Move declaration of -+ `_nl_msg_cat_cntr' outside __extension__ block to prevent warning -+ from gcc's -Wnested-extern option. -+ -+Fri Jun 7 01:58:00 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (install): Remove comment. -+ -+Thu Jun 6 17:28:17 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (install): Work around for another Buglix stupidity. -+ Always use an `else' close for `if's. Reported by Nelson Beebe. -+ -+ * Makefile.in (intlh.inst): Correct typo in phony rule. -+ Reported by Nelson Beebe. -+ -+Thu Jun 6 01:49:52 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * dcgettext.c (read_alias_file): Rename variable alloca_list to -+ block_list as the macro calls assume. -+ Patch by Eric Backus. -+ -+ * localealias.c [!HAVE_ALLOCA]: Define alloca as macro using -+ malloc. -+ (read_alias_file): Rename varriabe alloca_list to block_list as the -+ macro calls assume. -+ Patch by Eric Backus. -+ -+ * l10nflist.c: Correct conditional for <argz.h> inclusion. -+ Reported by Roland McGrath. -+ -+ * Makefile.in (all): Depend on all-@USE_INCLUDED_LIBINTL@, not -+ all-@USE_NLS@. -+ -+ * Makefile.in (install): intlh.inst comes from local dir, not -+ $(srcdir). -+ -+ * Makefile.in (intlh.inst): Special handling of this goal. If -+ used in gettext, this is really a rul to construct this file. If -+ used in any other package it is defined as a .PHONY rule with -+ empty body. -+ -+ * finddomain.c: Extract locale file information handling into -+ l10nfile.c. Rename local stpcpy__ function to stpcpy. -+ -+ * dcgettext.c (stpcpy): Add local definition. -+ -+ * l10nflist.c: Solve some portability problems. Patches partly by -+ Thomas Esken. Add local definition of stpcpy. -+ -+Tue Jun 4 02:47:49 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * intlh.inst.in: Don't depend including <locale.h> on -+ HAVE_LOCALE_H. Instead configure must rewrite this fiile -+ depending on the result of the configure run. -+ -+ * Makefile.in (install): libintl.inst is now called intlh.inst. -+ Add rules for updating intlh.inst from intlh.inst.in. -+ -+ * libintl.inst: Renamed to intlh.inst.in. -+ -+ * localealias.c, dcgettext.c [__GNUC__]: Define HAVE_ALLOCA to 1 -+ because gcc has __buitlin_alloca. -+ Reported by Roland McGrath. -+ -+Mon Jun 3 00:32:16 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (installcheck): New goal to fulfill needs of -+ automake's distcheck. -+ -+ * Makefile.in (install): Reorder commands so that VERSION is -+ found. -+ -+ * Makefile.in (gettextsrcdir): Now use subdirectory intl/ in -+ @datadir@/gettext. -+ (COMSRCS): Add l10nfile.c. -+ (OBJECTS): Add l10nfile.o. -+ (DISTFILES): Rename to DISTFILE.normal. Remove $(DISTFILES.common). -+ (DISTFILE.gettext): Remove $(DISTFILES.common). -+ (all-gettext): Remove goal. -+ (install): If $(PACKAGE) = gettext install, otherwose do nothing. No -+ package but gettext itself should install libintl.h + headers. -+ (dist): Extend goal to work for gettext, too. -+ (dist-gettext): Remove goal. -+ -+ * dcgettext.c [!HAVE_ALLOCA]: Define macro alloca by using malloc. -+ -+Sun Jun 2 17:33:06 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * loadmsgcat.c (_nl_load_domain): Parameter is now comes from -+ find_l10nfile. -+ -+Sat Jun 1 02:23:03 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * l10nflist.c (__argz_next): Add definition. -+ -+ * dcgettext.c [!HAVE_ALLOCA]: Add code for handling missing alloca -+ code. Use new l10nfile handling. -+ -+ * localealias.c [!HAVE_ALLOCA]: Add code for handling missing -+ alloca code. -+ -+ * l10nflist.c: Initial revision. -+ -+Tue Apr 2 18:51:18 1996 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (all-gettext): New goal. Same as all-yes. -+ -+Thu Mar 28 23:01:22 1996 Karl Eichwalder <ke@ke.central.de> -+ -+ * Makefile.in (gettextsrcdir): Define using @datadir@. -+ -+Tue Mar 26 12:39:14 1996 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c: Include <ctype.h>. Reported by Roland McGrath. -+ -+Sat Mar 23 02:00:35 1996 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (stpcpy): Rename to stpcpy__ to prevent clashing -+ with external declaration. -+ -+Sat Mar 2 00:47:09 1996 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (all-no): Rename from all_no. -+ -+Sat Feb 17 00:25:59 1996 Ulrich Drepper <drepper@myware> -+ -+ * gettextP.h [loaded_domain]: Array `successor' must now contain up -+ to 63 elements (because of codeset name normalization). -+ -+ * finddomain.c: Implement codeset name normalization. -+ -+Thu Feb 15 04:39:09 1996 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (all): Define to `all-@USE_NLS@'. -+ (all-yes, all_no): New goals. `all-no' is noop, `all-yes' -+ is former all. -+ -+Mon Jan 15 21:46:01 1996 Howard Gayle <howard@hal.com> -+ -+ * localealias.c (alias_compare): Increment string pointers in loop -+ of strcasecmp replacement. -+ -+Fri Dec 29 21:16:34 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (install-src): Who commented this goal out ? :-) -+ -+Fri Dec 29 15:08:16 1995 Ulrich Drepper <drepper@myware> -+ -+ * dcgettext.c (DCGETTEXT): Save `errno'. Failing system calls -+ should not effect it because a missing catalog is no error. -+ Reported by Harald K<o:>nig <koenig@tat.physik.uni-tuebingen.de>. -+ -+Tue Dec 19 22:09:13 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (Makefile): Explicitly use $(SHELL) for running -+ shell scripts. -+ -+Fri Dec 15 17:34:59 1995 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> -+ -+ * Makefile.in (install-src): Only install library and header when -+ we use the own implementation. Don't do it when using the -+ system's gettext or catgets functions. -+ -+ * dcgettext.c (find_msg): Must not swap domain->hash_size here. -+ -+Sat Dec 9 16:24:37 1995 Ulrich Drepper <drepper@myware> -+ -+ * localealias.c, libintl.inst, libgettext.h, hash-string.h, -+ gettextP.h, finddomain.c, dcgettext.c, cat-compat.c: -+ Use PARAMS instead of __P. Suggested by Roland McGrath. -+ -+Tue Dec 5 11:39:14 1995 Larry Schwimmer <rosebud@cyclone.stanford.edu> -+ -+ * libgettext.h: Use `#if !defined (_LIBINTL_H)' instead of `#if -+ !_LIBINTL_H' because Solaris defines _LIBINTL_H as empty. -+ -+Mon Dec 4 15:42:07 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (install-src): -+ Install libintl.inst instead of libintl.h.install. -+ -+Sat Dec 2 22:51:38 1995 Marcus Daniels <marcus@sysc.pdx.edu> -+ -+ * cat-compat.c (textdomain): -+ Reverse order in which files are tried you load. First -+ try local file, when this failed absolute path. -+ -+Wed Nov 29 02:03:53 1995 Nelson H. F. Beebe <beebe@math.utah.edu> -+ -+ * cat-compat.c (bindtextdomain): Add missing { }. -+ -+Sun Nov 26 18:21:41 1995 Ulrich Drepper <drepper@myware> -+ -+ * libintl.inst: Add missing __P definition. Reported by Nelson Beebe. -+ -+ * Makefile.in: -+ Add dummy `all' and `dvi' goals. Reported by Tom Tromey. -+ -+Sat Nov 25 16:12:01 1995 Franc,ois Pinard <pinard@iro.umontreal.ca> -+ -+ * hash-string.h: Capitalize arguments of macros. -+ -+Sat Nov 25 12:01:36 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (DISTFILES): Prevent files names longer than 13 -+ characters. libintl.h.glibc->libintl.glibc, -+ libintl.h.install->libintl.inst. Reported by Joshua R. Poulson. -+ -+Sat Nov 25 11:31:12 1995 Eric Backus <ericb@lsid.hp.com> -+ -+ * dcgettext.c: Fix bug in preprocessor conditionals. -+ -+Sat Nov 25 02:35:27 1995 Nelson H. F. Beebe <beebe@math.utah.edu> -+ -+ * libgettext.h: Solaris cc does not understand -+ #if !SYMBOL1 && !SYMBOL2. Sad but true. -+ -+Thu Nov 23 16:22:14 1995 Ulrich Drepper <drepper@myware> -+ -+ * hash-string.h (hash_string): -+ Fix for machine with >32 bit `unsigned long's. -+ -+ * dcgettext.c (DCGETTEXT): -+ Fix horrible bug in loop for alternative translation. -+ -+Thu Nov 23 01:45:29 1995 Ulrich Drepper <drepper@myware> -+ -+ * po2tbl.sed.in, linux-msg.sed, xopen-msg.sed: -+ Some further simplifications in message number generation. -+ -+Mon Nov 20 21:08:43 1995 Ulrich Drepper <drepper@myware> -+ -+ * libintl.h.glibc: Use __const instead of const in prototypes. -+ -+ * Makefile.in (install-src): -+ Install libintl.h.install instead of libintl.h. This -+ is a stripped-down version. Suggested by Peter Miller. -+ -+ * libintl.h.install, libintl.h.glibc: Initial revision. -+ -+ * localealias.c (_nl_expand_alias, read_alias_file): -+ Protect prototypes in type casts by __P. -+ -+Tue Nov 14 16:43:58 1995 Ulrich Drepper <drepper@myware> -+ -+ * hash-string.h: Correct prototype for hash_string. -+ -+Sun Nov 12 12:42:30 1995 Ulrich Drepper <drepper@myware> -+ -+ * hash-string.h (hash_string): Add prototype. -+ -+ * gettextP.h: Fix copyright. -+ (SWAP): Add prototype. -+ -+Wed Nov 8 22:56:33 1995 Ulrich Drepper <drepper@myware> -+ -+ * localealias.c (read_alias_file): Forgot sizeof. -+ Avoid calling *printf function. This introduces a big overhead. -+ Patch by Roland McGrath. -+ -+Tue Nov 7 14:21:08 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c, cat-compat.c: Wrong indentation in #if for stpcpy. -+ -+ * finddomain.c (stpcpy): -+ Define substitution function local. The macro was to flaky. -+ -+ * cat-compat.c: Fix typo. -+ -+ * xopen-msg.sed, linux-msg.sed: -+ While bringing message number to right place only accept digits. -+ -+ * linux-msg.sed, xopen-msg.sed: Now that the counter does not have -+ leading 0s we don't need to remove them. Reported by Marcus -+ Daniels. -+ -+ * Makefile.in (../po/cat-id-tbl.o): Use $(top_srdir) in -+ dependency. Reported by Marcus Daniels. -+ -+ * cat-compat.c: (stpcpy) [!_LIBC && !HAVE_STPCPY]: Define replacement. -+ Generally cleanup using #if instead of #ifndef. -+ -+ * Makefile.in: Correct typos in comment. By Franc,ois Pinard. -+ -+Mon Nov 6 00:27:02 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (install-src): Don't install libintl.h and libintl.a -+ if we use an available gettext implementation. -+ -+Sun Nov 5 22:02:08 1995 Ulrich Drepper <drepper@myware> -+ -+ * libgettext.h: Fix typo: HAVE_CATGETTS -> HAVE_CATGETS. Reported -+ by Franc,ois Pinard. -+ -+ * libgettext.h: Use #if instead of #ifdef/#ifndef. -+ -+ * finddomain.c: -+ Comments describing what has to be done should start with FIXME. -+ -+Sun Nov 5 19:38:01 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (DISTFILES): Split. Use DISTFILES with normal meaning. -+ DISTFILES.common names the files common to both dist goals. -+ DISTFILES.gettext are the files only distributed in GNU gettext. -+ -+Sun Nov 5 17:32:54 1995 Ulrich Drepper <drepper@myware> -+ -+ * dcgettext.c (DCGETTEXT): Correct searching in derived locales. -+ This was necessary since a change in _nl_find_msg several weeks -+ ago. I really don't know this is still not fixed. -+ -+Sun Nov 5 12:43:12 1995 Ulrich Drepper <drepper@myware> -+ -+ * loadmsgcat.c (_nl_load_domain): Test for FILENAME == NULL. This -+ might mark a special condition. -+ -+ * finddomain.c (make_entry_rec): Don't make illegal entry as decided. -+ -+ * Makefile.in (dist): Suppress error message when ln failed. -+ Get files from $(srcdir) explicitly. -+ -+ * libgettext.h (gettext_const): Rename to gettext_noop. -+ -+Fri Nov 3 07:36:50 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (make_entry_rec): -+ Protect against wrong locale names by testing mask. -+ -+ * libgettext.h (gettext_const): Add macro definition. -+ Capitalize macro arguments. -+ -+Thu Nov 2 23:15:51 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (_nl_find_domain): -+ Test for pointer != NULL before accessing value. -+ Reported by Tom Tromey. -+ -+ * gettext.c (NULL): -+ Define as (void*)0 instad of 0. Reported by Franc,ois Pinard. -+ -+Mon Oct 30 21:28:52 1995 Ulrich Drepper <drepper@myware> -+ -+ * po2tbl.sed.in: Serious typo bug fixed by Jim Meyering. -+ -+Sat Oct 28 23:20:47 1995 Ulrich Drepper <drepper@myware> -+ -+ * libgettext.h: Disable dcgettext optimization for Solaris 2.3. -+ -+ * localealias.c (alias_compare): -+ Peter Miller reported that tolower in some systems is -+ even dumber than I thought. Protect call by `isupper'. -+ -+Fri Oct 27 22:22:51 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (libdir, includedir): New variables. -+ (install-src): Install libintl.a and libintl.h in correct dirs. -+ -+Fri Oct 27 22:07:29 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (SOURCES): Fix typo: intrl.compat.c -> intl-compat.c. -+ -+ * po2tbl.sed.in: Patch for buggy SEDs by Christian von Roques. -+ -+ * localealias.c: -+ Fix typo and superflous test. Reported by Christian von Roques. -+ -+Fri Oct 6 11:52:05 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (_nl_find_domain): -+ Correct some remainder from the pre-CEN syntax. Now -+ we don't have a constant number of successors anymore. -+ -+Wed Sep 27 21:41:13 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (DISTFILES): Add libintl.h.glibc. -+ -+ * Makefile.in (dist-libc): Add goal for packing sources for glibc. -+ (COMSRCS, COMHDRS): Splitted to separate sources shared with glibc. -+ -+ * loadmsgcat.c: Forget to continue #if line. -+ -+ * localealias.c: -+ [_LIBC]: Rename strcasecmp to __strcasecmp to keep ANSI C name -+ space clean. -+ -+ * dcgettext.c, finddomain.c: Better comment to last change. -+ -+ * loadmsgcat.c: -+ [_LIBC]: Rename fstat, open, close, read, mmap, and munmap to -+ __fstat, __open, __close, __read, __mmap, and __munmap resp -+ to keep ANSI C name space clean. -+ -+ * finddomain.c: -+ [_LIBC]: Rename stpcpy to __stpcpy to keep ANSI C name space clean. -+ -+ * dcgettext.c: -+ [_LIBC]: Rename getced and stpcpy to __getcwd and __stpcpy resp to -+ keep ANSI C name space clean. -+ -+ * libgettext.h: -+ Include sys/types.h for those old SysV systems out there. -+ Reported by Francesco Potorti`. -+ -+ * loadmsgcat.c (use_mmap): Define if compiled for glibc. -+ -+ * bindtextdom.c: Include all those standard headers -+ unconditionally if _LIBC is defined. -+ -+ * finddomain.c: Fix 2 times defiend -> defined. -+ -+ * textdomain.c: Include libintl.h instead of libgettext.h when -+ compiling for glibc. Include all those standard headers -+ unconditionally if _LIBC is defined. -+ -+ * localealias.c, loadmsgcat.c: Prepare to be compiled in glibc. -+ -+ * gettext.c: -+ Include libintl.h instead of libgettext.h when compiling for glibc. -+ Get NULL from stddef.h if we compile for glibc. -+ -+ * finddomain.c: Include libintl.h instead of libgettext.h when -+ compiling for glibc. Include all those standard headers -+ unconditionally if _LIBC is defined. -+ -+ * dcgettext.c: Include all those standard headers unconditionally -+ if _LIBC is defined. -+ -+ * dgettext.c: If compiled in glibc include libintl.h instead of -+ libgettext.h. -+ (locale.h): Don't rely on HAVE_LOCALE_H when compiling for glibc. -+ -+ * dcgettext.c: If compiled in glibc include libintl.h instead of -+ libgettext.h. -+ (getcwd): Don't rely on HAVE_GETCWD when compiling for glibc. -+ -+ * bindtextdom.c: -+ If compiled in glibc include libintl.h instead of libgettext.h. -+ -+Mon Sep 25 22:23:06 1995 Ulrich Drepper <drepper@myware> -+ -+ * localealias.c (_nl_expand_alias): Don't call bsearch if NMAP <= 0. -+ Reported by Marcus Daniels. -+ -+ * cat-compat.c (bindtextdomain): -+ String used in putenv must not be recycled. -+ Reported by Marcus Daniels. -+ -+ * libgettext.h (__USE_GNU_GETTEXT): -+ Additional symbol to signal that we use GNU gettext -+ library. -+ -+ * cat-compat.c (bindtextdomain): -+ Fix bug with the strange stpcpy replacement. -+ Reported by Nelson Beebe. -+ -+Sat Sep 23 08:23:51 1995 Ulrich Drepper <drepper@myware> -+ -+ * cat-compat.c: Include <string.h> for stpcpy prototype. -+ -+ * localealias.c (read_alias_file): -+ While expand strdup code temporary variable `cp' hided -+ higher level variable with same name. Rename to `tp'. -+ -+ * textdomain.c (textdomain): -+ Avoid warning by using temporary variable in strdup code. -+ -+ * finddomain.c (_nl_find_domain): Remove unused variable `application'. -+ -+Thu Sep 21 15:51:44 1995 Ulrich Drepper <drepper@myware> -+ -+ * localealias.c (alias_compare): -+ Use strcasecmp() only if available. Else use -+ implementation in place. -+ -+ * intl-compat.c: -+ Wrapper functions now call *__ functions instead of __*. -+ -+ * libgettext.h: Declare prototypes for *__ functions instead for __*. -+ -+ * cat-compat.c, loadmsgcat.c: -+ Don't use xmalloc, xstrdup, and stpcpy. These functions are not part -+ of the standard libc and so prevent libintl.a from being used -+ standalone. -+ -+ * bindtextdom.c: -+ Don't use xmalloc, xstrdup, and stpcpy. These functions are not part -+ of the standard libc and so prevent libintl.a from being used -+ standalone. -+ Rename to bindtextdomain__ if not used in GNU C Library. -+ -+ * dgettext.c: -+ Rename function to dgettext__ if not used in GNU C Library. -+ -+ * gettext.c: -+ Don't use xmalloc, xstrdup, and stpcpy. These functions are not part -+ of the standard libc and so prevent libintl.a from being used -+ standalone. -+ Functions now called gettext__ if not used in GNU C Library. -+ -+ * dcgettext.c, localealias.c, textdomain.c, finddomain.c: -+ Don't use xmalloc, xstrdup, and stpcpy. These functions are not part -+ of the standard libc and so prevent libintl.a from being used -+ standalone. -+ -+Sun Sep 17 23:14:49 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c: Correct some bugs in handling of CEN standard -+ locale definitions. -+ -+Thu Sep 7 01:49:28 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c: Implement CEN syntax. -+ -+ * gettextP.h (loaded_domain): Extend number of successors to 31. -+ -+Sat Aug 19 19:25:29 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (aliaspath): Remove path to X11 locale dir. -+ -+ * Makefile.in: Make install-src depend on install. This helps -+ gettext to install the sources and other packages can use the -+ install goal. -+ -+Sat Aug 19 15:19:33 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (uninstall): Remove stuff installed by install-src. -+ -+Tue Aug 15 13:13:53 1995 Ulrich Drepper <drepper@myware> -+ -+ * VERSION.in: Initial revision. -+ -+ * Makefile.in (DISTFILES): -+ Add VERSION file. This is not necessary for gettext, but -+ for other packages using this library. -+ -+Tue Aug 15 06:16:44 1995 Ulrich Drepper <drepper@myware> -+ -+ * gettextP.h (_nl_find_domain): -+ New prototype after changing search strategy. -+ -+ * finddomain.c (_nl_find_domain): -+ We now try only to find a specified catalog. Fall back to other -+ catalogs listed in the locale list is now done in __dcgettext. -+ -+ * dcgettext.c (__dcgettext): -+ Now we provide message fall back even to different languages. -+ I.e. if a message is not available in one language all the other -+ in the locale list a tried. Formerly fall back was only possible -+ within one language. Implemented by moving one loop from -+ _nl_find_domain to here. -+ -+Mon Aug 14 23:45:50 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (gettextsrcdir): -+ Directory where source of GNU gettext library are made -+ available. -+ (INSTALL, INSTALL_DATA): Programs used for installing sources. -+ (gettext-src): New. Rule to install GNU gettext sources for use in -+ gettextize shell script. -+ -+Sun Aug 13 14:40:48 1995 Ulrich Drepper <drepper@myware> -+ -+ * loadmsgcat.c (_nl_load_domain): -+ Use mmap for loading only when munmap function is -+ also available. -+ -+ * Makefile.in (install): Depend on `all' goal. -+ -+Wed Aug 9 11:04:33 1995 Ulrich Drepper <drepper@myware> -+ -+ * localealias.c (read_alias_file): -+ Do not overwrite '\n' when terminating alias value string. -+ -+ * localealias.c (read_alias_file): -+ Handle long lines. Ignore the rest not fitting in -+ the buffer after the initial `fgets' call. -+ -+Wed Aug 9 00:54:29 1995 Ulrich Drepper <drepper@myware> -+ -+ * gettextP.h (_nl_load_domain): -+ Add prototype, replacing prototype for _nl_load_msg_cat. -+ -+ * finddomain.c (_nl_find_domain): -+ Remove unneeded variable filename and filename_len. -+ (expand_alias): Remove prototype because functions does not -+ exist anymore. -+ -+ * localealias.c (read_alias_file): -+ Change type of fname_len parameter to int. -+ (xmalloc): Add prototype. -+ -+ * loadmsgcat.c: Better prototypes for xmalloc. -+ -+Tue Aug 8 22:30:39 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (_nl_find_domain): -+ Allow alias name to be constructed from the four components. -+ -+ * Makefile.in (aliaspath): New variable. Set to preliminary value. -+ (SOURCES): Add localealias.c. -+ (OBJECTS): Add localealias.o. -+ -+ * gettextP.h: Add prototype for _nl_expand_alias. -+ -+ * finddomain.c: Aliasing handled in intl/localealias.c. -+ -+ * localealias.c: Aliasing for locale names. -+ -+ * bindtextdom.c: Better prototypes for xmalloc and xstrdup. -+ -+Mon Aug 7 23:47:42 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (DISTFILES): gettext.perl is now found in misc/. -+ -+ * cat-compat.c (bindtextdomain): -+ Correct implementation. dirname parameter was not used. -+ Reported by Marcus Daniels. -+ -+ * gettextP.h (loaded_domain): -+ New fields `successor' and `decided' for oo, lazy -+ message handling implementation. -+ -+ * dcgettext.c: -+ Adopt for oo, lazy message handliing. -+ Now we can inherit translations from less specific locales. -+ (find_msg): New function. -+ -+ * loadmsgcat.c, finddomain.c: -+ Complete rewrite. Implement oo, lazy message handling :-). -+ We now have an additional environment variable `LANGUAGE' with -+ a higher priority than LC_ALL for the LC_MESSAGE locale. -+ Here we can set a colon separated list of specifications each -+ of the form `language[_territory[.codeset]][@modifier]'. -+ -+Sat Aug 5 09:55:42 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (unistd.h): -+ Include to get _PC_PATH_MAX defined on system having it. -+ -+Fri Aug 4 22:42:00 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (stpcpy): Include prototype. -+ -+ * Makefile.in (dist): Remove `copying instead' message. -+ -+Wed Aug 2 18:52:03 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (ID, TAGS): Do not use $^. -+ -+Tue Aug 1 20:07:11 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (TAGS, ID): Use $^ as command argument. -+ (TAGS): Give etags -o option t write to current directory, -+ not $(srcdir). -+ (ID): Use $(srcdir) instead os $(top_srcdir)/src. -+ (distclean): Remove ID. -+ -+Sun Jul 30 11:51:46 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (gnulocaledir): -+ New variable, always using share/ for data directory. -+ (DEFS): Add GNULOCALEDIR, used in finddomain.c. -+ -+ * finddomain.c (_nl_default_dirname): -+ Set to GNULOCALEDIR, because it always has to point -+ to the directory where GNU gettext Library writes it to. -+ -+ * intl-compat.c (textdomain, bindtextdomain): -+ Undefine macros before function definition. -+ -+Sat Jul 22 01:10:02 1995 Ulrich Drepper <drepper@myware> -+ -+ * libgettext.h (_LIBINTL_H): -+ Protect definition in case where this file is included as -+ libgettext.h on Solaris machines. Add comment about this. -+ -+Wed Jul 19 02:36:42 1995 Ulrich Drepper <drepper@myware> -+ -+ * intl-compat.c (textdomain): Correct typo. -+ -+Wed Jul 19 01:51:35 1995 Ulrich Drepper <drepper@myware> -+ -+ * dcgettext.c (dcgettext): Function now called __dcgettext. -+ -+ * dgettext.c (dgettext): Now called __dgettext and calls -+ __dcgettext. -+ -+ * gettext.c (gettext): -+ Function now called __gettext and calls __dgettext. -+ -+ * textdomain.c (textdomain): Function now called __textdomain. -+ -+ * bindtextdom.c (bindtextdomain): Function now called -+ __bindtextdomain. -+ -+ * intl-compat.c: Initial revision. -+ -+ * Makefile.in (SOURCES): Add intl-compat.c. -+ (OBJECTS): We always compile the GNU gettext library functions. -+ OBJECTS contains all objects but cat-compat.o, ../po/cat-if-tbl.o, -+ and intl-compat.o. -+ (GETTOBJS): Contains now only intl-compat.o. -+ -+ * libgettext.h: -+ Re-include protection matches dualistic character of libgettext.h. -+ For all functions in GNU gettext library define __ counter part. -+ -+ * finddomain.c (strchr): Define as index if not found in C library. -+ (_nl_find_domain): For relative paths paste / in between. -+ -+Tue Jul 18 16:37:45 1995 Ulrich Drepper <drepper@myware> -+ -+ * loadmsgcat.c, finddomain.c: Add inclusion of sys/types.h. -+ -+ * xopen-msg.sed: Fix bug with `msgstr ""' lines. -+ A little bit better comments. -+ -+Tue Jul 18 01:18:27 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in: -+ po-mode.el, makelinks, combine-sh are now found in ../misc. -+ -+ * po-mode.el, makelinks, combine-sh, elisp-comp: -+ Moved to ../misc/. -+ -+ * libgettext.h, gettextP.h, gettext.h: Uniform test for __STDC__. -+ -+Sun Jul 16 22:33:02 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (INSTALL, INSTALL_DATA): New variables. -+ (install-data, uninstall): Install/uninstall .elc file. -+ -+ * po-mode.el (Installation comment): -+ Add .pox as possible extension of .po files. -+ -+Sun Jul 16 13:23:27 1995 Ulrich Drepper <drepper@myware> -+ -+ * elisp-comp: Complete new version by Franc,ois: This does not -+ fail when not compiling in the source directory. -+ -+Sun Jul 16 00:12:17 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (../po/cat-id-tbl.o): -+ Use $(MAKE) instead of make for recursive make. -+ -+ * Makefile.in (.el.elc): Use $(SHELL) instead of /bin/sh. -+ (install-exec): Add missing dummy goal. -+ (install-data, uninstall): @ in multi-line shell command at -+ beginning, not in front of echo. Reported by Eric Backus. -+ -+Sat Jul 15 00:21:28 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (DISTFILES): -+ Rename libgettext.perl to gettext.perl to fit in 14 chars -+ file systems. -+ -+ * gettext.perl: -+ Rename to gettext.perl to fit in 14 chars file systems. -+ -+Thu Jul 13 23:17:20 1995 Ulrich Drepper <drepper@myware> -+ -+ * cat-compat.c: If !STDC_HEADERS try to include malloc.h. -+ -+Thu Jul 13 20:55:02 1995 Ulrich Drepper <drepper@myware> -+ -+ * po2tbl.sed.in: Pretty printing. -+ -+ * linux-msg.sed, xopen-msg.sed: -+ Correct bugs with handling substitute flags in branches. -+ -+ * hash-string.h (hash_string): -+ Old K&R compilers don't under stand `unsigned char'. -+ -+ * gettext.h (nls_uint32): -+ Some old K&R compilers (eg HP) don't understand `unsigned int'. -+ -+ * cat-compat.c (msg_to_cat_id): De-ANSI-fy prototypes. -+ -+Thu Jul 13 01:34:33 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (ELCFILES): New variable. -+ (DISTFILES): Add elisp-comp. -+ Add implicit rule for .el -> .elc compilation. -+ (install-data): install $ELCFILES -+ (clean): renamed po-to-tbl and po-to-msg to po2tbl and po2msg resp. -+ -+ * elisp-comp: Initial revision -+ -+Wed Jul 12 16:14:52 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in: -+ cat-id-tbl.c is now found in po/. This enables us to use an identical -+ intl/ directory in all packages. -+ -+ * dcgettext.c (dcgettext): hashing does not work for table size <= 2. -+ -+ * textdomain.c: fix typo (#if def -> #if defined) -+ -+Tue Jul 11 18:44:43 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (stamp-cat-id): use top_srcdir to address source files -+ (DISTFILES,distclean): move tupdate.perl to src/ -+ -+ * po-to-tbl.sed.in: -+ add additional jump to clear change flag to recognize multiline strings -+ -+Tue Jul 11 01:32:50 1995 Ulrich Drepper <drepper@myware> -+ -+ * textdomain.c: Protect inclusion of stdlib.h and string.h. -+ -+ * loadmsgcat.c: Protect inclusion of stdlib.h. -+ -+ * libgettext.h: Protect inclusion of locale.h. -+ Allow use in C++ programs. -+ Define NULL is not happened already. -+ -+ * Makefile.in (DISTFILES): ship po-to-tbl.sed.in instead of -+ po-to-tbl.sed. -+ (distclean): remove po-to-tbl.sed and tupdate.perl. -+ -+ * tupdate.perl.in: Substitute Perl path even in exec line. -+ Don't include entries without translation from old .po file. -+ -+Tue Jul 4 00:41:51 1995 Ulrich Drepper <drepper@myware> -+ -+ * tupdate.perl.in: use "Updated: " in msgid "". -+ -+ * cat-compat.c: Fix typo (LOCALDIR -> LOCALEDIR). -+ Define getenv if !__STDC__. -+ -+ * bindtextdom.c: Protect stdlib.h and string.h inclusion. -+ Define free if !__STDC__. -+ -+ * finddomain.c: Change DEF_MSG_DOM_DIR to LOCALEDIR. -+ Define free if !__STDC__. -+ -+ * cat-compat.c: Change DEF_MSG_DOM_DIR to LOCALEDIR. -+ -+Mon Jul 3 23:56:30 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in: Use LOCALEDIR instead of DEF_MSG_DOM_DIR. -+ Remove unneeded $(srcdir) from Makefile.in dependency. -+ -+ * makelinks: Add copyright and short description. -+ -+ * po-mode.el: Last version for 0.7. -+ -+ * tupdate.perl.in: Fix die message. -+ -+ * dcgettext.c: Protect include of string.h. -+ -+ * gettext.c: Protect include of stdlib.h and further tries to get NULL. -+ -+ * finddomain.c: Some corrections in includes. -+ -+ * Makefile.in (INCLUDES): Prune list correct path to Makefile.in. -+ -+ * po-to-tbl.sed: Adopt for new .po file format. -+ -+ * linux-msg.sed, xopen-msg.sed: Adopt for new .po file format. -+ -+Sun Jul 2 23:55:03 1995 Ulrich Drepper <drepper@myware> -+ -+ * tupdate.perl.in: Complete rewrite for new .po file format. -+ -+Sun Jul 2 02:06:50 1995 Ulrich Drepper <drepper@myware> -+ -+ * First official release. This directory contains all the code -+ needed to internationalize own packages. It provides functions -+ which allow to use the X/Open catgets function with an interface -+ like the Uniforum gettext function. For system which does not -+ have neither of those a complete implementation is provided. -diff -urP gtkhtml-0.8.3.orig/intl/Makefile.in gtkhtml-0.8.3/intl/Makefile.in ---- gtkhtml-0.8.3.orig/intl/Makefile.in Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/Makefile.in Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,214 @@ -+# Makefile for directory with message catalog handling in GNU NLS Utilities. -+# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+# -+# This program 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 General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+PACKAGE = @PACKAGE@ -+VERSION = @VERSION@ -+ -+SHELL = /bin/sh -+ -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+top_builddir = .. -+VPATH = @srcdir@ -+ -+prefix = @prefix@ -+exec_prefix = @exec_prefix@ -+transform = @program_transform_name@ -+libdir = $(exec_prefix)/lib -+includedir = $(prefix)/include -+datadir = $(prefix)/@DATADIRNAME@ -+localedir = $(datadir)/locale -+gnulocaledir = $(prefix)/share/locale -+gettextsrcdir = @datadir@/gettext/intl -+aliaspath = $(localedir):. -+subdir = intl -+ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+MKINSTALLDIRS = @MKINSTALLDIRS@ -+ -+l = @l@ -+ -+AR = ar -+CC = @CC@ -+LIBTOOL = @LIBTOOL@ -+RANLIB = @RANLIB@ -+ -+DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \ -+-DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@ -+CPPFLAGS = @CPPFLAGS@ -+CFLAGS = @CFLAGS@ -+LDFLAGS = @LDFLAGS@ -+ -+COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) -+ -+HEADERS = $(COMHDRS) libgettext.h loadinfo.h -+COMHDRS = gettext.h gettextP.h hash-string.h -+SOURCES = $(COMSRCS) intl-compat.c cat-compat.c -+COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \ -+finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \ -+explodename.c -+OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \ -+finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \ -+explodename.$lo -+CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo -+GETTOBJS = intl-compat.$lo -+DISTFILES.common = ChangeLog Makefile.in linux-msg.sed po2tbl.sed.in \ -+xopen-msg.sed $(HEADERS) $(SOURCES) -+DISTFILES.normal = VERSION -+DISTFILES.gettext = libintl.glibc intlh.inst.in -+ -+.SUFFIXES: -+.SUFFIXES: .c .o .lo -+.c.o: -+ $(COMPILE) $< -+.c.lo: -+ $(LIBTOOL) --mode=compile $(COMPILE) $< -+ -+INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib -+ -+all: all-@USE_INCLUDED_LIBINTL@ -+ -+all-yes: libintl.$la intlh.inst -+all-no: -+ -+libintl.a: $(OBJECTS) -+ rm -f $@ -+ $(AR) cru $@ $(OBJECTS) -+ $(RANLIB) $@ -+ -+libintl.la: $(OBJECTS) -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \ -+ -version-info 1:0 -rpath $(libdir) -+ -+../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot -+ cd ../po && $(MAKE) cat-id-tbl.$lo -+ -+check: all -+ -+# This installation goal is only used in GNU gettext. Packages which -+# only use the library should use install instead. -+ -+# We must not install the libintl.h/libintl.a files if we are on a -+# system which has the gettext() function in its C library or in a -+# separate library or use the catgets interface. A special case is -+# where configure found a previously installed GNU gettext library. -+# If you want to use the one which comes with this version of the -+# package, you have to use `configure --with-included-gettext'. -+install: install-exec install-data -+install-exec: all -+ if test "$(PACKAGE)" = "gettext" \ -+ && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ -+ if test -r $(MKINSTALLDIRS); then \ -+ $(MKINSTALLDIRS) $(libdir) $(includedir); \ -+ else \ -+ $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \ -+ fi; \ -+ $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \ -+ $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \ -+ else \ -+ : ; \ -+ fi -+install-data: all -+ if test "$(PACKAGE)" = "gettext"; then \ -+ if test -r $(MKINSTALLDIRS); then \ -+ $(MKINSTALLDIRS) $(gettextsrcdir); \ -+ else \ -+ $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \ -+ fi; \ -+ $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \ -+ dists="$(DISTFILES.common)"; \ -+ for file in $$dists; do \ -+ $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \ -+ done; \ -+ else \ -+ : ; \ -+ fi -+ -+# Define this as empty until I found a useful application. -+installcheck: -+ -+uninstall: -+ dists="$(DISTFILES.common)"; \ -+ for file in $$dists; do \ -+ rm -f $(gettextsrcdir)/$$file; \ -+ done -+ -+info dvi: -+ -+$(OBJECTS): ../config.h libgettext.h -+bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h -+dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h -+ -+tags: TAGS -+ -+TAGS: $(HEADERS) $(SOURCES) -+ here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES) -+ -+id: ID -+ -+ID: $(HEADERS) $(SOURCES) -+ here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES) -+ -+ -+mostlyclean: -+ rm -f *.a *.o *.lo core core.* -+ -+clean: mostlyclean -+ -+distclean: clean -+ rm -f Makefile ID TAGS po2msg.sed po2tbl.sed -+ -+maintainer-clean: distclean -+ @echo "This command is intended for maintainers to use;" -+ @echo "it deletes files that may require special tools to rebuild." -+ -+ -+# GNU gettext needs not contain the file `VERSION' but contains some -+# other files which should not be distributed in other packages. -+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) -+dist distdir: Makefile $(DISTFILES) -+ if test "$(PACKAGE)" = gettext; then \ -+ additional="$(DISTFILES.gettext)"; \ -+ else \ -+ additional="$(DISTFILES.normal)"; \ -+ fi; \ -+ for file in $(DISTFILES.common) $$additional; do \ -+ ln $(srcdir)/$$file $(distdir) 2> /dev/null \ -+ || cp -p $(srcdir)/$$file $(distdir); \ -+ done -+ -+dist-libc: -+ tar zcvf intl-glibc.tar.gz $(COMSRCS) $(COMHDRS) libintl.h.glibc -+ -+Makefile: Makefile.in ../config.status -+ cd .. \ -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ -+# The dependency for intlh.inst is different in gettext and all other -+# packages. Because we cannot you GNU make features we have to solve -+# the problem while rewriting Makefile.in. -+@GT_YES@intlh.inst: intlh.inst.in ../config.status -+@GT_YES@ cd .. \ -+@GT_YES@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \ -+@GT_YES@ $(SHELL) ./config.status -+@GT_NO@.PHONY: intlh.inst -+@GT_NO@intlh.inst: -+ -+# Tell versions [3.59,3.63) of GNU make not to export all variables. -+# Otherwise a system limit (for SysV at least) may be exceeded. -+.NOEXPORT: -diff -urP gtkhtml-0.8.3.orig/intl/VERSION gtkhtml-0.8.3/intl/VERSION ---- gtkhtml-0.8.3.orig/intl/VERSION Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/VERSION Fri Mar 16 14:46:14 2001 -@@ -0,0 +1 @@ -+GNU gettext library from gettext-0.10.35 -diff -urP gtkhtml-0.8.3.orig/intl/bindtextdom.c gtkhtml-0.8.3/intl/bindtextdom.c ---- gtkhtml-0.8.3.orig/intl/bindtextdom.c Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/bindtextdom.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,203 @@ -+/* Implementation of the bindtextdomain(3) function -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#else -+# ifdef HAVE_MALLOC_H -+# include <malloc.h> -+# else -+void free (); -+# endif -+#endif -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# include <string.h> -+#else -+# include <strings.h> -+# ifndef memcpy -+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -+# endif -+#endif -+ -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+#include "gettext.h" -+#include "gettextP.h" -+ -+/* @@ end of prolog @@ */ -+ -+/* Contains the default location of the message catalogs. */ -+extern const char _nl_default_dirname[]; -+ -+/* List with bindings of specific domains. */ -+extern struct binding *_nl_domain_bindings; -+ -+ -+/* Names for the libintl functions are a problem. They must not clash -+ with existing names and they should follow ANSI C. But this source -+ code is also used in GNU C Library where the names have a __ -+ prefix. So we have to make a difference here. */ -+#ifdef _LIBC -+# define BINDTEXTDOMAIN __bindtextdomain -+# ifndef strdup -+# define strdup(str) __strdup (str) -+# endif -+#else -+# define BINDTEXTDOMAIN bindtextdomain__ -+#endif -+ -+/* Specify that the DOMAINNAME message catalog will be found -+ in DIRNAME rather than in the system locale data base. */ -+char * -+BINDTEXTDOMAIN (domainname, dirname) -+ const char *domainname; -+ const char *dirname; -+{ -+ struct binding *binding; -+ -+ /* Some sanity checks. */ -+ if (domainname == NULL || domainname[0] == '\0') -+ return NULL; -+ -+ for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) -+ { -+ int compare = strcmp (domainname, binding->domainname); -+ if (compare == 0) -+ /* We found it! */ -+ break; -+ if (compare < 0) -+ { -+ /* It is not in the list. */ -+ binding = NULL; -+ break; -+ } -+ } -+ -+ if (dirname == NULL) -+ /* The current binding has be to returned. */ -+ return binding == NULL ? (char *) _nl_default_dirname : binding->dirname; -+ -+ if (binding != NULL) -+ { -+ /* The domain is already bound. If the new value and the old -+ one are equal we simply do nothing. Otherwise replace the -+ old binding. */ -+ if (strcmp (dirname, binding->dirname) != 0) -+ { -+ char *new_dirname; -+ -+ if (strcmp (dirname, _nl_default_dirname) == 0) -+ new_dirname = (char *) _nl_default_dirname; -+ else -+ { -+#if defined _LIBC || defined HAVE_STRDUP -+ new_dirname = strdup (dirname); -+ if (new_dirname == NULL) -+ return NULL; -+#else -+ size_t len = strlen (dirname) + 1; -+ new_dirname = (char *) malloc (len); -+ if (new_dirname == NULL) -+ return NULL; -+ -+ memcpy (new_dirname, dirname, len); -+#endif -+ } -+ -+ if (binding->dirname != _nl_default_dirname) -+ free (binding->dirname); -+ -+ binding->dirname = new_dirname; -+ } -+ } -+ else -+ { -+ /* We have to create a new binding. */ -+#if !defined _LIBC && !defined HAVE_STRDUP -+ size_t len; -+#endif -+ struct binding *new_binding = -+ (struct binding *) malloc (sizeof (*new_binding)); -+ -+ if (new_binding == NULL) -+ return NULL; -+ -+#if defined _LIBC || defined HAVE_STRDUP -+ new_binding->domainname = strdup (domainname); -+ if (new_binding->domainname == NULL) -+ return NULL; -+#else -+ len = strlen (domainname) + 1; -+ new_binding->domainname = (char *) malloc (len); -+ if (new_binding->domainname == NULL) -+ return NULL; -+ memcpy (new_binding->domainname, domainname, len); -+#endif -+ -+ if (strcmp (dirname, _nl_default_dirname) == 0) -+ new_binding->dirname = (char *) _nl_default_dirname; -+ else -+ { -+#if defined _LIBC || defined HAVE_STRDUP -+ new_binding->dirname = strdup (dirname); -+ if (new_binding->dirname == NULL) -+ return NULL; -+#else -+ len = strlen (dirname) + 1; -+ new_binding->dirname = (char *) malloc (len); -+ if (new_binding->dirname == NULL) -+ return NULL; -+ memcpy (new_binding->dirname, dirname, len); -+#endif -+ } -+ -+ /* Now enqueue it. */ -+ if (_nl_domain_bindings == NULL -+ || strcmp (domainname, _nl_domain_bindings->domainname) < 0) -+ { -+ new_binding->next = _nl_domain_bindings; -+ _nl_domain_bindings = new_binding; -+ } -+ else -+ { -+ binding = _nl_domain_bindings; -+ while (binding->next != NULL -+ && strcmp (domainname, binding->next->domainname) > 0) -+ binding = binding->next; -+ -+ new_binding->next = binding->next; -+ binding->next = new_binding; -+ } -+ -+ binding = new_binding; -+ } -+ -+ return binding->dirname; -+} -+ -+#ifdef _LIBC -+/* Alias for function name in GNU C Library. */ -+weak_alias (__bindtextdomain, bindtextdomain); -+#endif -diff -urP gtkhtml-0.8.3.orig/intl/cat-compat.c gtkhtml-0.8.3/intl/cat-compat.c ---- gtkhtml-0.8.3.orig/intl/cat-compat.c Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/cat-compat.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,262 @@ -+/* Compatibility code for gettext-using-catgets interface. -+ Copyright (C) 1995, 1997 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <stdio.h> -+ -+#ifdef STDC_HEADERS -+# include <stdlib.h> -+# include <string.h> -+#else -+char *getenv (); -+# ifdef HAVE_MALLOC_H -+# include <malloc.h> -+# endif -+#endif -+ -+#ifdef HAVE_NL_TYPES_H -+# include <nl_types.h> -+#endif -+ -+#include "libgettext.h" -+ -+/* @@ end of prolog @@ */ -+ -+/* XPG3 defines the result of `setlocale (category, NULL)' as: -+ ``Directs `setlocale()' to query `category' and return the current -+ setting of `local'.'' -+ However it does not specify the exact format. And even worse: POSIX -+ defines this not at all. So we can use this feature only on selected -+ system (e.g. those using GNU C Library). */ -+#ifdef _LIBC -+# define HAVE_LOCALE_NULL -+#endif -+ -+/* The catalog descriptor. */ -+static nl_catd catalog = (nl_catd) -1; -+ -+/* Name of the default catalog. */ -+static const char default_catalog_name[] = "messages"; -+ -+/* Name of currently used catalog. */ -+static const char *catalog_name = default_catalog_name; -+ -+/* Get ID for given string. If not found return -1. */ -+static int msg_to_cat_id PARAMS ((const char *msg)); -+ -+/* Substitution for systems lacking this function in their C library. */ -+#if !_LIBC && !HAVE_STPCPY -+static char *stpcpy PARAMS ((char *dest, const char *src)); -+#endif -+ -+ -+/* Set currently used domain/catalog. */ -+char * -+textdomain (domainname) -+ const char *domainname; -+{ -+ nl_catd new_catalog; -+ char *new_name; -+ size_t new_name_len; -+ char *lang; -+ -+#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES \ -+ && defined HAVE_LOCALE_NULL -+ lang = setlocale (LC_MESSAGES, NULL); -+#else -+ lang = getenv ("LC_ALL"); -+ if (lang == NULL || lang[0] == '\0') -+ { -+ lang = getenv ("LC_MESSAGES"); -+ if (lang == NULL || lang[0] == '\0') -+ lang = getenv ("LANG"); -+ } -+#endif -+ if (lang == NULL || lang[0] == '\0') -+ lang = "C"; -+ -+ /* See whether name of currently used domain is asked. */ -+ if (domainname == NULL) -+ return (char *) catalog_name; -+ -+ if (domainname[0] == '\0') -+ domainname = default_catalog_name; -+ -+ /* Compute length of added path element. */ -+ new_name_len = sizeof (LOCALEDIR) - 1 + 1 + strlen (lang) -+ + sizeof ("/LC_MESSAGES/") - 1 + sizeof (PACKAGE) - 1 -+ + sizeof (".cat"); -+ -+ new_name = (char *) malloc (new_name_len); -+ if (new_name == NULL) -+ return NULL; -+ -+ strcpy (new_name, PACKAGE); -+ new_catalog = catopen (new_name, 0); -+ -+ if (new_catalog == (nl_catd) -1) -+ { -+ /* NLSPATH search didn't work, try absolute path */ -+ sprintf (new_name, "%s/%s/LC_MESSAGES/%s.cat", LOCALEDIR, lang, -+ PACKAGE); -+ new_catalog = catopen (new_name, 0); -+ -+ if (new_catalog == (nl_catd) -1) -+ { -+ free (new_name); -+ return (char *) catalog_name; -+ } -+ } -+ -+ /* Close old catalog. */ -+ if (catalog != (nl_catd) -1) -+ catclose (catalog); -+ if (catalog_name != default_catalog_name) -+ free ((char *) catalog_name); -+ -+ catalog = new_catalog; -+ catalog_name = new_name; -+ -+ return (char *) catalog_name; -+} -+ -+char * -+bindtextdomain (domainname, dirname) -+ const char *domainname; -+ const char *dirname; -+{ -+#if HAVE_SETENV || HAVE_PUTENV -+ char *old_val, *new_val, *cp; -+ size_t new_val_len; -+ -+ /* This does not make much sense here but to be compatible do it. */ -+ if (domainname == NULL) -+ return NULL; -+ -+ /* Compute length of added path element. If we use setenv we don't need -+ the first byts for NLSPATH=, but why complicate the code for this -+ peanuts. */ -+ new_val_len = sizeof ("NLSPATH=") - 1 + strlen (dirname) -+ + sizeof ("/%L/LC_MESSAGES/%N.cat"); -+ -+ old_val = getenv ("NLSPATH"); -+ if (old_val == NULL || old_val[0] == '\0') -+ { -+ old_val = NULL; -+ new_val_len += 1 + sizeof (LOCALEDIR) - 1 -+ + sizeof ("/%L/LC_MESSAGES/%N.cat"); -+ } -+ else -+ new_val_len += strlen (old_val); -+ -+ new_val = (char *) malloc (new_val_len); -+ if (new_val == NULL) -+ return NULL; -+ -+# if HAVE_SETENV -+ cp = new_val; -+# else -+ cp = stpcpy (new_val, "NLSPATH="); -+# endif -+ -+ cp = stpcpy (cp, dirname); -+ cp = stpcpy (cp, "/%L/LC_MESSAGES/%N.cat:"); -+ -+ if (old_val == NULL) -+ { -+# if __STDC__ -+ stpcpy (cp, LOCALEDIR "/%L/LC_MESSAGES/%N.cat"); -+# else -+ -+ cp = stpcpy (cp, LOCALEDIR); -+ stpcpy (cp, "/%L/LC_MESSAGES/%N.cat"); -+# endif -+ } -+ else -+ stpcpy (cp, old_val); -+ -+# if HAVE_SETENV -+ setenv ("NLSPATH", new_val, 1); -+ free (new_val); -+# else -+ putenv (new_val); -+ /* Do *not* free the environment entry we just entered. It is used -+ from now on. */ -+# endif -+ -+#endif -+ -+ return (char *) domainname; -+} -+ -+#undef gettext -+char * -+gettext (msg) -+ const char *msg; -+{ -+ int msgid; -+ -+ if (msg == NULL || catalog == (nl_catd) -1) -+ return (char *) msg; -+ -+ /* Get the message from the catalog. We always use set number 1. -+ The message ID is computed by the function `msg_to_cat_id' -+ which works on the table generated by `po-to-tbl'. */ -+ msgid = msg_to_cat_id (msg); -+ if (msgid == -1) -+ return (char *) msg; -+ -+ return catgets (catalog, 1, msgid, (char *) msg); -+} -+ -+/* Look through the table `_msg_tbl' which has `_msg_tbl_length' entries -+ for the one equal to msg. If it is found return the ID. In case when -+ the string is not found return -1. */ -+static int -+msg_to_cat_id (msg) -+ const char *msg; -+{ -+ int cnt; -+ -+ for (cnt = 0; cnt < _msg_tbl_length; ++cnt) -+ if (strcmp (msg, _msg_tbl[cnt]._msg) == 0) -+ return _msg_tbl[cnt]._msg_number; -+ -+ return -1; -+} -+ -+ -+/* @@ begin of epilog @@ */ -+ -+/* We don't want libintl.a to depend on any other library. So we -+ avoid the non-standard function stpcpy. In GNU C Library this -+ function is available, though. Also allow the symbol HAVE_STPCPY -+ to be defined. */ -+#if !_LIBC && !HAVE_STPCPY -+static char * -+stpcpy (dest, src) -+ char *dest; -+ const char *src; -+{ -+ while ((*dest++ = *src++) != '\0') -+ /* Do nothing. */ ; -+ return dest - 1; -+} -+#endif -diff -urP gtkhtml-0.8.3.orig/intl/dcgettext.c gtkhtml-0.8.3/intl/dcgettext.c ---- gtkhtml-0.8.3.orig/intl/dcgettext.c Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/dcgettext.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,624 @@ -+/* Implementation of the dcgettext(3) function. -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <sys/types.h> -+ -+#ifdef __GNUC__ -+# define alloca __builtin_alloca -+# define HAVE_ALLOCA 1 -+#else -+# if defined HAVE_ALLOCA_H || defined _LIBC -+# include <alloca.h> -+# else -+# ifdef _AIX -+ #pragma alloca -+# else -+# ifndef alloca -+char *alloca (); -+# endif -+# endif -+# endif -+#endif -+ -+#include <errno.h> -+#ifndef errno -+extern int errno; -+#endif -+#ifndef __set_errno -+# define __set_errno(val) errno = (val) -+#endif -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#else -+char *getenv (); -+# ifdef HAVE_MALLOC_H -+# include <malloc.h> -+# else -+void free (); -+# endif -+#endif -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# ifndef _GNU_SOURCE -+# define _GNU_SOURCE 1 -+# endif -+# include <string.h> -+#else -+# include <strings.h> -+#endif -+#if !HAVE_STRCHR && !defined _LIBC -+# ifndef strchr -+# define strchr index -+# endif -+#endif -+ -+#if defined HAVE_UNISTD_H || defined _LIBC -+# include <unistd.h> -+#endif -+ -+#include "gettext.h" -+#include "gettextP.h" -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+#include "hash-string.h" -+ -+/* @@ end of prolog @@ */ -+ -+#ifdef _LIBC -+/* Rename the non ANSI C functions. This is required by the standard -+ because some ANSI C functions will require linking with this object -+ file and the name space must not be polluted. */ -+# define getcwd __getcwd -+# ifndef stpcpy -+# define stpcpy __stpcpy -+# endif -+#else -+# if !defined HAVE_GETCWD -+char *getwd (); -+# define getcwd(buf, max) getwd (buf) -+# else -+char *getcwd (); -+# endif -+# ifndef HAVE_STPCPY -+static char *stpcpy PARAMS ((char *dest, const char *src)); -+# endif -+#endif -+ -+/* Amount to increase buffer size by in each try. */ -+#define PATH_INCR 32 -+ -+/* The following is from pathmax.h. */ -+/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define -+ PATH_MAX but might cause redefinition warnings when sys/param.h is -+ later included (as on MORE/BSD 4.3). */ -+#if defined(_POSIX_VERSION) || (defined(HAVE_LIMITS_H) && !defined(__GNUC__)) -+# include <limits.h> -+#endif -+ -+#ifndef _POSIX_PATH_MAX -+# define _POSIX_PATH_MAX 255 -+#endif -+ -+#if !defined(PATH_MAX) && defined(_PC_PATH_MAX) -+# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX)) -+#endif -+ -+/* Don't include sys/param.h if it already has been. */ -+#if defined(HAVE_SYS_PARAM_H) && !defined(PATH_MAX) && !defined(MAXPATHLEN) -+# include <sys/param.h> -+#endif -+ -+#if !defined(PATH_MAX) && defined(MAXPATHLEN) -+# define PATH_MAX MAXPATHLEN -+#endif -+ -+#ifndef PATH_MAX -+# define PATH_MAX _POSIX_PATH_MAX -+#endif -+ -+/* XPG3 defines the result of `setlocale (category, NULL)' as: -+ ``Directs `setlocale()' to query `category' and return the current -+ setting of `local'.'' -+ However it does not specify the exact format. And even worse: POSIX -+ defines this not at all. So we can use this feature only on selected -+ system (e.g. those using GNU C Library). */ -+#ifdef _LIBC -+# define HAVE_LOCALE_NULL -+#endif -+ -+/* Name of the default domain used for gettext(3) prior any call to -+ textdomain(3). The default value for this is "messages". */ -+const char _nl_default_default_domain[] = "messages"; -+ -+/* Value used as the default domain for gettext(3). */ -+const char *_nl_current_default_domain = _nl_default_default_domain; -+ -+/* Contains the default location of the message catalogs. */ -+const char _nl_default_dirname[] = GNULOCALEDIR; -+ -+/* List with bindings of specific domains created by bindtextdomain() -+ calls. */ -+struct binding *_nl_domain_bindings; -+ -+/* Prototypes for local functions. */ -+static char *find_msg PARAMS ((struct loaded_l10nfile *domain_file, -+ const char *msgid)) internal_function; -+static const char *category_to_name PARAMS ((int category)) internal_function; -+static const char *guess_category_value PARAMS ((int category, -+ const char *categoryname)) -+ internal_function; -+ -+ -+/* For those loosing systems which don't have `alloca' we have to add -+ some additional code emulating it. */ -+#ifdef HAVE_ALLOCA -+/* Nothing has to be done. */ -+# define ADD_BLOCK(list, address) /* nothing */ -+# define FREE_BLOCKS(list) /* nothing */ -+#else -+struct block_list -+{ -+ void *address; -+ struct block_list *next; -+}; -+# define ADD_BLOCK(list, addr) \ -+ do { \ -+ struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \ -+ /* If we cannot get a free block we cannot add the new element to \ -+ the list. */ \ -+ if (newp != NULL) { \ -+ newp->address = (addr); \ -+ newp->next = (list); \ -+ (list) = newp; \ -+ } \ -+ } while (0) -+# define FREE_BLOCKS(list) \ -+ do { \ -+ while (list != NULL) { \ -+ struct block_list *old = list; \ -+ list = list->next; \ -+ free (old); \ -+ } \ -+ } while (0) -+# undef alloca -+# define alloca(size) (malloc (size)) -+#endif /* have alloca */ -+ -+ -+/* Names for the libintl functions are a problem. They must not clash -+ with existing names and they should follow ANSI C. But this source -+ code is also used in GNU C Library where the names have a __ -+ prefix. So we have to make a difference here. */ -+#ifdef _LIBC -+# define DCGETTEXT __dcgettext -+#else -+# define DCGETTEXT dcgettext__ -+#endif -+ -+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY -+ locale. */ -+char * -+DCGETTEXT (domainname, msgid, category) -+ const char *domainname; -+ const char *msgid; -+ int category; -+{ -+#ifndef HAVE_ALLOCA -+ struct block_list *block_list = NULL; -+#endif -+ struct loaded_l10nfile *domain; -+ struct binding *binding; -+ const char *categoryname; -+ const char *categoryvalue; -+ char *dirname, *xdomainname; -+ char *single_locale; -+ char *retval; -+ int saved_errno = errno; -+ -+ /* If no real MSGID is given return NULL. */ -+ if (msgid == NULL) -+ return NULL; -+ -+ /* If DOMAINNAME is NULL, we are interested in the default domain. If -+ CATEGORY is not LC_MESSAGES this might not make much sense but the -+ defintion left this undefined. */ -+ if (domainname == NULL) -+ domainname = _nl_current_default_domain; -+ -+ /* First find matching binding. */ -+ for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) -+ { -+ int compare = strcmp (domainname, binding->domainname); -+ if (compare == 0) -+ /* We found it! */ -+ break; -+ if (compare < 0) -+ { -+ /* It is not in the list. */ -+ binding = NULL; -+ break; -+ } -+ } -+ -+ if (binding == NULL) -+ dirname = (char *) _nl_default_dirname; -+ else if (binding->dirname[0] == '/') -+ dirname = binding->dirname; -+ else -+ { -+ /* We have a relative path. Make it absolute now. */ -+ size_t dirname_len = strlen (binding->dirname) + 1; -+ size_t path_max; -+ char *ret; -+ -+ path_max = (unsigned) PATH_MAX; -+ path_max += 2; /* The getcwd docs say to do this. */ -+ -+ dirname = (char *) alloca (path_max + dirname_len); -+ ADD_BLOCK (block_list, dirname); -+ -+ __set_errno (0); -+ while ((ret = getcwd (dirname, path_max)) == NULL && errno == ERANGE) -+ { -+ path_max += PATH_INCR; -+ dirname = (char *) alloca (path_max + dirname_len); -+ ADD_BLOCK (block_list, dirname); -+ __set_errno (0); -+ } -+ -+ if (ret == NULL) -+ { -+ /* We cannot get the current working directory. Don't signal an -+ error but simply return the default string. */ -+ FREE_BLOCKS (block_list); -+ __set_errno (saved_errno); -+ return (char *) msgid; -+ } -+ -+ stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname); -+ } -+ -+ /* Now determine the symbolic name of CATEGORY and its value. */ -+ categoryname = category_to_name (category); -+ categoryvalue = guess_category_value (category, categoryname); -+ -+ xdomainname = (char *) alloca (strlen (categoryname) -+ + strlen (domainname) + 5); -+ ADD_BLOCK (block_list, xdomainname); -+ -+ stpcpy (stpcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"), -+ domainname), -+ ".mo"); -+ -+ /* Creating working area. */ -+ single_locale = (char *) alloca (strlen (categoryvalue) + 1); -+ ADD_BLOCK (block_list, single_locale); -+ -+ -+ /* Search for the given string. This is a loop because we perhaps -+ got an ordered list of languages to consider for th translation. */ -+ while (1) -+ { -+ /* Make CATEGORYVALUE point to the next element of the list. */ -+ while (categoryvalue[0] != '\0' && categoryvalue[0] == ':') -+ ++categoryvalue; -+ if (categoryvalue[0] == '\0') -+ { -+ /* The whole contents of CATEGORYVALUE has been searched but -+ no valid entry has been found. We solve this situation -+ by implicitly appending a "C" entry, i.e. no translation -+ will take place. */ -+ single_locale[0] = 'C'; -+ single_locale[1] = '\0'; -+ } -+ else -+ { -+ char *cp = single_locale; -+ while (categoryvalue[0] != '\0' && categoryvalue[0] != ':') -+ *cp++ = *categoryvalue++; -+ *cp = '\0'; -+ } -+ -+ /* If the current locale value is C (or POSIX) we don't load a -+ domain. Return the MSGID. */ -+ if (strcmp (single_locale, "C") == 0 -+ || strcmp (single_locale, "POSIX") == 0) -+ { -+ FREE_BLOCKS (block_list); -+ __set_errno (saved_errno); -+ return (char *) msgid; -+ } -+ -+ -+ /* Find structure describing the message catalog matching the -+ DOMAINNAME and CATEGORY. */ -+ domain = _nl_find_domain (dirname, single_locale, xdomainname); -+ -+ if (domain != NULL) -+ { -+ retval = find_msg (domain, msgid); -+ -+ if (retval == NULL) -+ { -+ int cnt; -+ -+ for (cnt = 0; domain->successor[cnt] != NULL; ++cnt) -+ { -+ retval = find_msg (domain->successor[cnt], msgid); -+ -+ if (retval != NULL) -+ break; -+ } -+ } -+ -+ if (retval != NULL) -+ { -+ FREE_BLOCKS (block_list); -+ __set_errno (saved_errno); -+ return retval; -+ } -+ } -+ } -+ /* NOTREACHED */ -+} -+ -+#ifdef _LIBC -+/* Alias for function name in GNU C Library. */ -+weak_alias (__dcgettext, dcgettext); -+#endif -+ -+ -+static char * -+internal_function -+find_msg (domain_file, msgid) -+ struct loaded_l10nfile *domain_file; -+ const char *msgid; -+{ -+ size_t top, act, bottom; -+ struct loaded_domain *domain; -+ -+ if (domain_file->decided == 0) -+ _nl_load_domain (domain_file); -+ -+ if (domain_file->data == NULL) -+ return NULL; -+ -+ domain = (struct loaded_domain *) domain_file->data; -+ -+ /* Locate the MSGID and its translation. */ -+ if (domain->hash_size > 2 && domain->hash_tab != NULL) -+ { -+ /* Use the hashing table. */ -+ nls_uint32 len = strlen (msgid); -+ nls_uint32 hash_val = hash_string (msgid); -+ nls_uint32 idx = hash_val % domain->hash_size; -+ nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2)); -+ nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]); -+ -+ if (nstr == 0) -+ /* Hash table entry is empty. */ -+ return NULL; -+ -+ if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len -+ && strcmp (msgid, -+ domain->data + W (domain->must_swap, -+ domain->orig_tab[nstr - 1].offset)) == 0) -+ return (char *) domain->data + W (domain->must_swap, -+ domain->trans_tab[nstr - 1].offset); -+ -+ while (1) -+ { -+ if (idx >= domain->hash_size - incr) -+ idx -= domain->hash_size - incr; -+ else -+ idx += incr; -+ -+ nstr = W (domain->must_swap, domain->hash_tab[idx]); -+ if (nstr == 0) -+ /* Hash table entry is empty. */ -+ return NULL; -+ -+ if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len -+ && strcmp (msgid, -+ domain->data + W (domain->must_swap, -+ domain->orig_tab[nstr - 1].offset)) -+ == 0) -+ return (char *) domain->data -+ + W (domain->must_swap, domain->trans_tab[nstr - 1].offset); -+ } -+ /* NOTREACHED */ -+ } -+ -+ /* Now we try the default method: binary search in the sorted -+ array of messages. */ -+ bottom = 0; -+ top = domain->nstrings; -+ while (bottom < top) -+ { -+ int cmp_val; -+ -+ act = (bottom + top) / 2; -+ cmp_val = strcmp (msgid, domain->data -+ + W (domain->must_swap, -+ domain->orig_tab[act].offset)); -+ if (cmp_val < 0) -+ top = act; -+ else if (cmp_val > 0) -+ bottom = act + 1; -+ else -+ break; -+ } -+ -+ /* If an translation is found return this. */ -+ return bottom >= top ? NULL : (char *) domain->data -+ + W (domain->must_swap, -+ domain->trans_tab[act].offset); -+} -+ -+ -+/* Return string representation of locale CATEGORY. */ -+static const char * -+internal_function -+category_to_name (category) -+ int category; -+{ -+ const char *retval; -+ -+ switch (category) -+ { -+#ifdef LC_COLLATE -+ case LC_COLLATE: -+ retval = "LC_COLLATE"; -+ break; -+#endif -+#ifdef LC_CTYPE -+ case LC_CTYPE: -+ retval = "LC_CTYPE"; -+ break; -+#endif -+#ifdef LC_MONETARY -+ case LC_MONETARY: -+ retval = "LC_MONETARY"; -+ break; -+#endif -+#ifdef LC_NUMERIC -+ case LC_NUMERIC: -+ retval = "LC_NUMERIC"; -+ break; -+#endif -+#ifdef LC_TIME -+ case LC_TIME: -+ retval = "LC_TIME"; -+ break; -+#endif -+#ifdef LC_MESSAGES -+ case LC_MESSAGES: -+ retval = "LC_MESSAGES"; -+ break; -+#endif -+#ifdef LC_RESPONSE -+ case LC_RESPONSE: -+ retval = "LC_RESPONSE"; -+ break; -+#endif -+#ifdef LC_ALL -+ case LC_ALL: -+ /* This might not make sense but is perhaps better than any other -+ value. */ -+ retval = "LC_ALL"; -+ break; -+#endif -+ default: -+ /* If you have a better idea for a default value let me know. */ -+ retval = "LC_XXX"; -+ } -+ -+ return retval; -+} -+ -+/* Guess value of current locale from value of the environment variables. */ -+static const char * -+internal_function -+guess_category_value (category, categoryname) -+ int category; -+ const char *categoryname; -+{ -+ const char *retval; -+ -+ /* The highest priority value is the `LANGUAGE' environment -+ variable. This is a GNU extension. */ -+ retval = getenv ("LANGUAGE"); -+ if (retval != NULL && retval[0] != '\0') -+ return retval; -+ -+ /* `LANGUAGE' is not set. So we have to proceed with the POSIX -+ methods of looking to `LC_ALL', `LC_xxx', and `LANG'. On some -+ systems this can be done by the `setlocale' function itself. */ -+#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL -+ return setlocale (category, NULL); -+#else -+ /* Setting of LC_ALL overwrites all other. */ -+ retval = getenv ("LC_ALL"); -+ if (retval != NULL && retval[0] != '\0') -+ return retval; -+ -+ /* Next comes the name of the desired category. */ -+ retval = getenv (categoryname); -+ if (retval != NULL && retval[0] != '\0') -+ return retval; -+ -+ /* Last possibility is the LANG environment variable. */ -+ retval = getenv ("LANG"); -+ if (retval != NULL && retval[0] != '\0') -+ return retval; -+ -+ /* We use C as the default domain. POSIX says this is implementation -+ defined. */ -+ return "C"; -+#endif -+} -+ -+/* @@ begin of epilog @@ */ -+ -+/* We don't want libintl.a to depend on any other library. So we -+ avoid the non-standard function stpcpy. In GNU C Library this -+ function is available, though. Also allow the symbol HAVE_STPCPY -+ to be defined. */ -+#if !_LIBC && !HAVE_STPCPY -+static char * -+stpcpy (dest, src) -+ char *dest; -+ const char *src; -+{ -+ while ((*dest++ = *src++) != '\0') -+ /* Do nothing. */ ; -+ return dest - 1; -+} -+#endif -+ -+ -+#ifdef _LIBC -+/* If we want to free all resources we have to do some work at -+ program's end. */ -+static void __attribute__ ((unused)) -+free_mem (void) -+{ -+ struct binding *runp; -+ -+ for (runp = _nl_domain_bindings; runp != NULL; runp = runp->next) -+ { -+ free (runp->domainname); -+ if (runp->dirname != _nl_default_dirname) -+ /* Yes, this is a pointer comparison. */ -+ free (runp->dirname); -+ } -+ -+ if (_nl_current_default_domain != _nl_default_default_domain) -+ /* Yes, again a pointer comparison. */ -+ free ((char *) _nl_current_default_domain); -+} -+ -+text_set_element (__libc_subfreeres, free_mem); -+#endif -diff -urP gtkhtml-0.8.3.orig/intl/dgettext.c gtkhtml-0.8.3/intl/dgettext.c ---- gtkhtml-0.8.3.orig/intl/dgettext.c Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/dgettext.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,59 @@ -+/* Implementation of the dgettext(3) function -+ Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#if defined HAVE_LOCALE_H || defined _LIBC -+# include <locale.h> -+#endif -+ -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+/* Names for the libintl functions are a problem. They must not clash -+ with existing names and they should follow ANSI C. But this source -+ code is also used in GNU C Library where the names have a __ -+ prefix. So we have to make a difference here. */ -+#ifdef _LIBC -+# define DGETTEXT __dgettext -+# define DCGETTEXT __dcgettext -+#else -+# define DGETTEXT dgettext__ -+# define DCGETTEXT dcgettext__ -+#endif -+ -+/* Look up MSGID in the DOMAINNAME message catalog of the current -+ LC_MESSAGES locale. */ -+char * -+DGETTEXT (domainname, msgid) -+ const char *domainname; -+ const char *msgid; -+{ -+ return DCGETTEXT (domainname, msgid, LC_MESSAGES); -+} -+ -+#ifdef _LIBC -+/* Alias for function name in GNU C Library. */ -+weak_alias (__dgettext, dgettext); -+#endif -diff -urP gtkhtml-0.8.3.orig/intl/explodename.c gtkhtml-0.8.3/intl/explodename.c ---- gtkhtml-0.8.3.orig/intl/explodename.c Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/explodename.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,188 @@ -+/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#endif -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# include <string.h> -+#else -+# include <strings.h> -+#endif -+#include <sys/types.h> -+ -+#include "loadinfo.h" -+ -+/* On some strange systems still no definition of NULL is found. Sigh! */ -+#ifndef NULL -+# if defined __STDC__ && __STDC__ -+# define NULL ((void *) 0) -+# else -+# define NULL 0 -+# endif -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+int -+_nl_explode_name (name, language, modifier, territory, codeset, -+ normalized_codeset, special, sponsor, revision) -+ char *name; -+ const char **language; -+ const char **modifier; -+ const char **territory; -+ const char **codeset; -+ const char **normalized_codeset; -+ const char **special; -+ const char **sponsor; -+ const char **revision; -+{ -+ enum { undecided, xpg, cen } syntax; -+ char *cp; -+ int mask; -+ -+ *modifier = NULL; -+ *territory = NULL; -+ *codeset = NULL; -+ *normalized_codeset = NULL; -+ *special = NULL; -+ *sponsor = NULL; -+ *revision = NULL; -+ -+ /* Now we determine the single parts of the locale name. First -+ look for the language. Termination symbols are `_' and `@' if -+ we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */ -+ mask = 0; -+ syntax = undecided; -+ *language = cp = name; -+ while (cp[0] != '\0' && cp[0] != '_' && cp[0] != '@' -+ && cp[0] != '+' && cp[0] != ',') -+ ++cp; -+ -+ if (*language == cp) -+ /* This does not make sense: language has to be specified. Use -+ this entry as it is without exploding. Perhaps it is an alias. */ -+ cp = strchr (*language, '\0'); -+ else if (cp[0] == '_') -+ { -+ /* Next is the territory. */ -+ cp[0] = '\0'; -+ *territory = ++cp; -+ -+ while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@' -+ && cp[0] != '+' && cp[0] != ',' && cp[0] != '_') -+ ++cp; -+ -+ mask |= TERRITORY; -+ -+ if (cp[0] == '.') -+ { -+ /* Next is the codeset. */ -+ syntax = xpg; -+ cp[0] = '\0'; -+ *codeset = ++cp; -+ -+ while (cp[0] != '\0' && cp[0] != '@') -+ ++cp; -+ -+ mask |= XPG_CODESET; -+ -+ if (*codeset != cp && (*codeset)[0] != '\0') -+ { -+ *normalized_codeset = _nl_normalize_codeset (*codeset, -+ cp - *codeset); -+ if (strcmp (*codeset, *normalized_codeset) == 0) -+ free ((char *) *normalized_codeset); -+ else -+ mask |= XPG_NORM_CODESET; -+ } -+ } -+ } -+ -+ if (cp[0] == '@' || (syntax != xpg && cp[0] == '+')) -+ { -+ /* Next is the modifier. */ -+ syntax = cp[0] == '@' ? xpg : cen; -+ cp[0] = '\0'; -+ *modifier = ++cp; -+ -+ while (syntax == cen && cp[0] != '\0' && cp[0] != '+' -+ && cp[0] != ',' && cp[0] != '_') -+ ++cp; -+ -+ mask |= XPG_MODIFIER | CEN_AUDIENCE; -+ } -+ -+ if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_')) -+ { -+ syntax = cen; -+ -+ if (cp[0] == '+') -+ { -+ /* Next is special application (CEN syntax). */ -+ cp[0] = '\0'; -+ *special = ++cp; -+ -+ while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_') -+ ++cp; -+ -+ mask |= CEN_SPECIAL; -+ } -+ -+ if (cp[0] == ',') -+ { -+ /* Next is sponsor (CEN syntax). */ -+ cp[0] = '\0'; -+ *sponsor = ++cp; -+ -+ while (cp[0] != '\0' && cp[0] != '_') -+ ++cp; -+ -+ mask |= CEN_SPONSOR; -+ } -+ -+ if (cp[0] == '_') -+ { -+ /* Next is revision (CEN syntax). */ -+ cp[0] = '\0'; -+ *revision = ++cp; -+ -+ mask |= CEN_REVISION; -+ } -+ } -+ -+ /* For CEN syntax values it might be important to have the -+ separator character in the file name, not for XPG syntax. */ -+ if (syntax == xpg) -+ { -+ if (*territory != NULL && (*territory)[0] == '\0') -+ mask &= ~TERRITORY; -+ -+ if (*codeset != NULL && (*codeset)[0] == '\0') -+ mask &= ~XPG_CODESET; -+ -+ if (*modifier != NULL && (*modifier)[0] == '\0') -+ mask &= ~XPG_MODIFIER; -+ } -+ -+ return mask; -+} -diff -urP gtkhtml-0.8.3.orig/intl/finddomain.c gtkhtml-0.8.3/intl/finddomain.c ---- gtkhtml-0.8.3.orig/intl/finddomain.c Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/finddomain.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,216 @@ -+/* Handle list of needed message catalogs -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <ctype.h> -+#include <errno.h> -+#include <stdio.h> -+#include <sys/types.h> -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#else -+# ifdef HAVE_MALLOC_H -+# include <malloc.h> -+# else -+void free (); -+# endif -+#endif -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# include <string.h> -+#else -+# include <strings.h> -+# ifndef memcpy -+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -+# endif -+#endif -+#if !HAVE_STRCHR && !defined _LIBC -+# ifndef strchr -+# define strchr index -+# endif -+#endif -+ -+#if defined HAVE_UNISTD_H || defined _LIBC -+# include <unistd.h> -+#endif -+ -+#include "gettext.h" -+#include "gettextP.h" -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+ -+/* @@ end of prolog @@ */ -+/* List of already loaded domains. */ -+static struct loaded_l10nfile *_nl_loaded_domains; -+ -+ -+/* Return a data structure describing the message catalog described by -+ the DOMAINNAME and CATEGORY parameters with respect to the currently -+ established bindings. */ -+struct loaded_l10nfile * -+internal_function -+_nl_find_domain (dirname, locale, domainname) -+ const char *dirname; -+ char *locale; -+ const char *domainname; -+{ -+ struct loaded_l10nfile *retval; -+ const char *language; -+ const char *modifier; -+ const char *territory; -+ const char *codeset; -+ const char *normalized_codeset; -+ const char *special; -+ const char *sponsor; -+ const char *revision; -+ const char *alias_value; -+ int mask; -+ -+ /* LOCALE can consist of up to four recognized parts for the XPG syntax: -+ -+ language[_territory[.codeset]][@modifier] -+ -+ and six parts for the CEN syntax: -+ -+ language[_territory][+audience][+special][,[sponsor][_revision]] -+ -+ Beside the first part all of them are allowed to be missing. If -+ the full specified locale is not found, the less specific one are -+ looked for. The various parts will be stripped off according to -+ the following order: -+ (1) revision -+ (2) sponsor -+ (3) special -+ (4) codeset -+ (5) normalized codeset -+ (6) territory -+ (7) audience/modifier -+ */ -+ -+ /* If we have already tested for this locale entry there has to -+ be one data set in the list of loaded domains. */ -+ retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, -+ strlen (dirname) + 1, 0, locale, NULL, NULL, -+ NULL, NULL, NULL, NULL, NULL, domainname, 0); -+ if (retval != NULL) -+ { -+ /* We know something about this locale. */ -+ int cnt; -+ -+ if (retval->decided == 0) -+ _nl_load_domain (retval); -+ -+ if (retval->data != NULL) -+ return retval; -+ -+ for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) -+ { -+ if (retval->successor[cnt]->decided == 0) -+ _nl_load_domain (retval->successor[cnt]); -+ -+ if (retval->successor[cnt]->data != NULL) -+ break; -+ } -+ return cnt >= 0 ? retval : NULL; -+ /* NOTREACHED */ -+ } -+ -+ /* See whether the locale value is an alias. If yes its value -+ *overwrites* the alias name. No test for the original value is -+ done. */ -+ alias_value = _nl_expand_alias (locale); -+ if (alias_value != NULL) -+ { -+#if defined _LIBC || defined HAVE_STRDUP -+ locale = strdup (alias_value); -+ if (locale == NULL) -+ return NULL; -+#else -+ size_t len = strlen (alias_value) + 1; -+ locale = (char *) malloc (len); -+ if (locale == NULL) -+ return NULL; -+ -+ memcpy (locale, alias_value, len); -+#endif -+ } -+ -+ /* Now we determine the single parts of the locale name. First -+ look for the language. Termination symbols are `_' and `@' if -+ we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */ -+ mask = _nl_explode_name (locale, &language, &modifier, &territory, -+ &codeset, &normalized_codeset, &special, -+ &sponsor, &revision); -+ -+ /* Create all possible locale entries which might be interested in -+ generalization. */ -+ retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, -+ strlen (dirname) + 1, mask, language, territory, -+ codeset, normalized_codeset, modifier, special, -+ sponsor, revision, domainname, 1); -+ if (retval == NULL) -+ /* This means we are out of core. */ -+ return NULL; -+ -+ if (retval->decided == 0) -+ _nl_load_domain (retval); -+ if (retval->data == NULL) -+ { -+ int cnt; -+ for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) -+ { -+ if (retval->successor[cnt]->decided == 0) -+ _nl_load_domain (retval->successor[cnt]); -+ if (retval->successor[cnt]->data != NULL) -+ break; -+ } -+ } -+ -+ /* The room for an alias was dynamically allocated. Free it now. */ -+ if (alias_value != NULL) -+ free (locale); -+ -+ return retval; -+} -+ -+ -+#ifdef _LIBC -+static void __attribute__ ((unused)) -+free_mem (void) -+{ -+ struct loaded_l10nfile *runp = _nl_loaded_domains; -+ -+ while (runp != NULL) -+ { -+ struct loaded_l10nfile *here = runp; -+ if (runp->data != NULL) -+ _nl_unload_domain ((struct loaded_domain *) runp->data); -+ runp = runp->next; -+ free (here); -+ } -+} -+ -+text_set_element (__libc_subfreeres, free_mem); -+#endif -diff -urP gtkhtml-0.8.3.orig/intl/gettext.c gtkhtml-0.8.3/intl/gettext.c ---- gtkhtml-0.8.3.orig/intl/gettext.c Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/gettext.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,70 @@ -+/* Implementation of gettext(3) function. -+ Copyright (C) 1995, 1997 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#ifdef _LIBC -+# define __need_NULL -+# include <stddef.h> -+#else -+# ifdef STDC_HEADERS -+# include <stdlib.h> /* Just for NULL. */ -+# else -+# ifdef HAVE_STRING_H -+# include <string.h> -+# else -+# define NULL ((void *) 0) -+# endif -+# endif -+#endif -+ -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+/* Names for the libintl functions are a problem. They must not clash -+ with existing names and they should follow ANSI C. But this source -+ code is also used in GNU C Library where the names have a __ -+ prefix. So we have to make a difference here. */ -+#ifdef _LIBC -+# define GETTEXT __gettext -+# define DGETTEXT __dgettext -+#else -+# define GETTEXT gettext__ -+# define DGETTEXT dgettext__ -+#endif -+ -+/* Look up MSGID in the current default message catalog for the current -+ LC_MESSAGES locale. If not found, returns MSGID itself (the default -+ text). */ -+char * -+GETTEXT (msgid) -+ const char *msgid; -+{ -+ return DGETTEXT (NULL, msgid); -+} -+ -+#ifdef _LIBC -+/* Alias for function name in GNU C Library. */ -+weak_alias (__gettext, gettext); -+#endif -diff -urP gtkhtml-0.8.3.orig/intl/gettext.h gtkhtml-0.8.3/intl/gettext.h ---- gtkhtml-0.8.3.orig/intl/gettext.h Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/gettext.h Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,105 @@ -+/* Internal header for GNU gettext internationalization functions. -+ Copyright (C) 1995, 1997 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 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. */ -+ -+#ifndef _GETTEXT_H -+#define _GETTEXT_H 1 -+ -+#include <stdio.h> -+ -+#if HAVE_LIMITS_H || _LIBC -+# include <limits.h> -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+/* The magic number of the GNU message catalog format. */ -+#define _MAGIC 0x950412de -+#define _MAGIC_SWAPPED 0xde120495 -+ -+/* Revision number of the currently used .mo (binary) file format. */ -+#define MO_REVISION_NUMBER 0 -+ -+/* The following contortions are an attempt to use the C preprocessor -+ to determine an unsigned integral type that is 32 bits wide. An -+ alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but -+ doing that would require that the configure script compile and *run* -+ the resulting executable. Locally running cross-compiled executables -+ is usually not possible. */ -+ -+#if __STDC__ -+# define UINT_MAX_32_BITS 4294967295U -+#else -+# define UINT_MAX_32_BITS 0xFFFFFFFF -+#endif -+ -+/* If UINT_MAX isn't defined, assume it's a 32-bit type. -+ This should be valid for all systems GNU cares about because -+ that doesn't include 16-bit systems, and only modern systems -+ (that certainly have <limits.h>) have 64+-bit integral types. */ -+ -+#ifndef UINT_MAX -+# define UINT_MAX UINT_MAX_32_BITS -+#endif -+ -+#if UINT_MAX == UINT_MAX_32_BITS -+typedef unsigned nls_uint32; -+#else -+# if USHRT_MAX == UINT_MAX_32_BITS -+typedef unsigned short nls_uint32; -+# else -+# if ULONG_MAX == UINT_MAX_32_BITS -+typedef unsigned long nls_uint32; -+# else -+ /* The following line is intended to throw an error. Using #error is -+ not portable enough. */ -+ "Cannot determine unsigned 32-bit data type." -+# endif -+# endif -+#endif -+ -+ -+/* Header for binary .mo file format. */ -+struct mo_file_header -+{ -+ /* The magic number. */ -+ nls_uint32 magic; -+ /* The revision number of the file format. */ -+ nls_uint32 revision; -+ /* The number of strings pairs. */ -+ nls_uint32 nstrings; -+ /* Offset of table with start offsets of original strings. */ -+ nls_uint32 orig_tab_offset; -+ /* Offset of table with start offsets of translation strings. */ -+ nls_uint32 trans_tab_offset; -+ /* Size of hashing table. */ -+ nls_uint32 hash_tab_size; -+ /* Offset of first hashing entry. */ -+ nls_uint32 hash_tab_offset; -+}; -+ -+struct string_desc -+{ -+ /* Length of addressed string. */ -+ nls_uint32 length; -+ /* Offset of string in file. */ -+ nls_uint32 offset; -+}; -+ -+/* @@ begin of epilog @@ */ -+ -+#endif /* gettext.h */ -diff -urP gtkhtml-0.8.3.orig/intl/gettextP.h gtkhtml-0.8.3/intl/gettextP.h ---- gtkhtml-0.8.3.orig/intl/gettextP.h Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/gettextP.h Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,89 @@ -+/* Header describing internals of gettext library -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifndef _GETTEXTP_H -+#define _GETTEXTP_H -+ -+#include "loadinfo.h" -+ -+/* @@ end of prolog @@ */ -+ -+#ifndef PARAMS -+# if __STDC__ -+# define PARAMS(args) args -+# else -+# define PARAMS(args) () -+# endif -+#endif -+ -+#ifndef internal_function -+# define internal_function -+#endif -+ -+#ifndef W -+# define W(flag, data) ((flag) ? SWAP (data) : (data)) -+#endif -+ -+ -+#ifdef _LIBC -+# include <byteswap.h> -+# define SWAP(i) bswap_32 (i) -+#else -+static nls_uint32 SWAP PARAMS ((nls_uint32 i)); -+ -+static inline nls_uint32 -+SWAP (i) -+ nls_uint32 i; -+{ -+ return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24); -+} -+#endif -+ -+ -+struct loaded_domain -+{ -+ const char *data; -+ int use_mmap; -+ size_t mmap_size; -+ int must_swap; -+ nls_uint32 nstrings; -+ struct string_desc *orig_tab; -+ struct string_desc *trans_tab; -+ nls_uint32 hash_size; -+ nls_uint32 *hash_tab; -+}; -+ -+struct binding -+{ -+ struct binding *next; -+ char *domainname; -+ char *dirname; -+}; -+ -+struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname, -+ char *__locale, -+ const char *__domainname)) -+ internal_function; -+void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain)) -+ internal_function; -+void _nl_unload_domain PARAMS ((struct loaded_domain *__domain)) -+ internal_function; -+ -+/* @@ begin of epilog @@ */ -+ -+#endif /* gettextP.h */ -diff -urP gtkhtml-0.8.3.orig/intl/hash-string.h gtkhtml-0.8.3/intl/hash-string.h ---- gtkhtml-0.8.3.orig/intl/hash-string.h Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/hash-string.h Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,59 @@ -+/* Implements a string hashing function. -+ Copyright (C) 1995, 1997 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 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. */ -+ -+/* @@ end of prolog @@ */ -+ -+#ifndef PARAMS -+# if __STDC__ -+# define PARAMS(Args) Args -+# else -+# define PARAMS(Args) () -+# endif -+#endif -+ -+/* We assume to have `unsigned long int' value with at least 32 bits. */ -+#define HASHWORDBITS 32 -+ -+ -+/* Defines the so called `hashpjw' function by P.J. Weinberger -+ [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools, -+ 1986, 1987 Bell Telephone Laboratories, Inc.] */ -+static unsigned long hash_string PARAMS ((const char *__str_param)); -+ -+static inline unsigned long -+hash_string (str_param) -+ const char *str_param; -+{ -+ unsigned long int hval, g; -+ const char *str = str_param; -+ -+ /* Compute the hash value for the given string. */ -+ hval = 0; -+ while (*str != '\0') -+ { -+ hval <<= 4; -+ hval += (unsigned long) *str++; -+ g = hval & ((unsigned long) 0xf << (HASHWORDBITS - 4)); -+ if (g != 0) -+ { -+ hval ^= g >> (HASHWORDBITS - 8); -+ hval ^= g; -+ } -+ } -+ return hval; -+} -diff -urP gtkhtml-0.8.3.orig/intl/intl-compat.c gtkhtml-0.8.3/intl/intl-compat.c ---- gtkhtml-0.8.3.orig/intl/intl-compat.c Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/intl-compat.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,76 @@ -+/* intl-compat.c - Stub functions to call gettext functions from GNU gettext -+ Library. -+ Copyright (C) 1995 Software Foundation, Inc. -+ -+This program is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 2, or (at your option) -+any later version. -+ -+This program 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 General Public License for more details. -+ -+You should have received a copy of the GNU General Public License -+along with this program; if not, write to the Free Software -+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include "libgettext.h" -+ -+/* @@ end of prolog @@ */ -+ -+ -+#undef gettext -+#undef dgettext -+#undef dcgettext -+#undef textdomain -+#undef bindtextdomain -+ -+ -+char * -+bindtextdomain (domainname, dirname) -+ const char *domainname; -+ const char *dirname; -+{ -+ return bindtextdomain__ (domainname, dirname); -+} -+ -+ -+char * -+dcgettext (domainname, msgid, category) -+ const char *domainname; -+ const char *msgid; -+ int category; -+{ -+ return dcgettext__ (domainname, msgid, category); -+} -+ -+ -+char * -+dgettext (domainname, msgid) -+ const char *domainname; -+ const char *msgid; -+{ -+ return dgettext__ (domainname, msgid); -+} -+ -+ -+char * -+gettext (msgid) -+ const char *msgid; -+{ -+ return gettext__ (msgid); -+} -+ -+ -+char * -+textdomain (domainname) -+ const char *domainname; -+{ -+ return textdomain__ (domainname); -+} -diff -urP gtkhtml-0.8.3.orig/intl/l10nflist.c gtkhtml-0.8.3/intl/l10nflist.c ---- gtkhtml-0.8.3.orig/intl/l10nflist.c Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/l10nflist.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,411 @@ -+/* Handle list of needed message catalogs -+ Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. -+ Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# ifndef _GNU_SOURCE -+# define _GNU_SOURCE 1 -+# endif -+# include <string.h> -+#else -+# include <strings.h> -+# ifndef memcpy -+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -+# endif -+#endif -+#if !HAVE_STRCHR && !defined _LIBC -+# ifndef strchr -+# define strchr index -+# endif -+#endif -+ -+#if defined _LIBC || defined HAVE_ARGZ_H -+# include <argz.h> -+#endif -+#include <ctype.h> -+#include <sys/types.h> -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#endif -+ -+#include "loadinfo.h" -+ -+/* On some strange systems still no definition of NULL is found. Sigh! */ -+#ifndef NULL -+# if defined __STDC__ && __STDC__ -+# define NULL ((void *) 0) -+# else -+# define NULL 0 -+# endif -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+#ifdef _LIBC -+/* Rename the non ANSI C functions. This is required by the standard -+ because some ANSI C functions will require linking with this object -+ file and the name space must not be polluted. */ -+# ifndef stpcpy -+# define stpcpy(dest, src) __stpcpy(dest, src) -+# endif -+#else -+# ifndef HAVE_STPCPY -+static char *stpcpy PARAMS ((char *dest, const char *src)); -+# endif -+#endif -+ -+/* Define function which are usually not available. */ -+ -+#if !defined _LIBC && !defined HAVE___ARGZ_COUNT -+/* Returns the number of strings in ARGZ. */ -+static size_t argz_count__ PARAMS ((const char *argz, size_t len)); -+ -+static size_t -+argz_count__ (argz, len) -+ const char *argz; -+ size_t len; -+{ -+ size_t count = 0; -+ while (len > 0) -+ { -+ size_t part_len = strlen (argz); -+ argz += part_len + 1; -+ len -= part_len + 1; -+ count++; -+ } -+ return count; -+} -+# undef __argz_count -+# define __argz_count(argz, len) argz_count__ (argz, len) -+#endif /* !_LIBC && !HAVE___ARGZ_COUNT */ -+ -+#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY -+/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's -+ except the last into the character SEP. */ -+static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep)); -+ -+static void -+argz_stringify__ (argz, len, sep) -+ char *argz; -+ size_t len; -+ int sep; -+{ -+ while (len > 0) -+ { -+ size_t part_len = strlen (argz); -+ argz += part_len; -+ len -= part_len + 1; -+ if (len > 0) -+ *argz++ = sep; -+ } -+} -+# undef __argz_stringify -+# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep) -+#endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */ -+ -+#if !defined _LIBC && !defined HAVE___ARGZ_NEXT -+static char *argz_next__ PARAMS ((char *argz, size_t argz_len, -+ const char *entry)); -+ -+static char * -+argz_next__ (argz, argz_len, entry) -+ char *argz; -+ size_t argz_len; -+ const char *entry; -+{ -+ if (entry) -+ { -+ if (entry < argz + argz_len) -+ entry = strchr (entry, '\0') + 1; -+ -+ return entry >= argz + argz_len ? NULL : (char *) entry; -+ } -+ else -+ if (argz_len > 0) -+ return argz; -+ else -+ return 0; -+} -+# undef __argz_next -+# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry) -+#endif /* !_LIBC && !HAVE___ARGZ_NEXT */ -+ -+ -+/* Return number of bits set in X. */ -+static int pop PARAMS ((int x)); -+ -+static inline int -+pop (x) -+ int x; -+{ -+ /* We assume that no more than 16 bits are used. */ -+ x = ((x & ~0x5555) >> 1) + (x & 0x5555); -+ x = ((x & ~0x3333) >> 2) + (x & 0x3333); -+ x = ((x >> 4) + x) & 0x0f0f; -+ x = ((x >> 8) + x) & 0xff; -+ -+ return x; -+} -+ -+ -+struct loaded_l10nfile * -+_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language, -+ territory, codeset, normalized_codeset, modifier, special, -+ sponsor, revision, filename, do_allocate) -+ struct loaded_l10nfile **l10nfile_list; -+ const char *dirlist; -+ size_t dirlist_len; -+ int mask; -+ const char *language; -+ const char *territory; -+ const char *codeset; -+ const char *normalized_codeset; -+ const char *modifier; -+ const char *special; -+ const char *sponsor; -+ const char *revision; -+ const char *filename; -+ int do_allocate; -+{ -+ char *abs_filename; -+ struct loaded_l10nfile *last = NULL; -+ struct loaded_l10nfile *retval; -+ char *cp; -+ size_t entries; -+ int cnt; -+ -+ /* Allocate room for the full file name. */ -+ abs_filename = (char *) malloc (dirlist_len -+ + strlen (language) -+ + ((mask & TERRITORY) != 0 -+ ? strlen (territory) + 1 : 0) -+ + ((mask & XPG_CODESET) != 0 -+ ? strlen (codeset) + 1 : 0) -+ + ((mask & XPG_NORM_CODESET) != 0 -+ ? strlen (normalized_codeset) + 1 : 0) -+ + (((mask & XPG_MODIFIER) != 0 -+ || (mask & CEN_AUDIENCE) != 0) -+ ? strlen (modifier) + 1 : 0) -+ + ((mask & CEN_SPECIAL) != 0 -+ ? strlen (special) + 1 : 0) -+ + (((mask & CEN_SPONSOR) != 0 -+ || (mask & CEN_REVISION) != 0) -+ ? (1 + ((mask & CEN_SPONSOR) != 0 -+ ? strlen (sponsor) + 1 : 0) -+ + ((mask & CEN_REVISION) != 0 -+ ? strlen (revision) + 1 : 0)) : 0) -+ + 1 + strlen (filename) + 1); -+ -+ if (abs_filename == NULL) -+ return NULL; -+ -+ retval = NULL; -+ last = NULL; -+ -+ /* Construct file name. */ -+ memcpy (abs_filename, dirlist, dirlist_len); -+ __argz_stringify (abs_filename, dirlist_len, ':'); -+ cp = abs_filename + (dirlist_len - 1); -+ *cp++ = '/'; -+ cp = stpcpy (cp, language); -+ -+ if ((mask & TERRITORY) != 0) -+ { -+ *cp++ = '_'; -+ cp = stpcpy (cp, territory); -+ } -+ if ((mask & XPG_CODESET) != 0) -+ { -+ *cp++ = '.'; -+ cp = stpcpy (cp, codeset); -+ } -+ if ((mask & XPG_NORM_CODESET) != 0) -+ { -+ *cp++ = '.'; -+ cp = stpcpy (cp, normalized_codeset); -+ } -+ if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0) -+ { -+ /* This component can be part of both syntaces but has different -+ leading characters. For CEN we use `+', else `@'. */ -+ *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@'; -+ cp = stpcpy (cp, modifier); -+ } -+ if ((mask & CEN_SPECIAL) != 0) -+ { -+ *cp++ = '+'; -+ cp = stpcpy (cp, special); -+ } -+ if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0) -+ { -+ *cp++ = ','; -+ if ((mask & CEN_SPONSOR) != 0) -+ cp = stpcpy (cp, sponsor); -+ if ((mask & CEN_REVISION) != 0) -+ { -+ *cp++ = '_'; -+ cp = stpcpy (cp, revision); -+ } -+ } -+ -+ *cp++ = '/'; -+ stpcpy (cp, filename); -+ -+ /* Look in list of already loaded domains whether it is already -+ available. */ -+ last = NULL; -+ for (retval = *l10nfile_list; retval != NULL; retval = retval->next) -+ if (retval->filename != NULL) -+ { -+ int compare = strcmp (retval->filename, abs_filename); -+ if (compare == 0) -+ /* We found it! */ -+ break; -+ if (compare < 0) -+ { -+ /* It's not in the list. */ -+ retval = NULL; -+ break; -+ } -+ -+ last = retval; -+ } -+ -+ if (retval != NULL || do_allocate == 0) -+ { -+ free (abs_filename); -+ return retval; -+ } -+ -+ retval = (struct loaded_l10nfile *) -+ malloc (sizeof (*retval) + (__argz_count (dirlist, dirlist_len) -+ * (1 << pop (mask)) -+ * sizeof (struct loaded_l10nfile *))); -+ if (retval == NULL) -+ return NULL; -+ -+ retval->filename = abs_filename; -+ retval->decided = (__argz_count (dirlist, dirlist_len) != 1 -+ || ((mask & XPG_CODESET) != 0 -+ && (mask & XPG_NORM_CODESET) != 0)); -+ retval->data = NULL; -+ -+ if (last == NULL) -+ { -+ retval->next = *l10nfile_list; -+ *l10nfile_list = retval; -+ } -+ else -+ { -+ retval->next = last->next; -+ last->next = retval; -+ } -+ -+ entries = 0; -+ /* If the DIRLIST is a real list the RETVAL entry corresponds not to -+ a real file. So we have to use the DIRLIST separation mechanism -+ of the inner loop. */ -+ cnt = __argz_count (dirlist, dirlist_len) == 1 ? mask - 1 : mask; -+ for (; cnt >= 0; --cnt) -+ if ((cnt & ~mask) == 0 -+ && ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0) -+ && ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0)) -+ { -+ /* Iterate over all elements of the DIRLIST. */ -+ char *dir = NULL; -+ -+ while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir)) -+ != NULL) -+ retval->successor[entries++] -+ = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, cnt, -+ language, territory, codeset, -+ normalized_codeset, modifier, special, -+ sponsor, revision, filename, 1); -+ } -+ retval->successor[entries] = NULL; -+ -+ return retval; -+} -+ -+/* Normalize codeset name. There is no standard for the codeset -+ names. Normalization allows the user to use any of the common -+ names. */ -+const char * -+_nl_normalize_codeset (codeset, name_len) -+ const unsigned char *codeset; -+ size_t name_len; -+{ -+ int len = 0; -+ int only_digit = 1; -+ char *retval; -+ char *wp; -+ size_t cnt; -+ -+ for (cnt = 0; cnt < name_len; ++cnt) -+ if (isalnum (codeset[cnt])) -+ { -+ ++len; -+ -+ if (isalpha (codeset[cnt])) -+ only_digit = 0; -+ } -+ -+ retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1); -+ -+ if (retval != NULL) -+ { -+ if (only_digit) -+ wp = stpcpy (retval, "iso"); -+ else -+ wp = retval; -+ -+ for (cnt = 0; cnt < name_len; ++cnt) -+ if (isalpha (codeset[cnt])) -+ *wp++ = tolower (codeset[cnt]); -+ else if (isdigit (codeset[cnt])) -+ *wp++ = codeset[cnt]; -+ -+ *wp = '\0'; -+ } -+ -+ return (const char *) retval; -+} -+ -+ -+/* @@ begin of epilog @@ */ -+ -+/* We don't want libintl.a to depend on any other library. So we -+ avoid the non-standard function stpcpy. In GNU C Library this -+ function is available, though. Also allow the symbol HAVE_STPCPY -+ to be defined. */ -+#if !_LIBC && !HAVE_STPCPY -+static char * -+stpcpy (dest, src) -+ char *dest; -+ const char *src; -+{ -+ while ((*dest++ = *src++) != '\0') -+ /* Do nothing. */ ; -+ return dest - 1; -+} -+#endif -diff -urP gtkhtml-0.8.3.orig/intl/libgettext.h gtkhtml-0.8.3/intl/libgettext.h ---- gtkhtml-0.8.3.orig/intl/libgettext.h Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/libgettext.h Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,182 @@ -+/* Message catalogs for internationalization. -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+/* Because on some systems (e.g. Solaris) we sometimes have to include -+ the systems libintl.h as well as this file we have more complex -+ include protection above. But the systems header might perhaps also -+ define _LIBINTL_H and therefore we have to protect the definition here. */ -+ -+#if !defined _LIBINTL_H || !defined _LIBGETTEXT_H -+#ifndef _LIBINTL_H -+# define _LIBINTL_H 1 -+#endif -+#define _LIBGETTEXT_H 1 -+ -+/* We define an additional symbol to signal that we use the GNU -+ implementation of gettext. */ -+#define __USE_GNU_GETTEXT 1 -+ -+#include <sys/types.h> -+ -+#if HAVE_LOCALE_H -+# include <locale.h> -+#endif -+ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+#ifndef PARAMS -+# if __STDC__ || defined __cplusplus -+# define PARAMS(args) args -+# else -+# define PARAMS(args) () -+# endif -+#endif -+ -+#ifndef NULL -+# if !defined __cplusplus || defined __GNUC__ -+# define NULL ((void *) 0) -+# else -+# define NULL (0) -+# endif -+#endif -+ -+#if !HAVE_LC_MESSAGES -+/* This value determines the behaviour of the gettext() and dgettext() -+ function. But some system does not have this defined. Define it -+ to a default value. */ -+# define LC_MESSAGES (-1) -+#endif -+ -+ -+/* Declarations for gettext-using-catgets interface. Derived from -+ Jim Meyering's libintl.h. */ -+struct _msg_ent -+{ -+ const char *_msg; -+ int _msg_number; -+}; -+ -+ -+#if HAVE_CATGETS -+/* These two variables are defined in the automatically by po-to-tbl.sed -+ generated file `cat-id-tbl.c'. */ -+extern const struct _msg_ent _msg_tbl[]; -+extern int _msg_tbl_length; -+#endif -+ -+ -+/* For automatical extraction of messages sometimes no real -+ translation is needed. Instead the string itself is the result. */ -+#define gettext_noop(Str) (Str) -+ -+/* Look up MSGID in the current default message catalog for the current -+ LC_MESSAGES locale. If not found, returns MSGID itself (the default -+ text). */ -+extern char *gettext PARAMS ((const char *__msgid)); -+extern char *gettext__ PARAMS ((const char *__msgid)); -+ -+/* Look up MSGID in the DOMAINNAME message catalog for the current -+ LC_MESSAGES locale. */ -+extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid)); -+extern char *dgettext__ PARAMS ((const char *__domainname, -+ const char *__msgid)); -+ -+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY -+ locale. */ -+extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid, -+ int __category)); -+extern char *dcgettext__ PARAMS ((const char *__domainname, -+ const char *__msgid, int __category)); -+ -+ -+/* Set the current default message catalog to DOMAINNAME. -+ If DOMAINNAME is null, return the current default. -+ If DOMAINNAME is "", reset to the default of "messages". */ -+extern char *textdomain PARAMS ((const char *__domainname)); -+extern char *textdomain__ PARAMS ((const char *__domainname)); -+ -+/* Specify that the DOMAINNAME message catalog will be found -+ in DIRNAME rather than in the system locale data base. */ -+extern char *bindtextdomain PARAMS ((const char *__domainname, -+ const char *__dirname)); -+extern char *bindtextdomain__ PARAMS ((const char *__domainname, -+ const char *__dirname)); -+ -+#if ENABLE_NLS -+ -+/* Solaris 2.3 has the gettext function but dcgettext is missing. -+ So we omit this optimization for Solaris 2.3. BTW, Solaris 2.4 -+ has dcgettext. */ -+# if !HAVE_CATGETS && (!HAVE_GETTEXT || HAVE_DCGETTEXT) -+ -+# define gettext(Msgid) \ -+ dgettext (NULL, Msgid) -+ -+# define dgettext(Domainname, Msgid) \ -+ dcgettext (Domainname, Msgid, LC_MESSAGES) -+ -+# if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ >= 7 -+/* This global variable is defined in loadmsgcat.c. We need a sign, -+ whether a new catalog was loaded, which can be associated with all -+ translations. */ -+extern int _nl_msg_cat_cntr; -+ -+# define dcgettext(Domainname, Msgid, Category) \ -+ (__extension__ \ -+ ({ \ -+ char *__result; \ -+ if (__builtin_constant_p (Msgid)) \ -+ { \ -+ static char *__translation__; \ -+ static int __catalog_counter__; \ -+ if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr) \ -+ { \ -+ __translation__ = \ -+ dcgettext__ (Domainname, Msgid, Category); \ -+ __catalog_counter__ = _nl_msg_cat_cntr; \ -+ } \ -+ __result = __translation__; \ -+ } \ -+ else \ -+ __result = dcgettext__ (Domainname, Msgid, Category); \ -+ __result; \ -+ })) -+# endif -+# endif -+ -+#else -+ -+# define gettext(Msgid) (Msgid) -+# define dgettext(Domainname, Msgid) (Msgid) -+# define dcgettext(Domainname, Msgid, Category) (Msgid) -+# define textdomain(Domainname) ((char *) Domainname) -+# define bindtextdomain(Domainname, Dirname) ((char *) Dirname) -+ -+#endif -+ -+/* @@ begin of epilog @@ */ -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif -diff -urP gtkhtml-0.8.3.orig/intl/linux-msg.sed gtkhtml-0.8.3/intl/linux-msg.sed ---- gtkhtml-0.8.3.orig/intl/linux-msg.sed Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/linux-msg.sed Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,100 @@ -+# po2msg.sed - Convert Uniforum style .po file to Linux style .msg file -+# Copyright (C) 1995 Free Software Foundation, Inc. -+# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+# -+# This program 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 General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+# -+# The first directive in the .msg should be the definition of the -+# message set number. We use always set number 1. -+# -+1 { -+ i\ -+$set 1 # Automatically created by po2msg.sed -+ h -+ s/.*/0/ -+ x -+} -+# -+# Mitch's old catalog format does not allow comments. -+# -+# We copy the original message as a comment into the .msg file. -+# -+/^msgid/ { -+ s/msgid[ ]*"// -+# -+# This does not work now with the new format. -+# /"$/! { -+# s/\\$// -+# s/$/ ... (more lines following)"/ -+# } -+ x -+# The following nice solution is by -+# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de> -+ td -+# Increment a decimal number in pattern space. -+# First hide trailing `9' digits. -+ :d -+ s/9\(_*\)$/_\1/ -+ td -+# Assure at least one digit is available. -+ s/^\(_*\)$/0\1/ -+# Increment the last digit. -+ s/8\(_*\)$/9\1/ -+ s/7\(_*\)$/8\1/ -+ s/6\(_*\)$/7\1/ -+ s/5\(_*\)$/6\1/ -+ s/4\(_*\)$/5\1/ -+ s/3\(_*\)$/4\1/ -+ s/2\(_*\)$/3\1/ -+ s/1\(_*\)$/2\1/ -+ s/0\(_*\)$/1\1/ -+# Convert the hidden `9' digits to `0's. -+ s/_/0/g -+ x -+ G -+ s/\(.*\)"\n\([0-9]*\)/$ #\2 Original Message:(\1)/p -+} -+# -+# The .msg file contains, other then the .po file, only the translations -+# but each given a unique ID. Starting from 1 and incrementing by 1 for -+# each message we assign them to the messages. -+# It is important that the .po file used to generate the cat-id-tbl.c file -+# (with po-to-tbl) is the same as the one used here. (At least the order -+# of declarations must not be changed.) -+# -+/^msgstr/ { -+ s/msgstr[ ]*"\(.*\)"/# \1/ -+# Clear substitution flag. -+ tb -+# Append the next line. -+ :b -+ N -+# Look whether second part is continuation line. -+ s/\(.*\n\)"\(.*\)"/\1\2/ -+# Yes, then branch. -+ ta -+ P -+ D -+# Note that D includes a jump to the start!! -+# We found a continuation line. But before printing insert '\'. -+ :a -+ s/\(.*\)\(\n.*\)/\1\\\2/ -+ P -+# We cannot use D here. -+ s/.*\n\(.*\)/\1/ -+ tb -+} -+d -diff -urP gtkhtml-0.8.3.orig/intl/loadinfo.h gtkhtml-0.8.3/intl/loadinfo.h ---- gtkhtml-0.8.3.orig/intl/loadinfo.h Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/loadinfo.h Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,76 @@ -+/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifndef PARAMS -+# if __STDC__ -+# define PARAMS(args) args -+# else -+# define PARAMS(args) () -+# endif -+#endif -+ -+/* Encoding of locale name parts. */ -+#define CEN_REVISION 1 -+#define CEN_SPONSOR 2 -+#define CEN_SPECIAL 4 -+#define XPG_NORM_CODESET 8 -+#define XPG_CODESET 16 -+#define TERRITORY 32 -+#define CEN_AUDIENCE 64 -+#define XPG_MODIFIER 128 -+ -+#define CEN_SPECIFIC (CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE) -+#define XPG_SPECIFIC (XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER) -+ -+ -+struct loaded_l10nfile -+{ -+ const char *filename; -+ int decided; -+ -+ const void *data; -+ -+ struct loaded_l10nfile *next; -+ struct loaded_l10nfile *successor[1]; -+}; -+ -+ -+extern const char *_nl_normalize_codeset PARAMS ((const unsigned char *codeset, -+ size_t name_len)); -+ -+extern struct loaded_l10nfile * -+_nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list, -+ const char *dirlist, size_t dirlist_len, int mask, -+ const char *language, const char *territory, -+ const char *codeset, -+ const char *normalized_codeset, -+ const char *modifier, const char *special, -+ const char *sponsor, const char *revision, -+ const char *filename, int do_allocate)); -+ -+ -+extern const char *_nl_expand_alias PARAMS ((const char *name)); -+ -+extern int _nl_explode_name PARAMS ((char *name, const char **language, -+ const char **modifier, -+ const char **territory, -+ const char **codeset, -+ const char **normalized_codeset, -+ const char **special, -+ const char **sponsor, -+ const char **revision)); -diff -urP gtkhtml-0.8.3.orig/intl/loadmsgcat.c gtkhtml-0.8.3/intl/loadmsgcat.c ---- gtkhtml-0.8.3.orig/intl/loadmsgcat.c Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/loadmsgcat.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,222 @@ -+/* Load needed message catalogs. -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <fcntl.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#endif -+ -+#if defined HAVE_UNISTD_H || defined _LIBC -+# include <unistd.h> -+#endif -+ -+#if (defined HAVE_MMAP && defined HAVE_MUNMAP) || defined _LIBC -+# include <sys/mman.h> -+#endif -+ -+#include "gettext.h" -+#include "gettextP.h" -+ -+/* @@ end of prolog @@ */ -+ -+#ifdef _LIBC -+/* Rename the non ISO C functions. This is required by the standard -+ because some ISO C functions will require linking with this object -+ file and the name space must not be polluted. */ -+# define open __open -+# define close __close -+# define read __read -+# define mmap __mmap -+# define munmap __munmap -+#endif -+ -+/* We need a sign, whether a new catalog was loaded, which can be associated -+ with all translations. This is important if the translations are -+ cached by one of GCC's features. */ -+int _nl_msg_cat_cntr = 0; -+ -+ -+/* Load the message catalogs specified by FILENAME. If it is no valid -+ message catalog do nothing. */ -+void -+internal_function -+_nl_load_domain (domain_file) -+ struct loaded_l10nfile *domain_file; -+{ -+ int fd; -+ size_t size; -+ struct stat st; -+ struct mo_file_header *data = (struct mo_file_header *) -1; -+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ -+ || defined _LIBC -+ int use_mmap = 0; -+#endif -+ struct loaded_domain *domain; -+ -+ domain_file->decided = 1; -+ domain_file->data = NULL; -+ -+ /* If the record does not represent a valid locale the FILENAME -+ might be NULL. This can happen when according to the given -+ specification the locale file name is different for XPG and CEN -+ syntax. */ -+ if (domain_file->filename == NULL) -+ return; -+ -+ /* Try to open the addressed file. */ -+ fd = open (domain_file->filename, O_RDONLY); -+ if (fd == -1) -+ return; -+ -+ /* We must know about the size of the file. */ -+ if (fstat (fd, &st) != 0 -+ || (size = (size_t) st.st_size) != st.st_size -+ || size < sizeof (struct mo_file_header)) -+ { -+ /* Something went wrong. */ -+ close (fd); -+ return; -+ } -+ -+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ -+ || defined _LIBC -+ /* Now we are ready to load the file. If mmap() is available we try -+ this first. If not available or it failed we try to load it. */ -+ data = (struct mo_file_header *) mmap (NULL, size, PROT_READ, -+ MAP_PRIVATE, fd, 0); -+ -+ if (data != (struct mo_file_header *) -1) -+ { -+ /* mmap() call was successful. */ -+ close (fd); -+ use_mmap = 1; -+ } -+#endif -+ -+ /* If the data is not yet available (i.e. mmap'ed) we try to load -+ it manually. */ -+ if (data == (struct mo_file_header *) -1) -+ { -+ size_t to_read; -+ char *read_ptr; -+ -+ data = (struct mo_file_header *) malloc (size); -+ if (data == NULL) -+ return; -+ -+ to_read = size; -+ read_ptr = (char *) data; -+ do -+ { -+ long int nb = (long int) read (fd, read_ptr, to_read); -+ if (nb == -1) -+ { -+ close (fd); -+ return; -+ } -+ -+ read_ptr += nb; -+ to_read -= nb; -+ } -+ while (to_read > 0); -+ -+ close (fd); -+ } -+ -+ /* Using the magic number we can test whether it really is a message -+ catalog file. */ -+ if (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED) -+ { -+ /* The magic number is wrong: not a message catalog file. */ -+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ -+ || defined _LIBC -+ if (use_mmap) -+ munmap ((caddr_t) data, size); -+ else -+#endif -+ free (data); -+ return; -+ } -+ -+ domain_file->data -+ = (struct loaded_domain *) malloc (sizeof (struct loaded_domain)); -+ if (domain_file->data == NULL) -+ return; -+ -+ domain = (struct loaded_domain *) domain_file->data; -+ domain->data = (char *) data; -+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ -+ || defined _LIBC -+ domain->use_mmap = use_mmap; -+#endif -+ domain->mmap_size = size; -+ domain->must_swap = data->magic != _MAGIC; -+ -+ /* Fill in the information about the available tables. */ -+ switch (W (domain->must_swap, data->revision)) -+ { -+ case 0: -+ domain->nstrings = W (domain->must_swap, data->nstrings); -+ domain->orig_tab = (struct string_desc *) -+ ((char *) data + W (domain->must_swap, data->orig_tab_offset)); -+ domain->trans_tab = (struct string_desc *) -+ ((char *) data + W (domain->must_swap, data->trans_tab_offset)); -+ domain->hash_size = W (domain->must_swap, data->hash_tab_size); -+ domain->hash_tab = (nls_uint32 *) -+ ((char *) data + W (domain->must_swap, data->hash_tab_offset)); -+ break; -+ default: -+ /* This is an illegal revision. */ -+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ -+ || defined _LIBC -+ if (use_mmap) -+ munmap ((caddr_t) data, size); -+ else -+#endif -+ free (data); -+ free (domain); -+ domain_file->data = NULL; -+ return; -+ } -+ -+ /* Show that one domain is changed. This might make some cached -+ translations invalid. */ -+ ++_nl_msg_cat_cntr; -+} -+ -+ -+#ifdef _LIBC -+void -+internal_function -+_nl_unload_domain (domain) -+ struct loaded_domain *domain; -+{ -+ if (domain->use_mmap) -+ munmap ((caddr_t) domain->data, domain->mmap_size); -+ else -+ free ((void *) domain->data); -+ -+ free (domain); -+} -+#endif -diff -urP gtkhtml-0.8.3.orig/intl/localealias.c gtkhtml-0.8.3/intl/localealias.c ---- gtkhtml-0.8.3.orig/intl/localealias.c Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/localealias.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,424 @@ -+/* Handle aliases for locale names. -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <ctype.h> -+#include <stdio.h> -+#include <sys/types.h> -+ -+#ifdef __GNUC__ -+# define alloca __builtin_alloca -+# define HAVE_ALLOCA 1 -+#else -+# if defined HAVE_ALLOCA_H || defined _LIBC -+# include <alloca.h> -+# else -+# ifdef _AIX -+ #pragma alloca -+# else -+# ifndef alloca -+char *alloca (); -+# endif -+# endif -+# endif -+#endif -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#else -+char *getenv (); -+# ifdef HAVE_MALLOC_H -+# include <malloc.h> -+# else -+void free (); -+# endif -+#endif -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# ifndef _GNU_SOURCE -+# define _GNU_SOURCE 1 -+# endif -+# include <string.h> -+#else -+# include <strings.h> -+# ifndef memcpy -+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -+# endif -+#endif -+#if !HAVE_STRCHR && !defined _LIBC -+# ifndef strchr -+# define strchr index -+# endif -+#endif -+ -+#include "gettext.h" -+#include "gettextP.h" -+ -+/* @@ end of prolog @@ */ -+ -+#ifdef _LIBC -+/* Rename the non ANSI C functions. This is required by the standard -+ because some ANSI C functions will require linking with this object -+ file and the name space must not be polluted. */ -+# define strcasecmp __strcasecmp -+ -+# define mempcpy __mempcpy -+# define HAVE_MEMPCPY 1 -+ -+/* We need locking here since we can be called from different places. */ -+# include <bits/libc-lock.h> -+ -+__libc_lock_define_initialized (static, lock); -+#endif -+ -+ -+/* For those loosing systems which don't have `alloca' we have to add -+ some additional code emulating it. */ -+#ifdef HAVE_ALLOCA -+/* Nothing has to be done. */ -+# define ADD_BLOCK(list, address) /* nothing */ -+# define FREE_BLOCKS(list) /* nothing */ -+#else -+struct block_list -+{ -+ void *address; -+ struct block_list *next; -+}; -+# define ADD_BLOCK(list, addr) \ -+ do { \ -+ struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \ -+ /* If we cannot get a free block we cannot add the new element to \ -+ the list. */ \ -+ if (newp != NULL) { \ -+ newp->address = (addr); \ -+ newp->next = (list); \ -+ (list) = newp; \ -+ } \ -+ } while (0) -+# define FREE_BLOCKS(list) \ -+ do { \ -+ while (list != NULL) { \ -+ struct block_list *old = list; \ -+ list = list->next; \ -+ free (old); \ -+ } \ -+ } while (0) -+# undef alloca -+# define alloca(size) (malloc (size)) -+#endif /* have alloca */ -+ -+ -+struct alias_map -+{ -+ const char *alias; -+ const char *value; -+}; -+ -+ -+static char *string_space = NULL; -+static size_t string_space_act = 0; -+static size_t string_space_max = 0; -+static struct alias_map *map; -+static size_t nmap = 0; -+static size_t maxmap = 0; -+ -+ -+/* Prototypes for local functions. */ -+static size_t read_alias_file PARAMS ((const char *fname, int fname_len)) -+ internal_function; -+static void extend_alias_table PARAMS ((void)); -+static int alias_compare PARAMS ((const struct alias_map *map1, -+ const struct alias_map *map2)); -+ -+ -+const char * -+_nl_expand_alias (name) -+ const char *name; -+{ -+ static const char *locale_alias_path = LOCALE_ALIAS_PATH; -+ struct alias_map *retval; -+ const char *result = NULL; -+ size_t added; -+ -+#ifdef _LIBC -+ __libc_lock_lock (lock); -+#endif -+ -+ do -+ { -+ struct alias_map item; -+ -+ item.alias = name; -+ -+ if (nmap > 0) -+ retval = (struct alias_map *) bsearch (&item, map, nmap, -+ sizeof (struct alias_map), -+ (int (*) PARAMS ((const void *, -+ const void *)) -+ ) alias_compare); -+ else -+ retval = NULL; -+ -+ /* We really found an alias. Return the value. */ -+ if (retval != NULL) -+ { -+ result = retval->value; -+ break; -+ } -+ -+ /* Perhaps we can find another alias file. */ -+ added = 0; -+ while (added == 0 && locale_alias_path[0] != '\0') -+ { -+ const char *start; -+ -+ while (locale_alias_path[0] == ':') -+ ++locale_alias_path; -+ start = locale_alias_path; -+ -+ while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ':') -+ ++locale_alias_path; -+ -+ if (start < locale_alias_path) -+ added = read_alias_file (start, locale_alias_path - start); -+ } -+ } -+ while (added != 0); -+ -+#ifdef _LIBC -+ __libc_lock_unlock (lock); -+#endif -+ -+ return result; -+} -+ -+ -+static size_t -+internal_function -+read_alias_file (fname, fname_len) -+ const char *fname; -+ int fname_len; -+{ -+#ifndef HAVE_ALLOCA -+ struct block_list *block_list = NULL; -+#endif -+ FILE *fp; -+ char *full_fname; -+ size_t added; -+ static const char aliasfile[] = "/locale.alias"; -+ -+ full_fname = (char *) alloca (fname_len + sizeof aliasfile); -+ ADD_BLOCK (block_list, full_fname); -+#ifdef HAVE_MEMPCPY -+ mempcpy (mempcpy (full_fname, fname, fname_len), -+ aliasfile, sizeof aliasfile); -+#else -+ memcpy (full_fname, fname, fname_len); -+ memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile); -+#endif -+ -+ fp = fopen (full_fname, "r"); -+ if (fp == NULL) -+ { -+ FREE_BLOCKS (block_list); -+ return 0; -+ } -+ -+ added = 0; -+ while (!feof (fp)) -+ { -+ /* It is a reasonable approach to use a fix buffer here because -+ a) we are only interested in the first two fields -+ b) these fields must be usable as file names and so must not -+ be that long -+ */ -+ unsigned char buf[BUFSIZ]; -+ unsigned char *alias; -+ unsigned char *value; -+ unsigned char *cp; -+ -+ if (fgets (buf, sizeof buf, fp) == NULL) -+ /* EOF reached. */ -+ break; -+ -+ /* Possibly not the whole line fits into the buffer. Ignore -+ the rest of the line. */ -+ if (strchr (buf, '\n') == NULL) -+ { -+ char altbuf[BUFSIZ]; -+ do -+ if (fgets (altbuf, sizeof altbuf, fp) == NULL) -+ /* Make sure the inner loop will be left. The outer loop -+ will exit at the `feof' test. */ -+ break; -+ while (strchr (altbuf, '\n') == NULL); -+ } -+ -+ cp = buf; -+ /* Ignore leading white space. */ -+ while (isspace (cp[0])) -+ ++cp; -+ -+ /* A leading '#' signals a comment line. */ -+ if (cp[0] != '\0' && cp[0] != '#') -+ { -+ alias = cp++; -+ while (cp[0] != '\0' && !isspace (cp[0])) -+ ++cp; -+ /* Terminate alias name. */ -+ if (cp[0] != '\0') -+ *cp++ = '\0'; -+ -+ /* Now look for the beginning of the value. */ -+ while (isspace (cp[0])) -+ ++cp; -+ -+ if (cp[0] != '\0') -+ { -+ size_t alias_len; -+ size_t value_len; -+ -+ value = cp++; -+ while (cp[0] != '\0' && !isspace (cp[0])) -+ ++cp; -+ /* Terminate value. */ -+ if (cp[0] == '\n') -+ { -+ /* This has to be done to make the following test -+ for the end of line possible. We are looking for -+ the terminating '\n' which do not overwrite here. */ -+ *cp++ = '\0'; -+ *cp = '\n'; -+ } -+ else if (cp[0] != '\0') -+ *cp++ = '\0'; -+ -+ if (nmap >= maxmap) -+ extend_alias_table (); -+ -+ alias_len = strlen (alias) + 1; -+ value_len = strlen (value) + 1; -+ -+ if (string_space_act + alias_len + value_len > string_space_max) -+ { -+ /* Increase size of memory pool. */ -+ size_t new_size = (string_space_max -+ + (alias_len + value_len > 1024 -+ ? alias_len + value_len : 1024)); -+ char *new_pool = (char *) realloc (string_space, new_size); -+ if (new_pool == NULL) -+ { -+ FREE_BLOCKS (block_list); -+ return added; -+ } -+ string_space = new_pool; -+ string_space_max = new_size; -+ } -+ -+ map[nmap].alias = memcpy (&string_space[string_space_act], -+ alias, alias_len); -+ string_space_act += alias_len; -+ -+ map[nmap].value = memcpy (&string_space[string_space_act], -+ value, value_len); -+ string_space_act += value_len; -+ -+ ++nmap; -+ ++added; -+ } -+ } -+ } -+ -+ /* Should we test for ferror()? I think we have to silently ignore -+ errors. --drepper */ -+ fclose (fp); -+ -+ if (added > 0) -+ qsort (map, nmap, sizeof (struct alias_map), -+ (int (*) PARAMS ((const void *, const void *))) alias_compare); -+ -+ FREE_BLOCKS (block_list); -+ return added; -+} -+ -+ -+static void -+extend_alias_table () -+{ -+ size_t new_size; -+ struct alias_map *new_map; -+ -+ new_size = maxmap == 0 ? 100 : 2 * maxmap; -+ new_map = (struct alias_map *) realloc (map, (new_size -+ * sizeof (struct alias_map))); -+ if (new_map == NULL) -+ /* Simply don't extend: we don't have any more core. */ -+ return; -+ -+ map = new_map; -+ maxmap = new_size; -+} -+ -+ -+#ifdef _LIBC -+static void __attribute__ ((unused)) -+free_mem (void) -+{ -+ if (string_space != NULL) -+ free (string_space); -+ if (map != NULL) -+ free (map); -+} -+text_set_element (__libc_subfreeres, free_mem); -+#endif -+ -+ -+static int -+alias_compare (map1, map2) -+ const struct alias_map *map1; -+ const struct alias_map *map2; -+{ -+#if defined _LIBC || defined HAVE_STRCASECMP -+ return strcasecmp (map1->alias, map2->alias); -+#else -+ const unsigned char *p1 = (const unsigned char *) map1->alias; -+ const unsigned char *p2 = (const unsigned char *) map2->alias; -+ unsigned char c1, c2; -+ -+ if (p1 == p2) -+ return 0; -+ -+ do -+ { -+ /* I know this seems to be odd but the tolower() function in -+ some systems libc cannot handle nonalpha characters. */ -+ c1 = isupper (*p1) ? tolower (*p1) : *p1; -+ c2 = isupper (*p2) ? tolower (*p2) : *p2; -+ if (c1 == '\0') -+ break; -+ ++p1; -+ ++p2; -+ } -+ while (c1 == c2); -+ -+ return c1 - c2; -+#endif -+} -diff -urP gtkhtml-0.8.3.orig/intl/po2tbl.sed.in gtkhtml-0.8.3/intl/po2tbl.sed.in ---- gtkhtml-0.8.3.orig/intl/po2tbl.sed.in Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/po2tbl.sed.in Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,102 @@ -+# po2tbl.sed - Convert Uniforum style .po file to lookup table for catgets -+# Copyright (C) 1995 Free Software Foundation, Inc. -+# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+# -+# This program 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 General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+1 { -+ i\ -+/* Automatically generated by po2tbl.sed from @PACKAGE NAME@.pot. */\ -+\ -+#if HAVE_CONFIG_H\ -+# include <config.h>\ -+#endif\ -+\ -+#include "libgettext.h"\ -+\ -+const struct _msg_ent _msg_tbl[] = { -+ h -+ s/.*/0/ -+ x -+} -+# -+# Write msgid entries in C array form. -+# -+/^msgid/ { -+ s/msgid[ ]*\(".*"\)/ {\1/ -+ tb -+# Append the next line -+ :b -+ N -+# Look whether second part is continuation line. -+ s/\(.*\)"\(\n\)"\(.*"\)/\1\2\3/ -+# Yes, then branch. -+ ta -+# Because we assume that the input file correctly formed the line -+# just read cannot be again be a msgid line. So it's safe to ignore -+# it. -+ s/\(.*\)\n.*/\1/ -+ bc -+# We found a continuation line. But before printing insert '\'. -+ :a -+ s/\(.*\)\(\n.*\)/\1\\\2/ -+ P -+# We cannot use D here. -+ s/.*\n\(.*\)/\1/ -+# Some buggy seds do not clear the `successful substitution since last ``t''' -+# flag on `N', so we do a `t' here to clear it. -+ tb -+# Not reached -+ :c -+ x -+# The following nice solution is by -+# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de> -+ td -+# Increment a decimal number in pattern space. -+# First hide trailing `9' digits. -+ :d -+ s/9\(_*\)$/_\1/ -+ td -+# Assure at least one digit is available. -+ s/^\(_*\)$/0\1/ -+# Increment the last digit. -+ s/8\(_*\)$/9\1/ -+ s/7\(_*\)$/8\1/ -+ s/6\(_*\)$/7\1/ -+ s/5\(_*\)$/6\1/ -+ s/4\(_*\)$/5\1/ -+ s/3\(_*\)$/4\1/ -+ s/2\(_*\)$/3\1/ -+ s/1\(_*\)$/2\1/ -+ s/0\(_*\)$/1\1/ -+# Convert the hidden `9' digits to `0's. -+ s/_/0/g -+ x -+ G -+ s/\(.*\)\n\([0-9]*\)/\1, \2},/ -+ s/\(.*\)"$/\1/ -+ p -+} -+# -+# Last line. -+# -+$ { -+ i\ -+};\ -+ -+ g -+ s/0*\(.*\)/int _msg_tbl_length = \1;/p -+} -+d -diff -urP gtkhtml-0.8.3.orig/intl/textdomain.c gtkhtml-0.8.3/intl/textdomain.c ---- gtkhtml-0.8.3.orig/intl/textdomain.c Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/textdomain.c Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,108 @@ -+/* Implementation of the textdomain(3) function. -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#endif -+ -+#if defined STDC_HEADERS || defined HAVE_STRING_H || defined _LIBC -+# include <string.h> -+#else -+# include <strings.h> -+# ifndef memcpy -+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -+# endif -+#endif -+ -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+/* Name of the default text domain. */ -+extern const char _nl_default_default_domain[]; -+ -+/* Default text domain in which entries for gettext(3) are to be found. */ -+extern const char *_nl_current_default_domain; -+ -+ -+/* Names for the libintl functions are a problem. They must not clash -+ with existing names and they should follow ANSI C. But this source -+ code is also used in GNU C Library where the names have a __ -+ prefix. So we have to make a difference here. */ -+#ifdef _LIBC -+# define TEXTDOMAIN __textdomain -+# ifndef strdup -+# define strdup(str) __strdup (str) -+# endif -+#else -+# define TEXTDOMAIN textdomain__ -+#endif -+ -+/* Set the current default message catalog to DOMAINNAME. -+ If DOMAINNAME is null, return the current default. -+ If DOMAINNAME is "", reset to the default of "messages". */ -+char * -+TEXTDOMAIN (domainname) -+ const char *domainname; -+{ -+ char *old; -+ -+ /* A NULL pointer requests the current setting. */ -+ if (domainname == NULL) -+ return (char *) _nl_current_default_domain; -+ -+ old = (char *) _nl_current_default_domain; -+ -+ /* If domain name is the null string set to default domain "messages". */ -+ if (domainname[0] == '\0' -+ || strcmp (domainname, _nl_default_default_domain) == 0) -+ _nl_current_default_domain = _nl_default_default_domain; -+ else -+ { -+ /* If the following malloc fails `_nl_current_default_domain' -+ will be NULL. This value will be returned and so signals we -+ are out of core. */ -+#if defined _LIBC || defined HAVE_STRDUP -+ _nl_current_default_domain = strdup (domainname); -+#else -+ size_t len = strlen (domainname) + 1; -+ char *cp = (char *) malloc (len); -+ if (cp != NULL) -+ memcpy (cp, domainname, len); -+ _nl_current_default_domain = cp; -+#endif -+ } -+ -+ if (old != _nl_default_default_domain) -+ free (old); -+ -+ return (char *) _nl_current_default_domain; -+} -+ -+#ifdef _LIBC -+/* Alias for function name in GNU C Library. */ -+weak_alias (__textdomain, textdomain); -+#endif -diff -urP gtkhtml-0.8.3.orig/intl/xopen-msg.sed gtkhtml-0.8.3/intl/xopen-msg.sed ---- gtkhtml-0.8.3.orig/intl/xopen-msg.sed Wed Dec 31 19:00:00 1969 -+++ gtkhtml-0.8.3/intl/xopen-msg.sed Fri Mar 16 14:46:14 2001 -@@ -0,0 +1,104 @@ -+# po2msg.sed - Convert Uniforum style .po file to X/Open style .msg file -+# Copyright (C) 1995 Free Software Foundation, Inc. -+# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+# -+# This program 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 General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+# -+# The first directive in the .msg should be the definition of the -+# message set number. We use always set number 1. -+# -+1 { -+ i\ -+$set 1 # Automatically created by po2msg.sed -+ h -+ s/.*/0/ -+ x -+} -+# -+# We copy all comments into the .msg file. Perhaps they can help. -+# -+/^#/ s/^#[ ]*/$ /p -+# -+# We copy the original message as a comment into the .msg file. -+# -+/^msgid/ { -+# Does not work now -+# /"$/! { -+# s/\\$// -+# s/$/ ... (more lines following)"/ -+# } -+ s/^msgid[ ]*"\(.*\)"$/$ Original Message: \1/ -+ p -+} -+# -+# The .msg file contains, other then the .po file, only the translations -+# but each given a unique ID. Starting from 1 and incrementing by 1 for -+# each message we assign them to the messages. -+# It is important that the .po file used to generate the cat-id-tbl.c file -+# (with po-to-tbl) is the same as the one used here. (At least the order -+# of declarations must not be changed.) -+# -+/^msgstr/ { -+ s/msgstr[ ]*"\(.*\)"/\1/ -+ x -+# The following nice solution is by -+# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de> -+ td -+# Increment a decimal number in pattern space. -+# First hide trailing `9' digits. -+ :d -+ s/9\(_*\)$/_\1/ -+ td -+# Assure at least one digit is available. -+ s/^\(_*\)$/0\1/ -+# Increment the last digit. -+ s/8\(_*\)$/9\1/ -+ s/7\(_*\)$/8\1/ -+ s/6\(_*\)$/7\1/ -+ s/5\(_*\)$/6\1/ -+ s/4\(_*\)$/5\1/ -+ s/3\(_*\)$/4\1/ -+ s/2\(_*\)$/3\1/ -+ s/1\(_*\)$/2\1/ -+ s/0\(_*\)$/1\1/ -+# Convert the hidden `9' digits to `0's. -+ s/_/0/g -+ x -+# Bring the line in the format `<number> <message>' -+ G -+ s/^[^\n]*$/& / -+ s/\(.*\)\n\([0-9]*\)/\2 \1/ -+# Clear flag from last substitution. -+ tb -+# Append the next line. -+ :b -+ N -+# Look whether second part is a continuation line. -+ s/\(.*\n\)"\(.*\)"/\1\2/ -+# Yes, then branch. -+ ta -+ P -+ D -+# Note that `D' includes a jump to the start!! -+# We found a continuation line. But before printing insert '\'. -+ :a -+ s/\(.*\)\(\n.*\)/\1\\\2/ -+ P -+# We cannot use the sed command `D' here -+ s/.*\n\(.*\)/\1/ -+ tb -+} -+d -diff -urP gtkhtml-0.8.3.orig/src/Makefile.am gtkhtml-0.8.3/src/Makefile.am ---- gtkhtml-0.8.3.orig/src/Makefile.am Wed Jan 24 07:10:23 2001 -+++ gtkhtml-0.8.3/src/Makefile.am Sun Apr 15 11:14:19 2001 -@@ -95,6 +95,7 @@ - htmltypes.h \ - htmlundo.h \ - htmlundo-action.h \ -+ htmlurl.h \ - htmlvspace.h \ - gtkhtml-keybinding.h \ - htmliframe.h \ -@@ -187,7 +188,6 @@ - - testgtkhtml_SOURCES = \ - testgtkhtml.c \ -- htmlurl.h \ - htmlurl.c - - testgtkhtml_CFLAGS = $(GLIBWWW_CFLAGS) diff --git a/gnome-extra/gtkhtml/gtkhtml-0.8.3.ebuild b/gnome-extra/gtkhtml/gtkhtml-0.8.3.ebuild deleted file mode 100644 index f25b62652d50..000000000000 --- a/gnome-extra/gtkhtml/gtkhtml-0.8.3.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/gnome-extra/gtkhtml/gtkhtml-0.8.3.ebuild,v 1.1 2001/04/15 18:57:14 pete Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="gtkhtml" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/gtkhtml/${A} - ftp://gnome.eazel.com/pub/gnome/unstable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/" - -RDEPEND=">=gnome-base/gal-0.5 - >=gnome-base/gconf-1.0 - >=gnome-base/control-center-1.2.4 - >=gnome-base/glibwww-0.2-r1 - >=gnome-base/libghttp-1.0.9" - -DEPEND="${RDEPEND} - >=sys-devel/automake-1.4" - -src_unpack() { - unpack ${A} - cd ${S} - patch -p1 < ${FILESDIR}/${P}-gentoo.diff -# try aclocal -I macros -# try autoconf - try automake -} - -src_compile() { - - local myconf - - if [ -z "`use nls`" ] - then - myconf="--disable-nls" - fi - - if [ "`use bonobo`" ] - then - myconf="${myconf} --with-bonobo" - else - myconf="${myconf} --without-bonobo" - fi - - try ./configure --host=${CHOST} --prefix=/opt/gnome \ - --sysconfdir=/etc/opt/gnome ${myconf} --with-gconf - - try make -} - -src_install() { - - try make DESTDIR=${D} install - #insinto /opt/gnome/include/gtkhtml - #doins src/htmlurl.h - dodoc AUTHORS COPYING* ChangeLog README - dodoc NEWS TODO - -} - - - - - - - - - - - - - diff --git a/gnome-extra/gtop/files/digest-gtop-1.0.10 b/gnome-extra/gtop/files/digest-gtop-1.0.10 deleted file mode 100644 index 7d8c9bfcc0bc..000000000000 --- a/gnome-extra/gtop/files/digest-gtop-1.0.10 +++ /dev/null @@ -1 +0,0 @@ -MD5 8e4eff1614a66123709b16d99d7e01c6 gtop-1.0.10.tar.gz diff --git a/gnome-extra/gtop/gtop-1.0.10.ebuild b/gnome-extra/gtop/gtop-1.0.10.ebuild deleted file mode 100644 index 9a3ec66d1d28..000000000000 --- a/gnome-extra/gtop/gtop-1.0.10.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/gnome-extra/gtop/gtop-1.0.10.ebuild,v 1.1 2000/11/25 13:01:57 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="gtop" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}" -HOMEPGAE="http://www.gnome.org/" - -DEPEND=">=gnome-base/libgtop-1.0.9" - -src_compile() { - cd ${S} - try ./configure --host=${CHOST} --prefix=/opt/gnome - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/opt/gnome install - dodoc AUTHORS COPYING ChangeLog NEWS README TODO - -} - - - - diff --git a/gnome-extra/libgda/files/digest-libgda-0.2.3 b/gnome-extra/libgda/files/digest-libgda-0.2.3 deleted file mode 100644 index 6033f75eebcf..000000000000 --- a/gnome-extra/libgda/files/digest-libgda-0.2.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 ecb2d4bc811e3bfd8ac92d34207f2975 libgda-0.2.3.tar.gz diff --git a/gnome-extra/libgda/libgda-0.2.3.ebuild b/gnome-extra/libgda/libgda-0.2.3.ebuild deleted file mode 100644 index 17d69655a8b8..000000000000 --- a/gnome-extra/libgda/libgda-0.2.3.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 - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="gda lib" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-db/${A}" -HOMEPAGE="http://www.gnome.org/gnome-db" - -DEPEND=">=gnome-base/gconf-0.11 - >=dev-perl/CORBA-ORBit-0.4.3 - mysql? ( >=dev-db/mysql-3.23.26 ) - postgres? ( >=dev-db/postgresql-7.1 ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - ldap? ( >=net-nds/openldap-1.2.11 )" - - -src_compile() { - local myconf - if [ "`use mysql`" ] ; then - myconf="--with-mysql=/usr" - fi - if [ "`use ldap`" ] ; then - myconf="$myconf --with-ldap=/usr" - fi - if [ "`use odbc`" ]; then - myconf="$myconf --with-odbc" - fi - if [ "`use postgres`" ]; then - myconf="$myconf --with-postgres=/usr" - fi - - try ./configure --host=${CHOST} --prefix=/opt/gnome $myconf - try make -} - -src_install() { - try make prefix=${D}/opt/gnome PREFIX=${D}/usr \ - GDA_oafinfodir=${D}/opt/gnome/share/oaf install - - dodoc AUTHORS COPYING.* ChangeLog NEWS README THANKS TODO -} - - - - diff --git a/gnome-extra/mc/files/digest-mc-4.5.53 b/gnome-extra/mc/files/digest-mc-4.5.53 deleted file mode 100644 index e054f7378d97..000000000000 --- a/gnome-extra/mc/files/digest-mc-4.5.53 +++ /dev/null @@ -1 +0,0 @@ -MD5 90652e48aaf2e5f937262de8436b7f56 mc-4.5.53.tar.gz diff --git a/gnome-extra/mc/files/digest-mc-4.5.53-r1 b/gnome-extra/mc/files/digest-mc-4.5.53-r1 deleted file mode 100644 index e054f7378d97..000000000000 --- a/gnome-extra/mc/files/digest-mc-4.5.53-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 90652e48aaf2e5f937262de8436b7f56 mc-4.5.53.tar.gz diff --git a/gnome-extra/mc/mc-4.5.53-r1.ebuild b/gnome-extra/mc/mc-4.5.53-r1.ebuild deleted file mode 100644 index 2e763bff67c3..000000000000 --- a/gnome-extra/mc/mc-4.5.53-r1.ebuild +++ /dev/null @@ -1,68 +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/gnome-extra/mc/mc-4.5.53-r1.ebuild,v 1.1 2001/05/05 17:42:37 achim Exp $ - -#P= -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="GNOME Midnight Commander" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/mc/" - -DEPEND="virtual/glibc - >=sys-libs/gpm-1.19.3 - pam? ( >=sys-libs/pam-0.72 ) - slang? ( >=sys-libs/slang-1.4.2 ) - >=sys-apps/e2fsprogs-1.19 - gnome? ( >=gnome-base/gnome-libs-1.2.4 ) - -" -RDEPEND="virtual/x11-web-browser" - -src_unpack() { - unpack ${A} - cd ${S}/vfs - cp smbfs.c smbfs.c.orig - sed -e "s:/etc/smb\.conf:/etc/smb/smb\.conf:" smbfs.c.orig > smbfs.c -} - -src_compile() { - local myconf - if [ "`use pam`" ] ; then - myconf="--with-pam" - else - myconf="--without-pam" - fi - if [ "`use slang`" ] ; then - myconf="$myconf --with-slang" - else - myconf="$myconf --with-included-slang" - fi - if [ "`use gnome`" ] ; then - myconf="$myconf --with-gnome --prefix=/opt/gnome" - else - myconf="$myconf --without-gnome --prefix=/usr" - fi - LDFLAGS="-lcrypt -lncurses" try ./configure --host=${CHOST} \ - --with-samba --with-vfs --with-netrc $myconf - try make -} - -src_install() { - - if [ "`use gnome`" ] ; then - try make prefix=${D}/opt/gnome install - else - try make prefix=${D}/usr install - fi - - dodoc ABOUT-NLS COPYING* FAQ INSTALL* NEWS - dodoc README* -} - - - - - - diff --git a/gnome-extra/mc/mc-4.5.53.ebuild b/gnome-extra/mc/mc-4.5.53.ebuild deleted file mode 100644 index 0551d3637ab1..000000000000 --- a/gnome-extra/mc/mc-4.5.53.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/gnome-extra/mc/mc-4.5.53.ebuild,v 1.1 2001/04/15 21:45:13 pete Exp $ - -#P= -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="GNOME Midnight Commander" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/mc/" - -DEPEND=">=sys-libs/pam-0.72 - >=sys-libs/slang-1.4.2 - >=sys-apps/e2fsprogs-1.19 - >=gnome-base/gnome-libs-1.2.4 -" -RDEPEND="virtual/x11-web-browser" - -src_unpack() { - unpack ${A} - cd ${S}/vfs - cp smbfs.c smbfs.c.orig - sed -e "s:/etc/smb\.conf:/etc/smb/smb\.conf:" smbfs.c.orig > smbfs.c -} - -src_compile() { - cd ${S} - LDFLAGS="-lcrypt -lncurses" try ./configure --host=${CHOST} --prefix=/opt/gnome \ - --with-samba --with-ldap --with-pam --with-vfs \ - --with-netrc --with-slang - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/opt/gnome install - prepman /opt/gnome - - dodoc ABOUT-NLS COPYING* FAQ INSTALL* NEWS - dodoc README* -} - - - - - - diff --git a/gnome-extra/medusa/files/digest-medusa-0.5.0 b/gnome-extra/medusa/files/digest-medusa-0.5.0 deleted file mode 100644 index 7d658f3dcd48..000000000000 --- a/gnome-extra/medusa/files/digest-medusa-0.5.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 6c93b219bfeccb5456570c2a464b72fb medusa-0.5.0.tar.gz diff --git a/gnome-extra/medusa/medusa-0.5.0.ebuild b/gnome-extra/medusa/medusa-0.5.0.ebuild deleted file mode 100644 index c8f2df48fa04..000000000000 --- a/gnome-extra/medusa/medusa-0.5.0.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/gnome-extra/medusa/medusa-0.5.0.ebuild,v 1.1 2001/04/15 21:45:13 pete Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="medusa" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${A} - ftp://gnome.eazel.com/pub/gnome/unstable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/" - -DEPEND=">=gnome-base/gnome-vfs-1.0 - >=sys-libs/db-1.8" - -src_compile() { - try ./configure --host=${CHOST} --prefix=/opt/gnome \ - --sysconfdir=/etc/opt/gnome --mandir=/opt/gnome/share/man \ - --sharedstatedir=/var/lib --localstatedir=/var/lib --enable-prefere-db1 - try make medusainitdir=/tmp -} - -src_install() { - try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome \ - medusainitdir=/tmp mandir=${D}/opt/gnome/share/man install - dodoc AUTHORS COPYING ChangeLog NEWS README - -} - - - - - - - diff --git a/gnome-libs/ammonite/ammonite-1.0.0.ebuild b/gnome-libs/ammonite/ammonite-1.0.0.ebuild deleted file mode 100644 index 3499257b08c1..000000000000 --- a/gnome-libs/ammonite/ammonite-1.0.0.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 Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/gnome-libs/ammonite/ammonite-1.0.0.ebuild,v 1.1 2001/04/15 21:45:13 pete Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="ammonite" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${A} - ftp://gnome.eazel.com/pub/gnome/unstable/sources/${PN}/${A}" - -HOMEPAGE="http://www.gnome.org/" - -DEPEND="nls? ( sys-devel/gettext ) - >=gnome-base/gnome-libs-1.2.12 - >=gnome-base/gconf-0.50 - >=dev-libs/openssl-0.9.6" - -src_unpack() { - unpack ${A} - cd ${S} - patch -p1 < ${FILESDIR}/${PF}-gentoo.diff -} - -src_compile() { - local myconf - if [ -z "`use nls`" ] - then - myconf="--disable-nls" - fi - try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome ${myconf} - try make -} - -src_install() { - - try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome install - dodoc ABOUT-NLS AUTHORS COPYING* HACKING README NEWS - dodoc TODO doc/*.txt - -} - - - - diff --git a/gnome-libs/ammonite/files/ammonite-1.0.0-gentoo.diff b/gnome-libs/ammonite/files/ammonite-1.0.0-gentoo.diff deleted file mode 100644 index be7fe857ba79..000000000000 --- a/gnome-libs/ammonite/files/ammonite-1.0.0-gentoo.diff +++ /dev/null @@ -1,5132 +0,0 @@ -diff -urP ammonite-1.0.0.orig/intl/ChangeLog ammonite-1.0.0/intl/ChangeLog ---- ammonite-1.0.0.orig/intl/ChangeLog Wed Dec 31 19:00:00 1969 -+++ ammonite-1.0.0/intl/ChangeLog Wed Mar 14 14:04:38 2001 -@@ -0,0 +1,1086 @@ -+1998-04-29 Ulrich Drepper <drepper@cygnus.com> -+ -+ * intl/localealias.c (read_alias_file): Use unsigned char for -+ local variables. Remove unused variable tp. -+ * intl/l10nflist.c (_nl_normalize_codeset): Use unsigned char * -+ for type of codeset. For loosing Solaris systems. -+ * intl/loadinfo.h: Adapt prototype of _nl_normalize_codeset. -+ * intl/bindtextdom.c (BINDTEXTDOMAIN): Don't define local variable -+ len if not needed. -+ Patches by Jim Meyering. -+ -+1998-04-28 Ulrich Drepper <drepper@cygnus.com> -+ -+ * loadmsgcat.c (_nl_load_domain): Don't assign the element use_mmap if -+ mmap is not supported. -+ -+ * hash-string.h: Don't include <values.h>. -+ -+1998-04-27 Ulrich Drepper <drepper@cygnus.com> -+ -+ * textdomain.c: Use strdup is available. -+ -+ * localealias.c: Define HAVE_MEMPCPY so that we can use this -+ function. Define and use semapahores to protect modfication of -+ global objects when compiling for glibc. Add code to allow -+ freeing alias table. -+ -+ * l10nflist.c: Don't assume stpcpy not being a macro. -+ -+ * gettextP.h: Define internal_function macri if not already done. -+ Use glibc byte-swap macros instead of defining SWAP when compiled -+ for glibc. -+ (struct loaded_domain): Add elements to allow unloading. -+ -+ * Makefile.in (distclean): Don't remove libintl.h here. -+ -+ * bindtextdomain.c: Carry over changes from glibc. Use strdup if -+ available. -+ -+ * dcgettext.c: Don't assume stpcpy not being a macro. Mark internal -+ functions. Add memory freeing code for glibc. -+ -+ * dgettext.c: Update copyright. -+ -+ * explodename.c: Include stdlib.h and string.h only if they exist. -+ Use strings.h eventually. -+ -+ * finddomain.c: Mark internal functions. Use strdup if available. -+ Add memory freeing code for glibc. -+ -+1997-10-10 20:00 Ulrich Drepper <drepper@cygnus.com> -+ -+ * libgettext.h: Fix dummy textdomain and bindtextdomain macros. -+ They should return reasonable values. -+ Reported by Tom Tromey <tromey@cygnus.com>. -+ -+1997-09-16 03:33 Ulrich Drepper <drepper@cygnus.com> -+ -+ * libgettext.h: Define PARAMS also to `args' if __cplusplus is defined. -+ * intlh.inst.in: Likewise. -+ Reported by Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>. -+ -+ * libintl.glibc: Update from current glibc version. -+ -+1997-09-06 02:10 Ulrich Drepper <drepper@cygnus.com> -+ -+ * intlh.inst.in: Reformat copyright. -+ -+1997-08-19 15:22 Ulrich Drepper <drepper@cygnus.com> -+ -+ * dcgettext.c (DCGETTEXT): Remove wrong comment. -+ -+1997-08-16 00:13 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (install-data): Don't change directory to install. -+ -+1997-08-01 14:30 Ulrich Drepper <drepper@cygnus.com> -+ -+ * cat-compat.c: Fix copyright. -+ -+ * localealias.c: Don't define strchr unless !HAVE_STRCHR. -+ -+ * loadmsgcat.c: Update copyright. Fix typos. -+ -+ * l10nflist.c: Don't define strchr unless !HAVE_STRCHR. -+ (_nl_make_l10nflist): Handle sponsor and revision correctly. -+ -+ * gettext.c: Update copyright. -+ * gettext.h: Likewise. -+ * hash-string.h: Likewise. -+ -+ * finddomain.c: Remoave dead code. Define strchr only if -+ !HAVE_STRCHR. -+ -+ * explodename.c: Include <sys/types.h>. -+ -+ * explodename.c: Reformat copyright text. -+ (_nl_explode_name): Fix typo. -+ -+ * dcgettext.c: Define and use __set_errno. -+ (guess_category_value): Don't use setlocale if HAVE_LC_MESSAGES is -+ not defined. -+ -+ * bindtextdom.c: Pretty printing. -+ -+1997-05-01 02:25 Ulrich Drepper <drepper@cygnus.com> -+ -+ * dcgettext.c (guess_category_value): Don't depend on -+ HAVE_LC_MESSAGES. We don't need the macro here. -+ Patch by Bruno Haible <haible@ilog.fr>. -+ -+ * cat-compat.c (textdomain): DoN't refer to HAVE_SETLOCALE_NULL -+ macro. Instead use HAVE_LOCALE_NULL and define it when using -+ glibc, as in dcgettext.c. -+ Patch by Bruno Haible <haible@ilog.fr>. -+ -+ * Makefile.in (CPPFLAGS): New variable. Reported by Franc,ois -+ Pinard. -+ -+Mon Mar 10 06:51:17 1997 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in: Implement handling of libtool. -+ -+ * gettextP.h: Change data structures for use of generic lowlevel -+ i18n file handling. -+ -+Wed Dec 4 20:21:18 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * textdomain.c: Put parentheses around arguments of memcpy macro -+ definition. -+ * localealias.c: Likewise. -+ * l10nflist.c: Likewise. -+ * finddomain.c: Likewise. -+ * bindtextdom.c: Likewise. -+ Reported by Thomas Esken. -+ -+Mon Nov 25 22:57:51 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * textdomain.c: Move definition of `memcpy` macro to right -+ position. -+ -+Fri Nov 22 04:01:58 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * finddomain.c [!HAVE_STRING_H && !_LIBC]: Define memcpy using -+ bcopy if not already defined. Reported by Thomas Esken. -+ * bindtextdom.c: Likewise. -+ * l10nflist.c: Likewise. -+ * localealias.c: Likewise. -+ * textdomain.c: Likewise. -+ -+Tue Oct 29 11:10:27 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (libdir): Change to use exec_prefix instead of -+ prefix. Reported by Knut-HåvardAksnes <etokna@eto.ericsson.se>. -+ -+Sat Aug 31 03:07:09 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * l10nflist.c (_nl_normalize_codeset): We convert to lower case, -+ so don't prepend uppercase `ISO' for only numeric arg. -+ -+Fri Jul 19 00:15:46 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * l10nflist.c: Move inclusion of argz.h, ctype.h, stdlib.h after -+ definition of _GNU_SOURCE. Patch by Roland McGrath. -+ -+ * Makefile.in (uninstall): Fix another bug with `for' loop and -+ empty arguments. Patch by Jim Meyering. Correct name os -+ uninstalled files: no intl- prefix anymore. -+ -+ * Makefile.in (install-data): Again work around shells which -+ cannot handle mpty for list. Reported by Jim Meyering. -+ -+Sat Jul 13 18:11:35 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (install): Split goal. Now depend on install-exec -+ and install-data. -+ (install-exec, install-data): New goals. Created from former -+ install goal. -+ Reported by Karl Berry. -+ -+Sat Jun 22 04:58:14 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (MKINSTALLDIRS): New variable. Path to -+ mkinstalldirs script. -+ (install): use MKINSTALLDIRS variable or if the script is not present -+ try to find it in the $top_scrdir). -+ -+Wed Jun 19 02:56:56 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * l10nflist.c: Linux libc *partly* includes the argz_* functions. -+ Grr. Work around by renaming the static version and use macros -+ for renaming. -+ -+Tue Jun 18 20:11:17 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * l10nflist.c: Correct presence test macros of __argz_* functions. -+ -+ * l10nflist.c: Include <argz.h> based on test of it instead when -+ __argz_* functions are available. -+ Reported by Andreas Schwab. -+ -+Thu Jun 13 15:17:44 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * explodename.c, l10nflist.c: Define NULL for dumb systems. -+ -+Tue Jun 11 17:05:13 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * intlh.inst.in, libgettext.h (dcgettext): Rename local variable -+ result to __result to prevent name clash. -+ -+ * l10nflist.c, localealias.c, dcgettext.c: Define _GNU_SOURCE to -+ get prototype for stpcpy and strcasecmp. -+ -+ * intlh.inst.in, libgettext.h: Move declaration of -+ `_nl_msg_cat_cntr' outside __extension__ block to prevent warning -+ from gcc's -Wnested-extern option. -+ -+Fri Jun 7 01:58:00 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (install): Remove comment. -+ -+Thu Jun 6 17:28:17 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (install): Work around for another Buglix stupidity. -+ Always use an `else' close for `if's. Reported by Nelson Beebe. -+ -+ * Makefile.in (intlh.inst): Correct typo in phony rule. -+ Reported by Nelson Beebe. -+ -+Thu Jun 6 01:49:52 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * dcgettext.c (read_alias_file): Rename variable alloca_list to -+ block_list as the macro calls assume. -+ Patch by Eric Backus. -+ -+ * localealias.c [!HAVE_ALLOCA]: Define alloca as macro using -+ malloc. -+ (read_alias_file): Rename varriabe alloca_list to block_list as the -+ macro calls assume. -+ Patch by Eric Backus. -+ -+ * l10nflist.c: Correct conditional for <argz.h> inclusion. -+ Reported by Roland McGrath. -+ -+ * Makefile.in (all): Depend on all-@USE_INCLUDED_LIBINTL@, not -+ all-@USE_NLS@. -+ -+ * Makefile.in (install): intlh.inst comes from local dir, not -+ $(srcdir). -+ -+ * Makefile.in (intlh.inst): Special handling of this goal. If -+ used in gettext, this is really a rul to construct this file. If -+ used in any other package it is defined as a .PHONY rule with -+ empty body. -+ -+ * finddomain.c: Extract locale file information handling into -+ l10nfile.c. Rename local stpcpy__ function to stpcpy. -+ -+ * dcgettext.c (stpcpy): Add local definition. -+ -+ * l10nflist.c: Solve some portability problems. Patches partly by -+ Thomas Esken. Add local definition of stpcpy. -+ -+Tue Jun 4 02:47:49 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * intlh.inst.in: Don't depend including <locale.h> on -+ HAVE_LOCALE_H. Instead configure must rewrite this fiile -+ depending on the result of the configure run. -+ -+ * Makefile.in (install): libintl.inst is now called intlh.inst. -+ Add rules for updating intlh.inst from intlh.inst.in. -+ -+ * libintl.inst: Renamed to intlh.inst.in. -+ -+ * localealias.c, dcgettext.c [__GNUC__]: Define HAVE_ALLOCA to 1 -+ because gcc has __buitlin_alloca. -+ Reported by Roland McGrath. -+ -+Mon Jun 3 00:32:16 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * Makefile.in (installcheck): New goal to fulfill needs of -+ automake's distcheck. -+ -+ * Makefile.in (install): Reorder commands so that VERSION is -+ found. -+ -+ * Makefile.in (gettextsrcdir): Now use subdirectory intl/ in -+ @datadir@/gettext. -+ (COMSRCS): Add l10nfile.c. -+ (OBJECTS): Add l10nfile.o. -+ (DISTFILES): Rename to DISTFILE.normal. Remove $(DISTFILES.common). -+ (DISTFILE.gettext): Remove $(DISTFILES.common). -+ (all-gettext): Remove goal. -+ (install): If $(PACKAGE) = gettext install, otherwose do nothing. No -+ package but gettext itself should install libintl.h + headers. -+ (dist): Extend goal to work for gettext, too. -+ (dist-gettext): Remove goal. -+ -+ * dcgettext.c [!HAVE_ALLOCA]: Define macro alloca by using malloc. -+ -+Sun Jun 2 17:33:06 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * loadmsgcat.c (_nl_load_domain): Parameter is now comes from -+ find_l10nfile. -+ -+Sat Jun 1 02:23:03 1996 Ulrich Drepper <drepper@cygnus.com> -+ -+ * l10nflist.c (__argz_next): Add definition. -+ -+ * dcgettext.c [!HAVE_ALLOCA]: Add code for handling missing alloca -+ code. Use new l10nfile handling. -+ -+ * localealias.c [!HAVE_ALLOCA]: Add code for handling missing -+ alloca code. -+ -+ * l10nflist.c: Initial revision. -+ -+Tue Apr 2 18:51:18 1996 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (all-gettext): New goal. Same as all-yes. -+ -+Thu Mar 28 23:01:22 1996 Karl Eichwalder <ke@ke.central.de> -+ -+ * Makefile.in (gettextsrcdir): Define using @datadir@. -+ -+Tue Mar 26 12:39:14 1996 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c: Include <ctype.h>. Reported by Roland McGrath. -+ -+Sat Mar 23 02:00:35 1996 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (stpcpy): Rename to stpcpy__ to prevent clashing -+ with external declaration. -+ -+Sat Mar 2 00:47:09 1996 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (all-no): Rename from all_no. -+ -+Sat Feb 17 00:25:59 1996 Ulrich Drepper <drepper@myware> -+ -+ * gettextP.h [loaded_domain]: Array `successor' must now contain up -+ to 63 elements (because of codeset name normalization). -+ -+ * finddomain.c: Implement codeset name normalization. -+ -+Thu Feb 15 04:39:09 1996 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (all): Define to `all-@USE_NLS@'. -+ (all-yes, all_no): New goals. `all-no' is noop, `all-yes' -+ is former all. -+ -+Mon Jan 15 21:46:01 1996 Howard Gayle <howard@hal.com> -+ -+ * localealias.c (alias_compare): Increment string pointers in loop -+ of strcasecmp replacement. -+ -+Fri Dec 29 21:16:34 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (install-src): Who commented this goal out ? :-) -+ -+Fri Dec 29 15:08:16 1995 Ulrich Drepper <drepper@myware> -+ -+ * dcgettext.c (DCGETTEXT): Save `errno'. Failing system calls -+ should not effect it because a missing catalog is no error. -+ Reported by Harald K<o:>nig <koenig@tat.physik.uni-tuebingen.de>. -+ -+Tue Dec 19 22:09:13 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (Makefile): Explicitly use $(SHELL) for running -+ shell scripts. -+ -+Fri Dec 15 17:34:59 1995 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> -+ -+ * Makefile.in (install-src): Only install library and header when -+ we use the own implementation. Don't do it when using the -+ system's gettext or catgets functions. -+ -+ * dcgettext.c (find_msg): Must not swap domain->hash_size here. -+ -+Sat Dec 9 16:24:37 1995 Ulrich Drepper <drepper@myware> -+ -+ * localealias.c, libintl.inst, libgettext.h, hash-string.h, -+ gettextP.h, finddomain.c, dcgettext.c, cat-compat.c: -+ Use PARAMS instead of __P. Suggested by Roland McGrath. -+ -+Tue Dec 5 11:39:14 1995 Larry Schwimmer <rosebud@cyclone.stanford.edu> -+ -+ * libgettext.h: Use `#if !defined (_LIBINTL_H)' instead of `#if -+ !_LIBINTL_H' because Solaris defines _LIBINTL_H as empty. -+ -+Mon Dec 4 15:42:07 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (install-src): -+ Install libintl.inst instead of libintl.h.install. -+ -+Sat Dec 2 22:51:38 1995 Marcus Daniels <marcus@sysc.pdx.edu> -+ -+ * cat-compat.c (textdomain): -+ Reverse order in which files are tried you load. First -+ try local file, when this failed absolute path. -+ -+Wed Nov 29 02:03:53 1995 Nelson H. F. Beebe <beebe@math.utah.edu> -+ -+ * cat-compat.c (bindtextdomain): Add missing { }. -+ -+Sun Nov 26 18:21:41 1995 Ulrich Drepper <drepper@myware> -+ -+ * libintl.inst: Add missing __P definition. Reported by Nelson Beebe. -+ -+ * Makefile.in: -+ Add dummy `all' and `dvi' goals. Reported by Tom Tromey. -+ -+Sat Nov 25 16:12:01 1995 Franc,ois Pinard <pinard@iro.umontreal.ca> -+ -+ * hash-string.h: Capitalize arguments of macros. -+ -+Sat Nov 25 12:01:36 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (DISTFILES): Prevent files names longer than 13 -+ characters. libintl.h.glibc->libintl.glibc, -+ libintl.h.install->libintl.inst. Reported by Joshua R. Poulson. -+ -+Sat Nov 25 11:31:12 1995 Eric Backus <ericb@lsid.hp.com> -+ -+ * dcgettext.c: Fix bug in preprocessor conditionals. -+ -+Sat Nov 25 02:35:27 1995 Nelson H. F. Beebe <beebe@math.utah.edu> -+ -+ * libgettext.h: Solaris cc does not understand -+ #if !SYMBOL1 && !SYMBOL2. Sad but true. -+ -+Thu Nov 23 16:22:14 1995 Ulrich Drepper <drepper@myware> -+ -+ * hash-string.h (hash_string): -+ Fix for machine with >32 bit `unsigned long's. -+ -+ * dcgettext.c (DCGETTEXT): -+ Fix horrible bug in loop for alternative translation. -+ -+Thu Nov 23 01:45:29 1995 Ulrich Drepper <drepper@myware> -+ -+ * po2tbl.sed.in, linux-msg.sed, xopen-msg.sed: -+ Some further simplifications in message number generation. -+ -+Mon Nov 20 21:08:43 1995 Ulrich Drepper <drepper@myware> -+ -+ * libintl.h.glibc: Use __const instead of const in prototypes. -+ -+ * Makefile.in (install-src): -+ Install libintl.h.install instead of libintl.h. This -+ is a stripped-down version. Suggested by Peter Miller. -+ -+ * libintl.h.install, libintl.h.glibc: Initial revision. -+ -+ * localealias.c (_nl_expand_alias, read_alias_file): -+ Protect prototypes in type casts by __P. -+ -+Tue Nov 14 16:43:58 1995 Ulrich Drepper <drepper@myware> -+ -+ * hash-string.h: Correct prototype for hash_string. -+ -+Sun Nov 12 12:42:30 1995 Ulrich Drepper <drepper@myware> -+ -+ * hash-string.h (hash_string): Add prototype. -+ -+ * gettextP.h: Fix copyright. -+ (SWAP): Add prototype. -+ -+Wed Nov 8 22:56:33 1995 Ulrich Drepper <drepper@myware> -+ -+ * localealias.c (read_alias_file): Forgot sizeof. -+ Avoid calling *printf function. This introduces a big overhead. -+ Patch by Roland McGrath. -+ -+Tue Nov 7 14:21:08 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c, cat-compat.c: Wrong indentation in #if for stpcpy. -+ -+ * finddomain.c (stpcpy): -+ Define substitution function local. The macro was to flaky. -+ -+ * cat-compat.c: Fix typo. -+ -+ * xopen-msg.sed, linux-msg.sed: -+ While bringing message number to right place only accept digits. -+ -+ * linux-msg.sed, xopen-msg.sed: Now that the counter does not have -+ leading 0s we don't need to remove them. Reported by Marcus -+ Daniels. -+ -+ * Makefile.in (../po/cat-id-tbl.o): Use $(top_srdir) in -+ dependency. Reported by Marcus Daniels. -+ -+ * cat-compat.c: (stpcpy) [!_LIBC && !HAVE_STPCPY]: Define replacement. -+ Generally cleanup using #if instead of #ifndef. -+ -+ * Makefile.in: Correct typos in comment. By Franc,ois Pinard. -+ -+Mon Nov 6 00:27:02 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (install-src): Don't install libintl.h and libintl.a -+ if we use an available gettext implementation. -+ -+Sun Nov 5 22:02:08 1995 Ulrich Drepper <drepper@myware> -+ -+ * libgettext.h: Fix typo: HAVE_CATGETTS -> HAVE_CATGETS. Reported -+ by Franc,ois Pinard. -+ -+ * libgettext.h: Use #if instead of #ifdef/#ifndef. -+ -+ * finddomain.c: -+ Comments describing what has to be done should start with FIXME. -+ -+Sun Nov 5 19:38:01 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (DISTFILES): Split. Use DISTFILES with normal meaning. -+ DISTFILES.common names the files common to both dist goals. -+ DISTFILES.gettext are the files only distributed in GNU gettext. -+ -+Sun Nov 5 17:32:54 1995 Ulrich Drepper <drepper@myware> -+ -+ * dcgettext.c (DCGETTEXT): Correct searching in derived locales. -+ This was necessary since a change in _nl_find_msg several weeks -+ ago. I really don't know this is still not fixed. -+ -+Sun Nov 5 12:43:12 1995 Ulrich Drepper <drepper@myware> -+ -+ * loadmsgcat.c (_nl_load_domain): Test for FILENAME == NULL. This -+ might mark a special condition. -+ -+ * finddomain.c (make_entry_rec): Don't make illegal entry as decided. -+ -+ * Makefile.in (dist): Suppress error message when ln failed. -+ Get files from $(srcdir) explicitly. -+ -+ * libgettext.h (gettext_const): Rename to gettext_noop. -+ -+Fri Nov 3 07:36:50 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (make_entry_rec): -+ Protect against wrong locale names by testing mask. -+ -+ * libgettext.h (gettext_const): Add macro definition. -+ Capitalize macro arguments. -+ -+Thu Nov 2 23:15:51 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (_nl_find_domain): -+ Test for pointer != NULL before accessing value. -+ Reported by Tom Tromey. -+ -+ * gettext.c (NULL): -+ Define as (void*)0 instad of 0. Reported by Franc,ois Pinard. -+ -+Mon Oct 30 21:28:52 1995 Ulrich Drepper <drepper@myware> -+ -+ * po2tbl.sed.in: Serious typo bug fixed by Jim Meyering. -+ -+Sat Oct 28 23:20:47 1995 Ulrich Drepper <drepper@myware> -+ -+ * libgettext.h: Disable dcgettext optimization for Solaris 2.3. -+ -+ * localealias.c (alias_compare): -+ Peter Miller reported that tolower in some systems is -+ even dumber than I thought. Protect call by `isupper'. -+ -+Fri Oct 27 22:22:51 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (libdir, includedir): New variables. -+ (install-src): Install libintl.a and libintl.h in correct dirs. -+ -+Fri Oct 27 22:07:29 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (SOURCES): Fix typo: intrl.compat.c -> intl-compat.c. -+ -+ * po2tbl.sed.in: Patch for buggy SEDs by Christian von Roques. -+ -+ * localealias.c: -+ Fix typo and superflous test. Reported by Christian von Roques. -+ -+Fri Oct 6 11:52:05 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (_nl_find_domain): -+ Correct some remainder from the pre-CEN syntax. Now -+ we don't have a constant number of successors anymore. -+ -+Wed Sep 27 21:41:13 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (DISTFILES): Add libintl.h.glibc. -+ -+ * Makefile.in (dist-libc): Add goal for packing sources for glibc. -+ (COMSRCS, COMHDRS): Splitted to separate sources shared with glibc. -+ -+ * loadmsgcat.c: Forget to continue #if line. -+ -+ * localealias.c: -+ [_LIBC]: Rename strcasecmp to __strcasecmp to keep ANSI C name -+ space clean. -+ -+ * dcgettext.c, finddomain.c: Better comment to last change. -+ -+ * loadmsgcat.c: -+ [_LIBC]: Rename fstat, open, close, read, mmap, and munmap to -+ __fstat, __open, __close, __read, __mmap, and __munmap resp -+ to keep ANSI C name space clean. -+ -+ * finddomain.c: -+ [_LIBC]: Rename stpcpy to __stpcpy to keep ANSI C name space clean. -+ -+ * dcgettext.c: -+ [_LIBC]: Rename getced and stpcpy to __getcwd and __stpcpy resp to -+ keep ANSI C name space clean. -+ -+ * libgettext.h: -+ Include sys/types.h for those old SysV systems out there. -+ Reported by Francesco Potorti`. -+ -+ * loadmsgcat.c (use_mmap): Define if compiled for glibc. -+ -+ * bindtextdom.c: Include all those standard headers -+ unconditionally if _LIBC is defined. -+ -+ * finddomain.c: Fix 2 times defiend -> defined. -+ -+ * textdomain.c: Include libintl.h instead of libgettext.h when -+ compiling for glibc. Include all those standard headers -+ unconditionally if _LIBC is defined. -+ -+ * localealias.c, loadmsgcat.c: Prepare to be compiled in glibc. -+ -+ * gettext.c: -+ Include libintl.h instead of libgettext.h when compiling for glibc. -+ Get NULL from stddef.h if we compile for glibc. -+ -+ * finddomain.c: Include libintl.h instead of libgettext.h when -+ compiling for glibc. Include all those standard headers -+ unconditionally if _LIBC is defined. -+ -+ * dcgettext.c: Include all those standard headers unconditionally -+ if _LIBC is defined. -+ -+ * dgettext.c: If compiled in glibc include libintl.h instead of -+ libgettext.h. -+ (locale.h): Don't rely on HAVE_LOCALE_H when compiling for glibc. -+ -+ * dcgettext.c: If compiled in glibc include libintl.h instead of -+ libgettext.h. -+ (getcwd): Don't rely on HAVE_GETCWD when compiling for glibc. -+ -+ * bindtextdom.c: -+ If compiled in glibc include libintl.h instead of libgettext.h. -+ -+Mon Sep 25 22:23:06 1995 Ulrich Drepper <drepper@myware> -+ -+ * localealias.c (_nl_expand_alias): Don't call bsearch if NMAP <= 0. -+ Reported by Marcus Daniels. -+ -+ * cat-compat.c (bindtextdomain): -+ String used in putenv must not be recycled. -+ Reported by Marcus Daniels. -+ -+ * libgettext.h (__USE_GNU_GETTEXT): -+ Additional symbol to signal that we use GNU gettext -+ library. -+ -+ * cat-compat.c (bindtextdomain): -+ Fix bug with the strange stpcpy replacement. -+ Reported by Nelson Beebe. -+ -+Sat Sep 23 08:23:51 1995 Ulrich Drepper <drepper@myware> -+ -+ * cat-compat.c: Include <string.h> for stpcpy prototype. -+ -+ * localealias.c (read_alias_file): -+ While expand strdup code temporary variable `cp' hided -+ higher level variable with same name. Rename to `tp'. -+ -+ * textdomain.c (textdomain): -+ Avoid warning by using temporary variable in strdup code. -+ -+ * finddomain.c (_nl_find_domain): Remove unused variable `application'. -+ -+Thu Sep 21 15:51:44 1995 Ulrich Drepper <drepper@myware> -+ -+ * localealias.c (alias_compare): -+ Use strcasecmp() only if available. Else use -+ implementation in place. -+ -+ * intl-compat.c: -+ Wrapper functions now call *__ functions instead of __*. -+ -+ * libgettext.h: Declare prototypes for *__ functions instead for __*. -+ -+ * cat-compat.c, loadmsgcat.c: -+ Don't use xmalloc, xstrdup, and stpcpy. These functions are not part -+ of the standard libc and so prevent libintl.a from being used -+ standalone. -+ -+ * bindtextdom.c: -+ Don't use xmalloc, xstrdup, and stpcpy. These functions are not part -+ of the standard libc and so prevent libintl.a from being used -+ standalone. -+ Rename to bindtextdomain__ if not used in GNU C Library. -+ -+ * dgettext.c: -+ Rename function to dgettext__ if not used in GNU C Library. -+ -+ * gettext.c: -+ Don't use xmalloc, xstrdup, and stpcpy. These functions are not part -+ of the standard libc and so prevent libintl.a from being used -+ standalone. -+ Functions now called gettext__ if not used in GNU C Library. -+ -+ * dcgettext.c, localealias.c, textdomain.c, finddomain.c: -+ Don't use xmalloc, xstrdup, and stpcpy. These functions are not part -+ of the standard libc and so prevent libintl.a from being used -+ standalone. -+ -+Sun Sep 17 23:14:49 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c: Correct some bugs in handling of CEN standard -+ locale definitions. -+ -+Thu Sep 7 01:49:28 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c: Implement CEN syntax. -+ -+ * gettextP.h (loaded_domain): Extend number of successors to 31. -+ -+Sat Aug 19 19:25:29 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (aliaspath): Remove path to X11 locale dir. -+ -+ * Makefile.in: Make install-src depend on install. This helps -+ gettext to install the sources and other packages can use the -+ install goal. -+ -+Sat Aug 19 15:19:33 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (uninstall): Remove stuff installed by install-src. -+ -+Tue Aug 15 13:13:53 1995 Ulrich Drepper <drepper@myware> -+ -+ * VERSION.in: Initial revision. -+ -+ * Makefile.in (DISTFILES): -+ Add VERSION file. This is not necessary for gettext, but -+ for other packages using this library. -+ -+Tue Aug 15 06:16:44 1995 Ulrich Drepper <drepper@myware> -+ -+ * gettextP.h (_nl_find_domain): -+ New prototype after changing search strategy. -+ -+ * finddomain.c (_nl_find_domain): -+ We now try only to find a specified catalog. Fall back to other -+ catalogs listed in the locale list is now done in __dcgettext. -+ -+ * dcgettext.c (__dcgettext): -+ Now we provide message fall back even to different languages. -+ I.e. if a message is not available in one language all the other -+ in the locale list a tried. Formerly fall back was only possible -+ within one language. Implemented by moving one loop from -+ _nl_find_domain to here. -+ -+Mon Aug 14 23:45:50 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (gettextsrcdir): -+ Directory where source of GNU gettext library are made -+ available. -+ (INSTALL, INSTALL_DATA): Programs used for installing sources. -+ (gettext-src): New. Rule to install GNU gettext sources for use in -+ gettextize shell script. -+ -+Sun Aug 13 14:40:48 1995 Ulrich Drepper <drepper@myware> -+ -+ * loadmsgcat.c (_nl_load_domain): -+ Use mmap for loading only when munmap function is -+ also available. -+ -+ * Makefile.in (install): Depend on `all' goal. -+ -+Wed Aug 9 11:04:33 1995 Ulrich Drepper <drepper@myware> -+ -+ * localealias.c (read_alias_file): -+ Do not overwrite '\n' when terminating alias value string. -+ -+ * localealias.c (read_alias_file): -+ Handle long lines. Ignore the rest not fitting in -+ the buffer after the initial `fgets' call. -+ -+Wed Aug 9 00:54:29 1995 Ulrich Drepper <drepper@myware> -+ -+ * gettextP.h (_nl_load_domain): -+ Add prototype, replacing prototype for _nl_load_msg_cat. -+ -+ * finddomain.c (_nl_find_domain): -+ Remove unneeded variable filename and filename_len. -+ (expand_alias): Remove prototype because functions does not -+ exist anymore. -+ -+ * localealias.c (read_alias_file): -+ Change type of fname_len parameter to int. -+ (xmalloc): Add prototype. -+ -+ * loadmsgcat.c: Better prototypes for xmalloc. -+ -+Tue Aug 8 22:30:39 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (_nl_find_domain): -+ Allow alias name to be constructed from the four components. -+ -+ * Makefile.in (aliaspath): New variable. Set to preliminary value. -+ (SOURCES): Add localealias.c. -+ (OBJECTS): Add localealias.o. -+ -+ * gettextP.h: Add prototype for _nl_expand_alias. -+ -+ * finddomain.c: Aliasing handled in intl/localealias.c. -+ -+ * localealias.c: Aliasing for locale names. -+ -+ * bindtextdom.c: Better prototypes for xmalloc and xstrdup. -+ -+Mon Aug 7 23:47:42 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (DISTFILES): gettext.perl is now found in misc/. -+ -+ * cat-compat.c (bindtextdomain): -+ Correct implementation. dirname parameter was not used. -+ Reported by Marcus Daniels. -+ -+ * gettextP.h (loaded_domain): -+ New fields `successor' and `decided' for oo, lazy -+ message handling implementation. -+ -+ * dcgettext.c: -+ Adopt for oo, lazy message handliing. -+ Now we can inherit translations from less specific locales. -+ (find_msg): New function. -+ -+ * loadmsgcat.c, finddomain.c: -+ Complete rewrite. Implement oo, lazy message handling :-). -+ We now have an additional environment variable `LANGUAGE' with -+ a higher priority than LC_ALL for the LC_MESSAGE locale. -+ Here we can set a colon separated list of specifications each -+ of the form `language[_territory[.codeset]][@modifier]'. -+ -+Sat Aug 5 09:55:42 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (unistd.h): -+ Include to get _PC_PATH_MAX defined on system having it. -+ -+Fri Aug 4 22:42:00 1995 Ulrich Drepper <drepper@myware> -+ -+ * finddomain.c (stpcpy): Include prototype. -+ -+ * Makefile.in (dist): Remove `copying instead' message. -+ -+Wed Aug 2 18:52:03 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (ID, TAGS): Do not use $^. -+ -+Tue Aug 1 20:07:11 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (TAGS, ID): Use $^ as command argument. -+ (TAGS): Give etags -o option t write to current directory, -+ not $(srcdir). -+ (ID): Use $(srcdir) instead os $(top_srcdir)/src. -+ (distclean): Remove ID. -+ -+Sun Jul 30 11:51:46 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (gnulocaledir): -+ New variable, always using share/ for data directory. -+ (DEFS): Add GNULOCALEDIR, used in finddomain.c. -+ -+ * finddomain.c (_nl_default_dirname): -+ Set to GNULOCALEDIR, because it always has to point -+ to the directory where GNU gettext Library writes it to. -+ -+ * intl-compat.c (textdomain, bindtextdomain): -+ Undefine macros before function definition. -+ -+Sat Jul 22 01:10:02 1995 Ulrich Drepper <drepper@myware> -+ -+ * libgettext.h (_LIBINTL_H): -+ Protect definition in case where this file is included as -+ libgettext.h on Solaris machines. Add comment about this. -+ -+Wed Jul 19 02:36:42 1995 Ulrich Drepper <drepper@myware> -+ -+ * intl-compat.c (textdomain): Correct typo. -+ -+Wed Jul 19 01:51:35 1995 Ulrich Drepper <drepper@myware> -+ -+ * dcgettext.c (dcgettext): Function now called __dcgettext. -+ -+ * dgettext.c (dgettext): Now called __dgettext and calls -+ __dcgettext. -+ -+ * gettext.c (gettext): -+ Function now called __gettext and calls __dgettext. -+ -+ * textdomain.c (textdomain): Function now called __textdomain. -+ -+ * bindtextdom.c (bindtextdomain): Function now called -+ __bindtextdomain. -+ -+ * intl-compat.c: Initial revision. -+ -+ * Makefile.in (SOURCES): Add intl-compat.c. -+ (OBJECTS): We always compile the GNU gettext library functions. -+ OBJECTS contains all objects but cat-compat.o, ../po/cat-if-tbl.o, -+ and intl-compat.o. -+ (GETTOBJS): Contains now only intl-compat.o. -+ -+ * libgettext.h: -+ Re-include protection matches dualistic character of libgettext.h. -+ For all functions in GNU gettext library define __ counter part. -+ -+ * finddomain.c (strchr): Define as index if not found in C library. -+ (_nl_find_domain): For relative paths paste / in between. -+ -+Tue Jul 18 16:37:45 1995 Ulrich Drepper <drepper@myware> -+ -+ * loadmsgcat.c, finddomain.c: Add inclusion of sys/types.h. -+ -+ * xopen-msg.sed: Fix bug with `msgstr ""' lines. -+ A little bit better comments. -+ -+Tue Jul 18 01:18:27 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in: -+ po-mode.el, makelinks, combine-sh are now found in ../misc. -+ -+ * po-mode.el, makelinks, combine-sh, elisp-comp: -+ Moved to ../misc/. -+ -+ * libgettext.h, gettextP.h, gettext.h: Uniform test for __STDC__. -+ -+Sun Jul 16 22:33:02 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (INSTALL, INSTALL_DATA): New variables. -+ (install-data, uninstall): Install/uninstall .elc file. -+ -+ * po-mode.el (Installation comment): -+ Add .pox as possible extension of .po files. -+ -+Sun Jul 16 13:23:27 1995 Ulrich Drepper <drepper@myware> -+ -+ * elisp-comp: Complete new version by Franc,ois: This does not -+ fail when not compiling in the source directory. -+ -+Sun Jul 16 00:12:17 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (../po/cat-id-tbl.o): -+ Use $(MAKE) instead of make for recursive make. -+ -+ * Makefile.in (.el.elc): Use $(SHELL) instead of /bin/sh. -+ (install-exec): Add missing dummy goal. -+ (install-data, uninstall): @ in multi-line shell command at -+ beginning, not in front of echo. Reported by Eric Backus. -+ -+Sat Jul 15 00:21:28 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (DISTFILES): -+ Rename libgettext.perl to gettext.perl to fit in 14 chars -+ file systems. -+ -+ * gettext.perl: -+ Rename to gettext.perl to fit in 14 chars file systems. -+ -+Thu Jul 13 23:17:20 1995 Ulrich Drepper <drepper@myware> -+ -+ * cat-compat.c: If !STDC_HEADERS try to include malloc.h. -+ -+Thu Jul 13 20:55:02 1995 Ulrich Drepper <drepper@myware> -+ -+ * po2tbl.sed.in: Pretty printing. -+ -+ * linux-msg.sed, xopen-msg.sed: -+ Correct bugs with handling substitute flags in branches. -+ -+ * hash-string.h (hash_string): -+ Old K&R compilers don't under stand `unsigned char'. -+ -+ * gettext.h (nls_uint32): -+ Some old K&R compilers (eg HP) don't understand `unsigned int'. -+ -+ * cat-compat.c (msg_to_cat_id): De-ANSI-fy prototypes. -+ -+Thu Jul 13 01:34:33 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (ELCFILES): New variable. -+ (DISTFILES): Add elisp-comp. -+ Add implicit rule for .el -> .elc compilation. -+ (install-data): install $ELCFILES -+ (clean): renamed po-to-tbl and po-to-msg to po2tbl and po2msg resp. -+ -+ * elisp-comp: Initial revision -+ -+Wed Jul 12 16:14:52 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in: -+ cat-id-tbl.c is now found in po/. This enables us to use an identical -+ intl/ directory in all packages. -+ -+ * dcgettext.c (dcgettext): hashing does not work for table size <= 2. -+ -+ * textdomain.c: fix typo (#if def -> #if defined) -+ -+Tue Jul 11 18:44:43 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in (stamp-cat-id): use top_srcdir to address source files -+ (DISTFILES,distclean): move tupdate.perl to src/ -+ -+ * po-to-tbl.sed.in: -+ add additional jump to clear change flag to recognize multiline strings -+ -+Tue Jul 11 01:32:50 1995 Ulrich Drepper <drepper@myware> -+ -+ * textdomain.c: Protect inclusion of stdlib.h and string.h. -+ -+ * loadmsgcat.c: Protect inclusion of stdlib.h. -+ -+ * libgettext.h: Protect inclusion of locale.h. -+ Allow use in C++ programs. -+ Define NULL is not happened already. -+ -+ * Makefile.in (DISTFILES): ship po-to-tbl.sed.in instead of -+ po-to-tbl.sed. -+ (distclean): remove po-to-tbl.sed and tupdate.perl. -+ -+ * tupdate.perl.in: Substitute Perl path even in exec line. -+ Don't include entries without translation from old .po file. -+ -+Tue Jul 4 00:41:51 1995 Ulrich Drepper <drepper@myware> -+ -+ * tupdate.perl.in: use "Updated: " in msgid "". -+ -+ * cat-compat.c: Fix typo (LOCALDIR -> LOCALEDIR). -+ Define getenv if !__STDC__. -+ -+ * bindtextdom.c: Protect stdlib.h and string.h inclusion. -+ Define free if !__STDC__. -+ -+ * finddomain.c: Change DEF_MSG_DOM_DIR to LOCALEDIR. -+ Define free if !__STDC__. -+ -+ * cat-compat.c: Change DEF_MSG_DOM_DIR to LOCALEDIR. -+ -+Mon Jul 3 23:56:30 1995 Ulrich Drepper <drepper@myware> -+ -+ * Makefile.in: Use LOCALEDIR instead of DEF_MSG_DOM_DIR. -+ Remove unneeded $(srcdir) from Makefile.in dependency. -+ -+ * makelinks: Add copyright and short description. -+ -+ * po-mode.el: Last version for 0.7. -+ -+ * tupdate.perl.in: Fix die message. -+ -+ * dcgettext.c: Protect include of string.h. -+ -+ * gettext.c: Protect include of stdlib.h and further tries to get NULL. -+ -+ * finddomain.c: Some corrections in includes. -+ -+ * Makefile.in (INCLUDES): Prune list correct path to Makefile.in. -+ -+ * po-to-tbl.sed: Adopt for new .po file format. -+ -+ * linux-msg.sed, xopen-msg.sed: Adopt for new .po file format. -+ -+Sun Jul 2 23:55:03 1995 Ulrich Drepper <drepper@myware> -+ -+ * tupdate.perl.in: Complete rewrite for new .po file format. -+ -+Sun Jul 2 02:06:50 1995 Ulrich Drepper <drepper@myware> -+ -+ * First official release. This directory contains all the code -+ needed to internationalize own packages. It provides functions -+ which allow to use the X/Open catgets function with an interface -+ like the Uniforum gettext function. For system which does not -+ have neither of those a complete implementation is provided. -diff -urP ammonite-1.0.0.orig/intl/Makefile.in ammonite-1.0.0/intl/Makefile.in ---- ammonite-1.0.0.orig/intl/Makefile.in Wed Dec 31 19:00:00 1969 -+++ ammonite-1.0.0/intl/Makefile.in Wed Mar 14 14:04:38 2001 -@@ -0,0 +1,218 @@ -+# Makefile for directory with message catalog handling in GNU NLS Utilities. -+# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+# -+# This program 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 General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+PACKAGE = @PACKAGE@ -+VERSION = @VERSION@ -+ -+SHELL = /bin/sh -+ -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+top_builddir = .. -+VPATH = @srcdir@ -+ -+prefix = @prefix@ -+exec_prefix = @exec_prefix@ -+transform = @program_transform_name@ -+libdir = $(exec_prefix)/lib -+includedir = $(prefix)/include -+datadir = $(prefix)/@DATADIRNAME@ -+localedir = $(datadir)/locale -+gnulocaledir = $(prefix)/share/locale -+gettextsrcdir = @datadir@/gettext/intl -+aliaspath = $(localedir):. -+subdir = intl -+ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+MKINSTALLDIRS = @MKINSTALLDIRS@ -+ -+l = @l@ -+ -+AR = ar -+CC = @CC@ -+LIBTOOL = @LIBTOOL@ -+RANLIB = @RANLIB@ -+ -+DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \ -+-DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@ -+CPPFLAGS = @CPPFLAGS@ -+CFLAGS = @CFLAGS@ -+LDFLAGS = @LDFLAGS@ -+ -+COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) -+ -+HEADERS = $(COMHDRS) libgettext.h loadinfo.h -+COMHDRS = gettext.h gettextP.h hash-string.h -+SOURCES = $(COMSRCS) intl-compat.c cat-compat.c -+COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \ -+finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \ -+explodename.c -+OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \ -+finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \ -+explodename.$lo -+CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo -+GETTOBJS = intl-compat.$lo -+DISTFILES.common = ChangeLog Makefile.in linux-msg.sed po2tbl.sed.in \ -+xopen-msg.sed $(HEADERS) $(SOURCES) -+DISTFILES.normal = VERSION -+DISTFILES.gettext = libintl.glibc intlh.inst.in -+ -+.SUFFIXES: -+.SUFFIXES: .c .o .lo -+.c.o: -+ $(COMPILE) $< -+.c.lo: -+ $(LIBTOOL) --mode=compile $(COMPILE) $< -+ -+INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib -+ -+all: all-@USE_INCLUDED_LIBINTL@ -+ -+all-yes: libintl.$la intlh.inst -+all-no: -+ -+libintl.a: $(OBJECTS) -+ rm -f $@ -+ $(AR) cru $@ $(OBJECTS) -+ $(RANLIB) $@ -+ -+libintl.la: $(OBJECTS) -+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \ -+ -version-info 1:0 -rpath $(libdir) -+ -+../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot -+ cd ../po && $(MAKE) cat-id-tbl.$lo -+ -+check: all -+ -+# This installation goal is only used in GNU gettext. Packages which -+# only use the library should use install instead. -+ -+# We must not install the libintl.h/libintl.a files if we are on a -+# system which has the gettext() function in its C library or in a -+# separate library or use the catgets interface. A special case is -+# where configure found a previously installed GNU gettext library. -+# If you want to use the one which comes with this version of the -+# package, you have to use `configure --with-included-gettext'. -+install: install-exec install-data -+install-exec: all -+ if test "$(PACKAGE)" = "gettext" \ -+ && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ -+ if test -r $(MKINSTALLDIRS); then \ -+ $(MKINSTALLDIRS) $(libdir) $(includedir); \ -+ else \ -+ $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \ -+ fi; \ -+ $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \ -+ $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \ -+ else \ -+ : ; \ -+ fi -+install-data: all -+ if test "$(PACKAGE)" = "gettext"; then \ -+ if test -r $(MKINSTALLDIRS); then \ -+ $(MKINSTALLDIRS) $(gettextsrcdir); \ -+ else \ -+ $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \ -+ fi; \ -+ $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \ -+ dists="$(DISTFILES.common)"; \ -+ for file in $$dists; do \ -+ $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \ -+ done; \ -+ else \ -+ : ; \ -+ fi -+ -+# Define this as empty until I found a useful application. -+installcheck: -+ -+uninstall: -+ if test "$(PACKAGE)" = "gettext"; then \ -+ dists="$(DISTFILES.common)"; \ -+ for file in $$dists; do \ -+ rm -f $(gettextsrcdir)/$$file; \ -+ done \ -+ else \ -+ : ; \ -+ fi -+ -+info dvi: -+ -+$(OBJECTS): ../config.h libgettext.h -+bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h -+dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h -+ -+tags: TAGS -+ -+TAGS: $(HEADERS) $(SOURCES) -+ here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES) -+ -+id: ID -+ -+ID: $(HEADERS) $(SOURCES) -+ here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES) -+ -+ -+mostlyclean: -+ rm -f *.a *.o *.lo core core.* -+ -+clean: mostlyclean -+ -+distclean: clean -+ rm -f Makefile ID TAGS po2msg.sed po2tbl.sed -+ -+maintainer-clean: distclean -+ @echo "This command is intended for maintainers to use;" -+ @echo "it deletes files that may require special tools to rebuild." -+ -+ -+# GNU gettext needs not contain the file `VERSION' but contains some -+# other files which should not be distributed in other packages. -+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) -+dist distdir: Makefile $(DISTFILES) -+ if test "$(PACKAGE)" = gettext; then \ -+ additional="$(DISTFILES.gettext)"; \ -+ else \ -+ additional="$(DISTFILES.normal)"; \ -+ fi; \ -+ for file in $(DISTFILES.common) $$additional; do \ -+ ln $(srcdir)/$$file $(distdir) 2> /dev/null \ -+ || cp -p $(srcdir)/$$file $(distdir); \ -+ done -+ -+dist-libc: -+ tar zcvf intl-glibc.tar.gz $(COMSRCS) $(COMHDRS) libintl.h.glibc -+ -+Makefile: Makefile.in ../config.status -+ cd .. \ -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+ -+# The dependency for intlh.inst is different in gettext and all other -+# packages. Because we cannot you GNU make features we have to solve -+# the problem while rewriting Makefile.in. -+@GT_YES@intlh.inst: intlh.inst.in ../config.status -+@GT_YES@ cd .. \ -+@GT_YES@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \ -+@GT_YES@ $(SHELL) ./config.status -+@GT_NO@.PHONY: intlh.inst -+@GT_NO@intlh.inst: -+ -+# Tell versions [3.59,3.63) of GNU make not to export all variables. -+# Otherwise a system limit (for SysV at least) may be exceeded. -+.NOEXPORT: -diff -urP ammonite-1.0.0.orig/intl/VERSION ammonite-1.0.0/intl/VERSION ---- ammonite-1.0.0.orig/intl/VERSION Wed Dec 31 19:00:00 1969 -+++ ammonite-1.0.0/intl/VERSION Wed Mar 14 14:04:38 2001 -@@ -0,0 +1 @@ -+GNU gettext library from gettext-0.10.35 -diff -urP ammonite-1.0.0.orig/intl/bindtextdom.c ammonite-1.0.0/intl/bindtextdom.c ---- ammonite-1.0.0.orig/intl/bindtextdom.c Wed Dec 31 19:00:00 1969 -+++ ammonite-1.0.0/intl/bindtextdom.c Wed Mar 14 14:04:38 2001 -@@ -0,0 +1,203 @@ -+/* Implementation of the bindtextdomain(3) function -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#else -+# ifdef HAVE_MALLOC_H -+# include <malloc.h> -+# else -+void free (); -+# endif -+#endif -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# include <string.h> -+#else -+# include <strings.h> -+# ifndef memcpy -+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -+# endif -+#endif -+ -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+#include "gettext.h" -+#include "gettextP.h" -+ -+/* @@ end of prolog @@ */ -+ -+/* Contains the default location of the message catalogs. */ -+extern const char _nl_default_dirname[]; -+ -+/* List with bindings of specific domains. */ -+extern struct binding *_nl_domain_bindings; -+ -+ -+/* Names for the libintl functions are a problem. They must not clash -+ with existing names and they should follow ANSI C. But this source -+ code is also used in GNU C Library where the names have a __ -+ prefix. So we have to make a difference here. */ -+#ifdef _LIBC -+# define BINDTEXTDOMAIN __bindtextdomain -+# ifndef strdup -+# define strdup(str) __strdup (str) -+# endif -+#else -+# define BINDTEXTDOMAIN bindtextdomain__ -+#endif -+ -+/* Specify that the DOMAINNAME message catalog will be found -+ in DIRNAME rather than in the system locale data base. */ -+char * -+BINDTEXTDOMAIN (domainname, dirname) -+ const char *domainname; -+ const char *dirname; -+{ -+ struct binding *binding; -+ -+ /* Some sanity checks. */ -+ if (domainname == NULL || domainname[0] == '\0') -+ return NULL; -+ -+ for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) -+ { -+ int compare = strcmp (domainname, binding->domainname); -+ if (compare == 0) -+ /* We found it! */ -+ break; -+ if (compare < 0) -+ { -+ /* It is not in the list. */ -+ binding = NULL; -+ break; -+ } -+ } -+ -+ if (dirname == NULL) -+ /* The current binding has be to returned. */ -+ return binding == NULL ? (char *) _nl_default_dirname : binding->dirname; -+ -+ if (binding != NULL) -+ { -+ /* The domain is already bound. If the new value and the old -+ one are equal we simply do nothing. Otherwise replace the -+ old binding. */ -+ if (strcmp (dirname, binding->dirname) != 0) -+ { -+ char *new_dirname; -+ -+ if (strcmp (dirname, _nl_default_dirname) == 0) -+ new_dirname = (char *) _nl_default_dirname; -+ else -+ { -+#if defined _LIBC || defined HAVE_STRDUP -+ new_dirname = strdup (dirname); -+ if (new_dirname == NULL) -+ return NULL; -+#else -+ size_t len = strlen (dirname) + 1; -+ new_dirname = (char *) malloc (len); -+ if (new_dirname == NULL) -+ return NULL; -+ -+ memcpy (new_dirname, dirname, len); -+#endif -+ } -+ -+ if (binding->dirname != _nl_default_dirname) -+ free (binding->dirname); -+ -+ binding->dirname = new_dirname; -+ } -+ } -+ else -+ { -+ /* We have to create a new binding. */ -+#if !defined _LIBC && !defined HAVE_STRDUP -+ size_t len; -+#endif -+ struct binding *new_binding = -+ (struct binding *) malloc (sizeof (*new_binding)); -+ -+ if (new_binding == NULL) -+ return NULL; -+ -+#if defined _LIBC || defined HAVE_STRDUP -+ new_binding->domainname = strdup (domainname); -+ if (new_binding->domainname == NULL) -+ return NULL; -+#else -+ len = strlen (domainname) + 1; -+ new_binding->domainname = (char *) malloc (len); -+ if (new_binding->domainname == NULL) -+ return NULL; -+ memcpy (new_binding->domainname, domainname, len); -+#endif -+ -+ if (strcmp (dirname, _nl_default_dirname) == 0) -+ new_binding->dirname = (char *) _nl_default_dirname; -+ else -+ { -+#if defined _LIBC || defined HAVE_STRDUP -+ new_binding->dirname = strdup (dirname); -+ if (new_binding->dirname == NULL) -+ return NULL; -+#else -+ len = strlen (dirname) + 1; -+ new_binding->dirname = (char *) malloc (len); -+ if (new_binding->dirname == NULL) -+ return NULL; -+ memcpy (new_binding->dirname, dirname, len); -+#endif -+ } -+ -+ /* Now enqueue it. */ -+ if (_nl_domain_bindings == NULL -+ || strcmp (domainname, _nl_domain_bindings->domainname) < 0) -+ { -+ new_binding->next = _nl_domain_bindings; -+ _nl_domain_bindings = new_binding; -+ } -+ else -+ { -+ binding = _nl_domain_bindings; -+ while (binding->next != NULL -+ && strcmp (domainname, binding->next->domainname) > 0) -+ binding = binding->next; -+ -+ new_binding->next = binding->next; -+ binding->next = new_binding; -+ } -+ -+ binding = new_binding; -+ } -+ -+ return binding->dirname; -+} -+ -+#ifdef _LIBC -+/* Alias for function name in GNU C Library. */ -+weak_alias (__bindtextdomain, bindtextdomain); -+#endif -diff -urP ammonite-1.0.0.orig/intl/cat-compat.c ammonite-1.0.0/intl/cat-compat.c ---- ammonite-1.0.0.orig/intl/cat-compat.c Wed Dec 31 19:00:00 1969 -+++ ammonite-1.0.0/intl/cat-compat.c Wed Mar 14 14:04:38 2001 -@@ -0,0 +1,262 @@ -+/* Compatibility code for gettext-using-catgets interface. -+ Copyright (C) 1995, 1997 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <stdio.h> -+ -+#ifdef STDC_HEADERS -+# include <stdlib.h> -+# include <string.h> -+#else -+char *getenv (); -+# ifdef HAVE_MALLOC_H -+# include <malloc.h> -+# endif -+#endif -+ -+#ifdef HAVE_NL_TYPES_H -+# include <nl_types.h> -+#endif -+ -+#include "libgettext.h" -+ -+/* @@ end of prolog @@ */ -+ -+/* XPG3 defines the result of `setlocale (category, NULL)' as: -+ ``Directs `setlocale()' to query `category' and return the current -+ setting of `local'.'' -+ However it does not specify the exact format. And even worse: POSIX -+ defines this not at all. So we can use this feature only on selected -+ system (e.g. those using GNU C Library). */ -+#ifdef _LIBC -+# define HAVE_LOCALE_NULL -+#endif -+ -+/* The catalog descriptor. */ -+static nl_catd catalog = (nl_catd) -1; -+ -+/* Name of the default catalog. */ -+static const char default_catalog_name[] = "messages"; -+ -+/* Name of currently used catalog. */ -+static const char *catalog_name = default_catalog_name; -+ -+/* Get ID for given string. If not found return -1. */ -+static int msg_to_cat_id PARAMS ((const char *msg)); -+ -+/* Substitution for systems lacking this function in their C library. */ -+#if !_LIBC && !HAVE_STPCPY -+static char *stpcpy PARAMS ((char *dest, const char *src)); -+#endif -+ -+ -+/* Set currently used domain/catalog. */ -+char * -+textdomain (domainname) -+ const char *domainname; -+{ -+ nl_catd new_catalog; -+ char *new_name; -+ size_t new_name_len; -+ char *lang; -+ -+#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES \ -+ && defined HAVE_LOCALE_NULL -+ lang = setlocale (LC_MESSAGES, NULL); -+#else -+ lang = getenv ("LC_ALL"); -+ if (lang == NULL || lang[0] == '\0') -+ { -+ lang = getenv ("LC_MESSAGES"); -+ if (lang == NULL || lang[0] == '\0') -+ lang = getenv ("LANG"); -+ } -+#endif -+ if (lang == NULL || lang[0] == '\0') -+ lang = "C"; -+ -+ /* See whether name of currently used domain is asked. */ -+ if (domainname == NULL) -+ return (char *) catalog_name; -+ -+ if (domainname[0] == '\0') -+ domainname = default_catalog_name; -+ -+ /* Compute length of added path element. */ -+ new_name_len = sizeof (LOCALEDIR) - 1 + 1 + strlen (lang) -+ + sizeof ("/LC_MESSAGES/") - 1 + sizeof (PACKAGE) - 1 -+ + sizeof (".cat"); -+ -+ new_name = (char *) malloc (new_name_len); -+ if (new_name == NULL) -+ return NULL; -+ -+ strcpy (new_name, PACKAGE); -+ new_catalog = catopen (new_name, 0); -+ -+ if (new_catalog == (nl_catd) -1) -+ { -+ /* NLSPATH search didn't work, try absolute path */ -+ sprintf (new_name, "%s/%s/LC_MESSAGES/%s.cat", LOCALEDIR, lang, -+ PACKAGE); -+ new_catalog = catopen (new_name, 0); -+ -+ if (new_catalog == (nl_catd) -1) -+ { -+ free (new_name); -+ return (char *) catalog_name; -+ } -+ } -+ -+ /* Close old catalog. */ -+ if (catalog != (nl_catd) -1) -+ catclose (catalog); -+ if (catalog_name != default_catalog_name) -+ free ((char *) catalog_name); -+ -+ catalog = new_catalog; -+ catalog_name = new_name; -+ -+ return (char *) catalog_name; -+} -+ -+char * -+bindtextdomain (domainname, dirname) -+ const char *domainname; -+ const char *dirname; -+{ -+#if HAVE_SETENV || HAVE_PUTENV -+ char *old_val, *new_val, *cp; -+ size_t new_val_len; -+ -+ /* This does not make much sense here but to be compatible do it. */ -+ if (domainname == NULL) -+ return NULL; -+ -+ /* Compute length of added path element. If we use setenv we don't need -+ the first byts for NLSPATH=, but why complicate the code for this -+ peanuts. */ -+ new_val_len = sizeof ("NLSPATH=") - 1 + strlen (dirname) -+ + sizeof ("/%L/LC_MESSAGES/%N.cat"); -+ -+ old_val = getenv ("NLSPATH"); -+ if (old_val == NULL || old_val[0] == '\0') -+ { -+ old_val = NULL; -+ new_val_len += 1 + sizeof (LOCALEDIR) - 1 -+ + sizeof ("/%L/LC_MESSAGES/%N.cat"); -+ } -+ else -+ new_val_len += strlen (old_val); -+ -+ new_val = (char *) malloc (new_val_len); -+ if (new_val == NULL) -+ return NULL; -+ -+# if HAVE_SETENV -+ cp = new_val; -+# else -+ cp = stpcpy (new_val, "NLSPATH="); -+# endif -+ -+ cp = stpcpy (cp, dirname); -+ cp = stpcpy (cp, "/%L/LC_MESSAGES/%N.cat:"); -+ -+ if (old_val == NULL) -+ { -+# if __STDC__ -+ stpcpy (cp, LOCALEDIR "/%L/LC_MESSAGES/%N.cat"); -+# else -+ -+ cp = stpcpy (cp, LOCALEDIR); -+ stpcpy (cp, "/%L/LC_MESSAGES/%N.cat"); -+# endif -+ } -+ else -+ stpcpy (cp, old_val); -+ -+# if HAVE_SETENV -+ setenv ("NLSPATH", new_val, 1); -+ free (new_val); -+# else -+ putenv (new_val); -+ /* Do *not* free the environment entry we just entered. It is used -+ from now on. */ -+# endif -+ -+#endif -+ -+ return (char *) domainname; -+} -+ -+#undef gettext -+char * -+gettext (msg) -+ const char *msg; -+{ -+ int msgid; -+ -+ if (msg == NULL || catalog == (nl_catd) -1) -+ return (char *) msg; -+ -+ /* Get the message from the catalog. We always use set number 1. -+ The message ID is computed by the function `msg_to_cat_id' -+ which works on the table generated by `po-to-tbl'. */ -+ msgid = msg_to_cat_id (msg); -+ if (msgid == -1) -+ return (char *) msg; -+ -+ return catgets (catalog, 1, msgid, (char *) msg); -+} -+ -+/* Look through the table `_msg_tbl' which has `_msg_tbl_length' entries -+ for the one equal to msg. If it is found return the ID. In case when -+ the string is not found return -1. */ -+static int -+msg_to_cat_id (msg) -+ const char *msg; -+{ -+ int cnt; -+ -+ for (cnt = 0; cnt < _msg_tbl_length; ++cnt) -+ if (strcmp (msg, _msg_tbl[cnt]._msg) == 0) -+ return _msg_tbl[cnt]._msg_number; -+ -+ return -1; -+} -+ -+ -+/* @@ begin of epilog @@ */ -+ -+/* We don't want libintl.a to depend on any other library. So we -+ avoid the non-standard function stpcpy. In GNU C Library this -+ function is available, though. Also allow the symbol HAVE_STPCPY -+ to be defined. */ -+#if !_LIBC && !HAVE_STPCPY -+static char * -+stpcpy (dest, src) -+ char *dest; -+ const char *src; -+{ -+ while ((*dest++ = *src++) != '\0') -+ /* Do nothing. */ ; -+ return dest - 1; -+} -+#endif -diff -urP ammonite-1.0.0.orig/intl/dcgettext.c ammonite-1.0.0/intl/dcgettext.c ---- ammonite-1.0.0.orig/intl/dcgettext.c Wed Dec 31 19:00:00 1969 -+++ ammonite-1.0.0/intl/dcgettext.c Wed Mar 14 14:04:38 2001 -@@ -0,0 +1,655 @@ -+/* Implementation of the dcgettext(3) function. -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <sys/types.h> -+ -+#if defined __GNUC__ && !defined C_ALLOCA -+# define alloca __builtin_alloca -+# define HAVE_ALLOCA 1 -+#else -+# if (defined HAVE_ALLOCA_H || defined _LIBC) && !defined C_ALLOCA -+# include <alloca.h> -+# else -+# ifdef _AIX -+ #pragma alloca -+# else -+# ifndef alloca -+char *alloca (); -+# endif -+# endif -+# endif -+#endif -+ -+#include <errno.h> -+#ifndef errno -+extern int errno; -+#endif -+#ifndef __set_errno -+# define __set_errno(val) errno = (val) -+#endif -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#else -+char *getenv (); -+# ifdef HAVE_MALLOC_H -+# include <malloc.h> -+# else -+void free (); -+# endif -+#endif -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# ifndef _GNU_SOURCE -+# define _GNU_SOURCE 1 -+# endif -+# include <string.h> -+#else -+# include <strings.h> -+#endif -+#if !HAVE_STRCHR && !defined _LIBC -+# ifndef strchr -+# define strchr index -+# endif -+#endif -+ -+#if defined HAVE_UNISTD_H || defined _LIBC -+# include <unistd.h> -+#endif -+ -+#include "gettext.h" -+#include "gettextP.h" -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+#include "hash-string.h" -+ -+/* @@ end of prolog @@ */ -+ -+#ifdef _LIBC -+/* Rename the non ANSI C functions. This is required by the standard -+ because some ANSI C functions will require linking with this object -+ file and the name space must not be polluted. */ -+# define getcwd __getcwd -+# ifndef stpcpy -+# define stpcpy __stpcpy -+# endif -+#else -+# if !defined HAVE_GETCWD -+char *getwd (); -+# define getcwd(buf, max) getwd (buf) -+# else -+char *getcwd (); -+# endif -+# ifndef HAVE_STPCPY -+static char *stpcpy PARAMS ((char *dest, const char *src)); -+# endif -+#endif -+ -+/* Amount to increase buffer size by in each try. */ -+#define PATH_INCR 32 -+ -+/* The following is from pathmax.h. */ -+/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define -+ PATH_MAX but might cause redefinition warnings when sys/param.h is -+ later included (as on MORE/BSD 4.3). */ -+#if defined(_POSIX_VERSION) || (defined(HAVE_LIMITS_H) && !defined(__GNUC__)) -+# include <limits.h> -+#endif -+ -+#ifndef _POSIX_PATH_MAX -+# define _POSIX_PATH_MAX 255 -+#endif -+ -+#if !defined(PATH_MAX) && defined(_PC_PATH_MAX) -+# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX)) -+#endif -+ -+/* Don't include sys/param.h if it already has been. */ -+#if defined(HAVE_SYS_PARAM_H) && !defined(PATH_MAX) && !defined(MAXPATHLEN) -+# include <sys/param.h> -+#endif -+ -+#if !defined(PATH_MAX) && defined(MAXPATHLEN) -+# define PATH_MAX MAXPATHLEN -+#endif -+ -+#ifndef PATH_MAX -+# define PATH_MAX _POSIX_PATH_MAX -+#endif -+ -+/* XPG3 defines the result of `setlocale (category, NULL)' as: -+ ``Directs `setlocale()' to query `category' and return the current -+ setting of `local'.'' -+ However it does not specify the exact format. And even worse: POSIX -+ defines this not at all. So we can use this feature only on selected -+ system (e.g. those using GNU C Library). */ -+#ifdef _LIBC -+# define HAVE_LOCALE_NULL -+#endif -+ -+/* Name of the default domain used for gettext(3) prior any call to -+ textdomain(3). The default value for this is "messages". */ -+const char _nl_default_default_domain[] = "messages"; -+ -+/* Value used as the default domain for gettext(3). */ -+const char *_nl_current_default_domain = _nl_default_default_domain; -+ -+/* Contains the default location of the message catalogs. */ -+const char _nl_default_dirname[] = GNULOCALEDIR; -+ -+/* List with bindings of specific domains created by bindtextdomain() -+ calls. */ -+struct binding *_nl_domain_bindings; -+ -+/* Prototypes for local functions. */ -+static char *find_msg PARAMS ((struct loaded_l10nfile *domain_file, -+ const char *msgid)) internal_function; -+static const char *category_to_name PARAMS ((int category)) internal_function; -+static const char *guess_category_value PARAMS ((int category, -+ const char *categoryname)) -+ internal_function; -+ -+ -+/* For those loosing systems which don't have `alloca' we have to add -+ some additional code emulating it. */ -+#ifdef HAVE_ALLOCA -+/* Nothing has to be done. */ -+# define ADD_BLOCK(list, address) /* nothing */ -+# define FREE_BLOCKS(list) /* nothing */ -+#else -+struct block_list -+{ -+ void *address; -+ struct block_list *next; -+}; -+# define ADD_BLOCK(list, addr) \ -+ do { \ -+ struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \ -+ /* If we cannot get a free block we cannot add the new element to \ -+ the list. */ \ -+ if (newp != NULL) { \ -+ newp->address = (addr); \ -+ newp->next = (list); \ -+ (list) = newp; \ -+ } \ -+ } while (0) -+# define FREE_BLOCKS(list) \ -+ do { \ -+ while (list != NULL) { \ -+ struct block_list *old = list; \ -+ list = list->next; \ -+ free (old); \ -+ } \ -+ } while (0) -+# undef alloca -+# define alloca(size) (malloc (size)) -+#endif /* have alloca */ -+ -+ -+/* Names for the libintl functions are a problem. They must not clash -+ with existing names and they should follow ANSI C. But this source -+ code is also used in GNU C Library where the names have a __ -+ prefix. So we have to make a difference here. */ -+#ifdef _LIBC -+# define DCGETTEXT __dcgettext -+#else -+# define DCGETTEXT dcgettext__ -+#endif -+ -+/* Checking whether the binaries runs SUID must be done and glibc provides -+ easier methods therefore we make a difference here. */ -+#ifdef _LIBC -+# define ENABLE_SECURE __libc_enable_secure -+# define DETERMINE_SECURE -+#else -+static int enable_secure; -+# define ENABLE_SECURE (enable_secure == 1) -+# define DETERMINE_SECURE \ -+ if (enable_secure == 0) \ -+ { \ -+ if (getuid () != geteuid () || getgid () != getegid ()) \ -+ enable_secure = 1; \ -+ else \ -+ enable_secure = -1; \ -+ } -+#endif -+ -+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY -+ locale. */ -+char * -+DCGETTEXT (domainname, msgid, category) -+ const char *domainname; -+ const char *msgid; -+ int category; -+{ -+#ifndef HAVE_ALLOCA -+ struct block_list *block_list = NULL; -+#endif -+ struct loaded_l10nfile *domain; -+ struct binding *binding; -+ const char *categoryname; -+ const char *categoryvalue; -+ char *dirname, *xdomainname; -+ char *single_locale; -+ char *retval; -+ int saved_errno = errno; -+ -+ /* If no real MSGID is given return NULL. */ -+ if (msgid == NULL) -+ return NULL; -+ -+ /* See whether this is a SUID binary or not. */ -+ DETERMINE_SECURE; -+ -+ /* If DOMAINNAME is NULL, we are interested in the default domain. If -+ CATEGORY is not LC_MESSAGES this might not make much sense but the -+ definition left this undefined. */ -+ if (domainname == NULL) -+ domainname = _nl_current_default_domain; -+ -+ /* First find matching binding. */ -+ for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) -+ { -+ int compare = strcmp (domainname, binding->domainname); -+ if (compare == 0) -+ /* We found it! */ -+ break; -+ if (compare < 0) -+ { -+ /* It is not in the list. */ -+ binding = NULL; -+ break; -+ } -+ } -+ -+ if (binding == NULL) -+ dirname = (char *) _nl_default_dirname; -+ else if (binding->dirname[0] == '/') -+ dirname = binding->dirname; -+ else -+ { -+ /* We have a relative path. Make it absolute now. */ -+ size_t dirname_len = strlen (binding->dirname) + 1; -+ size_t path_max; -+ char *ret; -+ -+ path_max = (unsigned int) PATH_MAX; -+ path_max += 2; /* The getcwd docs say to do this. */ -+ -+ dirname = (char *) alloca (path_max + dirname_len); -+ ADD_BLOCK (block_list, dirname); -+ -+ __set_errno (0); -+ while ((ret = getcwd (dirname, path_max)) == NULL && errno == ERANGE) -+ { -+ path_max += PATH_INCR; -+ dirname = (char *) alloca (path_max + dirname_len); -+ ADD_BLOCK (block_list, dirname); -+ __set_errno (0); -+ } -+ -+ if (ret == NULL) -+ { -+ /* We cannot get the current working directory. Don't signal an -+ error but simply return the default string. */ -+ FREE_BLOCKS (block_list); -+ __set_errno (saved_errno); -+ return (char *) msgid; -+ } -+ -+ stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname); -+ } -+ -+ /* Now determine the symbolic name of CATEGORY and its value. */ -+ categoryname = category_to_name (category); -+ categoryvalue = guess_category_value (category, categoryname); -+ -+ xdomainname = (char *) alloca (strlen (categoryname) -+ + strlen (domainname) + 5); -+ ADD_BLOCK (block_list, xdomainname); -+ -+ stpcpy (stpcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"), -+ domainname), -+ ".mo"); -+ -+ /* Creating working area. */ -+ single_locale = (char *) alloca (strlen (categoryvalue) + 1); -+ ADD_BLOCK (block_list, single_locale); -+ -+ -+ /* Search for the given string. This is a loop because we perhaps -+ got an ordered list of languages to consider for the translation. */ -+ while (1) -+ { -+ /* Make CATEGORYVALUE point to the next element of the list. */ -+ while (categoryvalue[0] != '\0' && categoryvalue[0] == ':') -+ ++categoryvalue; -+ if (categoryvalue[0] == '\0') -+ { -+ /* The whole contents of CATEGORYVALUE has been searched but -+ no valid entry has been found. We solve this situation -+ by implicitly appending a "C" entry, i.e. no translation -+ will take place. */ -+ single_locale[0] = 'C'; -+ single_locale[1] = '\0'; -+ } -+ else -+ { -+ char *cp = single_locale; -+ while (categoryvalue[0] != '\0' && categoryvalue[0] != ':') -+ *cp++ = *categoryvalue++; -+ *cp = '\0'; -+ -+ /* When this is a SUID binary we must not allow accessing files -+ outside the dedicated directories. */ -+ if (ENABLE_SECURE -+ && (memchr (single_locale, '/', -+ _nl_find_language (single_locale) - single_locale) -+ != NULL)) -+ /* Ingore this entry. */ -+ continue; -+ } -+ -+ /* If the current locale value is C (or POSIX) we don't load a -+ domain. Return the MSGID. */ -+ if (strcmp (single_locale, "C") == 0 -+ || strcmp (single_locale, "POSIX") == 0) -+ { -+ FREE_BLOCKS (block_list); -+ __set_errno (saved_errno); -+ return (char *) msgid; -+ } -+ -+ -+ /* Find structure describing the message catalog matching the -+ DOMAINNAME and CATEGORY. */ -+ domain = _nl_find_domain (dirname, single_locale, xdomainname); -+ -+ if (domain != NULL) -+ { -+ retval = find_msg (domain, msgid); -+ -+ if (retval == NULL) -+ { -+ int cnt; -+ -+ for (cnt = 0; domain->successor[cnt] != NULL; ++cnt) -+ { -+ retval = find_msg (domain->successor[cnt], msgid); -+ -+ if (retval != NULL) -+ break; -+ } -+ } -+ -+ if (retval != NULL) -+ { -+ FREE_BLOCKS (block_list); -+ __set_errno (saved_errno); -+ return retval; -+ } -+ } -+ } -+ /* NOTREACHED */ -+} -+ -+#ifdef _LIBC -+/* Alias for function name in GNU C Library. */ -+weak_alias (__dcgettext, dcgettext); -+#endif -+ -+ -+static char * -+internal_function -+find_msg (domain_file, msgid) -+ struct loaded_l10nfile *domain_file; -+ const char *msgid; -+{ -+ size_t act = 0; -+ size_t top, bottom; -+ struct loaded_domain *domain; -+ -+ if (domain_file->decided == 0) -+ _nl_load_domain (domain_file); -+ -+ if (domain_file->data == NULL) -+ return NULL; -+ -+ domain = (struct loaded_domain *) domain_file->data; -+ -+ /* Locate the MSGID and its translation. */ -+ if (domain->hash_size > 2 && domain->hash_tab != NULL) -+ { -+ /* Use the hashing table. */ -+ nls_uint32 len = strlen (msgid); -+ nls_uint32 hash_val = hash_string (msgid); -+ nls_uint32 idx = hash_val % domain->hash_size; -+ nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2)); -+ nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]); -+ -+ if (nstr == 0) -+ /* Hash table entry is empty. */ -+ return NULL; -+ -+ if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len -+ && strcmp (msgid, -+ domain->data + W (domain->must_swap, -+ domain->orig_tab[nstr - 1].offset)) == 0) -+ return (char *) domain->data + W (domain->must_swap, -+ domain->trans_tab[nstr - 1].offset); -+ -+ while (1) -+ { -+ if (idx >= domain->hash_size - incr) -+ idx -= domain->hash_size - incr; -+ else -+ idx += incr; -+ -+ nstr = W (domain->must_swap, domain->hash_tab[idx]); -+ if (nstr == 0) -+ /* Hash table entry is empty. */ -+ return NULL; -+ -+ if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len -+ && strcmp (msgid, -+ domain->data + W (domain->must_swap, -+ domain->orig_tab[nstr - 1].offset)) -+ == 0) -+ return (char *) domain->data -+ + W (domain->must_swap, domain->trans_tab[nstr - 1].offset); -+ } -+ /* NOTREACHED */ -+ } -+ -+ /* Now we try the default method: binary search in the sorted -+ array of messages. */ -+ bottom = 0; -+ top = domain->nstrings; -+ while (bottom < top) -+ { -+ int cmp_val; -+ -+ act = (bottom + top) / 2; -+ cmp_val = strcmp (msgid, domain->data -+ + W (domain->must_swap, -+ domain->orig_tab[act].offset)); -+ if (cmp_val < 0) -+ top = act; -+ else if (cmp_val > 0) -+ bottom = act + 1; -+ else -+ break; -+ } -+ -+ /* If an translation is found return this. */ -+ return bottom >= top ? NULL : (char *) domain->data -+ + W (domain->must_swap, -+ domain->trans_tab[act].offset); -+} -+ -+ -+/* Return string representation of locale CATEGORY. */ -+static const char * -+internal_function -+category_to_name (category) -+ int category; -+{ -+ const char *retval; -+ -+ switch (category) -+ { -+#ifdef LC_COLLATE -+ case LC_COLLATE: -+ retval = "LC_COLLATE"; -+ break; -+#endif -+#ifdef LC_CTYPE -+ case LC_CTYPE: -+ retval = "LC_CTYPE"; -+ break; -+#endif -+#ifdef LC_MONETARY -+ case LC_MONETARY: -+ retval = "LC_MONETARY"; -+ break; -+#endif -+#ifdef LC_NUMERIC -+ case LC_NUMERIC: -+ retval = "LC_NUMERIC"; -+ break; -+#endif -+#ifdef LC_TIME -+ case LC_TIME: -+ retval = "LC_TIME"; -+ break; -+#endif -+#ifdef LC_MESSAGES -+ case LC_MESSAGES: -+ retval = "LC_MESSAGES"; -+ break; -+#endif -+#ifdef LC_RESPONSE -+ case LC_RESPONSE: -+ retval = "LC_RESPONSE"; -+ break; -+#endif -+#ifdef LC_ALL -+ case LC_ALL: -+ /* This might not make sense but is perhaps better than any other -+ value. */ -+ retval = "LC_ALL"; -+ break; -+#endif -+ default: -+ /* If you have a better idea for a default value let me know. */ -+ retval = "LC_XXX"; -+ } -+ -+ return retval; -+} -+ -+/* Guess value of current locale from value of the environment variables. */ -+static const char * -+internal_function -+guess_category_value (category, categoryname) -+ int category; -+ const char *categoryname; -+{ -+ const char *retval; -+ -+ /* The highest priority value is the `LANGUAGE' environment -+ variable. This is a GNU extension. */ -+ retval = getenv ("LANGUAGE"); -+ if (retval != NULL && retval[0] != '\0') -+ return retval; -+ -+ /* `LANGUAGE' is not set. So we have to proceed with the POSIX -+ methods of looking to `LC_ALL', `LC_xxx', and `LANG'. On some -+ systems this can be done by the `setlocale' function itself. */ -+#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL -+ return setlocale (category, NULL); -+#else -+ /* Setting of LC_ALL overwrites all other. */ -+ retval = getenv ("LC_ALL"); -+ if (retval != NULL && retval[0] != '\0') -+ return retval; -+ -+ /* Next comes the name of the desired category. */ -+ retval = getenv (categoryname); -+ if (retval != NULL && retval[0] != '\0') -+ return retval; -+ -+ /* Last possibility is the LANG environment variable. */ -+ retval = getenv ("LANG"); -+ if (retval != NULL && retval[0] != '\0') -+ return retval; -+ -+ /* We use C as the default domain. POSIX says this is implementation -+ defined. */ -+ return "C"; -+#endif -+} -+ -+/* @@ begin of epilog @@ */ -+ -+/* We don't want libintl.a to depend on any other library. So we -+ avoid the non-standard function stpcpy. In GNU C Library this -+ function is available, though. Also allow the symbol HAVE_STPCPY -+ to be defined. */ -+#if !_LIBC && !HAVE_STPCPY -+static char * -+stpcpy (dest, src) -+ char *dest; -+ const char *src; -+{ -+ while ((*dest++ = *src++) != '\0') -+ /* Do nothing. */ ; -+ return dest - 1; -+} -+#endif -+ -+ -+#ifdef _LIBC -+/* If we want to free all resources we have to do some work at -+ program's end. */ -+static void __attribute__ ((unused)) -+free_mem (void) -+{ -+ struct binding *runp; -+ -+ for (runp = _nl_domain_bindings; runp != NULL; runp = runp->next) -+ { -+ free (runp->domainname); -+ if (runp->dirname != _nl_default_dirname) -+ /* Yes, this is a pointer comparison. */ -+ free (runp->dirname); -+ } -+ -+ if (_nl_current_default_domain != _nl_default_default_domain) -+ /* Yes, again a pointer comparison. */ -+ free ((char *) _nl_current_default_domain); -+} -+ -+text_set_element (__libc_subfreeres, free_mem); -+#endif -diff -urP ammonite-1.0.0.orig/intl/dgettext.c ammonite-1.0.0/intl/dgettext.c ---- ammonite-1.0.0.orig/intl/dgettext.c Wed Dec 31 19:00:00 1969 -+++ ammonite-1.0.0/intl/dgettext.c Wed Mar 14 14:04:38 2001 -@@ -0,0 +1,59 @@ -+/* Implementation of the dgettext(3) function -+ Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#if defined HAVE_LOCALE_H || defined _LIBC -+# include <locale.h> -+#endif -+ -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+/* Names for the libintl functions are a problem. They must not clash -+ with existing names and they should follow ANSI C. But this source -+ code is also used in GNU C Library where the names have a __ -+ prefix. So we have to make a difference here. */ -+#ifdef _LIBC -+# define DGETTEXT __dgettext -+# define DCGETTEXT __dcgettext -+#else -+# define DGETTEXT dgettext__ -+# define DCGETTEXT dcgettext__ -+#endif -+ -+/* Look up MSGID in the DOMAINNAME message catalog of the current -+ LC_MESSAGES locale. */ -+char * -+DGETTEXT (domainname, msgid) -+ const char *domainname; -+ const char *msgid; -+{ -+ return DCGETTEXT (domainname, msgid, LC_MESSAGES); -+} -+ -+#ifdef _LIBC -+/* Alias for function name in GNU C Library. */ -+weak_alias (__dgettext, dgettext); -+#endif -diff -urP ammonite-1.0.0.orig/intl/explodename.c ammonite-1.0.0/intl/explodename.c ---- ammonite-1.0.0.orig/intl/explodename.c Wed Dec 31 19:00:00 1969 -+++ ammonite-1.0.0/intl/explodename.c Wed Mar 14 14:04:38 2001 -@@ -0,0 +1,198 @@ -+/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#endif -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# include <string.h> -+#else -+# include <strings.h> -+#endif -+#include <sys/types.h> -+ -+#include "loadinfo.h" -+ -+/* On some strange systems still no definition of NULL is found. Sigh! */ -+#ifndef NULL -+# if defined __STDC__ && __STDC__ -+# define NULL ((void *) 0) -+# else -+# define NULL 0 -+# endif -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+char * -+_nl_find_language (name) -+ const char *name; -+{ -+ while (name[0] != '\0' && name[0] != '_' && name[0] != '@' -+ && name[0] != '+' && name[0] != ',') -+ ++name; -+ -+ return (char *) name; -+} -+ -+ -+int -+_nl_explode_name (name, language, modifier, territory, codeset, -+ normalized_codeset, special, sponsor, revision) -+ char *name; -+ const char **language; -+ const char **modifier; -+ const char **territory; -+ const char **codeset; -+ const char **normalized_codeset; -+ const char **special; -+ const char **sponsor; -+ const char **revision; -+{ -+ enum { undecided, xpg, cen } syntax; -+ char *cp; -+ int mask; -+ -+ *modifier = NULL; -+ *territory = NULL; -+ *codeset = NULL; -+ *normalized_codeset = NULL; -+ *special = NULL; -+ *sponsor = NULL; -+ *revision = NULL; -+ -+ /* Now we determine the single parts of the locale name. First -+ look for the language. Termination symbols are `_' and `@' if -+ we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */ -+ mask = 0; -+ syntax = undecided; -+ *language = cp = name; -+ cp = _nl_find_language (*language); -+ -+ if (*language == cp) -+ /* This does not make sense: language has to be specified. Use -+ this entry as it is without exploding. Perhaps it is an alias. */ -+ cp = strchr (*language, '\0'); -+ else if (cp[0] == '_') -+ { -+ /* Next is the territory. */ -+ cp[0] = '\0'; -+ *territory = ++cp; -+ -+ while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@' -+ && cp[0] != '+' && cp[0] != ',' && cp[0] != '_') -+ ++cp; -+ -+ mask |= TERRITORY; -+ -+ if (cp[0] == '.') -+ { -+ /* Next is the codeset. */ -+ syntax = xpg; -+ cp[0] = '\0'; -+ *codeset = ++cp; -+ -+ while (cp[0] != '\0' && cp[0] != '@') -+ ++cp; -+ -+ mask |= XPG_CODESET; -+ -+ if (*codeset != cp && (*codeset)[0] != '\0') -+ { -+ *normalized_codeset = _nl_normalize_codeset (*codeset, -+ cp - *codeset); -+ if (strcmp (*codeset, *normalized_codeset) == 0) -+ free ((char *) *normalized_codeset); -+ else -+ mask |= XPG_NORM_CODESET; -+ } -+ } -+ } -+ -+ if (cp[0] == '@' || (syntax != xpg && cp[0] == '+')) -+ { -+ /* Next is the modifier. */ -+ syntax = cp[0] == '@' ? xpg : cen; -+ cp[0] = '\0'; -+ *modifier = ++cp; -+ -+ while (syntax == cen && cp[0] != '\0' && cp[0] != '+' -+ && cp[0] != ',' && cp[0] != '_') -+ ++cp; -+ -+ mask |= XPG_MODIFIER | CEN_AUDIENCE; -+ } -+ -+ if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_')) -+ { -+ syntax = cen; -+ -+ if (cp[0] == '+') -+ { -+ /* Next is special application (CEN syntax). */ -+ cp[0] = '\0'; -+ *special = ++cp; -+ -+ while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_') -+ ++cp; -+ -+ mask |= CEN_SPECIAL; -+ } -+ -+ if (cp[0] == ',') -+ { -+ /* Next is sponsor (CEN syntax). */ -+ cp[0] = '\0'; -+ *sponsor = ++cp; -+ -+ while (cp[0] != '\0' && cp[0] != '_') -+ ++cp; -+ -+ mask |= CEN_SPONSOR; -+ } -+ -+ if (cp[0] == '_') -+ { -+ /* Next is revision (CEN syntax). */ -+ cp[0] = '\0'; -+ *revision = ++cp; -+ -+ mask |= CEN_REVISION; -+ } -+ } -+ -+ /* For CEN syntax values it might be important to have the -+ separator character in the file name, not for XPG syntax. */ -+ if (syntax == xpg) -+ { -+ if (*territory != NULL && (*territory)[0] == '\0') -+ mask &= ~TERRITORY; -+ -+ if (*codeset != NULL && (*codeset)[0] == '\0') -+ mask &= ~XPG_CODESET; -+ -+ if (*modifier != NULL && (*modifier)[0] == '\0') -+ mask &= ~XPG_MODIFIER; -+ } -+ -+ return mask; -+} -diff -urP ammonite-1.0.0.orig/intl/finddomain.c ammonite-1.0.0/intl/finddomain.c ---- ammonite-1.0.0.orig/intl/finddomain.c Wed Dec 31 19:00:00 1969 -+++ ammonite-1.0.0/intl/finddomain.c Wed Mar 14 14:04:39 2001 -@@ -0,0 +1,216 @@ -+/* Handle list of needed message catalogs -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <ctype.h> -+#include <errno.h> -+#include <stdio.h> -+#include <sys/types.h> -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#else -+# ifdef HAVE_MALLOC_H -+# include <malloc.h> -+# else -+void free (); -+# endif -+#endif -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# include <string.h> -+#else -+# include <strings.h> -+# ifndef memcpy -+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -+# endif -+#endif -+#if !HAVE_STRCHR && !defined _LIBC -+# ifndef strchr -+# define strchr index -+# endif -+#endif -+ -+#if defined HAVE_UNISTD_H || defined _LIBC -+# include <unistd.h> -+#endif -+ -+#include "gettext.h" -+#include "gettextP.h" -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+ -+/* @@ end of prolog @@ */ -+/* List of already loaded domains. */ -+static struct loaded_l10nfile *_nl_loaded_domains; -+ -+ -+/* Return a data structure describing the message catalog described by -+ the DOMAINNAME and CATEGORY parameters with respect to the currently -+ established bindings. */ -+struct loaded_l10nfile * -+internal_function -+_nl_find_domain (dirname, locale, domainname) -+ const char *dirname; -+ char *locale; -+ const char *domainname; -+{ -+ struct loaded_l10nfile *retval; -+ const char *language; -+ const char *modifier; -+ const char *territory; -+ const char *codeset; -+ const char *normalized_codeset; -+ const char *special; -+ const char *sponsor; -+ const char *revision; -+ const char *alias_value; -+ int mask; -+ -+ /* LOCALE can consist of up to four recognized parts for the XPG syntax: -+ -+ language[_territory[.codeset]][@modifier] -+ -+ and six parts for the CEN syntax: -+ -+ language[_territory][+audience][+special][,[sponsor][_revision]] -+ -+ Beside the first part all of them are allowed to be missing. If -+ the full specified locale is not found, the less specific one are -+ looked for. The various parts will be stripped off according to -+ the following order: -+ (1) revision -+ (2) sponsor -+ (3) special -+ (4) codeset -+ (5) normalized codeset -+ (6) territory -+ (7) audience/modifier -+ */ -+ -+ /* If we have already tested for this locale entry there has to -+ be one data set in the list of loaded domains. */ -+ retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, -+ strlen (dirname) + 1, 0, locale, NULL, NULL, -+ NULL, NULL, NULL, NULL, NULL, domainname, 0); -+ if (retval != NULL) -+ { -+ /* We know something about this locale. */ -+ int cnt; -+ -+ if (retval->decided == 0) -+ _nl_load_domain (retval); -+ -+ if (retval->data != NULL) -+ return retval; -+ -+ for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) -+ { -+ if (retval->successor[cnt]->decided == 0) -+ _nl_load_domain (retval->successor[cnt]); -+ -+ if (retval->successor[cnt]->data != NULL) -+ break; -+ } -+ return cnt >= 0 ? retval : NULL; -+ /* NOTREACHED */ -+ } -+ -+ /* See whether the locale value is an alias. If yes its value -+ *overwrites* the alias name. No test for the original value is -+ done. */ -+ alias_value = _nl_expand_alias (locale); -+ if (alias_value != NULL) -+ { -+#if defined _LIBC || defined HAVE_STRDUP -+ locale = strdup (alias_value); -+ if (locale == NULL) -+ return NULL; -+#else -+ size_t len = strlen (alias_value) + 1; -+ locale = (char *) malloc (len); -+ if (locale == NULL) -+ return NULL; -+ -+ memcpy (locale, alias_value, len); -+#endif -+ } -+ -+ /* Now we determine the single parts of the locale name. First -+ look for the language. Termination symbols are `_' and `@' if -+ we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */ -+ mask = _nl_explode_name (locale, &language, &modifier, &territory, -+ &codeset, &normalized_codeset, &special, -+ &sponsor, &revision); -+ -+ /* Create all possible locale entries which might be interested in -+ generalization. */ -+ retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, -+ strlen (dirname) + 1, mask, language, territory, -+ codeset, normalized_codeset, modifier, special, -+ sponsor, revision, domainname, 1); -+ if (retval == NULL) -+ /* This means we are out of core. */ -+ return NULL; -+ -+ if (retval->decided == 0) -+ _nl_load_domain (retval); -+ if (retval->data == NULL) -+ { -+ int cnt; -+ for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) -+ { -+ if (retval->successor[cnt]->decided == 0) -+ _nl_load_domain (retval->successor[cnt]); -+ if (retval->successor[cnt]->data != NULL) -+ break; -+ } -+ } -+ -+ /* The room for an alias was dynamically allocated. Free it now. */ -+ if (alias_value != NULL) -+ free (locale); -+ -+ return retval; -+} -+ -+ -+#ifdef _LIBC -+static void __attribute__ ((unused)) -+free_mem (void) -+{ -+ struct loaded_l10nfile *runp = _nl_loaded_domains; -+ -+ while (runp != NULL) -+ { -+ struct loaded_l10nfile *here = runp; -+ if (runp->data != NULL) -+ _nl_unload_domain ((struct loaded_domain *) runp->data); -+ runp = runp->next; -+ free (here); -+ } -+} -+ -+text_set_element (__libc_subfreeres, free_mem); -+#endif -diff -urP ammonite-1.0.0.orig/intl/gettext.c ammonite-1.0.0/intl/gettext.c ---- ammonite-1.0.0.orig/intl/gettext.c Wed Dec 31 19:00:00 1969 -+++ ammonite-1.0.0/intl/gettext.c Wed Mar 14 14:04:39 2001 -@@ -0,0 +1,70 @@ -+/* Implementation of gettext(3) function. -+ Copyright (C) 1995, 1997 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#ifdef _LIBC -+# define __need_NULL -+# include <stddef.h> -+#else -+# ifdef STDC_HEADERS -+# include <stdlib.h> /* Just for NULL. */ -+# else -+# ifdef HAVE_STRING_H -+# include <string.h> -+# else -+# define NULL ((void *) 0) -+# endif -+# endif -+#endif -+ -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+/* Names for the libintl functions are a problem. They must not clash -+ with existing names and they should follow ANSI C. But this source -+ code is also used in GNU C Library where the names have a __ -+ prefix. So we have to make a difference here. */ -+#ifdef _LIBC -+# define GETTEXT __gettext -+# define DGETTEXT __dgettext -+#else -+# define GETTEXT gettext__ -+# define DGETTEXT dgettext__ -+#endif -+ -+/* Look up MSGID in the current default message catalog for the current -+ LC_MESSAGES locale. If not found, returns MSGID itself (the default -+ text). */ -+char * -+GETTEXT (msgid) -+ const char *msgid; -+{ -+ return DGETTEXT (NULL, msgid); -+} -+ -+#ifdef _LIBC -+/* Alias for function name in GNU C Library. */ -+weak_alias (__gettext, gettext); -+#endif -diff -urP ammonite-1.0.0.orig/intl/gettext.h ammonite-1.0.0/intl/gettext.h ---- ammonite-1.0.0.orig/intl/gettext.h Wed Dec 31 19:00:00 1969 -+++ ammonite-1.0.0/intl/gettext.h Wed Mar 14 14:04:39 2001 -@@ -0,0 +1,105 @@ -+/* Internal header for GNU gettext internationalization functions. -+ Copyright (C) 1995, 1997 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 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. */ -+ -+#ifndef _GETTEXT_H -+#define _GETTEXT_H 1 -+ -+#include <stdio.h> -+ -+#if HAVE_LIMITS_H || _LIBC -+# include <limits.h> -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+/* The magic number of the GNU message catalog format. */ -+#define _MAGIC 0x950412de -+#define _MAGIC_SWAPPED 0xde120495 -+ -+/* Revision number of the currently used .mo (binary) file format. */ -+#define MO_REVISION_NUMBER 0 -+ -+/* The following contortions are an attempt to use the C preprocessor -+ to determine an unsigned integral type that is 32 bits wide. An -+ alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but -+ doing that would require that the configure script compile and *run* -+ the resulting executable. Locally running cross-compiled executables -+ is usually not possible. */ -+ -+#if __STDC__ -+# define UINT_MAX_32_BITS 4294967295U -+#else -+# define UINT_MAX_32_BITS 0xFFFFFFFF -+#endif -+ -+/* If UINT_MAX isn't defined, assume it's a 32-bit type. -+ This should be valid for all systems GNU cares about because -+ that doesn't include 16-bit systems, and only modern systems -+ (that certainly have <limits.h>) have 64+-bit integral types. */ -+ -+#ifndef UINT_MAX -+# define UINT_MAX UINT_MAX_32_BITS -+#endif -+ -+#if UINT_MAX == UINT_MAX_32_BITS -+typedef unsigned nls_uint32; -+#else -+# if USHRT_MAX == UINT_MAX_32_BITS -+typedef unsigned short nls_uint32; -+# else -+# if ULONG_MAX == UINT_MAX_32_BITS -+typedef unsigned long nls_uint32; -+# else -+ /* The following line is intended to throw an error. Using #error is -+ not portable enough. */ -+ "Cannot determine unsigned 32-bit data type." -+# endif -+# endif -+#endif -+ -+ -+/* Header for binary .mo file format. */ -+struct mo_file_header -+{ -+ /* The magic number. */ -+ nls_uint32 magic; -+ /* The revision number of the file format. */ -+ nls_uint32 revision; -+ /* The number of strings pairs. */ -+ nls_uint32 nstrings; -+ /* Offset of table with start offsets of original strings. */ -+ nls_uint32 orig_tab_offset; -+ /* Offset of table with start offsets of translation strings. */ -+ nls_uint32 trans_tab_offset; -+ /* Size of hashing table. */ -+ nls_uint32 hash_tab_size; -+ /* Offset of first hashing entry. */ -+ nls_uint32 hash_tab_offset; -+}; -+ -+struct string_desc -+{ -+ /* Length of addressed string. */ -+ nls_uint32 length; -+ /* Offset of string in file. */ -+ nls_uint32 offset; -+}; -+ -+/* @@ begin of epilog @@ */ -+ -+#endif /* gettext.h */ -diff -urP ammonite-1.0.0.orig/intl/gettextP.h ammonite-1.0.0/intl/gettextP.h ---- ammonite-1.0.0.orig/intl/gettextP.h Wed Dec 31 19:00:00 1969 -+++ ammonite-1.0.0/intl/gettextP.h Wed Mar 14 14:04:39 2001 -@@ -0,0 +1,89 @@ -+/* Header describing internals of gettext library -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifndef _GETTEXTP_H -+#define _GETTEXTP_H -+ -+#include "loadinfo.h" -+ -+/* @@ end of prolog @@ */ -+ -+#ifndef PARAMS -+# if __STDC__ -+# define PARAMS(args) args -+# else -+# define PARAMS(args) () -+# endif -+#endif -+ -+#ifndef internal_function -+# define internal_function -+#endif -+ -+#ifndef W -+# define W(flag, data) ((flag) ? SWAP (data) : (data)) -+#endif -+ -+ -+#ifdef _LIBC -+# include <byteswap.h> -+# define SWAP(i) bswap_32 (i) -+#else -+static nls_uint32 SWAP PARAMS ((nls_uint32 i)); -+ -+static inline nls_uint32 -+SWAP (i) -+ nls_uint32 i; -+{ -+ return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24); -+} -+#endif -+ -+ -+struct loaded_domain -+{ -+ const char *data; -+ int use_mmap; -+ size_t mmap_size; -+ int must_swap; -+ nls_uint32 nstrings; -+ struct string_desc *orig_tab; -+ struct string_desc *trans_tab; -+ nls_uint32 hash_size; -+ nls_uint32 *hash_tab; -+}; -+ -+struct binding -+{ -+ struct binding *next; -+ char *domainname; -+ char *dirname; -+}; -+ -+struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname, -+ char *__locale, -+ const char *__domainname)) -+ internal_function; -+void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain)) -+ internal_function; -+void _nl_unload_domain PARAMS ((struct loaded_domain *__domain)) -+ internal_function; -+ -+/* @@ begin of epilog @@ */ -+ -+#endif /* gettextP.h */ -diff -urP ammonite-1.0.0.orig/intl/hash-string.h ammonite-1.0.0/intl/hash-string.h ---- ammonite-1.0.0.orig/intl/hash-string.h Wed Dec 31 19:00:00 1969 -+++ ammonite-1.0.0/intl/hash-string.h Wed Mar 14 14:04:39 2001 -@@ -0,0 +1,59 @@ -+/* Implements a string hashing function. -+ Copyright (C) 1995, 1997 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 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. */ -+ -+/* @@ end of prolog @@ */ -+ -+#ifndef PARAMS -+# if __STDC__ -+# define PARAMS(Args) Args -+# else -+# define PARAMS(Args) () -+# endif -+#endif -+ -+/* We assume to have `unsigned long int' value with at least 32 bits. */ -+#define HASHWORDBITS 32 -+ -+ -+/* Defines the so called `hashpjw' function by P.J. Weinberger -+ [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools, -+ 1986, 1987 Bell Telephone Laboratories, Inc.] */ -+static unsigned long int hash_string PARAMS ((const char *__str_param)); -+ -+static inline unsigned long int -+hash_string (str_param) -+ const char *str_param; -+{ -+ unsigned long int hval, g; -+ const char *str = str_param; -+ -+ /* Compute the hash value for the given string. */ -+ hval = 0; -+ while (*str != '\0') -+ { -+ hval <<= 4; -+ hval += (unsigned long int) *str++; -+ g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4)); -+ if (g != 0) -+ { -+ hval ^= g >> (HASHWORDBITS - 8); -+ hval ^= g; -+ } -+ } -+ return hval; -+} -diff -urP ammonite-1.0.0.orig/intl/intl-compat.c ammonite-1.0.0/intl/intl-compat.c ---- ammonite-1.0.0.orig/intl/intl-compat.c Wed Dec 31 19:00:00 1969 -+++ ammonite-1.0.0/intl/intl-compat.c Wed Mar 14 14:04:39 2001 -@@ -0,0 +1,76 @@ -+/* intl-compat.c - Stub functions to call gettext functions from GNU gettext -+ Library. -+ Copyright (C) 1995 Software Foundation, Inc. -+ -+This program is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 2, or (at your option) -+any later version. -+ -+This program 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 General Public License for more details. -+ -+You should have received a copy of the GNU General Public License -+along with this program; if not, write to the Free Software -+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include "libgettext.h" -+ -+/* @@ end of prolog @@ */ -+ -+ -+#undef gettext -+#undef dgettext -+#undef dcgettext -+#undef textdomain -+#undef bindtextdomain -+ -+ -+char * -+bindtextdomain (domainname, dirname) -+ const char *domainname; -+ const char *dirname; -+{ -+ return bindtextdomain__ (domainname, dirname); -+} -+ -+ -+char * -+dcgettext (domainname, msgid, category) -+ const char *domainname; -+ const char *msgid; -+ int category; -+{ -+ return dcgettext__ (domainname, msgid, category); -+} -+ -+ -+char * -+dgettext (domainname, msgid) -+ const char *domainname; -+ const char *msgid; -+{ -+ return dgettext__ (domainname, msgid); -+} -+ -+ -+char * -+gettext (msgid) -+ const char *msgid; -+{ -+ return gettext__ (msgid); -+} -+ -+ -+char * -+textdomain (domainname) -+ const char *domainname; -+{ -+ return textdomain__ (domainname); -+} -diff -urP ammonite-1.0.0.orig/intl/l10nflist.c ammonite-1.0.0/intl/l10nflist.c ---- ammonite-1.0.0.orig/intl/l10nflist.c Wed Dec 31 19:00:00 1969 -+++ ammonite-1.0.0/intl/l10nflist.c Wed Mar 14 14:04:39 2001 -@@ -0,0 +1,411 @@ -+/* Handle list of needed message catalogs -+ Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. -+ Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# ifndef _GNU_SOURCE -+# define _GNU_SOURCE 1 -+# endif -+# include <string.h> -+#else -+# include <strings.h> -+# ifndef memcpy -+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -+# endif -+#endif -+#if !HAVE_STRCHR && !defined _LIBC -+# ifndef strchr -+# define strchr index -+# endif -+#endif -+ -+#if defined _LIBC || defined HAVE_ARGZ_H -+# include <argz.h> -+#endif -+#include <ctype.h> -+#include <sys/types.h> -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#endif -+ -+#include "loadinfo.h" -+ -+/* On some strange systems still no definition of NULL is found. Sigh! */ -+#ifndef NULL -+# if defined __STDC__ && __STDC__ -+# define NULL ((void *) 0) -+# else -+# define NULL 0 -+# endif -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+#ifdef _LIBC -+/* Rename the non ANSI C functions. This is required by the standard -+ because some ANSI C functions will require linking with this object -+ file and the name space must not be polluted. */ -+# ifndef stpcpy -+# define stpcpy(dest, src) __stpcpy(dest, src) -+# endif -+#else -+# ifndef HAVE_STPCPY -+static char *stpcpy PARAMS ((char *dest, const char *src)); -+# endif -+#endif -+ -+/* Define function which are usually not available. */ -+ -+#if !defined _LIBC && !defined HAVE___ARGZ_COUNT -+/* Returns the number of strings in ARGZ. */ -+static size_t argz_count__ PARAMS ((const char *argz, size_t len)); -+ -+static size_t -+argz_count__ (argz, len) -+ const char *argz; -+ size_t len; -+{ -+ size_t count = 0; -+ while (len > 0) -+ { -+ size_t part_len = strlen (argz); -+ argz += part_len + 1; -+ len -= part_len + 1; -+ count++; -+ } -+ return count; -+} -+# undef __argz_count -+# define __argz_count(argz, len) argz_count__ (argz, len) -+#endif /* !_LIBC && !HAVE___ARGZ_COUNT */ -+ -+#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY -+/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's -+ except the last into the character SEP. */ -+static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep)); -+ -+static void -+argz_stringify__ (argz, len, sep) -+ char *argz; -+ size_t len; -+ int sep; -+{ -+ while (len > 0) -+ { -+ size_t part_len = strlen (argz); -+ argz += part_len; -+ len -= part_len + 1; -+ if (len > 0) -+ *argz++ = sep; -+ } -+} -+# undef __argz_stringify -+# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep) -+#endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */ -+ -+#if !defined _LIBC && !defined HAVE___ARGZ_NEXT -+static char *argz_next__ PARAMS ((char *argz, size_t argz_len, -+ const char *entry)); -+ -+static char * -+argz_next__ (argz, argz_len, entry) -+ char *argz; -+ size_t argz_len; -+ const char *entry; -+{ -+ if (entry) -+ { -+ if (entry < argz + argz_len) -+ entry = strchr (entry, '\0') + 1; -+ -+ return entry >= argz + argz_len ? NULL : (char *) entry; -+ } -+ else -+ if (argz_len > 0) -+ return argz; -+ else -+ return 0; -+} -+# undef __argz_next -+# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry) -+#endif /* !_LIBC && !HAVE___ARGZ_NEXT */ -+ -+ -+/* Return number of bits set in X. */ -+static int pop PARAMS ((int x)); -+ -+static inline int -+pop (x) -+ int x; -+{ -+ /* We assume that no more than 16 bits are used. */ -+ x = ((x & ~0x5555) >> 1) + (x & 0x5555); -+ x = ((x & ~0x3333) >> 2) + (x & 0x3333); -+ x = ((x >> 4) + x) & 0x0f0f; -+ x = ((x >> 8) + x) & 0xff; -+ -+ return x; -+} -+ -+ -+struct loaded_l10nfile * -+_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language, -+ territory, codeset, normalized_codeset, modifier, special, -+ sponsor, revision, filename, do_allocate) -+ struct loaded_l10nfile **l10nfile_list; -+ const char *dirlist; -+ size_t dirlist_len; -+ int mask; -+ const char *language; -+ const char *territory; -+ const char *codeset; -+ const char *normalized_codeset; -+ const char *modifier; -+ const char *special; -+ const char *sponsor; -+ const char *revision; -+ const char *filename; -+ int do_allocate; -+{ -+ char *abs_filename; -+ struct loaded_l10nfile *last = NULL; -+ struct loaded_l10nfile *retval; -+ char *cp; -+ size_t entries; -+ int cnt; -+ -+ /* Allocate room for the full file name. */ -+ abs_filename = (char *) malloc (dirlist_len -+ + strlen (language) -+ + ((mask & TERRITORY) != 0 -+ ? strlen (territory) + 1 : 0) -+ + ((mask & XPG_CODESET) != 0 -+ ? strlen (codeset) + 1 : 0) -+ + ((mask & XPG_NORM_CODESET) != 0 -+ ? strlen (normalized_codeset) + 1 : 0) -+ + (((mask & XPG_MODIFIER) != 0 -+ || (mask & CEN_AUDIENCE) != 0) -+ ? strlen (modifier) + 1 : 0) -+ + ((mask & CEN_SPECIAL) != 0 -+ ? strlen (special) + 1 : 0) -+ + (((mask & CEN_SPONSOR) != 0 -+ || (mask & CEN_REVISION) != 0) -+ ? (1 + ((mask & CEN_SPONSOR) != 0 -+ ? strlen (sponsor) + 1 : 0) -+ + ((mask & CEN_REVISION) != 0 -+ ? strlen (revision) + 1 : 0)) : 0) -+ + 1 + strlen (filename) + 1); -+ -+ if (abs_filename == NULL) -+ return NULL; -+ -+ retval = NULL; -+ last = NULL; -+ -+ /* Construct file name. */ -+ memcpy (abs_filename, dirlist, dirlist_len); -+ __argz_stringify (abs_filename, dirlist_len, ':'); -+ cp = abs_filename + (dirlist_len - 1); -+ *cp++ = '/'; -+ cp = stpcpy (cp, language); -+ -+ if ((mask & TERRITORY) != 0) -+ { -+ *cp++ = '_'; -+ cp = stpcpy (cp, territory); -+ } -+ if ((mask & XPG_CODESET) != 0) -+ { -+ *cp++ = '.'; -+ cp = stpcpy (cp, codeset); -+ } -+ if ((mask & XPG_NORM_CODESET) != 0) -+ { -+ *cp++ = '.'; -+ cp = stpcpy (cp, normalized_codeset); -+ } -+ if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0) -+ { -+ /* This component can be part of both syntaces but has different -+ leading characters. For CEN we use `+', else `@'. */ -+ *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@'; -+ cp = stpcpy (cp, modifier); -+ } -+ if ((mask & CEN_SPECIAL) != 0) -+ { -+ *cp++ = '+'; -+ cp = stpcpy (cp, special); -+ } -+ if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0) -+ { -+ *cp++ = ','; -+ if ((mask & CEN_SPONSOR) != 0) -+ cp = stpcpy (cp, sponsor); -+ if ((mask & CEN_REVISION) != 0) -+ { -+ *cp++ = '_'; -+ cp = stpcpy (cp, revision); -+ } -+ } -+ -+ *cp++ = '/'; -+ stpcpy (cp, filename); -+ -+ /* Look in list of already loaded domains whether it is already -+ available. */ -+ last = NULL; -+ for (retval = *l10nfile_list; retval != NULL; retval = retval->next) -+ if (retval->filename != NULL) -+ { -+ int compare = strcmp (retval->filename, abs_filename); -+ if (compare == 0) -+ /* We found it! */ -+ break; -+ if (compare < 0) -+ { -+ /* It's not in the list. */ -+ retval = NULL; -+ break; -+ } -+ -+ last = retval; -+ } -+ -+ if (retval != NULL || do_allocate == 0) -+ { -+ free (abs_filename); -+ return retval; -+ } -+ -+ retval = (struct loaded_l10nfile *) -+ malloc (sizeof (*retval) + (__argz_count (dirlist, dirlist_len) -+ * (1 << pop (mask)) -+ * sizeof (struct loaded_l10nfile *))); -+ if (retval == NULL) -+ return NULL; -+ -+ retval->filename = abs_filename; -+ retval->decided = (__argz_count (dirlist, dirlist_len) != 1 -+ || ((mask & XPG_CODESET) != 0 -+ && (mask & XPG_NORM_CODESET) != 0)); -+ retval->data = NULL; -+ -+ if (last == NULL) -+ { -+ retval->next = *l10nfile_list; -+ *l10nfile_list = retval; -+ } -+ else -+ { -+ retval->next = last->next; -+ last->next = retval; -+ } -+ -+ entries = 0; -+ /* If the DIRLIST is a real list the RETVAL entry corresponds not to -+ a real file. So we have to use the DIRLIST separation mechanism -+ of the inner loop. */ -+ cnt = __argz_count (dirlist, dirlist_len) == 1 ? mask - 1 : mask; -+ for (; cnt >= 0; --cnt) -+ if ((cnt & ~mask) == 0 -+ && ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0) -+ && ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0)) -+ { -+ /* Iterate over all elements of the DIRLIST. */ -+ char *dir = NULL; -+ -+ while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir)) -+ != NULL) -+ retval->successor[entries++] -+ = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, cnt, -+ language, territory, codeset, -+ normalized_codeset, modifier, special, -+ sponsor, revision, filename, 1); -+ } -+ retval->successor[entries] = NULL; -+ -+ return retval; -+} -+ -+/* Normalize codeset name. There is no standard for the codeset -+ names. Normalization allows the user to use any of the common -+ names. */ -+const char * -+_nl_normalize_codeset (codeset, name_len) -+ const char *codeset; -+ size_t name_len; -+{ -+ int len = 0; -+ int only_digit = 1; -+ char *retval; -+ char *wp; -+ size_t cnt; -+ -+ for (cnt = 0; cnt < name_len; ++cnt) -+ if (isalnum (codeset[cnt])) -+ { -+ ++len; -+ -+ if (isalpha (codeset[cnt])) -+ only_digit = 0; -+ } -+ -+ retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1); -+ -+ if (retval != NULL) -+ { -+ if (only_digit) -+ wp = stpcpy (retval, "iso"); -+ else -+ wp = retval; -+ -+ for (cnt = 0; cnt < name_len; ++cnt) -+ if (isalpha (codeset[cnt])) -+ *wp++ = tolower (codeset[cnt]); -+ else if (isdigit (codeset[cnt])) -+ *wp++ = codeset[cnt]; -+ -+ *wp = '\0'; -+ } -+ -+ return (const char *) retval; -+} -+ -+ -+/* @@ begin of epilog @@ */ -+ -+/* We don't want libintl.a to depend on any other library. So we -+ avoid the non-standard function stpcpy. In GNU C Library this -+ function is available, though. Also allow the symbol HAVE_STPCPY -+ to be defined. */ -+#if !_LIBC && !HAVE_STPCPY -+static char * -+stpcpy (dest, src) -+ char *dest; -+ const char *src; -+{ -+ while ((*dest++ = *src++) != '\0') -+ /* Do nothing. */ ; -+ return dest - 1; -+} -+#endif -diff -urP ammonite-1.0.0.orig/intl/libgettext.h ammonite-1.0.0/intl/libgettext.h ---- ammonite-1.0.0.orig/intl/libgettext.h Wed Dec 31 19:00:00 1969 -+++ ammonite-1.0.0/intl/libgettext.h Wed Mar 14 14:04:39 2001 -@@ -0,0 +1,182 @@ -+/* Message catalogs for internationalization. -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+/* Because on some systems (e.g. Solaris) we sometimes have to include -+ the systems libintl.h as well as this file we have more complex -+ include protection above. But the systems header might perhaps also -+ define _LIBINTL_H and therefore we have to protect the definition here. */ -+ -+#if !defined _LIBINTL_H || !defined _LIBGETTEXT_H -+#ifndef _LIBINTL_H -+# define _LIBINTL_H 1 -+#endif -+#define _LIBGETTEXT_H 1 -+ -+/* We define an additional symbol to signal that we use the GNU -+ implementation of gettext. */ -+#define __USE_GNU_GETTEXT 1 -+ -+#include <sys/types.h> -+ -+#if HAVE_LOCALE_H -+# include <locale.h> -+#endif -+ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+#ifndef PARAMS -+# if __STDC__ || defined __cplusplus -+# define PARAMS(args) args -+# else -+# define PARAMS(args) () -+# endif -+#endif -+ -+#ifndef NULL -+# if !defined __cplusplus || defined __GNUC__ -+# define NULL ((void *) 0) -+# else -+# define NULL (0) -+# endif -+#endif -+ -+#if !HAVE_LC_MESSAGES -+/* This value determines the behaviour of the gettext() and dgettext() -+ function. But some system does not have this defined. Define it -+ to a default value. */ -+# define LC_MESSAGES (-1) -+#endif -+ -+ -+/* Declarations for gettext-using-catgets interface. Derived from -+ Jim Meyering's libintl.h. */ -+struct _msg_ent -+{ -+ const char *_msg; -+ int _msg_number; -+}; -+ -+ -+#if HAVE_CATGETS -+/* These two variables are defined in the automatically by po-to-tbl.sed -+ generated file `cat-id-tbl.c'. */ -+extern const struct _msg_ent _msg_tbl[]; -+extern int _msg_tbl_length; -+#endif -+ -+ -+/* For automatical extraction of messages sometimes no real -+ translation is needed. Instead the string itself is the result. */ -+#define gettext_noop(Str) (Str) -+ -+/* Look up MSGID in the current default message catalog for the current -+ LC_MESSAGES locale. If not found, returns MSGID itself (the default -+ text). */ -+extern char *gettext PARAMS ((const char *__msgid)); -+extern char *gettext__ PARAMS ((const char *__msgid)); -+ -+/* Look up MSGID in the DOMAINNAME message catalog for the current -+ LC_MESSAGES locale. */ -+extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid)); -+extern char *dgettext__ PARAMS ((const char *__domainname, -+ const char *__msgid)); -+ -+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY -+ locale. */ -+extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid, -+ int __category)); -+extern char *dcgettext__ PARAMS ((const char *__domainname, -+ const char *__msgid, int __category)); -+ -+ -+/* Set the current default message catalog to DOMAINNAME. -+ If DOMAINNAME is null, return the current default. -+ If DOMAINNAME is "", reset to the default of "messages". */ -+extern char *textdomain PARAMS ((const char *__domainname)); -+extern char *textdomain__ PARAMS ((const char *__domainname)); -+ -+/* Specify that the DOMAINNAME message catalog will be found -+ in DIRNAME rather than in the system locale data base. */ -+extern char *bindtextdomain PARAMS ((const char *__domainname, -+ const char *__dirname)); -+extern char *bindtextdomain__ PARAMS ((const char *__domainname, -+ const char *__dirname)); -+ -+#if ENABLE_NLS -+ -+/* Solaris 2.3 has the gettext function but dcgettext is missing. -+ So we omit this optimization for Solaris 2.3. BTW, Solaris 2.4 -+ has dcgettext. */ -+# if !HAVE_CATGETS && (!HAVE_GETTEXT || HAVE_DCGETTEXT) -+ -+# define gettext(Msgid) \ -+ dgettext (NULL, Msgid) -+ -+# define dgettext(Domainname, Msgid) \ -+ dcgettext (Domainname, Msgid, LC_MESSAGES) -+ -+# if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ >= 7 -+/* This global variable is defined in loadmsgcat.c. We need a sign, -+ whether a new catalog was loaded, which can be associated with all -+ translations. */ -+extern int _nl_msg_cat_cntr; -+ -+# define dcgettext(Domainname, Msgid, Category) \ -+ (__extension__ \ -+ ({ \ -+ char *__result; \ -+ if (__builtin_constant_p (Msgid)) \ -+ { \ -+ static char *__translation__; \ -+ static int __catalog_counter__; \ -+ if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr) \ -+ { \ -+ __translation__ = \ -+ dcgettext__ (Domainname, Msgid, Category); \ -+ __catalog_counter__ = _nl_msg_cat_cntr; \ -+ } \ -+ __result = __translation__; \ -+ } \ -+ else \ -+ __result = dcgettext__ (Domainname, Msgid, Category); \ -+ __result; \ -+ })) -+# endif -+# endif -+ -+#else -+ -+# define gettext(Msgid) (Msgid) -+# define dgettext(Domainname, Msgid) (Msgid) -+# define dcgettext(Domainname, Msgid, Category) (Msgid) -+# define textdomain(Domainname) ((char *) Domainname) -+# define bindtextdomain(Domainname, Dirname) ((char *) Dirname) -+ -+#endif -+ -+/* @@ begin of epilog @@ */ -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif -diff -urP ammonite-1.0.0.orig/intl/linux-msg.sed ammonite-1.0.0/intl/linux-msg.sed ---- ammonite-1.0.0.orig/intl/linux-msg.sed Wed Dec 31 19:00:00 1969 -+++ ammonite-1.0.0/intl/linux-msg.sed Wed Mar 14 14:04:39 2001 -@@ -0,0 +1,100 @@ -+# po2msg.sed - Convert Uniforum style .po file to Linux style .msg file -+# Copyright (C) 1995 Free Software Foundation, Inc. -+# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+# -+# This program 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 General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+# -+# The first directive in the .msg should be the definition of the -+# message set number. We use always set number 1. -+# -+1 { -+ i\ -+$set 1 # Automatically created by po2msg.sed -+ h -+ s/.*/0/ -+ x -+} -+# -+# Mitch's old catalog format does not allow comments. -+# -+# We copy the original message as a comment into the .msg file. -+# -+/^msgid/ { -+ s/msgid[ ]*"// -+# -+# This does not work now with the new format. -+# /"$/! { -+# s/\\$// -+# s/$/ ... (more lines following)"/ -+# } -+ x -+# The following nice solution is by -+# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de> -+ td -+# Increment a decimal number in pattern space. -+# First hide trailing `9' digits. -+ :d -+ s/9\(_*\)$/_\1/ -+ td -+# Assure at least one digit is available. -+ s/^\(_*\)$/0\1/ -+# Increment the last digit. -+ s/8\(_*\)$/9\1/ -+ s/7\(_*\)$/8\1/ -+ s/6\(_*\)$/7\1/ -+ s/5\(_*\)$/6\1/ -+ s/4\(_*\)$/5\1/ -+ s/3\(_*\)$/4\1/ -+ s/2\(_*\)$/3\1/ -+ s/1\(_*\)$/2\1/ -+ s/0\(_*\)$/1\1/ -+# Convert the hidden `9' digits to `0's. -+ s/_/0/g -+ x -+ G -+ s/\(.*\)"\n\([0-9]*\)/$ #\2 Original Message:(\1)/p -+} -+# -+# The .msg file contains, other then the .po file, only the translations -+# but each given a unique ID. Starting from 1 and incrementing by 1 for -+# each message we assign them to the messages. -+# It is important that the .po file used to generate the cat-id-tbl.c file -+# (with po-to-tbl) is the same as the one used here. (At least the order -+# of declarations must not be changed.) -+# -+/^msgstr/ { -+ s/msgstr[ ]*"\(.*\)"/# \1/ -+# Clear substitution flag. -+ tb -+# Append the next line. -+ :b -+ N -+# Look whether second part is continuation line. -+ s/\(.*\n\)"\(.*\)"/\1\2/ -+# Yes, then branch. -+ ta -+ P -+ D -+# Note that D includes a jump to the start!! -+# We found a continuation line. But before printing insert '\'. -+ :a -+ s/\(.*\)\(\n.*\)/\1\\\2/ -+ P -+# We cannot use D here. -+ s/.*\n\(.*\)/\1/ -+ tb -+} -+d -diff -urP ammonite-1.0.0.orig/intl/loadinfo.h ammonite-1.0.0/intl/loadinfo.h ---- ammonite-1.0.0.orig/intl/loadinfo.h Wed Dec 31 19:00:00 1969 -+++ ammonite-1.0.0/intl/loadinfo.h Wed Mar 14 14:04:39 2001 -@@ -0,0 +1,78 @@ -+/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifndef PARAMS -+# if __STDC__ -+# define PARAMS(args) args -+# else -+# define PARAMS(args) () -+# endif -+#endif -+ -+/* Encoding of locale name parts. */ -+#define CEN_REVISION 1 -+#define CEN_SPONSOR 2 -+#define CEN_SPECIAL 4 -+#define XPG_NORM_CODESET 8 -+#define XPG_CODESET 16 -+#define TERRITORY 32 -+#define CEN_AUDIENCE 64 -+#define XPG_MODIFIER 128 -+ -+#define CEN_SPECIFIC (CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE) -+#define XPG_SPECIFIC (XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER) -+ -+ -+struct loaded_l10nfile -+{ -+ const char *filename; -+ int decided; -+ -+ const void *data; -+ -+ struct loaded_l10nfile *next; -+ struct loaded_l10nfile *successor[1]; -+}; -+ -+ -+extern const char *_nl_normalize_codeset PARAMS ((const char *codeset, -+ size_t name_len)); -+ -+extern struct loaded_l10nfile * -+_nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list, -+ const char *dirlist, size_t dirlist_len, int mask, -+ const char *language, const char *territory, -+ const char *codeset, -+ const char *normalized_codeset, -+ const char *modifier, const char *special, -+ const char *sponsor, const char *revision, -+ const char *filename, int do_allocate)); -+ -+ -+extern const char *_nl_expand_alias PARAMS ((const char *name)); -+ -+extern int _nl_explode_name PARAMS ((char *name, const char **language, -+ const char **modifier, -+ const char **territory, -+ const char **codeset, -+ const char **normalized_codeset, -+ const char **special, -+ const char **sponsor, -+ const char **revision)); -+ -+extern char *_nl_find_language PARAMS ((const char *name)); -diff -urP ammonite-1.0.0.orig/intl/loadmsgcat.c ammonite-1.0.0/intl/loadmsgcat.c ---- ammonite-1.0.0.orig/intl/loadmsgcat.c Wed Dec 31 19:00:00 1969 -+++ ammonite-1.0.0/intl/loadmsgcat.c Wed Mar 14 14:04:39 2001 -@@ -0,0 +1,220 @@ -+/* Load needed message catalogs. -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <fcntl.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#endif -+ -+#if defined HAVE_UNISTD_H || defined _LIBC -+# include <unistd.h> -+#endif -+ -+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ -+ || (defined _LIBC && defined _POSIX_MAPPED_FILES) -+# include <sys/mman.h> -+# undef HAVE_MMAP -+# define HAVE_MMAP 1 -+#else -+# undef HAVE_MMAP -+#endif -+ -+#include "gettext.h" -+#include "gettextP.h" -+ -+/* @@ end of prolog @@ */ -+ -+#ifdef _LIBC -+/* Rename the non ISO C functions. This is required by the standard -+ because some ISO C functions will require linking with this object -+ file and the name space must not be polluted. */ -+# define open __open -+# define close __close -+# define read __read -+# define mmap __mmap -+# define munmap __munmap -+#endif -+ -+/* We need a sign, whether a new catalog was loaded, which can be associated -+ with all translations. This is important if the translations are -+ cached by one of GCC's features. */ -+int _nl_msg_cat_cntr = 0; -+ -+ -+/* Load the message catalogs specified by FILENAME. If it is no valid -+ message catalog do nothing. */ -+void -+internal_function -+_nl_load_domain (domain_file) -+ struct loaded_l10nfile *domain_file; -+{ -+ int fd; -+ size_t size; -+ struct stat st; -+ struct mo_file_header *data = (struct mo_file_header *) -1; -+ int use_mmap = 0; -+ struct loaded_domain *domain; -+ -+ domain_file->decided = 1; -+ domain_file->data = NULL; -+ -+ /* If the record does not represent a valid locale the FILENAME -+ might be NULL. This can happen when according to the given -+ specification the locale file name is different for XPG and CEN -+ syntax. */ -+ if (domain_file->filename == NULL) -+ return; -+ -+ /* Try to open the addressed file. */ -+ fd = open (domain_file->filename, O_RDONLY); -+ if (fd == -1) -+ return; -+ -+ /* We must know about the size of the file. */ -+ if (fstat (fd, &st) != 0 -+ || (size = (size_t) st.st_size) != st.st_size -+ || size < sizeof (struct mo_file_header)) -+ { -+ /* Something went wrong. */ -+ close (fd); -+ return; -+ } -+ -+#ifdef HAVE_MMAP -+ /* Now we are ready to load the file. If mmap() is available we try -+ this first. If not available or it failed we try to load it. */ -+ data = (struct mo_file_header *) mmap (NULL, size, PROT_READ, -+ MAP_PRIVATE, fd, 0); -+ -+ if (data != (struct mo_file_header *) -1) -+ { -+ /* mmap() call was successful. */ -+ close (fd); -+ use_mmap = 1; -+ } -+#endif -+ -+ /* If the data is not yet available (i.e. mmap'ed) we try to load -+ it manually. */ -+ if (data == (struct mo_file_header *) -1) -+ { -+ size_t to_read; -+ char *read_ptr; -+ -+ data = (struct mo_file_header *) malloc (size); -+ if (data == NULL) -+ return; -+ -+ to_read = size; -+ read_ptr = (char *) data; -+ do -+ { -+ long int nb = (long int) read (fd, read_ptr, to_read); -+ if (nb == -1) -+ { -+ close (fd); -+ return; -+ } -+ -+ read_ptr += nb; -+ to_read -= nb; -+ } -+ while (to_read > 0); -+ -+ close (fd); -+ } -+ -+ /* Using the magic number we can test whether it really is a message -+ catalog file. */ -+ if (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED) -+ { -+ /* The magic number is wrong: not a message catalog file. */ -+#ifdef HAVE_MMAP -+ if (use_mmap) -+ munmap ((caddr_t) data, size); -+ else -+#endif -+ free (data); -+ return; -+ } -+ -+ domain_file->data -+ = (struct loaded_domain *) malloc (sizeof (struct loaded_domain)); -+ if (domain_file->data == NULL) -+ return; -+ -+ domain = (struct loaded_domain *) domain_file->data; -+ domain->data = (char *) data; -+ domain->use_mmap = use_mmap; -+ domain->mmap_size = size; -+ domain->must_swap = data->magic != _MAGIC; -+ -+ /* Fill in the information about the available tables. */ -+ switch (W (domain->must_swap, data->revision)) -+ { -+ case 0: -+ domain->nstrings = W (domain->must_swap, data->nstrings); -+ domain->orig_tab = (struct string_desc *) -+ ((char *) data + W (domain->must_swap, data->orig_tab_offset)); -+ domain->trans_tab = (struct string_desc *) -+ ((char *) data + W (domain->must_swap, data->trans_tab_offset)); -+ domain->hash_size = W (domain->must_swap, data->hash_tab_size); -+ domain->hash_tab = (nls_uint32 *) -+ ((char *) data + W (domain->must_swap, data->hash_tab_offset)); -+ break; -+ default: -+ /* This is an invalid revision. */ -+#ifdef HAVE_MMAP -+ if (use_mmap) -+ munmap ((caddr_t) data, size); -+ else -+#endif -+ free (data); -+ free (domain); -+ domain_file->data = NULL; -+ return; -+ } -+ -+ /* Show that one domain is changed. This might make some cached -+ translations invalid. */ -+ ++_nl_msg_cat_cntr; -+} -+ -+ -+#ifdef _LIBC -+void -+internal_function -+_nl_unload_domain (domain) -+ struct loaded_domain *domain; -+{ -+#ifdef _POSIX_MAPPED_FILES -+ if (domain->use_mmap) -+ munmap ((caddr_t) domain->data, domain->mmap_size); -+ else -+#endif /* _POSIX_MAPPED_FILES */ -+ free ((void *) domain->data); -+ -+ free (domain); -+} -+#endif -diff -urP ammonite-1.0.0.orig/intl/localealias.c ammonite-1.0.0/intl/localealias.c ---- ammonite-1.0.0.orig/intl/localealias.c Wed Dec 31 19:00:00 1969 -+++ ammonite-1.0.0/intl/localealias.c Wed Mar 14 14:04:39 2001 -@@ -0,0 +1,438 @@ -+/* Handle aliases for locale names. -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#include <ctype.h> -+#include <stdio.h> -+#include <sys/types.h> -+ -+#ifdef __GNUC__ -+# define alloca __builtin_alloca -+# define HAVE_ALLOCA 1 -+#else -+# if defined HAVE_ALLOCA_H || defined _LIBC -+# include <alloca.h> -+# else -+# ifdef _AIX -+ #pragma alloca -+# else -+# ifndef alloca -+char *alloca (); -+# endif -+# endif -+# endif -+#endif -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#else -+char *getenv (); -+# ifdef HAVE_MALLOC_H -+# include <malloc.h> -+# else -+void free (); -+# endif -+#endif -+ -+#if defined HAVE_STRING_H || defined _LIBC -+# ifndef _GNU_SOURCE -+# define _GNU_SOURCE 1 -+# endif -+# include <string.h> -+#else -+# include <strings.h> -+# ifndef memcpy -+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -+# endif -+#endif -+#if !HAVE_STRCHR && !defined _LIBC -+# ifndef strchr -+# define strchr index -+# endif -+#endif -+ -+#include "gettext.h" -+#include "gettextP.h" -+ -+/* @@ end of prolog @@ */ -+ -+#ifdef _LIBC -+/* Rename the non ANSI C functions. This is required by the standard -+ because some ANSI C functions will require linking with this object -+ file and the name space must not be polluted. */ -+# define strcasecmp __strcasecmp -+ -+# ifndef mempcpy -+# define mempcpy __mempcpy -+# endif -+# define HAVE_MEMPCPY 1 -+ -+/* We need locking here since we can be called from different places. */ -+# include <bits/libc-lock.h> -+ -+__libc_lock_define_initialized (static, lock); -+#endif -+ -+#ifndef internal_function -+# define internal_function -+#endif -+ -+/* For those loosing systems which don't have `alloca' we have to add -+ some additional code emulating it. */ -+#ifdef HAVE_ALLOCA -+/* Nothing has to be done. */ -+# define ADD_BLOCK(list, address) /* nothing */ -+# define FREE_BLOCKS(list) /* nothing */ -+#else -+struct block_list -+{ -+ void *address; -+ struct block_list *next; -+}; -+# define ADD_BLOCK(list, addr) \ -+ do { \ -+ struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \ -+ /* If we cannot get a free block we cannot add the new element to \ -+ the list. */ \ -+ if (newp != NULL) { \ -+ newp->address = (addr); \ -+ newp->next = (list); \ -+ (list) = newp; \ -+ } \ -+ } while (0) -+# define FREE_BLOCKS(list) \ -+ do { \ -+ while (list != NULL) { \ -+ struct block_list *old = list; \ -+ list = list->next; \ -+ free (old); \ -+ } \ -+ } while (0) -+# undef alloca -+# define alloca(size) (malloc (size)) -+#endif /* have alloca */ -+ -+#if defined _LIBC_REENTRANT || defined HAVE_FGETS_UNLOCKED -+# undef fgets -+# define fgets(buf, len, s) fgets_unlocked (buf, len, s) -+#endif -+#if defined _LIBC_REENTRANT || defined HAVE_FEOF_UNLOCKED -+# undef feof -+# define feof(s) feof_unlocked (s) -+#endif -+ -+ -+struct alias_map -+{ -+ const char *alias; -+ const char *value; -+}; -+ -+ -+static char *string_space = NULL; -+static size_t string_space_act = 0; -+static size_t string_space_max = 0; -+static struct alias_map *map; -+static size_t nmap = 0; -+static size_t maxmap = 0; -+ -+ -+/* Prototypes for local functions. */ -+static size_t read_alias_file PARAMS ((const char *fname, int fname_len)) -+ internal_function; -+static void extend_alias_table PARAMS ((void)); -+static int alias_compare PARAMS ((const struct alias_map *map1, -+ const struct alias_map *map2)); -+ -+ -+const char * -+_nl_expand_alias (name) -+ const char *name; -+{ -+ static const char *locale_alias_path = LOCALE_ALIAS_PATH; -+ struct alias_map *retval; -+ const char *result = NULL; -+ size_t added; -+ -+#ifdef _LIBC -+ __libc_lock_lock (lock); -+#endif -+ -+ do -+ { -+ struct alias_map item; -+ -+ item.alias = name; -+ -+ if (nmap > 0) -+ retval = (struct alias_map *) bsearch (&item, map, nmap, -+ sizeof (struct alias_map), -+ (int (*) PARAMS ((const void *, -+ const void *)) -+ ) alias_compare); -+ else -+ retval = NULL; -+ -+ /* We really found an alias. Return the value. */ -+ if (retval != NULL) -+ { -+ result = retval->value; -+ break; -+ } -+ -+ /* Perhaps we can find another alias file. */ -+ added = 0; -+ while (added == 0 && locale_alias_path[0] != '\0') -+ { -+ const char *start; -+ -+ while (locale_alias_path[0] == ':') -+ ++locale_alias_path; -+ start = locale_alias_path; -+ -+ while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ':') -+ ++locale_alias_path; -+ -+ if (start < locale_alias_path) -+ added = read_alias_file (start, locale_alias_path - start); -+ } -+ } -+ while (added != 0); -+ -+#ifdef _LIBC -+ __libc_lock_unlock (lock); -+#endif -+ -+ return result; -+} -+ -+ -+static size_t -+internal_function -+read_alias_file (fname, fname_len) -+ const char *fname; -+ int fname_len; -+{ -+#ifndef HAVE_ALLOCA -+ struct block_list *block_list = NULL; -+#endif -+ FILE *fp; -+ char *full_fname; -+ size_t added; -+ static const char aliasfile[] = "/locale.alias"; -+ -+ full_fname = (char *) alloca (fname_len + sizeof aliasfile); -+ ADD_BLOCK (block_list, full_fname); -+#ifdef HAVE_MEMPCPY -+ mempcpy (mempcpy (full_fname, fname, fname_len), -+ aliasfile, sizeof aliasfile); -+#else -+ memcpy (full_fname, fname, fname_len); -+ memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile); -+#endif -+ -+ fp = fopen (full_fname, "r"); -+ if (fp == NULL) -+ { -+ FREE_BLOCKS (block_list); -+ return 0; -+ } -+ -+ added = 0; -+ while (!feof (fp)) -+ { -+ /* It is a reasonable approach to use a fix buffer here because -+ a) we are only interested in the first two fields -+ b) these fields must be usable as file names and so must not -+ be that long -+ */ -+ char buf[BUFSIZ]; -+ char *alias; -+ char *value; -+ char *cp; -+ -+ if (fgets (buf, sizeof buf, fp) == NULL) -+ /* EOF reached. */ -+ break; -+ -+ /* Possibly not the whole line fits into the buffer. Ignore -+ the rest of the line. */ -+ if (strchr (buf, '\n') == NULL) -+ { -+ char altbuf[BUFSIZ]; -+ do -+ if (fgets (altbuf, sizeof altbuf, fp) == NULL) -+ /* Make sure the inner loop will be left. The outer loop -+ will exit at the `feof' test. */ -+ break; -+ while (strchr (altbuf, '\n') == NULL); -+ } -+ -+ cp = buf; -+ /* Ignore leading white space. */ -+ while (isspace (cp[0])) -+ ++cp; -+ -+ /* A leading '#' signals a comment line. */ -+ if (cp[0] != '\0' && cp[0] != '#') -+ { -+ alias = cp++; -+ while (cp[0] != '\0' && !isspace (cp[0])) -+ ++cp; -+ /* Terminate alias name. */ -+ if (cp[0] != '\0') -+ *cp++ = '\0'; -+ -+ /* Now look for the beginning of the value. */ -+ while (isspace (cp[0])) -+ ++cp; -+ -+ if (cp[0] != '\0') -+ { -+ size_t alias_len; -+ size_t value_len; -+ -+ value = cp++; -+ while (cp[0] != '\0' && !isspace (cp[0])) -+ ++cp; -+ /* Terminate value. */ -+ if (cp[0] == '\n') -+ { -+ /* This has to be done to make the following test -+ for the end of line possible. We are looking for -+ the terminating '\n' which do not overwrite here. */ -+ *cp++ = '\0'; -+ *cp = '\n'; -+ } -+ else if (cp[0] != '\0') -+ *cp++ = '\0'; -+ -+ if (nmap >= maxmap) -+ extend_alias_table (); -+ -+ alias_len = strlen (alias) + 1; -+ value_len = strlen (value) + 1; -+ -+ if (string_space_act + alias_len + value_len > string_space_max) -+ { -+ /* Increase size of memory pool. */ -+ size_t new_size = (string_space_max -+ + (alias_len + value_len > 1024 -+ ? alias_len + value_len : 1024)); -+ char *new_pool = (char *) realloc (string_space, new_size); -+ if (new_pool == NULL) -+ { -+ FREE_BLOCKS (block_list); -+ return added; -+ } -+ string_space = new_pool; -+ string_space_max = new_size; -+ } -+ -+ map[nmap].alias = memcpy (&string_space[string_space_act], -+ alias, alias_len); -+ string_space_act += alias_len; -+ -+ map[nmap].value = memcpy (&string_space[string_space_act], -+ value, value_len); -+ string_space_act += value_len; -+ -+ ++nmap; -+ ++added; -+ } -+ } -+ } -+ -+ /* Should we test for ferror()? I think we have to silently ignore -+ errors. --drepper */ -+ fclose (fp); -+ -+ if (added > 0) -+ qsort (map, nmap, sizeof (struct alias_map), -+ (int (*) PARAMS ((const void *, const void *))) alias_compare); -+ -+ FREE_BLOCKS (block_list); -+ return added; -+} -+ -+ -+static void -+extend_alias_table () -+{ -+ size_t new_size; -+ struct alias_map *new_map; -+ -+ new_size = maxmap == 0 ? 100 : 2 * maxmap; -+ new_map = (struct alias_map *) realloc (map, (new_size -+ * sizeof (struct alias_map))); -+ if (new_map == NULL) -+ /* Simply don't extend: we don't have any more core. */ -+ return; -+ -+ map = new_map; -+ maxmap = new_size; -+} -+ -+ -+#ifdef _LIBC -+static void __attribute__ ((unused)) -+free_mem (void) -+{ -+ if (string_space != NULL) -+ free (string_space); -+ if (map != NULL) -+ free (map); -+} -+text_set_element (__libc_subfreeres, free_mem); -+#endif -+ -+ -+static int -+alias_compare (map1, map2) -+ const struct alias_map *map1; -+ const struct alias_map *map2; -+{ -+#if defined _LIBC || defined HAVE_STRCASECMP -+ return strcasecmp (map1->alias, map2->alias); -+#else -+ const unsigned char *p1 = (const unsigned char *) map1->alias; -+ const unsigned char *p2 = (const unsigned char *) map2->alias; -+ unsigned char c1, c2; -+ -+ if (p1 == p2) -+ return 0; -+ -+ do -+ { -+ /* I know this seems to be odd but the tolower() function in -+ some systems libc cannot handle nonalpha characters. */ -+ c1 = isupper (*p1) ? tolower (*p1) : *p1; -+ c2 = isupper (*p2) ? tolower (*p2) : *p2; -+ if (c1 == '\0') -+ break; -+ ++p1; -+ ++p2; -+ } -+ while (c1 == c2); -+ -+ return c1 - c2; -+#endif -+} -diff -urP ammonite-1.0.0.orig/intl/po2tbl.sed.in ammonite-1.0.0/intl/po2tbl.sed.in ---- ammonite-1.0.0.orig/intl/po2tbl.sed.in Wed Dec 31 19:00:00 1969 -+++ ammonite-1.0.0/intl/po2tbl.sed.in Wed Mar 14 14:04:39 2001 -@@ -0,0 +1,102 @@ -+# po2tbl.sed - Convert Uniforum style .po file to lookup table for catgets -+# Copyright (C) 1995 Free Software Foundation, Inc. -+# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+# -+# This program 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 General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+1 { -+ i\ -+/* Automatically generated by po2tbl.sed from @PACKAGE NAME@.pot. */\ -+\ -+#if HAVE_CONFIG_H\ -+# include <config.h>\ -+#endif\ -+\ -+#include "libgettext.h"\ -+\ -+const struct _msg_ent _msg_tbl[] = { -+ h -+ s/.*/0/ -+ x -+} -+# -+# Write msgid entries in C array form. -+# -+/^msgid/ { -+ s/msgid[ ]*\(".*"\)/ {\1/ -+ tb -+# Append the next line -+ :b -+ N -+# Look whether second part is continuation line. -+ s/\(.*\)"\(\n\)"\(.*"\)/\1\2\3/ -+# Yes, then branch. -+ ta -+# Because we assume that the input file correctly formed the line -+# just read cannot be again be a msgid line. So it's safe to ignore -+# it. -+ s/\(.*\)\n.*/\1/ -+ bc -+# We found a continuation line. But before printing insert '\'. -+ :a -+ s/\(.*\)\(\n.*\)/\1\\\2/ -+ P -+# We cannot use D here. -+ s/.*\n\(.*\)/\1/ -+# Some buggy seds do not clear the `successful substitution since last ``t''' -+# flag on `N', so we do a `t' here to clear it. -+ tb -+# Not reached -+ :c -+ x -+# The following nice solution is by -+# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de> -+ td -+# Increment a decimal number in pattern space. -+# First hide trailing `9' digits. -+ :d -+ s/9\(_*\)$/_\1/ -+ td -+# Assure at least one digit is available. -+ s/^\(_*\)$/0\1/ -+# Increment the last digit. -+ s/8\(_*\)$/9\1/ -+ s/7\(_*\)$/8\1/ -+ s/6\(_*\)$/7\1/ -+ s/5\(_*\)$/6\1/ -+ s/4\(_*\)$/5\1/ -+ s/3\(_*\)$/4\1/ -+ s/2\(_*\)$/3\1/ -+ s/1\(_*\)$/2\1/ -+ s/0\(_*\)$/1\1/ -+# Convert the hidden `9' digits to `0's. -+ s/_/0/g -+ x -+ G -+ s/\(.*\)\n\([0-9]*\)/\1, \2},/ -+ s/\(.*\)"$/\1/ -+ p -+} -+# -+# Last line. -+# -+$ { -+ i\ -+};\ -+ -+ g -+ s/0*\(.*\)/int _msg_tbl_length = \1;/p -+} -+d -diff -urP ammonite-1.0.0.orig/intl/textdomain.c ammonite-1.0.0/intl/textdomain.c ---- ammonite-1.0.0.orig/intl/textdomain.c Wed Dec 31 19:00:00 1969 -+++ ammonite-1.0.0/intl/textdomain.c Wed Mar 14 14:04:39 2001 -@@ -0,0 +1,108 @@ -+/* Implementation of the textdomain(3) function. -+ Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -+ Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program 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 General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -+ -+#ifdef HAVE_CONFIG_H -+# include <config.h> -+#endif -+ -+#if defined STDC_HEADERS || defined _LIBC -+# include <stdlib.h> -+#endif -+ -+#if defined STDC_HEADERS || defined HAVE_STRING_H || defined _LIBC -+# include <string.h> -+#else -+# include <strings.h> -+# ifndef memcpy -+# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -+# endif -+#endif -+ -+#ifdef _LIBC -+# include <libintl.h> -+#else -+# include "libgettext.h" -+#endif -+ -+/* @@ end of prolog @@ */ -+ -+/* Name of the default text domain. */ -+extern const char _nl_default_default_domain[]; -+ -+/* Default text domain in which entries for gettext(3) are to be found. */ -+extern const char *_nl_current_default_domain; -+ -+ -+/* Names for the libintl functions are a problem. They must not clash -+ with existing names and they should follow ANSI C. But this source -+ code is also used in GNU C Library where the names have a __ -+ prefix. So we have to make a difference here. */ -+#ifdef _LIBC -+# define TEXTDOMAIN __textdomain -+# ifndef strdup -+# define strdup(str) __strdup (str) -+# endif -+#else -+# define TEXTDOMAIN textdomain__ -+#endif -+ -+/* Set the current default message catalog to DOMAINNAME. -+ If DOMAINNAME is null, return the current default. -+ If DOMAINNAME is "", reset to the default of "messages". */ -+char * -+TEXTDOMAIN (domainname) -+ const char *domainname; -+{ -+ char *old; -+ -+ /* A NULL pointer requests the current setting. */ -+ if (domainname == NULL) -+ return (char *) _nl_current_default_domain; -+ -+ old = (char *) _nl_current_default_domain; -+ -+ /* If domain name is the null string set to default domain "messages". */ -+ if (domainname[0] == '\0' -+ || strcmp (domainname, _nl_default_default_domain) == 0) -+ _nl_current_default_domain = _nl_default_default_domain; -+ else -+ { -+ /* If the following malloc fails `_nl_current_default_domain' -+ will be NULL. This value will be returned and so signals we -+ are out of core. */ -+#if defined _LIBC || defined HAVE_STRDUP -+ _nl_current_default_domain = strdup (domainname); -+#else -+ size_t len = strlen (domainname) + 1; -+ char *cp = (char *) malloc (len); -+ if (cp != NULL) -+ memcpy (cp, domainname, len); -+ _nl_current_default_domain = cp; -+#endif -+ } -+ -+ if (old != _nl_default_default_domain) -+ free (old); -+ -+ return (char *) _nl_current_default_domain; -+} -+ -+#ifdef _LIBC -+/* Alias for function name in GNU C Library. */ -+weak_alias (__textdomain, textdomain); -+#endif -diff -urP ammonite-1.0.0.orig/intl/xopen-msg.sed ammonite-1.0.0/intl/xopen-msg.sed ---- ammonite-1.0.0.orig/intl/xopen-msg.sed Wed Dec 31 19:00:00 1969 -+++ ammonite-1.0.0/intl/xopen-msg.sed Wed Mar 14 14:04:39 2001 -@@ -0,0 +1,104 @@ -+# po2msg.sed - Convert Uniforum style .po file to X/Open style .msg file -+# Copyright (C) 1995 Free Software Foundation, Inc. -+# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. -+# -+# This program 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 General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+# -+# The first directive in the .msg should be the definition of the -+# message set number. We use always set number 1. -+# -+1 { -+ i\ -+$set 1 # Automatically created by po2msg.sed -+ h -+ s/.*/0/ -+ x -+} -+# -+# We copy all comments into the .msg file. Perhaps they can help. -+# -+/^#/ s/^#[ ]*/$ /p -+# -+# We copy the original message as a comment into the .msg file. -+# -+/^msgid/ { -+# Does not work now -+# /"$/! { -+# s/\\$// -+# s/$/ ... (more lines following)"/ -+# } -+ s/^msgid[ ]*"\(.*\)"$/$ Original Message: \1/ -+ p -+} -+# -+# The .msg file contains, other then the .po file, only the translations -+# but each given a unique ID. Starting from 1 and incrementing by 1 for -+# each message we assign them to the messages. -+# It is important that the .po file used to generate the cat-id-tbl.c file -+# (with po-to-tbl) is the same as the one used here. (At least the order -+# of declarations must not be changed.) -+# -+/^msgstr/ { -+ s/msgstr[ ]*"\(.*\)"/\1/ -+ x -+# The following nice solution is by -+# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de> -+ td -+# Increment a decimal number in pattern space. -+# First hide trailing `9' digits. -+ :d -+ s/9\(_*\)$/_\1/ -+ td -+# Assure at least one digit is available. -+ s/^\(_*\)$/0\1/ -+# Increment the last digit. -+ s/8\(_*\)$/9\1/ -+ s/7\(_*\)$/8\1/ -+ s/6\(_*\)$/7\1/ -+ s/5\(_*\)$/6\1/ -+ s/4\(_*\)$/5\1/ -+ s/3\(_*\)$/4\1/ -+ s/2\(_*\)$/3\1/ -+ s/1\(_*\)$/2\1/ -+ s/0\(_*\)$/1\1/ -+# Convert the hidden `9' digits to `0's. -+ s/_/0/g -+ x -+# Bring the line in the format `<number> <message>' -+ G -+ s/^[^\n]*$/& / -+ s/\(.*\)\n\([0-9]*\)/\2 \1/ -+# Clear flag from last substitution. -+ tb -+# Append the next line. -+ :b -+ N -+# Look whether second part is a continuation line. -+ s/\(.*\n\)"\(.*\)"/\1\2/ -+# Yes, then branch. -+ ta -+ P -+ D -+# Note that `D' includes a jump to the start!! -+# We found a continuation line. But before printing insert '\'. -+ :a -+ s/\(.*\)\(\n.*\)/\1\\\2/ -+ P -+# We cannot use the sed command `D' here -+ s/.*\n\(.*\)/\1/ -+ tb -+} -+d diff --git a/gnome-libs/ammonite/files/digest-ammonite-1.0.0 b/gnome-libs/ammonite/files/digest-ammonite-1.0.0 deleted file mode 100644 index 414fd4dabe50..000000000000 --- a/gnome-libs/ammonite/files/digest-ammonite-1.0.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 217263a10fb9322e5a611c6657467e58 ammonite-1.0.0.tar.gz diff --git a/gnome-libs/gb/files/digest-gb-0.0.17 b/gnome-libs/gb/files/digest-gb-0.0.17 deleted file mode 100644 index 3f9cee74eff4..000000000000 --- a/gnome-libs/gb/files/digest-gb-0.0.17 +++ /dev/null @@ -1 +0,0 @@ -MD5 3cd9606630275cf9b5571afcc4423c91 gb-0.0.17.tar.gz diff --git a/gnome-libs/gb/gb-0.0.17.ebuild b/gnome-libs/gb/gb-0.0.17.ebuild deleted file mode 100644 index 8b4fb871f777..000000000000 --- a/gnome-libs/gb/gb-0.0.17.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 - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="GNOME Basic" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/" - -DEPEND=">=gnome-base/gnome-libs-1.2.8" - -src_unpack() { - unpack ${A} -} - -src_compile() { - cd ${S} - try ./configure --host=${CHOST} --prefix=/opt/gnome - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/opt/gnome install - - dodoc AUTHORS COPYING ChangeLog NEWS README* TODO -} - - - diff --git a/gnome-libs/libgda/files/digest-libgda-0.2.3 b/gnome-libs/libgda/files/digest-libgda-0.2.3 deleted file mode 100644 index 6033f75eebcf..000000000000 --- a/gnome-libs/libgda/files/digest-libgda-0.2.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 ecb2d4bc811e3bfd8ac92d34207f2975 libgda-0.2.3.tar.gz diff --git a/gnome-libs/libgda/libgda-0.2.3.ebuild b/gnome-libs/libgda/libgda-0.2.3.ebuild deleted file mode 100644 index 17d69655a8b8..000000000000 --- a/gnome-libs/libgda/libgda-0.2.3.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 - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="gda lib" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-db/${A}" -HOMEPAGE="http://www.gnome.org/gnome-db" - -DEPEND=">=gnome-base/gconf-0.11 - >=dev-perl/CORBA-ORBit-0.4.3 - mysql? ( >=dev-db/mysql-3.23.26 ) - postgres? ( >=dev-db/postgresql-7.1 ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - ldap? ( >=net-nds/openldap-1.2.11 )" - - -src_compile() { - local myconf - if [ "`use mysql`" ] ; then - myconf="--with-mysql=/usr" - fi - if [ "`use ldap`" ] ; then - myconf="$myconf --with-ldap=/usr" - fi - if [ "`use odbc`" ]; then - myconf="$myconf --with-odbc" - fi - if [ "`use postgres`" ]; then - myconf="$myconf --with-postgres=/usr" - fi - - try ./configure --host=${CHOST} --prefix=/opt/gnome $myconf - try make -} - -src_install() { - try make prefix=${D}/opt/gnome PREFIX=${D}/usr \ - GDA_oafinfodir=${D}/opt/gnome/share/oaf install - - dodoc AUTHORS COPYING.* ChangeLog NEWS README THANKS TODO -} - - - - diff --git a/gnome-libs/libole2/files/digest-libole2-0.1.7 b/gnome-libs/libole2/files/digest-libole2-0.1.7 deleted file mode 100644 index 232a7a4560bd..000000000000 --- a/gnome-libs/libole2/files/digest-libole2-0.1.7 +++ /dev/null @@ -1 +0,0 @@ -MD5 2e719211feea43b4b18b6ab7c37786f1 libole2-0.1.7.tar.gz diff --git a/gnome-libs/libole2/libole2-0.1.7.ebuild b/gnome-libs/libole2/libole2-0.1.7.ebuild deleted file mode 100644 index ba8cd5502bbf..000000000000 --- a/gnome-libs/libole2/libole2-0.1.7.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 - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="libole2" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/" - -DEPEND=">=dev-libs/glib-1.2.8" - -src_unpack() { - unpack ${A} -} - -src_compile() { - cd ${S} - try ./configure --host=${CHOST} --prefix=/opt/gnome - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/opt/gnome install - - dodoc AUTHORS COPYING ChangeLog NEWS README* TODO -} - - - diff --git a/gnome-libs/libxml2/files/digest-libxml2-2.3.5 b/gnome-libs/libxml2/files/digest-libxml2-2.3.5 deleted file mode 100644 index 5ae128f55bf7..000000000000 --- a/gnome-libs/libxml2/files/digest-libxml2-2.3.5 +++ /dev/null @@ -1 +0,0 @@ -MD5 42f661fb90a50d768c3c94da9608f694 libxml2-2.3.5.tar.gz diff --git a/gnome-libs/libxml2/libxml2-2.3.5.ebuild b/gnome-libs/libxml2/libxml2-2.3.5.ebuild deleted file mode 100644 index 385fd36a3734..000000000000 --- a/gnome-libs/libxml2/libxml2-2.3.5.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 Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/gnome-libs/libxml2/libxml2-2.3.5.ebuild,v 1.2 2001/05/29 17:28:19 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="libxml" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/libxml/${A} - ftp://gnome.eazel.com/pub/gnome/stable/sources/libxml/${A}" -HOMEPAGE="http://www.gnome.org/" - -DEPEND="virtual/glibc - >=sys-libs/ncurses-5.2 - >=sys-libs/readline-4.1 - gnome-base/gnome-env" - -src_compile() { - try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome - try make -} - -src_install() { - try make install prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome mandir=${D}/opt/gnome/share/man - dodoc AUTHORS COPYING* ChangeLog NEWS README -} - - - - - - - diff --git a/gnome-libs/libxslt/files/digest-libxslt-0.5.0 b/gnome-libs/libxslt/files/digest-libxslt-0.5.0 deleted file mode 100644 index fd379033d9fb..000000000000 --- a/gnome-libs/libxslt/files/digest-libxslt-0.5.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 30caf75722a04d8dd15fc64c1a616a19 libxslt-0.5.0.tar.gz diff --git a/gnome-libs/libxslt/libxslt-0.5.0.ebuild b/gnome-libs/libxslt/libxslt-0.5.0.ebuild deleted file mode 100644 index 59f0fadb3cea..000000000000 --- a/gnome-libs/libxslt/libxslt-0.5.0.ebuild +++ /dev/null @@ -1,28 +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/gnome-libs/libxslt/libxslt-0.5.0.ebuild,v 1.1 2001/03/15 21:01:34 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="libxslt" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${A} - ftp://gnome.eazel.com/pub/gnome/unstable/sources/${PN}/${A}" - -HOMEPAGE="http://www.gnome.org/" - -DEPEND="virtual/glibc - >=gnome-libs/libxml2-2.3.4" - -src_compile() { - - try ./configure --host=${CHOST} --prefix=/opt/gnome - try make -} - -src_install() { - - try make prefix=${D}/opt/gnome install - dodoc AUTHORS COPYING* ChangeLog README NEWS TODO -} - diff --git a/gnome-libs/medusa/files/digest-medusa-0.5.0 b/gnome-libs/medusa/files/digest-medusa-0.5.0 deleted file mode 100644 index 7d658f3dcd48..000000000000 --- a/gnome-libs/medusa/files/digest-medusa-0.5.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 6c93b219bfeccb5456570c2a464b72fb medusa-0.5.0.tar.gz diff --git a/gnome-libs/medusa/medusa-0.5.0.ebuild b/gnome-libs/medusa/medusa-0.5.0.ebuild deleted file mode 100644 index f41cb6f99422..000000000000 --- a/gnome-libs/medusa/medusa-0.5.0.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/gnome-libs/medusa/medusa-0.5.0.ebuild,v 1.1 2001/04/15 21:45:13 pete Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="medusa" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${A} - ftp://gnome.eazel.com/pub/gnome/unstable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/" - -DEPEND=">=gnome-base/gnome-vfs-1.0 - >=sys-libs/db-1.8" - -src_compile() { - try ./configure --host=${CHOST} --prefix=/opt/gnome \ - --sysconfdir=/etc/opt/gnome --mandir=/opt/gnome/share/man \ - --sharedstatedir=/var/lib --localstatedir=/var/lib --enable-prefere-db1 - try make medusainitdir=/tmp -} - -src_install() { - try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome \ - medusainitdir=/tmp mandir=${D}/opt/gnome/share/man install - dodoc AUTHORS COPYING ChangeLog NEWS README - -} - - - - - - - diff --git a/gnome-office/abiword/abiword-0.7.12.ebuild b/gnome-office/abiword/abiword-0.7.12.ebuild deleted file mode 100644 index 5e16f48907d4..000000000000 --- a/gnome-office/abiword/abiword-0.7.12.ebuild +++ /dev/null @@ -1,52 +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/gnome-office/abiword/abiword-0.7.12.ebuild,v 1.3 2001/05/18 17:13:55 achim Exp $ - -A="abi-${PV}.tar.gz abidistfiles.tar.gz expat.tar.gz - unixfonts.tar.gz wv.tar.gz" -S=${WORKDIR}/abi-${PV} -DESCRIPTION="Framework for creating database applications" -SRC_URI="http://download.abisource.com/releases/${PV}/src/abi-${PV}.tar.gz - http://download.abisource.com/releases/${PV}/src/abidistfiles.tar.gz - http://download.abisource.com/releases/${PV}/src/expat.tar.gz - http://download.abisource.com/releases/${PV}/src/unixfonts.tar.gz - http://download.abisource.com/releases/${PV}/src/wv.tar.gz" - - -HOMEPAGE="http://www.gnome.org/gnome-office/abiword.shtml/" - -DEPEND=">=sys-libs/glibc-2.1.3 - >=sys-devel/gcc-2.95.2 - =media-libs/freetype-1.3.1-r2 - >=media-libs/libpng-1.0.7 - >=dev-libs/glib-1.2.8 - >=x11-libs/gtk+-1.2.8 - virtual/x11" - - -src_unpack() { - unpack ${A} - cd ${S} -} - -src_compile() { - cd ${S} - try make prefix=/opt/gnome/ UNIX_CAN_BUILD_STATIC=0 -} - -src_install() { - cd ${S} - try make prefix=${D}/opt/gnome UNIX_CAN_BUILD_STATIC=0 install - cp ${D}/opt/gnome/AbiSuite/bin/AbiWord AbiWord.orig - sed -e "s:${D}::" AbiWord.orig > ${D}/opt/gnome/AbiSuite/bin/AbiWord - cd ${D}/opt/gnome/bin - rm -f abiword - rm -f AbiWord - ln -s ../AbiSuite/bin/AbiWord AbiWord - ln -s ../AbiSuite/bin/AbiWord abiword -} - - - - diff --git a/gnome-office/abiword/files/digest-abiword-0.7.12 b/gnome-office/abiword/files/digest-abiword-0.7.12 deleted file mode 100644 index 0f5b09d39a03..000000000000 --- a/gnome-office/abiword/files/digest-abiword-0.7.12 +++ /dev/null @@ -1,5 +0,0 @@ -MD5 3c7eb8cfaef1971d97a44b2fba1fa7a9 abi-0.7.12.tar.gz -MD5 b750d05cb417ed0835e7c0e298f71ae6 abidistfiles.tar.gz -MD5 e7a3a3d7963aec7ac55bfa343d36e2cd expat.tar.gz -MD5 618cfbc3de9b73407d47ba283b5955a9 unixfonts.tar.gz -MD5 adc023021a296260d4607a5e8ae01018 wv.tar.gz diff --git a/gnome-office/dia/dia-0.86-r1.ebuild b/gnome-office/dia/dia-0.86-r1.ebuild deleted file mode 100644 index c3371894bad5..000000000000 --- a/gnome-office/dia/dia-0.86-r1.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/gnome-office/dia/dia-0.86-r1.ebuild,v 1.4 2000/11/25 17:05:13 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Diagram Creation Program" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/gnome-office/dia.shtml" - -DEPEND=">=gnome-base/gnome-print-0.24 - >=app-arch/rpm-3.0.5" - - -src_compile() { - - cd ${S} - local myconf -# if [ "`use bonobo`" ] -# then -# myconf="--enable-bonobo" -# fi - try ./configure --host=${CHOST} --prefix=/opt/gnome \ - --enable-gnome --enable-gnome-print ${myconf} - # bonobo support does not work yet - try make - -} - -src_install () { - - cd ${S} - try make prefix=${D}/opt/gnome install - dodoc AUTHORS COPYING ChangeLog README NEWS TODO KNOWN_BUGS -} - - - - - diff --git a/gnome-office/dia/dia-0.87.ebuild b/gnome-office/dia/dia-0.87.ebuild deleted file mode 100644 index e317fe77def4..000000000000 --- a/gnome-office/dia/dia-0.87.ebuild +++ /dev/null @@ -1,46 +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/gnome-office/dia/dia-0.87.ebuild,v 1.2 2001/05/10 03:51:37 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Diagram Creation Program" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/gnome-office/dia.shtml" - -DEPEND=">=gnome-base/gnome-print-0.24 - >=app-arch/rpm-3.0.5 - bonobo? ( gnome-base/bonobo ) - python? ( dev-lang/python-2.0 )" - - -src_compile() { - - local myconf - if [ "`use bonobo`" ] - then - myconf="--enable-bonobo" - fi -# if [ "`use python`" ] -# then -# myconf="$myconf --with-python" -# fi - try ./configure --host=${CHOST} --prefix=/opt/gnome \ - --sysconfdir=/etc/opt/gnome \ - --enable-gnome --enable-gnome-print ${myconf} - try make - -} - -src_install () { - - try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome install - dodoc AUTHORS COPYING ChangeLog README NEWS TODO KNOWN_BUGS - -} - - - - - diff --git a/gnome-office/dia/files/digest-dia-0.86-r1 b/gnome-office/dia/files/digest-dia-0.86-r1 deleted file mode 100644 index 77e2182066bb..000000000000 --- a/gnome-office/dia/files/digest-dia-0.86-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 66c32ceb8d034137be88d4b649e405a2 dia-0.86.tar.gz diff --git a/gnome-office/dia/files/digest-dia-0.87 b/gnome-office/dia/files/digest-dia-0.87 deleted file mode 100644 index 3823bcf7891c..000000000000 --- a/gnome-office/dia/files/digest-dia-0.87 +++ /dev/null @@ -1 +0,0 @@ -MD5 36a2c19544b3537632af06bfa67eb45f dia-0.87.tar.gz diff --git a/gnome-office/gnome-db/files/digest-gnome-db-0.2.3 b/gnome-office/gnome-db/files/digest-gnome-db-0.2.3 deleted file mode 100644 index 60f6b82e1251..000000000000 --- a/gnome-office/gnome-db/files/digest-gnome-db-0.2.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 0e47c245288df8544181d6bbdefd9aec gnome-db-0.2.3.tar.gz diff --git a/gnome-office/gnome-db/gnome-db-0.2.3.ebuild b/gnome-office/gnome-db/gnome-db-0.2.3.ebuild deleted file mode 100644 index b54b945ef28a..000000000000 --- a/gnome-office/gnome-db/gnome-db-0.2.3.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/gnome-office/gnome-db/gnome-db-0.2.3.ebuild,v 1.1 2001/04/29 16:17:43 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Framework for creating database applications" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/gnome-office/gnomedb.shtml" - -DEPEND=">=gnome-base/gtkhtml-0.8 - >=gnome-base/bonobo-0.30 - >=gnome-libs/libgda-0.2.3" - -src_compile() { - - try ./configure --host=${CHOST} --prefix=/opt/gnome --disable-bonobotest - try make -} - -src_install() { - try make prefix=${D}/opt/gnome \ - GNOME_sysconfdir=${D}/opt/gnome/etc \ - GNOME_datadir=${D}/opt/gnome/share \ - GNOMEDB_oafinfodir=${D}/opt/gnome/share/oaf \ - install - dodoc AUTHORS COPYING ChangeLog README -} - - - diff --git a/gnome-office/gnome-pim/files/digest-gnome-pim-1.2.0-r1 b/gnome-office/gnome-pim/files/digest-gnome-pim-1.2.0-r1 deleted file mode 100644 index f1809eaa3611..000000000000 --- a/gnome-office/gnome-pim/files/digest-gnome-pim-1.2.0-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 d0af4da54851fa996b59d4f738ff2920 gnome-pim-1.2.0.tar.gz diff --git a/gnome-office/gnome-pim/gnome-pim-1.2.0-r1.ebuild b/gnome-office/gnome-pim/gnome-pim-1.2.0-r1.ebuild deleted file mode 100644 index f80a9477446e..000000000000 --- a/gnome-office/gnome-pim/gnome-pim-1.2.0-r1.ebuild +++ /dev/null @@ -1,30 +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/gnome-office/gnome-pim/gnome-pim-1.2.0-r1.ebuild,v 1.2 2000/11/25 18:59:38 achim Exp $ - -P=gnome-pim-1.2.0 -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="gnome-pim" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-pim/"${A} -HOMEPGAE="http://www.gnome.org/gnome-office/gnome-pim.shtml" - -DEPEND=">=gnome-base/gnome-core-1.2.4" -RDEPEND=">gnome-base/gnome-libs-1.2.8" - -src_compile() { - cd ${S} - try ./configure --host=${CHOST} --prefix=/opt/gnome - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/opt/gnome install - dodoc AUTHORS COPYING* ChangeLog NEWS - dodoc README* -} - - - diff --git a/gnome-office/gnumeric/files/digest-gnumeric-0.64-r1 b/gnome-office/gnumeric/files/digest-gnumeric-0.64-r1 deleted file mode 100644 index b478595faf00..000000000000 --- a/gnome-office/gnumeric/files/digest-gnumeric-0.64-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 49673e41e314dacc54ea5aa74c0792ea gnumeric-0.64.tar.gz diff --git a/gnome-office/gnumeric/gnumeric-0.64-r1.ebuild b/gnome-office/gnumeric/gnumeric-0.64-r1.ebuild deleted file mode 100644 index 5b1215785c8f..000000000000 --- a/gnome-office/gnumeric/gnumeric-0.64-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/gnome-office/gnumeric/gnumeric-0.64-r1.ebuild,v 1.1 2001/05/17 13:29:30 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="gnumeric" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnumeric/"${A} -HOMEPAGE="http://www.gnome.org/gnome-office/gnumeric.shtml" - -DEPEND=">=sys-devel/perl-5 - >=dev-lang/python-2.0 - >=gnome-base/gal-0.3.0 - >=gnome-libs/gb-0.0.17 - >=gnome-libs/libole2-0.1.7 - bonobo? ( >=gnome-base/bonobo-0.28 - >=gnome-libs/libgda-0.2.0 ) " - -src_unpack() { - unpack ${A} - cd ${S} - cp configure configure.orig - sed -e 's:"%d,:"%d",:' configure.orig > configure -} - -src_compile() { - cd ${S} - local myconf - if [ "`use bonobo`" ] - then - myconf="--with-bonobo" - fi - LDFLAGS="-L/opt/gnome/lib -lunicode" try ./configure --host=${CHOST} --prefix=/opt/gnome \ - ${myconf} --with-gb - cd ${S} - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/opt/gnome PREFIX=${D}/usr install - dodoc AUTHORS COPYING *ChangeLog HACKING NEWS README TODO - -} - - - - - - diff --git a/kde-apps/kdbg/files/digest-kdbg-1.2.0-r1 b/kde-apps/kdbg/files/digest-kdbg-1.2.0-r1 deleted file mode 100644 index 0f00cae5362f..000000000000 --- a/kde-apps/kdbg/files/digest-kdbg-1.2.0-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 bc01765e0b0a02331144b558346467e1 kdbg-1.2.0.tar.gz diff --git a/kde-apps/kdbg/kdbg-1.2.0-r1.ebuild b/kde-apps/kdbg/kdbg-1.2.0-r1.ebuild deleted file mode 100644 index 22aba5f86af4..000000000000 --- a/kde-apps/kdbg/kdbg-1.2.0-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Your Name <your email> -# $Header: /var/cvsroot/gentoo-x86/kde-apps/kdbg/kdbg-1.2.0-r1.ebuild,v 1.1 2001/04/28 07:05:39 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="A Graphical Debugger Interface to gdb" -SRC_URI="ftp://ftp.eudaptics.com/pub/people/jsixt/${A}" -HOMEPAGE="http://members.nextra.at/johsixt/kdbg.html" - -DEPEND=">=kde-base/kdelibs-2.0.1" - -src_compile() { - - try ./configure --prefix=${KDEDIR} --with-kde-version=2 --host=${CHOST} - try make - -} - -src_install () { - - try make DESTDIR=${D} install - - dodoc BUGS COPYING ChangeLog README TODO - -} - diff --git a/kde-apps/koffice/files/digest-koffice-2.0.1 b/kde-apps/koffice/files/digest-koffice-2.0.1 deleted file mode 100644 index 4a54c9603eae..000000000000 --- a/kde-apps/koffice/files/digest-koffice-2.0.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 77e6f47ba41d610793bcfc768dc3441e koffice-2.0.1.tar.bz2 diff --git a/kde-apps/koffice/files/digest-koffice-2.1.1_beta1 b/kde-apps/koffice/files/digest-koffice-2.1.1_beta1 deleted file mode 100644 index 5f872d73a640..000000000000 --- a/kde-apps/koffice/files/digest-koffice-2.1.1_beta1 +++ /dev/null @@ -1 +0,0 @@ -MD5 dc97d2b97122c9740377bb6339492e92 koffice-1.1-beta1.tar.bz2 diff --git a/kde-apps/koffice/koffice-2.0.1.ebuild b/kde-apps/koffice/koffice-2.0.1.ebuild deleted file mode 100644 index d193a8702884..000000000000 --- a/kde-apps/koffice/koffice-2.0.1.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/kde-apps/koffice/koffice-2.0.1.ebuild,v 1.5 2001/04/30 11:15:14 achim Exp $ - -A=${P}.tar.bz2 -S=${WORKDIR}/${P} -DESCRIPTION="KDE ${PV} - KOffice" -SRC_PATH="kde/stable/${PV}/distribution/tar/generic/src/${A}" -SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH - ftp://ftp.sourceforge.net/pub/mirrors/$SRC_PATH" - -HOMEPAGE="http://www.kde.org/" - -DEPEND=">=kde-base/kdelibs-${PV}" -RDEPEND=$DEPEND - -src_compile() { - QTBASE=/usr/X11R6/lib/qt - try ./configure --prefix=$KDEDIR --host=${CHOST} \ - --with-qt-dir=$QTBASE - try make -} - -src_install() { - try make install DESTDIR=${D} - dodoc ChangeLog COPYING AUTHORS NEWS README -} - diff --git a/kde-apps/koffice/koffice-2.1.1_beta1.ebuild b/kde-apps/koffice/koffice-2.1.1_beta1.ebuild deleted file mode 100644 index 1b25b270ae4d..000000000000 --- a/kde-apps/koffice/koffice-2.1.1_beta1.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/kde-apps/koffice/koffice-2.1.1_beta1.ebuild,v 1.2 2001/05/12 12:13:25 achim Exp $ - -P=${PN}-1.1-beta1 -A=${P}.tar.bz2 -S=${WORKDIR}/${P} -DESCRIPTION="KDE ${PV} - KOffice" -SRC_PATH="kde/unstable/${P}/src/${A}" -SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH - ftp://ftp.sourceforge.net/pub/mirrors/$SRC_PATH" - -HOMEPAGE="http://www.kde.org/" - -DEPEND=">=kde-base/kdelibs-2.1.1 - >=dev-lang/python-2.0-r2" - -RDEPEND=$DEPEND - -src_compile() { - QTBASE=/usr/X11R6/lib/qt - try ./configure --prefix=$KDEDIR --host=${CHOST} \ - --with-qt-dir=$QTBASE - if [ "`use readline`" ] - then - LIBPYTHON="-lpython2.0 -lm -lutil -ldl -lz -lreadline -lncurses -lcrypt" - fi - if [ "`use berkdb`" ] - then - LIBPYTHON="$LIBPYTHON -L/usr/lib -ldb-3.2" - fi - echo $LIBPYTHON - # I use sed to patch a makefile to compile with python - for i in connector text zoom selector - do - cd ${S}/kivio/plugins/kivio${i}tool - cp Makefile Makefile.orig - sed -e "s:^LDFLAGS =.*:LDFLAGS = $LIBPYTHON:" Makefile.orig > Makefile - done - cd ${S} - - try LIBPYTHON=\"$LIBPYTHON\" make -} - -src_install() { - try make install DESTDIR=${D} - dodoc ChangeLog COPYING AUTHORS NEWS README -} - diff --git a/kde-apps/krusader/files/digest-krusader-0.79.1 b/kde-apps/krusader/files/digest-krusader-0.79.1 deleted file mode 100644 index 491ce571226d..000000000000 --- a/kde-apps/krusader/files/digest-krusader-0.79.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 752100bbebbdfd5def66eb66e56c83a8 krusader-0.79-1.tar.gz diff --git a/kde-apps/krusader/files/digest-krusader-0.90 b/kde-apps/krusader/files/digest-krusader-0.90 deleted file mode 100644 index 491ce571226d..000000000000 --- a/kde-apps/krusader/files/digest-krusader-0.90 +++ /dev/null @@ -1 +0,0 @@ -MD5 752100bbebbdfd5def66eb66e56c83a8 krusader-0.79-1.tar.gz diff --git a/kde-apps/krusader/krusader-0.79.1.ebuild b/kde-apps/krusader/krusader-0.79.1.ebuild deleted file mode 100644 index 2106d6865572..000000000000 --- a/kde-apps/krusader/krusader-0.79.1.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 Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/kde-apps/krusader/krusader-0.79.1.ebuild,v 1.1 2001/04/28 18:21:31 achim Exp $ - -A=${PN}-0.79-1.tar.gz -S=${WORKDIR}/${PN}-0.79 -DESCRIPTION="A Filemanager for KDE" -SRC_URI="http://krusader.sourceforge.net/distributions/${A}" -HOMEPAGE="http:/krusader.sourceforge.net/" - -DEPEND=">=kde-base/kdelibs-2.0 - >=app-text/openjade-1.3 - >=app-text/sgml-common-0.3" -RDEPEND=">=kde-base/kdelibs-2.0" - -src_compile() { - try ./configure --prefix=${KDEDIR} --host=${CHOST} - try make -} - -src_install () { - - try make DESTDIR=${D} install - -} - diff --git a/kde-apps/krusader/krusader-0.90.ebuild b/kde-apps/krusader/krusader-0.90.ebuild deleted file mode 100644 index a6a3dfb79402..000000000000 --- a/kde-apps/krusader/krusader-0.90.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 Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/kde-apps/krusader/krusader-0.90.ebuild,v 1.1 2001/05/06 16:07:20 achim Exp $ - -A=${PN}-0.79-1.tar.gz -S=${WORKDIR}/${PN}-0.79 -DESCRIPTION="A Filemanager for KDE" -SRC_URI="http://krusader.sourceforge.net/distributions/${A}" -HOMEPAGE="http:/krusader.sourceforge.net/" - -DEPEND=">=kde-base/kdelibs-2.0 - >=app-text/openjade-1.3 - >=app-text/sgml-common-0.3" -RDEPEND=">=kde-base/kdelibs-2.0" - -src_compile() { - try ./configure --prefix=${KDEDIR} --host=${CHOST} - try make -} - -src_install () { - - try make DESTDIR=${D} install - -} - diff --git a/kde-base/kde-env/kde-env-2.1.ebuild b/kde-base/kde-env/kde-env-2.1.ebuild deleted file mode 100644 index e0a35a442339..000000000000 --- a/kde-base/kde-env/kde-env-2.1.ebuild +++ /dev/null @@ -1,19 +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/kde-base/kde-env/kde-env-2.1.ebuild,v 1.2 2001/05/24 20:53:33 achim Exp $ - -A="" -S=${WORKDIR} -DESCRIPTION="KDE 2.1 environment" -SRC_URI="" -HOMEPAGE="http://www.kde.org/" - -src_install() { - - insinto /etc/env.d - doins ${FILESDIR}/90kde21 - exeinto /usr/X11R6/bin/wm - doexe ${FILESDIR}/kde21 - newexe ${FILESDIR}/kde21 kde -} diff --git a/kde-base/kdelibs/files/digest-kdelibs-2.1.1 b/kde-base/kdelibs/files/digest-kdelibs-2.1.1 deleted file mode 100644 index ccdc4e394b56..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-2.1.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 5904281e61ce2a8cb6d4007a8bdc99eb kdelibs-2.1.1.tar.bz2 diff --git a/kde-base/kdelibs/kdelibs-2.1.1.ebuild b/kde-base/kdelibs/kdelibs-2.1.1.ebuild deleted file mode 100644 index 8d0f8b3f9ed6..000000000000 --- a/kde-base/kdelibs/kdelibs-2.1.1.ebuild +++ /dev/null @@ -1,98 +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/kde-base/kdelibs/kdelibs-2.1.1.ebuild,v 1.5 2001/05/27 02:58:36 achim Exp $ - -V=2.1 -A=${P}.tar.bz2 -S=${WORKDIR}/${P} -DESCRIPTION="KDE ${PV} - libs" -SRC_PATH="kde/stable/${PV}/distribution/tar/generic/src/${A}" -SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH - ftp://ftp.twoguys.org/pub/$SRC_PATH - ftp://ftp.sourceforge.net/pub/mirrors/$SRC_PATH" - -HOMEPAGE="http://www.kde.org/" - -DEPEND=">=sys-devel/gcc-2.95.2 - >=media-libs/audiofile-0.1.9 - >=media-libs/tiff-3.5.5 - >=x11-libs/qt-x11-2.3.0 - >=app-text/docbook-sgml-1.0 - ssl? ( >=dev-libs/openssl-0.9.6 ) - mysql? ( >=dev-db/mysql-3.23.30 ) - postgres? ( >=dev-db/postgresql-7.0.3 ) - alsa? ( >=media-libs/alsa-lib-0.5.9 ) - sys-devel/autoconf" - -RDEPEND=">=sys-devel/gcc-2.95.2 - >=media-libs/audiofile-0.1.9 - >=x11-libs/qt-x11-2.3.0 - =kde-base/kde-env-2.1" - -src_unpack() { - unpack ${A} - cd ${S} - patch -p0 < ${FILESDIR}/${P}-ksgmltools-gentoo.diff - rm configure - autoconf -} - -src_compile() { - - QTBASE=/usr/X11R6/lib/qt - - local myopts - if [ "`use ssl`" ] - then - myopts="--with-ssl-dir=/usr" - else - myopts="--without-ssl" - fi - if [ "`use mysql`" ] - then - myopts="$myopts --enable-mysql " - else - myopts="$myopts --disable-mysql" - fi - if [ "`use postgres`" ] - then - myopts="$myopts --enable-pgsql" - else - myopts="$myopts --disable-pgsql" - fi - if [ "`use alsa`" ] - then - myopts="$myopts --with-alsa" - fi - if [ "`use qtmt`" ] - then - myopts="$myopts --enable-mt" - fi - if [ "`use mitshm`" ] - then - myopts="$myopts --enable-mitshm" - fi - try ./configure --prefix=/opt/kde${V} --host=${CHOST} \ - --with-qt-dir=$QTBASE $myopts - cd ${S} - try make -} - -src_install() { - try make install DESTDIR=${D} - dodoc AUTHORS ChangeLog COMPILING COPYING* NAMING NEWS README - docinto html - dodoc *.html -} - - -pkg_postinst() { - install-catalog --add /etc/sgml/kde-docbook.cat /usr/share/sgml/docbook/kde-customizations/catalog - install-catalog --add /etc/sgml/kde-docbook.cat /etc/sgml/sgml-docbook.cat -} - -pkg_prerm() { - install-catalog --remove /etc/sgml/kde-docbook.cat /usr/share/sgml/docbook/kde-customizations/catalog - install-catalog --remove /etc/sgml/kde-docbook.cat /etc/sgml/sgml-docbook.cat -} diff --git a/media-gfx/aview/aview-1.2-r2.ebuild b/media-gfx/aview/aview-1.2-r2.ebuild deleted file mode 100644 index b2206ceea936..000000000000 --- a/media-gfx/aview/aview-1.2-r2.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/media-gfx/aview/aview-1.2-r2.ebuild,v 1.2 2001/02/06 12:56:22 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="An ASCII PNG-Viewer" -SRC_URI="ftp://ftp.ta.jcu.cz/pub/aa/${A}" -HOMEPAGE="http://www.ta.jcu.cz/aa" - -DEPEND=">=media-libs/aalib-1.2" - -src_compile() { - - try ./configure --prefix=/usr --host=${CHOST} - try make aview - -} - -src_install () { - - into /usr - dobin aview - dodoc ANNOUNCE COPYING ChangeLog README* TODO - -} - - diff --git a/media-gfx/aview/files/digest-aview-1.2-r2 b/media-gfx/aview/files/digest-aview-1.2-r2 deleted file mode 100644 index 624182dbcffe..000000000000 --- a/media-gfx/aview/files/digest-aview-1.2-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 8c3bc5d64f8b8d290e4d7816a6201bca aview-1.2.tar.gz diff --git a/media-gfx/blender-static/blender-static-2.04.ebuild b/media-gfx/blender-static/blender-static-2.04.ebuild deleted file mode 100644 index 1b1557d8e9c7..000000000000 --- a/media-gfx/blender-static/blender-static-2.04.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/media-gfx/blender-static/blender-static-2.04.ebuild,v 1.1 2000/12/09 06:31:24 drobbins Exp $ - -A="blender${PV}-linux-glibc2.1.2-i386-static.tar.gz manual_1.5.zip" -S=${WORKDIR} -DESCRIPTION="Etremly fast and versatile 3D rendering package" -SRC_URI="ftp://ftp.blender.nl/pub/blender${PV}-linux-glibc2.1.2-i386-static.tar.gz - ftp://ftp.blender.nl/pub/manual_1.5.zip" -HOMEPAGE="http://www.blender.nl" - -DEPEND=">=app-arch/unzip-5.23" - -src_unpack () { - echo -} - -src_install () { - - cd ${S} - dodir /opt - cd ${D}/opt - tar xzf ${DISTDIR}/blender${PV}-linux-glibc2.1.2-i386-static.tar.gz - mv blender${PV}-linux-glibc2.1.2-i386-static blender-static-${PV} - dodir /usr/doc/${P} - cd ${D}/usr/doc/${P} - unzip ${DISTDIR}/manual_1.5.zip - mv manual_1.5 html - insinto /usr/X11R6/bin - insopts -m755 - doins ${FILESDIR}/blender-static - -} - diff --git a/media-gfx/blender-static/files/blender-static b/media-gfx/blender-static/files/blender-static deleted file mode 100644 index 46d8ac409cc0..000000000000 --- a/media-gfx/blender-static/files/blender-static +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/opt/blender-static-2.04/blender diff --git a/media-gfx/blender-static/files/digest-blender-static-2.04 b/media-gfx/blender-static/files/digest-blender-static-2.04 deleted file mode 100644 index de22e4e1b776..000000000000 --- a/media-gfx/blender-static/files/digest-blender-static-2.04 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 d9ed02c74bccfeecb77f48afa40e33b6 blender2.04-linux-glibc2.1.2-i386-static.tar.gz -MD5 489f4b961370f0bc1b4d8e7737157fbd manual_1.5.zip diff --git a/media-gfx/blender/blender-2.04.ebuild b/media-gfx/blender/blender-2.04.ebuild deleted file mode 100644 index 6954df03ba6e..000000000000 --- a/media-gfx/blender/blender-2.04.ebuild +++ /dev/null @@ -1,34 +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/media-gfx/blender/blender-2.04.ebuild,v 1.3 2000/11/02 02:17:12 achim Exp $ - -A="blender${PV}-linux-glibc2.1.2-i386.tar.gz manual_1.5.zip" -S=${WORKDIR}/blender${PV}-linux-glibc2.1.2-i386 -DESCRIPTION="Etremly fast and versatile 3D rendering package" -SRC_URI="ftp://ftp.blender.nl/pub/blender${PV}-linux-glibc2.1.2-i386.tar.gz ftp://ftp.blender.nl/pub/manual_1.5.zip" -HOMEPAGE="http://www.blender.nl" - -DEPEND=">=app-arch/unzip-5.23" - -src_unpack () { - echo -} - -src_install () { - - cd ${S} - dodir /opt - cd ${D}/opt - tar xzf ${DISTDIR}/blender${PV}-linux-glibc2.1.2-i386.tar.gz - mv blender${PV}-linux-glibc2.1.2-i386 blender-${PV} - dodir /usr/doc/${P} - cd ${D}/usr/doc/${P} - unzip ${DISTDIR}/manual_1.5.zip - mv manual_1.5 html - insinto /usr/X11R6/bin - insopts -m755 - doins ${FILESDIR}/blender - -} - diff --git a/media-gfx/blender/files/blender b/media-gfx/blender/files/blender deleted file mode 100644 index 4e454a395ee3..000000000000 --- a/media-gfx/blender/files/blender +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/opt/blender-2.04/blender diff --git a/media-gfx/blender/files/digest-blender-2.04 b/media-gfx/blender/files/digest-blender-2.04 deleted file mode 100644 index 81ee7312c0f5..000000000000 --- a/media-gfx/blender/files/digest-blender-2.04 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 ef159450e66b9bd71ae9cea521e903f8 blender2.04-linux-glibc2.1.2-i386.tar.gz -MD5 489f4b961370f0bc1b4d8e7737157fbd manual_1.5.zip diff --git a/media-gfx/gimp-print/files/digest-gimp-print-4.1.1 b/media-gfx/gimp-print/files/digest-gimp-print-4.1.1 deleted file mode 100644 index fc7123be198b..000000000000 --- a/media-gfx/gimp-print/files/digest-gimp-print-4.1.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 770e035d3f272c47af1cfb0a9a5b01fd print-4.1.1.tar.gz diff --git a/media-gfx/gimp-print/gimp-print-4.1.1.ebuild b/media-gfx/gimp-print/gimp-print-4.1.1.ebuild deleted file mode 100644 index c3037d3913d9..000000000000 --- a/media-gfx/gimp-print/gimp-print-4.1.1.ebuild +++ /dev/null @@ -1,42 +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/media-gfx/gimp-print/gimp-print-4.1.1.ebuild,v 1.1 2000/12/25 16:23:28 achim Exp $ - -A=print-${PV}.tar.gz -S=${WORKDIR}/print-${PV} -DESCRIPTION="Gimp Plugin and Ghostscript driver for Gimp" -SRC_URI="http://download.sourceforge.net/gimp-print/${A}" -HOMEPAGE="http://gimp-print.sourceforge.net/" - -DEPEND=">=media-gfx/gimp-1.1.31" - -src_unpack() { - unpack ${A} -} - -src_compile() { - cd ${S} - try ./configure --host=${CHOST} --prefix=/usr/X11R6 \ - --with-gimp-exec-prefix=/usr/X11R6 - cp Makefile Makefile.orig - sed -e "s:^libexecdir = :libexecdir = ${D}/: " \ - Makefile.orig > Makefile - try make - -} - -src_install() { - cd ${S} - try make DESTDIR=${D} install-binPROGRAMS - insinto /usr/X11R6/lib/gimp/1.1/plug-ins/ - insopts -m755 - doins print - dodoc AUTHORS ChangeLog COPYING NEWS README* RELNOTES - -} - - - - - diff --git a/media-gfx/gqview/files/digest-gqview-0.10.1 b/media-gfx/gqview/files/digest-gqview-0.10.1 deleted file mode 100644 index bd221dd399a4..000000000000 --- a/media-gfx/gqview/files/digest-gqview-0.10.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 543729c6d4fd4dcb75bca93cc826e54f gqview-0.10.1.tar.gz diff --git a/media-gfx/gqview/gqview-0.10.1.ebuild b/media-gfx/gqview/gqview-0.10.1.ebuild deleted file mode 100644 index 3c0a0e2c92fa..000000000000 --- a/media-gfx/gqview/gqview-0.10.1.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 Your Name <your email> -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gqview/gqview-0.10.1.ebuild,v 1.2 2001/05/16 14:16:48 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="A GNOME image browser" -SRC_URI="http://download.sourceforge.net/gqview/${A}" -HOMEPAGE="http://gqview.sourceforge.net" - -DEPEND="virtual/glibc - gnome-base/gdk-pixbuf - nls? ( sys-devel/gettext )" - -src_compile() { - local myconf - if [ -z "`use nls`" ] - then - myconf="--disable-nls" - fi - - try ./configure --prefix=/opt/gnome --mandir=/opt/gnome/share/man \ - --host=${CHOST} ${myconf} - try make - -} - -src_install () { - - try make prefix=${D}/opt/gnome mandir=${D}/opt/gnome/share/man \ - GNOME_DATADIR=${D}/opt/gnome/share install - -} - diff --git a/media-gfx/imagemagick/files/digest-imagemagick-5.2.7 b/media-gfx/imagemagick/files/digest-imagemagick-5.2.7 deleted file mode 100644 index 2b0e2e65d034..000000000000 --- a/media-gfx/imagemagick/files/digest-imagemagick-5.2.7 +++ /dev/null @@ -1 +0,0 @@ -MD5 f6dc45a73416705e975c635e3e58f012 ImageMagick-5.2.7.tar.gz diff --git a/media-gfx/imagemagick/files/digest-imagemagick-5.3.3 b/media-gfx/imagemagick/files/digest-imagemagick-5.3.3 deleted file mode 100644 index 207e2dcf83b3..000000000000 --- a/media-gfx/imagemagick/files/digest-imagemagick-5.3.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 266190ba66deea75cad55386c289baba ImageMagick-5.3.3.tar.gz diff --git a/media-gfx/imagemagick/imagemagick-5.2.7.ebuild b/media-gfx/imagemagick/imagemagick-5.2.7.ebuild deleted file mode 100644 index 649610b42046..000000000000 --- a/media-gfx/imagemagick/imagemagick-5.2.7.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/media-gfx/imagemagick/imagemagick-5.2.7.ebuild,v 1.3 2001/05/01 18:29:05 achim Exp $ - -P=ImageMagick-${PV} -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="A collection of tools and libraries for many image formats" -SRC_URI="ftp://ftp.fifi.org/pub/ImageMagick/${A}" -HOMEPAGE="http://www.imagemagick.org" - -DEPEND=">=app-text/dgs-0.5.9.1 - >=sys-devel/perl-5 - >=media-libs/freetype-1.3.1 - >=media-libs/jpeg-6b - >=media-libs/tiff-3.5.5 - >=media-libs/libpng-1.0.7 - virtual/x11 - app-text/ghostscript - app-text/tetex - media-gfx/gimp - media-video/mpeg2vidcodec - net-misc/wget - virtual/lpr - virtual/x11-web-browser" - -RDEPEND=">app-text/dgs-0.5.9.1 - >=media-libs/jpeg-6b - >=media-libs/freetype-1.3.1 - >=media-libs/libpng-1.0.7" - -src_compile() { - - cd ${S} - try ./configure CFLAGS=\"$CFLAGS -I/opt/gnome/include\" \ - --prefix=/usr/X11R6 --build=${CHOST} \ - --without-xml --enable-lzw --without-ttf \ - --enable-shared --with-threads - try make - -} - -src_install () { - - cd ${S} - try make prefix=${D}/usr/X11R6 PREFIX=${D}/usr install - -} - diff --git a/media-gfx/imagemagick/imagemagick-5.3.3.ebuild b/media-gfx/imagemagick/imagemagick-5.3.3.ebuild deleted file mode 100644 index 07586dee815a..000000000000 --- a/media-gfx/imagemagick/imagemagick-5.3.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 Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.3.3.ebuild,v 1.2 2001/05/18 17:13:55 achim Exp $ - -P=ImageMagick-${PV} -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="A collection of tools and libraries for many image formats" -SRC_URI="ftp://ftp.fifi.org/pub/ImageMagick/${A}" -HOMEPAGE="http://www.imagemagick.org" - -DEPEND=">=app-text/dgs-0.5.9.1 - >=sys-devel/perl-5 - =media-libs/freetype-1.3.1-r2 - >=media-libs/jpeg-6b - >=media-libs/tiff-3.5.5 - >=media-libs/libpng-1.0.7 - virtual/x11 - virtual/lpr" - -RDEPEND=">app-text/dgs-0.5.9.1 - >=media-libs/jpeg-6b - >=media-libs/freetype-1.3.1 - >=media-libs/libpng-1.0.7" - -src_compile() { - - try ./configure CFLAGS=\"$CFLAGS -I/opt/gnome/include\" \ - --prefix=/usr/X11R6 --build=${CHOST} \ - --without-xml --enable-lzw --without-ttf \ - --enable-shared --with-threads --mandir=/usr/X11R6/share/man - try make - -} - -src_install () { - - try make prefix=${D}/usr/X11R6 PREFIX=${D}/usr \ - INSTALLMAN3DIR=${D}/usr/share/man/man3 \ - INSTALLMAN1DIR=${D}/usr/share/man/man1 \ - mandir=${D}/usr/X11R6/share/man install - -} - diff --git a/media-gfx/xsane/files/digest-xsane-0.71-r1 b/media-gfx/xsane/files/digest-xsane-0.71-r1 deleted file mode 100644 index 28fff1e89aea..000000000000 --- a/media-gfx/xsane/files/digest-xsane-0.71-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 916514a56143a2107ffd17914a87d766 xsane-0.71.tar.gz diff --git a/media-gfx/xsane/xsane-0.71-r1.ebuild b/media-gfx/xsane/xsane-0.71-r1.ebuild deleted file mode 100644 index acaa39f13ec4..000000000000 --- a/media-gfx/xsane/xsane-0.71-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Your Name <your email> -# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.71-r1.ebuild,v 1.4 2001/06/04 06:41:14 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="XSane is a graphical scanning frontend" -SRC_URI="http://www.xsane.org/download/${A}" -HOMEPAGE="http://www.xsane.org" - -DEPEND="media-gfx/sane-backends media-gfx/gimp" - -src_compile() { - - try ./configure --prefix=/usr/X11R6 --mandir=/usr/X11R6/man --host=${CHOST} - try make - -} - -src_install () { - - try make prefix=${D}/usr/X11R6 mandir=${D}/usr/X11R6/man install - dodoc xsane.[A-Z]* - docinto html - dodoc doc/*.{jpg,html} -} - diff --git a/media-libs/SoQt/SoQt-20010215.ebuild b/media-libs/SoQt/SoQt-20010215.ebuild deleted file mode 100644 index 991a82ebbf32..000000000000 --- a/media-libs/SoQt/SoQt-20010215.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 Your Name <your email> -# $Header: /var/cvsroot/gentoo-x86/media-libs/SoQt/SoQt-20010215.ebuild,v 1.3 2001/05/16 11:36:45 achim Exp $ - - -A=${P}.tar.gz -S=${WORKDIR}/${PN} -DESCRIPTION="A Qt Interface for coin" -SRC_URI="ftp://ftp.coin3d.org/pub/snapshots/${A}" -HOMEPAGE="http://www.coinn3d.org" - -DEPEND="virtual/x11 - virtual/opengl - >=x11-libs/qt-x11-2.3 - =media-libs/coin-${PV}" - -src_compile() { - - try ./configure --prefix=/usr/X11R6 --host=${CHOST} - try make - -} - -src_install () { - - try make DESTDIR=${D} install - dodoc AUTHORS COPYING ChangeLog* LICENSE* NEWS README* - docinto txt - dodoc docs/qtcomponents.doxygen - -} - diff --git a/media-libs/SoQt/files/digest-SoQt-20010215 b/media-libs/SoQt/files/digest-SoQt-20010215 deleted file mode 100644 index 9dedffc4f307..000000000000 --- a/media-libs/SoQt/files/digest-SoQt-20010215 +++ /dev/null @@ -1 +0,0 @@ -MD5 30b9f6225c3aeb3d41cfd3c9b124b97f SoQt-20010215.tar.gz diff --git a/media-libs/aalib/aalib-1.2-r1.ebuild b/media-libs/aalib/aalib-1.2-r1.ebuild deleted file mode 100644 index cd1c8cdbd812..000000000000 --- a/media-libs/aalib/aalib-1.2-r1.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 Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.2-r1.ebuild,v 1.5 2001/05/01 18:29:05 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="A ASCI-Graphics Library" -SRC_URI="ftp://ftp.ta.jcu.cz/pub/aa/${A}" -HOMEPAGE="http://www.ta.jcu.cz/aa/" - -DEPEND=">=sys-libs/ncurses-5.1 - slang? ( >=sys-libs/slang-1.4.2 ) - X? ( virtual/x11 )" - -RDEPEND=">=sys-libs/ncurses-5.1 - slang? ( >=sys-libs/slang-1.4.2 ) - X? ( virtual/x11 )" - -src_unpack() { - - unpack ${A} - cd ${S} - patch -p0 < ${FILESDIR}/${P}-configure-gpm-gentoo.diff - patch -p0 < ${FILESDIR}/${P}-configure.in-gpm-gentoo.diff - touch * -} - -src_compile() { - - local myconf - if [ "`use slang`" ] - then - myconf="--with-slang-driver=yes" - else - myconf="--with-slang-driver=no" - fi - if [ "`use X`" ] - then - myconf="${myconf} --with-x11-driver=yes" - else - myconf="${myconf} --with-x11-driver=no" - fi - if [ -z "`use gpm`" ] - then - myconf="${myconf} --with-gpm-mouse=no" - fi - - try ./configure --prefix=/usr --infodir=/usr/share/info --host=${CHOST} ${myconf} - try make - -} - -src_install () { - - try make prefix=${D}/usr infodir=${D}/usr/share/info install - - dodoc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README* - -} - diff --git a/media-libs/aalib/files/aalib-1.2-configure-gpm-gentoo.diff b/media-libs/aalib/files/aalib-1.2-configure-gpm-gentoo.diff deleted file mode 100644 index 9b6cab540d88..000000000000 --- a/media-libs/aalib/files/aalib-1.2-configure-gpm-gentoo.diff +++ /dev/null @@ -1,1682 +0,0 @@ ---- configure.orig Wed Feb 28 16:39:49 2001 -+++ configure Wed Feb 28 16:39:53 2001 -@@ -1,7 +1,7 @@ - #! /bin/sh - - # Guess values for system-dependent variables and create Makefiles. --# Generated automatically using autoconf version 2.12 -+# Generated automatically using autoconf version 2.13 - # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. - # - # This configure script is free software; the Free Software Foundation -@@ -24,7 +24,7 @@ - ac_help="$ac_help - --with-curses-driver=no/yes Used to disable/force curses driver" - ac_help="$ac_help -- --with-gpm-mouse=base-dir Specifies the base gpm directory" -+ --with-gpm-mouse=base-dir/no Specifies the base gpm directory" - ac_help="$ac_help - --with-x use the X Window System" - ac_help="$ac_help -@@ -73,6 +73,7 @@ - # Initialize some other variables. - subdirs= - MFLAGS= MAKEFLAGS= -+SHELL=${CONFIG_SHELL-/bin/sh} - # Maximum number of lines to put in a shell here document. - ac_max_here_lines=12 - -@@ -356,7 +357,7 @@ - verbose=yes ;; - - -version | --version | --versio | --versi | --vers) -- echo "configure generated by autoconf version 2.12" -+ echo "configure generated by autoconf version 2.13" - exit 0 ;; - - -with-* | --with-*) -@@ -526,9 +527,11 @@ - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. - ac_cpp='$CPP $CPPFLAGS' - ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' --ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cc_cross - -+ac_exeext= -+ac_objext=o - if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then -@@ -568,28 +571,30 @@ - # SunOS /usr/etc/install - # IRIX /sbin/install - # AIX /bin/install -+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag - # AFS /usr/afsws/bin/install, which mishandles nonexistent args - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # ./install, which can be erroneously created by make from ./install.sh. - echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 --echo "configure:576: checking for a BSD compatible install" >&5 -+echo "configure:580: checking for a BSD compatible install" >&5 - if test -z "$INSTALL"; then - if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" -+ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" - for ac_dir in $PATH; do - # Account for people who put trailing slashes in PATH elements. - case "$ac_dir/" in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. -- for ac_prog in ginstall installbsd scoinst install; do -+ # Don't use installbsd from OSF since it installs stuff as root -+ # by default. -+ for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then - if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. -- # OSF/1 installbsd also uses dspmsg, but is usable. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" -@@ -619,6 +624,8 @@ - # It thinks the first close brace ends the variable substitution. - test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' -+ - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - -@@ -641,7 +648,7 @@ - EOF - - echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 --echo "configure:645: checking whether build environment is sane" >&5 -+echo "configure:652: checking whether build environment is sane" >&5 - # Just in case - sleep 1 - echo timestamp > conftestfile -@@ -688,7 +695,7 @@ - - missing_dir=`cd $ac_aux_dir && pwd` - echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 --echo "configure:692: checking for working aclocal" >&5 -+echo "configure:699: checking for working aclocal" >&5 - # Run test in a subshell; some versions of sh will print an error if - # an executable is not found, even if stderr is redirected. - # Redirect stdin to placate older versions of autoconf. Sigh. -@@ -701,7 +708,7 @@ - fi - - echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 --echo "configure:705: checking for working autoconf" >&5 -+echo "configure:712: checking for working autoconf" >&5 - # Run test in a subshell; some versions of sh will print an error if - # an executable is not found, even if stderr is redirected. - # Redirect stdin to placate older versions of autoconf. Sigh. -@@ -714,7 +721,7 @@ - fi - - echo $ac_n "checking for working automake""... $ac_c" 1>&6 --echo "configure:718: checking for working automake" >&5 -+echo "configure:725: checking for working automake" >&5 - # Run test in a subshell; some versions of sh will print an error if - # an executable is not found, even if stderr is redirected. - # Redirect stdin to placate older versions of autoconf. Sigh. -@@ -727,7 +734,7 @@ - fi - - echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 --echo "configure:731: checking for working autoheader" >&5 -+echo "configure:738: checking for working autoheader" >&5 - # Run test in a subshell; some versions of sh will print an error if - # an executable is not found, even if stderr is redirected. - # Redirect stdin to placate older versions of autoconf. Sigh. -@@ -740,7 +747,7 @@ - fi - - echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 --echo "configure:744: checking for working makeinfo" >&5 -+echo "configure:751: checking for working makeinfo" >&5 - # Run test in a subshell; some versions of sh will print an error if - # an executable is not found, even if stderr is redirected. - # Redirect stdin to placate older versions of autoconf. Sigh. -@@ -753,7 +760,7 @@ - fi - - echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 --echo "configure:757: checking whether ${MAKE-make} sets \${MAKE}" >&5 -+echo "configure:764: checking whether ${MAKE-make} sets \${MAKE}" >&5 - set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -803,15 +810,16 @@ - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:807: checking for $ac_word" >&5 -+echo "configure:814: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. - else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -- for ac_dir in $PATH; do -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="gcc" -@@ -832,16 +840,17 @@ - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:836: checking for $ac_word" >&5 -+echo "configure:844: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. - else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_prog_rejected=no -- for ac_dir in $PATH; do -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then -@@ -876,25 +885,61 @@ - echo "$ac_t""no" 1>&6 - fi - -+ if test -z "$CC"; then -+ case "`uname -s`" in -+ *win32* | *WIN32*) -+ # Extract the first word of "cl", so it can be a program name with args. -+set dummy cl; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:895: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_CC="cl" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+CC="$ac_cv_prog_CC" -+if test -n "$CC"; then -+ echo "$ac_t""$CC" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ ;; -+ esac -+ fi - test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } - fi - - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:884: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:927: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. - ac_cpp='$CPP $CPPFLAGS' - ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' --ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cc_cross - --cat > conftest.$ac_ext <<EOF --#line 894 "configure" -+cat > conftest.$ac_ext << EOF -+ -+#line 938 "configure" - #include "confdefs.h" -+ - main(){return(0);} - EOF --if { (eval echo configure:898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then -@@ -908,18 +953,24 @@ - ac_cv_prog_cc_works=no - fi - rm -fr conftest* -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross - - echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 - if test $ac_cv_prog_cc_works = no; then - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:918: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:969: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 --echo "configure:923: checking whether we are using GNU C" >&5 -+echo "configure:974: checking whether we are using GNU C" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -928,7 +979,7 @@ - yes; - #endif - EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:932: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:983: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes - else - ac_cv_prog_gcc=no -@@ -939,11 +990,15 @@ - - if test $ac_cv_prog_gcc = yes; then - GCC=yes -- ac_test_CFLAGS="${CFLAGS+set}" -- ac_save_CFLAGS="$CFLAGS" -- CFLAGS= -- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:947: checking whether ${CC-cc} accepts -g" >&5 -+else -+ GCC= -+fi -+ -+ac_test_CFLAGS="${CFLAGS+set}" -+ac_save_CFLAGS="$CFLAGS" -+CFLAGS= -+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -+echo "configure:1002: checking whether ${CC-cc} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -958,40 +1013,44 @@ - fi - - echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 -- if test "$ac_test_CFLAGS" = set; then -- CFLAGS="$ac_save_CFLAGS" -- elif test $ac_cv_prog_cc_g = yes; then -+if test "$ac_test_CFLAGS" = set; then -+ CFLAGS="$ac_save_CFLAGS" -+elif test $ac_cv_prog_cc_g = yes; then -+ if test "$GCC" = yes; then - CFLAGS="-g -O2" - else -- CFLAGS="-O2" -+ CFLAGS="-g" - fi - else -- GCC= -- test "${CFLAGS+set}" = set || CFLAGS="-g" -+ if test "$GCC" = yes; then -+ CFLAGS="-O2" -+ else -+ CFLAGS= -+ fi - fi - - - # Make sure we can run config.sub. --if $ac_config_sub sun4 >/dev/null 2>&1; then : -+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : - else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } - fi - - echo $ac_n "checking host system type""... $ac_c" 1>&6 --echo "configure:981: checking host system type" >&5 -+echo "configure:1040: checking host system type" >&5 - - host_alias=$host - case "$host_alias" in - NONE) - case $nonopt in - NONE) -- if host_alias=`$ac_config_guess`; then : -+ if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } - fi ;; - *) host_alias=$nonopt ;; - esac ;; - esac - --host=`$ac_config_sub $host_alias` -+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` - host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` - host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` - host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -@@ -1000,15 +1059,16 @@ - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1004: checking for $ac_word" >&5 -+echo "configure:1063: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. - else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -- for ac_dir in $PATH; do -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="ranlib" -@@ -1036,10 +1096,10 @@ - - if test "$with_gnu_ld" = yes; then - echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 --echo "configure:1040: checking for GNU ld" >&5 -+echo "configure:1100: checking for GNU ld" >&5 - else - echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 --echo "configure:1043: checking for non-GNU ld" >&5 -+echo "configure:1103: checking for non-GNU ld" >&5 - fi - if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1078,7 +1138,7 @@ - test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } - - echo $ac_n "checking whether we are using GNU ld""... $ac_c" 1>&6 --echo "configure:1082: checking whether we are using GNU ld" >&5 -+echo "configure:1142: checking whether we are using GNU ld" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1094,7 +1154,7 @@ - - - echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 --echo "configure:1098: checking whether ln -s works" >&5 -+echo "configure:1158: checking whether ln -s works" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1172,7 +1232,7 @@ - || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } - - echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 --echo "configure:1176: checking whether ${MAKE-make} sets \${MAKE}" >&5 -+echo "configure:1236: checking whether ${MAKE-make} sets \${MAKE}" >&5 - set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1206,28 +1266,30 @@ - # SunOS /usr/etc/install - # IRIX /sbin/install - # AIX /bin/install -+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag - # AFS /usr/afsws/bin/install, which mishandles nonexistent args - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # ./install, which can be erroneously created by make from ./install.sh. - echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 --echo "configure:1214: checking for a BSD compatible install" >&5 -+echo "configure:1275: checking for a BSD compatible install" >&5 - if test -z "$INSTALL"; then - if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" -+ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" - for ac_dir in $PATH; do - # Account for people who put trailing slashes in PATH elements. - case "$ac_dir/" in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. -- for ac_prog in ginstall installbsd scoinst install; do -+ # Don't use installbsd from OSF since it installs stuff as root -+ # by default. -+ for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then - if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. -- # OSF/1 installbsd also uses dspmsg, but is usable. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" -@@ -1257,6 +1319,8 @@ - # It thinks the first close brace ends the variable substitution. - test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' -+ - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - -@@ -1264,15 +1328,16 @@ - # Extract the first word of "uname", so it can be a program name with args. - set dummy uname; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1268: checking for $ac_word" >&5 -+echo "configure:1332: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_system'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - if test -n "$system"; then - ac_cv_prog_system="$system" # Let the user override the test. - else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -- for ac_dir in $PATH; do -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_system="`uname`" -@@ -1294,15 +1359,16 @@ - # Extract the first word of "uname", so it can be a program name with args. - set dummy uname; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1298: checking for $ac_word" >&5 -+echo "configure:1363: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_machine'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - if test -n "$machine"; then - ac_cv_prog_machine="$machine" # Let the user override the test. - else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -- for ac_dir in $PATH; do -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_machine="`uname --machine`" -@@ -1322,7 +1388,7 @@ - - fi - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:1326: checking how to run the C preprocessor" >&5 -+echo "configure:1392: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@ -1337,14 +1403,14 @@ - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext <<EOF --#line 1341 "configure" -+#line 1407 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out` -+{ (eval echo configure:1413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : - else -@@ -1354,14 +1420,31 @@ - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext <<EOF --#line 1358 "configure" -+#line 1424 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out` -+{ (eval echo configure:1430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ : -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CPP="${CC-cc} -nologo -E" -+ cat > conftest.$ac_ext <<EOF -+#line 1441 "configure" -+#include "confdefs.h" -+#include <assert.h> -+Syntax Error -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:1447: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : - else -@@ -1374,6 +1457,8 @@ - rm -f conftest* - fi - rm -f conftest* -+fi -+rm -f conftest* - ac_cv_prog_CPP="$CPP" - fi - CPP="$ac_cv_prog_CPP" -@@ -1383,12 +1468,12 @@ - echo "$ac_t""$CPP" 1>&6 - - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:1387: checking for ANSI C header files" >&5 -+echo "configure:1472: checking for ANSI C header files" >&5 - if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1392 "configure" -+#line 1477 "configure" - #include "confdefs.h" - #include <stdlib.h> - #include <stdarg.h> -@@ -1396,8 +1481,8 @@ - #include <float.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out` -+{ (eval echo configure:1485: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* - ac_cv_header_stdc=yes -@@ -1413,7 +1498,7 @@ - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 1417 "configure" -+#line 1502 "configure" - #include "confdefs.h" - #include <string.h> - EOF -@@ -1431,7 +1516,7 @@ - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 1435 "configure" -+#line 1520 "configure" - #include "confdefs.h" - #include <stdlib.h> - EOF -@@ -1452,7 +1537,7 @@ - : - else - cat > conftest.$ac_ext <<EOF --#line 1456 "configure" -+#line 1541 "configure" - #include "confdefs.h" - #include <ctype.h> - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -1463,7 +1548,7 @@ - exit (0); } - - EOF --if { (eval echo configure:1467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:1552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -1487,7 +1572,7 @@ - fi - - echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6 --echo "configure:1491: checking for pow in -lm" >&5 -+echo "configure:1576: checking for pow in -lm" >&5 - ac_lib_var=`echo m'_'pow | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1495,7 +1580,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lm $LIBS" - cat > conftest.$ac_ext <<EOF --#line 1499 "configure" -+#line 1584 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -1506,7 +1591,7 @@ - pow() - ; return 0; } - EOF --if { (eval echo configure:1510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:1595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -1614,8 +1699,12 @@ - withval="$with_gpm_mouse" - if test x$withval = xyes - then -- echo "configure: warning: Usage is: --with-gpm-mouse=base-dir" 1>&2 -+ echo "configure: warning: Usage is: --with-gpm-mouse=base-dir/no " 1>&2 - else -+ if test x$withval = xno -+ then -+ gpm_mousedriver_test=no -+ else - LIBS="$LIBS -L$withval/lib -lgpm" - cat >> confdefs.h <<\EOF - #define GPM_MOUSEDRIVER 1 -@@ -1624,6 +1713,7 @@ - gpm_mousedriver=true - CFLAGS="$CFLAGS -I$withval/include" - echo "$ac_t""defining use_gpm" 1>&6 -+ fi - fi - - fi -@@ -1635,7 +1725,7 @@ - # Uses ac_ vars as temps to allow command line to override cache and checks. - # --without-x overrides everything else, but does not touch the cache. - echo $ac_n "checking for X""... $ac_c" 1>&6 --echo "configure:1639: checking for X" >&5 -+echo "configure:1729: checking for X" >&5 - - # Check whether --with-x or --without-x was given. - if test "${with_x+set}" = set; then -@@ -1697,13 +1787,13 @@ - - # First, try using that file with no special directory specified. - cat > conftest.$ac_ext <<EOF --#line 1701 "configure" -+#line 1791 "configure" - #include "confdefs.h" - #include <$x_direct_test_include> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out` -+{ (eval echo configure:1796: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* - # We can compile using X headers with no special include directory. -@@ -1771,14 +1861,14 @@ - ac_save_LIBS="$LIBS" - LIBS="-l$x_direct_test_library $LIBS" - cat > conftest.$ac_ext <<EOF --#line 1775 "configure" -+#line 1865 "configure" - #include "confdefs.h" - - int main() { - ${x_direct_test_function}() - ; return 0; } - EOF --if { (eval echo configure:1782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:1872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - LIBS="$ac_save_LIBS" - # We can link X programs with no special library path. -@@ -1884,17 +1974,17 @@ - case "`(uname -sr) 2>/dev/null`" in - "SunOS 5"*) - echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 --echo "configure:1888: checking whether -R must be followed by a space" >&5 -+echo "configure:1978: checking whether -R must be followed by a space" >&5 - ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" - cat > conftest.$ac_ext <<EOF --#line 1891 "configure" -+#line 1981 "configure" - #include "confdefs.h" - - int main() { - - ; return 0; } - EOF --if { (eval echo configure:1898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:1988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_R_nospace=yes - else -@@ -1910,14 +2000,14 @@ - else - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat > conftest.$ac_ext <<EOF --#line 1914 "configure" -+#line 2004 "configure" - #include "confdefs.h" - - int main() { - - ; return 0; } - EOF --if { (eval echo configure:1921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_R_space=yes - else -@@ -1949,7 +2039,7 @@ - # libraries were built with DECnet support. And karl@cs.umb.edu says - # the Alpha needs dnet_stub (dnet does not exist). - echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 --echo "configure:1953: checking for dnet_ntoa in -ldnet" >&5 -+echo "configure:2043: checking for dnet_ntoa in -ldnet" >&5 - ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1957,7 +2047,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldnet $LIBS" - cat > conftest.$ac_ext <<EOF --#line 1961 "configure" -+#line 2051 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -1968,7 +2058,7 @@ - dnet_ntoa() - ; return 0; } - EOF --if { (eval echo configure:1972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -1990,7 +2080,7 @@ - - if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 --echo "configure:1994: checking for dnet_ntoa in -ldnet_stub" >&5 -+echo "configure:2084: checking for dnet_ntoa in -ldnet_stub" >&5 - ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1998,7 +2088,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ldnet_stub $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2002 "configure" -+#line 2092 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -2009,7 +2099,7 @@ - dnet_ntoa() - ; return 0; } - EOF --if { (eval echo configure:2013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2038,12 +2128,12 @@ - # The nsl library prevents programs from opening the X display - # on Irix 5.2, according to dickey@clark.net. - echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 --echo "configure:2042: checking for gethostbyname" >&5 -+echo "configure:2132: checking for gethostbyname" >&5 - if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2047 "configure" -+#line 2137 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname(); below. */ -@@ -2066,7 +2156,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:2070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_gethostbyname=yes" - else -@@ -2087,7 +2177,7 @@ - - if test $ac_cv_func_gethostbyname = no; then - echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 --echo "configure:2091: checking for gethostbyname in -lnsl" >&5 -+echo "configure:2181: checking for gethostbyname in -lnsl" >&5 - ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2095,7 +2185,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lnsl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2099 "configure" -+#line 2189 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -2106,7 +2196,7 @@ - gethostbyname() - ; return 0; } - EOF --if { (eval echo configure:2110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2136,12 +2226,12 @@ - # -lsocket must be given before -lnsl if both are needed. - # We assume that if connect needs -lnsl, so does gethostbyname. - echo $ac_n "checking for connect""... $ac_c" 1>&6 --echo "configure:2140: checking for connect" >&5 -+echo "configure:2230: checking for connect" >&5 - if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2145 "configure" -+#line 2235 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect(); below. */ -@@ -2164,7 +2254,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:2168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_connect=yes" - else -@@ -2185,7 +2275,7 @@ - - if test $ac_cv_func_connect = no; then - echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 --echo "configure:2189: checking for connect in -lsocket" >&5 -+echo "configure:2279: checking for connect in -lsocket" >&5 - ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2193,7 +2283,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsocket $X_EXTRA_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2197 "configure" -+#line 2287 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -2204,7 +2294,7 @@ - connect() - ; return 0; } - EOF --if { (eval echo configure:2208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2228,12 +2318,12 @@ - - # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. - echo $ac_n "checking for remove""... $ac_c" 1>&6 --echo "configure:2232: checking for remove" >&5 -+echo "configure:2322: checking for remove" >&5 - if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2237 "configure" -+#line 2327 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char remove(); below. */ -@@ -2256,7 +2346,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:2260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_remove=yes" - else -@@ -2277,7 +2367,7 @@ - - if test $ac_cv_func_remove = no; then - echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 --echo "configure:2281: checking for remove in -lposix" >&5 -+echo "configure:2371: checking for remove in -lposix" >&5 - ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2285,7 +2375,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lposix $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2289 "configure" -+#line 2379 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -2296,7 +2386,7 @@ - remove() - ; return 0; } - EOF --if { (eval echo configure:2300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2320,12 +2410,12 @@ - - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo $ac_n "checking for shmat""... $ac_c" 1>&6 --echo "configure:2324: checking for shmat" >&5 -+echo "configure:2414: checking for shmat" >&5 - if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2329 "configure" -+#line 2419 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shmat(); below. */ -@@ -2348,7 +2438,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:2352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_shmat=yes" - else -@@ -2369,7 +2459,7 @@ - - if test $ac_cv_func_shmat = no; then - echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 --echo "configure:2373: checking for shmat in -lipc" >&5 -+echo "configure:2463: checking for shmat in -lipc" >&5 - ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2377,7 +2467,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lipc $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2381 "configure" -+#line 2471 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -2388,7 +2478,7 @@ - shmat() - ; return 0; } - EOF --if { (eval echo configure:2392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2421,15 +2511,15 @@ - # libraries we check for below, so use a different variable. - # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. - echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 --echo "configure:2425: checking for IceConnectionNumber in -lICE" >&5 -+echo "configure:2515: checking for IceConnectionNumber in -lICE" >&5 - ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lICE $LIBS" -+LIBS="-lICE $X_EXTRA_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2433 "configure" -+#line 2523 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -2440,7 +2530,7 @@ - IceConnectionNumber() - ; return 0; } - EOF --if { (eval echo configure:2444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2477,7 +2567,7 @@ - fi - if test "$gpm_mousedriver_test" = yes; then - echo $ac_n "checking for Gpm_Repeat in -lgpm""... $ac_c" 1>&6 --echo "configure:2481: checking for Gpm_Repeat in -lgpm" >&5 -+echo "configure:2571: checking for Gpm_Repeat in -lgpm" >&5 - ac_lib_var=`echo gpm'_'Gpm_Repeat | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2485,7 +2575,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lgpm $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2489 "configure" -+#line 2579 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -2496,7 +2586,7 @@ - Gpm_Repeat() - ; return 0; } - EOF --if { (eval echo configure:2500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2653,7 +2743,7 @@ - LIBS1="$LIBS" - LIBS="$LIBS " - echo $ac_n "checking for SLsmg_init_smg in -lslang""... $ac_c" 1>&6 --echo "configure:2657: checking for SLsmg_init_smg in -lslang" >&5 -+echo "configure:2747: checking for SLsmg_init_smg in -lslang" >&5 - ac_lib_var=`echo slang'_'SLsmg_init_smg | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2661,7 +2751,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lslang $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2665 "configure" -+#line 2755 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -2672,7 +2762,7 @@ - SLsmg_init_smg() - ; return 0; } - EOF --if { (eval echo configure:2676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2724,7 +2814,7 @@ - LIBS1="$LIBS" - LIBS="$LIBS " - echo $ac_n "checking for SLsmg_init_smg in -lslang""... $ac_c" 1>&6 --echo "configure:2728: checking for SLsmg_init_smg in -lslang" >&5 -+echo "configure:2818: checking for SLsmg_init_smg in -lslang" >&5 - ac_lib_var=`echo slang'_'SLsmg_init_smg | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2732,7 +2822,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lslang $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2736 "configure" -+#line 2826 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -2743,7 +2833,7 @@ - SLsmg_init_smg() - ; return 0; } - EOF --if { (eval echo configure:2747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2795,7 +2885,7 @@ - LIBS1="$LIBS" - LIBS="$LIBS " - echo $ac_n "checking for SLsmg_init_smg in -lslang""... $ac_c" 1>&6 --echo "configure:2799: checking for SLsmg_init_smg in -lslang" >&5 -+echo "configure:2889: checking for SLsmg_init_smg in -lslang" >&5 - ac_lib_var=`echo slang'_'SLsmg_init_smg | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2803,7 +2893,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lslang $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2807 "configure" -+#line 2897 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -2814,7 +2904,7 @@ - SLsmg_init_smg() - ; return 0; } - EOF --if { (eval echo configure:2818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2866,7 +2956,7 @@ - LIBS1="$LIBS" - LIBS="$LIBS " - echo $ac_n "checking for SLsmg_init_smg in -lslang""... $ac_c" 1>&6 --echo "configure:2870: checking for SLsmg_init_smg in -lslang" >&5 -+echo "configure:2960: checking for SLsmg_init_smg in -lslang" >&5 - ac_lib_var=`echo slang'_'SLsmg_init_smg | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2874,7 +2964,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lslang $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2878 "configure" -+#line 2968 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -2885,7 +2975,7 @@ - SLsmg_init_smg() - ; return 0; } - EOF --if { (eval echo configure:2889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -2945,7 +3035,7 @@ - if $search_ncurses - then - echo "checking "location of curses"" 1>&6 --echo "configure:2949: checking "location of curses"" >&5 -+echo "configure:3039: checking "location of curses"" >&5 - - - if $search_ncurses -@@ -2955,7 +3045,7 @@ - LIBS1="$LIBS" - LIBS="$LIBS " - echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 --echo "configure:2959: checking for initscr in -lncurses" >&5 -+echo "configure:3049: checking for initscr in -lncurses" >&5 - ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2963,7 +3053,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lncurses $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2967 "configure" -+#line 3057 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -2974,7 +3064,7 @@ - initscr() - ; return 0; } - EOF --if { (eval echo configure:2978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:3068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -3027,7 +3117,7 @@ - LIBS1="$LIBS" - LIBS="$LIBS " - echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 --echo "configure:3031: checking for initscr in -lncurses" >&5 -+echo "configure:3121: checking for initscr in -lncurses" >&5 - ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3035,7 +3125,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lncurses $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3039 "configure" -+#line 3129 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -3046,7 +3136,7 @@ - initscr() - ; return 0; } - EOF --if { (eval echo configure:3050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:3140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -3099,7 +3189,7 @@ - LIBS1="$LIBS" - LIBS="$LIBS " - echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 --echo "configure:3103: checking for initscr in -lncurses" >&5 -+echo "configure:3193: checking for initscr in -lncurses" >&5 - ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3107,7 +3197,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lncurses $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3111 "configure" -+#line 3201 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -3118,7 +3208,7 @@ - initscr() - ; return 0; } - EOF --if { (eval echo configure:3122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:3212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -3171,7 +3261,7 @@ - LIBS1="$LIBS" - LIBS="$LIBS -L/usr/local/lib -L/usr/local/lib/ncurses" - echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 --echo "configure:3175: checking for initscr in -lncurses" >&5 -+echo "configure:3265: checking for initscr in -lncurses" >&5 - ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3179,7 +3269,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lncurses $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3183 "configure" -+#line 3273 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -3190,7 +3280,7 @@ - initscr() - ; return 0; } - EOF --if { (eval echo configure:3194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:3284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -3244,7 +3334,7 @@ - LIBS1="$LIBS" - LIBS="$LIBS -L/usr/local/lib" - echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 --echo "configure:3248: checking for initscr in -lncurses" >&5 -+echo "configure:3338: checking for initscr in -lncurses" >&5 - ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3252,7 +3342,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lncurses $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3256 "configure" -+#line 3346 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -3263,7 +3353,7 @@ - initscr() - ; return 0; } - EOF --if { (eval echo configure:3267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:3357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -3317,7 +3407,7 @@ - LIBS1="$LIBS" - LIBS="$LIBS " - echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 --echo "configure:3321: checking for initscr in -lncurses" >&5 -+echo "configure:3411: checking for initscr in -lncurses" >&5 - ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3325,7 +3415,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lncurses $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3329 "configure" -+#line 3419 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -3336,7 +3426,7 @@ - initscr() - ; return 0; } - EOF --if { (eval echo configure:3340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:3430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -3389,7 +3479,7 @@ - LIBS1="$LIBS" - LIBS="$LIBS " - echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6 --echo "configure:3393: checking for initscr in -lcurses" >&5 -+echo "configure:3483: checking for initscr in -lcurses" >&5 - ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3397,7 +3487,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lcurses $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3401 "configure" -+#line 3491 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -3408,7 +3498,7 @@ - initscr() - ; return 0; } - EOF --if { (eval echo configure:3412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:3502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -3460,7 +3550,7 @@ - if $search_ncurses - then - cat > conftest.$ac_ext <<EOF --#line 3464 "configure" -+#line 3554 "configure" - #include "confdefs.h" - #include </usr/include/curses.h> - EOF -@@ -3516,12 +3606,12 @@ - for ac_func in mousemask termattrs wredrawln redrawwin curs_set - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:3520: checking for $ac_func" >&5 -+echo "configure:3610: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3525 "configure" -+#line 3615 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -3544,7 +3634,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:3548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:3638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -3572,12 +3662,12 @@ - - - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:3576: checking for ANSI C header files" >&5 -+echo "configure:3666: checking for ANSI C header files" >&5 - if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3581 "configure" -+#line 3671 "configure" - #include "confdefs.h" - #include <stdlib.h> - #include <stdarg.h> -@@ -3585,8 +3675,8 @@ - #include <float.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out` -+{ (eval echo configure:3679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* - ac_cv_header_stdc=yes -@@ -3602,7 +3692,7 @@ - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 3606 "configure" -+#line 3696 "configure" - #include "confdefs.h" - #include <string.h> - EOF -@@ -3620,7 +3710,7 @@ - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 3624 "configure" -+#line 3714 "configure" - #include "confdefs.h" - #include <stdlib.h> - EOF -@@ -3641,7 +3731,7 @@ - : - else - cat > conftest.$ac_ext <<EOF --#line 3645 "configure" -+#line 3735 "configure" - #include "confdefs.h" - #include <ctype.h> - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -3652,7 +3742,7 @@ - exit (0); } - - EOF --if { (eval echo configure:3656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -3679,18 +3769,18 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:3683: checking for $ac_hdr" >&5 -+echo "configure:3773: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3688 "configure" -+#line 3778 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3693: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out` -+{ (eval echo configure:3783: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -@@ -3717,12 +3807,12 @@ - - - echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 --echo "configure:3721: checking for st_rdev in struct stat" >&5 -+echo "configure:3811: checking for st_rdev in struct stat" >&5 - if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3726 "configure" -+#line 3816 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/stat.h> -@@ -3730,7 +3820,7 @@ - struct stat s; s.st_rdev; - ; return 0; } - EOF --if { (eval echo configure:3734: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_struct_st_rdev=yes - else -@@ -3751,12 +3841,12 @@ - fi - - echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 --echo "configure:3755: checking whether time.h and sys/time.h may both be included" >&5 -+echo "configure:3845: checking whether time.h and sys/time.h may both be included" >&5 - if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3760 "configure" -+#line 3850 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/time.h> -@@ -3765,7 +3855,7 @@ - struct tm *tp; - ; return 0; } - EOF --if { (eval echo configure:3769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_header_time=yes - else -@@ -3788,13 +3878,13 @@ - - if test $ac_cv_prog_gcc = yes; then - echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 --echo "configure:3792: checking whether ${CC-cc} needs -traditional" >&5 -+echo "configure:3882: checking whether ${CC-cc} needs -traditional" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_pattern="Autoconf.*'x'" - cat > conftest.$ac_ext <<EOF --#line 3798 "configure" -+#line 3888 "configure" - #include "confdefs.h" - #include <sgtty.h> - Autoconf TIOCGETP -@@ -3812,7 +3902,7 @@ - - if test $ac_cv_prog_gcc_traditional = no; then - cat > conftest.$ac_ext <<EOF --#line 3816 "configure" -+#line 3906 "configure" - #include "confdefs.h" - #include <termio.h> - Autoconf TCGETA -@@ -3834,12 +3924,12 @@ - fi - - echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 --echo "configure:3838: checking return type of signal handlers" >&5 -+echo "configure:3928: checking return type of signal handlers" >&5 - if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3843 "configure" -+#line 3933 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <signal.h> -@@ -3856,7 +3946,7 @@ - int i; - ; return 0; } - EOF --if { (eval echo configure:3860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3950: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_type_signal=void - else -@@ -3877,12 +3967,12 @@ - for ac_func in strdup - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:3881: checking for $ac_func" >&5 -+echo "configure:3971: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3886 "configure" -+#line 3976 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -3905,7 +3995,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:3909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:3999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -4045,7 +4135,7 @@ - # Ultrix sh set writes to stderr and can't be redirected directly, - # and sets the high bit in the cache file unless we assign to the vars. - (set) 2>&1 | -- case `(ac_space=' '; set) 2>&1` in -+ case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). -@@ -4112,7 +4202,7 @@ - echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" - exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; - -version | --version | --versio | --versi | --vers | --ver | --ve | --v) -- echo "$CONFIG_STATUS generated by autoconf version 2.12" -+ echo "$CONFIG_STATUS generated by autoconf version 2.13" - exit 0 ;; - -help | --help | --hel | --he | --h) - echo "\$ac_cs_usage"; exit 0 ;; -@@ -4132,9 +4222,11 @@ - s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF - $ac_vpsub - $extrasub -+s%@SHELL@%$SHELL%g - s%@CFLAGS@%$CFLAGS%g - s%@CPPFLAGS@%$CPPFLAGS%g - s%@CXXFLAGS@%$CXXFLAGS%g -+s%@FFLAGS@%$FFLAGS%g - s%@DEFS@%$DEFS%g - s%@LDFLAGS@%$LDFLAGS%g - s%@LIBS@%$LIBS%g -@@ -4154,8 +4246,8 @@ - s%@infodir@%$infodir%g - s%@mandir@%$mandir%g - s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g --s%@INSTALL_DATA@%$INSTALL_DATA%g - s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g -+s%@INSTALL_DATA@%$INSTALL_DATA%g - s%@PACKAGE@%$PACKAGE%g - s%@VERSION@%$VERSION%g - s%@ACLOCAL@%$ACLOCAL%g diff --git a/media-libs/aalib/files/aalib-1.2-configure.in-gpm-gentoo.diff b/media-libs/aalib/files/aalib-1.2-configure.in-gpm-gentoo.diff deleted file mode 100644 index 59abb3d7274d..000000000000 --- a/media-libs/aalib/files/aalib-1.2-configure.in-gpm-gentoo.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- configure.in.orig Thu Feb 22 15:04:29 2001 -+++ configure.in Thu Feb 22 15:04:35 2001 -@@ -101,16 +101,21 @@ - fi - ]) - AC_ARG_WITH(gpm-mouse, -- [ --with-gpm-mouse=base-dir Specifies the base gpm directory], -+ [ --with-gpm-mouse=base-dir/no Specifies the base gpm directory], - if test x$withval = xyes - then -- AC_MSG_WARN(Usage is: --with-gpm-mouse=base-dir) -+ AC_MSG_WARN(Usage is: --with-gpm-mouse=base-dir/no ) - else -+ if test x$withval = xno -+ then -+ gpm_mousedriver_test=no -+ else - LIBS="$LIBS -L$withval/lib -lgpm" - AC_DEFINE(GPM_MOUSEDRIVER) - gpm_mousedriver=true - CFLAGS="$CFLAGS -I$withval/include" - AC_MSG_RESULT(defining use_gpm) -+ fi - fi - ) - diff --git a/media-libs/aalib/files/configure-gpm.diff b/media-libs/aalib/files/configure-gpm.diff deleted file mode 100644 index 59abb3d7274d..000000000000 --- a/media-libs/aalib/files/configure-gpm.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- configure.in.orig Thu Feb 22 15:04:29 2001 -+++ configure.in Thu Feb 22 15:04:35 2001 -@@ -101,16 +101,21 @@ - fi - ]) - AC_ARG_WITH(gpm-mouse, -- [ --with-gpm-mouse=base-dir Specifies the base gpm directory], -+ [ --with-gpm-mouse=base-dir/no Specifies the base gpm directory], - if test x$withval = xyes - then -- AC_MSG_WARN(Usage is: --with-gpm-mouse=base-dir) -+ AC_MSG_WARN(Usage is: --with-gpm-mouse=base-dir/no ) - else -+ if test x$withval = xno -+ then -+ gpm_mousedriver_test=no -+ else - LIBS="$LIBS -L$withval/lib -lgpm" - AC_DEFINE(GPM_MOUSEDRIVER) - gpm_mousedriver=true - CFLAGS="$CFLAGS -I$withval/include" - AC_MSG_RESULT(defining use_gpm) -+ fi - fi - ) - diff --git a/media-libs/aalib/files/digest-aalib-1.2-r1 b/media-libs/aalib/files/digest-aalib-1.2-r1 deleted file mode 100644 index 8c8f3a0fc602..000000000000 --- a/media-libs/aalib/files/digest-aalib-1.2-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 790434e0f2005fc95559ab3eab42e746 aalib-1.2.tar.gz diff --git a/media-libs/coin/coin-20010215.ebuild b/media-libs/coin/coin-20010215.ebuild deleted file mode 100644 index 01d3aba43aad..000000000000 --- a/media-libs/coin/coin-20010215.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 Your Name <your email> -# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-20010215.ebuild,v 1.2 2001/06/04 00:16:12 achim Exp $ - - -A=Coin-${PV}.tar.gz -S=${WORKDIR}/Coin -DESCRIPTION="An OpenSource implementation of SGI's OpenInventor" -SRC_URI="ftp://ftp.coin3d.org/pub/snapshots/${A}" -HOMEPAGE="http://www.coin3d.org" - -DEPEND="virtual/x11 virtual/opengl virtual/glu" - -src_compile() { - - local myconf - if [ -z "`use X`" ] - then - myconf="--without-x" - fi - try ./configure --prefix=/usr/X11R6 --with-glu=/usr --host=${CHOST} $myconf - try make - -} - -src_install () { - - try make prefix=${D}/usr/X11R6 install - dodoc AUTHORS COPYING ChangeLog* HACKING LICENSE* NEWS README* - docinto txt - dodoc docs/*.txt docs/coin.doxygen docs/whitepapers/*.txt - -} - diff --git a/media-libs/coin/files/digest-coin-20010215 b/media-libs/coin/files/digest-coin-20010215 deleted file mode 100644 index 8711dcbbaaf4..000000000000 --- a/media-libs/coin/files/digest-coin-20010215 +++ /dev/null @@ -1 +0,0 @@ -MD5 b8ec72febd0f3a9808975045435a1bce Coin-20010215.tar.gz diff --git a/media-libs/gdk-pixbuf/files/digest-gdk-pixbuf-0.10.1 b/media-libs/gdk-pixbuf/files/digest-gdk-pixbuf-0.10.1 deleted file mode 100644 index e70af3d0571a..000000000000 --- a/media-libs/gdk-pixbuf/files/digest-gdk-pixbuf-0.10.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 eb554077f6f176da32e263dcacfe34c4 gdk-pixbuf-0.10.1.tar.gz diff --git a/media-libs/gdk-pixbuf/gdk-pixbuf-0.10.1.ebuild b/media-libs/gdk-pixbuf/gdk-pixbuf-0.10.1.ebuild deleted file mode 100644 index 362bff4de6ca..000000000000 --- a/media-libs/gdk-pixbuf/gdk-pixbuf-0.10.1.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/media-libs/gdk-pixbuf/gdk-pixbuf-0.10.1.ebuild,v 1.1 2001/04/13 16:59:03 pete Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="GNOME Image Library" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/"${A} - -DEPEND=">=gnome-base/gnome-libs-1.2.13" - -src_compile() { - - try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome - try make -} - -src_install() { - - try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome install - dodoc AUTHORS COPYING* ChangeLog INSTALL README NEWS TODO -} - - - - - - diff --git a/media-libs/giflib/files/digest-giflib-4.1.0-r2 b/media-libs/giflib/files/digest-giflib-4.1.0-r2 deleted file mode 100644 index d88e517e0a46..000000000000 --- a/media-libs/giflib/files/digest-giflib-4.1.0-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 f70e8fe2dd57815bd2740aa88aa32f2c giflib-4.1.0.tar.gz diff --git a/media-libs/giflib/giflib-4.1.0-r2.ebuild b/media-libs/giflib/giflib-4.1.0-r2.ebuild deleted file mode 100644 index 8e77e450c74e..000000000000 --- a/media-libs/giflib/giflib-4.1.0-r2.ebuild +++ /dev/null @@ -1,46 +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/media-libs/giflib/giflib-4.1.0-r2.ebuild,v 1.2 2001/05/01 18:29:05 achim Exp $ - -P=giflib-4.1.0 -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="giflib" -SRC_URI="ftp://metalab.unc.edu/pub/Linux/libs/giflib/${A} - ftp://prtr-13.ucsc.edu/pub/libungif/${A}" - -HOMEPAGE="http://prtr-13.ucsc.edu/~badger/software/libungif/index.shtml" - -DEPEND="virtual/glibc - X? ( virtual/x11 )" - -src_compile() { - - local myconf - if [ "`use X`" ] - then - myconf="--with-x" - else - myconf="--without-x" - fi - - try ./configure --host=${CHOST} --prefix=/usr ${myconf} - - try make - -} - -src_install() { - - try make prefix=${D}/usr install - dodoc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS ONEWS - dodoc PATENT_PROBLEMS README TODO - dodoc doc/*.txt - docinto html - dodoc doc/*.html doc/*.png - -} - - - diff --git a/media-libs/libmng/files/digest-libmng-1.0.0 b/media-libs/libmng/files/digest-libmng-1.0.0 deleted file mode 100644 index d0dcf5b11d66..000000000000 --- a/media-libs/libmng/files/digest-libmng-1.0.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 54c9cb5bf9aa5f76dfa4d63cddea539a libmng-1.0.0.tar.gz diff --git a/media-libs/libmng/libmng-1.0.0.ebuild b/media-libs/libmng/libmng-1.0.0.ebuild deleted file mode 100644 index 60a812473aeb..000000000000 --- a/media-libs/libmng/libmng-1.0.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 Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/libmng-1.0.0.ebuild,v 1.1 2001/02/13 14:29:41 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Multiple Image Networkgraphics lib (animated png's)" -SRC_URI="http://download.sourceforge.net/libmng/${A}" -HOMEPAGE="http://www.libmng.com/" - -DEPEND="virtual/glibc - >=media-libs/jpeg-6b >=sys-libs/zlib-1.1.3 - lcms? ( >=media-libs/lcms-1.0.6 )" - -src_compile() { - - local myconf - if [ "`use lcms`" ] - then - myconf="--with-lcms=/usr" - else - myconf="--without-lcms" - fi - try ./configure --prefix=/usr $myconf --host=${CHOST} - try make - -} - -src_install () { - - try make prefix=${D}/usr install - - dodoc CHANGES LICENSE README* - dodoc doc/doc.readme doc/libmng.txt doc/*.png - -} - - diff --git a/media-libs/libpng/files/digest-libpng-1.0.9 b/media-libs/libpng/files/digest-libpng-1.0.9 deleted file mode 100644 index 753aaf3aa0f8..000000000000 --- a/media-libs/libpng/files/digest-libpng-1.0.9 +++ /dev/null @@ -1 +0,0 @@ -MD5 4e4f5a75058b97ffa9373b4b5ca38ea4 libpng-1.0.9.tar.gz diff --git a/media-libs/libpng/libpng-1.0.9.ebuild b/media-libs/libpng/libpng-1.0.9.ebuild deleted file mode 100644 index 0c7f33ec7dcf..000000000000 --- a/media-libs/libpng/libpng-1.0.9.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/media-libs/libpng/libpng-1.0.9.ebuild,v 1.1 2001/02/13 14:29:41 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="libpng" -SRC_URI="ftp://swrinde.nde.swri.edu/pub/png/src/${A}" -HOMEPAGE="http://www.libpng.org/" - -DEPEND=">=sys-libs/zlib-1.1.3-r2" - -src_compile() { - - sed -e "s:ZLIBLIB=../zlib:ZLIBLIB=/usr/lib:" \ - -e "s:ZLIBINC=../zlib:ZLIBINC=/usr/include:" \ - -e "s:prefix=/usr:prefix=${D}/usr:" \ - -e "s/-O3/${CFLAGS}/" \ - scripts/makefile.linux > Makefile - try make -} - - -src_install() { - - dodir /usr/{include,lib} - - try make install prefix=${D}/usr - - doman *.[35] - - dodoc ANNOUNCE CHANGES KNOWNBUG LICENSE README TODO Y2KINFO - -} diff --git a/media-libs/libsdl/files/digest-libsdl-1.1.8-r1 b/media-libs/libsdl/files/digest-libsdl-1.1.8-r1 deleted file mode 100644 index e493356fc892..000000000000 --- a/media-libs/libsdl/files/digest-libsdl-1.1.8-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 af977736c789185456faab535f1c6fac SDL-1.1.8.tar.gz diff --git a/media-libs/libsdl/libsdl-1.1.8-r1.ebuild b/media-libs/libsdl/libsdl-1.1.8-r1.ebuild deleted file mode 100644 index 4447549f8c37..000000000000 --- a/media-libs/libsdl/libsdl-1.1.8-r1.ebuild +++ /dev/null @@ -1,91 +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/media-libs/libsdl/libsdl-1.1.8-r1.ebuild,v 1.5 2001/04/30 14:50:18 achim Exp $ - -A=SDL-${PV}.tar.gz -S=${WORKDIR}/SDL-${PV} -DESCRIPTION="Simple Direct Media Layer" -SRC_URI="http://www.libsdl.org/release/"${A} -HOMEPAGE="http://www.libsdl.org/" - -DEPEND="virtual/glibc - >=dev-lang/nasm-0.98 - >=media-libs/audiofile-0.1.9 - opengl? ( virtual/opengl ) - svga? ( >=media-libs/svgalib-1.4.2 ) - esd? ( >=media-sound/esound-0.2.19 ) - X? ( virtual/x11 ) - arts? ( >=kde-base/kdelibs-2.0.1 ) - nas? ( media-sound/nas ) - ggi? ( >=medlia-libs/libggi-2.0_beta3 )" - -src_compile() { - - local myconf - - if [ -z "`use esd`" ] - then - myconf="--disable-esd" - fi - - if [ -z "`use arts`" ] - then - myconf="${myconf} --disable-arts" - fi - - if [ -z "`use nas`" ] - then - myconf="${myconf} --disable-nas" - fi - - if [ -z "`use X`" ] - then - myconf="${myconf} --disable-video-x11" - fi - if [ "`use svga`" ] - then - myconf="${myconf} --enable-video-svga" - fi - if [ -z "`use fbcon`" ] - then - myconf="${myconf} --disable-video-fbcon" - fi - if [ "`use aalib`" ] - then - myconf="${myconf} --enable-video-aalib" - fi - if [ "`use ggi`" ] - then - myconf="${myconf} --enable-video-ggi" - fi - if [ -z "`use opengl`" ] - then - myconf="${myconf} --disable-video-opengl" - fi - - try ./configure --host=${CHOST} --prefix=/usr --mandir=/usr/share/man ${myconf} - - try make - -} - -src_install() { - cd ${S} - try make DESTDIR=${D} install - preplib /usr - dodoc BUGS COPYING CREDITS README* TODO WhatsNew - docinto html - dodoc *.html - docinto html/docs - dodoc docs/*.html - -} -pkg_postinst() { - - ldconfig -r ${ROOT} - -} - - - diff --git a/media-libs/mesa-glu/files/digest-mesa-glu-3.4-r1 b/media-libs/mesa-glu/files/digest-mesa-glu-3.4-r1 deleted file mode 100644 index 2271c1f6bdee..000000000000 --- a/media-libs/mesa-glu/files/digest-mesa-glu-3.4-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 6817ac3667aec85ab4c64ad8116867b7 MesaLib-3.4.tar.bz2 -MD5 27f7c8e143e2412e75ef7a3cd2313e0b MesaDemos-3.4.tar.bz2 diff --git a/media-libs/mesa-glu/mesa-glu-3.4-r1.ebuild b/media-libs/mesa-glu/mesa-glu-3.4-r1.ebuild deleted file mode 100644 index f285ef36184f..000000000000 --- a/media-libs/mesa-glu/mesa-glu-3.4-r1.ebuild +++ /dev/null @@ -1,72 +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/media-libs/mesa-glu/mesa-glu-3.4-r1.ebuild,v 1.2 2001/05/01 18:29:06 achim Exp $ - -P=MesaLib-${PV} -A0=${P}.tar.bz2 -A1=MesaDemos-${PV}.tar.bz2 -A="${A0} ${A1}" -S=${WORKDIR}/Mesa-${PV} -DESCRIPTION="OpenGL like graphic library for Linux, this package only contains the glu and glut parts" -SRC_URI="http://download.sourceforge.net/mesa3d/${A0} - http://download.sourceforge.net/mesa3d/${A1}" -HOMEPAGE="http://mesa3d.sourceforge.net/" - -DEPEND="virtual/glibc virtual/x11" - -PROVIDE="virtual/glu virtual/glut" - -src_compile() { - - local myconf - - if [ "`use mmx`" ] - then - myconf="--enable-mmx" - else - myconf="--disable-mmx" - fi - - if [ "`use 3dnow`" ] - then - myconf="${myconf} --enable-3dnow" - else - myconf="${myconf} --disable-3dnow" - fi - - if [ "`use sse`" ] - then - myconf="${myconf} --enable-sse" - else - myconf="${myconf} --disable-sse" - fi - - myconf="${myconf} --with-x --without-glut --disable-ggi-fbdev --without-ggi" - - try ./configure --prefix=/usr --sysconfdir=/etc/mesa --host=${CHOST} $myconf - - try make - -} - -src_install () { - - - cd ${S} - try make DESTDIR=${D} install - cd ${D}/usr/lib - - rm -f libGL.* - - rm -f ../include/GL/gl.h - rm -f ../include/GL/glx.h - rm -f ../include/GL/osmesa.h - - ln -s libGLU.so.1.1.030400 libMesaGLU.so.3 - - - cd ${S} - dodoc docs/* -} - diff --git a/media-libs/mesa/files/digest-mesa-3.4-r1 b/media-libs/mesa/files/digest-mesa-3.4-r1 deleted file mode 100644 index 2271c1f6bdee..000000000000 --- a/media-libs/mesa/files/digest-mesa-3.4-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 6817ac3667aec85ab4c64ad8116867b7 MesaLib-3.4.tar.bz2 -MD5 27f7c8e143e2412e75ef7a3cd2313e0b MesaDemos-3.4.tar.bz2 diff --git a/media-libs/mesa/mesa-3.4-r1.ebuild b/media-libs/mesa/mesa-3.4-r1.ebuild deleted file mode 100644 index 6d45cc6b9ea9..000000000000 --- a/media-libs/mesa/mesa-3.4-r1.ebuild +++ /dev/null @@ -1,138 +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/media-libs/mesa/mesa-3.4-r1.ebuild,v 1.6 2001/05/01 18:29:06 achim Exp $ - -P=MesaLib-${PV} -A0=${P}.tar.bz2 -A1=MesaDemos-${PV}.tar.bz2 -A="${A0} ${A1}" -S=${WORKDIR}/Mesa-${PV} -DESCRIPTION="OpenGL like graphic library for Linux" -SRC_URI="http://download.sourceforge.net/mesa3d/${A0} - http://download.sourceforge.net/mesa3d/${A1}" -HOMEPAGE="http://mesa3d.sourceforge.net/" - -DEPEND="virtual/glibc - X? ( virtual/x11 ) - ggi? ( >=media-libs/libggi-2.0_beta3 ) - svga? ( >=media-libs/svgalib-1.4.2-r1 )" - -if [ "`use X`" ] -then - PROVIDE="virtual/opengl virtual/glu virtual/glut" -else - PROVIDE="virtual/opengl" -fi - -src_compile() { - - local myconf - - if [ "`use mmx`" ] - then - myconf="--enable-mmx" - else - myconf="--disable-mmx" - fi - - if [ "`use 3dnow`" ] - then - myconf="${myconf} --enable-3dnow" - else - myconf="${myconf} --disable-3dnow" - fi - - if [ "`use sse`" ] - then - myconf="${myconf} --enable-sse" - else - myconf="${myconf} --disable-sse" - fi - - if [ "`use X`" ] - then - myconf="${myconf} --with-x --without-glut" - # --without-glut means that mesa is forced to use and install - # his own version of glut. - else - myconf="${myconf} --without-x" - rm -rf src-glut - fi - - if [ -z "`use ggi`" ] || [ -z "`use fbcon`" ] - then - myconf="${myconf} --disable-ggi-fbdev --without-ggi" - fi - - if [ -z "`use svga`" ] - then - myconf="${myconf} --without-svga" - fi - - cp configure configure.orig - sed -e "s:^ggi_confdir.*:ggi_confdir=/etc/ggi:" \ - -e "s:^ggi_libdir.*:ggi_libdir=\$prefix/lib:" \ - configure.orig > configure - - try ./configure --prefix=/usr --sysconfdir=/etc/mesa --host=${CHOST} $myconf - - if [ "`use ggi`" ] && [ "`use fbcon`" ] - then - cd ${S}/src/GGI - cp Makefile Makefile.orig - sed -e "s:^ggimesaconfdatadir.*:ggimesaconfdatadir = \${ggi_confdir}:" \ - Makefile.orig > Makefile - - cd ${S}/src/GGI/default - cp stubs.c stubs.c.orig - sed -e "s:Texture.Enabled:Texture.ReallyEnabled:" stubs.c.orig > stubs.c - - cd ${S}/src/GGI/include/ggi/mesa - cp display_fbdev.h display_fbdev.h.orig - sed -e "s:fbdev_hook:ggi_fbdev_priv:" display_fbdev.h.orig > display_fbdev.h - - cd ${S} - fi - - try make - - if [ "`use ggi`" ] - then - cd ggi/ggiglut - try make libglut_la_LIBADD=\"-lggi -lgg -L${S}/src/.libs -lGL\" - fi -} - -src_install () { - - - if [ "`use ggi`" ] - then - cd ggi/ggiglut - try make DESTDIR=${D} install - cd ${D}/usr/lib - cp libglut.la libglut.orig - sed -e "s:-L${S}/src/.libs::g" libglut.orig > libglut.la - rm libglut.orig - fi - cd ${S} - try make DESTDIR=${D} install - cd ${D}/usr/lib - if [ "$PN" = "mesa-glu" ] - then - rm -f libGL.* - - rm -f ../include/GL/gl.h - rm -f ../include/GL/glx.h - rm -f ../include/GL/osmesa.h - else - ln -s libGL.so.2.1.030400 libMesaGL.so.3 - fi - ln -s libGLU.so.1.1.030400 libMesaGLU.so.3 - - - cd ${S} - dodoc docs/* -} - diff --git a/media-libs/smpeg/files/digest-smpeg-0.4.2-r1 b/media-libs/smpeg/files/digest-smpeg-0.4.2-r1 deleted file mode 100644 index cc51f0f49207..000000000000 --- a/media-libs/smpeg/files/digest-smpeg-0.4.2-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 36fe3c2799faee25b79db88fe3699755 smpeg-0.4.2.tar.gz diff --git a/media-libs/smpeg/smpeg-0.4.2-r1.ebuild b/media-libs/smpeg/smpeg-0.4.2-r1.ebuild deleted file mode 100644 index 1f74b3438cd5..000000000000 --- a/media-libs/smpeg/smpeg-0.4.2-r1.ebuild +++ /dev/null @@ -1,54 +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/media-libs/smpeg/smpeg-0.4.2-r1.ebuild,v 1.6 2001/05/15 10:19:33 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="SDL MPEG Player Library" -SRC_URI="ftp://ftp.lokigames.com/pub/open-source/smpeg/${A}" -HOMEPAGE="http://www.lokigames.com/development/smpeg.php3" - -DEPEND=">=media-libs/libsdl-1.0.8 - opengl? ( virtual/opengl ) - gtk? ( >=dev-libs/glib-1.2.8 - >=x11-libs/gtk+-1.2.8 )" - -src_compile() { - - local myconf - if [ "`use mmx`" ] - then - myconf="--enable-mmx" - fi - if [ -z "`use gtk`" ] - then - myconf="${myconf} --disable-gtk-player" - fi - if [ -z "`use X`" ] - then - myconf="${myconf} --disable-gtk-player --without-x" - fi - - if [ -z "`use opengl`" ] - then - myconf="${myconf} --disable-opengl-player" - fi - if [ "`use nas`" ] ; then - LDFLAGS="-L/usr/X11R6/lib -lXt" - fi - try LDFLAGS=\"$LDFLAGS\" ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} ${myconf} --disable-sdltest - try make -} - -src_install () { - - try make DESTDIR=${D} install - - dodoc CHANGES COPYING README* TODO - -} - - - - diff --git a/media-libs/tiff/files/config.site-3.5.5-r3 b/media-libs/tiff/files/config.site-3.5.5-r3 deleted file mode 100644 index ec0c3bc24f43..000000000000 --- a/media-libs/tiff/files/config.site-3.5.5-r3 +++ /dev/null @@ -1,12 +0,0 @@ -JPEG="yes" -ZIP="yes" -HTML="yes" -DIR_BIN=${D}/usr/bin -DIR_LIB=${D}/usr/lib -DIR_INC=${D}/usr/include -DIR_MAN=${D}/usr/share/man -DIRS_LIBINC="/usr/include" -DIR_JPEGLIB="/usr/lib" -DIR_GZLIB="/usr/lib" -DSOSUF="so" -#MANSCHEME="bsd-nroff-gzip-0.gz" diff --git a/media-libs/tiff/files/digest-tiff-3.5.5-r3 b/media-libs/tiff/files/digest-tiff-3.5.5-r3 deleted file mode 100644 index 0e42d243be7c..000000000000 --- a/media-libs/tiff/files/digest-tiff-3.5.5-r3 +++ /dev/null @@ -1 +0,0 @@ -MD5 407d65a98c7621ad6e2c64cd3d1e7a40 tiff-v3.5.5.tar.gz diff --git a/media-libs/tiff/tiff-3.5.5-r3.ebuild b/media-libs/tiff/tiff-3.5.5-r3.ebuild deleted file mode 100644 index bc2d94100b74..000000000000 --- a/media-libs/tiff/tiff-3.5.5-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/media-libs/tiff/tiff-3.5.5-r3.ebuild,v 1.2 2001/03/06 05:27:28 achim Exp $ - -P=${PN}-v${PV} -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="libtiff" -SRC_URI="http://www.libtiff.org/"${A} -HOMEPAGE="http://www.libtiff.org/" - -DEPEND=">=media-libs/jpeg-6b - >=sys-libs/zlib-1.1.3-r2" - -src_unpack() { - unpack ${A} - cd ${S} - cp ${FILESDIR}/config.site-${PV}-r${PR} config.site - echo "DIR_HTML=\"${D}/usr/share/doc/${PF}/html\"" >> config.site - mv configure configure.orig - sed -e "s:if \[ -r /lib/libc.*:if \[ -r /lib/libc\.so\.6 \]\; then:" \ - configure.orig > configure - chmod +x configure -} - -src_compile() { - try ./configure --noninteractive - - try make OPTIMIZER=\""${CFLAGS}"\" -} - -src_install() { - dodir /usr/{bin,lib,share/man,share/doc/${PF}/html} - - dodir /usr/share/doc/${PF}/html - try make install - - gzip ${D}/usr/share/doc/${PF}/html/*.html - gzip ${D}/usr/share/doc/${PF}/html/images/* - - rm ${D}/usr/lib/libtiff.so.3 - mv ${D}/usr/lib/libtiff.so.3.5. ${D}/usr/lib/libtiff.so.3.5.5 - preplib /usr - rm -rf ${D}/tiff.sw.tools - - dodoc COPYRIGHT README TODO VERSION -} diff --git a/media-sound/lame/files/digest-lame-3.86b b/media-sound/lame/files/digest-lame-3.86b deleted file mode 100644 index 7897aa6fbee5..000000000000 --- a/media-sound/lame/files/digest-lame-3.86b +++ /dev/null @@ -1 +0,0 @@ -MD5 1376a6c944ec3745b46af18fab62db6c lame3.86beta.tar.gz diff --git a/media-sound/lame/lame-3.86b.ebuild b/media-sound/lame/lame-3.86b.ebuild deleted file mode 100644 index 7567f7eac64e..000000000000 --- a/media-sound/lame/lame-3.86b.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/media-sound/lame/lame-3.86b.ebuild,v 1.4 2000/11/02 02:17:12 achim Exp $ - -P=lame-3.86b -A=lame3.86beta.tar.gz -S=${WORKDIR}/lame3.86 -CATEGORY="media-sound" -DESCRIPTION="LAME Ain't an Mp3 Encoder" -SRC_URI="http://lame.sourceforge.net/download/beta/${A}" -HOMEPAGE="http://www.sulaco.org/mp3/" - -DEPEND=">=sys-libs/glibc-2.1.3 - >=dev-libs/glib-1.2.8 - >=x11-libs/gtk+-1.2.8" - -src_unpack () { - - unpack ${A} - cd ${S} - cp Makefile Makefile.orig - sed -e "s:-O3:${CFLAGS}:" Makefile.orig > Makefile - -} - -src_compile() { - - cd ${S} - try make - -} - -src_install () { - - cd ${S} - into /usr - dobin lame - doman doc/man/lame.1 - dodoc API COPYING HACKING PRESETS.draft LICENSE README* TODO USAGE - docinto html - dodoc doc/html/*.html doc/html/*.css - -} - - - diff --git a/media-sound/lopster/files/digest-lopster-0.9.6 b/media-sound/lopster/files/digest-lopster-0.9.6 deleted file mode 100644 index 9ab5aef07ffe..000000000000 --- a/media-sound/lopster/files/digest-lopster-0.9.6 +++ /dev/null @@ -1 +0,0 @@ -MD5 0266c76e28bf81efb50b46d4c1dc1f67 lopster-0.9.6.tar.gz diff --git a/media-sound/lopster/lopster-0.9.6.ebuild b/media-sound/lopster/lopster-0.9.6.ebuild deleted file mode 100644 index 54ef70308c91..000000000000 --- a/media-sound/lopster/lopster-0.9.6.ebuild +++ /dev/null @@ -1,31 +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/media-sound/lopster/lopster-0.9.6.ebuild,v 1.2 2001/05/01 18:29:06 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="A Napster Client using GTK" -SRC_URI="http://download.sourceforge.net/lopster/${A}" -HOMEPAGE="http://lopster.sourceforge.net" - -DEPEND=">=sys-libs/glibc-2.1.3 - >=dev-libs/glib-1.2.8 - >=x11-libs/gtk+-1.2.8 - virtual/x11" - -src_compile() { - - cd ${S} - try ./configure --prefix=/usr/X11R6 --host=${CHOST} - try make - -} - -src_install () { - - cd ${S} - try make DESTDIR=${D} install - dodoc AUTHORS BUGS COPYING README ChangeLog NEWS -} - diff --git a/media-sound/mp3blaster/files/digest-mp3blaster-3.0 b/media-sound/mp3blaster/files/digest-mp3blaster-3.0 deleted file mode 100644 index 0fec2cdb931a..000000000000 --- a/media-sound/mp3blaster/files/digest-mp3blaster-3.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 e3c9f44f7ac9a02ced53bd6c6dfb8c74 mp3blaster-3.0p7.tar.gz diff --git a/media-sound/xmms/files/digest-xmms-1.2.4-r2 b/media-sound/xmms/files/digest-xmms-1.2.4-r2 deleted file mode 100644 index 90c2194bf4e0..000000000000 --- a/media-sound/xmms/files/digest-xmms-1.2.4-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 df1081cc01628cd8b97cb5f3ca80e063 xmms-1.2.4.tar.gz diff --git a/media-sound/xmms/xmms-1.2.4-r2.ebuild b/media-sound/xmms/xmms-1.2.4-r2.ebuild deleted file mode 100644 index f943d7648ac8..000000000000 --- a/media-sound/xmms/xmms-1.2.4-r2.ebuild +++ /dev/null @@ -1,58 +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/media-sound/xmms/xmms-1.2.4-r2.ebuild,v 1.2 2001/04/23 23:36:22 achim Exp $ - -S=${WORKDIR}/${P} -DESCRIPTION="X MultiMedia System" -SRC_URI="ftp://ftp.xmms.org/xmms/1.2.x/${P}.tar.gz" -HOMEPAGE="http://www.xmms.org/" - -DEPEND="gnome? ( >=gnome-base/gnome-core-1.2.2.1 ) - >=gnome-base/libxml-1.8.10 - >=media-libs/libmikmod-3.1.9 - >=media-sound/esound-0.2.22 - >=x11-libs/gtk+-1.2.8 - virtual/opengl" - -RDEPEND="gnome? ( >=gnome-base/gnome-core-1.2.2.1 ) - >=gnome-base/libxml-1.8.10 - >=media-libs/libmikmod-3.1.9 - >=media-sound/esound-0.2.22 - >=x11-libs/gtk+-1.2.8 - virtual/opengl" - -src_compile() { - cd ${S} - local myopts - if [ -n "`use gnome`" ] - then - myopts="--prefix=/opt/gnome --with-gnome" - else - myopts="--prefix=/usr/X11R6 --without-gnome" - fi - CFLAGS="$CFLAGS -I/opt/gnome/include" try ./configure --host=${CHOST} ${myopts} - try make - -} - -src_install() { - cd ${S} - if [ -n "`use gnome`" ] - then - try make prefix=${D}/opt/gnome \ - gnorbadir=${D}/opt/gnome/etc/CORBA/servers \ - sysdir=${D}/opt/gnome/share/applets/Multimedia \ - install - else - try make prefix=${D}/usr/X11R6 install - fi - dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO - insinto /usr/X11R6/include/X11/pixmaps/ - donewins gnomexmms/gnomexmms.xpm xmms.xpm -} - - - - - diff --git a/media-video/avi-xmms/avi-xmms-1.2.2.ebuild b/media-video/avi-xmms/avi-xmms-1.2.2.ebuild deleted file mode 100644 index 02b865f3a47b..000000000000 --- a/media-video/avi-xmms/avi-xmms-1.2.2.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2001 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/media-video/avi-xmms/avi-xmms-1.2.2.ebuild,v 1.4 2001/05/10 01:52:55 achim Exp $ - -S=${WORKDIR}/${P} -DESCRIPTION="A xmms plugin for AVI/DivX movies" -SRC_URI="http://www.xmms.org/files/plugins/avi-xmms/avi-xmms-1.2.2.tar.gz" -HOMEPAGE="http://www.xmms.org/plugins_input.html" - -DEPEND=">=media-video/avifile-0.53.5 media-sound/xmms" - -src_compile() { - cd ${S} - local myprefix - if [ "`use gnome`" ] - then - myprefix="/opt/gnome" - else - myprefix="/usr/X11R6" - fi - echo $myprefix > ${T}/myprefix - try ./configure --prefix=$myprefix --host=${CHOST} -} - -src_install () { - cd ${S} - try make libdir=`cat ${T}/myprefix`/lib/xmms/Input DESTDIR=${D} install - dodoc AUTHORS COPYING ChangeLog README TODO -} - diff --git a/media-video/avi-xmms/files/digest-avi-xmms-1.2.2 b/media-video/avi-xmms/files/digest-avi-xmms-1.2.2 deleted file mode 100644 index 7df12b143c99..000000000000 --- a/media-video/avi-xmms/files/digest-avi-xmms-1.2.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 0532dce534cf6f7ba1d1563547128659 avi-xmms-1.2.2.tar.gz diff --git a/media-video/xawtv/files/digest-xawtv-3.43 b/media-video/xawtv/files/digest-xawtv-3.43 deleted file mode 100644 index 06da94f2725a..000000000000 --- a/media-video/xawtv/files/digest-xawtv-3.43 +++ /dev/null @@ -1 +0,0 @@ -MD5 a5cc8576f76b6f7bf6d5fe9a81260a81 xawtv_3.43.tar.gz diff --git a/media-video/xawtv/files/digest-xawtv-3.46 b/media-video/xawtv/files/digest-xawtv-3.46 deleted file mode 100644 index 3006216e09e0..000000000000 --- a/media-video/xawtv/files/digest-xawtv-3.46 +++ /dev/null @@ -1 +0,0 @@ -MD5 a540cd0c1b64477603d8221259d22836 xawtv_3.46.tar.gz diff --git a/media-video/xawtv/xawtv-3.43.ebuild b/media-video/xawtv/xawtv-3.43.ebuild deleted file mode 100644 index 4d80482e038d..000000000000 --- a/media-video/xawtv/xawtv-3.43.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/media-video/xawtv/xawtv-3.43.ebuild,v 1.1 2001/04/12 09:34:46 achim Exp $ - -A=xawtv_${PV}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="TV application for the bttv driver" -SRC_URI="http://www.strusel007.de/linux/xawtv/${A}" -HOMEPAGE="http://www.strusel007.de/linux/xawtv/" - -DEPEND="virtual/glibc - >=sys-libs/ncurses-5.1 - >=media-libs/jpeg-6b - >=media-libs/libpng-1.0.8 - >=x11-base/xfree-4.0.1" - -src_compile() { - - unset DEPEND - try ./configure --host=${CHOST} --prefix=/usr \ - --enable-jpeg --enable-xfree-ext --enable-xvideo --with-x - try make -} - -src_install() { - - try make prefix=${D}/usr mandir=${D}/usr/share/man install - - dodoc COPYING Changes KNOWN_PROBLEMS Miro_gpio.txt Programming-FAQ - dodoc README* Sound-FAQ TODO Trouble-Shooting UPDATE_TO_v3.0 - insinto /usr/local/httpd/cgi-bin - insopts -m 755 - doins webcam/webcam.cgi - dodir /usr/X11R6/lib - mv ${D}/usr/lib/X11 ${D}/usr/X11R6/lib - - rm -rf ${D}/usr/X11R6/lib/X11/fonts/misc/fonts.dir - rm -rf ${D}/usr/lib - -} - - - - - - diff --git a/media-video/xmovie/files/digest-xmovie-1.6 b/media-video/xmovie/files/digest-xmovie-1.6 deleted file mode 100644 index ea335d4f0b6f..000000000000 --- a/media-video/xmovie/files/digest-xmovie-1.6 +++ /dev/null @@ -1 +0,0 @@ -MD5 153a3c43fe11c5bc88cbe65f8110168c xmovie-1.6.tar.gz diff --git a/media-video/xmovie/xmovie-1.6.ebuild b/media-video/xmovie/xmovie-1.6.ebuild deleted file mode 100644 index cf4dae452670..000000000000 --- a/media-video/xmovie/xmovie-1.6.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 Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/media-video/xmovie/xmovie-1.6.ebuild,v 1.1 2001/04/29 20:27:29 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="A Player for MPEG and Quicktime movies" -SRC_URI="http://heroinewarrior.com/${A}" -HOMEPAGE="http://heroines.sourceforge.net/" - -DEPEND=">=sys-devel/gcc-2.95.2 - >=sys-libs/glibc-2.1.3 - >=dev-lang/nasm-0.98 - >=dev-libs/glib-1.2.8 - >=media-libs/libpng-1.0.7 - >=x11-base/xfree-4.0.1" - -src_compile() { - - cd ${S} - try ./configure - try make - -} - -src_install () { - - cd ${S} - into /usr/X11R6 - dobin xmovie/xmovie - dodoc README - docinto html - dodoc docs/index.html - -} - - - diff --git a/net-analyzer/ethereal/ethereal-0.8.17a.ebuild b/net-analyzer/ethereal/ethereal-0.8.17a.ebuild deleted file mode 100644 index 1d72900d5e9c..000000000000 --- a/net-analyzer/ethereal/ethereal-0.8.17a.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-analyzer/ethereal/ethereal-0.8.17a.ebuild,v 1.1 2001/04/29 22:50:16 achim Exp $ - -A=${PN}-0.8.17-a.tar.gz -S=${WORKDIR}/${PN}-0.8.17 -DESCRIPTION="ethereal" -SRC_URI="http://ethereal.zing.org/distribution/${A} - ftp://ethereal.zing.org/pub/ethereal/${A}" -HOMEPAGE="http://ethereal.zing.org/" - -DEPEND=">=sys-libs/glibc-2.1.3 - >=dev-libs/glib-1.2.8 - >=x11-libs/gtk+-1.2.8 - >=net-libs/libpcap-0.5.2 - >=x11-base/xfree-4.0.1" - -src_compile() { - cd ${S} - LDFLAGS="-L/usr/lib -lz" try ./configure --host=${CHOST} --prefix=/usr/X11R6 \ - --sysconfdir=/etc/ethereal --disable-snmp - try make -} - -src_install() { - cd ${S} - dodir /usr/X11R6/lib/ethereal/lugins/${PV} - try make prefix=${D}/usr/X11R6 sysconfdir=${D}/etc/ethereal \ - plugindir=${D}/usr/X11R6/lib/ethereal/plugins/${PV} install - dodoc AUTHORS COPYING ChangeLog INSTALL.* NEWS README* TODO - -} - - - diff --git a/net-analyzer/ethereal/files/digest-ethereal-0.8.17a b/net-analyzer/ethereal/files/digest-ethereal-0.8.17a deleted file mode 100644 index f3590a6b4cd6..000000000000 --- a/net-analyzer/ethereal/files/digest-ethereal-0.8.17a +++ /dev/null @@ -1 +0,0 @@ -MD5 e28e340ceb41b01609a51c885a6ede0e ethereal-0.8.17-a.tar.gz diff --git a/net-analyzer/nessus/files/digest-nessus-1.0.6 b/net-analyzer/nessus/files/digest-nessus-1.0.6 deleted file mode 100644 index 3dcbddc0152e..000000000000 --- a/net-analyzer/nessus/files/digest-nessus-1.0.6 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 a216154152049118d234172f18c4d3b5 nessus-libraries-1.0.6.tar.gz -MD5 d904ae36d5d7a8e22d538a5e48a7a23e nessus-core-1.0.6.tar.gz -MD5 97e8fafd4745813fb2eaed669560ff26 nessus-plugins-1.0.6.tar.gz -MD5 bf2663ff9704089dbf924bb167d4edc1 libnasl-1.0.6.tar.gz diff --git a/net-analyzer/nessus/nessus-1.0.6.ebuild b/net-analyzer/nessus/nessus-1.0.6.ebuild deleted file mode 100644 index 9db713bd62a9..000000000000 --- a/net-analyzer/nessus/nessus-1.0.6.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -#Copyright 2000 Achim Gottinger -#Distributed under the GPL - -# It's better to split it in four different packages - -A="nessus-libraries-${PV}.tar.gz nessus-core-${PV}.tar.gz - nessus-plugins-${PV}.tar.gz libnasl-${PV}.tar.gz" -S=${WORKDIR} -DESCRIPTION="A remote security scanner for Linux" -SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/nessus-libraries-${PV}.tar.gz - ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/nessus-core-${PV}.tar.gz - ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/nessus-plugins-${PV}.tar.gz - ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/libnasl-${PV}.tar.gz" - -HOMEPAGE="http://www.nessus.org/" - -DEPEND=">=sys-apps/bash-2.04 - >=sys-libs/glibc-2.1.3 - >=dev-libs/glib-1.2.8 - >=x11-libs/gtk+-1.2.8 - >=x11-base/xfree-4.0.1" - -src_compile() { - - export PATH=${D}/usr/bin:$PATH - export LD_LIBRARY_PATH=${D}/usr/lib:$LD_LIBRARY_PATH - echo "Compiling libraries..." - cd ${S}/nessus-libraries - try ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/state \ - --enable-pthread - try make - try make prefix=${D}/usr sysconfdir=${D}/etc localstatedir=${D}/var/state install - cd ${D}/usr/bin - cp nessus-config nessus-config.orig - sed -e "s:^PREFIX=:PREFIX=${D}:" \ - -e "s:-I/usr:-I${D}/usr: " nessus-config.orig > nessus-config - - echo "Compiling libnasl..." - cd ${S}/libnasl - try ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/state - try make - try make prefix=${D}/usr sysconfdir=${D}/etc localstatedir=${D}/var/state install - cd ${D}/usr/bin - cp nasl-config nasl-config.orig - sed -e "s:^PREFIX=:PREFIX=${D}:" nasl-config.orig > nasl-config - - echo "Compiling core..." - cd ${S}/nessus-core - try ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/state - try make - try make prefix=${D}/usr sysconfdir=${D}/etc localstatedir=${D}/var/state install - - - echo "Compiling plugins..." - cd ${S}/nessus-plugins - try ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/state - try make - try make prefix=${D}/usr sysconfdir=${D}/etc localstatedir=${D}/var/state install - -} - -src_install() { - cd ${S}/nessus-libraries - try make prefix=${D}/usr sysconfdir=${D}/etc localstatedir=${D}/var/state install - - cd ${S}/libnasl - try make prefix=${D}/usr sysconfdir=${D}/etc localstatedir=${D}/var/state install - - cd ${S}/nessus-core - try make prefix=${D}/usr sysconfdir=${D}/etc localstatedir=${D}/var/state install - cp ${ROOT}/config/nessusd.conf ${D}/etc/nessus/ - - cd ${S}/nessus-plugins - try make prefix=${D}/usr sysconfdir=${D}/etc localstatedir=${D}/var/state install - - cd ${S}/nessus-libraries - docinto nessus-libraries - dodoc README* - - cd ${S}/libnasl - docinto libnasl - dodoc COPYING TODO - - cd ${S}/nessus-core - docinto nessus-core - dodoc README* UPGRADE_README CHANGES - dodoc doc/*.txt doc/ntp/* - - cd ${S}/nessus-plugins - docinto nessus-plugins - dodoc docs/*.txt plugins/accounts/accounts.txt - prepman - - insinto /etc/rc.d/init.d - insopts -m 755 - doins ${FILESDIR}/nessusd -} - - - - diff --git a/net-analyzer/nmap/files/digest-nmap-2.54_beta22 b/net-analyzer/nmap/files/digest-nmap-2.54_beta22 deleted file mode 100644 index d25e83505872..000000000000 --- a/net-analyzer/nmap/files/digest-nmap-2.54_beta22 +++ /dev/null @@ -1 +0,0 @@ -MD5 325f553a42461b78ce65fc91418fa256 nmap-2.54BETA22.tgz diff --git a/net-analyzer/nmap/files/digest-nmap-2.54_beta22-r1 b/net-analyzer/nmap/files/digest-nmap-2.54_beta22-r1 deleted file mode 100644 index d25e83505872..000000000000 --- a/net-analyzer/nmap/files/digest-nmap-2.54_beta22-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 325f553a42461b78ce65fc91418fa256 nmap-2.54BETA22.tgz diff --git a/net-analyzer/nmap/nmap-2.54_beta22-r1.ebuild b/net-analyzer/nmap/nmap-2.54_beta22-r1.ebuild deleted file mode 100644 index c34b459f4de0..000000000000 --- a/net-analyzer/nmap/nmap-2.54_beta22-r1.ebuild +++ /dev/null @@ -1,37 +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> -# $Heade - -P=nmap-2.54BETA22 -A=${P}.tgz -S=${WORKDIR}/${P} -DESCRIPTION="Portscanner" -SRC_URI="http://www.insecure.org/nmap/dist/"${A} -HOMEPAGE="http://www.insecure.org/nmap/" - -DEPEND="virtual/glibc - gtk? ( >=x11-libs/gtk+-1.2.8 )" - -src_compile() { - try ./configure --host=${CHOST} --prefix=/usr --mandir=/usr/share/man - if [ "`use gtk`" ] ; then - try make - else - try make nmap - fi -} - -src_install() { - - try make prefix=${D}/usr mandir=${D}/usr/share/man install - - dodoc CHANGELOG COPYING HACKING README* - cd docs - dodoc *.txt - docinto html - dodoc *.html -} - - - diff --git a/net-analyzer/nmap/nmap-2.54_beta22.ebuild b/net-analyzer/nmap/nmap-2.54_beta22.ebuild deleted file mode 100644 index 1c91e9f93e1b..000000000000 --- a/net-analyzer/nmap/nmap-2.54_beta22.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> -# $Heade - -P=nmap-2.54BETA22 -A=${P}.tgz -S=${WORKDIR}/${P} -DESCRIPTION="Portscanner" -SRC_URI="http://www.insecure.org/nmap/dist/"${A} -HOMEPAGE="http://www.insecure.org/nmap/" - -DEPEND=">=x11-libs/gtk+-1.2.8" - -src_compile() { - try ./configure --host=${CHOST} --prefix=/usr --mandir=/usr/share/man - try make -} - -src_install() { - - try make prefix=${D}/usr mandir=${D}/usr/share/man install - - dodoc CHANGELOG COPYING README - cd docs - dodoc *.txt - docinto html - dodoc *.html -} - - - diff --git a/net-fs/samba/files/digest-samba-2.0.8 b/net-fs/samba/files/digest-samba-2.0.8 deleted file mode 100644 index 2b428117b001..000000000000 --- a/net-fs/samba/files/digest-samba-2.0.8 +++ /dev/null @@ -1 +0,0 @@ -MD5 08c4cf0c90871f2492160cbce4f17440 samba-2.0.8.tar.gz diff --git a/net-fs/samba/files/digest-samba-2.2.0 b/net-fs/samba/files/digest-samba-2.2.0 deleted file mode 100644 index 1246f4b40682..000000000000 --- a/net-fs/samba/files/digest-samba-2.2.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 fb1f7d52bfa6cef6c2b471ff3981e2a6 samba-2.2.0.tar.gz diff --git a/net-fs/samba/files/digest-samba-2.2.0-r1 b/net-fs/samba/files/digest-samba-2.2.0-r1 deleted file mode 100644 index 1246f4b40682..000000000000 --- a/net-fs/samba/files/digest-samba-2.2.0-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 fb1f7d52bfa6cef6c2b471ff3981e2a6 samba-2.2.0.tar.gz diff --git a/net-fs/samba/samba-2.2.0-r1.ebuild b/net-fs/samba/samba-2.2.0-r1.ebuild deleted file mode 100644 index 620af221acb9..000000000000 --- a/net-fs/samba/samba-2.2.0-r1.ebuild +++ /dev/null @@ -1,169 +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/samba/samba-2.2.0-r1.ebuild,v 1.2 2001/05/28 14:32:32 achim Exp $ - -S=${WORKDIR}/${P} -DESCRIPTION="Samba :)" -SRC_URI="http://us1.samba.org/samba/ftp/samba-2.2.0.tar.gz" -HOMEPAGE="http://www.samba.org" - -DEPEND="virtual/glibc - pam? ( >=sys-libs/pam-0.72 ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 )" - -#ssl support removed -- it doesn't work... - -src_compile() { - local myconf - if [ "`use pam`" ] - then - myconf="--with-pam" - else - myconf="--without-pam" - fi - - cd ${S}/source - - # Disabled automout support, because it failed - # Added -lncurses for readline detection - - try ./configure --prefix=/usr \ - --sysconfdir=/etc/smb --localstatedir=/var/log --libdir=/etc/smb --sbindir=/usr/sbin \ - --without-automount --with-utmp --without-sambabook --with-netatalk --with-smbmount \ - --with-privatedir=/etc/smb/private --with-msdfs --with-vfs --with-spinlocks --with-lockdir=/var/run/smb --with-swatdir=/usr/share/swat \ - --with-mandir=/usr/share/man ${myconf} - try make -} - -src_install() { - cd ${S}/source - dodir /usr - dodir /etc/smb - dodir /usr/share/swat - dodir /usr/share/doc/${PF}/html/book - dodir /var/log - dodir /var/run/smb - try make install prefix=${D}/usr BASEDIR=${D}/usr LIBDIR=${D}/etc/smb VARDIR=${D}/var/log \ - PRIVATEDIR=${D}/etc/smb/private SWATDIR=${D}/usr/share/swat \ - LOCKDIR=${D}/var/lock SBINDIR=${D}/usr/sbin MANDIR=${D}/usr/share/man - into /usr - cd ${S}/source/script - exeinto /usr/sbin - doexe convert_smbpasswd mknissmbpasswd.sh mknissmbpwdtbl.sh - doexe mksmbpasswd.sh smbtar - cd ${S} - dodoc COPYING Manifest README Roadmap WHATSNEW.txt - cd ${S}/docs - dodoc announce history samba.lsm THANKS - docinto reg - dodoc *.reg - docinto html - dodoc htmldocs/*.html - docinto html/book - dodoc htmldocs/using_samba/*.html - docinto html/book/gifs - dodoc htmldocs/using_samba/gifs/* - docinto html/book/figs - dodoc htmldocs/using_samba/figs/* - docinto faq - dodoc faq/*.txt - docinto html/faq - dodoc faq/*.html - docinto textdocs - dodoc textdocs/*.txt textdocs/README* - docinto print - dodoc textdocs/*.{tex,ps,pdf} - docinto sgml/faq - dodoc faq/*.sgml - docinto sgml/docbook/faq - dodoc docbook/faq/*.sgml - docinto sgml/docbook/howto - dodoc docbook/howto/*.sgml - docinto sgml/docbook/manpages - dodoc docbook/manpages/*.sgml - docinto sgml/docbook/projdoc - dodoc docbook/projdoc/*.sgml - insinto /usr/share/sgml/docbook/dbsgml - doins docbook/dbsgml/* - insinto /usr/share/sgml/docbook/dbsgml/ent - doins docbook/dbsgml/ent/* - cd ${S} - cp -a examples ${D}/usr/share/doc/${PF} - cp examples/smb.conf.default ${D}/etc/smb/smb.conf.eg - - exeinto /etc/rc.d/init.d - doexe ${FILESDIR}/samba ${FILESDIR}/svc-samba - diropts -m0700 - dodir /etc/smb/private - - #now, we move smbmount from /usr/sbin to /sbin, and rename it to mount.smbfs - #this allows it to work perfectly with the standard Linux mount command - # :) - - dodir /sbin - mv ${D}/usr/bin/smbmount ${D}/sbin/mount.smbfs - - - #supervise support - local x - for x in smbd nmbd - do - dodir /var/lib/supervise/services/${x}/log - chmod +t ${D}/var/lib/supervise/services/${x} - exeinto /var/lib/supervise/services/${x} - newexe ${FILESDIR}/${x}-run run - exeinto /var/lib/supervise/services/${x}/log - newexe ${FILESDIR}/${x}-log run - done -} - -pkg_preinst() { - if [ "$ROOT" = "/" ] - then - if [ -e /etc/rc.d/init.d/svc-samba ] - then - /etc/rc.d/init.d/svc-samba stop - fi - if [ -e /etc/rc.d/init.d/samba ] - then - /etc/rc.d/init.d/samba stop - fi - fi -} - -pkg_postinst() { - #touch ${D}/etc/smb/smb.conf to create a dummy file so that people installing samba - #just to mount smb shares don't get annoying warnings all the time - - if [ ! -e ${ROOT}etc/smb/smb.conf ] - then - touch ${ROOT}etc/smb/smb.conf - fi - - echo "Samba installed. To configure samba (the server) to start on boot, type:" - echo - echo "# rc-update add svc-samba [ for high-availability supervised Samba -- recommended ]" - echo "# rc-update add samba [ for normal non-supervised Samba ]" - echo - echo "If you had samba running earlier, you'll need to start it again." - echo - echo "Also, please note that you must configure /etc/smb/smb.conf before Samba (the server) will " - echo "work properly. Mounting smb shares and the smbclient program should work immediately," - echo "without any tweaking required." - echo - echo "To mount SMB shares, type something like this. You'll need kernel SMB support to do this:" - echo "# mount -t smbfs -o username=drobbins,password=foo,ip=192.168.1.1 //mybox/drobbins /mnt/foo" - echo - echo "An empty file exists at /etc/smb/smb.conf at this moment, so that mounting smb shares won't" - echo "produce an annoying warning message." - echo - echo "Another note. If you want to allow normal users to mount smb shares, type the following as" - echo "root:" - echo "# chmod u+s /usr/bin/smbmnt" -} - - - - - diff --git a/net-fs/samba/samba-2.2.0.ebuild b/net-fs/samba/samba-2.2.0.ebuild deleted file mode 100644 index 1e03bb198f0c..000000000000 --- a/net-fs/samba/samba-2.2.0.ebuild +++ /dev/null @@ -1,148 +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/samba/samba-2.2.0.ebuild,v 1.2 2001/04/27 23:03:01 drobbins Exp $ - -S=${WORKDIR}/${P} -DESCRIPTION="Samba :)" -SRC_URI="http://us1.samba.org/samba/ftp/samba-2.2.0.tar.gz" -HOMEPAGE="http://www.samba.org" - -DEPEND="virtual/glibc - pam? ( >=sys-libs/pam-0.72 ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 )" - -#ssl support removed -- it doesn't work... - -src_compile() { - local myconf - if [ "`use pam`" ] - then - myconf="--with-pam" - else - myconf="--without-pam" - fi - - cd ${S}/source - - # Disabled automout support, because it failed - # Added -lncurses for readline detection - - try LDFLAGS="-lncurses" ./configure --prefix=/usr \ - --sysconfdir=/etc/smb --localstatedir=/var/log --libdir=/etc/smb --sbindir=/usr/sbin \ - --without-automount --with-utmp --without-sambabook --with-netatalk --with-smbmount \ - --with-privatedir=/etc/smb/private --with-msdfs --with-vfs --with-spinlocks --with-lockdir=/var/run/smb --with-swatdir=/usr/share/swat \ - --with-mandir=/usr/share/man ${myconf} - try make -} - -src_install() { - cd ${S}/source - dodir /usr - dodir /etc/smb - dodir /usr/share/swat - dodir /usr/share/doc/${P}/html/book - dodir /var/log - dodir /var/run/smb - try make install prefix=${D}/usr BASEDIR=${D}/usr LIBDIR=${D}/etc/smb VARDIR=${D}/var/log \ - PRIVATEDIR=${D}/etc/smb/private SWATDIR=${D}/usr/share/swat \ - LOCKDIR=${D}/var/lock SBINDIR=${D}/usr/sbin MANDIR=${D}/usr/share/man - into /usr - cd ${S} - dodoc COPYING Manifest README Roadmap WHATSNEW.txt - cd ${S}/docs - dodoc announce history NT4-Locking.reg NT4_PlainPassword.reg - dodoc samba.lsm THANKS Win* - docinto html - dodoc htmldocs/*.html - docinto html/book - dodoc htmldocs/using_samba/*.html - docinto html/book/gifs - dodoc htmldocs/using_samba/gifs/* - docinto html/book/figs - dodoc htmldocs/using_samba/figs/* - docinto faq - dodoc faq/*.txt - docinto html/faq - dodoc faq/*.html - docinto textdocs - dodoc textdocs/* - cd ${S} - cp -a examples ${D}/usr/share/doc/${PF} - cp examples/smb.conf.default ${D}/etc/smb/smb.conf.eg - - exeinto /etc/rc.d/init.d - doexe ${FILESDIR}/samba ${FILESDIR}/svc-samba - diropts -m0700 - dodir /etc/smb/private - - #now, we move smbmount from /usr/sbin to /sbin, and rename it to mount.smbfs - #this allows it to work perfectly with the standard Linux mount command - # :) - - dodir /sbin - mv ${D}/usr/bin/smbmount ${D}/sbin/mount.smbfs - - - #supervise support - local x - for x in smbd nmbd - do - dodir /var/lib/supervise/services/${x}/log - chmod +t ${D}/var/lib/supervise/services/${x} - exeinto /var/lib/supervise/services/${x} - newexe ${FILESDIR}/${x}-run run - exeinto /var/lib/supervise/services/${x}/log - newexe ${FILESDIR}/${x}-log run - done -} - -pkg_preinst() { - if [ "$ROOT" = "/" ] - then - if [ -e /etc/rc.d/init.d/svc-samba ] - then - /etc/rc.d/init.d/svc-samba stop - fi - if [ -e /etc/rc.d/init.d/samba ] - then - /etc/rc.d/init.d/samba stop - fi - fi -} - -pkg_postinst() { - #touch ${D}/etc/smb/smb.conf to create a dummy file so that people installing samba - #just to mount smb shares don't get annoying warnings all the time - - if [ ! -e ${ROOT}etc/smb/smb.conf ] - then - touch ${ROOT}etc/smb/smb.conf - fi - - echo "Samba installed. To configure samba (the server) to start on boot, type:" - echo - echo "# rc-update add svc-samba [ for high-availability supervised Samba -- recommended ]" - echo "# rc-update add samba [ for normal non-supervised Samba ]" - echo - echo "If you had samba running earlier, you'll need to start it again." - echo - echo "Also, please note that you must configure /etc/smb/smb.conf before Samba (the server) will " - echo "work properly. Mounting smb shares and the smbclient program should work immediately," - echo "without any tweaking required." - echo - echo "To mount SMB shares, type something like this. You'll need kernel SMB support to do this:" - echo "# mount -t smbfs -o username=drobbins,password=foo,ip=192.168.1.1 //mybox/drobbins /mnt/foo" - echo - echo "An empty file exists at /etc/smb/smb.conf at this moment, so that mounting smb shares won't" - echo "produce an annoying warning message." - echo - echo "Another note. If you want to allow normal users to mount smb shares, type the following as" - echo "root:" - echo "# chmod u+s /usr/bin/smbmnt" -} - - - - - diff --git a/net-ftp/lftp/files/digest-lftp-2.3.5 b/net-ftp/lftp/files/digest-lftp-2.3.5 deleted file mode 100644 index 175596fad5a9..000000000000 --- a/net-ftp/lftp/files/digest-lftp-2.3.5 +++ /dev/null @@ -1 +0,0 @@ -MD5 9d93c0b0f59f5d8a92d0f309ae1c73d0 lftp-2.3.5.tar.bz2 diff --git a/net-ftp/lftp/files/digest-lftp-2.3.7 b/net-ftp/lftp/files/digest-lftp-2.3.7 deleted file mode 100644 index 5058a5c07d9e..000000000000 --- a/net-ftp/lftp/files/digest-lftp-2.3.7 +++ /dev/null @@ -1 +0,0 @@ -MD5 acb3253499b944ebfcaf40202297095a lftp-2.3.7.tar.bz2 diff --git a/net-ftp/lftp/lftp-2.3.5.ebuild b/net-ftp/lftp/lftp-2.3.5.ebuild deleted file mode 100644 index 1fad2c78e6e0..000000000000 --- a/net-ftp/lftp/lftp-2.3.5.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 Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-2.3.5.ebuild,v 1.1 2000/11/26 20:54:19 achim Exp $ - -A=${P}.tar.bz2 -S=${WORKDIR}/${P} -DESCRIPTION="Groovy little ftp client" -SRC_URI="ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/${A} - http://metalab.unc.edu/pub/Linux/system/network/file-transfer/${A}" - -HOMEPAGE="http://ftp.yars.free.net/projects/lftp/" - -DEPEND=">=sys-apps/bash-2.04 - >=sys-libs/glibc-2.1.3 - >=sys-libs/gpm-1.19.3 - >=sys-libs/ncurses-5.1 - >=dev-libs/openssl-0.9.6" - -src_unpack () { - unpack ${A} -} - -src_compile() { - export CFLAGS="-fno-exceptions -fno-rtti ${CFLAGS}" - export CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}" - try ./configure --prefix=/usr --sysconfdir=/etc/lftp --with-catgets --with-modules - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/usr sysconfdir=${D}/etc/lftp install - prepman - dodoc BUGS COPYING ChangeLog FAQ FEATURES MIRRORS NEWS - dodoc README* THANKS TODO - -} - - - - - diff --git a/net-ftp/lftp/lftp-2.3.7.ebuild b/net-ftp/lftp/lftp-2.3.7.ebuild deleted file mode 100644 index d9d4602c1d1b..000000000000 --- a/net-ftp/lftp/lftp-2.3.7.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 Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/lftp-2.3.7.ebuild,v 1.1 2001/01/18 19:19:56 achim Exp $ - -A=${P}.tar.bz2 -S=${WORKDIR}/${P} -DESCRIPTION="Groovy little ftp client" -SRC_URI="ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/${A} - http://metalab.unc.edu/pub/Linux/system/network/file-transfer/${A}" - -HOMEPAGE="http://ftp.yars.free.net/projects/lftp/" - -DEPEND=">=sys-apps/bash-2.04 - >=sys-libs/glibc-2.1.3 - >=sys-libs/gpm-1.19.3 - >=sys-libs/ncurses-5.1 - >=dev-libs/openssl-0.9.6" - -src_unpack () { - unpack ${A} -} - -src_compile() { - export CFLAGS="-fno-exceptions -fno-rtti ${CFLAGS}" - export CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}" - try ./configure --prefix=/usr --sysconfdir=/etc/lftp --with-modules - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/usr sysconfdir=${D}/etc/lftp install - prepman - dodoc BUGS COPYING ChangeLog FAQ FEATURES MIRRORS NEWS - dodoc README* THANKS TODO - -} - - - - - diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.0_rc2-r1 b/net-ftp/proftpd/files/digest-proftpd-1.2.0_rc2-r1 deleted file mode 100644 index 19a1f14a9414..000000000000 --- a/net-ftp/proftpd/files/digest-proftpd-1.2.0_rc2-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 13e48f0f4006738ffb9aa7c28ab0ae63 proftpd-1.2.0rc2.tar.gz diff --git a/net-ftp/proftpd/proftpd-1.2.0_rc2-r1.ebuild b/net-ftp/proftpd/proftpd-1.2.0_rc2-r1.ebuild deleted file mode 100644 index 84a6eb62dac9..000000000000 --- a/net-ftp/proftpd/proftpd-1.2.0_rc2-r1.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/net-ftp/proftpd/proftpd-1.2.0_rc2-r1.ebuild,v 1.5 2001/01/27 14:41:33 achim Exp $ - -P=proftpd-1.2.0rc2 -A="${P}.tar.gz" -S=${WORKDIR}/${P} -DESCRIPTION="proftpd." -SRC_URI="ftp://ftp.nl.uu.net/pub/unix/ftp/proftpd/${P}.tar.gz" -HOMEPAGE="http://www.proftpd.net/" - -DEPEND=">=sys-libs/glibc-2.1.3 - >=sys-libs/pam-0.72 - >=dev-db/mysql-3.23.26 - >=net-nds/openldap-1.2.11" - -src_unpack() { - unpack ${A} -} - -src_compile() { - LDFLAGS="-Lssl" CFLAGS="$CFLAGS -I/usr/include/mysql" try ./configure --host=${CHOST} --prefix=/usr --sbindir=/usr/sbin \ - --sysconfdir=/etc/proftp --localstatedir=/var/run --mandir=/usr/man \ - --with-modules=mod_ldap:mod_ratio:mod_readme:mod_linuxprivs:mod_mysql:mod_sqlpw:mod_pam \ - --disable-sendfile --enable-shadow --enable-autoshadow - try make clean - try make - -} - -src_install() { - try make install prefix=${D}/usr sysconfdir=${D}/etc/proftp mandir=${D}/usr/man \ - localstatedir=${D}/var/run sbindir=${D}/usr/sbin - prepman - - cd ${S} - into /usr - dodir /home/ftp - dobin contrib/genuser.pl - dodoc COPYING CREDITS ChangeLog NEWS - dodoc README* - cd doc - dodoc API Changes-1.2.0pre3 license.txt GetConf ShowUndocumented - dodoc Undocumented.txt development.notes - docinto html - dodoc *.html - docinto rfc - dodoc rfc/*.txt - cp ${O}/files/proftpd.conf ${D}/etc/proftp -} - - - - diff --git a/net-im/licq/files/digest-licq-1.0.3 b/net-im/licq/files/digest-licq-1.0.3 deleted file mode 100644 index 442083ca1cc5..000000000000 --- a/net-im/licq/files/digest-licq-1.0.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 894d7c27c0799c8b31dda134fe14b257 licq-1.0.3.tar.gz diff --git a/net-im/licq/licq-1.0.3.ebuild b/net-im/licq/licq-1.0.3.ebuild deleted file mode 100644 index 21db10c45873..000000000000 --- a/net-im/licq/licq-1.0.3.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Jules Gagnon <eonwe@users.sourceforge.net> - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="licq" -SRC_URI="http://download.sourceforge.net/${PN}/${A} - ftp://ftp.fanfic.org/pub/${PN}/srcs/${A} - ftp://licq.darkorb.net/${A} - ftp://ftp.fr.licq.org/pub/${PN}/srcs/${A} - ftp://ftp.ru.licq.org/pub/${PN}/srcs/${A} - ftp://ftp.pt.licq.org/pub/mirrors/${PN}/srcs/${A} - ftp://mirror.itcnet.ro/pub/${PN}/srcs/${A}" -HOMEPAGE="http://www.licq.org" - -DEPEND="virtual/glibc - ssl? ( >=dev-libs/openssl-0.9.6 )" - -src_compile() { - local myconf - if [ -z "`use ssl`" ] - then - myconf="--disable-openssl" - fi - if [ "`use socks5`" ] - then - myconf="${myconf} --enable-socks5" - fi - try ./configure --host=${CHOST} --prefix=/usr ${myconf} - try make -} - -src_install() { - try make prefix=${D}/usr install - dodoc README.OPENSSL doc/* -} - diff --git a/net-irc/xchat/files/digest-xchat-1.4.3 b/net-irc/xchat/files/digest-xchat-1.4.3 deleted file mode 100644 index 7142a2a36a6d..000000000000 --- a/net-irc/xchat/files/digest-xchat-1.4.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 268ee72a8a58c323e838f72ebfc58cd6 xchat-1.4.3.tar.bz2 diff --git a/net-irc/xchat/files/digest-xchat-1.7.5 b/net-irc/xchat/files/digest-xchat-1.7.5 deleted file mode 100644 index d6a3124b3255..000000000000 --- a/net-irc/xchat/files/digest-xchat-1.7.5 +++ /dev/null @@ -1 +0,0 @@ -MD5 2331e71e699ab1306531b0b9c9b97177 xchat-1.7.5.tar.bz2 diff --git a/net-irc/xchat/xchat-1.4.3.ebuild b/net-irc/xchat/xchat-1.4.3.ebuild deleted file mode 100644 index 4ead9c0cb4e8..000000000000 --- a/net-irc/xchat/xchat-1.4.3.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/net-irc/xchat/xchat-1.4.3.ebuild,v 1.1 2000/11/26 20:54:19 achim Exp $ - -A=${P}.tar.bz2 -S=${WORKDIR}/${P} -DESCRIPTION="xchat" -SRC_URI="http://www.xchat.org/files/source/1.4/"${A} -HOMEPAGE="http://www.xchat.org/" - -DEPEND=">=media-libs/imlib-1.9.8.1 - gnome? ( >=gnome-base/gnome-core-1.2.2.1 )" - -src_compile() { - cd ${S} - local myopts - if [ -n "`use gnome`" ] - then - myopts="--enable-gnome --prefix=/opt/gnome" - else - myopts="--disable-gnome --prefix=/usr/X11R6" - fi - try ./configure --host=${CHOST} --disable-perl --disable-python ${myopts} --with-catgets - try make -} - -src_install() { - cd ${S} - if [ -n "`use gnome`" ] - then - try make prefix=${D}/opt/gnome install - else - try make prefix=${D}/usr/X11R6 install - fi - dodoc AUTHORS COPYING ChangeLog NEWS README -} - - - - - - diff --git a/net-mail/courier-imap/courier-imap-1.3.0.ebuild b/net-mail/courier-imap/courier-imap-1.3.0.ebuild deleted file mode 100644 index cef6f568755d..000000000000 --- a/net-mail/courier-imap/courier-imap-1.3.0.ebuild +++ /dev/null @@ -1,67 +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/net-mail/courier-imap/courier-imap-1.3.0.ebuild,v 1.1 2001/01/02 03:54:22 drobbins Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="An IMAP daemon designed specifically for maildirs" -SRC_URI="http://download.sourceforge.net/courier/${A}" -HOMEPAGE="http://www.courier-mta.org/" - -DEPEND=">=sys-libs/glibc-2.1.3" - -#This package is complete if you just need basic IMAP functionality. Here are some things that -#still need fixing: -#supervise support (of course) -#creation of imapd-ssl, pop3-ssl, pop3 init.d scripts (I only converted the imapd.rc script) -#tweaking of config files. -#My RC script is configured to look for maildirs in ~/.maildir (my preference, and the official -#Gentoo Linux standard location) instead of the more traditional and icky ~/Maildir. -#We need to add an /etc/mail.conf. - -src_compile() { - cd ${S} - try ./configure --sysconfdir=/etc/courier-imap --prefix=/usr --bindir=/usr/sbin --libexecdir=/usr/lib/courier-imap --localstatedir=/var/lib/courier-imap --with-authdaemonvar=/var/lib/courier-imap/authdaemon --without-authldap --with-db=db --disable-root-check - try make -} - -src_install () { - cd ${S} - mkdir -p ${D}/etc/pam.d - make install DESTDIR=${D} - cd ${D}/etc/courier-imap - local x - for x in pop3d pop3d-ssl imapd imapd-ssl - do - mv ${x}.dist ${x} - done - cd ${D}/usr/sbin - for x in * - do - if [ -L ${x} ] - then - rm ${x} - fi - done - cd ../share - mv * ../sbin - cd .. - rm -rf share - cd ${D}/etc/pam.d - for x in * - do - cp ${x} ${x}.orig - sed -e 's#/lib/security/##g' ${x}.orig > ${x} - rm ${x}.orig - done - exeinto /etc/rc.d/init.d - doexe ${FILESDIR}/courier-imap* - rm ${D}/usr/sbin/mkimapdcert - exeinto /usr/sbin - doexe ${FILESDIR}/mkimapdcert -} - -pkg_config() { - ${ROOT}/usr/sbin/rc-update add courier-imap -} diff --git a/net-mail/courier-imap/files/digest-courier-imap-1.3.0 b/net-mail/courier-imap/files/digest-courier-imap-1.3.0 deleted file mode 100644 index 5b78dd03dd10..000000000000 --- a/net-mail/courier-imap/files/digest-courier-imap-1.3.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 ee1c27d0da2222dfb6fd0c000b8c852e courier-imap-1.3.0.tar.gz diff --git a/net-mail/fetchmail/fetchmail-5.7.5.ebuild b/net-mail/fetchmail/fetchmail-5.7.5.ebuild deleted file mode 100644 index 5bb339ba400e..000000000000 --- a/net-mail/fetchmail/fetchmail-5.7.5.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2001 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-mail/fetchmail/fetchmail-5.7.5.ebuild,v 1.1 2001/03/22 05:43:17 ryan Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="fetchmail" -SRC_URI="http://www.tuxedo.org/~esr/fetchmail/"${A} -HOMEPAGE="http://www.tuxedo.org/~esr/fetchmail/" - -DEPEND=">=sys-libs/glibc-2.1.3 - >=dev-libs/openssl-0.9.6" - -src_compile() { - export CFLAGS="$CFLAGS -I/usr/include/openssl" \ - - try ./configure --prefix=/usr --host=${CHOST} \ - --with-ssl --with-catgets --enable-RPA --enable-NTLN \ - --enable-SDPS - try make -} - - -src_install() { - try make DESTDIR=${D} install - dodoc FAQ FEATURES ABOUT-NLS NEWS NOTES README README.NTLM \ - TODO COPYING MANIFEST - docinto html - dodoc *.html - docinto contrib - dodoc contrib/* -} diff --git a/net-mail/fetchmail/files/digest-fetchmail-5.7.5 b/net-mail/fetchmail/files/digest-fetchmail-5.7.5 deleted file mode 100644 index 011121b28c99..000000000000 --- a/net-mail/fetchmail/files/digest-fetchmail-5.7.5 +++ /dev/null @@ -1 +0,0 @@ -MD5 4a111fda06e1d45579dd7c6a2c11cfb9 fetchmail-5.7.5.tar.gz diff --git a/net-mail/postfix/files/digest-postfix-20010228.2 b/net-mail/postfix/files/digest-postfix-20010228.2 deleted file mode 100644 index d3db8e911e45..000000000000 --- a/net-mail/postfix/files/digest-postfix-20010228.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 9a0730bf0c95922c82157465dda718c4 postfix-20010228-pl02.tar.gz diff --git a/net-mail/postfix/postfix-20010228.1.ebuild b/net-mail/postfix/postfix-20010228.1.ebuild deleted file mode 100644 index d19b24fff5f2..000000000000 --- a/net-mail/postfix/postfix-20010228.1.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Jerry Alexandratos <jerry@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-20010228.1.ebuild,v 1.1 2001/05/06 14:49:06 achim Exp $ - -P=${PN}-20010228-pl01 -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="A fast and secure drop-in replacement for sendmail" -SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${A}" -HOMEPAGE="http://www.postfix.org/" - -DEPEND=">=net-mail/mailbase-0.00 - >=dev-libs/libpcre-3.4 - >=sys-libs/glibc-2.1.3" - -RDEPEND="!virtual/mta" - -TLS_DEP=">=dev-libs/openssl-0.9.6" -LDAP_DEP=">=net-nds/openldap-2.0.7" -MYSQL_DEP=">=dev-db/mysql-3.23.28" - -#TLS_URI= - -#if [ -n "`use mta-tls`" ]; then -# DEPEND="${DEPEND} ${TLS_DEP}" -# echo $DEPEND -#fi - -if [ -n "`use mta-ldap`" ]; then - DEPEND="${DEPEND} ${LDAP_DEP}" - echo $DEPEND -fi - -if [ -n "`use mta-mysql`" ]; then - DEPEND="${DEPEND} ${MYSQL_DEP}" - echo $DEPEND -fi - -PROVIDE="virtual/mta" - -src_unpack() { - unpack ${A} - cd ${S} - - CCARGS="-I/usr/include -DHAS_PCRE" - AUXLIBS="-L/usr/lib -lpcre" - -# if [ -n "`use mta-tls`" ]; then -# CCARGS="${CCARGS} -DUSE_SASL_AUTH" -# AUXLIBS="${AUXLIBS} -lsasl" -# fi - - if [ -n "`use mta-ldap`" ]; then - CCARGS="${CCARGS} -DHAS_LDAP" - AUXLIBS="${AUXLIBS} -lldap -lbre" - fi - - if [ -n "`use mta-mysql`" ]; then - CCARGS="${CCARGS} -DHAS_MYSQL" - AUXLIBS="${AUXLIBS} -lmysqlclient -lm" - fi - - make makefiles CC="cc ${CFLAGS} ${CCARGS} ${AUXLIBS}" -} - -src_compile() { - cd ${S} - try make -} - -src_install () { - cd ${S}/bin - insopts -o root -g root -m 0755 - insinto /usr/sbin - doins post* sendmail - - dodir /usr/bin /usr/sbin /usr/lib - dosym /usr/sbin/sendmail /usr/bin/mail - dosym /usr/sbin/sendmail /usr/bin/mailq - dosym /usr/sbin/sendmail /usr/bin/newaliases - dosym /usr/sbin/sendmail /usr/lib/sendmail - - cd ${S}/libexec - dodir /usr/libexec/postfix - insopts -o root -g root -m 0755 - insinto /usr/libexec/postfix - doins * - - cd ${S} - dodir /etc/postfix - insopts -o root -g root -m 0644 - insinto /etc/postfix - doins ${FILESDIR}/main.cf - doins ${FILESDIR}/master.cf - - cd ${S}/conf - dodir /etc/postfix/sample - insopts -o root -g root -m 0644 - insinto /etc/postfix/sample - doins *.cf access aliases canonical relocated transport \ - pcre_table regexp_table postfix-script* - - insopts -o root -g root -m 0755 - insinto /etc/postfix - donewins postfix-script-sgid postfix-script - - cd ${S}/man - for i in man* - do - doman $i/* - done - - cd ${S} - dodoc *README COMPATIBILITY HISTORY LICENSE PORTING \ - RELEASE_NOTES RESTRICTION_CLASS TODO - - cd ${S}/html - docinto html - dodoc * - - dodir /var/spool/postfix - fperms 0755 /var/spool/postfix - fowners root.root /var/spool/postfix - - dodir /var/spool/postfix/maildrop - fperms 1733 /var/spool/postfix/maildrop - fowners postfix.root /var/spool/postfix/maildrop - - insopts -o root -g root -m 0755 - insinto /etc/rc.d/init.d - doins ${FILESDIR}/postfix -} - -pkg_config() { - ${ROOT}/usr/sbin/rc-update add postfix -} diff --git a/net-mail/postfix/postfix-20010228.2.ebuild b/net-mail/postfix/postfix-20010228.2.ebuild deleted file mode 100644 index 4faaf4f85d6a..000000000000 --- a/net-mail/postfix/postfix-20010228.2.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Jerry Alexandratos <jerry@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-20010228.2.ebuild,v 1.1 2001/05/06 14:49:06 achim Exp $ - -P=${PN}-20010228-pl02 -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="A fast and secure drop-in replacement for sendmail" -SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${A}" -HOMEPAGE="http://www.postfix.org/" - -DEPEND=">=net-mail/mailbase-0.00 - >=dev-libs/libpcre-3.4 - >=sys-libs/glibc-2.1.3" - -RDEPEND="!virtual/mta" - -TLS_DEP=">=dev-libs/openssl-0.9.6" -LDAP_DEP=">=net-nds/openldap-2.0.7" -MYSQL_DEP=">=dev-db/mysql-3.23.28" - -#TLS_URI= - -#if [ -n "`use mta-tls`" ]; then -# DEPEND="${DEPEND} ${TLS_DEP}" -# echo $DEPEND -#fi - -if [ -n "`use mta-ldap`" ]; then - DEPEND="${DEPEND} ${LDAP_DEP}" - echo $DEPEND -fi - -if [ -n "`use mta-mysql`" ]; then - DEPEND="${DEPEND} ${MYSQL_DEP}" - echo $DEPEND -fi - -PROVIDE="virtual/mta" - -src_unpack() { - unpack ${A} - cd ${S}/conf - cp main.cf main.cf.orig - sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" \ - main.cf.orig > main.cf - cd ${S}/src/global - cp mail_params.h mail_params.h.orig - sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" \ - mail_params.h.orig > mail_params.h - cd ${S} - CCARGS="-I/usr/include -DHAS_PCRE" - AUXLIBS="-L/usr/lib -lpcre" - -# if [ -n "`use mta-tls`" ]; then -# CCARGS="${CCARGS} -DUSE_SASL_AUTH" -# AUXLIBS="${AUXLIBS} -lsasl" -# fi - - if [ -n "`use mta-ldap`" ]; then - CCARGS="${CCARGS} -DHAS_LDAP" - AUXLIBS="${AUXLIBS} -lldap -lbre" - fi - - if [ -n "`use mta-mysql`" ]; then - CCARGS="${CCARGS} -DHAS_MYSQL" - AUXLIBS="${AUXLIBS} -lmysqlclient -lm" - fi - - make makefiles CC="cc ${CFLAGS} ${CCARGS} ${AUXLIBS}" -} - -src_compile() { - cd ${S} - try make -} - -src_install () { - cd ${S}/bin - insopts -o root -g root -m 0755 - insinto /usr/sbin - doins post* sendmail - - dodir /usr/bin /usr/sbin /usr/lib - dosym /usr/sbin/sendmail /usr/bin/mail - dosym /usr/sbin/sendmail /usr/bin/mailq - dosym /usr/sbin/sendmail /usr/bin/newaliases - dosym /usr/sbin/sendmail /usr/lib/sendmail - - cd ${S}/libexec - dodir /usr/lib/postfix - insopts -o root -g root -m 0755 - insinto /usr/lib/postfix - doins * - - cd ${S} - dodir /etc/postfix - insopts -o root -g root -m 0644 - insinto /etc/postfix - doins ${FILESDIR}/main.cf - doins ${FILESDIR}/master.cf - - cd ${S}/conf - dodir /etc/postfix/sample - insopts -o root -g root -m 0644 - insinto /etc/postfix/sample - doins *.cf access aliases canonical relocated transport \ - pcre_table regexp_table postfix-script* - - insopts -o root -g root -m 0755 - insinto /etc/postfix - donewins postfix-script-sgid postfix-script - - cd ${S}/man - for i in man* - do - doman $i/* - done - - cd ${S} - dodoc *README COMPATIBILITY HISTORY LICENSE PORTING \ - RELEASE_NOTES RESTRICTION_CLASS TODO - - cd ${S}/html - docinto html - dodoc * - - dodir /var/spool/postfix - fperms 0755 /var/spool/postfix - fowners root.root /var/spool/postfix - - dodir /var/spool/postfix/maildrop - fperms 1733 /var/spool/postfix/maildrop - fowners postfix.root /var/spool/postfix/maildrop - - insopts -o root -g root -m 0755 - insinto /etc/rc.d/init.d - doins ${FILESDIR}/postfix -} - -pkg_config() { - ${ROOT}/usr/sbin/rc-update add postfix -} diff --git a/net-misc/bind/bind-9.1.1.ebuild b/net-misc/bind/bind-9.1.1.ebuild deleted file mode 100644 index f7bc71631403..000000000000 --- a/net-misc/bind/bind-9.1.1.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/net-misc/bind/bind-9.1.1.ebuild,v 1.1 2001/04/19 08:43:26 jerry Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Name Server" -SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV}/"${A} -HOMEPAGE="http://www.isc.org/products/BIND" - -DEPEND=">=sys-apps/bash-2.04 - >=sys-devel/libtool-1.3.5 - >=sys-libs/glibc-2.1.3" - -#this service should be upgraded to offer optional supervise support - -src_unpack() { - unpack ${A} - cd ${S}/doc/man - #fix man pages to reflect Gentoo Linux file locations (drobbins) - local x - for x in */* - do - cp ${x} ${x}.orig - sed -e 's:/etc/named.conf:/etc/bind/named.conf:g' -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' ${x}.orig > ${x} - rm ${x}.orig - done -} - -src_compile() { - try ./configure --prefix=/usr --host=${CHOST} --sysconfdir=/etc/bind --localstatedir=/var --with-libtool - try make all -} - -src_install() { - dodir /usr/bin - try make DESTDIR=${D} install - doman doc/man/*/*.[1-8] - dodir /etc/rc.d/init.d - cp ${FILESDIR}/named ${D}/etc/rc.d/init.d - dodir /etc/bind - cp ${FILESDIR}/named.conf ${D}/etc/bind/named.conf - cd ${S}/doc/arm - dodoc *.html -} - -#bind needs config files set up correctly before it should be enabled. -#pkg_config() { -# . ${ROOT}/etc/rc.d/config/functions -# -# echo "BIND enabled." -#} diff --git a/net-misc/bind/files/digest-bind-9.1.1 b/net-misc/bind/files/digest-bind-9.1.1 deleted file mode 100644 index 31c69ab207cb..000000000000 --- a/net-misc/bind/files/digest-bind-9.1.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 c18ddd84174006d217e18740f7736e4e bind-9.1.1.tar.gz diff --git a/net-misc/clockspeed/clockspeed-0.62.ebuild b/net-misc/clockspeed/clockspeed-0.62.ebuild deleted file mode 100644 index 1dcd62973b5f..000000000000 --- a/net-misc/clockspeed/clockspeed-0.62.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Your Name <your email> -# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/clockspeed-0.62.ebuild,v 1.1 2001/04/20 00:23:24 pete Exp $ - -#P= -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="a simple ntp client" -SRC_URI="http://cr.yp.to/clockspeed/clockspeed-0.62.tar.gz" -HOMEPAGE="http://cr.yp.to/" - -DEPEND="virtual/glibc" - -src_unpack() { - unpack ${A} - cd ${S} - patch -p1 < ${FILESDIR}/${PF}-gentoo.diff - cp -a conf-cc conf-cc.orig - sed "s/@CFLAGS@/${CFLAGS}/" < conf-cc.orig > conf-cc -} - -src_compile() { - try make -} - -src_install () { - dodir /etc /usr/bin /usr/share/man/man1 - insinto /etc - doins leapsecs.dat - - into /usr - dobin clockspeed clockadd clockview sntpclock taiclock taiclockd - doman clockspeed.1 clockadd.1 clockview.1 sntpclock.1 taiclock.1 taiclockd.1 - - dodoc BLURB CHANGES README THANKS TODO -} diff --git a/net-misc/clockspeed/files/clockspeed-0.62-gentoo.diff b/net-misc/clockspeed/files/clockspeed-0.62-gentoo.diff deleted file mode 100644 index 9e996aa78206..000000000000 --- a/net-misc/clockspeed/files/clockspeed-0.62-gentoo.diff +++ /dev/null @@ -1,34 +0,0 @@ -diff -ur clockspeed-0.62.orig/conf-cc clockspeed-0.62/conf-cc ---- clockspeed-0.62.orig/conf-cc Tue Oct 13 13:37:49 1998 -+++ clockspeed-0.62/conf-cc Thu Apr 19 19:55:16 2001 -@@ -1,3 +1,3 @@ --gcc -O2 -+gcc @CFLAGS@ - - This will be used to compile .c files. -diff -ur clockspeed-0.62.orig/conf-home clockspeed-0.62/conf-home ---- clockspeed-0.62.orig/conf-home Tue Oct 13 13:37:49 1998 -+++ clockspeed-0.62/conf-home Thu Apr 19 19:55:00 2001 -@@ -1,4 +1,4 @@ --/usr/local/clockspeed -+/usr - - This is the clockspeed home directory. Programs will be installed in - .../bin. -diff -ur clockspeed-0.62.orig/conf-ld clockspeed-0.62/conf-ld ---- clockspeed-0.62.orig/conf-ld Tue Oct 13 13:37:49 1998 -+++ clockspeed-0.62/conf-ld Thu Apr 19 19:54:54 2001 -@@ -1,3 +1,3 @@ --gcc -s -+gcc - - This will be used to link .o files into an executable. ---- clockspeed-0.62/clockview.c~ Tue Oct 13 19:37:49 1998 -+++ clockspeed-0.62/clockview.c Thu Apr 26 01:11:43 2001 -@@ -1,5 +1,5 @@ - #include <sys/types.h> --#include <sys/time.h> -+#include <time.h> - #include "substdio.h" - #include "readwrite.h" - #include "strerr.h" diff --git a/net-misc/clockspeed/files/digest-clockspeed-0.62 b/net-misc/clockspeed/files/digest-clockspeed-0.62 deleted file mode 100644 index 8e9ac051cd77..000000000000 --- a/net-misc/clockspeed/files/digest-clockspeed-0.62 +++ /dev/null @@ -1 +0,0 @@ -MD5 425614174fcfe2ad42d22d3d02e2d567 clockspeed-0.62.tar.gz diff --git a/net-misc/gupsc/files/digest-gupsc-0.3.0-r1 b/net-misc/gupsc/files/digest-gupsc-0.3.0-r1 deleted file mode 100644 index 984ee520751b..000000000000 --- a/net-misc/gupsc/files/digest-gupsc-0.3.0-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 f201a31442586340cd773ac95ffeb53c gupsc-0.3.0.tar.bz2 diff --git a/net-misc/gupsc/gupsc-0.3.0-r1.ebuild b/net-misc/gupsc/gupsc-0.3.0-r1.ebuild deleted file mode 100644 index 7074d3c1b25b..000000000000 --- a/net-misc/gupsc/gupsc-0.3.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/net-misc/gupsc/gupsc-0.3.0-r1.ebuild,v 1.1 2000/11/25 15:21:44 achim Exp $ - -P=gupsc-0.3.0 -A=${P}.tar.bz2 -S=${WORKDIR}/${P} -DESCRIPTION="A Gnome client for the Network UPS Tools (nut)" -SRC_URI="http://www.stud.ifi.uio.no/~hennikul/gupsc/download/"${A} -HOMEPAGE="http://www.stud.ifi.uio.no/~hennikul/gupsc/" - -DEPEND=">=gnome-base/gnome-libs-1.2.4" - -src_unpack() { - unpack ${A} -} - -src_compile() { - cd ${S} - try ./configure --host=${CHOST} --prefix=/opt/gnome - try make -} - -src_install() { - cd ${S} - try make DESTDIR=${D} install - dodoc AUTHORS COPYING ChangeLog NEWS README TODO -} - - - diff --git a/net-misc/hylafax/files/digest-hylafax-4.1_beta3 b/net-misc/hylafax/files/digest-hylafax-4.1_beta3 deleted file mode 100644 index d67effa822bb..000000000000 --- a/net-misc/hylafax/files/digest-hylafax-4.1_beta3 +++ /dev/null @@ -1 +0,0 @@ -MD5 25b0bafb7d84533ff247441890f12c81 hylafax-4.1beta3.tar.gz diff --git a/net-misc/ntp/files/digest-ntp-4.0.99k-r1 b/net-misc/ntp/files/digest-ntp-4.0.99k-r1 deleted file mode 100644 index 54379ce87ea4..000000000000 --- a/net-misc/ntp/files/digest-ntp-4.0.99k-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 7b3b73e42f5a10324d06ada4996dccbb ntp-4.0.99k23.tar.gz diff --git a/net-misc/ntp/ntp-4.0.99k-r1.ebuild b/net-misc/ntp/ntp-4.0.99k-r1.ebuild deleted file mode 100644 index eb47ec592229..000000000000 --- a/net-misc/ntp/ntp-4.0.99k-r1.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 Jerry Alexandratos <jerry@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.0.99k-r1.ebuild,v 1.1 2001/04/23 22:54:14 achim Exp $ - -A=${P}23.tar.gz -S=${WORKDIR}/${P}23 -DESCRIPTION="Network Time Protocol suite/programs" -SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/${A}" -HOMEPAGE="http://www.ntp.org/" - -DEPEND="virtual/glibc - >=sys-libs/ncurses-5.2 - >=sys-libs/readline-4.1" - -src_compile() { - try CFLAGS=\"$CFLAGS -lncurses\" ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} - try make -} - -src_install () { - try make prefix=${D}/usr mandir=${D}/usr/share/man install - - dodoc ChangeLog INSTALL NEWS README TODO WHERE-TO-START - - cd ${S}/html - docinto html - dodoc *.htm - - cd ${S}/html/hints - docinto html/hints - dodoc * - - cd ${S}/html/pic - docinto html/pic - dodoc * - - cd ${S}/scripts - insinto /usr/share/ntp - doins * -} diff --git a/net-misc/openssh/files/digest-openssh-2.3.0_p1-r5 b/net-misc/openssh/files/digest-openssh-2.3.0_p1-r5 deleted file mode 100644 index 894bbf191bc9..000000000000 --- a/net-misc/openssh/files/digest-openssh-2.3.0_p1-r5 +++ /dev/null @@ -1 +0,0 @@ -MD5 b3d53dfb45da6e7bf88aaaf65b528aac openssh-2.3.0p1.tar.gz diff --git a/net-misc/openssh/openssh-2.3.0_p1-r5.ebuild b/net-misc/openssh/openssh-2.3.0_p1-r5.ebuild deleted file mode 100644 index 90c2365cf6f6..000000000000 --- a/net-misc/openssh/openssh-2.3.0_p1-r5.ebuild +++ /dev/null @@ -1,57 +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-misc/openssh/openssh-2.3.0_p1-r5.ebuild,v 1.1 2001/03/06 06:20:41 achim Exp $ - -P=openssh-2.3.0p1 -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Port of OpenBSD's free SSH release" -SRC_URI="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/"${A} -HOMEPAGE="http://www.openssh.com/" - -DEPEND="virtual/glibc - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - pam? ( >=sys-libs/pam-0.73 ) - >=dev-libs/openssl-0.9.6" - -src_compile() { - local myconf - if [ "`use tcpd`" ] - then - myconf="--with-tcp-wrappers" - fi - if [ "`use pam`" ] - then - myconf="${myconf} --without-shadow" - else - myconf="${myconf} --without-pam" - fi - - try ./configure --prefix=/usr --sysconfdir=/etc/ssh \ - --libexecdir=/usr/lib/misc --mandir=/usr/share/man \ - --with-ipv4-default --host=${CHOST} ${myconf} - try make -} - -src_install() { - - try make manpages install-files DESTDIR=${D} - dodoc ChangeLog COPYING.* CREDITS OVERVIEW README* TODO - insinto /etc/pam.d - donewins ${FILESDIR}/sshd.pam sshd - exeinto /etc/rc.d/init.d - newexe ${FILESDIR}/openssh sshd - newexe ${FILESDIR}/svc-openssh svc-sshd - exeinto /var/lib/supervise/services/sshd - newexe ${FILESDIR}/sshd-run run -} - - -pkg_postinst() { - # Make ssh start at boot - . ${ROOT}/etc/rc.d/config/functions - einfo ">>> Generating symlinks" - ${ROOT}/usr/sbin/rc-update add svc-sshd -} - diff --git a/net-misc/snort/files/digest-snort-1.6.3-r2 b/net-misc/snort/files/digest-snort-1.6.3-r2 deleted file mode 100644 index 24256af85a55..000000000000 --- a/net-misc/snort/files/digest-snort-1.6.3-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 5d628b08c0bf42af3affc9fcfca7ea69 snort-1.6.3.tar.gz diff --git a/net-misc/snort/snort-1.6.3-r2.ebuild b/net-misc/snort/snort-1.6.3-r2.ebuild deleted file mode 100644 index ce3e4a2d8d42..000000000000 --- a/net-misc/snort/snort-1.6.3-r2.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 Your Name <your email> -# $Header: /var/cvsroot/gentoo-x86/net-misc/snort/snort-1.6.3-r2.ebuild,v 1.3 2001/05/09 04:28:00 achim Exp $ - -#P= -A="${P}.tar.gz" -S=${WORKDIR}/${P} -DESCRIPTION="Libpcap packet sniffer/logger/lightweight IDS" -SRC_URI="http://www.snort.org/Files/${A}" -HOMEPAGE="http://www.snort.org" - -DEPEND=">=net-libs/libpcap-0.5.2 - >=dev-db/mysql-3.23.26" - -RDEPEND=">=dev-db/mysql-3.23.26" - -src_compile() { - - cd ${S} - try ./configure --prefix=/usr --host=${CHOST} \ - --enable-smbalerts --enable-pthreads \ - --with-mysql-includes=/usr/include/mysql \ - --with-mysql-libraries=/usr/lib/mysql - try make - -} - -src_install () { - - cd ${S} - try make DESTDIR=${D} install - insinto /usr/lib/snort/bin - doins contrib/create_mysql contrib/*.pl contrib/snortlog - dodoc AUTHORS BUGS ChangeLog COPYING CREDITS NEWS README.* - dodoc RULES.SAMPLE USAGE contrib/pgsql.php3 -} - - diff --git a/net-misc/wget/files/digest-wget-1.5.3-r2 b/net-misc/wget/files/digest-wget-1.5.3-r2 deleted file mode 100644 index 3e03558f217b..000000000000 --- a/net-misc/wget/files/digest-wget-1.5.3-r2 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 47680b25bf893afdb0c43b24e3fc2fd6 wget-1.5.3.tar.gz -MD5 5528c7295855e24f8eaab4f4332b7d79 wget-new-percentage-3.0.tgz diff --git a/net-misc/wget/wget-1.5.3-r2.ebuild b/net-misc/wget/wget-1.5.3-r2.ebuild deleted file mode 100644 index d1896688db94..000000000000 --- a/net-misc/wget/wget-1.5.3-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-misc/wget/wget-1.5.3-r2.ebuild,v 1.2 2001/05/02 17:23:46 achim Exp $ - -A="${P}.tar.gz wget-new-percentage-3.0.tgz" -S=${WORKDIR}/${P} -DESCRIPTION="Network utility to retrieve files from the WWW" -SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/wget/${P}.tar.gz - ftp://prep.ai.mit.edu/gnu/wget/${P}.tar.gz - http://www.biscom.net/~cade/away/projects/wget-new-percentage-3.0.tgz" -HOMEPAGE="http://www.cg.tuwien.ac.at/~prikryl/wget.html" - -DEPEND=">=sys-libs/glibc-2.1.3 - nls? ( sys-devel/gettext )" - -src_unpack () { - unpack ${A} - cd ${S}/src - cp ../../wget-new-percentage/wget-new-percentage.c . - patch retr.c < ../../wget-new-percentage/wget-new-percentage.diff -} -src_compile() { - local myconf - if [ -z "`use nls`" ] ; then - myconf="--disable-nls" - fi - if [ -z "$DEBUG" ] ; then - myconf="$myconf --disable-debug" - fi - try ./configure --prefix=/usr --sysconfdir=/etc/wget --infodir=/usr/share/info $myconf - if [ "`use static`" ] ; then - try make -e LDFLAGS=\"--static\" - else - try make - fi -} - -src_install() { - - if [ "`use build`" ] ; then - dobin src/wget - else - try make prefix=${D}/usr sysconfdir=${D}/etc/wget infodir=${D}/usr/share/info install - - dodoc AUTHORS COPYING ChangeLog MACHINES MAILING-LIST NEWS README TODO - dodoc doc/sample.wgetrc - fi -} - - diff --git a/net-nds/openldap/files/digest-openldap-1.2.11-r2 b/net-nds/openldap/files/digest-openldap-1.2.11-r2 deleted file mode 100644 index 2a427cded549..000000000000 --- a/net-nds/openldap/files/digest-openldap-1.2.11-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 ac469c0fe66ece3893e96182f14b7886 openldap-stable-20000704.tgz diff --git a/net-nds/openldap/files/digest-openldap-2.0.7 b/net-nds/openldap/files/digest-openldap-2.0.7 deleted file mode 100644 index 48982066fa3d..000000000000 --- a/net-nds/openldap/files/digest-openldap-2.0.7 +++ /dev/null @@ -1 +0,0 @@ -MD5 e772449b0fcc64dc4e7bf20c2853dd10 openldap-2.0.7.tgz diff --git a/net-nds/openldap/openldap-1.2.11-r2.ebuild b/net-nds/openldap/openldap-1.2.11-r2.ebuild deleted file mode 100644 index 1ff29bc280e2..000000000000 --- a/net-nds/openldap/openldap-1.2.11-r2.ebuild +++ /dev/null @@ -1,72 +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-nds/openldap/openldap-1.2.11-r2.ebuild,v 1.5 2001/06/01 16:24:34 achim Exp $ - -A=${PN}-stable-20000704.tgz -S=${WORKDIR}/${P} -DESCRIPTION="LDAP suite of application and development tools" -SRC_URI="ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-stable/"${A} -HOMEPAGE="http://www.OpenLDAP.org/" - -DEPEND="virtual/glibc - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - >=sys-libs/ncurses-5.1 - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - berkdb? ( >=sys-libs/db-3.2.3h )" - -RDEPEND="virtual/glibc - >=sys-libs/ncurses-5.1 - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - berkdb? ( >=sys-libs/db-3.2.3h )" - -src_compile() { - local myconf - if [ "`use tcpd`" ] ; then - myconf="--enable-wrappers" - fi - if [ "`use berkdb`" ] ; then - myconf="--enable-ldbm --with-ldbm-api=db" - elif [ "`use gdbm`" ] ; then - myconf="$myconf --enable-ldbm --with-ldbm-api=gdbm" - fi - ./configure --host=${CHOST} --enable-passwd \ - --enable-shell --enable-shared --enable-static \ - --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib \ - --with-ldbm-api=gdbm \ - --mandir=/usr/share/man --libexecdir=/usr/lib $myconf - try make depend - try make - cd tests - make -} - -src_install() { - cd ${S} - make prefix=${D}/usr sysconfdir=${D}/etc/openldap localstatedir=${D}/var/lib \ - mandir=${D}/usr/share/man libexecdir=${D}/usr/lib install - - dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE - docinto rfc - dodoc doc/rfc/*.txt - docinto devel - dodoc doc/devel/* - - dodir /etc/rc.d/init.d - cp ${O}/files/slapd ${D}/etc/rc.d/init.d - cp ${O}/files/slurpd ${D}/etc/rc.d/init.d - - cd ${D}/etc/openldap - - for i in * - do - cp $i $i.orig - sed -e "s:${D}::" $i.orig > $i - rm $i.orig - done -} - - - - - diff --git a/net-nds/openldap/openldap-2.0.7.ebuild b/net-nds/openldap/openldap-2.0.7.ebuild deleted file mode 100644 index 6fe0fca30baf..000000000000 --- a/net-nds/openldap/openldap-2.0.7.ebuild +++ /dev/null @@ -1,65 +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-nds/openldap/openldap-2.0.7.ebuild,v 1.2 2001/05/29 17:28:19 achim Exp $ - -A=${P}.tgz -S=${WORKDIR}/${P} -DESCRIPTION="LDAP suite of application and development tools" -SRC_URI="ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/"${A} -HOMEPAGE="http://www.OpenLDAP.org/" - -DEPEND="virtual/glibc - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - ssl? ( >=dev-libs/openssl-0.9.6 ) - readline? ( >=sys-libs/readline-4.1 ) - >=sys-libs/ncurses-5.1 - >=sys-libs/gdbm-1.8.0" - -RDEPEND="virtual/glibc - >=sys-libs/ncurses-5.1 - >=sys-libs/gdbm-1.8.0 - readline? ( >=sys-libs/readline-4.1 )" - -src_compile() { - local myconf - if [ "`use tcpd`" ] ; then - myconf="--enable-wrappers" - fi - try ./configure --host=${CHOST} --enable-passwd \ - --enable-shell --enable-shared --enable-static --with-ldbm-api=gdbm \ - --prefix=/usr --sysconfdir=/etc --localstatedir=/var/state $myconf - try make depend - try make - cd tests - try make -} - -src_install() { - cd ${S} - try make prefix=${D}/usr sysconfdir=${D}/etc/openldap localstatedir=${D}/var/state install - prepman - - dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE - docinto rfc - dodoc doc/rfc/*.txt - docinto devel - dodoc doc/devel/* - - dodir /etc/rc.d/init.d - cp ${O}/files/slapd ${D}/etc/rc.d/init.d - cp ${O}/files/slurpd ${D}/etc/rc.d/init.d - - cd ${D}/etc/openldap - - for i in * - do - dosed $i - done -} - - - - - - diff --git a/net-print/cups/cups-1.1.6.ebuild b/net-print/cups/cups-1.1.6.ebuild deleted file mode 100644 index 4c050c3fa73d..000000000000 --- a/net-print/cups/cups-1.1.6.ebuild +++ /dev/null @@ -1,68 +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-print/cups/cups-1.1.6.ebuild,v 1.1 2001/04/28 04:19:58 achim Exp $ - -S=${WORKDIR}/${PN}-1.1.6 -DESCRIPTION="The Common Unix Printing System" -SRC_URI="ftp://ftp.easysw.com/pub/cups/1.1.6/${PN}-1.1.6-source.tar.bz2" - -HOMEPAGE="http://www.cups.org" - -PROVIDE="virtual/lpr" - -DEPEND="virtual/glibc - pam? ( >=sys-libs/pam-0.72 ) - ssl? ( >=dev-libs/openssl-0.9.6 ) - >=media-libs/libpng-1.0.9 - >=media-libs/jpeg-6b - >=media-libs/tiff-3.5.5 - !net-pint/LPRng" - - -src_compile() { - - local myconf - if [ "`use pam`" ] - then - myconf="--enable-pam" - fi - if [ "`use ssl`" ] - then - myconf="${myconf} --enable-ssl" - fi - try ./configure --prefix=/ -exec-prefix=/usr \ - --mandir=/usr/share/man --host=${CHOST} ${myconf} - cp config.h config.h.orig - sed -e "s:/usr/share/doc/cups:/usr/share/cups/doc:" \ - config.h.orig > config.h - cp Makedefs Makedefs.orig - sed -e "s:/usr/share/doc/cups:/usr/share/cups/doc:" \ - Makedefs.orig > Makedefs - try make -} - -src_install () { - - cd ${S} - try make exec_prefix=${D}/usr prefix=${D}/ \ - MANDIR=${D}/usr/share/man PAMDIR=${D}/etc/pam.d \ - INITDIR=${D}/etc/rc.d DOCDIR=${D}/usr/share/cups/doc \ - INCLUDEDIR=${D}/usr/include install - rm -rf ${D}/etc/rc.d - rm -rf ${D}/usr/man/cat* - cd ${S} - dodoc *.txt - docinto html - dodoc LICENSE.html - - insinto /etc/rc.d/init.d - insopts -m 755 - doins ${FILESDIR}/cupsd - insinto /etc/pam.d - insopts -m 644 - doins ${FILESDIR}/cups - -} - - diff --git a/net-print/cups/files/digest-cups-1.1.6 b/net-print/cups/files/digest-cups-1.1.6 deleted file mode 100644 index 512f408c4b18..000000000000 --- a/net-print/cups/files/digest-cups-1.1.6 +++ /dev/null @@ -1 +0,0 @@ -MD5 83759c52574337e18a58f31e340ee64b cups-1.1.6-source.tar.bz2 diff --git a/net-print/gtklp/files/digest-gtklp-0.6d b/net-print/gtklp/files/digest-gtklp-0.6d deleted file mode 100644 index c4c66636591c..000000000000 --- a/net-print/gtklp/files/digest-gtklp-0.6d +++ /dev/null @@ -1 +0,0 @@ -MD5 f48d140ccb9a0b856ffe916fbad8bd8d gtklp-0.6d.src.tgz diff --git a/net-print/gtklp/gtklp-0.6d.ebuild b/net-print/gtklp/gtklp-0.6d.ebuild deleted file mode 100644 index 648d54696b81..000000000000 --- a/net-print/gtklp/gtklp-0.6d.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/net-print/gtklp/gtklp-0.6d.ebuild,v 1.2 2001/06/04 00:16:12 achim Exp $ - -S=${WORKDIR}/src -DESCRIPTION="A GUI fort cupsd" -SRC_URI="http://www.stud.uni-hannover.de/~sirtobi/gtklp/files/${P}.src.tgz" -HOMEPAGE="http://www.stud.uni-hannover.de/~sirtobi/gtklp" - -DEPEND=">=x11-libs/gtk+-1.2.8 - >=net-print/cups-1.1.4" - -src_compile() { - - try make CCFLAGS=\"$CFLAGS\" - -} - -src_install () { - - into /usr/X11R6 - dobin gtklp - dodoc gtklprc.path.sample - docinto html - dodoc doc/*.html doc/*.jpg doc/*.gif - -} - diff --git a/net-www/apache-ssl/apache-ssl-1.3.17.2.8.0-r1.ebuild b/net-www/apache-ssl/apache-ssl-1.3.17.2.8.0-r1.ebuild deleted file mode 100644 index 61a7fc29572e..000000000000 --- a/net-www/apache-ssl/apache-ssl-1.3.17.2.8.0-r1.ebuild +++ /dev/null @@ -1,97 +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-www/apache-ssl/apache-ssl-1.3.17.2.8.0-r1.ebuild,v 1.1 2001/03/12 10:57:18 achim Exp $ - -A="apache_1.3.17.tar.gz mod_ssl-2.8.0-1.3.17.tar.gz" -S=${WORKDIR}/apache_1.3.17 -DESCRIPTION="The Apache Web Server v1.3.17 with mod_ssl" -SRC_URI="http://httpd.apache.org/dist/apache_1.3.17.tar.gz - ftp://ftp.modssl.org/source/mod_ssl-2.8.0-1.3.17.tar.gz" -HOMEPAGE="http://www.apache.org http://www.modssl.org" - -DEPEND=">=sys-apps/bash-2.04 - >=sys-libs/glibc-2.1.3 - >=sys-libs/db-3.1 - >=dev-libs/openssl-0.9.6" - -src_compile() { - export SSL_BASE=SYSTEM -#I get file locking errors with 2.4.0-test10 thru 12 (everything I've tried) -#so we zap the FLOCK option... -# export EXTRA_CFLAGS="-DUSE_FLOCK_SERIALIZED_ACCEPT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" - export EXTRA_CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" - cd ${S}/../mod_ssl-2.8.0-1.3.17 - try ./configure --with-apache=${S} --with-ssl=SYSTEM - cd ${S} - export RULE_EXPAT=NO - try ./configure --prefix=/usr/local/httpd --bindir=/usr/bin \ - --sbindir=/usr/sbin --datadir=/usr/local/httpd \ - --sysconfdir=/etc/httpd --libexecdir=/usr/lib/apache \ - --mandir=/usr/share/man --logfiledir=/var/log/apache --localstatedir=/var/lock \ - --proxycachedir=/var/cache/httpd --includedir=/usr/include/apache \ - --enable-module=all --enable-module=ssl \ - --enable-shared=max --enable-suexec --suexec-caller=wwwrun \ - --suexec-userdir=public_html --suexec-uidmin=96 \ - --suexec-gidmin=96 --suexec-safepath="/bin:/usr/bin" \ - --disable-rule=EXPAT -# --disable-module=auth_dbm" - try make - try make certificate TYPE=dummy -} - -src_install() { - cd ${S} - try make install-quiet root=${D} - - dodoc ABOUT_APACHE Announcement INSTALL* KEYS LICENSE* README* WARNING* - docinto mod_ssl - cd ../mod_ssl-2.8.0-1.3.17 - dodoc ANNOUNCE CHANGES CREDITS INSTALL* LICENSE NEWS README* - dodir /etc/rc.d/init.d - cp ${FILESDIR}/httpd.conf ${D}/etc/httpd - cp ${FILESDIR}/httpd ${D}/etc/rc.d/init.d -} - -pkg_config() { - - source ${ROOT}/var/db/pkg/install.config - source ${ROOT}/etc/rc.d/config/functions - - if [ "$ServerName" = "" ] - then - ServerName=`uname -n` - fi - if [ "$ServerAdmin" = "" ] - - then - ServerAdmin="webmaster\@$ServerName" - fi - - # Make apache start at boot - ${ROOT}/usr/sbin/rc-update add httpd - - # Set ServerName and ServerAdmin - einfo "Setting Servername to $ServerName..." - cp ${ROOT}/etc/httpd/httpd.conf ${ROOT}/etc/httpd/httpd.conf.orig - sed -e "s/^\#ServerName.*/ServerName $ServerName/" \ - -e "s/^ServerName.*/ServerName $ServerName/" \ - -e "s/^ServerAdmin.*/ServerAdmin $ServerAdmin/" \ - ${ROOT}/etc/httpd/httpd.conf.orig > ${ROOT}/etc/httpd/httpd.conf - -} - -pkg_prerm() { - - source ${ROOT}/etc/rc.d/config/functions - if [ "$ROOT" = "/" ] - then - if [ -f /var/run/httpd.pid ] - then - einfo "Stopping running daemon..." - /etc/rc.d/init.d/httpd stop - fi - fi - -} - diff --git a/net-www/apache-ssl/apache-ssl-1.3.19.2.8.3.ebuild b/net-www/apache-ssl/apache-ssl-1.3.19.2.8.3.ebuild deleted file mode 100644 index 86c7f0ca888d..000000000000 --- a/net-www/apache-ssl/apache-ssl-1.3.19.2.8.3.ebuild +++ /dev/null @@ -1,97 +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-www/apache-ssl/apache-ssl-1.3.19.2.8.3.ebuild,v 1.2 2001/05/20 13:50:36 achim Exp $ - -A="apache_1.3.19.tar.gz mod_ssl-2.8.3-1.3.19.tar.gz" -S=${WORKDIR}/apache_1.3.19 -DESCRIPTION="The Apache Web Server v1.3.19 with mod_ssl" -SRC_URI="http://httpd.apache.org/dist/httpd/apache_1.3.19.tar.gz - ftp://ftp.modssl.org/source/mod_ssl-2.8.3-1.3.19.tar.gz" -HOMEPAGE="http://www.apache.org http://www.modssl.org" - -DEPEND="virtual/glibc - =sys-libs/db-3.2.3h-r3 - =sys-libs/db-1.85-r1 - >=dev-libs/openssl-0.9.6" - -src_compile() { - export SSL_BASE=SYSTEM -#I get file locking errors with 2.4.0-test10 thru 12 (everything I've tried) -#so we zap the FLOCK option... -# export EXTRA_CFLAGS="-DUSE_FLOCK_SERIALIZED_ACCEPT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" - export EXTRA_CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" - cd ${S}/../mod_ssl-2.8.3-1.3.19 - try ./configure --with-apache=${S} --with-ssl=SYSTEM - cd ${S} - export RULE_EXPAT=NO - try ./configure --prefix=/usr/local/httpd --bindir=/usr/bin \ - --sbindir=/usr/sbin --datadir=/usr/local/httpd \ - --sysconfdir=/etc/httpd --libexecdir=/usr/lib/apache \ - --mandir=/usr/share/man --logfiledir=/var/log/apache --localstatedir=/var/lock \ - --proxycachedir=/var/cache/httpd --includedir=/usr/include/apache \ - --enable-module=all --enable-module=ssl \ - --enable-shared=max --enable-suexec --suexec-caller=wwwrun \ - --suexec-userdir=public_html --suexec-uidmin=96 \ - --suexec-gidmin=96 --suexec-safepath="/bin:/usr/bin" \ - --disable-rule=EXPAT -# --disable-module=auth_dbm" - try make - try make certificate TYPE=dummy -} - -src_install() { - cd ${S} - try make install-quiet root=${D} - - dodoc ABOUT_APACHE Announcement INSTALL* KEYS LICENSE* README* WARNING* - docinto mod_ssl - cd ../mod_ssl-2.8.3-1.3.19 - dodoc ANNOUNCE CHANGES CREDITS INSTALL* LICENSE NEWS README* - dodir /etc/rc.d/init.d - cp ${FILESDIR}/httpd.conf ${D}/etc/httpd - cp ${FILESDIR}/httpd ${D}/etc/rc.d/init.d -} - -pkg_config() { - - source ${ROOT}/var/db/pkg/install.config - source ${ROOT}/etc/rc.d/config/functions - - if [ "$ServerName" = "" ] - then - ServerName=`uname -n` - fi - if [ "$ServerAdmin" = "" ] - - then - ServerAdmin="webmaster\@$ServerName" - fi - - # Make apache start at boot - ${ROOT}/usr/sbin/rc-update add httpd - - # Set ServerName and ServerAdmin - einfo "Setting Servername to $ServerName..." - cp ${ROOT}/etc/httpd/httpd.conf ${ROOT}/etc/httpd/httpd.conf.orig - sed -e "s/^\#ServerName.*/ServerName $ServerName/" \ - -e "s/^ServerName.*/ServerName $ServerName/" \ - -e "s/^ServerAdmin.*/ServerAdmin $ServerAdmin/" \ - ${ROOT}/etc/httpd/httpd.conf.orig > ${ROOT}/etc/httpd/httpd.conf - -} - -pkg_prerm() { - - source ${ROOT}/etc/rc.d/config/functions - if [ "$ROOT" = "/" ] - then - if [ -f /var/run/httpd.pid ] - then - einfo "Stopping running daemon..." - /etc/rc.d/init.d/httpd stop - fi - fi - -} - diff --git a/net-www/apache-ssl/files/digest-apache-ssl-1.3.17.2.8.0-r1 b/net-www/apache-ssl/files/digest-apache-ssl-1.3.17.2.8.0-r1 deleted file mode 100644 index 107bf1e63ab0..000000000000 --- a/net-www/apache-ssl/files/digest-apache-ssl-1.3.17.2.8.0-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 bcb3c0db956709ad8f04655fd75621e6 apache_1.3.17.tar.gz -MD5 3a158f3b5442cb8b7bee4a55851c3794 mod_ssl-2.8.0-1.3.17.tar.gz diff --git a/net-www/apache-ssl/files/digest-apache-ssl-1.3.19.2.8.3 b/net-www/apache-ssl/files/digest-apache-ssl-1.3.19.2.8.3 deleted file mode 100644 index 861ebdd9a908..000000000000 --- a/net-www/apache-ssl/files/digest-apache-ssl-1.3.19.2.8.3 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 e9b12b6fbf9a566110f09ac1f3791855 apache_1.3.19.tar.gz -MD5 1b7ed7ae80fe1fa675aea6896c0e68c8 mod_ssl-2.8.3-1.3.19.tar.gz diff --git a/net-www/mozilla/files/digest-mozilla-0.8.1-r2 b/net-www/mozilla/files/digest-mozilla-0.8.1-r2 deleted file mode 100644 index 1f66125c9c87..000000000000 --- a/net-www/mozilla/files/digest-mozilla-0.8.1-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 04c6fbb5dd01ba68687ea2dd95195451 mozilla-source-0.8.1.tar.gz diff --git a/net-www/mozilla/mozilla-0.8.1-r2.ebuild b/net-www/mozilla/mozilla-0.8.1-r2.ebuild deleted file mode 100644 index 17356d1b6ad9..000000000000 --- a/net-www/mozilla/mozilla-0.8.1-r2.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 Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-0.8.1-r2.ebuild,v 1.2 2001/05/08 19:27:40 achim Exp $ - -A=mozilla-source-${PV}.tar.gz -S=${WORKDIR}/mozilla -DESCRIPTION="" -SRC_URI="ftp://ftp.mozilla.org/pub/mozilla/releases/mozilla${PV}/src/${A}" -HOMEPAGE="http://www.mozilla.org" -PROVIDE="virtual/x11-web-browser" - -DEPEND=">=gnome-base/ORBit-0.5.7 - >=x11-libs/gtk+-1.2.9 - >=sys-libs/zlib-1.1.3 - >=media-libs/jpeg-6b - >=media-libs/libpng-1.0.9 - app-arch/zip - app-arch/unzip" - -src_compile() { - - try ./configure --prefix=/opt/mozilla --host=${CHOST} \ - --with-gtk --disable-tests --disable-debug - try make - try ./configure --prefix=/opt/mozilla --host=${CHOST} \ - --with-gtk --disable-tests --disable-debug - try make BUILD_MODULES=psm - try ./configure --prefix=/opt/mozilla --host=${CHOST} \ - --with-gtk --disable-tests --disable-debug \ - --with-extensions=default,irc - cd extensions/irc - try make -} - -src_install () { - - dodir /opt/mozilla/include/{private,obsolete} - cd dist/include - cp -f *.h ${D}/opt/mozilla/include - cp -f obsolete/*.h ${D}/opt/mozilla/include/obsolete - cp -f private/*.h ${D}/opt/mozilla/include/private - - export MOZILLA_OFFICIAL=1 - export BUILD_OFFICIAL=1 - cd ${S}/xpinstall/packager - try make - dodir /opt - tar xzf ${S}/dist/mozilla-i686-pc-linux-gnu.tar.gz -C ${D}/opt - mv ${D}/opt/package ${D}/opt/mozilla - - exeinto /usr/bin - doexe ${FILESDIR}/mozilla - insinto /etc/env.d - doins ${FILESDIR}/10mozilla - dodoc LEGAL LICENSE README/mozilla/README* - - -} - diff --git a/net-www/netscape/files/digest-netscape-4.76-r2 b/net-www/netscape/files/digest-netscape-4.76-r2 deleted file mode 100644 index df1848676858..000000000000 --- a/net-www/netscape/files/digest-netscape-4.76-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 720de067072ff74d1e0c4aaa47eeae5c communicator-v476-us.x86-unknown-linux2.2.tar.gz diff --git a/net-www/netscape/netscape-4.76-r2.ebuild b/net-www/netscape/netscape-4.76-r2.ebuild deleted file mode 100644 index c5293c142d8e..000000000000 --- a/net-www/netscape/netscape-4.76-r2.ebuild +++ /dev/null @@ -1,34 +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-www/netscape/netscape-4.76-r2.ebuild,v 1.1 2001/03/06 06:20:41 achim Exp $ - -P=netscape-4.76 -A=communicator-v476-us.x86-unknown-linux2.2.tar.gz -S=${WORKDIR}/communicator-v476.x86-unknown-linux2.2 -DESCRIPTION="Netscape Communicator 4.76" -SRC_URI="ftp://ftp.netscape.com/pub/communicator/english/4.76/unix/supported/linux22/complete_install/"${A} -HOMEPAGE="http://developer.netscape.com/support/index.html" - -RDEPEND=">=sys-libs/lib-compat-1.0" -PROVIDE="virtual/x11-web-browser" - -src_install() { - cd ${S} - dodir /opt/netscape - dodir /opt/netscape/java/classes - dodir /usr/X11R6/bin - dodoc README.install - cd ${D}/opt/netscape - gzip -dc ${S}/netscape-v476.nif | tar xf - - gzip -dc ${S}/nethelp-v476.nif | tar xf - - gzip -dc ${S}/spellchk-v476.nif | tar xf - - cp ${S}/*.jar ${D}/opt/netscape/java/classes - cp ${O}/files/netscape ${D}/usr/X11R6/bin/netscape - rm ${D}/opt/netscape/netscape-dynMotif - rm ${D}/opt/netscape/libnullplugin-dynMotif.so - insinto /usr/X11R6/bin - doins ${FILESDIR}/netscape - chmod +x ${D}/usr/X11R6/bin/netscape -} - diff --git a/net-www/prozilla/files/digest-prozilla-1.3.4 b/net-www/prozilla/files/digest-prozilla-1.3.4 deleted file mode 100644 index 70eab6b99e13..000000000000 --- a/net-www/prozilla/files/digest-prozilla-1.3.4 +++ /dev/null @@ -1 +0,0 @@ -MD5 c5b97e3d268bf5eb9142fd5badec749e prozilla-1.3.4.tar.gz diff --git a/net-www/prozilla/prozilla-1.3.4.ebuild b/net-www/prozilla/prozilla-1.3.4.ebuild deleted file mode 100644 index 74cbd97bbc20..000000000000 --- a/net-www/prozilla/prozilla-1.3.4.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Philippe Namias <pnamias@gentoo.org> - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="A download manager" -SRC_URI="http://www.lintux.cx/~kalum/${A}" -HOMEPAGE="http://www.lintux.cx/~kalum/prozilla.html" - -DEPEND="virtual/glibc - >=sys-libs/ncurses-5.2" - -src_compile() { - try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} --sysconfdir=/etc - try make -} - -src_install () { - try make DESTDIR=${D} install - - dodoc ANNOUNCE AUTHORS COPYING CREDITS ChangeLog FAQ NEWS README TODO - -} - diff --git a/net-www/squid/files/digest-squid-2.3.4s-r2 b/net-www/squid/files/digest-squid-2.3.4s-r2 deleted file mode 100644 index d45ed898e22a..000000000000 --- a/net-www/squid/files/digest-squid-2.3.4s-r2 +++ /dev/null @@ -1,8 +0,0 @@ -MD5 c38c083f44c222a8d026fa129c30b98f squid-2.3.STABLE4-src.tar.gz -MD5 f1383b24672f9a8317c2c16302a94eaa squid-2.3.stable4-ftp_icon_not_found.patch -MD5 bec46f5a1fcbd9aa1deb9d518c5c11a5 squid-2.3.stable4-internal_dns_rcode_table_formatting.patch -MD5 4453c53a712280a26fdca42c950bc94f squid-2.3.stable4-ipfw_configure.patch -MD5 436eb77056bed5d45547c739d1123bd3 squid-2.3.stable4-invalid_ip_acl_entry.patch -MD5 db8e4eb9c1712a4adde7e9aaed0b5249 squid-2.3.stable4-accel_only_access.patch -MD5 68228709d011c93c2cccd9ac723fb462 squid-2.3.stable4-html_quoting.patch -MD5 c3d48a2b4fc26c0d90eb4c30ae34d3d6 squid-2.3.stable4-carp-assertion.patch diff --git a/net-www/squid/squid-2.3.4s-r2.ebuild b/net-www/squid/squid-2.3.4s-r2.ebuild deleted file mode 100644 index 52cda829c85b..000000000000 --- a/net-www/squid/squid-2.3.4s-r2.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/net-www/squid/squid-2.3.4s-r2.ebuild,v 1.2 2001/05/17 13:25:34 achim Exp $ - -P=squid-2.3.STABLE4 - -A0=squid-2.3.stable4-ftp_icon_not_found.patch -A1=squid-2.3.stable4-internal_dns_rcode_table_formatting.patch -A2=squid-2.3.stable4-ipfw_configure.patch -A3=squid-2.3.stable4-invalid_ip_acl_entry.patch -A4=squid-2.3.stable4-accel_only_access.patch -A5=squid-2.3.stable4-html_quoting.patch -A6=squid-2.3.stable4-carp-assertion.patch - -S=${WORKDIR}/${P} -DESCRIPTION="SQUID - Web Proxy Server" -SRC_URI0="http://www.squid-cache.org/Versions/v2/2.3" -SRC_URI="$SRC_URI0/${P}-src.tar.gz - $SRC_URI0/bugs/$A0 $SRC_URI0/bugs/$A1 $SRC_URI0/bugs/$A2 - $SRC_URI0/bugs/$A3 $SRC_URI0/bugs/$A4 $SRC_URI0/bugs/$A5 - $SRC_URI0/bugs/$A6" - -HOMEPAGE="http://www.squid-cache.org/" - -DEPEND=">=sys-libs/glibc-2.1.3 - >=sys-libs/pam-0.72 - ldap? ( >=net-nds/openldap-1.2.11 )" - -src_unpack() { - unpack ${P}-src.tar.gz - cd ${S} - patch -p0 < ${DISTDIR}/${A0} - patch -p0 < ${DISTDIR}/${A1} - patch -p0 < ${DISTDIR}/${A2} - patch -p0 < ${DISTDIR}/${A3} - patch -p0 < ${DISTDIR}/${A4} - patch -p0 < ${DISTDIR}/${A5} - -} - -src_compile() { - cd ${S} - LDFLAGS="$LDFLAGS -lresolv" try ./configure --host=${CHOST} \ - --prefix=/usr --sysconfdir=/etc/squid \ - --localstatedir=/var/state/squid \ - --enable-useragent-log \ - --enable-async-io --enable-icmp - try make - cd ${S}/auth_modules/LDAP - try make - cd ../PAM - try make - cd ../SMB - try make - if [ "`use ldap`" ] ; then - cd ../LDAP - try make - fi - cd ../NCSA - try make - -} - -src_install() { - cd ${S} - rm -rf ${D} - dodir /usr/bin - dodir /etc/squid - dodir /var/squid - chown squid.daemon ${D}/var/squid - try make install prefix=${D}/usr sysconfdir=${D}/etc/squid \ - localstatedir=${D}/var/state/squid - into /usr - cd auth_modules - if [ "`use ldap`" ] ; then - dobin LDAP/squid_ldap_auth - fi - dobin PAM/pam_auth SMB/smb_auth NCSA/ncsa_auth - cd ../doc - doman tree.3 - dodoc *.txt - cd .. - dodoc README QUICKSTART CONTRIBUTORS COPYRIGHT COPYING CREDITS - dodoc ChangeLog TODO - cp ${O}/files/squid.conf ${D}/etc/squid - dodir /etc/rc.d/init.d - cp ${O}/files/squid ${D}/etc/rc.d/init.d -# rm -r ${D}/var/squid - dodir /var/log/squid - dodir /var/cache/squid - fowners squid.daemon /var/log/squid - fowners squid.daemon /var/cache/squid - fperms 755 /var/log/squid - fperms 755 /var/cache/squid -} - -pkg_config() { - - . ${ROOT}/etc/rc.d/config/functions - - einfo "Generating symlinks..." - ${ROOT}/usr/sbin/rc-update add squid - -} diff --git a/net-www/zope/files/digest-zope-2.3.0 b/net-www/zope/files/digest-zope-2.3.0 deleted file mode 100644 index e14f98c473a6..000000000000 --- a/net-www/zope/files/digest-zope-2.3.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 ffd467bc9da04564af10452a4bb520d1 Zope-2.3.0-src.tgz diff --git a/sys-apps/eject/eject-2.0.2.ebuild b/sys-apps/eject/eject-2.0.2.ebuild deleted file mode 100644 index f214ade0e1ca..000000000000 --- a/sys-apps/eject/eject-2.0.2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Your Name <your email> -# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.2.ebuild,v 1.2 2001/04/06 23:15:32 drobbins Exp $ - -#P= -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="" -SRC_URI="http://www.ibiblio.org/pub/Linux/utils/disk-management/${A}" -HOMEPAGE="http://www.pobox.com/~tranter/eject.html" - -DEPEND="virtual/glibc" - -src_unpack() { - unpack ${A} - cd ${S} - patch -p1 < ${FILESDIR}/${P}-gentoo.diff -} - -src_compile() { - try make OPT=\""${CFLAGS}"\" -} - -src_install () { - dodir /usr/bin /usr/share/man/man1 - try make DESTDIR=${D} install -} diff --git a/sys-apps/eject/eject-2.0.4.ebuild b/sys-apps/eject/eject-2.0.4.ebuild deleted file mode 100644 index 694b6dc9ab20..000000000000 --- a/sys-apps/eject/eject-2.0.4.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Your Name <your email> -# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.4.ebuild,v 1.1 2001/05/06 16:20:03 achim Exp $ - -#P= -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="" -SRC_URI="http://www.ibiblio.org/pub/Linux/utils/disk-management/${A}" -HOMEPAGE="http://www.pobox.com/~tranter/eject.html" - -DEPEND="virtual/glibc" - -src_compile() { - try make CFLAGS=\""${CFLAGS}"\" -} - -src_install () { - dodir /usr/bin /usr/share/man/man1 - try make DESTDIR=${D} BINDIR=/usr/bin MANDIR=/usr/share/man install - dodoc ChangeLog COPYING README PORTING TODO -} diff --git a/sys-apps/eject/files/digest-eject-2.0.2 b/sys-apps/eject/files/digest-eject-2.0.2 deleted file mode 100644 index d017f831fa2d..000000000000 --- a/sys-apps/eject/files/digest-eject-2.0.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 70a6644dd85623cda100f552a1fe0480 eject-2.0.2.tar.gz diff --git a/sys-apps/eject/files/digest-eject-2.0.4 b/sys-apps/eject/files/digest-eject-2.0.4 deleted file mode 100644 index d020273c96ae..000000000000 --- a/sys-apps/eject/files/digest-eject-2.0.4 +++ /dev/null @@ -1 +0,0 @@ -MD5 700e31aee4ea238fdfb011a6d571da5f eject-2.0.4.tar.gz diff --git a/sys-apps/eject/files/eject-2.0.2-gentoo.diff b/sys-apps/eject/files/eject-2.0.2-gentoo.diff deleted file mode 100644 index 9949d73a4220..000000000000 --- a/sys-apps/eject/files/eject-2.0.2-gentoo.diff +++ /dev/null @@ -1,66 +0,0 @@ -diff -ur eject-2.0.2.orig/Makefile eject-2.0.2/Makefile ---- eject-2.0.2.orig/Makefile Sun Feb 14 15:49:02 1999 -+++ eject-2.0.2/Makefile Thu Mar 1 21:52:09 2001 -@@ -1,24 +1,28 @@ - # Make file for eject - -+DESTDIR= -+ - # Default device to eject. Can be a partial name such as "cdrom" or - # a full device name such as "/dev/sda4". - DEFAULTDEVICE = \"cdrom\" - - # Location to install binary. Default is /usr/local/bin. You may - # prefer to install it in /usr/bin or /sbin --BINDIR = /usr/local/bin --#BINDIR=/usr/bin -+#BINDIR = /usr/local/bin -+BINDIR=/usr/bin - #BINDIR=/usr/sbin - - # Location to install man page. Default is /usr/local/man. You may - # prefer to install it in /usr/man --MANDIR = /usr/local/man -+#MANDIR = /usr/local/man - #MANDIR = /usr/man -+MANDIR = /usr/share/man - - # File permissions for binary. Use MODE=4555 if you want to install it - # setuid root (see man page). --MODE = 555 -+#MODE = 555 - #MODE = 4555 -+MODE = 755 - - # Compiler to use - CC = gcc -@@ -29,14 +33,15 @@ - # Preprocessor options - # Define -DGETOPTLONG if you have GNU getopt_long() - # -I options are needed for some systems that do not have /usr/include/scsi --CPPFLAGS = -I/usr/src/linux -I/usr/src/linux/include -DDEFAULTDEVICE=$(DEFAULTDEVICE) -DGETOPTLONG -+CPPFLAGS = -DDEFAULTDEVICE=$(DEFAULTDEVICE) -DGETOPTLONG - - # Compile and link options - # On a.out systems you might want to add -N when linking - # RPM_OPT_FLAGS can be set by rpm tool - # ...For production code --CFLAGS = -Wall -O3 $(RPM_OPT_FLAGS) --LDFLAGS = -s -+OPT=-O2 -+CFLAGS = -Wall $(OPT) -+LDFLAGS = - # ...For debug - #CFLAGS = -Wall -g - #LDFLAGS = -g -@@ -48,8 +53,8 @@ - $(CC) $(CPPFLAGS) $(CFLAGS) -c eject.c - - install: eject -- install -m $(MODE) eject $(BINDIR)/eject -- install -m 444 eject.1 $(MANDIR)/man1/eject.1 -+ install -m $(MODE) eject $(DESTDIR)/$(BINDIR)/eject -+ install -m 644 eject.1 $(DESTDIR)/$(MANDIR)/man1/eject.1 - @for dir in /bin /usr/bin /sbin /usr/sbin /usr/local/bin /usr/local/sbin ; do \ - test $(BINDIR) = $$dir && continue ; \ - if [ -x $$dir/eject ] ; then \ diff --git a/sys-apps/fileutils/files/digest-fileutils-4.0.36-r3 b/sys-apps/fileutils/files/digest-fileutils-4.0.36-r3 deleted file mode 100644 index 44878ba266d7..000000000000 --- a/sys-apps/fileutils/files/digest-fileutils-4.0.36-r3 +++ /dev/null @@ -1 +0,0 @@ -MD5 c603c20eedd5b964b1b429efe8103159 fileutils-4.0.36.tar.gz diff --git a/sys-apps/fileutils/fileutils-4.0.36-r3.ebuild b/sys-apps/fileutils/fileutils-4.0.36-r3.ebuild deleted file mode 100644 index 24e01dde78df..000000000000 --- a/sys-apps/fileutils/fileutils-4.0.36-r3.ebuild +++ /dev/null @@ -1,56 +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-apps/fileutils/fileutils-4.0.36-r3.ebuild,v 1.1 2001/02/27 16:34:41 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls, etc)" -SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${A}" -HOMEPAGE="http://www.gnu.org/software/fileutils/fileutils.html" - -DEPEND="virtual/glibc - nls? ( sys-devel/gettext )" - -RDEPEND="virtual/glibc" - -src_compile() { - - local myconf - if [ -z "`use nls`" ] - then - myconf="--disable-nls" - fi - try ./configure --prefix=/usr --mandir=/usr/share/man \ - --infodir=/usr/share/info --bindir=/bin ${myconf} - if [ -z "`use static`" ] - then - try make ${MAKEOPTS} - else - try make ${MAKEOPTS} LDFLAGS=-static - fi -} - -src_install() { - - if [ -z "`use build`" ] - then - make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info bindir=${D}/bin install - cd ${D} - dodir /usr/bin - rm -rf usr/lib - cd usr/bin - ln -s ../../bin/* . - cd ${S} - dodoc COPYING NEWS README* THANKS TODO ChangeLog ChangeLog-1997 AUTHORS - else - cd ${S}/src - into / - dobin chgrp chown dd dir du ln mkdir mknod rm touch \ - chmod cp df ls mkfifo mv rmdir sync - newbin ginstall install - dosym /bin/install /usr/bin/install - fi - -} - diff --git a/sys-apps/iptables/files/digest-iptables-1.2.1a b/sys-apps/iptables/files/digest-iptables-1.2.1a deleted file mode 100644 index a31591a9e5c9..000000000000 --- a/sys-apps/iptables/files/digest-iptables-1.2.1a +++ /dev/null @@ -1 +0,0 @@ -MD5 a7196af43f81c33467e658365a043037 iptables-1.2.1a.tar.bz2 diff --git a/sys-apps/iptables/iptables-1.2.1a.ebuild b/sys-apps/iptables/iptables-1.2.1a.ebuild deleted file mode 100644 index b4d237b35c3a..000000000000 --- a/sys-apps/iptables/iptables-1.2.1a.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 Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-apps/iptables/iptables-1.2.1a.ebuild,v 1.1 2001/04/24 00:16:44 drobbins Exp $ - -A=${P}.tar.bz2 -S=${WORKDIR}/${P} -DESCRIPTION="Kernel 2.4 routing and traffic control utilities" -SRC_URI="http://netfilter.samba.org/${A}" - -DEPEND="virtual/glibc" - -src_unpack() { - unpack ${A} - cd ${S} - mv Makefile Makefile.orig - sed -e "s/-O2/${CFLAGS}/g" -e "s:/usr/local:/usr:g" Makefile.orig > Makefile -} - -src_compile() { - #I had a problem with pmake - DR - try make -} - - -src_install() { - dodir /usr/lib /usr/share/man/man8 /usr/sbin - try make LIBDIR=${D}/usr/lib BINDIR=${D}/usr/sbin MANDIR=${D}/usr/share/man install - dodoc COPYING KNOWN_BUGS -} - - diff --git a/sys-apps/lilo/files/digest-lilo-21.7.3 b/sys-apps/lilo/files/digest-lilo-21.7.3 deleted file mode 100644 index c29e6aaba3f0..000000000000 --- a/sys-apps/lilo/files/digest-lilo-21.7.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 3731fe41cac01787e7a58dd041b6e116 lilo-21.7.3.tar.gz diff --git a/sys-apps/lilo/lilo-21.7.3.ebuild b/sys-apps/lilo/lilo-21.7.3.ebuild deleted file mode 100644 index d2f0ab54dab9..000000000000 --- a/sys-apps/lilo/lilo-21.7.3.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-apps/lilo/lilo-21.7.3.ebuild,v 1.1 2001/04/18 19:03:14 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Standard Linux boot loader" -SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/"${A} - -DEPEND="virtual/glibc - >=sys-devel/bin86-0.15.4-r1" - -RDEPEND="virtual/glibc" - -src_unpack() { - - unpack ${A} - cd ${S} - cp Makefile Makefile.orig - sed -e "s:-g:${CFLAGS}:" \ - Makefile.orig > Makefile - -} - -src_compile() { - - try pmake -} - -src_install() { - - into / - dosbin lilo - into /usr - dosbin keytab-lilo.pl - dodir /boot - insinto /boot - doins boot-text.b boot-menu.b chain.b os2_d.b - doman manPages/*.[5-8] - dodoc CHANGES COPYING INCOMPAT QuickInst README* -} - -pkg_preinst() { - - . ${ROOT}/etc/rc.d/config/functions - - if [ ! -L $ROOT/boot/boot.b -a -f $ROOT/boot/boot.b ] - then - einfo "Saving old boot.b..." - mv $ROOT/boot/boot.b $ROOT/boot/boot.old; - fi - - if [ ! -L $ROOT/boot/chain.b -a -f $ROOT/boot/chain.b ] - then - einfo "Saving old chain.b..." - mv $ROOT/boot/chain.b $ROOT/boot/chain.old; - fi - - if [ ! -L $ROOT/boot/os2_d.b -a -f $ROOT/boot/os2_d.b ] - then - einfo "Saving old os2_d.b..." - mv $ROOT/boot/os2_d.b $ROOT/boot/os2_d.old; - fi -} - -pkg_postinst() { - - . ${ROOT}/etc/rc.d/config/functions - - einfo "Activating boot-menu..." - ln -sf boot-menu.b $ROOT/boot/boot.b; - -} - - diff --git a/sys-apps/modutils/files/digest-modutils-2.4.2 b/sys-apps/modutils/files/digest-modutils-2.4.2 deleted file mode 100644 index 0e98cfea5a5a..000000000000 --- a/sys-apps/modutils/files/digest-modutils-2.4.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 a8a8268d07d3780a64e17870a9ea3080 modutils-2.4.2.tar.bz2 diff --git a/sys-apps/modutils/modutils-2.4.2.ebuild b/sys-apps/modutils/modutils-2.4.2.ebuild deleted file mode 100644 index 280ba863f7dc..000000000000 --- a/sys-apps/modutils/modutils-2.4.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-apps/modutils/modutils-2.4.2.ebuild,v 1.1 2001/02/07 15:51:27 achim Exp $ - -A=${P}.tar.bz2 -S=${WORKDIR}/${P} -DESCRIPTION="Standard kernel module utilities" -SRC_URI="http://www.kernel.org/pub/linux/utils/kernel/modutils/v2.4/${A}" - -DEPEND="virtual/glibc" - -src_compile() { - - try ./configure --prefix=/ --mandir=/usr/share/man --host=${CHOST} --disable-strip - try make ${MAKEOPTS} -} - -src_install() { - - try make prefix=${D} mandir=${D}/usr/share/man install - dodoc COPYING CREDITS ChangeLog NEWS README TODO -} - - - - diff --git a/sys-apps/net-tools/files/digest-net-tools-1.59 b/sys-apps/net-tools/files/digest-net-tools-1.59 deleted file mode 100644 index adf0d3d551ac..000000000000 --- a/sys-apps/net-tools/files/digest-net-tools-1.59 +++ /dev/null @@ -1 +0,0 @@ -MD5 46719c4c352414357b68161a789dbe82 net-tools-1.59.tar.bz2 diff --git a/sys-apps/net-tools/net-tools-1.59.ebuild b/sys-apps/net-tools/net-tools-1.59.ebuild deleted file mode 100644 index a14da63588d7..000000000000 --- a/sys-apps/net-tools/net-tools-1.59.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-apps/net-tools/net-tools-1.59.ebuild,v 1.1 2001/02/18 01:58:46 achim Exp $ - -A=${P}.tar.bz2 -S=${WORKDIR}/${P} -DESCRIPTION="standard Linux network tools" -SRC_URI="http://www.tazenda.demon.co.uk/phil/net-tools/${A}" -HOMEPAGE="http://sites.inka.de/lina/linux/NetTools/" - -DEPEND="virtual/glibc - sys-devel/gettext" -RDEPEND="virtual/glibc" - -src_unpack() { - - unpack ${A} - cd ${S} - cp ${FILESDIR}/config.h . - cp ${FILESDIR}/config.make . - cp Makefile Makefile.orig - sed -e "s/-O2 -Wall -g/${CFLAGS}/" Makefile.orig > Makefile - cd man - cp Makefile Makefile.orig - sed -e "s:/usr/man:/usr/share/man:" Makefile.orig > Makefile - -} - -src_compile() { - - try make ${MAKEOPTS} - cd po - try make ${MAKEOPTS} - -} - -src_install() { - - try make BASEDIR=${D} install - mv ${D}/bin/* ${D}/sbin - for i in hostname domainname netstat dnsdomainname ypdomainname nisdomainname - do - mv ${D}/sbin/${i} ${D}/bin - done - - dodoc COPYING README README.ipv6 TODO -} - - - diff --git a/sys-apps/procps/files/procps-2.0.6.diff b/sys-apps/procps/files/procps-2.0.6.diff deleted file mode 100644 index 24a24004414d..000000000000 --- a/sys-apps/procps/files/procps-2.0.6.diff +++ /dev/null @@ -1,3401 +0,0 @@ ---- procps-2.0.6.orig/proc/Makefile -+++ procps-2.0.6/proc/Makefile -@@ -66,8 +66,8 @@ - $(INSTALL) $(LIBOWN) lib$(NAME).a $(LIBDIR) - ifeq ($(SHARED),1) - $(INSTALL) $(LIBOWN) $(SONAME) $(SHLIBDIR) -- cd $(SHLIBDIR) && ln -sf $(SONAME) lib$(NAME).so -- ldconfig -+ #cd $(SHLIBDIR) && ln -sf $(SONAME) lib$(NAME).so -+ #ldconfig - endif - - # VARIOUS SHORT CUT TARGETS ---- procps-2.0.6.orig/proc/devname.c -+++ procps-2.0.6/proc/devname.c -@@ -100,7 +100,7 @@ - sprintf(buf, "/dev/tty%d", min); - break; - } -- if(min<128){ -+ if(min<128){ /* to 255 on newer systems */ - sprintf(buf, "/dev/ttyS%d", min-64); - break; - } -@@ -112,7 +112,8 @@ - break; - case 17: sprintf(buf, "/dev/ttyH%d", min); break; - case 19: sprintf(buf, "/dev/ttyC%d", min); break; -- case 23: sprintf(buf, "/dev/ttyD%d", min); break; -+ case 22: sprintf(buf, "/dev/ttyD%d", min); break; /* devices.txt */ -+ case 23: sprintf(buf, "/dev/ttyD%d", min); break; /* driver code */ - case 24: sprintf(buf, "/dev/ttyE%d", min); break; - case 32: sprintf(buf, "/dev/ttyX%d", min); break; - case 43: sprintf(buf, "/dev/ttyI%d", min); break; -@@ -121,10 +122,19 @@ - case 57: sprintf(buf, "/dev/ttyP%d", min); break; - case 71: sprintf(buf, "/dev/ttyF%d", min); break; - case 75: sprintf(buf, "/dev/ttyW%d", min); break; -- case 78: sprintf(buf, "/dev/ttyM%d", min); break; -+ case 78: sprintf(buf, "/dev/ttyM%d", min); break; /* conflict */ - case 105: sprintf(buf, "/dev/ttyV%d", min); break; -+ case 112: sprintf(buf, "/dev/ttyM%d", min); break; /* conflict */ - /* 136 ... 143 are /dev/pts/0, /dev/pts/1, /dev/pts/2 ... */ - case 136 ... 143: sprintf(buf, "/dev/pts/%d", min+(maj-136)*256); break; -+ case 148: sprintf(buf, "/dev/ttyT%d", min); break; -+ case 154: sprintf(buf, "/dev/ttySR%d", min); break; -+ case 156: sprintf(buf, "/dev/ttySR%d", min+256); break; -+ case 164: sprintf(buf, "/dev/ttyCH%d", min); break; -+ case 166: sprintf(buf, "/dev/ttyACM%d", min); break; /* bummer, 9-char */ -+ case 172: sprintf(buf, "/dev/ttyMX%d", min); break; -+ case 174: sprintf(buf, "/dev/ttySI%d", min); break; -+ case 188: sprintf(buf, "/dev/ttyUSB%d", min); break; /* bummer, 9-char */ - default: return 0; - } - if(stat(buf, &sbuf) < 0) return 0; -@@ -137,12 +147,12 @@ - * Useful names could be in /proc/PID/fd/2 (stderr, seldom redirected) - * and in /proc/PID/fd/255 (used by bash to remember the tty). - */ --static int fd_name(char * const buf, int maj, int min, int pid, int fd){ -+static int link_name(char * const buf, int maj, int min, int pid, char *name){ - struct stat sbuf; - char path[32]; - int count; -- sprintf(path, "/proc/%d/fd/%d", pid, fd); /* often permission denied */ -- count = readlink(path,buf,PAGE_SIZE); -+ sprintf(path, "/proc/%d/%s", pid, name); /* often permission denied */ -+ count = readlink(path,buf,PAGE_SIZE-1); - if(count == -1) return 0; - buf[count] = '\0'; - if(stat(buf, &sbuf) < 0) return 0; -@@ -158,10 +168,11 @@ - int i = 0; - int c; - if((short)dev == (short)-1) goto fail; -- if( fd_name(tmp, major(dev), minor(dev), pid, 2 )) goto abbrev; -- if( fd_name(tmp, major(dev), minor(dev), pid, 255)) goto abbrev; -- if( guess_name(tmp, major(dev), minor(dev) )) goto abbrev; -- if(driver_name(tmp, major(dev), minor(dev) )) goto abbrev; -+ if( link_name(tmp, major(dev), minor(dev), pid, "tty" )) goto abbrev; -+ if( link_name(tmp, major(dev), minor(dev), pid, "fd/2" )) goto abbrev; -+ if( guess_name(tmp, major(dev), minor(dev) )) goto abbrev; -+ if( link_name(tmp, major(dev), minor(dev), pid, "fd/255")) goto abbrev; -+ if(driver_name(tmp, major(dev), minor(dev) )) goto abbrev; - fail: - strcpy(ret, "?"); - return 1; ---- procps-2.0.6.orig/proc/ksym.c -+++ procps-2.0.6/proc/ksym.c -@@ -25,6 +25,14 @@ - - #if 0 - #undef KSYMS_FILENAME -+#define KSYMS_FILENAME "/would/be/nice/to/have/this/file" -+#define SYSMAP_FILENAME "/home/albert/ps/45621/System.map-hacked" -+#define linux_version_code 131598 /* ? */ -+#define smp_num_cpus 2 -+#endif -+ -+#if 0 -+#undef KSYMS_FILENAME - #define KSYMS_FILENAME "/home/albert/ps/45621/ksyms-2.3.12" - #define SYSMAP_FILENAME "/home/albert/ps/45621/System.map-2.3.12" - #define linux_version_code 131852 /* 2.3.12 */ -@@ -47,24 +55,17 @@ - #define smp_num_cpus 2 - #endif - --/* -- * '?' is a symbol type -- * '.' is part of a name (versioning?) -- * "\t[]" are for the module name in /proc/ksyms -- */ --#define LEGAL_SYSMAP_CHARS "0123456789_ ?.\n\t[]" \ -- "abcdefghijklmnopqrstuvwxyz" \ -- "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -- - /* These are the symbol types, with relative popularity: -- * 4 W (not for i386) -+ * ? w machine type junk for Alpha -- odd syntax -+ * ? S not for i386 -+ * 4 W not for i386 - * 60 R - * 100 A - * 125 r -- * 363 s (not for i386) -+ * 363 s not for i386 - * 858 B -- * 905 g (not for i386) -- * 929 G (not for i386) -+ * 905 g generated by modutils? -+ * 929 G generated by modutils? - * 1301 b - * 2750 D - * 4481 d -@@ -75,7 +76,30 @@ - * For i386, that is: "RArBbDd?tT" - */ - --#define SYMBOL_TYPE_CHARS "Tt?dDbBrARGgsW" -+#define SYMBOL_TYPE_CHARS "Tt?dDbBrARGgsWS" -+ -+/* -+ * '?' is a symbol type -+ * '.' is part of a name (versioning?) -+ * "\t[]" are for the module name in /proc/ksyms -+ */ -+#define LEGAL_SYSMAP_CHARS "0123456789_ ?.\n\t[]" \ -+ "abcdefghijklmnopqrstuvwxyz" \ -+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -+ -+/* System.map lines look like: -+ * hex num, space, one of SYMBOL_TYPE_CHARS, space, LEGAL_SYSMAP_CHARS, \n -+ * -+ * Alpha systems can start with a few lines that have the address replaced -+ * by space padding and a 'w' for the type. For those lines, the last space -+ * is followed by something like: mikasa_primo_mv p2k_mv sable_gamma_mv -+ * (just one of those, always with a "_mv", then the newline) -+ * -+ * The /proc/ksyms lines are like System.map lines w/o the symbol type char. -+ * When odd features are used, the name part contains: -+ * "(.*)_R(smp_|smp2gig_|2gig_)?[0-9a-fA-F]{8,}" -+ * It is likely that more crap will be added... -+ */ - - typedef struct symb { - const char *name; -@@ -100,6 +124,63 @@ - static unsigned ksyms_count; - static int idx_room; - -+/*********************************/ -+ -+/* Kill this: _R(smp_?|smp2gig_?|2gig_?)?[0-9a-f]{8,}$ -+ * We kill: (_R[^A-Z]*[0-9a-f]{8,})+$ -+ * -+ * The loop should almost never be taken, but it has to be there. -+ * It gets rid of anything that _looks_ like a version code, even -+ * if a real version code has already been found. This is because -+ * the inability to perfectly recognize a version code may lead to -+ * symbol mangling, which in turn leads to mismatches between the -+ * /proc/ksyms and System.map data files. -+ */ -+#if 0 -+static void chop_version(char *arg){ -+ char *cp; -+ cp = strchr(arg,'\t'); -+ if(cp) *cp = '\0'; /* kill trailing module name first */ -+ for(;;){ -+ char *p; -+ int len = 0; -+ cp = strrchr(arg, 'R'); -+ if(!cp || cp<=arg+1 || cp[-1]!='_') break; -+ for(p=cp; *++p; ){ -+ switch(*p){ -+ default: -+ return; -+ case '0' ... '9': -+ case 'a' ... 'f': -+ len++; -+ continue; -+ case 'g' ... 'z': -+ case '_': -+ len=0; -+ continue; -+ } -+ } -+ if(len<8) break; -+ cp[-1] = '\0'; -+ } -+} -+#endif -+static void chop_version(char *arg){ -+ char *cp; -+ cp = strchr(arg,'\t'); -+ if(cp) *cp = '\0'; /* kill trailing module name first */ -+ for(;;){ -+ int len; -+ cp = strrchr(arg, 'R'); -+ if(!cp || cp<=arg+1 || cp[-1]!='_') break; -+ len=strlen(cp); -+ if(len<9) break; -+ if(strpbrk(cp+1,"ABCDEFGHIJKLMNOPQRSTUVWXYZ")) break; -+ if(strspn(cp+len-8,"0123456789abcdef")!=8) break; -+ cp[-1] = '\0'; -+ } -+} -+ - /***********************************/ - - static const symb *search(unsigned long address, symb *idx, unsigned count){ -@@ -174,12 +255,14 @@ - } - *bufp = buf; - *roomp = room; -+ close(fd); - return; - hell: - if(buf) free(buf); - *bufp = NULL; - *roomp = 0; /* this function will never work again */ - total = 0; -+ close(fd); - return; - } - -@@ -189,6 +272,7 @@ - char *endp; - if(!ksyms_room || !ksyms_data) goto quiet_goodbye; - endp = ksyms_data; -+ ksyms_count = 0; - if(idx_room) goto bypass; /* some space already allocated */ - idx_room = 512; - for(;;){ -@@ -201,36 +285,16 @@ - for(;;){ - char *saved; - if(!*endp) return 1; -+ saved = endp; - ksyms_index[ksyms_count].addr = strtoul(endp, &endp, 16); -- if(*endp != ' ') goto bad_parse; -+ if(endp==saved || *endp != ' ') goto bad_parse; - endp++; - ksyms_index[ksyms_count].name = endp; - saved = endp; - endp = strchr(endp,'\n'); - if(!endp) goto bad_parse; /* no newline */ - *endp = '\0'; -- if(1){ /* The Killing Scope */ -- char *cp; -- cp = strchr(endp,'\t'); -- if(cp) *cp = '\0'; /* kill trailing module name */ -- if(smp_num_cpus==1){ -- saved = strrchr(saved, '_'); -- if(saved && saved[1]=='R' && saved[2] && !(strlen(saved+2)&7)){ -- /* could be crummy version info */ -- char *endp2; -- strtoul(saved+2, &endp2, 16); -- if(!*endp2) *saved = '\0'; /* Die version, DIE!!! */ -- } -- }else{ -- saved = strstr(saved, "_Rsmp_"); -- if(saved && !(strlen(saved+6)&7)){ -- /* could be crummy version info */ -- char *endp2; -- strtoul(saved+6, &endp2, 16); -- if(!*endp2) *saved = '\0'; /* Die version, DIE!!! */ -- } -- } -- } /* end killing scope */ -+ chop_version(saved); - ++endp; - if(++ksyms_count >= idx_room) break; /* need more space */ - } -@@ -270,6 +334,14 @@ - /* Would be shared read-only, but we want '\0' after each name. */ - endp = mmap(0, sbuf.st_size + 1, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0); - sysmap_data = endp; -+ while(*endp==' '){ /* damn Alpha machine types */ -+ if(strncmp(endp," w ", 19)) goto bad_parse; -+ endp += 19; -+ endp = strchr(endp,'\n'); -+ if(!endp) goto bad_parse; /* no newline */ -+ if(strncmp(endp-3, "_mv\n", 4)) goto bad_parse; -+ endp++; -+ } - if(sysmap_data == (caddr_t) -1) goto bad_open; - close(fd); - fd = -1; -@@ -330,6 +402,7 @@ - if(!endp) goto bad_parse; /* no newline */ - *endp = '\0'; - ++endp; -+ chop_version(vstart); - if(*vstart=='V' && *Version && !strcmp(Version,vstart)) *Version='\0'; - if(++sysmap_count >= sysmap_room) break; /* need more space */ - } -@@ -456,11 +529,3 @@ - - return ret; - } -- -- -- -- -- -- -- -- ---- procps-2.0.6.orig/proc/readproc.c -+++ procps-2.0.6/proc/readproc.c -@@ -14,6 +14,7 @@ - #include <stdarg.h> - #include <string.h> - #include <unistd.h> -+#include <signal.h> - #include <fcntl.h> - #include <sys/dir.h> - #include <sys/types.h> -@@ -154,6 +155,9 @@ - int num; - char* tmp = strrchr(S, ')'); /* split into "PID (cmd" and "<rest>" */ - *tmp = '\0'; /* replace trailing ')' with NUL */ -+ /* fill in default values for older kernels */ -+ P->exit_signal = SIGCHLD; -+ P->processor = 0; - /* parse these two strings separately, skipping the leading "(". */ - memset(P->cmd, 0, sizeof P->cmd); /* clear even though *P xcalloc'd ?! */ - sscanf(S, "%d (%15c", &P->pid, P->cmd); /* comm[16] in kernel */ -@@ -166,7 +170,8 @@ - "%ld " - "%lu %lu %lu %lu %lu %lu " - "%*s %*s %*s %*s " /* discard, no RT signals & Linux 2.1 used hex */ -- "%lu %lu %lu", -+ "%lu %lu %lu " -+ "%d %d", - &P->state, - &P->ppid, &P->pgrp, &P->session, &P->tty, &P->tpgid, - &P->flags, &P->min_flt, &P->cmin_flt, &P->maj_flt, &P->cmaj_flt, &P->utime, &P->stime, -@@ -175,18 +180,15 @@ - &P->rss, - &P->rss_rlim, &P->start_code, &P->end_code, &P->start_stack, &P->kstk_esp, &P->kstk_eip, - /* P->signal, P->blocked, P->sigignore, P->sigcatch, */ /* can't use */ -- &P->wchan, &P->nswap, &P->cnswap /* , &P->exit_signal */); --/* TODO: add &P->exit_signal support here, perhaps to identify Linux threads */ -+ &P->wchan, &P->nswap, &P->cnswap, -+/* -- Linux 2.0.35 ends here -- */ -+ &P->exit_signal, &P->processor /* 2.2.1 ends with "exit_signal" */ -+/* -- Linux 2.2.8 and 2.3.47 end here -- */ -+ ); - --/* fprintf(stderr, "stat2proc converted %d fields.\n",num); */ -+ /* fprintf(stderr, "stat2proc converted %d fields.\n",num); */ - if (P->tty == 0) - P->tty = -1; /* the old notty val, update elsewhere bef. moving to 0 */ -- if (linux_version_code < LINUX_VERSION(1,3,39)) { -- P->priority = 2*15 - P->priority; /* map old meanings to new */ -- P->nice = 15 - P->nice; -- } -- if (linux_version_code < LINUX_VERSION(1,1,30) && P->tty != -1) -- P->tty = 4*0x100 + P->tty; /* when tty wasn't full devno */ - } - - static void statm2proc(char* s, proc_t* P) { -@@ -504,55 +506,6 @@ - return NULL; - } - --#if 0 --static proc_t* readproctree(int flags, ...) { -- static proc_t tree; -- PROCTAB* PT = NULL; -- proc_t *node, *tmp=NULL, *tmp2=NULL; -- va_list ap; -- -- /* pass through apropriate arguments to openproc */ -- va_start(ap, flags); -- if (Do(UID)) { -- /* temporary variables to ensure that va_arg() instances -- * are called in the right order -- */ -- uid_t* u; -- int i; -- -- u = va_arg(ap, uid_t*); -- i = va_arg(ap, int); -- PT = openproc(flags, u, i); -- } -- else if (Do(PID) || Do(TTY) || Do(STAT)) -- PT = openproc(flags, va_arg(ap, void*)); -- else -- PT = openproc(flags); -- va_end(ap); -- -- /* first pass: build tree, putting orphans on the first level */ -- tree.l = tree.r = NULL; -- while ((node = readproc(PT,0))) -- if ((tmp = LookupPID(&tree, node->ppid))) { -- node->r = tmp->l->r; /* node --> left list of parent */ -- tmp->l->r = node; -- } else { -- node->r = tree.r; /* node --> right list of 'tree' */ -- tree.r = node; -- } -- /* second pass: scan tree for PPIDs of level-1 nodes moving links as necessary */ -- for (node = &tree; node; node = node->r) -- if ((tmp = LookupPID(&tree, node->r->ppid))) { -- tmp2 = node->r; /* unlink from right list of 'tree' */ -- node->r = node->r->r; -- tmp2->r = tmp->l->r; /* insert as child of found node */ -- tmp->l->r = node; -- } -- closeproc(PT); -- return &tree; --} --#endif -- - /* Convenient wrapper around openproc and readproc to slurp in the whole process - * table subset satisfying the constraints of flags and the optional PID list. - * Free allocated memory with freeproctab(). Access via tab[N]->member. The -@@ -588,14 +541,3 @@ - closeproc(PT); - return tab; - } -- --#if 0 --/* deallocate a table of pointers to proc structures -- */ --static void freeproctab(proc_t** tab) { -- proc_t** p; -- for(p = tab; *p; p++) -- freeproc(*p); -- free(tab); --} --#endif ---- procps-2.0.6.orig/proc/readproc.h -+++ procps-2.0.6/proc/readproc.h -@@ -50,7 +50,7 @@ - priority, /* kernel scheduling priority */ - timeout, /* ? */ - nice, /* standard unix nice level of process */ -- rss, /* resident set size from /proc/#/stat */ -+ rss, /* resident set size from /proc/#/stat (pages) */ - it_real_value, /* ? */ - /* the next 7 members come from /proc/#/statm */ - size, /* total # of pages of memory */ -@@ -70,7 +70,7 @@ - vm_exe, /* executable size */ - vm_lib, /* library size (all pages, not just used ones) */ - vsize, /* number of pages of virtual memory ... */ -- rss_rlim, /* resident set size ... ? */ -+ rss_rlim, /* resident set size limit? */ - flags, /* kernel flags for the process */ - min_flt, /* number of minor page faults since process start */ - maj_flt, /* number of major page faults since process start */ -@@ -113,7 +113,9 @@ - pgrp, /* process group id */ - session, /* session id */ - tty, /* full device number of controlling terminal */ -- tpgid; /* terminal process group id */ -+ tpgid, /* terminal process group id */ -+ exit_signal, /* might not be SIGCHLD */ -+ processor; /* current (or most recent?) CPU */ - unsigned - pcpu; /* %CPU usage (is not filled in by readproc!!!) */ - char ---- procps-2.0.6.orig/proc/sysinfo.c -+++ procps-2.0.6/proc/sysinfo.c -@@ -49,20 +49,20 @@ - static int local_n; \ - if (fd == -1 && (fd = open(filename, O_RDONLY)) == -1) { \ - fprintf(stderr, BAD_OPEN_MESSAGE); \ -- close(fd); \ -- exit(102); \ -+ fflush(NULL); \ -+ _exit(102); \ - } \ - lseek(fd, 0L, SEEK_SET); \ - if ((local_n = read(fd, buf, sizeof buf - 1)) < 0) { \ - perror(filename); \ -- close(fd); \ -- fd = -1; \ -- exit(103); \ -+ fflush(NULL); \ -+ _exit(103); \ - } \ - buf[local_n] = '\0'; \ - }while(0) - --#define SET_IF_DESIRED(x,y) if(x) *(x) = (y) /* evals 'x' twice */ -+/* evals 'x' twice */ -+#define SET_IF_DESIRED(x,y) do{ if(x) *(x) = (y); }while(0) - - - /***********************************************************************/ -@@ -110,7 +110,7 @@ - double up_1, up_2, seconds; - unsigned long jiffies, h; - smp_num_cpus = sysconf(_SC_NPROCESSORS_CONF); -- if(smp_num_cpus==-1) smp_num_cpus=1; -+ if(smp_num_cpus<1) smp_num_cpus=1; - do{ - FILE_TO_BUF(UPTIME_FILE,uptime_fd); sscanf(buf, "%lf", &up_1); - /* uptime(&up_1, NULL); */ -@@ -145,22 +145,46 @@ - } - } - --/***********************************************************************/ -+/*********************************************************************** -+ * The /proc filesystem calculates idle=jiffies-(user+nice+sys) and we -+ * recover jiffies by adding up the 4 numbers we are given. SMP kernels -+ * (as of pre-2.4 era) can report idle time going backwards, perhaps due -+ * to non-atomic reads and updates. There is no locking for these values. -+ */ -+#ifndef NAN -+#define NAN (-0.0) -+#endif - #define JT unsigned long --void four_cpu_numbers(JT *uret, JT *nret, JT *sret, JT *iret) { -- static JT u, n, s, i; -- JT user_j, nice_j, sys_j, idle_j; -- -+void four_cpu_numbers(double *uret, double *nret, double *sret, double *iret){ -+ double tmp_u, tmp_n, tmp_s, tmp_i; -+ double scale; /* scale values to % */ -+ static JT old_u, old_n, old_s, old_i; -+ JT new_u, new_n, new_s, new_i; -+ JT ticks_past; /* avoid div-by-0 by not calling too often :-( */ -+ - FILE_TO_BUF(STAT_FILE,stat_fd); -- sscanf(buf, "cpu %lu %lu %lu %lu", &user_j, &nice_j, &sys_j, &idle_j); -- SET_IF_DESIRED(uret, user_j-u); -- SET_IF_DESIRED(nret, nice_j-n); -- SET_IF_DESIRED(sret, sys_j-s); -- SET_IF_DESIRED(iret, idle_j-i); -- u=user_j; -- n=nice_j; -- s=sys_j; -- i=idle_j; -+ sscanf(buf, "cpu %lu %lu %lu %lu", &new_u, &new_n, &new_s, &new_i); -+ ticks_past = (new_u+new_n+new_s+new_i)-(old_u+old_n+old_s+old_i); -+ if(ticks_past){ -+ scale = 100.0 / (double)ticks_past; -+ tmp_u = ( (double)new_u - (double)old_u ) * scale; -+ tmp_n = ( (double)new_n - (double)old_n ) * scale; -+ tmp_s = ( (double)new_s - (double)old_s ) * scale; -+ tmp_i = ( (double)new_i - (double)old_i ) * scale; -+ }else{ -+ tmp_u = NAN; -+ tmp_n = NAN; -+ tmp_s = NAN; -+ tmp_i = NAN; -+ } -+ SET_IF_DESIRED(uret, tmp_u); -+ SET_IF_DESIRED(nret, tmp_n); -+ SET_IF_DESIRED(sret, tmp_s); -+ SET_IF_DESIRED(iret, tmp_i); -+ old_u=new_u; -+ old_n=new_n; -+ old_s=new_s; -+ old_i=new_i; - } - #undef JT - -@@ -199,15 +223,19 @@ - return strcmp(((mem_table_struct*)a)->name,((mem_table_struct*)b)->name); - } - --/* example data, following junk: -+/* example data, following junk, with comments: - * - * Buffers: 2636 kB - * Cached: 27276 kB - * MemFree: 1852 kB -- * MemShared: 20664 kB -+ * MemShared: 20664 kB Recent kernels do not calculate this. - * MemTotal: 63088 kB - * SwapFree: 99180 kB - * SwapTotal: 122588 kB -+ * HighTotal: 0 kB New! -+ * HighFree: 0 kB New! -+ * LowTotal: 255596 kB New! -+ * LowFree: 62260 kB New! - */ - - unsigned kb_main_buffers; ---- procps-2.0.6.orig/proc/sig.c -+++ procps-2.0.6/proc/sig.c -@@ -27,20 +27,15 @@ - * Nearly garbage: SIGSTKFLT SIGUNUSED (nothing else to fill slots) - */ - --#ifdef SIGSYS --# ifndef SIGEMT --# error You have SIGSYS without SIGEMT? What did it replace? --# endif --# undef SIGUNUSED --# undef SIGSTKFLT --#else --# ifndef SIGUNUSED --# error You seem to be missing some signals. --# endif --# ifndef SIGSTKFLT --# error You seem to be missing some signals. --# endif -+/* Linux 2.3.29 replaces SIGUNUSED with the standard SIGSYS signal */ -+#ifndef SIGSYS - # warning Standards require that <signal.h> define SIGSYS -+# define SIGSYS SIGUNUSED -+#endif -+ -+/* If we see both, it is likely SIGSTKFLT (junk) was replaced. */ -+#ifdef SIGEMT -+# undef SIGSTKFLT - #endif - - #ifndef SIGRTMIN -@@ -84,17 +79,12 @@ - {"STKFLT", SIGSTKFLT}, - #endif - {"STOP", SIGSTOP}, --#ifdef SIGSYS -- {"SYS", SIGSYS}, --#endif -+ {"SYS", SIGSYS}, /* UNUSED */ - {"TERM", SIGTERM}, - {"TRAP", SIGTRAP}, - {"TSTP", SIGTSTP}, - {"TTIN", SIGTTIN}, - {"TTOU", SIGTTOU}, --#ifdef SIGUNUSED -- {"UNUSED", SIGUNUSED}, --#endif - {"URG", SIGURG}, - {"USR1", SIGUSR1}, - {"USR2", SIGUSR2}, ---- procps-2.0.6.orig/proc/sysinfo.h -+++ procps-2.0.6/proc/sysinfo.h -@@ -4,7 +4,7 @@ - extern unsigned long Hertz; /* clock tick frequency */ - extern long smp_num_cpus; /* number of CPUs */ - --#define JT unsigned long -+#define JT double - extern void four_cpu_numbers(JT *uret, JT *nret, JT *sret, JT *iret); - #undef JT - ---- procps-2.0.6.orig/BUGS -+++ procps-2.0.6/BUGS -@@ -9,7 +9,7 @@ - - Where to send - ============= --Send comments, bug reports, patches, etc., to procps-bugs@redhat.com -+Send comments, bug reports, patches, etc., to acahalan@cs.uml.edu - - - What to send ---- procps-2.0.6.orig/NEWS -+++ procps-2.0.6/NEWS -@@ -1,5 +1,7 @@ - NEWS: what has changed recently with procps, in reverse cronological order. --Please send bug reports to procps-bugs@redhat.com -+Please send bug reports to acahalan@cs.uml.edu -+ -+*** THIS FILE DOES NOT INCLUDE RECENT CHANGES *** - - - NEWS for version 2.0.6 of procps ---- procps-2.0.6.orig/Makefile -+++ procps-2.0.6/Makefile -@@ -4,8 +4,8 @@ - PREFIX = #proc# prefix for program names - - DESTDIR = / --MAN1DIR = ${DESTDIR}/usr/man/man1 --MAN8DIR = ${DESTDIR}/usr/man/man8 -+MAN1DIR = ${DESTDIR}/usr/share/man/man1 -+MAN8DIR = ${DESTDIR}/usr/share/man/man8 - BINDIR = ${DESTDIR}/bin - SBINDIR = ${DESTDIR}/sbin - XBINDIR = ${DESTDIR}/usr/X11R6/bin ---- procps-2.0.6.orig/TODO -+++ procps-2.0.6/TODO -@@ -9,12 +9,27 @@ - killall pstree fuser lsof who - (they are maintained elsewhere, which causes version problems) - --See if the syslogd & klogd maintainer will take XConsole. -- - Cache results of dev_to_tty. - - ---------------------- kernel ------------------------- - -+Add an "adopted child" flag to mark processes that are not -+natural children of init. This can make --forest work better. -+ -+Add a thread group ID, to be shared by all tasks that are related by -+the clone() system call. This ID might be made unique from boot to -+shutdown, perhaps being a 16-bit CPU number and 48-bit per-CPU -+serial number. -+ -+Make the kernel group /proc listing output by thread group. -+Without this, a thread-aware ps must always sort processes. -+ -+Supply the task ID (the "PID"/"TID") of the thread group leader. -+I define "leader" as the first process of a thread group. -+ -+Don't reuse the task ID of a thread group leader until all threads -+are dead. Better yet, don't let the leader exit. -+ - Supply better data for top's CPU state display. Currently top has - to subtract old numbers from new numbers and divide that result by - the number of processors. The kernel won't even supply the number -@@ -41,6 +56,8 @@ - of 64-bit values on all machines. New entries go on the end and obsolete - ones get filled in with something logical -- entries must never be deleted! - -+Add all the stuff Solaris has. This would also replace ptrace. -+ - The kernel should provide a "current CPU number" indication for SMP. Maybe - use "last CPU number" if not currently running, since processor affinity - will tend to put the process back on the same CPU it had before. -@@ -58,20 +75,12 @@ - Verify that DNS control does not give a user the power to specify - arbitrary data for the FROM column. (could set root's VGA color map!) - ------------------------ watch -------------------------- -- --Should catch SIGWINCH and adjust as needed. --Tell 29970@bugs.debian.org when done. -- - ---------------------- vmstat -------------------------- - - Extract /proc/stat parsing from vmstat into libproc somewhere. - - --------------------- libproc ---------------------- - --Remove pre-2.0 /proc/meminfo support from proc/sysinfo.c to simplify the code. --Parse the 2.0 format in a better manner, perhaps like ps does long options. -- - Stop storing fields with duplicate info (often different - units: kB and pages, seconds and jiffies) in the proc_t struct. - -@@ -79,9 +88,6 @@ - - Share more stuff with ps. - ---------------------- skill ------------------------ -- -- - ---------------- ps for now, maybe move to libproc ------------------ - - With forest output and a tty named /dev/this_is_my_tty, the position -@@ -126,8 +132,6 @@ - are reported as being 5 days old, while boot processes look normal) - (reported for procps-2.0.2 in May 1999) - --Make "ps --sort:pcpu" work. (p->pcpu is not filled in) -- - Show real-time priorities. (type & number) - - Add an option to select all processes that a user can kill. -@@ -150,7 +154,7 @@ - code as much as the kernel can support. Make sure that memory amounts are in - pages when they should be and in kB when they should be, not backwards. - --output encoding: UTF8 --nul --null --html -+output encoding: UTF8 --nul --null - - Make BSD formats use non-standard BSD time format, at least when it - doesn't violate the "no whitespace" rule. ---- procps-2.0.6.orig/free.1 -+++ procps-2.0.6/free.1 -@@ -41,5 +41,5 @@ - .SH AUTHORS - Written by Brian Edmonds. - --Send bug reports to <procps-bugs@redhat.com> -+Send bug reports to <acahalan@cs.uml.edu> - ---- procps-2.0.6.orig/free.c -+++ procps-2.0.6/free.c -@@ -17,13 +17,9 @@ - static int total = 0; - - int main(int argc, char *argv[]){ -- char buf1[80], buf2[80]; -- char *titles[6], name[32]; -- int i, n = 0, col[6] = {0}, rtime = 0, old_fmt = 0, first_line; -- int old_meminfo = 0; -- unsigned **mem; -- -- static int sum[6]; /* statics get initialized to zero */ -+ int i; -+ int old_fmt = 0; -+ int rtime = 0; - - /* check startup flags */ - while( (i = getopt(argc, argv, "bkmos:tV") ) != -1 ) ---- procps-2.0.6.orig/procps.lsm -+++ procps-2.0.6/procps.lsm -@@ -1,16 +1,16 @@ - Begin3 - Title: procps --Version: 2.0.6 --Entered-date: 02NOV99 -+Version: 000110 -+Entered-date: 10JAN00 - Description: Procps is a library which parses the textual /proc filesystem - and a suite of utilites which use the library. - Keywords: procps /proc libproc - ps uptime tload free w top vmstat watch skill snice kill - Author: Michael K. Johnson, Charles Blake, Albert Cahalan, many others. --Maintained-by: Michael K. Johnson <procps-bugs@redhat.com> --Primary-site: tsx-11.mit.edu /pub/linux/sources/usr.bin/ -- 185kB procps-2.0.6.tar.gz --Alternate-site: sunsite.unc.edu /pub/Linux/system/Status/ps -- 185kB procps-2.0.6.tar.gz -+Maintained-by: various <acahalan@cs.uml.edu> -+Primary-site: http://www.cs.uml.edu/~acahalan/linux/ -+ 185kB procps-000110.tar.gz -+Alternate-site: http://www.debian.org/Packages/unstable/base/procps.html -+ 185kB procps-000110.tar.gz - Copying-policy: mixed - End ---- procps-2.0.6.orig/ps/display.c -+++ procps-2.0.6/ps/display.c -@@ -41,7 +41,7 @@ - fprintf(stderr, - "\n\n" - "Signal %d caught by ps (%s).\n" -- "Please send bug reports to <procps-bugs@redhat.com>\n", -+ "Please send bug reports to <acahalan@cs.uml.edu>\n", - signo, - procps_version - ); -@@ -201,6 +201,10 @@ - proc_t buf; - PROCTAB* ptp; - ptp = openproc(PROC_FILLBUG); -+ if(!ptp) { -+ fprintf(stderr, "Error: can not access /proc.\n"); -+ exit(1); -+ } - memset(&buf, '#', sizeof(proc_t)); - /* use "ps_" prefix to catch library mismatch */ - while(ps_readproc(ptp,&buf)){ -@@ -269,6 +273,7 @@ - - /***** show tree */ - /* this needs some optimization work */ -+#define ADOPTED(x) 1 - static void show_tree(const int self, const int n, const int level, const int have_sibling){ - int i = 0; - if(level){ -@@ -293,11 +298,18 @@ - forest_prefix[level] = '\0'; - } - for(;;){ -+ int self_pid; - int more_children = 1; - if(i >= n) break; /* over the edge */ -- if(i+1 >= n) more_children = 0; -- else if(processes[i+1]->ppid != processes[self]->pid) more_children = 0; -- show_tree(i++, n, level+1, more_children); -+ self_pid=processes[self]->pid; -+ if(i+1 >= n) -+ more_children = 0; -+ else -+ if(processes[i+1]->ppid != self_pid) more_children = 0; -+ if(self_pid==1 && ADOPTED(processes[i]) && forest_type!='u') -+ show_tree(i++, n, level, more_children); -+ else -+ show_tree(i++, n, level+1, more_children); - if(!more_children) break; - } - /* chop prefix that children added -- do we need this? */ -@@ -325,6 +337,10 @@ - PROCTAB* ptp; - int n = 0; /* number of processes & index into array */ - ptp = openproc(PROC_FILLBUG); -+ if(!ptp) { -+ fprintf(stderr, "Error: can not access /proc.\n"); -+ exit(1); -+ } - while((retbuf = ps_readproc(ptp,NULL))){ - fill_pcpu(retbuf); - if(want_this_proc(retbuf)) processes[n++] = retbuf; -@@ -341,15 +357,6 @@ - - /***** no comment */ - int main(int argc, char *argv[]){ -- if(getuid()!=geteuid()){ -- fprintf(stderr, "This /bin/ps is not secure for setuid operation."); -- exit(1); -- } -- if(getgid()!=getegid()){ -- fprintf(stderr, "This /bin/ps is not secure for setgid operation."); -- exit(1); -- } -- - #ifdef DEBUG - init_stack_trace(argv[0]); - #else ---- procps-2.0.6.orig/ps/parser.c -+++ procps-2.0.6/ps/parser.c -@@ -87,19 +87,16 @@ - static const char *parse_uid(char *str, sel_union *ret){ - struct passwd *passwd_data; - char *endp; -- int num; -+ unsigned long num; - static const char *uidrange = "User ID out of range."; - static const char *uidexist = "User name does not exist."; -- num = strtol(str, &endp, 0); -+ num = strtoul(str, &endp, 0); - if(*endp != '\0'){ /* hmmm, try as login name */ - passwd_data = getpwnam(str); - if(!passwd_data) return uidexist; - num = passwd_data->pw_uid; - } -- if(num>65534) return uidrange; /* 65535 is very bad */ -- if(num<-32768) return uidrange; -- if(num==-1) return uidrange; /* -1 is very bad */ -- num &= 0xffff; -+ if(num > 0xfffffffeUL) return uidrange; - ret->uid = num; - return 0; - } -@@ -107,19 +104,16 @@ - static const char *parse_gid(char *str, sel_union *ret){ - struct group *group_data; - char *endp; -- int num; -+ unsigned long num; - static const char *gidrange = "Group ID out of range."; - static const char *gidexist = "Group name does not exist."; -- num = strtol(str, &endp, 0); -+ num = strtoul(str, &endp, 0); - if(*endp != '\0'){ /* hmmm, try as login name */ - group_data = getgrnam(str); - if(!group_data) return gidexist; - num = group_data->gr_gid; - } -- if(num>65534) return gidrange; /* 65535 is very bad */ -- if(num<-32768) return gidrange; -- if(num==-1) return gidrange; /* -1 is very bad */ -- num &= 0xffff; -+ if(num > 0xfffffffeUL) return gidrange; - ret->gid = num; - return 0; - } -@@ -255,14 +249,14 @@ - forest_type = 'u'; - break; - case 'L': /* */ -- /* "fucking Sun blows me"... Sun uses this for threads, -- * adding the feature after both IBM & Digital used -m. -- * Maybe this will be supported eventually, after I calm -- * down about Sun's lack of conformity. Hmmm, SCO added it. -+ /* In spite of the insane 2-level thread system, Sun appears to -+ * have made this option Linux-compatible. If a process has N -+ * threads, ps will produce N lines of output. (not N+1 lines) -+ * Zombies are the only exception, with NLWP==0 and 1 output line. -+ * SCO UnixWare uses -L too. - */ - trace("-L Print LWP (thread) info.\n"); - format_modifiers |= FM_L; -- return "Use -m to print threads, not Sun's nonstandard -L."; - break; - case 'M': /* someday, maybe, we will have MAC like SGI's Irix */ - trace("-M Print security label for Mandatory Access Control.\n"); -@@ -279,23 +273,25 @@ - if(!arg) return "Format or sort specification must follow -O."; - defer_sf_option(arg, SF_U_O); - return NULL; /* can't have any more options */ --#ifdef WE_UNDERSTAND_THIS -- case 'P': /* unknown HP/UX or SunOS 5 feature */ -+ case 'P': /* SunOS 5 "psr" or unknown HP/UX feature */ - trace("-P adds columns of PRM info (HP) or PSR column (Sun)\n"); - format_modifiers |= FM_P; -- return "No HP PRM support. No Sun PSR info either."; - break; -+#ifdef WE_UNDERSTAND_THIS - case 'R': /* unknown HP/UX feature */ - trace("-R selects PRM groups\n"); - return "Don't understand PRM on Linux."; - break; -- case 'T': /* unknown IRIX feature */ -- /* IRIX 6.5 docs suggest POSIX threads get shown individually. */ -- /* This would make -T be like -L, -m, and m. (but an extra column) */ -+#endif -+ case 'T': -+ /* IRIX 6.5 docs suggest POSIX threads get shown individually. -+ * This would make -T be like -L, -m, and m. (but an extra column) -+ * Testing (w/ normal processes) shows 1 line/process, not 2. -+ * Also, testing shows PID==SPID for all normal processes. -+ */ - trace("-T adds strange SPID column (old sproc() threads?)\n"); -- return "Please tell the author what -T is for."; -+ format_modifiers |= FM_T; - break; --#endif - case 'U': /* end */ - trace("-U select by RUID (supports names).\n"); - arg=get_opt_arg(); -@@ -362,12 +358,13 @@ - break; - case 'm': - trace("-m shows threads.\n"); -- return "Thread display not implemented."; -+ /* note that AIX shows 2 lines for a normal process */ -+ /* not implemented -- silently ignore the option */ - break; - case 'n': /* end */ - trace("-n sets namelist file.\n"); - arg=get_opt_arg(); -- if(!arg) return "System.map or psdatabase must follow -n."; -+ if(!arg) return "Alternate System.map file must follow -n."; - namelist_file = arg; - return NULL; /* can't have any more options */ - case 'o': /* end */ -@@ -415,7 +412,7 @@ - case 'u': /* end */ - trace("-u select by user ID (the EUID?) (supports names).\n"); - arg=get_opt_arg(); -- if(!arg) return "List of users must follow -p."; -+ if(!arg) return "List of users must follow -u."; - err=parse_list(arg, parse_uid); - if(err) return err; - selection_list->typecode = SEL_EUID; -@@ -470,6 +467,13 @@ - - while(*++flagptr){ - switch(*flagptr){ -+ case '0' ... '9': /* end */ -+ trace("0..9 Old BSD-style select by process ID\n"); -+ arg=flagptr; -+ err=parse_list(arg, parse_pid); -+ if(err) return err; -+ selection_list->typecode = SEL_PID; -+ return NULL; /* can't have any more options */ - #if 0 - case 'A': - /* maybe this just does a larger malloc() ? */ -@@ -496,7 +500,7 @@ - case 'N': /* end */ - trace("N Specify namelist file\n"); - arg=get_opt_arg(); -- if(!arg) return "System.map or psdatabase must follow N."; -+ if(!arg) return "Alternate System.map file must follow N."; - namelist_file = arg; - return NULL; /* can't have any more options */ - case 'O': /* end */ -@@ -595,7 +599,7 @@ - defer_sf_option("pmem", SF_B_m); - break; - } -- return "Thread support not implemented."; -+ /* not implemented -- silently ignore the option */ - break; - case 'n': - trace("n Numeric output for WCHAN, and USER replaced by UID\n"); -@@ -606,7 +610,7 @@ - case 'o': /* end */ - trace("o Specify user-defined format\n"); - arg=get_opt_arg(); -- if(!arg) return "Format specification must follow -o."; -+ if(!arg) return "Format specification must follow o."; - defer_sf_option(arg, SF_B_o); - return NULL; /* can't have any more options */ - case 'p': /* end */ ---- procps-2.0.6.orig/ps/output.c -+++ procps-2.0.6/ps/output.c -@@ -274,7 +274,6 @@ - if(!*p) return 0; - /* Arrrgh! somebody defined unix as 1 */ - if(forest_type == 'u') goto unixy; -- p++; /* don't show everything as init's child */ - while(*p){ - switch(*p){ - case ' ': strcpy(q, " "); break; -@@ -726,19 +725,36 @@ - return sprintf(outbuf, "%5ld", pp->rss_rlim >> 10); - } - -+/* should print leading tilde ('~') if process is bound to the CPU */ -+static int pr_psr(void){ -+ return sprintf(outbuf, "%d", pp->processor); -+} -+ -+static int pr_wname(void){ -+/* SGI's IRIX always uses a number for "wchan", so "wname" is provided too. -+ * -+ * We use '-' for running processes, the location when there is -+ * only one thread waiting in the kernel, and '*' when there is -+ * more than one thread waiting in the kernel. -+ */ -+ if(!(pp->wchan & 0xffffff)) return sprintf(outbuf, "%s", "-"); -+ return sprintf(outbuf, "%s", wchan(pp->wchan)); -+} -+ - static int pr_nwchan(void){ - if(!(pp->wchan & 0xffffff)) return sprintf(outbuf, "-"); - return sprintf(outbuf, "%lx", pp->wchan & 0xffffff); - } - - static int pr_rss(void){ -- return sprintf(outbuf, "%lu", pp->rss << (page_shift - 10)); -+ return sprintf(outbuf, "%lu", pp->vm_rss); - } - --/* On 32-bit hardware, this handles at least 8 GB. Use 1000ULL for more. */ -+/* pp->vm_rss * 1000 would overflow on 32-bit systems with 64 GB memory */ - static int pr_pmem(void){ - unsigned long pmem = 0; -- pmem = pp->rss * 1000 / (kb_main_total >> (page_shift-10)); -+ pmem = pp->vm_rss * 1000ULL / kb_main_total; -+ if (pmem > 999) pmem = 999; - return sprintf(outbuf, "%2u.%u", (unsigned)(pmem/10), (unsigned)(pmem%10)); - } - -@@ -875,6 +891,13 @@ - } - - -+static int pr_thread(void){ /* TID tid LWP lwp SPID spid */ -+ return sprintf(outbuf, "%u", pp->pid); /* for now... FIXME */ -+} -+static int pr_nlwp(void){ /* THCNT thcount NLWP nlwp */ -+ return sprintf(outbuf, "-"); /* for now... FIXME */ -+} -+ - static int pr_sess(void){ - return sprintf(outbuf, "%u", pp->session); - } -@@ -885,7 +908,7 @@ - - /* SGI uses "cpu" to print the processor ID with header "P" */ - static int pr_sgi_p(void){ /* FIXME */ -- if(pp->state == 'R') return sprintf(outbuf, "%d", 0); -+ if(pp->state == 'R') return sprintf(outbuf, "%d", pp->processor); - return sprintf(outbuf, "*"); - } - -@@ -1007,6 +1030,7 @@ - {"lstart", "STARTED", pr_lstart, sr_nop, 24, 0, XXX, RIGHT}, - {"luid", "LUID", pr_nop, sr_nop, 5, 0, LNX, RIGHT}, /* login ID */ - {"luser", "LUSER", pr_nop, sr_nop, 8, 0, LNX, USER}, /* login USER */ -+{"lwp", "LWP", pr_thread, sr_nop, 5, 0, SUN, RIGHT}, - {"m_drs", "DRS", pr_drs, sr_drs, 5, 0, LNx, RIGHT}, - {"m_dt", "DT", pr_nop, sr_dt, 4, 0, LNx, RIGHT}, - {"m_lrs", "LRS", pr_nop, sr_lrs, 5, 0, LNx, RIGHT}, -@@ -1024,6 +1048,7 @@ - {"ni", "NI", pr_nice, sr_nice, 3, 0, BSD, RIGHT}, /*nice*/ - {"nice", "NI", pr_nice, sr_nice, 3, 0, U98, RIGHT}, /*ni*/ - {"nivcsw", "IVCSW", pr_nop, sr_nop, 5, 0, XXX, RIGHT}, -+{"nlwp", "NLWP", pr_nlwp, sr_nop, 4, 0, SUN, RIGHT}, - {"nsignals", "NSIGS", pr_nop, sr_nop, 5, 0, DEC, RIGHT}, /*nsigs*/ - {"nsigs", "NSIGS", pr_nop, sr_nop, 5, 0, BSD, RIGHT}, /*nsignals*/ - {"nswap", "NSWAP", pr_nop, sr_nswap, 5, 0, XXX, RIGHT}, -@@ -1050,10 +1075,10 @@ - {"prmgrp", "-", pr_nop, sr_nop, 1, 0, HPU, RIGHT}, - {"prmid", "-", pr_nop, sr_nop, 1, 0, HPU, RIGHT}, - {"pset", "PSET", pr_nop, sr_nop, 4, 0, DEC, RIGHT}, --{"psr", "PSR", pr_nop, sr_nop, 3, 0, DEC, RIGHT}, -+{"psr", "PSR", pr_psr, sr_nop, 3, 0, DEC, RIGHT}, - {"psxpri", "PPR", pr_nop, sr_nop, 3, 0, DEC, RIGHT}, - {"re", "RE", pr_nop, sr_nop, 3, 0, BSD, RIGHT}, --{"resident", "-", pr_nop, sr_resident, 5, 0, LNX, RIGHT}, -+{"resident", "RES", pr_nop, sr_resident, 5, 0, LNX, RIGHT}, - {"rgid", "RGID", pr_rgid, sr_rgid, 5, 0, XXX, RIGHT}, - {"rgroup", "RGROUP", pr_rgroup, sr_rgroup, 6, 0, U98, USER}, /* was 8 wide */ - {"rlink", "RLINK", pr_nop, sr_nop, 8, 0, BSD, RIGHT}, -@@ -1085,6 +1110,7 @@ - {"sigmask", "BLOCKED", pr_sigmask, sr_nop, 9, 0, XXX, SIGNAL}, /*blocked*/ - {"size", "-", pr_nop, sr_size, 1, 0, SCO, RIGHT}, - {"sl", "SL", pr_nop, sr_nop, 3, 0, XXX, RIGHT}, -+{"spid", "SPID", pr_thread, sr_nop, 5, 0, SGI, RIGHT}, - {"stackp", "STACKP", pr_stackp, sr_nop, 8, 0, LNX, RIGHT}, /*start_stack*/ - {"start", "STARTED", pr_start, sr_nop, 8, 0, XXX, RIGHT}, - {"start_code", "S_CODE", pr_nop, sr_start_code, 8, 0, LNx, RIGHT}, -@@ -1103,8 +1129,8 @@ - {"systime", "SYSTEM", pr_nop, sr_nop, 6, 0, DEC, RIGHT}, - {"sz", "SZ", pr_sz, sr_nop, 5, 0, HPU, RIGHT}, - {"tdev", "TDEV", pr_nop, sr_nop, 4, 0, XXX, RIGHT}, --{"thcount", "THCNT", pr_nop, sr_nop, 1, 0, AIX, RIGHT}, --{"tid", "TID", pr_nop, sr_nop, 1, 0, AIX, RIGHT}, -+{"thcount", "THCNT", pr_nlwp, sr_nop, 5, 0, AIX, RIGHT}, -+{"tid", "TID", pr_thread, sr_nop, 5, 0, AIX, RIGHT}, - {"time", "TIME", pr_time, sr_nop, 8, 0, U98, CUMUL|RIGHT}, /*cputime*/ /* was 6 wide */ - {"timeout", "TMOUT", pr_timeout, sr_timeout, 5, 0, LNX, RIGHT}, - {"tmout", "TMOUT", pr_timeout, sr_timeout, 5, 0, LNX, RIGHT}, -@@ -1140,6 +1166,7 @@ - {"vsize", "VSZ", pr_vsz, sr_vsize, 5, 0, DEC, RIGHT}, /*vsz*/ - {"vsz", "VSZ", pr_vsz, sr_vm_size, 5, 0, U98, RIGHT}, /*vsize*/ - {"wchan", "WCHAN", pr_wchan, sr_wchan, 6, 0, XXX, WCHAN}, /* BSD n forces this to nwchan */ /* was 10 wide */ -+{"wname", "WCHAN", pr_wname, sr_nop, 6, 0, SGI, WCHAN}, /* opposite of nwchan */ - {"xstat", "XSTAT", pr_nop, sr_nop, 5, 0, BSD, RIGHT}, - {"~", "-", pr_nop, sr_nop, 1, 0, LNX, RIGHT} /* NULL would ruin alphabetical order */ - }; ---- procps-2.0.6.orig/ps/sortformat.c -+++ procps-2.0.6/ps/sortformat.c -@@ -684,6 +684,7 @@ - PUSH("pgid"); - } - if(format_flags & (FF_Uf|FF_Ul)) PUSH("ppid"); -+ if(format_modifiers & FM_T) PUSH("spid"); - PUSH("pid"); - if(format_flags & FF_Uf){ - if(personality & PER_SANE_USER) PUSH("user"); ---- procps-2.0.6.orig/ps/common.h -+++ procps-2.0.6/ps/common.h -@@ -112,6 +112,7 @@ - #define FM_L 0x0008 /* -L */ - #define FM_P 0x0010 /* -P */ - #define FM_M 0x0020 /* -M */ -+#define FM_T 0x0040 /* -T */ - - /* sorting & formatting */ - /* U,B,G is Unix,BSD,Gnu and then there is the option itself */ ---- procps-2.0.6.orig/ps/Makefile -+++ procps-2.0.6/ps/Makefile -@@ -19,7 +19,7 @@ - AOUT_CAPABLE = #-DAOUT_CAPABLE - ELF_CAPABLE = #-DELF_CAPABLE - LIBBFD = -lbfd -liberty --MAN1DIR = /usr/man/man1 -+MAN1DIR = /usr/share/man/man1 - - all: ps - -@@ -52,7 +52,7 @@ - install: ps - -install --owner 0 --group 0 --mode a=rx --strip ps ${DESTDIR}/bin/ps - -install --owner 0 --group 0 --mode a=r ps.1 ${DESTDIR}$(MAN1DIR)/ps.1 -- rm -f ${DESTDIR}/var/catman/cat1/ps.1.gz ${DESTDIR}/var/man/cat1/ps.1.gz -+ #rm -f ${DESTDIR}/var/catman/cat1/ps.1.gz ${DESTDIR}/var/man/cat1/ps.1.gz - - clean: - rm -f *.o DEADJOE *~ core ps gmon.out ---- procps-2.0.6.orig/ps/ps.1 -+++ procps-2.0.6/ps/ps.1 -@@ -1,217 +1,221 @@ -+'\" t - .\" Man page for ps. --.\" Quick hack conversion by Albert Cahalan, 1998. --.\" Licensed under version 2 of the Gnu General Public License. -+.\" Licensed under version 2 of the GNU General Public License. - .\" --.\" This man page is a horrid hack because *roff sucks. --.\" The whole system is way obsolete. The internal header --.\" stuff must die, and will when I figure out how to kill it. --.\" I've already killed the wasteful left margin and screwy --.\" old perfect justification. Gross! You'd think someone --.\" invented this crap in 1973. Oh yeah, they did. Sorry. - .\" - .TH PS 1 "July 5, 1998" "Linux" "Linux User's Manual" --.SH \fRNAME\fR --ps \- report process status --.ad r --.na --.ss 12 0 --.in 0 --.nh --.nf -+.SH NAME -+\fBps\fR \- report process status - --SYNOPSIS --ps [options] -+.SH SYNOPSIS -+\fBps\fR [\fIoptions\fR] - - --DESCRIPTION --ps gives a snapshot of the current processes. If you want --a repetitive update of this status, use top. This man --page documents the /proc-based version of ps, or tries to. -+.SH DESCRIPTION -+\fBps\fR gives a snapshot of the current processes. If you want -+a repetitive update of this status, use \fBtop\fR. This man -+page documents the /proc-based version of \fBps\fR, or tries to. - - --COMMAND-LINE OPTIONS -+.SH OPTIONS - --This version of ps accepts several kinds of options. -+This version of \fBps\fR accepts several kinds of options. - - Unix options may be grouped and must be preceeded by a dash. - BSD options may be grouped and must not be used with a dash. --Gnu long options are preceeded by two dashes. -+GNU long options are preceeded by two dashes. - - Options of different types may be freely mixed. - --Set the I_WANT_A_BROKEN_PS environment variable to force BSD syntax even --when options are preceeded by a dash. The PS_PERSONALITY environment -+Set the \fBI_WANT_A_BROKEN_PS\fR environment variable to force BSD syntax even -+when options are preceeded by a dash. The \fBPS_PERSONALITY\fR environment - variable (described below) provides more detailed control of ps behavior. - - SIMPLE PROCESS SELECTION ---A selects all processes ---N negate selection ---a select all with a tty except session leaders ---d select all, but omit session leaders ---e selects all processes --T Select all processes on this terminal --a Select all processes on a terminal, including those of other users --g really all, even group leaders (does nothing w/o SunOS settings) --r restrict output to running processes --x Select processes without controlling ttys ----deselect negate selection -+.TS -+lfB l. -+-A selects all processes -+-N negate selection -+-a select all with a tty except session leaders -+-d select all, but omit session leaders -+-e selects all processes -+T Select all processes on this terminal -+a Select all processes on a terminal, including those of other users -+g really all, even group leaders (does nothing w/o SunOS settings) -+r restrict output to running processes -+x Select processes without controlling ttys -+--deselect negate selection -+.TE - - PROCESS SELECTION BY LIST ---C Select by command name ---G select by RGID (supports names) ---U select by RUID (supports names) ---g select by session leader OR by group name ---p select by PID ---s Select processes belonging to the sessions given ---t select by tty ---u select by effective user ID (supports names) --U Select processes for specified users --p Select by process ID --t Select by tty ----Group select by real group name or ID ----User select by real user name or ID ----group select by effective group name or ID ----pid select by process ID ----sid select by session ID ----tty select by terminal ----user select by effective user name or ID ---123 implied --sid --123 implied --pid -+.TS -+lfB l. -+-C Select by command name -+-G select by RGID (supports names) -+-U select by RUID (supports names) -+-g select by session leader OR by group name -+-p select by PID -+-s Select processes belonging to the sessions given -+-t select by tty -+-u select by effective user ID (supports names) -+U Select processes for specified users -+p Select by process ID -+t Select by tty -+--Group select by real group name or ID -+--User select by real user name or ID -+--group select by effective group name or ID -+--pid select by process ID -+--sid select by session ID -+--tty select by terminal -+--user select by effective user name or ID -+-123 implied --sid -+123 implied --pid -+.TE - - OUTPUT FORMAT CONTROL ---O is preloaded "-o" ---c different scheduler info for -l option ---f does full listing ---j jobs format ---l long format ---o user-defined format ---y do not show flags; show rss in place of addr --O is preloaded "o" (overloaded) --X Old Linux i386 register format --j job control format --l Display long format --o Specify user-defined format --s Display signal format --u Display user-oriented format --v Display virtual memory format ----format user-defined format -+.TS -+lfB l. -+-O is preloaded "-o" -+-c different scheduler info for -l option -+-f does full listing -+-j jobs format -+-l long format -+-o user-defined format -+-y do not show flags; show rss in place of addr -+O is preloaded "o" (overloaded) -+X Old Linux i386 register format -+j job control format -+l Display long format -+o Specify user-defined format -+s Display signal format -+u Display user-oriented format -+v Display virtual memory format -+--format user-defined format -+.TE - - OUTPUT MODIFIERS ---H show process heirarchy (forest) ---m shows threads ---n sets namelist file ---w wide output --C Use raw CPU time for %CPU instead of decaying average --N Specify namelist file --O Sorting order (overloaded) --S include some dead child process data (as a sum with the parent) --c true command name --e show environment after the command --f ASCII-art process heirarchy (forest) --h no header (or, one header per screen in the BSD personality) --m all threads --n Numeric output for WCHAN and USER --w wide output ----cols set screen width ----columns set screen width ----cumulative include some dead child process data (as a sum with the parent) ----forest ASCII art process tree ----html HTML escaped output ----headers repeat header lines, one per page of output ----no-headers print no header line at all ----lines set screen height ----nul unjustified output with NULs ----null unjustified output with NULs ----rows set screen height ----sort specify sorting order ----width set screen width ----zero unjustified output with NULs -+.TS -+lfB l. -+-H show process hierarchy (forest) -+-m shows threads -+-n, N sets namelist file -+-w, w wide output -+C Use raw CPU time for %CPU instead of decaying average -+O Sorting order (overloaded) -+S, -+--cumulative include some dead child process data (as a sum with the parent) -+c true command name -+e show environment after the command -+f, --forest ASCII-art process hierarchy (forest) -+h no header (or, one header per screen in the BSD personality) -+m all threads -+n Numeric output for WCHAN and USER -+--cols, -+--columns, -+--width set screen width -+--html HTML escaped output -+--headers repeat header lines, one per page of output -+--no-headers print no header line at all -+--lines, -+--rows set screen height -+--nul, --null, -+--zero unjustified output with NULs -+--sort specify sorting order -+.TE - - INFORMATION ---V prints version --L List all format specifiers --V show version info ----help print help message ----info print debugging info ----version prints version -+.TS -+lfB l. -+-V, V, -+--version prints version -+L List all format specifiers -+--help print help message -+--info print debugging info -+.TE - - OBSOLETE --A Increases the argument space (DecUnix) --M use alternate core (try -n or N instead) --W get swap info from ... not /dev/drum (try -n or N instead) --k use /vmcore as c-dumpfile (try -n or N instead) -+.TS -+lfB l. -+A Increases the argument space (DecUnix) -+M use alternate core (try -n or N instead) -+W get swap info from ... not /dev/drum (try -n or N instead) -+k use /vmcore as c-dumpfile (try -n or N instead) -+.TE - - -+.SH NOTES - --NOTES -- --The "-g" option can select by session leader OR by group name. -+The \fB-g\fR option can select by session leader OR by group name. - Selection by session leader is specified by many standards, - but selection by group is the logical behavior that several other - operating systems use. This ps will select by session leader when - the list is completely numeric (as sessions are). Group ID numbers - will work only when some group names are also specified. - --The "m" option should not be used. Use "-m" or "-o" with a list. --("m" displays memory info, shows threads, or sorts by memory use) -+The \fBm\fR option should not be used. Use \fB-m\fR or \fB-o\fR with a list. -+(\fBm\fR displays memory info, shows threads, or sorts by memory use) - --The "h" option is problematic. Standard BSD ps uses the option to --print a header on each page of output, but older Linux ps uses the option -+The \fBh\fR option is problematic. Standard BSD \fBps\fR uses the option to -+print a header on each page of output, but older Linux \fBps\fR uses the option - to totally disable the header. This version of ps follows the Linux - usage of not printing the header unless the BSD personality has been - selected, in which case it prints a header on each page of output. - Regardless of the current personality, you can use the long options ----headers and --no-headers to enable printing headers each page and -+\fB--headers\fR and \fB--no-headers\fR to enable printing headers each page and - disable headers entirely, respectively. - - Terminals (ttys, or screens for text output) can be specified in several --forms: /dev/ttyS1, ttyS1, S1. Obsolete "ps t" (your own terminal) and --"ps t?" (processes without a terminal) syntax is supported, but modern --options ("T", "-t" with list, "x", "t" with list) should be used instead. -+forms: \fI/dev/ttyS1\fR, \fIttyS1\fR, \fIS1\fR. Obsolete \fBps t\fR (your own terminal) and -+\fBps t?\fR (processes without a terminal) syntax is supported, but modern -+options (\fBT\fR, \fB-t\fR with list, \fBx\fR, \fBt\fR with list) should be used instead. - --The BSD "O" option can act like "-O" (user-defined output format with -+The BSD \fBO\fR option can act like \fB-O\fR (user-defined output format with - some common fields predefined) or can be used to specify sort order. - Heuristics are used to determine the behavior of this option. To ensure - that the desired behavior is obtained, specify the other option (sorting - or formatting) in some other way. - --For sorting, BSD "O" option syntax is O[+|-]k1[,[+|-]k2[,...]] -+For sorting, BSD \fBO\fR option syntax is \fBO\fR[+|-]\fIk1\fR[,[+|-]\fIk2\fR[,...]] - Order the process listing according to the multilevel sort specified by --the sequence of short keys from SORT KEYS, k1, k2, ... The `+' is quite -+the sequence of short keys from SORT KEYS, \fIk1\fR, \fIk2\fR, ... The `+' is quite - optional, merely re-iterating the default direction on a key. `-' reverses --direction only on the key it precedes. The O option must be the last option -+direction only on the key it precedes. The \fBO\fR option must be the last option - in a single command argument, but specifications in successive arguments are - catenated. - --Gnu sorting syntax is --sortX[+|-]key[,[+|-]key[,...]] -+GNU sorting syntax is \fB--sort\fIX\fR[+|-]\fIkey\fR[,[+|-]\fIkey\fR[,...]] - Choose a multi-letter key from the SORT KEYS section. X may be any - convenient separator character. To be GNU-ish use `='. The `+' is really - optional since default direction is increasing numerical or lexicographic --order. For example, ps jax --sort=uid,-ppid,+pid -+order. For example, \fBps\fR \fIjax\fR \fB--sort\fR=\fIuid\fR,-\fIppid\fR,+\fIpid\fR - --This ps works by reading the virtual files in /proc. This ps does not --need to be suid kmem or have any privileges to run. Do not give this ps -+This \fBps\fR works by reading the virtual files in /proc. This \fBps\fR does not -+need to be suid kmem or have any privileges to run. Do not give this \fBps\fR - any special permissions. - --This ps needs access to a namelist file for proper WCHAN display. -+This \fBps\fR needs access to a namelist file for proper WCHAN display. - The namelist file must match the current Linux kernel exactly for - correct output. - - To produce the WCHAN field, ps needs to read the System.map file created - when the kernel is compiled. The search path is: - --$PS_SYSTEM_MAP --/boot/System.map-`uname -r` --/boot/System.map --/lib/modules/`uname -r`/System.map --/usr/src/linux/System.map -+.B $PS_SYSTEM_MAP -+.br -+.I /boot/System.map-`uname -r` -+.br -+.I /boot/System.map -+.br -+.I /lib/modules/`uname -r`/System.map -+.br -+.I /usr/src/linux/System.map - - The member used_math of task_struct is not shown, since crt0.s checks - to see if math is present. This causes the math flag to be set for all - processes, and so it is worthless. (Somebody fix libc or the kernel please) - - Programs swapped out to disk will be shown without command line arguments, --and unless the c option is given, in brackets. -+and unless the \fBc\fR option is given, in brackets. - - %CPU shows the cputime/realtime percentage. It will not add up to 100% - unless you are lucky. It is time used divided by the time the process has -@@ -227,289 +231,309 @@ - - - PROCESS FLAGS -- --ALIGNWARN 001 print alignment warning msgs --STARTING 002 being created --EXITING 004 getting shut down --PTRACED 010 set if ptrace (0) has been called --TRACESYS 020 tracing system calls --FORKNOEXEC 040 forked but didn't exec --SUPERPRIV 100 used super-user privileges --DUMPCORE 200 dumped core --SIGNALED 400 killed by a signal -+.TS -+l l l. -+ALIGNWARN 001 print alignment warning msgs -+STARTING 002 being created -+EXITING 004 getting shut down -+PTRACED 010 set if ptrace (0) has been called -+TRACESYS 020 tracing system calls -+FORKNOEXEC 040 forked but didn't exec -+SUPERPRIV 100 used super-user privileges -+DUMPCORE 200 dumped core -+SIGNALED 400 killed by a signal -+.TE - - - PROCESS STATE CODES -- --D uninterruptible sleep (usually IO) --R runnable (on run queue) --S sleeping --T traced or stopped --Z a defunct ("zombie") process -+.TS -+l l. -+D uninterruptible sleep (usually IO) -+R runnable (on run queue) -+S sleeping -+T traced or stopped -+Z a defunct ("zombie") process -+.TE - - For BSD formats and when the "stat" keyword is used, additional - letters may be displayed: -+.TS -+l l. -+W has no resident pages -+< high-priority process -+N low-priority task -+L has pages locked into memory (for real-time and custom IO) -+.TE - --W has no resident pages --< high-priority process --N low-priority task --L has pages locked into memory (for real-time and custom IO) -- -- --SORT KEYS -+.SH SORT KEYS - - Note that the values used in sorting are the internal values ps uses and not - the `cooked' values used in some of the output format fields. Pipe ps - output into the sort(1) command if you want to sort the cooked values. - --KEY LONG DESCRIPTION --c cmd simple name of executable --C cmdline full command line --f flags flags as in long format F field --g pgrp process group ID --G tpgid controlling tty process group ID --j cutime cumulative user time --J cstime cumulative system time --k utime user time --K stime system time --m min_flt number of minor page faults --M maj_flt number of major page faults --n cmin_flt cumulative minor page faults --N cmaj_flt cumulative major page faults --o session session ID --p pid process ID --P ppid parent process ID --r rss resident set size --R resident resident pages --s size memory size in kilobytes --S share amount of shared pages --t tty the minor device number of tty --T start_time time process was started --U uid user ID number --u user user name --v vsize total VM size in bytes --y priority kernel scheduling priority -+.TS -+l l l. -+KEY LONG DESCRIPTION -+c cmd simple name of executable -+C cmdline full command line -+f flags flags as in long format F field -+g pgrp process group ID -+G tpgid controlling tty process group ID -+j cutime cumulative user time -+J cstime cumulative system time -+k utime user time -+K stime system time -+m min_flt number of minor page faults -+M maj_flt number of major page faults -+n cmin_flt cumulative minor page faults -+N cmaj_flt cumulative major page faults -+o session session ID -+p pid process ID -+P ppid parent process ID -+r rss resident set size -+R resident resident pages -+s size memory size in kilobytes -+S share amount of shared pages -+t tty the minor device number of tty -+T start_time time process was started -+U uid user ID number -+u user user name -+v vsize total VM size in bytes -+y priority kernel scheduling priority -+.TE - -- --AIX FORMAT DESCRIPTORS -+.SH AIX FORMAT DESCRIPTORS - - This ps supports AIX format descriptors, which work somewhat like the --formatting codes of printf(1) and printf(3). For example, the normal --default output can be produced with this: ps -eo "%p %y %x %c" -- --CODE NORMAL HEADER --%C pcpu %CPU --%G group GROUP --%P ppid PPID --%U user USER --%a args COMMAND --%c comm COMMAND --%g rgroup RGROUP --%n nice NI --%p pid PID --%r pgid PGID --%t etime ELAPSED --%u ruser RUSER --%x time TIME --%y tty TTY --%z vsz VSZ -+formatting codes of \fBprintf\fR(1) and \fBprintf\fR(3). For example, the normal -+default output can be produced with this: \fBps\fR \fB-eo\fR "%p %y %x %c" - -+.TS -+l l l. -+CODE NORMAL HEADER -+%C pcpu %CPU -+%G group GROUP -+%P ppid PPID -+%U user USER -+%a args COMMAND -+%c comm COMMAND -+%g rgroup RGROUP -+%n nice NI -+%p pid PID -+%r pgid PGID -+%t etime ELAPSED -+%u ruser RUSER -+%x time TIME -+%y tty TTY -+%z vsz VSZ -+.TE - --STANDARD FORMAT SPECIFIERS -+.SH STANDARD FORMAT SPECIFIERS - - These may be used to control both output format and sorting. - For example: ps -eo pid,user,args --sort user - --CODE HEADER --%cpu %CPU --%mem %MEM --alarm ALARM --args COMMAND --blocked BLOCKED --bsdstart START --bsdtime TIME --c C --caught CAUGHT --cmd CMD --comm COMMAND --command COMMAND --cputime TIME --drs DRS --dsiz DSIZ --egid EGID --egroup EGROUP --eip EIP --esp ESP --etime ELAPSED --euid EUID --euser EUSER --f F --fgid FGID --fgroup FGROUP --flag F --flags F --fname COMMAND --fsgid FSGID --fsgroup FSGROUP --fsuid FSUID --fsuser FSUSER --fuid FUID --fuser FUSER --gid GID --group GROUP --ignored IGNORED --intpri PRI --lim LIM --longtname TTY --lstart STARTED --m_drs DRS --m_trs TRS --maj_flt MAJFL --majflt MAJFLT --min_flt MINFL --minflt MINFLT --ni NI --nice NI --nwchan WCHAN --opri PRI --pagein PAGEIN --pcpu %CPU --pending PENDING --pgid PGID --pgrp PGRP --pid PID --pmem %MEM --ppid PPID --pri PRI --priority PRI --rgid RGID --rgroup RGROUP --rss RSS --rssize RSS --rsz RSZ --ruid RUID --ruser RUSER --s S --sess SESS --session SESS --sgi_p P --sgi_rss RSS --sgid SGID --sgroup SGROUP --sid SID --sig PENDING --sig_block BLOCKED --sig_catch CATCHED --sig_ignore IGNORED --sig_pend SIGNAL --sigcatch CAUGHT --sigignore IGNORED --sigmask BLOCKED --stackp STACKP --start STARTED --start_stack STACKP --start_time START --stat STAT --state S --stime STIME --suid SUID --suser SUSER --svgid SVGID --svgroup SVGROUP --svuid SVUID --svuser SVUSER --sz SZ --time TIME --timeout TMOUT --tmout TMOUT --tname TTY --tpgid TPGID --trs TRS --trss TRSS --tsiz TSIZ --tt TT --tty TT --tty4 TTY --tty8 TTY --ucmd CMD --ucomm COMMAND --uid UID --uid_hack UID --uname USER --user USER --vsize VSZ --vsz VSZ --wchan WCHAN -+.TS -+l l. -+CODE HEADER -+%cpu %CPU -+%mem %MEM -+alarm ALARM -+args COMMAND -+blocked BLOCKED -+bsdstart START -+bsdtime TIME -+c C -+caught CAUGHT -+cmd CMD -+comm COMMAND -+command COMMAND -+cputime TIME -+drs DRS -+dsiz DSIZ -+egid EGID -+egroup EGROUP -+eip EIP -+esp ESP -+etime ELAPSED -+euid EUID -+euser EUSER -+f F -+fgid FGID -+fgroup FGROUP -+flag F -+flags F -+fname COMMAND -+fsgid FSGID -+fsgroup FSGROUP -+fsuid FSUID -+fsuser FSUSER -+fuid FUID -+fuser FUSER -+gid GID -+group GROUP -+ignored IGNORED -+intpri PRI -+lim LIM -+longtname TTY -+lstart STARTED -+m_drs DRS -+m_trs TRS -+maj_flt MAJFL -+majflt MAJFLT -+min_flt MINFL -+minflt MINFLT -+ni NI -+nice NI -+nwchan WCHAN -+opri PRI -+pagein PAGEIN -+pcpu %CPU -+pending PENDING -+pgid PGID -+pgrp PGRP -+pid PID -+pmem %MEM -+ppid PPID -+pri PRI -+priority PRI -+rgid RGID -+rgroup RGROUP -+rss RSS -+rssize RSS -+rsz RSZ -+ruid RUID -+ruser RUSER -+s S -+sess SESS -+session SESS -+sgi_p P -+sgi_rss RSS -+sgid SGID -+sgroup SGROUP -+sid SID -+sig PENDING -+sig_block BLOCKED -+sig_catch CATCHED -+sig_ignore IGNORED -+sig_pend SIGNAL -+sigcatch CAUGHT -+sigignore IGNORED -+sigmask BLOCKED -+stackp STACKP -+start STARTED -+start_stack STACKP -+start_time START -+stat STAT -+state S -+stime STIME -+suid SUID -+suser SUSER -+svgid SVGID -+svgroup SVGROUP -+svuid SVUID -+svuser SVUSER -+sz SZ -+time TIME -+timeout TMOUT -+tmout TMOUT -+tname TTY -+tpgid TPGID -+trs TRS -+trss TRSS -+tsiz TSIZ -+tt TT -+tty TT -+tty4 TTY -+tty8 TTY -+ucmd CMD -+ucomm COMMAND -+uid UID -+uid_hack UID -+uname USER -+user USER -+vsize VSZ -+vsz VSZ -+wchan WCHAN -+.TE - - - -+.SH ENVIRONMENT VARIABLES - --ENVIRONMENT VARIABLES - The following environment variables could affect ps: -- COLUMNS Override default display width. -- LINES Override default display height. -- PS_PERSONALITY Set to one of posix,old,linux,bsd,sun,digital... -- CMD_ENV Set to one of posix,old,linux,bsd,sun,digital... -- I_WANT_A_BROKEN_PS Force obsolete command line interpretation. -- LC_TIME Date format. -- PS_COLORS Not currently supported. -- PS_FORMAT Default output format override. -- PS_SYSMAP Default namelist (System.map) location. -- PS_SYSTEM_MAP Default namelist (System.map) location. -- POSIXLY_CORRECT Don't find excuses to ignore bad "features". -- UNIX95 Don't find excuses to ignore bad "features". -- _XPG Cancel CMD_ENV=irix non-standard behavior. -+.TS -+lfB l. -+COLUMNS Override default display width. -+LINES Override default display height. -+PS_PERSONALITY Set to one of posix,old,linux,bsd,sun,digital... -+CMD_ENV Set to one of posix,old,linux,bsd,sun,digital... -+I_WANT_A_BROKEN_PS Force obsolete command line interpretation. -+LC_TIME Date format. -+PS_COLORS Not currently supported. -+PS_FORMAT Default output format override. -+PS_SYSMAP Default namelist (System.map) location. -+PS_SYSTEM_MAP Default namelist (System.map) location. -+POSIXLY_CORRECT Don't find excuses to ignore bad "features". -+UNIX95 Don't find excuses to ignore bad "features". -+_XPG Cancel CMD_ENV=irix non-standard behavior. -+.TE - - In general, it is a bad idea to set these variables. The one exception --is CMD_ENV or PS_PERSONALITY, which could be set to Linux for normal --systems. Without that setting, ps follows the useless and bad parts -+is \fBCMD_ENV\fR or \fBPS_PERSONALITY\fR, which could be set to Linux for normal -+systems. Without that setting, \fBps\fR follows the useless and bad parts - of the Unix98 standard. - - - PERSONALITY -- aix like AIX ps -- bsd like FreeBSD ps (totally non-standard) -- compaq like Digital Unix ps -- debian like the old Debian ps -- digital like Digital Unix ps -- gnu like the old Debian ps -- hp like HP-UX ps -- hpux like HP-UX ps -- irix like Irix ps -- linux ***** RECOMMENDED ***** -- old like the original Linux ps (totally non-standard) -- posix standard -- sco like SCO ps -- sgi like Irix ps -- sun like SunOS 4 ps (totally non-standard) -- sunos like SunOS 4 ps (totally non-standard) -- sysv standard -- unix standard -- unix95 standard -- unix98 standard -+.TS -+l l. -+aix like AIX ps -+bsd like FreeBSD ps (totally non-standard) -+compaq like Digital Unix ps -+debian like the old Debian ps -+digital like Digital Unix ps -+gnu like the old Debian ps -+hp like HP-UX ps -+hpux like HP-UX ps -+irix like Irix ps -+linux ***** RECOMMENDED ***** -+old like the original Linux ps (totally non-standard) -+posix standard -+sco like SCO ps -+sgi like Irix ps -+sun like SunOS 4 ps (totally non-standard) -+sunos like SunOS 4 ps (totally non-standard) -+sysv standard -+unix standard -+unix95 standard -+unix98 standard -+.TE - - --EXAMPLES -+.SH EXAMPLES - To see every process on the system using standard syntax: -- ps -e -+ \fBps\fR \fB-e\fR -+.br - To see every process on the system using BSD syntax: -- ps ax -+ \fBps\fR \fBax\fR -+.br - To see every process except those running as root (real & effective ID) -- ps -U root -u root -N -+ \fBps\fR \fB-U\fR \fIroot\fR \fB-u\fR \fIroot\fR \fB-N\fR -+.br - To see every process with a user-defined format: -- ps -eo pid,tt,user,fname,tmout,f,wchan -+ \fBps\fR \fB-eo\fR pid,tt,user,fname,tmout,f,wchan -+.br - Odd display with AIX field descriptors: -- ps -o "%u : %U : %p : %a" -+ \fBps\fR \fB-o\fR "%u : %U : %p : %a" -+.br - Print only the process IDs of syslogd: -- ps -C syslogd -o pid= -- --SEE ALSO --top(1) pstree(1) proc(5) -+ \fBps\fR \fB-C\fR \fIsyslogd\fR \fB-o\fR pid= - --STANDARDS --This ps conforms to version 2 of the Single Unix Specification. -+.SH CONFORMING TO -+This \fBps\fR conforms to version 2 of the Single Unix Specification. - --AUTHOR -+.SH AUTHOR - ps was originally written by Branko Lankester <lankeste@fwi.uva.nl>. Michael - K. Johnson <johnsonm@redhat.com> re-wrote it significantly to use the proc - filesystem, changing a few things in the process. Michael Shields -@@ -518,8 +542,11 @@ - device name-to-number mmaped database, the approximate binary search - directly on System.map, and many code and documentation cleanups. David - Mossberger-Tang wrote the generic BFD support for psupdate. Albert Cahalan --<acahalan@cs.uml.edu> rewrote ps for full Unix98 and BSD support, along with --some ugly hacks for obsolete and foreign syntax. Michael K. Johnson --<johnsonm@redhat.com> is the current maintainer. -+<acahalan@cs.uml.edu> rewrote \fBps\fR for full Unix98 and BSD support, along with -+some ugly hacks for obsolete and foreign syntax. -+ -+Please send bug reports to <acahalan@cs.uml.edu> or use the Debian Bug Tracking System. -+ -+.SH SEE ALSO -+\fBtop\fR(1), \fBpstree\fR(1), \fBproc\fR(5) - --Please send bug reports to <procps-bugs@redhat.com> ---- procps-2.0.6.orig/w.c -+++ procps-2.0.6/w.c -@@ -119,12 +119,12 @@ - if (hour == 0) hour = 12; - if (curt - logt > 12*60*60 && logtm->tm_yday != today) { - if (curt - logt > 6*24*60*60) -- fprintf(fout, " %2d%3s%2d", logtm->tm_mday, month[logtm->tm_mon], -+ fprintf(fout, " %02d%3s%02d", logtm->tm_mday, month[logtm->tm_mon], - logtm->tm_year % 100); - else -- fprintf(fout, " %3s%2d%s", weekday[logtm->tm_wday], hour, merid); -+ fprintf(fout, " %3s%02d%s", weekday[logtm->tm_wday], hour, merid); - } else { -- fprintf(fout, " %2d:%02d%s", hour, logtm->tm_min, merid); -+ fprintf(fout, " %02d:%02d%s", hour, logtm->tm_min, merid); - } - } - ---- procps-2.0.6.orig/tload.1 -+++ procps-2.0.6/tload.1 -@@ -47,4 +47,4 @@ - Branko Lankester, David Engel <david@ods.com>, and - Michael K. Johnson <johnsonm@redhat.com>. - --Please send bug reports to <procps-bugs@redhat.com> -+Please send bug reports to <acahalan@cs.uml.edu> ---- procps-2.0.6.orig/sysctl.c -+++ procps-2.0.6/sysctl.c -@@ -207,8 +207,7 @@ - return; - } /* endif */ - -- while (!feof(fp)) { -- fgets(oneline, 256, fp); -+ while (fgets(oneline, 256, fp)) { - oneline[256] = 0; - n++; - t = StripLeadingAndTrailingSpaces(oneline); ---- procps-2.0.6.orig/top.1 -+++ procps-2.0.6/top.1 -@@ -441,6 +441,4 @@ - The "b" and "n" options contributed by George Bonser <george@captech.com> - for CapTech IT Services. - --Michael K. Johnson <johnsonm@redhat.com> is now the maintainer. -- --Please send bug reports to <procps-bugs@redhat.com> -+Please send bug reports to <acahalan@cs.uml.edu> ---- procps-2.0.6.orig/top.c -+++ procps-2.0.6/top.c -@@ -471,6 +471,8 @@ - if (open_psdb(NULL)) CL_wchan_nout = 1; - } - -+ meminfo(); /* need kb_main_total value filled in */ -+ - setup_terminal(); - window_size(0); - /* -@@ -737,8 +739,8 @@ - - static int mem_sort (proc_t **P, proc_t **Q) - { -- if( (*P)->resident < (*Q)->resident ) return -1; -- if( (*P)->resident > (*Q)->resident ) return 1; -+ if( (*P)->vm_rss < (*Q)->vm_rss ) return -1; -+ if( (*P)->vm_rss > (*Q)->vm_rss ) return 1; - return 0; - } - -@@ -852,9 +854,9 @@ - printf("Toggle fields with a-x, any other key to return: "); - fflush(stdout); - tcsetattr(0, TCSAFLUSH, &Rawtty); -+ read(0, &c, 1); -+ tcsetattr(0, TCSAFLUSH, &Savetty); - } -- read(0, &c, 1); -- tcsetattr(0, TCSAFLUSH, &Savetty); - i = toupper(c) - 'A'; - if (i >= 0 && i < sizeof headers / sizeof headers[0]) { - row = i % (Lines - 3) + 3; -@@ -959,7 +961,7 @@ - /* - * Displays infos for a single task - */ --static void show_task_info(proc_t *task, int pmem) -+static void show_task_info(proc_t *task) - { - int i,j; - unsigned int t; -@@ -984,8 +986,12 @@ - case P_PCPU: - sprintf(tmp, "%4.1f ", (float)task->pcpu / 10); - break; -- case P_PMEM: -- sprintf(tmp, "%4.1f ", (float)pmem / 10); -+ case P_PMEM: { -+ unsigned pmem; -+ pmem = task->vm_rss * 1000ULL / kb_main_total; -+ if (pmem > 999) pmem = 999; -+ sprintf(tmp, "%2u.%u ", pmem/10U, pmem%10U); -+ } - break; - case P_TTY: { - char outbuf[9]; -@@ -1032,9 +1038,9 @@ - case P_DT: - sprintf(tmp, "%3.3s ", scale_k(task->dt, 3, 0)); - break; -- case P_RSS: /* resident not rss, it seems to be more correct. */ -+ case P_RSS: /* rss, not resident (which includes IO memory) */ - sprintf(tmp, "%4.4s ", -- scale_k((task->resident << CL_pg_shift), 4, 1)); -+ scale_k((task->rss << CL_pg_shift), 4, 1)); - break; - case P_WCHAN: - if (!CL_wchan_nout) -@@ -1113,7 +1119,7 @@ - static int first=0; - - if (first==0) { -- proc_flags=PROC_FILLMEM|PROC_FILLCMD|PROC_FILLUSR; -+ proc_flags=PROC_FILLMEM|PROC_FILLCMD|PROC_FILLUSR|PROC_FILLSTATUS|PROC_FILLSTAT; - if (monpids_index) - proc_flags |= PROC_PID; - p_table=readproctab2(proc_flags, p_table, monpids); -@@ -1154,7 +1160,6 @@ - count = 0; - ActualLines = 0; - while ((ActualLines < Maxlines) && (p_table[count]->pid!=-1)) { -- int pmem; - char Stat; - - Stat = p_table[count]->state; -@@ -1166,10 +1171,7 @@ - /* - * Show task info. - */ -- /* FIXME: this appears to assume a 4 kB page size */ -- /* FIXME: maybe this can overflow on huge memory systems */ -- pmem = p_table[count]->resident * 250 / (kb_main_total); -- show_task_info(p_table[count], pmem); -+ show_task_info(p_table[count]); - if (!Batch) - ActualLines++; - } -@@ -1245,18 +1247,19 @@ - proc_t *this; - int arrindex, total_time, i, n = 0; - int sleeping = 0, stopped = 0, zombie = 0, running = 0; -- unsigned long system_ticks = 0, user_ticks = 0, nice_ticks = 0, idle_ticks = 1000; -+ double system_ticks, user_ticks, nice_ticks, idle_ticks; - static int prev_count = 0; - int systime, usrtime; - -- /* start with one 4K page as a reasonable allocate size */ -- static int save_history_size = sizeof(struct save_hist) * 204; -+ /* start with one page as a reasonable allocate size */ -+ static int save_history_size = -+ sizeof(long)*1024 / sizeof(struct save_hist); - static struct save_hist *save_history; - struct save_hist *New_save_hist; - - if (!save_history) -- save_history = xcalloc(NULL, save_history_size); -- New_save_hist = xcalloc(NULL, save_history_size); -+ save_history = xcalloc(NULL, sizeof(struct save_hist)*save_history_size); -+ New_save_hist = xcalloc(NULL, sizeof(struct save_hist)*save_history_size); - - /* - * Make a pass through the data to get stats. -@@ -1288,10 +1291,10 @@ - * (usrtime) plus system time (systime). - */ - total_time = this->utime + this->stime; -- if (arrindex > save_history_size) { -+ if (arrindex >= save_history_size) { - save_history_size *= 2; -- save_history = xrealloc(save_history, save_history_size); -- New_save_hist = xrealloc(New_save_hist, save_history_size); -+ save_history = xrealloc(save_history, sizeof(struct save_hist)*save_history_size); -+ New_save_hist = xrealloc(New_save_hist, sizeof(struct save_hist)*save_history_size); - } - New_save_hist[arrindex].ticks = total_time; - New_save_hist[arrindex].pid = this->pid; -@@ -1318,28 +1321,10 @@ - if (this->pcpu > 999) - this->pcpu = 999; - --#if 0 -- /* -- * Calculate time in idle, system, user and niced tasks. -- */ -- idle_ticks -= this->pcpu; -- system_ticks += systime; -- user_ticks += usrtime; -- if (this->nice > 0) -- nice_ticks += this->pcpu; --#endif -- - arrindex++; - n++; - } - --#if 0 -- if (idle_ticks < 0) -- idle_ticks = 0; -- system_ticks = (system_ticks * 10 * 100/Hertz) / elapsed_time; -- user_ticks = (user_ticks * 10 * 100/Hertz) / elapsed_time; --#endif -- - /* - * Display stats. - */ -@@ -1349,25 +1334,14 @@ - n, sleeping, running, zombie, stopped); - PUTP(top_clrtoeol); - putchar('\n'); -- /* BEGIN EXPERIMENTAL CODE */ -- /* Throw out the calculation above... TODO: remove calculation. */ - four_cpu_numbers(&user_ticks,&nice_ticks,&system_ticks,&idle_ticks); -- do{ -- unsigned long sum; -- sum = user_ticks+nice_ticks+system_ticks+idle_ticks; -- user_ticks = (user_ticks * 1000) / sum; -- system_ticks = (system_ticks * 1000) / sum; -- nice_ticks = (nice_ticks * 1000) / sum; -- idle_ticks = (idle_ticks * 1000) / sum; -- }while(0); -- /* END EXPERIMENTAL CODE */ - printf("CPU states:" -- " %2ld.%ld%% user, %2ld.%ld%% system," -- " %2ld.%ld%% nice, %2ld.%ld%% idle", -- user_ticks / 10UL, user_ticks % 10UL, -- system_ticks / 10UL, system_ticks % 10UL, -- nice_ticks / 10UL, nice_ticks % 10UL, -- idle_ticks / 10UL, idle_ticks % 10UL -+ " %# 5.1f%% user, %# 5.1f%% system," -+ " %# 5.1f%% nice, %# 5.1f%% idle", -+ user_ticks, -+ system_ticks, -+ nice_ticks, -+ idle_ticks - ); - PUTP(top_clrtoeol); - putchar('\n'); ---- procps-2.0.6.orig/top.h -+++ procps-2.0.6/top.h -@@ -22,7 +22,7 @@ - static void show_fields(void); - static void change_order(void); - static void change_fields(void); --static void show_task_info(proc_t *task, int pmem); -+static void show_task_info(proc_t *task); - static void show_procs(void); - static float get_elapsed_time(void); - static void show_meminfo(void); ---- procps-2.0.6.orig/vmstat.c -+++ procps-2.0.6/vmstat.c -@@ -19,7 +19,7 @@ - */ - /* PROCPS - This is part of the procps package maintained by Michael K. Johnson -- <johnsonm@redhat.com>; report bugs to <procps-bugs@redhat.com>. -+ <johnsonm@redhat.com>; report bugs to <acahalan@cs.uml.edu>. - */ - - #include "proc/sysinfo.h" ---- procps-2.0.6.orig/uptime.1 -+++ procps-2.0.6/uptime.1 -@@ -26,7 +26,7 @@ - was written by Larry Greenfield <greenfie@gauss.rutgers.edu> and - Michael K. Johnson <johnsonm@sunsite.unc.edu>. - --Please send bug reports to <procps-bugs@redhat.com> -+Please send bug reports to <acahalan@cs.uml.edu> - .SH "SEE ALSO" - .BR ps (1), - .BR top (1), ---- procps-2.0.6.orig/w.1 -+++ procps-2.0.6/w.1 -@@ -59,10 +59,13 @@ - Show information about the specified user only. - - .SH FILES --.ta --.IR /etc/utmp " information about who is currently logged on" --.IR /proc " process information" --.fi -+.TP -+.I /etc/utmp -+information about who is currently logged on -+.TP -+.I /proc -+process information -+.PP - - .SH "SEE ALSO" - .BR free (1), -@@ -78,4 +81,4 @@ - Greenfield <greenfie@gauss.rutgers.edu> and Michael K. Johnson - <johnsonm@redhat.com>. - --Please send bug reports to <procps-bugs@redhat.com> -+Please send bug reports to <acahalan@cs.uml.edu> ---- procps-2.0.6.orig/watch.c -+++ procps-2.0.6/watch.c -@@ -13,8 +13,8 @@ - - #include <ctype.h> - #include <getopt.h> --#include <ncurses.h> - #include <signal.h> -+#include <ncurses.h> - #include <stdio.h> - #include <stdlib.h> - #include <string.h> ---- procps-2.0.6.orig/oldps.1 -+++ procps-2.0.6/oldps.1 -@@ -353,4 +353,4 @@ - wrote the generic BFD support for psupdate. Michael K. Johnson - <johnsonm@redhat.com> is the current maintainer. - --Please send bug reports to <procps-bugs@redhat.com> -+Please send bug reports to <acahalan@cs.uml.edu> ---- procps-2.0.6.orig/kill.1 -+++ procps-2.0.6/kill.1 -@@ -2,7 +2,7 @@ - .\" Licensed under version 2 of the GNU General Public License. - .\" Written by Albert Cahalan; converted to a man page by - .\" Michael K. Johnson --.TH KILL 1 "March 12, 1999" "Linux" "Linux User's Manual" -+.TH KILL 1 "November 21, 1999" "Linux" "Linux User's Manual" - .SH NAME - kill \- report process status - -@@ -42,8 +42,7 @@ - USR1 exit - USR2 exit - VTALRM exit --STKFLT exit i386, m68k, arm and ppc hardware only --UNUSED exit i386, m68k, arm and ppc hardware only -+STKFLT exit may not be implemented - PWR ignore may exit on some systems - WINCH ignore - CHLD ignore -@@ -71,9 +70,6 @@ - You may need to run the command described here as /bin/kill to solve - the conflict. - --The STKFLT and UNUSED signals may not be supported in the future, --and are currently unavailable on some systems. -- - .SH EXAMPLES - kill -9 -1 - .br -@@ -94,4 +90,4 @@ - version that was not standards compliant. Michael K. Johnson - <johnsonm@redhat.com> is the current maintainer of the procps collection. - --Please send bug reports to <procps-bugs@redhat.com> -+Please send bug reports to <acahalan@cs.uml.edu> ---- procps-2.0.6.orig/oldps.c -+++ procps-2.0.6/oldps.c -@@ -304,6 +304,10 @@ - - /* initiate process table scan */ - tab = openproc(pflags, args, N); -+ if (!tab) { -+ fprintf(stderr, "Error: can not access /proc.\n"); -+ exit(1); -+ } - - if (do_header) puts(mode[CL_fmt].header); /* print header */ - ---- procps-2.0.6.orig/skill.1 -+++ procps-2.0.6/skill.1 -@@ -66,8 +66,7 @@ - USR1 exit - USR2 exit - VTALRM exit --STKFLT exit i386, m68k, arm and ppc hardware only --UNUSED exit i386, m68k, arm and ppc hardware only -+STKFLT exit may not be implemented - PWR ignore may exit on some systems - WINCH ignore - CHLD ignore -@@ -90,10 +89,6 @@ - XFSZ core core dump may fail - .TE - --.SH NOTES --The STKFLT and UNUSED signals may not be supported in the future, --and they are currently unavailable on some systems. -- - .SH EXAMPLES - .TS - lB lB -@@ -101,7 +96,7 @@ - Command Description - .TC - snice netscape crack +7 Slow down netscape and crack --skill -KILL -v pts/* Kill users on new-style PTY devices -+skill -KILL -v /dev/pts/* Kill users on new-style PTY devices - skill -STOP torvalds davem tytso Stop 3 users - snice -17 root bash Give priority to root's shell - .TE -@@ -117,4 +112,4 @@ - replacement for a non-free version. Michael K. Johnson <johnsonm@redhat.com> - is the current maintainer of the procps collection. - --Please send bug reports to <procps-bugs@redhat.com> -+Please send bug reports to <acahalan@cs.uml.edu> ---- procps-2.0.6.orig/debian/procps.sh -+++ procps-2.0.6/debian/procps.sh -@@ -0,0 +1,39 @@ -+#! /bin/sh -+# /etc/init.d/procps: Set kernel variables from /etc/sysctl.conf -+# -+# written by Elrond <Elrond@Wunder-Nett.org> -+ -+# Check for existance of the default file and exit if not there, -+# Closes #52839 for the boot-floppy people -+[ -r /etc/default/rcS ] || exit 0 -+. /etc/default/rcS -+ -+[ -x /sbin/sysctl ] || exit 0 -+ -+ -+case "$1" in -+ start|reload|restart|force-reload) -+ if [ ! -r /etc/sysctl.conf ] -+ then -+ exit 0 -+ fi -+ if [ "$VERBOSE" = "no" ] -+ then -+ n="-n" -+ redir=">/dev/null" -+ else -+ echo "Setting kernel variables." -+ n="" -+ redir="" -+ fi -+ eval "/sbin/sysctl $n -p $redir" -+ ;; -+ stop|show) -+ ;; -+ *) -+ echo "Usage: /etc/init.d/sysctl.sh {start|stop|reload|restart}" >&2 -+ exit 1 -+ ;; -+esac -+ -+ ---- procps-2.0.6.orig/debian/rules -+++ procps-2.0.6/debian/rules -@@ -0,0 +1,90 @@ -+#!/usr/bin/make -f -+# Sample debian/rules that uses debhelper. -+# GNU copyright 1997 to 1999 by Joey Hess. -+ -+# Uncomment this to turn on verbose mode. -+#export DH_VERBOSE=1 -+ -+# This is the debhelper compatability version to use. -+export DH_COMPAT=1 -+ -+build: build-stamp -+build-stamp: -+ dh_testdir -+ -+ # Add here commands to compile the package. -+ -$(MAKE) -+ -+ touch build-stamp -+ -+clean: -+ dh_testdir -+ dh_testroot -+ rm -f build-stamp install-stamp -+ -+ # Add here commands to clean up after the build process. -+ #-$(MAKE) clean -+ -$(MAKE) distclean -+ -+ dh_clean -+ -+install: install-stamp -+install-stamp: build-stamp -+ dh_testdir -+ dh_testroot -+ dh_clean -k -+ dh_installdirs -+ -+ # Add here commands to install the package into debian/tmp. -+ #$(MAKE) DESTDIR=`pwd`/debian/tmp install_free install_skill install_oldps install_snice install_tload install_sysctl install_uptime install_vmstat install_w install_watch install_ps install_top install_sysctl -+ $(MAKE) DESTDIR=`pwd`/debian/tmp install -+ $(MAKE) DESTDIR=`pwd`/debian/tmp TOPDIR=`pwd`/debian/tmp/usr libinstall -+ (cd `pwd`/debian/tmp/usr/bin && mv w w.procps ) -+ (cd `pwd`/debian/tmp/usr/lib && ln -sf /lib/libproc.so.2.0.6 libproc.so) -+ # Special for kill, we need it in /bin -+ install --mode a=rx --strip skill `pwd`/debian/tmp/bin/kill -+ rm `pwd`/debian/tmp/usr/bin/kill -+ install --mode 644 -o root -g root debian/sysctl.conf `pwd`/debian/tmp/etc -+ -+ -+ touch install-stamp -+ -+# Build architecture-independent files here. -+binary-indep: build install -+# We have nothing to do by default. -+ -+# Build architecture-dependent files here. -+binary-arch: build install -+# dh_testversion -+ dh_testdir -+ dh_testroot -+ dh_installdocs -+ dh_installexamples -+ dh_installmenu -+# dh_installemacsen -+# dh_installpam -+ dh_installinit --update-rcd-params='start 30 S .' --init-script='procps.sh' -+ dh_installcron -+ dh_installmanpages -pprocps -+ (cd `pwd`/debian/tmp/usr/share/man/man1 && mv w.1 w.procps.1 ) -+ dh_installinfo -+# dh_undocumented -+ dh_installchangelogs NEWS -+ dh_link -+ dh_strip -+ dh_compress -+ dh_fixperms -+ dh_movefiles -+ # You may want to make some executables suid here. -+ dh_suidregister -+ dh_makeshlibs -+ dh_installdeb -+# dh_perl -+ dh_shlibdeps -pprocps -u"-Ldebian/procps.shlibs.local" -+ dh_shlibdeps -plibproc-dev -u"-Ldebian/shlibs.local" -+ dh_gencontrol -+ dh_md5sums -+ dh_builddeb -+ -+binary: binary-indep binary-arch -+.PHONY: build clean binary-indep binary-arch binary install ---- procps-2.0.6.orig/debian/README.Debian -+++ procps-2.0.6/debian/README.Debian -@@ -0,0 +1,6 @@ -+procps for DEBIAN -+---------------------- -+ XConsole and other X-based programs have been finally removed. Look in -+ the x packages for their equivalents. -+ -+ Craig Small <csmall@debian.org> ---- procps-2.0.6.orig/debian/changelog -+++ procps-2.0.6/debian/changelog -@@ -0,0 +1,455 @@ -+procps (1:2.0.6-9) unstable; urgency=medium -+ -+ * added libncurses5-dev to build-depends, Closes: #67533 -+ * Put kill back into /bin Closes #67580, #67582 -+ * Put 2.0.6-7 ps.1 back in Closes: #67451 -+ -+ -- Craig Small <csmall@debian.org> Tue, 25 Jul 2000 08:13:21 +1000 -+ -+procps (1:2.0.6-8) unstable; urgency=low -+ -+ * New upstream source: -+ * - sysctl EOF bug fixed Closes: #62877 -+ * - stop crashes with unmounted /proc Closes: #63512, #55177 -+ * - Versions checking tolerates RH /proc/ksyms Closes: #59798 -+ * - Top works better with SMP Closes: #34734, #56547, #59703 -+ -+ -- Craig Small <csmall@debian.org> Fri, 14 Jul 2000 22:33:44 +1000 -+ -+procps (1:2.0.6-7) unstable; urgency=low -+ -+ * Fixed missing version Closes: #62207, #62484, #59112 -+ * Stop crashes with umounted /proc Closes: #63512, #55177 -+ * Nicer man pages Closes: #63495, #59406 -+ * Fixed sysctl eof bug Closes: #62877 -+ * watch wraps properly Closes: #60913 -+ * watch handles tabs Closes: #46213 -+ * watch honors locale settings Closes: #63762 -+ * now versioned replaces line for bsdutils -+ -+ -- Craig Small <csmall@debian.org> Mon, 29 May 2000 13:31:54 +1000 -+ -+procps (1:2.0.6-6) unstable; urgency=low -+ -+ * New patchlevel (000221) -+ * ps 'f' ASCII art forest fixed. Closes: #57134, #58644 -+ * let insane people run ps setuid. Closes: #56701 -+ * note that kernel 2.3 is now faster. Closes: #49130 -+ * top with WCHAN was leaking memory. Closes: #58172, #52257, #56889 -+ * can show current CPU. Closes: #37023 -+ * w looks better now. Closes: #55952 -+ * init.d/procps removed if exists. Closes: #55137, #55852 -+ * Fixed skill/snice man page (thanks man-db maint!) Closes: #53736, #46743 -+ * Fixed ps man page Closes: #58365 -+ -+ -- Craig Small <csmall@debian.org> Wed, 23 Feb 2000 10:31:37 +1100 -+ -+procps (1:2.0.6-5) unstable; urgency=low -+ -+ * New upstream source -+ * kill "_R(smp_|smp2gig_|2gig_)?[0-9a-fA-F]{8,}" Closes: #54394, #53208 -+ * added type 'S' and scan past machine types Closes: #54396 -+ * Fixed w(1) manpage Closes: #54709 -+ * top now agrees with ps for RSS Closes: #52679 -+ -+ -- Craig Small <csmall@debian.org> Tue, 11 Jan 2000 08:23:56 +1100 -+ -+procps (1:2.0.6-4) unstable; urgency=low -+ -+ * procps init.d script quietly dies if not /etc/default/rcS Closes: -+ #52839 -+ * Put the NEWS changelog back in Closes: #52678 -+ * Fixed that damn Rsmp annoying message bug Closes: #48686 -+ * Remove /etc/init.d/procps Closes: #53818 -+ -+ -- Craig Small <csmall@debian.org> Mon, 20 Dec 1999 11:14:53 +1100 -+ -+procps (1:2.0.6-3) unstable; urgency=low -+ -+ * Patched ps so it complains if you chmod 711 /proc Closes: #52481 -+ * Did the same for top. -+ * Ditto for oldps. -+ * Changed and int to a char* Closes: #52482 -+ * sysctl.conf file references sysctl.conf (5) not 8 Closes: #52385 -+ * props init.d script changed to procps.sh Closes: #52228 -+ -+ -- Craig Small <csmall@debian.org> Mon, 13 Dec 1999 11:57:01 +1100 -+ -+procps (1:2.0.6-2) unstable; urgency=low -+ -+ * Changed psmisc from reccomends to suggests -+ * %MEM now works, Closes: #50010 #50055 #50148 #50356 -+ * top doesn't crash with > 204 processes Closes: #50055 -+ * Another libproc fd leak fixed Closes: #45398 -+ * ps silently ignores m and -m for future compatibility Closes: #48308 -+ * Added a sysctl.conf and other files as suggested Closes: #51098 -+ * Fix start field instability -+ * ps.1 fixed Closes: #35137 -+ -+ -- Craig Small <csmall@debian.org> Tue, 7 Dec 1999 14:42:51 +1100 -+ -+procps (1:2.0.6-1) unstable; urgency=low -+ -+ * New upstream -+ * sysctl crash fixed, Closes: #49015 -+ * libproc file descriptor leak fixed, Closes: #45398 -+ * False positive System.map mismatches killed, Closes: #49047 -+ * Supports 64 Hz for StrongARM/Shark Closes: #47461 -+ * pr_time fixed, Closes: #46223 -+ * libc num cpu workaround back in, Closes: #49039 -+ * Fixed kill manpage, Closes: #47018 -+ * This version definitely, absolutely has kill, Closes: #46762 -+ -+ -+ -- Craig Small <csmall@debian.org> Fri, 5 Nov 1999 12:46:05 +1100 -+ -+procps (1:2.0.3-5) unstable; urgency=low -+ -+ * Changed conflicts with replaces -+ -+ -- Craig Small <csmall@debian.org> Wed, 6 Oct 1999 14:36:48 +1000 -+ -+procps (1:2.0.3-4) unstable; urgency=low -+ -+ * support SMP systems with versioned kernel modules Closes: #45621, #46465 -+ * Added kill to this (it is removed from bsdutils). -+ * We now need kill manpage, Closes: #46004 -+ -+ -- Craig Small <csmall@debian.org> Tue, 5 Oct 1999 10:28:01 +1000 -+ -+procps (1:2.0.3-3) unstable; urgency=low -+ -+ * System.map support for non-i386 Closes: #45592, #45250 -+ * Do not require /proc/ksyms Closes: #45128, #45132, #45619 -+ * Alternative w.1 points to the right spot, Closes: #45331 -+ * Copyright for skill and snice and ps fixed, Closes: #45119 -+ -+ -- Craig Small <csmall@debian.org> Tue, 21 Sep 1999 16:31:59 +1000 -+ -+procps (1:2.0.3-2) unstable; urgency=medium -+ -+ * Now with top! Closes: #45106 -+ -+ -- Craig Small <csmall@debian.org> Wed, 15 Sep 1999 11:12:34 +1000 -+ -+procps (1:2.0.3-1) unstable; urgency=low -+ -+ * New upstream source -+ * Debian personality does m flag Closes: #44832 -+ * Corrected typo in top.1 Closes: #44836 -+ * New improved watch Closes: #29970 -+ -+ -- Craig Small <csmall@debian.org> Mon, 13 Sep 1999 16:59:16 +1000 -+ -+procps (1:2.0.2-4) unstable; urgency=high -+ -+ * Fixed the nasty ps formatting problem (Bug #40859 #40856 #40839 ) -+ -+ -- Craig Small <csmall@debian.org> Wed, 7 Jul 1999 08:41:54 +1000 -+ -+procps (1:2.0.2-3) unstable; urgency=low -+ -+ * New upstream patches/source -+ * SMB Hz wierdness fixed (Bug #33023 #33284) -+ * non-tty output does not get chopped at 80 columns (bug #36688) -+ * BSD personalities set the default selection and output format (bug #36698) -+ * Fixed collumn spacing problem (Bug #35309) -+ * Work around for borken libs that return 0 processors (Bug #36902) -+ * skill now uses process name not command line (Bug #19208) -+ -+ -- Craig Small <csmall@debian.org> Mon, 5 Jul 1999 07:29:47 +1000 -+ -+procps (1:2.0.2-2) unstable; urgency=low -+ -+ * Removed kill and manual page (Bug #36421 #36551 #36375) -+ * Put in patch for bogus sysconf return (Bug #36494 #36532 #36581) -+ -+ -- Craig Small <csmall@debian.org> Wed, 28 Apr 1999 09:04:59 +1000 -+ -+procps (1:2.0.2-1) unstable; urgency=low -+ -+ * New upstream version (Bug #34394 #27291 #34250 #34956 #35240 #35247 -+ #35520 #35756 #34580 ) -+ -+ -- Craig Small <csmall@debian.org> Mon, 19 Apr 1999 13:26:48 +1000 -+ -+procps (1:2.0.0-1) unstable; urgency=low -+ -+ * New upstream version (Bug #33083 23347 33462 10556 33266 33371 ) -+ -+ -+ -- Craig Small <csmall@debian.org> Mon, 15 Mar 1999 14:21:57 +1100 -+ -+procps (1:1.9.0-2) unstable; urgency=low -+ -+ * top now resumes (Bug #32106 ) -+ * debhelper text problem fixed in postinst (Bug #32963 #33122 #33003 33117 ) -+ * oldps and ps now use alternatives (Bug #33083 ) -+ * ps s format now not ugly (Bug #28266 ) -+ * watch command line help and man page correct (Bug #31702 ) -+ * sessreg removed from package (Bug #32294 ) -+ * ps doesn't display extra spaces (Bug #27799 ) -+ * top has spaces in command lines again (Bug #33060 ) -+ * ps now has personality (Bug #22923 #18429 ) -+ * moved non-free skill and snice to non-free package. -+ -+ -- Craig Small <csmall@debian.org> Tue, 9 Feb 1999 15:10:58 +1100 -+ -+procps (1:1.9.0-1) unstable; urgency=low -+ -+ * New Upstream source -+ -+ -- Craig Small <csmall@debian.org> Thu, 4 Feb 1999 14:48:37 +1100 -+ -+procps (1:1.2.9-3) unstable; urgency=low -+ -+ * Linked to ncurses4 -+ -+ -- Craig Small <csmall@debian.org> Fri, 30 Oct 1998 14:13:02 +1100 -+ -+procps (1:1.2.9-2) unstable; urgency=low -+ -+ * top now has spaces in between command lines (Bug #28178 ) -+ * --version or -V now shows proper version. -+ -+ -- Craig Small <csmall@debian.org> Mon, 26 Oct 1998 08:55:59 +1100 -+ -+procps (1:1.2.9-1) unstable; urgency=low -+ -+ * New upstream version (Bug #27573 ) -+ * Menu entry changed from System to Menu/System (Bug #27438 ) -+ * Char variables changed to int for powerpc (Bug #26624 ) -+ * libproc now nulls allocated structure (Bug #26225 ) -+ * No longer uses psdevtab (yay!) (Bug #25388 ) -+ * ps doesn't double space command line parameters (Bug #25306 #24293 ) -+ * ps now silently ignores g flag for those BSD heads (Bug #24075 ) -+ -+ -- Craig Small <csmall@debian.org> Fri, 9 Oct 1998 09:15:11 +1000 -+ -+procps (1:1.2.7-2) unstable; urgency=low -+ -+ * Top can suspend twice (or three times even) (Bug #22997 ) -+ * Libraries properly built (Bug #20010 ) -+ -+ -- Craig Small <csmall@debian.org> Mon, 1 Jun 1998 09:16:09 +1000 -+ -+procps (1:1.2.7-1) frozen unstable; urgency=high -+ -+ * New upstream source, fixes security bug (Bug #21475) -+ -+ -- Craig Small <csmall@debian.org> Thu, 23 Apr 1998 08:04:54 +1000 -+ -+procps (1:1.2.6-2) unstable; urgency=low -+ -+ * Fixed Shared library dependencies (bugs #18388 #18394 18392 ) -+ * Conflicts with earlier versions of w-bassman (bug #18389 ) -+ -+ -- Craig Small <csmall@debian.org> Mon, 23 Feb 1998 09:05:54 +1100 -+ -+procps (1:1.2.6-1) unstable; urgency=low -+ -+ * New upstream source. -+ * xload is undiverted (Bug #17102 ) -+ * ps_fields.7.gz removed (Bug #18090 ) -+ * Colour patches removed, color-related bugs gone (Bug #18008 #17217 #18090 ) -+ * POSIX patches removed, cmd line bugs gone (Bug #15537 ) -+ * w is now an alternative w.procps (Bug #17960 ) -+ * skill now works with process names (Bug #17087 ) -+ * ps and top man pages have their field descriptions (Bug #17360 ) -+ * ps u fixed (Bug #17313 ) -+ * Source code is no longer FUBAR (Bug #17892 ) -+ * top now redraws screen after config screen (Bug #11896 ) -+ * Circular dependency removed (Bug #16966 ) -+ * top does mess up screens with wrong cmd line (Bug #17230 ) -+ * top suspends with ctrl-Z (Bug #16703 ) -+ -+ -- Craig Small <csmall@debian.org> Tue, 17 Feb 1998 08:31:21 +1100 -+ -+procps (1:1.2.5-2) unstable; urgency=low -+ -+ * Moved /bin into /bin/ps (Bug #17001 ) -+ -+ -- Craig Small <csmall@debian.org> Tue, 13 Jan 1998 07:50:43 +1100 -+ -+procps (1:1.2.5-1) unstable; urgency=low -+ -+ * TTY selection works ( #16724 ) -+ * top and ps now accept --colour and *_COLOURS -+ * xproc copyright file not compressed ( #14491 ) -+ * All #include <proc/*.h> now #include "proc/*.h" ( #13482 ) -+ * Copyright doesn't mention psmisc now ( #16704 ) -+ * Moved ps back into /bin ( #16737 #16705 ) -+ * New upstream source ( #16795 ) -+ -+ -- Craig Small <csmall@debian.org> Mon, 12 Jan 1998 08:35:10 +1100 -+ -+procps (1:1.2.2-1) unstable; urgency=low -+ -+ * New maintainer -+ * Updated upstream source to 1.2.2 (instead of 1.2) -+ * Merged Helmut's color/command line patches into upstream. -+ * Copyright file is not compressed ( #14493 #14415 ) -+ * psdatabase refreshed when installing ( #10693 ) -+ * Fixed +/- line in free ( #10785 #10870 #11566 #12027 #12245 #12374 ) -+ * w collumns corrected ( #10898 #13117 ) -+ * top saves sort type ( #11553 ) -+ * Linked to libc6 ( #11725 ) -+ * top doesn't coredump with S option ( #11855 ) -+ * skill works with given patch ( #12023 ) -+ * libproc-dev has proper sym link ( #12697 ) -+ * top -h doesn't change terminal settings ( #13513 ) -+ * ps -s has "CAUGHT" not "CATCHED" ( #14342 ) -+ * ps_colors.7 and ps_fields.7 reformatted ( #14109 #14544 #14545 ) -+ * ps checks for tty before using colors ( #14596 ) -+ * top sets stop signal handler later, stopping race ( #14769 ) -+ * When using POSIX personality, processes show up ( #14780 ) -+ * top checks for valid term type ( #15807 ) -+ * xproc now Depends on procps-1.2.*-* ( #10762 #13347 ) -+ * xproc dependencies fixed ( #12698 ) -+ -+ -- Craig Small <csmall@debian.org> Tue, 30 Dec 1997 11:33:54 +1100 -+ -+procps (1.12.2.1) unstable; urgency=low -+ -+ * Non-maintainer release, built for libc6. -+ * Added in free.c from new procps version 1.2.3 (from sunsite), seems to -+ fix all the problems with free reporting bogus valus. -+ -+ -- Joey Hess <joeyh@master.debian.org> Fri, 24 Oct 1997 13:34:35 -0400 -+ -+procps (1.12.2) stable unstable; urgency=low -+ -+ * fixed meminfo handling again, as the fix wouldn't work on pre-2.1.x -+ kernels. -+ * fixed free to use the meminfo routines from libproc. -+ -+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Fri, 13 Jun 1997 22:42:14 +0200 -+ -+procps (1.12.1) stable unstable; urgency=low -+ -+ * fixed several bugs -+ * replaced utmp handling to support wrappers. -+ * added /proc/meminfo support for 2.1.x kernels. -+ -+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Tue, 10 Jun 1997 23:59:41 +0200 -+ -+procps (1.11.6) frozen unstable; urgency=medium -+ -+ * psmisc 1.14 : new upstream version (mainly bugfixes) -+ * added a lot of new serial device major numbers to the device lookup -+ code. Somehow it seems there are new serial devices every other week. -+ * fixed a bug in top: broken .toprc may cause a segmentation fault. -+ -+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Sun, 4 May 1997 09:50:30 +0200 -+ -+procps (1.11.5) frozen unstable; urgency=medium -+ -+ * minor changes to make it compile with libc6 -+ * fix top behaviour on machines having nonstandard NR_TASKS up to 4k -+ tasks -+ -+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Fri, 18 Apr 1997 02:07:46 +0200 -+ -+procps (1.11.4) unstable; urgency=medium -+ -+ * strip libproc.so from unneeded symbols (Bug# 8311) -+ * fixed watch.1 example (Bug# 8169) -+ * partly fixed fuser sigsegv core dump (Bug# 8004) -+ * menu entries for xproc and procps (Bug# 8325) -+ * divertions for xmem and xload. (Bug# 7565) -+ -+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Sun, 13 Apr 1997 20:55:05 +0200 -+ -+procps (1.11.3) unstable; urgency=low -+ -+ * fixed uptime again, minor Makefile changes -+ -+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Fri, 21 Feb 1997 16:22:04 +0100 -+ -+procps (1.11.2) unstable; urgency=medium -+ -+ * fixed typo in ps_fields.7 (Bug#5457) -+ * fixed typo in debian/rules (Bug #5585) -+ * fixed bug in w introduced in 1.11.1 (Bugs #5489, #5694, #5695, #5705). -+ * added support for non-standard serial devices (long overdue - Bug -+ #5771). -+ * fixed uptime option handling (Bug #6099). -+ * fixed top problems with missing/corrupted utmp (Bug #5819). -+ * fixed manpage problems (Bug #5936). -+ -+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Wed, 19 Feb 1997 18:49:26 +0100 -+ -+procps (1.11.1) unstable; urgency=low -+ -+ * fixed bug in w <username> -+ * automatic resize if field length is exceeded. This changed the shared -+ library, so popping the major number. -+ * fixed numeric WCHAN output on Alphas and stupid bug in ps (again, -+ thanks to H. Koenig). -+ * fixed top memory statistics for systems with more than 100M memory or -+ swap. -+ -+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Tue, 12 Nov 1996 02:57:18 +0100 -+ -+procps (1.10.1) unstable; urgency=low -+ -+ * merged in ALPHA & Sparc patches -+ (from ftp.azstarnet.com:/pub/linux/axp/glibc) -+ * fixed ps --deselect/-N for pid lists -+ * use shared libs from now on, install shlibs again -+ * manpages for libproc -+ * static lib compiled without -fPIC -+ * added libproc package for development installing libproc headers, -+ manpages and static library. -+ * fixed PROC_REAL bug when PROC_FILLSTATUS isn't set. -+ * fixed color bug in ps --forest -+ * added xproc package for xload, xmem, xidle, xcpustate -+ (XConsole left out as we use xconsole & klogd on debian) -+ * adapted xload manpage for xidle and xmem -+ * fixed xmem to cope with newer kernels (where shared pages are counted -+ once for each additional reference) -+ * fixed top change_fields bug (a field needs 24, not 21 spaces) -+ * fixed several Alpha bugs (thanks to Harald Koenig) -+ * due to popular demand, the old format for time intervals is back. -+ for all program using this, a toggle command line option has been -+ provided. The default behaviour depends on the compile time option -+ NEW_TIME_DEFAULT (see main Makefile) -+ -+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Wed, 23 Oct 1996 21:30:54 +0200 -+ -+procps (1.09.2) unstable; urgency=low -+ -+ * fixed cpu nice % in summary -+ * fixed topsetup initialisation in top.h I messed up in last revision -+ * fixed pipe output bug -+ * fixed --deselect bug in SVR4/POSIX mode -+ -+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Sun, 20 Oct 1996 13:57:11 +0200 -+ -+procps (1.09.1) unstable; urgency=low -+ -+ * fixed ps -w bug displaying too many empty lines -+ * fixed SIGSEGV bug in ps -www -+ * fixed bug in top not calculating length of the command/args/env fields -+ at the field selection screen in some circumstances. -+ * fixed SIGSEGV bug when using environ field -+ -+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Sat, 12 Oct 1996 07:59:29 +0200 -+ -+procps (1.09) experimental; urgency=low -+ -+ * This is an experimental release of the procps suite. A lot of features have -+ been added since the 1.01(a) release: -+ - support for both BSD and POSIX (SVR4) style command line options. -+ - completely configurable display of information. -+ - colour markup of processes exceeding limits or belonging to a user. -+ Please take a look at /usr/doc/procps/NEWS and the manpages for a concise -+ list. This is how the next upstream release of procps may look -+ (i.e. it will look like this if there is not too much resistance). -+ -+ -- Helmut Geyer <Helmut.Geyer@iwr.uni-heidelberg.de> Sat, 5 Oct 1996 14:26:57 +0200 -+ -+Local variables: -+mode: debian-changelog -+add-log-mailing-address: "Craig Small <csmall@debian.org>" -+End: ---- procps-2.0.6.orig/debian/control -+++ procps-2.0.6/debian/control -@@ -0,0 +1,31 @@ -+Source: procps -+Section: base -+Priority: required -+Maintainer: Craig Small <csmall@debian.org> -+Build-Depends: debhelper, libncurses5-dev -+Standards-Version: 3.1.1 -+ -+Package: procps -+Architecture: any -+Replaces: watch -+Provides: watch -+Depends: ${shlibs:Depends} -+Conflicts: watch, libproc-dev (<< 1:1.2.6-2), w-bassman (<< 1.0-3), procps-nonfree -+Replaces: bsdutils (<< 2.9x-1) -+Recommends: psmisc -+Description: The /proc file system utilities. -+ These are utilities to browse the /proc filesystem, which is not a real file -+ system but a way for the kernel to provide information about the status of -+ entries in its process table. (e.g. running, stopped or "zombie") -+ Both command line and full screen utilities are provided. Ncurses is needed -+ for the full screen utilities. -+ -+Package: libproc-dev -+Architecture: any -+Section: devel -+Priority: optional -+Depends: libc6-dev, procps (= ${Source-Version}) -+Description: library for accessing process information from /proc -+ These are the header files for libproc. Some packages using libproc -+ to access process information from /proc need these to compile. -+ ---- procps-2.0.6.orig/debian/copyright -+++ procps-2.0.6/debian/copyright -@@ -0,0 +1,29 @@ -+This is the Debian Linux prepackaged version of the /proc file -+system utilities. -+ -+This package was downloaded from: -+ http://www.cs.uml.edu/~acahalan/linux/procps-XXXXXX.tar.gz -+ -+ -+Upstream Author(s): -+Werner Almesberger <almesber@di.epfl.ch>, Roger Binns, Charles -+Blake <cblake@ucsd.edu>, Brian Edmonds, David Engel <david@ods.com>, -+Larry Greenfield <greenfie@gauss.rutgers.edu>, Michael K. Johnson -+<johnsonm@sunsite.unc.edu>, Branko Lankester <lankeste@fwi.uva.nl>, -+Robert Nation <nation@rocket.sanders.lockheed.com>, Michael Shields -+<mjshield@nyx.cs.du.edu>, Henry Ware <al172@yfn.ysu.edu>, Matt -+Welsh <mdw@sunsite.unc.edu> and Albert D. Cahalan -+ -+The upstream maintainer of procps is Michael J. Johnson -+<johnsonm@sunsite.unc.edu>. -+ -+All programs except ps, skill and snice are copyright by their -+authors and redistributable under the terms of the GNU General -+Public License. On Debian Linux systems, the complete text of -+the GNU General Public License can be found in -+`/usr/share/common-licenses/GPL'. -+ -+ps, skill and snice are copyright by their authors and redistributable under -+the terms of the GNU Library General Public License. On Debian Linux -+systems, the complete text of the GNU Library General Public License can -+be found in `/usr/share/common/licenses/LGPL'. ---- procps-2.0.6.orig/debian/dirs -+++ procps-2.0.6/debian/dirs -@@ -0,0 +1,11 @@ -+etc -+lib -+sbin -+bin -+usr/bin -+usr/sbin -+usr/include/proc -+usr/lib -+usr/share/man/man1 -+usr/share/man/man8 -+ ---- procps-2.0.6.orig/debian/docs -+++ procps-2.0.6/debian/docs -@@ -0,0 +1,3 @@ -+BUGS -+TODO -+ ---- procps-2.0.6.orig/debian/libproc-dev.dirs -+++ procps-2.0.6/debian/libproc-dev.dirs -@@ -0,0 +1,2 @@ -+usr/lib -+usr/include/proc ---- procps-2.0.6.orig/debian/libproc-dev.files -+++ procps-2.0.6/debian/libproc-dev.files -@@ -0,0 +1,12 @@ -+usr/lib/libproc.a -+usr/lib/libproc.so -+usr/include/proc/compare.h -+usr/include/proc/devname.h -+usr/include/proc/procps.h -+usr/include/proc/readproc.h -+usr/include/proc/sig.h -+usr/include/proc/status.h -+usr/include/proc/sysinfo.h -+usr/include/proc/tree.h -+usr/include/proc/version.h -+usr/include/proc/whattime.h ---- procps-2.0.6.orig/debian/menu -+++ procps-2.0.6/debian/menu -@@ -0,0 +1 @@ -+?package(procps):needs=text section="Apps/System" title="Top" command="/usr/bin/top" ---- procps-2.0.6.orig/debian/postinst -+++ procps-2.0.6/debian/postinst -@@ -0,0 +1,29 @@ -+#!/bin/sh -+set -e -+ -+if [ -e /etc/psdevtab ] ; then -+ rm -f /etc/psdevtab -+fi -+if [ -e /etc/psdatabase ] -+then -+ rm -f /etc/psdatabase -+fi -+# Remove old /etc/init.d/procps file, Bug #53818 -+if [ -e /etc/init.d/procps ] -+then -+ rm -f /etc/init.d/procps -+fi -+# Remove old procps init.d script, if it exists Closes: #55137 -+if [ -e /etc/rcS.d/S30procps ] -+then -+ update-rc.d procps remove >/dev/null -+fi -+ -+# -+# Now to do the alternatives for w and ps -+update-alternatives --install /usr/bin/w w /usr/bin/w.procps 50 \ -+ --slave /usr/share/man/man1/w.1.gz w.1.gz /usr/share/man/man1/w.procps.1.gz -+ -+ldconfig -+ -+#DEBHELPER# ---- procps-2.0.6.orig/debian/prerm -+++ procps-2.0.6/debian/prerm -@@ -0,0 +1,11 @@ -+#!/bin/sh -+ -+if [ "$1" != "upgrade" ] -+then -+ update-alternatives --remove w /usr/bin/w.procps -+fi -+ -+#DEBHELPER# -+ -+exit 0 -+ ---- procps-2.0.6.orig/debian/procps.shlibs.local -+++ procps-2.0.6/debian/procps.shlibs.local -@@ -0,0 +1 @@ -+libproc 2.0.6 ---- procps-2.0.6.orig/debian/shlibs.local -+++ procps-2.0.6/debian/shlibs.local -@@ -0,0 +1 @@ -+libproc 2.0.6 procps (>> 1:2.0.6-0), procps (<< 1:2.0.7-0) ---- procps-2.0.6.orig/debian/watch -+++ procps-2.0.6/debian/watch -@@ -0,0 +1,6 @@ -+# Example watch control file for uscan -+# Rename this file to "watch" and then you can run the "uscan" command -+# to check for upstream updates and more. -+# Site Directory Pattern Version Script -+sunsite.unc.edu /pub/Linux/Incoming procps-*.tar.gz debian uupdate -+ ---- procps-2.0.6.orig/debian/sysctl.conf -+++ procps-2.0.6/debian/sysctl.conf -@@ -0,0 +1,6 @@ -+# -+# /etc/sysctl.conf - Configuration file for setting system variables -+# See sysctl.conf (5) for information. -+# -+#kernel.domainname = example.com -+#net/ipv4/icmp_echo_ignore_broadcasts=1 ---- procps-2.0.6.orig/debian/examples -+++ procps-2.0.6/debian/examples -@@ -0,0 +1,2 @@ -+debian/sysctl.conf -+ ---- procps-2.0.6.orig/debian/conffiles -+++ procps-2.0.6/debian/conffiles -@@ -0,0 +1,2 @@ -+/etc/sysctl.conf -+/etc/init.d/procps.sh diff --git a/sys-apps/reiserfs-utils/files/digest-reiserfs-utils-3.6.25-r5 b/sys-apps/reiserfs-utils/files/digest-reiserfs-utils-3.6.25-r5 deleted file mode 100644 index 76ec362bf324..000000000000 --- a/sys-apps/reiserfs-utils/files/digest-reiserfs-utils-3.6.25-r5 +++ /dev/null @@ -1 +0,0 @@ -MD5 48e4c6c7ea0b7a4199e9c3310bbf19ce reiserfsprogs-3.x.0j.tar.gz diff --git a/sys-apps/sysvinit/files/digest-sysvinit-2.78-r2 b/sys-apps/sysvinit/files/digest-sysvinit-2.78-r2 deleted file mode 100644 index 762e3231d98c..000000000000 --- a/sys-apps/sysvinit/files/digest-sysvinit-2.78-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 cf40920a0423b05479504d79c0bd70ea sysvinit-2.78.tar.gz diff --git a/sys-apps/sysvinit/sysvinit-2.78-r2.ebuild b/sys-apps/sysvinit/sysvinit-2.78-r2.ebuild deleted file mode 100644 index 5db83adbb336..000000000000 --- a/sys-apps/sysvinit/sysvinit-2.78-r2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Daniel robbins <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.78-r2.ebuild,v 1.1 2001/02/07 15:51:28 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P}/src -DESCRIPTION="System initialization stuff" -SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/daemons/init/${A}" -DEPEND="virtual/glibc" - -src_unpack() { - - unpack ${A} - cd ${S} - mv Makefile Makefile.orig - sed -e "s/-O2/${CFLAGS}/" Makefile.orig > Makefile -} - -src_compile() { - - try pmake LDFLAGS=\"\" - cd ../contrib - try gcc ${CFLAGS} start-stop-daemon.c -o start-stop-daemon -} - - -src_install() { - - into / - dosbin halt init killall5 runlevel shutdown sulogin - dobin last mesg utmpdump wall - dosym killall5 /sbin/pidof - dosym halt /sbin/reboot - cd ../contrib - dosbin start-stop-daemon - into /usr - cd ../man - doman *.[1-9] - - cd .. - dodoc README doc/* contrib/start-stop-daemon.README - -} - - diff --git a/sys-apps/util-linux/files/digest-util-linux-2.10s b/sys-apps/util-linux/files/digest-util-linux-2.10s deleted file mode 100644 index 9b8ec70a6125..000000000000 --- a/sys-apps/util-linux/files/digest-util-linux-2.10s +++ /dev/null @@ -1 +0,0 @@ -MD5 5aa31212a1339536242e511f1271d0a8 util-linux-2.10s.tar.bz2 diff --git a/sys-apps/util-linux/util-linux-2.10s.ebuild b/sys-apps/util-linux/util-linux-2.10s.ebuild deleted file mode 100644 index 4ae70f740db0..000000000000 --- a/sys-apps/util-linux/util-linux-2.10s.ebuild +++ /dev/null @@ -1,57 +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-apps/util-linux/util-linux-2.10s.ebuild,v 1.1 2001/03/09 10:26:59 achim Exp $ - -S=${WORKDIR}/${P} -DESCRIPTION="Various useful Linux utilities" -SRC_URI="ftp://ftp.de.kernel.org/pub/linux/utils/util-linux/${P}.tar.bz2" -DEPEND=">=sys-libs/ncurses-5.2-r2" - - -RDEPEND="$DEPEND - sys-devel/perl" - -src_unpack() { - - unpack ${P}.tar.bz2 - cd ${S} - cp MCONFIG MCONFIG.orig - sed -e "s:-pipe -O2 -m486 -fomit-frame-pointer:${CFLAGS}:" \ - -e "s:CPU=.*:CPU=${CHOST%%-*}:" \ - -e "s:HAVE_PAM=no:HAVE_PAM=yes:" \ - -e "s:HAVE_SLN=no:HAVE_SLN=yes:" \ - -e "s:HAVE_TSORT=no:HAVE_TSORT=yes:" \ - -e "s:usr/man:usr/share/man:" \ - -e "s:usr/info:usr/share/info:" \ - MCONFIG.orig > MCONFIG.orig2 - if [ "`use simpleinit`" ] - then - sed -e "s:HAVE_SYSVINIT=yes:HAVE_SYSVINIT=no:" \ - -e "s:HAVE_SYSVINIT_UTILS=yes:HAVE_SYSVINIT_UTILS=no:" \ - MCONFIG.orig2 > MCONFIG - else - mv MCONFIG.orig2 MCONFIG - fi - -} - -src_compile() { - - try ./configure - try make ${MAKEOPTS} LDFLAGS=\"\" -} - - -src_install() { - - try make DESTDIR=${D} install - - dodoc HISTORY MAINTAINER README VERSION - docinto licenses - dodoc licenses/* HISTORY - docinto examples - dodoc example.files/* -} - - diff --git a/sys-apps/vim-nogui/files/digest-vim-nogui-5.7-r4 b/sys-apps/vim-nogui/files/digest-vim-nogui-5.7-r4 deleted file mode 100644 index bd52e4ba82b9..000000000000 --- a/sys-apps/vim-nogui/files/digest-vim-nogui-5.7-r4 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 0b2bca69c7018a8777d8d5390e23d06e vim-5.7-src.tar.gz -MD5 b7d9cbc64479e26f52e2bc58d312bd84 vim-5.7-rt.tar.gz diff --git a/sys-apps/vim-nogui/vim-nogui-5.7-r4.ebuild b/sys-apps/vim-nogui/vim-nogui-5.7-r4.ebuild deleted file mode 100644 index 8f096399bdf9..000000000000 --- a/sys-apps/vim-nogui/vim-nogui-5.7-r4.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 Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-apps/vim-nogui/vim-nogui-5.7-r4.ebuild,v 1.4 2001/05/28 05:24:13 achim Exp $ - -A="vim-5.7-src.tar.gz vim-5.7-rt.tar.gz" -S=${WORKDIR}/vim-5.7 -DESCRIPTION="Handy vi-compatible editor" -SRC_URI="ftp://ftp.home.vim.org/pub/vim/unix/vim-5.7-src.tar.gz - ftp://ftp.home.vim.org/pub/vim/unix/vim-5.7-rt.tar.gz" -HOMEPAGE="http://www.vim.org" - -DEPEND="virtual/glibc >=sys-libs/ncurses-5.2-r2 - gpm? ( >=sys-libs/gpm-1.19.3 )" -if [ "`use build`" ] ; then - RDEPEND="virtual/glibc" -fi -src_compile() { - - local myconf - - if [ -z "`use gpm`" ] - then - myconf="--disable-gpm" - fi - try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} \ - --enable-gui=no --with-cscope --without-x $myconf - # Parallel make does not work - if [ "`use build`" ] ; then - try make LDFLAGS=\"--static\" - else - try make - fi -} - -src_install() { - - try make prefix=${D}/usr MANDIR=${D}/usr/share/man STRIP=echo install - dodoc README* - insinto /root - newins ${FILESDIR}/vimrc .vimrc - if [ "`use build`" ] ; then - rm -r ${D}/usr/share/{man,doc} - rm -r ${D}/usr/share/vim/vim57/{tutor,doc} - else - cd ${D}/usr/share/doc/${PF} - ln -s ../../vim/vim57/doc ${P} - insinto /etc/skel - newins ${FILESDIR}/vimrc .vimrc - fi - - cd ${D}/usr/bin - ln -s vim vi - dosed "s:/usr/bin/nawk:/usr/bin/awk:" /usr/share/vim/vim57/tools/mve.awk -} - - - - diff --git a/sys-devel/bin86/bin86-0.15.4-r1.ebuild b/sys-devel/bin86/bin86-0.15.4-r1.ebuild deleted file mode 100644 index e9e7e89f65bc..000000000000 --- a/sys-devel/bin86/bin86-0.15.4-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-devel/bin86/bin86-0.15.4-r1.ebuild,v 1.2 2001/02/27 12:34:52 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/bin86 -DESCRIPTION="Assembler and loader used to create kernel bootsector" -SRC_URI="http://www.cix.co.uk/~mayday/${A}" -HOMEPAGE="http://www.cix.co.uk/~mayday/" -DEPEND="virtual/glibc" - -src_unpack() { - - unpack ${A} - cd ${S} - patch -p0 < ${FILESDIR}/bin86-0.15.4-Makefile-gentoo.diff -} - -src_compile() { - - try make ${MAKEOPTS} - -} - -src_install() { - - try make DESTDIR=${D} install - - dodoc README README-0.4 ChangeLog - docinto as - dodoc as/COPYING as/TODO -} - - diff --git a/sys-devel/bin86/files/digest-bin86-0.15.4-r1 b/sys-devel/bin86/files/digest-bin86-0.15.4-r1 deleted file mode 100644 index 26a7c3731184..000000000000 --- a/sys-devel/bin86/files/digest-bin86-0.15.4-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 8ac305eeb5cb0cb6ce90e7e30f7c11f0 bin86-0.15.4.tar.gz diff --git a/sys-devel/binutils/binutils-2.10.0.26.ebuild b/sys-devel/binutils/binutils-2.10.0.26.ebuild deleted file mode 100644 index 6aab41fa67f4..000000000000 --- a/sys-devel/binutils/binutils-2.10.0.26.ebuild +++ /dev/null @@ -1,64 +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-devel/binutils/binutils-2.10.0.26.ebuild,v 1.1 2000/09/28 01:57:28 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Tools necessary to build programs" -SRC_URI="ftp://ftp.varesearch.com/pub/support/hjl/binutils/${A}" - -src_compile() { - try ./configure --prefix=/usr --host=${CHOST} - try make -} - -src_install() { - #I'm sure this can be simplified with a "try make PREFIX=${D}/usr install" - #one of these days... - into /usr - doman binutils/*.1 gas/doc/as.1 gprof/gprof.1 - insinto /usr/lib - doins bfd/libbfd.la bfd/libbfd.a opcodes/libopcodes.a opcodes/libopcodes.la libiberty/libiberty.a - insinto /usr/include - doins bfd/bfd.h include/ansidecl.h include/bfdlink.h - cp binutils/nm-new binutils/nm - cp binutils/strip-new binutils/strip - cp gas/as-new gas/as - cp gas/gasp-new gas/gasp - cp ld/ld-new ld/ld - cd binutils - dobin addr2line ar cxxfilt nm objcopy objdump ranlib readelf size strings strip - cd .. - dobin ld/ld gprof/gprof gas/as gas/gasp - dodir /usr/${CHOST}/bin - for i in nm strip ar ranlib as ld - do - dosym /usr/bin/${i} /usr/${CHOST}/bin/${i} - done - insinto /usr/${CHOST}/lib/ldscripts - doins ld/ldscripts/* - dodoc COPYING* README* ChangeLog* mpw-README - docinto bfd - dodoc bfd/ChangeLog* bfd/COPYING bfd/README bfd/PORTING bfd/TODO - docinto binutils - dodoc binutils/MAINTAINERS binutils/NEWS binutils/README - docinto gas - dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/COPYING gas/MAINTAINERS gas/NEWS gas/README* - docinto gprof - dodoc gprof/ChangeLog* gprof/MAINTAINERS gprof/NOTES gprof/TEST gprof/TODO - docinto include - dodoc include/ChangeLog* include/COPYING include/MAINTAINERS - docinto intl - dodoc intl/ChangeLog - docinto ld - dodoc ld/ChangeLog* ld/MAINTAINERS ld/README ld/NEWS ld/TODO - docinto libiberty - dodoc libiberty/ChangeLog* libiberty/COPYING.LIB libiberty/README - docinto opcodes - dodoc opcodes/ChangeLog* opcodes/MAINTAINERS - -} - - - diff --git a/sys-devel/binutils/binutils-2.10.91.0.2-r1.ebuild b/sys-devel/binutils/binutils-2.10.91.0.2-r1.ebuild deleted file mode 100644 index f4c6fd6cafbb..000000000000 --- a/sys-devel/binutils/binutils-2.10.91.0.2-r1.ebuild +++ /dev/null @@ -1,64 +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-devel/binutils/binutils-2.10.91.0.2-r1.ebuild,v 1.4 2001/05/01 10:13:38 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="Tools necessary to build programs" -SRC_URI="http://ftp.valinux.com/pub/support/hjl/binutils/${A}" - -if [ -z "`use build`" ] ; then - DEPEND="nls? ( sys-devel/gettext )" -fi - -src_compile() { - - local myconf - if [ "`use nls`" ] - then - if [ "`use build`" ] ; then - myconf="--with-included-gettext" - fi - else - myconf="--disable-nls" - fi - try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} ${myconf} - if [ "`use static`" ] - then - try make -e LDFLAGS=-all-static ${MAKEOPTS} - else - try make ${MAKEOPTS} - fi -} - -src_install() { - - try make prefix=${D}/usr mandir=${D}/usr/share/man install - - if [ -z "`use build`" ] - then - dodoc COPYING* README - docinto bfd - dodoc bfd/ChangeLog* bfd/COPYING bfd/README bfd/PORTING bfd/TODO - docinto binutils - dodoc binutils/ChangeLog binutils/NEWS binutils/README - docinto gas - dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/COPYING \ - gas/NEWS gas/README* - docinto gprof - dodoc gprof/ChangeLog* gprof/NOTES gprof/TEST gprof/TODO - docinto ld - dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO - docinto libiberty - dodoc libiberty/ChangeLog* libiberty/COPYING.LIB libiberty/README - docinto opcodes - dodoc opcodes/ChangeLog* - else - rm -rf ${D}/usr/share/man - fi - -} - - - diff --git a/sys-devel/binutils/files/digest-binutils-2.10.0.26 b/sys-devel/binutils/files/digest-binutils-2.10.0.26 deleted file mode 100644 index d951d3ed4959..000000000000 --- a/sys-devel/binutils/files/digest-binutils-2.10.0.26 +++ /dev/null @@ -1 +0,0 @@ -MD5 85662fb0b136f3b0fccd211fdde259a9 binutils-2.10.0.26.tar.gz diff --git a/sys-devel/binutils/files/digest-binutils-2.10.91.0.2-r1 b/sys-devel/binutils/files/digest-binutils-2.10.91.0.2-r1 deleted file mode 100644 index f21977d64c6e..000000000000 --- a/sys-devel/binutils/files/digest-binutils-2.10.91.0.2-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 76a67983e1ce656681925cb2c7b2ba45 binutils-2.10.91.0.2.tar.gz diff --git a/sys-devel/gcc/files/digest-gcc-2.95.3 b/sys-devel/gcc/files/digest-gcc-2.95.3 deleted file mode 100644 index e9e574dc3b7f..000000000000 --- a/sys-devel/gcc/files/digest-gcc-2.95.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 f3ad4f32c2296fad758ed051b5ac8e28 gcc-2.95.3.tar.gz diff --git a/sys-devel/gcc/gcc-2.95.3.ebuild b/sys-devel/gcc/gcc-2.95.3.ebuild deleted file mode 100644 index 8a1ec78ac84c..000000000000 --- a/sys-devel/gcc/gcc-2.95.3.ebuild +++ /dev/null @@ -1,169 +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-devel/gcc/gcc-2.95.3.ebuild,v 1.5 2001/05/02 22:03:30 achim Exp $ - - -SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${P}.tar.gz" - -if [ "`use libg++`" ] -then - SRC_URI="${SRC_URI} - ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3.tar.gz - ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3-20000312.diff.gz - ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3-20000419.diff.gz - ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3-20000816.diff.gz - ftp://ftp.freesoftware.com/pub/sourceware/gcc/infrastructure/libg++-2.8.1.3-20000914.diff.gz" -fi - -S=${WORKDIR}/${P} -T=/usr - -DESCRIPTION="Modern GCC C/C++ compiler" -HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html" -if [ -z "`use build`" ] ; then - if [ "`use bootstrap`" ] ; then - DEPEND="nls? ( sys-devel/gettext )" - else - DEPEND="nls? ( sys-devel/gettext ) sys-apps/texinfo" - fi -fi - - -src_unpack() { - - unpack ${P}.tar.gz - - if [ "`use libg++`" ] - then - unpack libg++-2.8.1.3.tar.gz - cd ${S}/../libg++-2.8.1.3 - gzip -dc ${DISTDIR}/libg++-2.8.1.3-20000312.diff.gz | patch -p1 - gzip -dc ${DISTDIR}/libg++-2.8.1.3-20000419.diff.gz | patch -p1 - gzip -dc ${DISTDIR}/libg++-2.8.1.3-20000816.diff.gz | patch -p1 - gzip -dc ${DISTDIR}/libg++-2.8.1.3-20000914.diff.gz | patch -p1 - cd ${S} - mv ../libg++-2.8.1.3/* . - rmdir ../libg++-2.8.1.3 - fi - - cd ${S} - - # We do not build the included texinfo stuff - if [ -z "`use build`" ] - then - rm -rf texinfo - fi -} - -src_compile() { - - local myconf - if [ -z "`use build`" ] - then - myconf="--enable-shared" - else - myconf="--enable-languages=c" - fi - if [ "`use nls`" ] - then - if [ "`use build`" ] ; then - myconf="${myconf} --with-included-gettext --enable-nls" - else - myconf="${myconf} --enable-nls" - fi - else - myconf="${myconf} --disable-nls" - fi - - # gcc does not like optimization - - export CFLAGS="${CFLAGS/-O?/}" - export CXXFLAGS="${CXXFLAGS/-O?/}" - - - try ${S}/configure --prefix=${T} --mandir=${T}/share/man --infodir=${T}/share/info \ - --enable-version-specific-runtime-libs \ - --host=${CHOST} --build=${CHOST} --target=${CHOST} --enable-threads \ - --with-local-prefix=${T}/local ${myconf} - - # Parallel build does not work - if [ -z "`use static`" ] - then - try make ${MAKEOPTS} bootstrap-lean - else - try make ${MAKEOPTS} LDFLAGS=-static bootstrap - fi - if [ "`use build`" ] - then - cd ${S}/texinfo/util - make texindex install-info - fi -} - -src_install() { - - try make install prefix=${D}${T} mandir=${D}${T}/share/man infodir=${D}${T}/share/info - - FULLPATH=${D}${T}/lib/gcc-lib/${CHOST}/${PV} - cd ${FULLPATH} - dodir /lib - dosym ${T}/lib/gcc-lib/${CHOST}/${PV}/cpp0 /lib/cpp - dosym /usr/bin/gcc /usr/bin/cc - dodir /etc/env.d - echo "LDPATH=${T}/lib/gcc-lib/${CHOST}/${PV}" > ${D}/etc/env.d/05gcc - cd ${S} - if [ -z "`use build`" ] - then - dodoc COPYING COPYING.LIB README* FAQ MAINTAINERS - docinto html - dodoc faq.html - docinto gcc - cd ${S}/gcc - dodoc BUGS ChangeLog* COPYING* FSFChangeLog* \ - LANGUAGES NEWS PROBLEMS README* \ - SERVICE TESTS.FLUNK - cd ${S}/libchill - docinto libchill - dodoc ChangeLog - cd ${S}/libf2c - docinto libf2c - dodoc ChangeLog changes.netlib README TODO - cd ${S}/libiberty - docinto libiberty - dodoc ChangeLog COPYING.LIB README - cd ${S}/libio - docinto libio - dodoc ChangeLog NEWS README - cd dbz - docinto libio/dbz - dodoc README - cd ../stdio - docinto libio/stdio - dodoc ChangeLog* - cd ${S}/libobjc - docinto libobjc - dodoc ChangeLog README* THREADS* - - if [ "`use libg++`" ] - then - cd ${S}/libg++ - docinto libg++ - dodoc ChangeLog g++FAQ.txt NEWS README* TODO - else - cd ${S}/libstdc++ - docinto libstdc++ - dodoc ChangeLog NEWS - fi - else - rm -rf ${D}/usr/share/{man,info} - cd texinfo - dobin makeinfo/makeinfo util/texi2dvi util/install-info util/texindex - fi - -} - - - - - diff --git a/sys-devel/gettext/files/digest-gettext-0.10.35-r2 b/sys-devel/gettext/files/digest-gettext-0.10.35-r2 deleted file mode 100644 index 61d920c7e290..000000000000 --- a/sys-devel/gettext/files/digest-gettext-0.10.35-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 f29d32b82217b9d89fcda66328752acc gettext-0.10.35.tar.gz diff --git a/sys-devel/gettext/gettext-0.10.35-r2.ebuild b/sys-devel/gettext/gettext-0.10.35-r2.ebuild deleted file mode 100644 index c5c222064921..000000000000 --- a/sys-devel/gettext/gettext-0.10.35-r2.ebuild +++ /dev/null @@ -1,40 +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-devel/gettext/gettext-0.10.35-r2.ebuild,v 1.4 2001/05/01 10:09:09 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="GNU locale utilities" -SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/gettext/${A} - ftp://prep.ai.mit.edu/gnu/gettext/${A}" -HOMEPAGE="http://www.gnu.org/software/gettext/gettext.html" - -if [ -z "`use build`" ] ; then -DEPEND="virtual/glibc" -fi - -src_compile() { - local myconf - if [ -z "`use nls`" ] - then - myconf="--disable-nls" - fi - try ./configure --prefix=/usr --infodir=/usr/share/info \ - --with-included-gettext --enable-shared --host=${CHOST} ${myconf} - try make ${MAKEOPTS} -} - -src_install() { - - try make prefix=${D}/usr infodir=${D}/usr/share/info \ - lispdir=${D}/usr/share/emacs/site-lisp install - - dodoc AUTHORS BUGS COPYING ChangeLog DISCLAIM NEWS README* THANKS TODO - - exeopts -m0755 - exeinto /usr/bin - doexe misc/gettextize -} - - diff --git a/sys-devel/perl/files/digest-perl-5.6.0-r6 b/sys-devel/perl/files/digest-perl-5.6.0-r6 deleted file mode 100644 index 39a333a00793..000000000000 --- a/sys-devel/perl/files/digest-perl-5.6.0-r6 +++ /dev/null @@ -1 +0,0 @@ -MD5 b2940e2cc6312bcfa52355b684e70b9d perl-5.6.0.tar.gz diff --git a/sys-devel/perl/perl-5.6.0-r6.ebuild b/sys-devel/perl/perl-5.6.0-r6.ebuild deleted file mode 100644 index a7248c2100aa..000000000000 --- a/sys-devel/perl/perl-5.6.0-r6.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 Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-devel/perl/perl-5.6.0-r6.ebuild,v 1.3 2001/04/09 05:38:55 achim Exp $ - - -A=${P}.tar.gz -S=${WORKDIR}/perl-5.6.0 -DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language" -SRC_URI="ftp://ftp.perl.org/pub/perl/CPAN/src/${A}" -HOMEPAGE="http://www.perl.org" - -DEPEND="virtual/glibc - berkdb? ( >=sys-libs/db-3.1.17 ) - gdbm? ( >=sys-libs/gdbm-1.8.0 )" - -src_compile() { - -# this is gross -- from Christian Gafton, Red Hat -cat > config.over <<EOF -installprefix=${D}/usr -test -d \$installprefix || mkdir \$installprefix -test -d \$installprefix/bin || mkdir \$installprefix/bin -installarchlib=\`echo \$installarchlib | sed "s!\$prefix!\$installprefix!"\` -installbin=\`echo \$installbin | sed "s!\$prefix!\$installprefix!"\` -installman1dir=\$installprefix/share/man/man1 -installman3dir=\$installprefix/share/man/man3 -man1ext=1 -man3ext=3pl -installprivlib=\`echo \$installprivlib | sed "s!\$prefix!\$installprefix!"\` -installscript=\`echo \$installscript | sed "s!\$prefix!\$installprefix!"\` -installsitelib=\`echo \$installsitelib | sed "s!\$prefix!\$installprefix!"\` -installsitearch=\`echo \$installsitearch | sed "s!\$prefix!\$installprefix!"\` -EOF - - local myconf - if [ "`use gdbm`" ] - then - myconf="-Di_gdbm" - fi - if [ "`use berkdb`" ] - then - myconf="${myconf} -Di_db -Di_ndbm" - else - myconf="${myconf} -Ui_db -Ui_ndbm" - fi - sh Configure -des -Dprefix=/usr -Dd_dosuid \ - -Dd_semctl_semun ${myconf} -Duselargefiles \ - -Darchname=${CHOST%%-*}-linux - #-Dusethreads -Duse505threads \ - - #Optimize ;) - cp config.sh config.sh.orig - sed -e "s/optimize='-O2'/optimize=\'${CFLAGS}\'/" config.sh.orig > config.sh - #THIS IS USED LATER: - export PARCH=`grep myarchname config.sh | cut -f2 -d"'"` - try make - # Parallell make failes - make test -} - -src_install() { - - export PARCH=`grep myarchname config.sh | cut -f2 -d"'"` - - try make INSTALLMAN1DIR=${D}/usr/share/man/man1 \ - INSTALLMAN3DIR=${D}/usr/share/man/man3 install - install -m 755 utils/pl2pm ${D}/usr/bin/pl2pm - -# Generate *.ph files with a trick. Is this sick or what? -# Yes it is, and thank you Christian for getting sick just so we can -# run perl :) - -make all -f - <<EOF -STDH =\$(wildcard /usr/include/linux/*.h) \$(wildcard /usr/include/asm/*.h) \ - \$(wildcard /usr/include/scsi/*.h) -GCCDIR = \$(shell gcc --print-file-name include) - -PERLLIB = \$(D)/usr/lib/perl5/%{perlver}%{perlrel} -PERL = PERL5LIB=\$(PERLLIB) \$(D)/usr/bin/perl -PHDIR = \$(PERLLIB)/\${PARCH}-linux -H2PH = \$(PERL) \$(D)/usr/bin/h2ph -d \$(PHDIR)/ - -all: std-headers gcc-headers fix-config - -std-headers: \$(STDH) - cd /usr/include && \$(H2PH) \$(STDH:/usr/include/%%=%%) - -gcc-headers: \$(GCCH) - cd \$(GCCDIR) && \$(H2PH) \$(GCCH:\$(GCCDIR)/%%=%%) - -fix-config: \$(PHDIR)/Config.pm - \$(PERL) -i -p -e "s|\$(D)||g;" \$< - -EOF - -#man pages - -# ./perl installman --man1dir=${D}/usr/share/man/man1 --man1ext=1 --man3dir=${D}/usr/share/man/man3 --man3ext=3 - - -# This removes ${D} from Config.pm - - dosed /usr/lib/perl5/5.6.0/${CHOST%%-*}-linux/Config.pm - dosed /usr/lib/perl5/5.6.0/${CHOST%%-*}-linux/.packlist - -# DOCUMENTATION - - dodoc Changes* Artistic Copying README Todo* AUTHORS - -# HTML Documentation - - dodir /usr/share/doc/${PF}/html - ./perl installhtml --recurse --htmldir=${D}/usr/share/doc/${PF}/html - prepalldocs - -} - - - - diff --git a/sys-libs/db/db-3.2.3h-r2.ebuild b/sys-libs/db/db-3.2.3h-r2.ebuild deleted file mode 100644 index 4bbeb7b7c73a..000000000000 --- a/sys-libs/db/db-3.2.3h-r2.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/sys-libs/db/db-3.2.3h-r2.ebuild,v 1.1 2001/04/29 02:15:57 drobbins Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P}/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="virtual/glibc" -DEPEND="$RDEPEND - =sys-libs/db-1.85-r1" - -src_compile() { - - try ../dist/configure \ - --enable-compat185 --enable-dump185 \ - --prefix=/usr --host=${CHOST} --target=${CHOST} --build=${CHOST} \ - --enable-shared --enable-static \ - --enable-cxx - #--enable-rpc does not work - - echo - # Parallel make does not work - echo "Building static libs..." - make libdb=libdb-3.2.a libdb-3.2.a - make libcxx=libdb_cxx-3.2.a libdb_cxx-3.2.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.2.a libcxx=libdb_cxx-3.2.a - -} - -src_install () { - - try make libdb=libdb-3.2.a libcxx=libcxx_3.2.a prefix=${D}/usr install - dolib.a libdb-3.2.a libdb_cxx-3.2.a - dolib libdb-3.2.la libdb_cxx-3.2.la - - dodir usr/include/db3 - cd ${D}/usr/include - mv *.h db3 - ln db3/db.h db.h - - cd ${D}/usr/lib - ln -s libdb.3.so libdb.so.3 - - cd ${S}/.. - dodoc README LICENSE - if [ -d ${D}/usr/share/doc/${PF} ] - then - mv ${D}/usr/docs ${D}/usr/share/doc/${PF}/html - else - mv ${D}/usr/docs ${D}/usr/doc/${PF}/html - fi - prepalldocs - -} - diff --git a/sys-libs/db/files/digest-db-3.2.3h-r1 b/sys-libs/db/files/digest-db-3.2.3h-r1 deleted file mode 100644 index 42617da0179b..000000000000 --- a/sys-libs/db/files/digest-db-3.2.3h-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 7a4a88daa29268eebb57ff2ed58dff53 db-3.2.3h.tar.gz diff --git a/sys-libs/db/files/digest-db-3.2.3h-r2 b/sys-libs/db/files/digest-db-3.2.3h-r2 deleted file mode 100644 index 42617da0179b..000000000000 --- a/sys-libs/db/files/digest-db-3.2.3h-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 7a4a88daa29268eebb57ff2ed58dff53 db-3.2.3h.tar.gz diff --git a/sys-libs/glibc/files/digest-glibc-2.2.3 b/sys-libs/glibc/files/digest-glibc-2.2.3 deleted file mode 100644 index 7261ba16aa7d..000000000000 --- a/sys-libs/glibc/files/digest-glibc-2.2.3 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 dce1d6d0b210c5a8c74918982341799b glibc-2.2.3.tar.gz -MD5 46e9e722fbac89f0a94a8de872d3d39f glibc-linuxthreads-2.2.3.tar.gz diff --git a/sys-libs/glibc/glibc-2.2.3.ebuild b/sys-libs/glibc/glibc-2.2.3.ebuild deleted file mode 100644 index f2fec70b4b6e..000000000000 --- a/sys-libs/glibc/glibc-2.2.3.ebuild +++ /dev/null @@ -1,162 +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.3.ebuild,v 1.2 2001/05/08 07:23:45 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-intl-perl - do - echo "Applying $i patch..." - patch -p0 < ${FILESDIR}/glibc-2.2.2-${i}.diff - done - patch -p0 < ${FILESDIR}/glibc-2.2.3-libnss.diff - 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 - - if [ "`use pic`" ] - then - find ${S}/buildhere -name "*_pic.a" -exec cp {} ${D}/lib \; - find ${S}/buildhere -name "*.map" -exec cp {} ${D}/lib \; - for i in ${D}/lib/*.map - do - mv ${i} ${i%.map}_pic.map - done - fi - rm ${D}/lib/ld-linux.so.2 - rm ${D}/lib/libc.so.6 - rm ${D}/lib/libpthread.so.0 - chmod 755 ${D}/usr/lib/misc/pt_chown - -} - -pkg_preinst() -{ - # Check if we run under X - if [ -e /usr/X11R6/bin/X ] ; then - if [ "`/sbin/pidof /usr/X11R6/bin/X`" ] ; then - echo "glibc can not be installed wHile X is running!!" - exit 1 - fi - fi - echo "Saving ld-linux,libc6 and libpthread" - - /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 - /bin/cp ${ROOT}lib/libpthread.so.0 ${ROOT}tmp - /sbin/sln ${ROOT}tmp/libpthread.so.0 ${ROOT}lib/libpthread.so.0 - - if [ -e ${ROOT}etc/localtime ] - then - #keeping old timezone - if [ -e ${D}/etc/localtime ] ; then - /bin/rm ${D}/etc/localtime - fi - else - echo "Please remember to set your timezone using the zic command." - fi -} - -pkg_postinst() -{ - echo "Setting ld-linux,libc6 and libpthread" - - /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 - /sbin/sln ${ROOT}lib/libpthread-0.9.so ${ROOT}lib/libpthread.so.0 - /bin/rm ${ROOT}tmp/ld-linux.so.2 - /bin/rm ${ROOT}tmp/libc.so.6 - /bin/rm ${ROOT}tmp/libpthread.so.0 - /sbin/ldconfig -r ${ROOT} - -} - - - diff --git a/sys-libs/gpm/files/digest-gpm-1.19.3-r2 b/sys-libs/gpm/files/digest-gpm-1.19.3-r2 deleted file mode 100644 index 77933740e92e..000000000000 --- a/sys-libs/gpm/files/digest-gpm-1.19.3-r2 +++ /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-r2.ebuild b/sys-libs/gpm/gpm-1.19.3-r2.ebuild deleted file mode 100644 index 41156b98fd20..000000000000 --- a/sys-libs/gpm/gpm-1.19.3-r2.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 Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.19.3-r2.ebuild,v 1.4 2001/05/29 17:28:19 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.2 - tex? ( app-text/tetex )" - -RDEPEND="virtual/glibc >=sys-libs/ncurses-5.2" - -src_unpack() { - - unpack ${P}.tar.gz - cd ${S} - cp ${FILESDIR}/gpmInt.h . - patch -p1 < ${DISTDIR}/devfs.patch - -} - -src_compile() { - - try ./configure --prefix=/usr --sysconfdir=/etc/gpm - # without-curses is required to avoid cyclic dependencies to ncurses - 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/x11-libs/fltk/files/digest-fltk-1.0.10-r1 b/x11-libs/fltk/files/digest-fltk-1.0.10-r1 deleted file mode 100644 index b525bdcfb13f..000000000000 --- a/x11-libs/fltk/files/digest-fltk-1.0.10-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 e76cc38b6c0bdb046a8ac5cd31a7e65e fltk-1.0.10-source.tar.bz2 diff --git a/x11-libs/fltk/fltk-1.0.10-r1.ebuild b/x11-libs/fltk/fltk-1.0.10-r1.ebuild deleted file mode 100644 index 39b67e9fb991..000000000000 --- a/x11-libs/fltk/fltk-1.0.10-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Your Name <your email> -# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.0.10-r1.ebuild,v 1.2 2001/04/23 19:59:42 drobbins Exp $ - -S=${WORKDIR}/${P} -DESCRIPTION="C++ user interface toolkit for X and OpenGL." -SRC_URI="ftp://ftp.fltk.org/pub/fltk/${PV}/${P}-source.tar.bz2" -HOMEPAGE="http://www.fltk.org" -DEPEND="virtual/x11 opengl? ( virtual/opengl )" - - -src_compile() { - - try ./configure --prefix=/usr/X11R6 --host=${CHOST} --enable-shared - if [ -z "`use opengl`" ] - then - cp config.h config.orig - sed -e "s:#define HAVE_GL.*:#define HAVE_GL 0:" \ - config.orig > config.h - fi - try make - -} - -src_install () { - - cd ${S} - try make prefix=${D}/usr/X11R6 install - dodoc CHANGES COPYING README* - mv ${D}/usr/X11R6/share/doc/fltk ${D}/usr/share/doc/${PF}/html - -} - diff --git a/x11-libs/gtk-engines/files/digest-gtk-engines-0.10 b/x11-libs/gtk-engines/files/digest-gtk-engines-0.10 deleted file mode 100644 index 529a4174f29d..000000000000 --- a/x11-libs/gtk-engines/files/digest-gtk-engines-0.10 +++ /dev/null @@ -1 +0,0 @@ -MD5 bc202dcb0e30ce742233e9237de4edc1 gtk-engines-0.10.tar.gz diff --git a/x11-libs/gtk-engines/gtk-engines-0.10.ebuild b/x11-libs/gtk-engines/gtk-engines-0.10.ebuild deleted file mode 100644 index 0900f335221f..000000000000 --- a/x11-libs/gtk-engines/gtk-engines-0.10.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/x11-libs/gtk-engines/gtk-engines-0.10.ebuild,v 1.5 2000/11/02 08:31:54 achim Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="gtk-engines" -SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}" -HOMEPAGE="http://www.gnome.org/" - -DEPEND=">=sys-libs/glibc-2.1.3 - >=dev-libs/glib-1.2.8 - >=x11-libs/gtk+-1.2.8 - >=media-libs/imlib-1.9.8.1 - >=x11-base/xfree-4.0.1" - -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 NEWS -} - - - - diff --git a/x11-wm/WindowMaker/WindowMaker-0.62.1-r1.ebuild b/x11-wm/WindowMaker/WindowMaker-0.62.1-r1.ebuild deleted file mode 100644 index 5b4a49330f0e..000000000000 --- a/x11-wm/WindowMaker/WindowMaker-0.62.1-r1.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 Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-wm/WindowMaker/WindowMaker-0.62.1-r1.ebuild,v 1.5 2001/05/07 15:51:46 achim Exp $ - -P=WindowMaker-0.62.1 -A="${P}.tar.gz WindowMaker-extra-0.1.tar.bz2" -S=${WORKDIR}/${P} -DESCRIPTION="Window Maker" -SRC_URI="ftp://ftp.windowmaker.org/pub/release/srcs/current/WindowMaker-0.62.1.tar.gz - ftp://ftp.windowmaker.org/pub/release/srcs/current/WindowMaker-extra-0.1.tar.bz2" -HOMEPAGE="http://www.windowmaker.org/" - -DEPEND=">=sys-libs/glibc-2.1.3 - >=media-libs/jpeg-6b - >=media-libs/tiff-3.5.5 - >=media-libs/libpng-1.0.7 - >=media-libs/giflib-4.1.0 - >=x11-libs/libPropList-0.10.1 - >=x11-base/xfree-4.0.1" - -src_compile() { - try ./configure --host=${CHOST} --prefix=/usr/X11R6 --sysconfdir=/etc/X11 \ - --enable-gnome --enable-kde --with-x --enable-newstyle --enable-superfluous - try make - cd ../WindowMaker-extra-0.1 - try ./configure --host=${CHOST} --prefix=/usr/X11R6 - try make -} - -src_install() { - try make prefix=${D}/usr/X11R6 sysconfdir=${D}/etc/X11 install - exeinto /usr/X11R6/bin/wm - doexe ${FILESDIR}/windowmaker - cp -f WindowMaker/plmenu ${D}/etc/X11/WindowMaker/WMRootMenu - dodoc AUTHORS BUGFORUM BUGS ChangeLog COPYING* FAQ* README* NEWS TODO - - cd ../WindowMaker-extra-0.1 - try make prefix=${D}/usr/X11R6 install - newdoc README README.extra - - - -} - - - - diff --git a/x11-wm/WindowMaker/files/digest-WindowMaker-0.62.1-r1 b/x11-wm/WindowMaker/files/digest-WindowMaker-0.62.1-r1 deleted file mode 100644 index ef6eb1bac41e..000000000000 --- a/x11-wm/WindowMaker/files/digest-WindowMaker-0.62.1-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 058fb8a36a1c25b3d70b78d053c114ae WindowMaker-0.62.1.tar.gz -MD5 e6fb381da0d207c320f58e7a1fea2a2b WindowMaker-extra-0.1.tar.bz2 diff --git a/x11-wm/fvwm/files/digest-fvwm-2.3.28 b/x11-wm/fvwm/files/digest-fvwm-2.3.28 deleted file mode 100644 index 3d5d686d7af1..000000000000 --- a/x11-wm/fvwm/files/digest-fvwm-2.3.28 +++ /dev/null @@ -1 +0,0 @@ -MD5 6cb6ca57597b745b7c6be7e3a3670269 fvwm-2.3.28.tar.bz2 diff --git a/x11-wm/fvwm/fvwm-2.3.28.ebuild b/x11-wm/fvwm/fvwm-2.3.28.ebuild deleted file mode 100644 index 05269f2bb495..000000000000 --- a/x11-wm/fvwm/fvwm-2.3.28.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 Peter Gavin <pete@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.3.28.ebuild,v 1.3 2001/05/15 22:21:40 achim Exp $ - -#P= -A=${P}.tar.bz2 -S=${WORKDIR}/${P} -DESCRIPTION="an extremely powerful ICCCM-compliant multiple virtual desktop window manager" -SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${A}" -HOMEPAGE="http://www.fvwm.org/" - -DEPEND=">=x11-base/xfree-4.0 - >=sys-libs/readline-4.0 - >=sys-libs/ncurses-5.0 - >=x11-libs/gtk+-1.2.8 - gnome? ( >=gnome-base/gnome-libs-1.2.8 )" - -src_compile() { - local myconf - if [ -n "$( use gnome )" ] - then - myconf="--with-gnome" - else - myconf="--without-gnome" - fi - try ./configure --prefix=/usr/X11R6 --libexecdir=/usr/X11R6/lib \ - --host=${CHOST} ${myconf} - try make -} - -src_install () { - - try make DESTDIR=${D} install - exeinto /usr/X11R6/bin/wm - doexe ${FILESDIR}/fvwm - -} diff --git a/x11-wm/icewm/files/digest-icewm-1.0.8-r4 b/x11-wm/icewm/files/digest-icewm-1.0.8-r4 deleted file mode 100644 index cba9403838b8..000000000000 --- a/x11-wm/icewm/files/digest-icewm-1.0.8-r4 +++ /dev/null @@ -1 +0,0 @@ -MD5 e489eb84af15d7305f9cc5768d6886bc icewm-1.0.8-4.tar.gz diff --git a/x11-wm/icewm/icewm-1.0.8-r4.ebuild b/x11-wm/icewm/icewm-1.0.8-r4.ebuild deleted file mode 100644 index 738f53c1118a..000000000000 --- a/x11-wm/icewm/icewm-1.0.8-r4.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -#Author Nathaniel Hirsch <nh2@njit.edu> - -P=icewm-1.0.8-r4 -A=icewm-1.0.8-4.tar.gz -S=${WORKDIR}/icewm-1.0.8 -DESCRIPTION="Ice Window Manager" -SRC_URI="prdownloads.sourceforge.net/icewm/${A}" -HOMEPAGE="www.icewm.org" - -DEPEND=">=x11-base/xfree-4.0.1" - -src_compile(){ - try ./configure --prefix=/usr/X11R6 --sysconfdir=/etc/X11/ - try make -} -src_install(){ - - try make prefix=${D}/usr/X11R6 DOCDIR=${S}/dummy install - exeinto /usr/X11R6/bin/wm - doexe ${FILESDIR}/icewm - dodoc BUGS CHANGES COPYING FAQ PLATFORMS README TODO VERSION - docinto html - dodoc doc/*.html - docinto sgml - dodoc doc/*.sgml - -} - diff --git a/x11-wm/xfce/files/digest-xfce-3.8.1 b/x11-wm/xfce/files/digest-xfce-3.8.1 deleted file mode 100644 index 51eb1ce0e529..000000000000 --- a/x11-wm/xfce/files/digest-xfce-3.8.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 6cc4a90a0d5e45b8f4e3ba06a08981aa xfce-3.8.1.tar.gz diff --git a/x11-wm/xfce/files/digest-xfce-3.8.1-r1 b/x11-wm/xfce/files/digest-xfce-3.8.1-r1 deleted file mode 100644 index 51eb1ce0e529..000000000000 --- a/x11-wm/xfce/files/digest-xfce-3.8.1-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 6cc4a90a0d5e45b8f4e3ba06a08981aa xfce-3.8.1.tar.gz diff --git a/x11-wm/xfce/files/digest-xfce-3.8.2 b/x11-wm/xfce/files/digest-xfce-3.8.2 deleted file mode 100644 index 10490f2201ed..000000000000 --- a/x11-wm/xfce/files/digest-xfce-3.8.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 2f7c799a6f39d0ef9ca27b8eaaa5ea88 xfce-3.8.2.tar.gz diff --git a/x11-wm/xfce/xfce-3.8.1-r1.ebuild b/x11-wm/xfce/xfce-3.8.1-r1.ebuild deleted file mode 100644 index 1b11a442d6f6..000000000000 --- a/x11-wm/xfce/xfce-3.8.1-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2001 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Ben Lutgens <ben@sistina.com> -# /home/cvsroot/gentoo-x86/x11-wm/blackbox/blackbox-0.61.1.ebuild,v 1.1 2001/04/20 18:51:22 drobbins Exp - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="XFce is a lightweight desktop environment for various UNIX systems." -SRC_URI="http://prdownloads.sourceforge.net/xfce/${A}" -HOMEPAGE="http://www.xfce.org/" - -DEPEND="virtual/x11 - >=x11-libs/gtk+-1.2 - gnome? ( >=gnome-base/gdk-pixbuf-0.10 )" - -if [ -z "`use gnome`" ] -then - DEPEND="${DEPEND} >=media-libs/imlib-1.9.10" -fi - -src_compile() { - local myconf - if [ "`use gnome`" ] - then - myconf="--enable-imlib=no --enable-gdk-pixbuf=/opt/gnome" - fi - try ./configure --prefix=/usr/X11R6 --mandir=/usr/X11R6/share/man --host=${CHOST} \ - --with-data-dir=/usr/X11R6/share/xfce --with-conf-dir=/etc/X11/xfce \ - --with-locale-dir=/usr/X11R6/share/locale ${myconf} - try make -} - -src_install () { - try make DESTDIR=${D} install - dodoc ChangeLog* AUTHORS LICENSE README* TODO* - exeinto /usr/X11R6/bin/wm - doexe ${FILESDIR}/xfce - dodir /etc/skel/.xfce -} diff --git a/x11-wm/xfce/xfce-3.8.1.ebuild b/x11-wm/xfce/xfce-3.8.1.ebuild deleted file mode 100644 index 499db1bd6565..000000000000 --- a/x11-wm/xfce/xfce-3.8.1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2001 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Ben Lutgens <ben@sistina.com> -# /home/cvsroot/gentoo-x86/x11-wm/blackbox/blackbox-0.61.1.ebuild,v 1.1 2001/04/20 18:51:22 drobbins Exp - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="XFce is a lightweight desktop environment for various UNIX systems." -SRC_URI="http://prdownloads.sourceforge.net/xfce/${A}" -HOMEPAGE="http://www.xfce.org/" - -DEPEND="virtual/x11 - >=x11-libs/gtk+-1.2 - >=media-libs/imlib-1.9.10" - -src_compile() { - try ./configure --prefix=/usr/X11R6 --mandir=/usr/X11R6/share/man --host=${CHOST} - try make -} - -src_install () { - try make DESTDIR=${D} install - dodoc ChangeLog* AUTHORS LICENSE README* TODO* - exeinto /usr/X11R6/bin/wm - doexe ${FILESDIR}/xfce -} diff --git a/x11-wm/xfce/xfce-3.8.2.ebuild b/x11-wm/xfce/xfce-3.8.2.ebuild deleted file mode 100644 index 1b11a442d6f6..000000000000 --- a/x11-wm/xfce/xfce-3.8.2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2001 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# Author Ben Lutgens <ben@sistina.com> -# /home/cvsroot/gentoo-x86/x11-wm/blackbox/blackbox-0.61.1.ebuild,v 1.1 2001/04/20 18:51:22 drobbins Exp - -A=${P}.tar.gz -S=${WORKDIR}/${P} -DESCRIPTION="XFce is a lightweight desktop environment for various UNIX systems." -SRC_URI="http://prdownloads.sourceforge.net/xfce/${A}" -HOMEPAGE="http://www.xfce.org/" - -DEPEND="virtual/x11 - >=x11-libs/gtk+-1.2 - gnome? ( >=gnome-base/gdk-pixbuf-0.10 )" - -if [ -z "`use gnome`" ] -then - DEPEND="${DEPEND} >=media-libs/imlib-1.9.10" -fi - -src_compile() { - local myconf - if [ "`use gnome`" ] - then - myconf="--enable-imlib=no --enable-gdk-pixbuf=/opt/gnome" - fi - try ./configure --prefix=/usr/X11R6 --mandir=/usr/X11R6/share/man --host=${CHOST} \ - --with-data-dir=/usr/X11R6/share/xfce --with-conf-dir=/etc/X11/xfce \ - --with-locale-dir=/usr/X11R6/share/locale ${myconf} - try make -} - -src_install () { - try make DESTDIR=${D} install - dodoc ChangeLog* AUTHORS LICENSE README* TODO* - exeinto /usr/X11R6/bin/wm - doexe ${FILESDIR}/xfce - dodir /etc/skel/.xfce -} |