fixums

2 files changed, 25 insertions, 89 deletions

diff --git a/sys-apps/gawk/gawk-3.0.6-r3.ebuild b/sys-apps/gawk/gawk-3.0.6-r3.ebuild
deleted file mode 100644
index 381280717c31..000000000000
--- a/sys-apps/gawk/gawk-3.0.6-r3.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 Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.0.6-r3.ebuild,v 1.1 2001/02/27 16:39:39 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU awk pattern-matching language"
-SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/gawk/${A}
-	 ftp://prep.ai.mit.edu/gnu/gawk/${A}"
-HOMEPAGE="http://www.gnu.org/software/gawk/gawk.html"
-DEPEND="virtual/glibc"
-
-src_compile() {
-
-	try ./configure --prefix=/usr --libexecdir=/usr/lib/awk --mandir=/usr/share/man --infodir=/usr/share/info --host=${CHOST}
-    if [ -z "`use static`" ]
-    then
-	    try make ${MAKEOPTS}
-    else
-        try make ${MAKEOPTS} LDFLAGS=-static
-    fi
-
-}
-
-src_install() {
-
-	try make prefix=${D}/usr mandir=${D}/usr/share/man/man1 infodir=${D}/usr/share/info libexecdir=${D}/usr/lib/awk install
-
-    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/man ${D}/usr/share/info
-     fi
-
-}
-
-
-
diff --git a/sys-apps/gawk/gawk-3.0.6-r4.ebuild b/sys-apps/gawk/gawk-3.0.6-r4.ebuild
index 0b04ab9d862c..c6797009dd38 100644
--- a/sys-apps/gawk/gawk-3.0.6-r4.ebuild
+++ b/sys-apps/gawk/gawk-3.0.6-r4.ebuild
@@ -1,49 +1,37 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# 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.2 2001/08/04 18:22:45 pete Exp $
+# Author: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.0.6-r4.ebuild,v 1.3 2001/10/06 17:04:49 drobbins Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU awk pattern-matching language"
-SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/gawk/${A}
-	 ftp://prep.ai.mit.edu/gnu/gawk/${A}"
+SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/gawk/${P}.tar.gz ftp://prep.ai.mit.edu/gnu/gawk/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/gawk/gawk.html"
 DEPEND="virtual/glibc"
 
 src_compile() {
-
-	try ./configure --prefix=/usr --libexecdir=/usr/lib/awk --mandir=/usr/share/man --infodir=/usr/share/info --host=${CHOST}
-    if [ -z "`use static`" ]
-    then
-	    try make ${MAKEOPTS}
-    else
-        try make ${MAKEOPTS} LDFLAGS=-static
-    fi
-
+	./configure --prefix=/usr --libexecdir=/usr/lib/awk --mandir=/usr/share/man --infodir=/usr/share/info --host=${CHOST} || die
+	emake || die
 }
 
 src_install() {
-
-	try make prefix=${D}/usr mandir=${D}/usr/share/man/man1 infodir=${D}/usr/share/info libexecdir=${D}/usr/lib/awk install
-
-    if [ -z "`use build`" ] && [ -z "`use bootcd`" ]
-    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
-
+	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
 }