diff options
author | jmmv <jmmv> | 2003-09-17 16:40:12 +0000 |
---|---|---|
committer | jmmv <jmmv> | 2003-09-17 16:40:12 +0000 |
commit | 5bef77b1bd8e311d9cc30b29722df4e22164808b (patch) | |
tree | 11ca480bc60fb01b774fe5a57489f1f16184ade8 /devel | |
parent | bb0685643cf42e490473c12f24953878da7b61c0 (diff) | |
download | pkgsrc-5bef77b1bd8e311d9cc30b29722df4e22164808b.tar.gz |
Update to 0.98.37 (really, rename nasm-devel to nasm). This version is far
more complete than 0.98, plus homogenizing the package in a single one will
save us from conflicts during bulk builds (and during manual builds too).
Diffstat (limited to 'devel')
-rw-r--r-- | devel/nasm/DESCR | 13 | ||||
-rw-r--r-- | devel/nasm/Makefile | 20 | ||||
-rw-r--r-- | devel/nasm/PLIST | 42 | ||||
-rw-r--r-- | devel/nasm/distinfo | 8 | ||||
-rw-r--r-- | devel/nasm/patches/patch-aa | 13 | ||||
-rw-r--r-- | devel/nasm/patches/patch-ab | 40 |
6 files changed, 118 insertions, 18 deletions
diff --git a/devel/nasm/DESCR b/devel/nasm/DESCR index e80dc9e3531..5db02d290f3 100644 --- a/devel/nasm/DESCR +++ b/devel/nasm/DESCR @@ -1,8 +1,5 @@ -This is a distribution of NASM, the Netwide Assembler. NASM is a -prototype general-purpose x86 assembler. It will currently output -flat-form binary files, a.out, COFF and ELF Unix object files, -Microsoft Win32 and 16-bit DOS object files, OS/2 object files, the -as86 object format, and a home-grown format called RDF. - -Also included is NDISASM, a prototype x86 binary-file disassembler -which uses the same instruction table as NASM. +The Netwide Assembler, NASM, is an 80x86 assembler designed for portability +and modularity. It supports a range of object file formats, including Linux +a.out and ELF, NetBSD/FreeBSD, COFF, Microsoft 16-bit OBJ and Win32. It will +also output plain binary files. Its syntax is designed to be simple and easy +to understand, similar to Intel's but less complex. diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile index 3d7ec2a4de2..764f88ae25a 100644 --- a/devel/nasm/Makefile +++ b/devel/nasm/Makefile @@ -1,15 +1,23 @@ -# $NetBSD: Makefile,v 1.8 2003/07/17 21:31:53 grant Exp $ -# FreeBSD Id: Makefile,v 1.5 1999/06/16 14:02:28 billf Exp $ +# $NetBSD: Makefile,v 1.9 2003/09/17 16:40:12 jmmv Exp $ +# -DISTNAME= nasm-0.98 +DISTNAME= nasm-0.98.37 CATEGORIES= devel lang -MASTER_SITES= ${MASTER_SITE_SUNSITE:=devel/lang/assemblers/} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nasm/} MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://nasm.sourceforge.net/ -COMMENT= General-purpose multi-platform x86 assembler +COMMENT= General-purpose x86 assembler +ALL_TARGET= everything +INSTALL_TARGET= install_everything GNU_CONFIGURE= yes -USE_BUILDLINK2= yes +USE_GMAKE= yes +USE_PERL5= build +USE_MAKEINFO= YES +INFO_FILES= nasm.info + +MAKE_ENV+= PERL5="${PERL5}" \ + INSTALL_DATA_DIR="${INSTALL_DATA_DIR}" .include "../../mk/bsd.pkg.mk" diff --git a/devel/nasm/PLIST b/devel/nasm/PLIST index 50a02dd1b24..4f7b98af69c 100644 --- a/devel/nasm/PLIST +++ b/devel/nasm/PLIST @@ -1,5 +1,45 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:24:55 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/09/17 16:40:12 jmmv Exp $ bin/nasm bin/ndisasm +bin/rdfdump +bin/ldrdf +bin/rdx +bin/rdflib +bin/rdf2bin +bin/rdf2ihx +bin/rdf2com man/man1/nasm.1 man/man1/ndisasm.1 +info/nasm.info +info/nasm.info-1 +info/nasm.info-2 +info/nasm.info-3 +info/nasm.info-4 +info/nasm.info-5 +info/nasm.info-6 +info/nasm.info-7 +info/nasm.info-8 +info/nasm.info-9 +info/nasm.info-10 +info/nasm.info-11 +info/nasm.info-12 +info/nasm.info-13 +info/nasm.info-14 +share/doc/html/nasm/nasmdoc0.html +share/doc/html/nasm/nasmdoc1.html +share/doc/html/nasm/nasmdoc2.html +share/doc/html/nasm/nasmdoc3.html +share/doc/html/nasm/nasmdoc4.html +share/doc/html/nasm/nasmdoc5.html +share/doc/html/nasm/nasmdoc6.html +share/doc/html/nasm/nasmdoc7.html +share/doc/html/nasm/nasmdoc8.html +share/doc/html/nasm/nasmdoc9.html +share/doc/html/nasm/nasmdo10.html +share/doc/html/nasm/nasmdoca.html +share/doc/html/nasm/nasmdocb.html +share/doc/html/nasm/nasmdoci.html +share/doc/nasm/nasmdoc.ps +share/doc/nasm/nasmdoc.txt +@dirrm share/doc/html/nasm +@dirrm share/doc/nasm diff --git a/devel/nasm/distinfo b/devel/nasm/distinfo index 688d7d87dff..1150cdce72f 100644 --- a/devel/nasm/distinfo +++ b/devel/nasm/distinfo @@ -1,4 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 00:44:31 wiz Exp $ +$NetBSD: distinfo,v 1.3 2003/09/17 16:40:13 jmmv Exp $ -SHA1 (nasm-0.98.tar.gz) = c18adc9a543d785fa3b950dd2980a350a3eff772 -Size (nasm-0.98.tar.gz) = 468600 bytes +SHA1 (nasm-0.98.37.tar.gz) = c51939545d394db2538436561973e7ddfadc7bdc +Size (nasm-0.98.37.tar.gz) = 631560 bytes +SHA1 (patch-aa) = b0a4c91d7448ba630bfb482ab8f97e98753169cb +SHA1 (patch-ab) = bbe1d7219dd2e5ade8f97a4f3070bc87d3a7d4b5 diff --git a/devel/nasm/patches/patch-aa b/devel/nasm/patches/patch-aa new file mode 100644 index 00000000000..60d60833200 --- /dev/null +++ b/devel/nasm/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.1 2003/09/17 16:40:14 jmmv Exp $ + +--- Makefile.in.orig Fri Aug 29 21:56:40 2003 ++++ Makefile.in +@@ -18,7 +18,7 @@ CC = @CC@ + CFLAGS = @CFLAGS@ @GCCFLAGS@ @DEFS@ -I$(srcdir) -I. + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ +-PERL = perl ++PERL = ${PERL5} + + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/devel/nasm/patches/patch-ab b/devel/nasm/patches/patch-ab new file mode 100644 index 00000000000..6ee5e1da311 --- /dev/null +++ b/devel/nasm/patches/patch-ab @@ -0,0 +1,40 @@ +$NetBSD: patch-ab,v 1.1 2003/09/17 16:40:14 jmmv Exp $ + +--- doc/Makefile.in.orig 2002-05-18 22:17:28.000000000 +0000 ++++ doc/Makefile.in +@@ -9,20 +9,20 @@ prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ + mandir = @mandir@ +-docdir = $(prefix)/doc/nasm ++docdir = $(prefix)/share/doc/nasm ++htmldocdir = $(prefix)/share/doc/html/nasm + infodir = @infodir@ + + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ + +-PERL = perl +-MAKEINFO = makeinfo ++PERL = ${PERL5} + TEXI2DVI = texi2dvi + PS2PDF = ps2pdf -dOptimize=true # Part of GhostScript + + SRCS = nasmdoc.src +-OUT = nasm.info nasmdoc.ps nasmdoc.pdf ++OUT = nasm.info nasmdoc.ps # nasmdoc.pdf + + all: $(OUT) + +@@ -73,6 +73,7 @@ spotless: clean + + install: all + $(INSTALL_DATA) info/* $(INSTALLROOT)$(infodir) +- mkdir -p $(INSTALLROOT)$(docdir)/html +- $(INSTALL_DATA) html/* $(INSTALLROOT)$(docdir)/html +- $(INSTALL_DATA) nasmdoc.ps nasmdoc.pdf nasmdoc.txt $(INSTALLROOT)$(docdir) ++ $(INSTALL_DATA_DIR) $(INSTALLROOT)$(docdir) ++ $(INSTALL_DATA_DIR) $(INSTALLROOT)$(htmldocdir) ++ $(INSTALL_DATA) html/* $(INSTALLROOT)$(htmldocdir) ++ $(INSTALL_DATA) nasmdoc.ps nasmdoc.txt $(INSTALLROOT)$(docdir) |