add /bin/awk compat symlink

5 files changed, 25 insertions, 43 deletions

diff --git a/sys-apps/gawk/ChangeLog b/sys-apps/gawk/ChangeLog
index 0991cf2daa5d..7a6543d526ad 100644
--- a/sys-apps/gawk/ChangeLog
+++ b/sys-apps/gawk/ChangeLog
@@ -1,6 +1,11 @@
 # 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.2 2002/03/12 13:42:56 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.3 2002/06/24 23:00:19 azarah Exp $
+
+*gawk-3.1.0-r2 (26 Jun 2002)
+
+  26 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Add /bin/awk compat symlink, closing bug #3288.
 
 *gawk-3.1.0-r1 (12 Mar 2002)
 
diff --git a/sys-apps/gawk/files/digest-gawk-3.0.6-r4 b/sys-apps/gawk/files/digest-gawk-3.0.6-r4
deleted file mode 100644
index 2cf943fb2844..000000000000
--- a/sys-apps/gawk/files/digest-gawk-3.0.6-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b5ba21c033f5a9737455458d94954609 gawk-3.0.6.tar.gz 1047328
diff --git a/sys-apps/gawk/files/digest-gawk-3.1.0 b/sys-apps/gawk/files/digest-gawk-3.1.0-r2
index bc69ec02d738..bc69ec02d738 100644
--- a/sys-apps/gawk/files/digest-gawk-3.1.0
+++ b/sys-apps/gawk/files/digest-gawk-3.1.0-r2
diff --git a/sys-apps/gawk/gawk-3.0.6-r4.ebuild b/sys-apps/gawk/gawk-3.0.6-r4.ebuild
deleted file mode 100644
index d75f9bc1f4cb..000000000000
--- a/sys-apps/gawk/gawk-3.0.6-r4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2001 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/gawk/gawk-3.0.6-r4.ebuild,v 1.4 2001/11/24 18:36:40 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU awk pattern-matching language"
-SRC_URI="ftp://prep.ai.mit.edu/gnu/gawk/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/gawk/gawk.html"
-DEPEND="virtual/glibc"
-
-src_compile() {
-	./configure --prefix=/usr --libexecdir=/usr/lib/awk --mandir=/usr/share/man --infodir=/usr/share/info --host=${CHOST} || die
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr mandir=${D}/usr/share/man/man1 infodir=${D}/usr/share/info libexecdir=${D}/usr/lib/awk install || die
-	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.ebuild b/sys-apps/gawk/gawk-3.1.0-r2.ebuild
index fb60e701f6c1..1226beef16a3 100644
--- a/sys-apps/gawk/gawk-3.1.0.ebuild
+++ b/sys-apps/gawk/gawk-3.1.0-r2.ebuild
@@ -1,33 +1,47 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.0.ebuild,v 1.4 2001/12/31 23:47:55 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.0-r2.ebuild,v 1.1 2002/06/24 23:00:19 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"
 
-DEPEND="virtual/glibc"
+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} || die
+		--host=${CHOST}  \
+		${myconf} || die
+
 	emake || die
 }
 
 src_install() {
+
 	make prefix=${D}/usr \
 		mandir=${D}/usr/share/man \
 		infodir=${D}/usr/share/info \
 		libexecdir=${D}/usr/lib/awk \
 		install || die
+		
 	cd ${D}/usr/bin
-	rm gawk
+	rm -f gawk
 	ln -s gawk-${PV} gawk
+	#compat symlink
+	dodir /bin
+	cd ${D}/bin
+	ln -s /usr/bin/gawk-${PV} awk
+	
 	cd ${S}
 	if [ -z "`use build`" ] 
 	then
@@ -48,3 +62,4 @@ src_install() {
 		rm -rf ${D}/usr/share
 	fi
 }
+