new version; move awk to /bin

5 files changed, 88 insertions, 6 deletions

diff --git a/sys-apps/gawk/ChangeLog b/sys-apps/gawk/ChangeLog
index b35519bd062f..b1cbfd47b533 100644
--- a/sys-apps/gawk/ChangeLog
+++ b/sys-apps/gawk/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/gawk
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.4 2002/07/14 19:20:17 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.5 2002/07/21 16:36:05 azarah Exp $
+
+*gawk-3.1.1 (21 Jul 2002)
+
+  21 Jul 2002; Martin Schlemmmer <azarah@gentoo.org> :
+  Update version.
+
+*gawk-3.1.0-r3 (21 Jul 2002)
+
+  21 Jul 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Move /usr/bin/awk to /bin/awk for upcomming baselayout.
 
 *gawk-3.1.0-r2 (26 Jun 2002)
 
diff --git a/sys-apps/gawk/files/digest-gawk-3.1.0-r2 b/sys-apps/gawk/files/digest-gawk-3.1.0-r3
index bc69ec02d738..bc69ec02d738 100644
--- a/sys-apps/gawk/files/digest-gawk-3.1.0-r2
+++ b/sys-apps/gawk/files/digest-gawk-3.1.0-r3
diff --git a/sys-apps/gawk/files/digest-gawk-3.1.1 b/sys-apps/gawk/files/digest-gawk-3.1.1
new file mode 100644
index 000000000000..d0f65dc6c181
--- /dev/null
+++ b/sys-apps/gawk/files/digest-gawk-3.1.1
@@ -0,0 +1 @@
+MD5 47e3754195bf32c8b78ad632bab903cd gawk-3.1.1.tar.gz 1875134
diff --git a/sys-apps/gawk/gawk-3.1.0-r3.ebuild b/sys-apps/gawk/gawk-3.1.0-r3.ebuild
new file mode 100644
index 000000000000..cf12750ab634
--- /dev/null
+++ b/sys-apps/gawk/gawk-3.1.0-r3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.0-r3.ebuild,v 1.1 2002/07/21 16:36:05 azarah Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="GNU awk pattern-matching language"
+SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/gawk/${P}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/gawk/gawk.html"
+KEYWORDS="x86 ppc"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="virtual/glibc
+		nls? ( sys-devel/gettext )"
+
+src_compile() {
+
+	local myconf=""
+	use nls || myconf="${myconf} --disable-nls"
+
+	./configure --prefix=/usr \
+		--libexecdir=/usr/lib/awk \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--host=${CHOST}  \
+		${myconf} || die
+
+	emake || die
+}
+
+src_install() {
+
+	make prefix=${D}/usr \
+		bindir=${D}/bin \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
+		libexecdir=${D}/usr/lib/awk \
+		install || die
+		
+	cd ${D}/bin
+	rm -f gawk
+	ln -s gawk-${PV} gawk
+	#compat symlink
+	dodir /usr/bin
+	cd ${D}/usr/bin
+	ln -s /bin/gawk-${PV} awk
+	ln -s /bin/gawk-${PV} gawk
+	
+	cd ${S}
+	if [ -z "`use build`" ] 
+	then
+		dosym gawk.1.gz /usr/share/man/man1/awk.1.gz
+		dodoc ChangeLog ACKNOWLEDGMENT COPYING FUTURES
+		dodoc LIMITATIONS NEWS PROBLEMS README
+		docinto README_d
+		dodoc README_d/*
+		docinto atari
+		dodoc atari/ChangeLog atari/README.1st
+		docinto awklib
+		dodoc awklib/ChangeLog
+		docinto pc
+		dodoc pc/ChangeLog
+		docinto posix
+		dodoc posix/ChangeLog
+	else
+		rm -rf ${D}/usr/share
+	fi
+}
+
diff --git a/sys-apps/gawk/gawk-3.1.0-r2.ebuild b/sys-apps/gawk/gawk-3.1.1.ebuild
index 8f98443720b3..25deab78dc22 100644
--- a/sys-apps/gawk/gawk-3.1.0-r2.ebuild
+++ b/sys-apps/gawk/gawk-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.0-r2.ebuild,v 1.5 2002/07/16 05:50:56 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.1.ebuild,v 1.1 2002/07/21 16:36:05 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU awk pattern-matching language"
@@ -31,18 +31,20 @@ src_compile() {
 src_install() {
 
 	make prefix=${D}/usr \
+		bindir=${D}/bin \
 		mandir=${D}/usr/share/man \
 		infodir=${D}/usr/share/info \
 		libexecdir=${D}/usr/lib/awk \
 		install || die
 		
-	cd ${D}/usr/bin
+	cd ${D}/bin
 	rm -f gawk
 	ln -s gawk-${PV} gawk
 	#compat symlink
-	dodir /bin
-	cd ${D}/bin
-	ln -s /usr/bin/gawk-${PV} awk
+	dodir /usr/bin
+	cd ${D}/usr/bin
+	ln -s /bin/gawk-${PV} awk
+	ln -s /bin/gawk-${PV} gawk
 	
 	cd ${S}
 	if [ -z "`use build`" ]