summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Hallendal <hallski@gentoo.org>2001-11-10 11:31:53 +0000
committerMikael Hallendal <hallski@gentoo.org>2001-11-10 11:31:53 +0000
commit98ba0d49c7308f4335a828a43dbb54ae37311718 (patch)
tree4113be2a7befbe0d9bf9738072330c6291eca801 /dev-lang/nasm
parentA=-fix (diff)
downloadgentoo-2-98ba0d49c7308f4335a828a43dbb54ae37311718.tar.gz
gentoo-2-98ba0d49c7308f4335a828a43dbb54ae37311718.tar.bz2
gentoo-2-98ba0d49c7308f4335a828a43dbb54ae37311718.zip
A=-fix, try->die,...
Diffstat (limited to 'dev-lang/nasm')
-rw-r--r--dev-lang/nasm/files/digest-nasm-0.98-r21
-rw-r--r--dev-lang/nasm/nasm-0.98-r2.ebuild46
-rw-r--r--dev-lang/nasm/nasm-0.98-r3.ebuild28
3 files changed, 12 insertions, 63 deletions
diff --git a/dev-lang/nasm/files/digest-nasm-0.98-r2 b/dev-lang/nasm/files/digest-nasm-0.98-r2
deleted file mode 100644
index 0204a3d56424..000000000000
--- a/dev-lang/nasm/files/digest-nasm-0.98-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9b7b0cb51d6b777edcbed7e0447a5f4e nasm-0.98.tar.bz2 389120
diff --git a/dev-lang/nasm/nasm-0.98-r2.ebuild b/dev-lang/nasm/nasm-0.98-r2.ebuild
deleted file mode 100644
index b0cdff6c1325..000000000000
--- a/dev-lang/nasm/nasm-0.98-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 <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98-r2.ebuild,v 1.2 2001/05/29 17:28:19 achim Exp $
-
-P=nasm-0.98
-A=${P}.tar.bz2
-S=${WORKDIR}/${P}
-DESCRIPTION="groovy little assembler"
-SRC_URI="ftp://ftp.kernel.org/pub/software/devel/nasm/source/${A}
- ftp://ftp.de.kernel.org/pub/software/devel/nasm/source/${A}
- ftp://ftp.uk.kernel.org/pub/software/devel/nasm/source/${A}"
-HOMEPAGE="http://nasm.sourceforge.net/"
-
-DEPEND="virtual/glibc sys-devel/perl sys-apps/texinfo"
-RDEPEND="virtual/glibc"
-
-src_compile() {
-
- try ./configure --prefix=/usr
- try make
- cd doc
- try make
-}
-
-src_install() {
-
-
- dobin nasm ndisasm
- dobin rdoff/ldrdf rdoff/rdf2bin rdoff/rdfdump rdoff/rdflib rdoff/rdx
- doman nasm.1 ndisasm.1
- dodoc COPYING Changes Licence MODIFIED Readme Wishlist
- docinto txt
- cd doc
- dodoc nasmdoc.txt
- docinto html
- dodoc html/*.html
- docinto ps
- dodoc nasmdoc.ps
- docinto rtf
- dodoc nasmdoc.rtf
-
- doinfo info/*.info*
-}
-
-
diff --git a/dev-lang/nasm/nasm-0.98-r3.ebuild b/dev-lang/nasm/nasm-0.98-r3.ebuild
index 631c9227150b..1d8b740e8151 100644
--- a/dev-lang/nasm/nasm-0.98-r3.ebuild
+++ b/dev-lang/nasm/nasm-0.98-r3.ebuild
@@ -1,15 +1,13 @@
# 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/dev-lang/nasm/nasm-0.98-r3.ebuild,v 1.2 2001/08/18 04:27:00 chadh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nasm/nasm-0.98-r3.ebuild,v 1.3 2001/11/10 11:31:53 hallski Exp $
-P=nasm-0.98
-A=${P}.tar.bz2
S=${WORKDIR}/${P}
DESCRIPTION="groovy little assembler"
-SRC_URI="ftp://ftp.kernel.org/pub/software/devel/nasm/source/${A}
- ftp://ftp.de.kernel.org/pub/software/devel/nasm/source/${A}
- ftp://ftp.uk.kernel.org/pub/software/devel/nasm/source/${A}"
+SRC_URI="ftp://ftp.kernel.org/pub/software/devel/nasm/source/${P}.tar.bz2
+ ftp://ftp.de.kernel.org/pub/software/devel/nasm/source/${P}.tar.bz2
+ ftp://ftp.uk.kernel.org/pub/software/devel/nasm/source/${P}.tar.bz2"
HOMEPAGE="http://nasm.sourceforge.net/"
DEPEND="virtual/glibc sys-apps/texinfo"
@@ -20,15 +18,15 @@ if [ -z "`use build`" ]; then
fi
src_compile() {
+ ./configure --prefix=/usr || die
- try ./configure --prefix=/usr
- if [ "`use build`" ]; then
- make nasm
- else
- try make
- cd doc
- try make
- fi
+ if [ "`use build`" ]; then
+ make nasm
+ else
+ make || die
+ cd doc
+ make || die
+ fi
}
src_install() {
@@ -52,5 +50,3 @@ src_install() {
doinfo info/*.info*
fi
}
-
-