Thu May 18 21:44:42 2017 UTC ()
Version 2.13.01

Fix incorrect output for some types of FAR or SEG references in the obj output format, and possibly other 16-bit output formats.

Fix the address in the list file for an instruction containing a TIMES directive.

Fix error with TIMES used together with an instruction which can vary in size, e.g. JMP.

Fix breakage on some uses of the DZ pseudo-op.


(adam)
diff -r1.53 -r1.54 pkgsrc/devel/nasm/Makefile
diff -r1.11 -r1.12 pkgsrc/devel/nasm/PLIST
diff -r1.26 -r1.27 pkgsrc/devel/nasm/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/nasm/patches/patch-Makefile.in
diff -r1.1 -r1.2 pkgsrc/devel/nasm/patches/patch-doc_Makefile.in
cvs diff -r1.53 -r1.54 pkgsrc/devel/nasm/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/nasm/Makefile 2017/02/14 08:05:30 1.53
+++ pkgsrc/devel/nasm/Makefile 2017/05/18 21:44:42 1.54
@@ -1,28 +1,25 @@ @@ -1,28 +1,25 @@
1# $NetBSD: Makefile,v 1.53 2017/02/14 08:05:30 adam Exp $ 1# $NetBSD: Makefile,v 1.54 2017/05/18 21:44:42 adam Exp $
2 2
3DISTNAME= nasm-2.12.02 3DISTNAME= nasm-2.13.01
4CATEGORIES= devel lang 4CATEGORIES= devel lang
5MASTER_SITES= http://www.nasm.us/pub/nasm/releasebuilds/${PKGVERSION_NOREV}/ 5MASTER_SITES= http://www.nasm.us/pub/nasm/releasebuilds/${PKGVERSION_NOREV}/
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.nasm.us/ 9HOMEPAGE= http://www.nasm.us/
10COMMENT= General-purpose x86 assembler 10COMMENT= General-purpose x86 assembler
11# actually only 2-clause BSD 11LICENSE= 2-clause-bsd
12LICENSE= modified-bsd 
13 12
14AUTO_MKDIRS= yes 13#AUTO_MKDIRS= yes
15 14
16USE_TOOLS+= gmake makeinfo perl 15USE_TOOLS+= gmake makeinfo perl
17GCC_REQD+= 3.0 16GCC_REQD+= 3.0
18GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
19 18
20INFO_FILES= yes 
21BUILD_TARGET= everything 19BUILD_TARGET= everything
22INSTALL_TARGET= install_everything 20INSTALL_TARGET= install_everything
23 21
24INSTALL_ENV+= INSTALLROOT=${DESTDIR} 22INSTALL_ENV+= INSTALLROOT=${DESTDIR}
25 
26MAKE_ENV+= PERL5=${PERL5:Q} 23MAKE_ENV+= PERL5=${PERL5:Q}
27 24
28.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/devel/nasm/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/nasm/PLIST 2009/07/22 21:21:33 1.11
+++ pkgsrc/devel/nasm/PLIST 2017/05/18 21:44:42 1.12
@@ -1,43 +1,46 @@ @@ -1,43 +1,46 @@
1@comment $NetBSD: PLIST,v 1.11 2009/07/22 21:21:33 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.12 2017/05/18 21:44:42 adam Exp $
2bin/ldrdf 2bin/ldrdf
3bin/nasm 3bin/nasm
4bin/ndisasm 4bin/ndisasm
5bin/rdf2bin 5bin/rdf2bin
6bin/rdf2com 6bin/rdf2com
7bin/rdf2ihx 7bin/rdf2ihx
8bin/rdf2ith 8bin/rdf2ith
9bin/rdf2srec 9bin/rdf2srec
10bin/rdfdump 10bin/rdfdump
11bin/rdflib 11bin/rdflib
12bin/rdx 12bin/rdx
13info/nasm.info 
14man/man1/ldrdf.1 13man/man1/ldrdf.1
15man/man1/nasm.1 14man/man1/nasm.1
16man/man1/ndisasm.1 15man/man1/ndisasm.1
17man/man1/rdf2bin.1 16man/man1/rdf2bin.1
18man/man1/rdf2com.1 17man/man1/rdf2com.1
19man/man1/rdf2ihx.1 18man/man1/rdf2ihx.1
20man/man1/rdf2ith.1 19man/man1/rdf2ith.1
21man/man1/rdf2srec.1 20man/man1/rdf2srec.1
22man/man1/rdfdump.1 21man/man1/rdfdump.1
23man/man1/rdflib.1 22man/man1/rdflib.1
24man/man1/rdx.1 23man/man1/rdx.1
 24share/doc/nasm/html/local.css
25share/doc/nasm/html/nasmdo10.html 25share/doc/nasm/html/nasmdo10.html
26share/doc/nasm/html/nasmdo11.html 26share/doc/nasm/html/nasmdo11.html
27share/doc/nasm/html/nasmdo12.html 27share/doc/nasm/html/nasmdo12.html
 28share/doc/nasm/html/nasmdoc.css
28share/doc/nasm/html/nasmdoc0.html 29share/doc/nasm/html/nasmdoc0.html
29share/doc/nasm/html/nasmdoc1.html 30share/doc/nasm/html/nasmdoc1.html
30share/doc/nasm/html/nasmdoc2.html 31share/doc/nasm/html/nasmdoc2.html
31share/doc/nasm/html/nasmdoc3.html 32share/doc/nasm/html/nasmdoc3.html
32share/doc/nasm/html/nasmdoc4.html 33share/doc/nasm/html/nasmdoc4.html
33share/doc/nasm/html/nasmdoc5.html 34share/doc/nasm/html/nasmdoc5.html
34share/doc/nasm/html/nasmdoc6.html 35share/doc/nasm/html/nasmdoc6.html
35share/doc/nasm/html/nasmdoc7.html 36share/doc/nasm/html/nasmdoc7.html
36share/doc/nasm/html/nasmdoc8.html 37share/doc/nasm/html/nasmdoc8.html
37share/doc/nasm/html/nasmdoc9.html 38share/doc/nasm/html/nasmdoc9.html
38share/doc/nasm/html/nasmdoca.html 39share/doc/nasm/html/nasmdoca.html
39share/doc/nasm/html/nasmdocb.html 40share/doc/nasm/html/nasmdocb.html
40share/doc/nasm/html/nasmdocc.html 41share/doc/nasm/html/nasmdocc.html
 42share/doc/nasm/html/nasmdocd.html
 43share/doc/nasm/html/nasmdoce.html
41share/doc/nasm/html/nasmdoci.html 44share/doc/nasm/html/nasmdoci.html
42share/doc/nasm/nasmdoc.ps 45share/doc/nasm/html/nasmlogw.png
43share/doc/nasm/nasmdoc.txt 46share/doc/nasm/nasmdoc.txt
cvs diff -r1.26 -r1.27 pkgsrc/devel/nasm/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/nasm/distinfo 2017/02/14 08:05:30 1.26
+++ pkgsrc/devel/nasm/distinfo 2017/05/18 21:44:42 1.27
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.26 2017/02/14 08:05:30 adam Exp $ 1$NetBSD: distinfo,v 1.27 2017/05/18 21:44:42 adam Exp $
2 2
3SHA1 (nasm-2.12.02.tar.xz) = a0e6e655d04009178d4b7c15d935a46a691a617c 3SHA1 (nasm-2.13.01.tar.xz) = b2ff7fbb085cfc7ba29f48cd79cb1e88bbcc128b
4RMD160 (nasm-2.12.02.tar.xz) = 7929d01e0a53860c2e6a5c2d3b819d4abd693975 4RMD160 (nasm-2.13.01.tar.xz) = 04a53df091350466ec5bb270662ac0da63a5d219
5SHA512 (nasm-2.12.02.tar.xz) = a2b4728386aa451160cee00455d5052dbf983866693c5faa9532c57b9d246c27a4f4f07cf7ca77ee7547c1702f685e9bee8f370dd0aedb5b5fa1898f25389b83 5SHA512 (nasm-2.13.01.tar.xz) = 6561a2efb3ffea77a1a8cd364edf1ecedb2c14e1902469d7c59d743f25ca612529113d1099818abbe0a9f2592f12604f1810855bbdf8dc9de3648094a83529ae
6Size (nasm-2.12.02.tar.xz) = 782444 bytes 6Size (nasm-2.13.01.tar.xz) = 800244 bytes
7SHA1 (patch-Makefile.in) = 256fb7cb3483cbce67f2f608fa83732f3bcbfad6 7SHA1 (patch-Makefile.in) = a85054afeb827b61b0db3352825088454e3013d4
8SHA1 (patch-doc_Makefile.in) = 9e5e8bd407c1516a99dd76396dc0ff4197f01dee 8SHA1 (patch-doc_Makefile.in) = 20bb04e4fb00ec14d1e2bb31a3fe2497673132ef
cvs diff -r1.1 -r1.2 pkgsrc/devel/nasm/patches/patch-Makefile.in (expand / switch to unified diff)

--- pkgsrc/devel/nasm/patches/patch-Makefile.in 2017/02/14 08:05:30 1.1
+++ pkgsrc/devel/nasm/patches/patch-Makefile.in 2017/05/18 21:44:42 1.2
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1$NetBSD: patch-Makefile.in,v 1.1 2017/02/14 08:05:30 adam Exp $ 1$NetBSD: patch-Makefile.in,v 1.2 2017/05/18 21:44:42 adam Exp $
2 2
3Use correct tools. 3Use correct tools.
4 4
5--- Makefile.in.orig 2016-07-06 20:44:27.000000000 +0000 5--- Makefile.in.orig 2017-05-02 05:18:51.000000000 +0000
6+++ Makefile.in 6+++ Makefile.in
7@@ -23,7 +23,7 @@ INTERNAL_CFLAGS = -I$(srcdir) -I. 7@@ -35,7 +35,7 @@ AR = @AR@
8 ALL_CFLAGS = $(BUILD_CFLAGS) $(INTERNAL_CFLAGS) 8 RANLIB = @RANLIB@
9 LDFLAGS = @LDFLAGS@ 9 STRIP = @STRIP@
10 LIBS = @LIBS@ 
11-PERL = perl -I$(srcdir)/perllib -I$(srcdir) 
12+PERL = ${PERL5} 
13  10
14 XOBJS = @XOBJS@ 11-PERL = perl
 12+PERL = ${PERL5}
 13 PERLFLAGS = -I$(srcdir)/perllib -I$(srcdir)
 14 RUNPERL = $(PERL) $(PERLFLAGS)
15  15
16@@ -216,12 +216,12 @@ nsis: nsis/nasm.nsi nsis/arch.nsh nsis/v 16@@ -334,12 +334,12 @@ nsis: nsis/nasm.nsi nsis/arch.nsh nsis/v
17 manpages: nasm.1 ndisasm.1 17 manpages: nasm.1 ndisasm.1
18  18
19 install: nasm$(X) ndisasm$(X) 19 install: nasm$(X) ndisasm$(X)
20- $(MKDIR) -p $(INSTALLROOT)$(bindir) 20- $(MKDIR) -p $(INSTALLROOT)$(bindir)
21- $(INSTALL_PROGRAM) nasm$(X) $(INSTALLROOT)$(bindir)/nasm$(X) 21- $(INSTALL_PROGRAM) nasm$(X) $(INSTALLROOT)$(bindir)/nasm$(X)
22- $(INSTALL_PROGRAM) ndisasm$(X) $(INSTALLROOT)$(bindir)/ndisasm$(X) 22- $(INSTALL_PROGRAM) ndisasm$(X) $(INSTALLROOT)$(bindir)/ndisasm$(X)
23- $(MKDIR) -p $(INSTALLROOT)$(mandir)/man1 23- $(MKDIR) -p $(INSTALLROOT)$(mandir)/man1
24- $(INSTALL_DATA) $(srcdir)/nasm.1 $(INSTALLROOT)$(mandir)/man1/nasm.1 24- $(INSTALL_DATA) $(srcdir)/nasm.1 $(INSTALLROOT)$(mandir)/man1/nasm.1
25- $(INSTALL_DATA) $(srcdir)/ndisasm.1 $(INSTALLROOT)$(mandir)/man1/ndisasm.1 25- $(INSTALL_DATA) $(srcdir)/ndisasm.1 $(INSTALLROOT)$(mandir)/man1/ndisasm.1
26+ $(BSD_INSTALL_PROGRAM_DIR) $(INSTALLROOT)$(bindir) 26+ $(BSD_INSTALL_PROGRAM_DIR) $(INSTALLROOT)$(bindir)
27+ $(BSD_INSTALL_PROGRAM) nasm$(X) $(INSTALLROOT)$(bindir)/nasm$(X) 27+ $(BSD_INSTALL_PROGRAM) nasm$(X) $(INSTALLROOT)$(bindir)/nasm$(X)
28+ $(BSD_INSTALL_PROGRAM) ndisasm$(X) $(INSTALLROOT)$(bindir)/ndisasm$(X) 28+ $(BSD_INSTALL_PROGRAM) ndisasm$(X) $(INSTALLROOT)$(bindir)/ndisasm$(X)
29+ $(BSD_INSTALL_MAN_DIR) $(INSTALLROOT)$(mandir)/man1 29+ $(BSD_INSTALL_MAN_DIR) $(INSTALLROOT)$(mandir)/man1
30+ $(BSD_INSTALL_MAN) $(srcdir)/nasm.1 $(INSTALLROOT)$(mandir)/man1/nasm.1 30+ $(BSD_INSTALL_MAN) $(srcdir)/nasm.1 $(INSTALLROOT)$(mandir)/man1/nasm.1
31+ $(BSD_INSTALL_MAN) $(srcdir)/ndisasm.1 $(INSTALLROOT)$(mandir)/man1/ndisasm.1 31+ $(BSD_INSTALL_MAN) $(srcdir)/ndisasm.1 $(INSTALLROOT)$(mandir)/man1/ndisasm.1
32  32
33 clean: 33 clean:
34 $(RM) -f *.$(O) *.s *.i 34 for d in . $(SUBDIRS) $(XSUBDIRS); do \
cvs diff -r1.1 -r1.2 pkgsrc/devel/nasm/patches/patch-doc_Makefile.in (expand / switch to unified diff)

--- pkgsrc/devel/nasm/patches/patch-doc_Makefile.in 2017/02/14 08:05:30 1.1
+++ pkgsrc/devel/nasm/patches/patch-doc_Makefile.in 2017/05/18 21:44:42 1.2
@@ -1,48 +1,56 @@ @@ -1,48 +1,56 @@
1$NetBSD: patch-doc_Makefile.in,v 1.1 2017/02/14 08:05:30 adam Exp $ 1$NetBSD: patch-doc_Makefile.in,v 1.2 2017/05/18 21:44:42 adam Exp $
2 2
3Use correct paths and tools. 3Use correct paths and tools.
4Do not build nasmdoc.pdf. 4Do not build nasmdoc.pdf.
 5Avoid cp -u, it is not portable.
5 6
6--- doc/Makefile.in.orig 2016-07-06 20:44:04.000000000 +0000 7--- doc/Makefile.in.orig 2017-05-02 05:18:37.000000000 +0000
7+++ doc/Makefile.in 8+++ doc/Makefile.in
8@@ -9,7 +9,8 @@ prefix = @prefix@ 9@@ -9,7 +9,8 @@ prefix = @prefix@
9 exec_prefix = @exec_prefix@ 10 exec_prefix = @exec_prefix@
10 bindir = @bindir@ 11 bindir = @bindir@
11 mandir = @mandir@ 12 mandir = @mandir@
12-docdir = $(prefix)/doc/nasm 13-docdir = $(prefix)/doc/nasm
13+docdir = $(prefix)/share/doc/nasm 14+docdir = $(prefix)/share/doc/nasm
14+htmldocdir = $(docdir)/html 15+htmldocdir = $(docdir)/html
15 infodir = @infodir@ 16 infodir = @infodir@
16 datarootdir = @datarootdir@ 17 datarootdir = @datarootdir@
17  18
18@@ -17,7 +18,7 @@ INSTALL = @INSTALL@ 19@@ -17,7 +18,7 @@ INSTALL = @INSTALL@
19 INSTALL_PROGRAM = @INSTALL_PROGRAM@ 20 INSTALL_PROGRAM = @INSTALL_PROGRAM@
20 INSTALL_DATA = @INSTALL_DATA@ 21 INSTALL_DATA = @INSTALL_DATA@
21  22
22-PERL = perl -I$(srcdir) 23-PERL = perl -I$(srcdir)
23+PERL = ${PERL5} 24+PERL = ${PERL5} -I$(srcdir)
24 MAKEINFO = makeinfo 25
25 TEXI2DVI = texi2dvi 26 PDFOPT = @PDFOPT@
26 TEXI2IPF = texi2ipf 27
27@@ -28,7 +29,7 @@ PSTOPDF = @PSTOPDF@ # BSD/MacOS X util 28@@ -30,7 +31,7 @@ CP_UF = cp -ufv
28 PS2PDF = @PS2PDF@ # Part of GhostScript 29 HTMLAUX = nasmdoc.css local.css nasmlogw.png
29  30
30 SRCS = nasmdoc.src inslist.src changes.src version.src 31 SRCS = nasmdoc.src inslist.src changes.src version.src
31-OUT = info html nasmdoc.txt nasmdoc.ps nasmdoc.pdf 32-OUT = html nasmdoc.txt nasmdoc.pdf
32+OUT = info html nasmdoc.txt nasmdoc.ps #nasmdoc.pdf 33+OUT = html nasmdoc.txt
 34
 35 .SUFFIXES: .pfa .ph
 36
 37@@ -42,7 +43,7 @@ inslist.src: inslist.pl ../x86/insns.dat
 38 .PHONY: html
 39 html: $(HTMLAUX)
 40 mkdir -p html
 41- for f in $(HTMLAUX); do $(CP_UF) "$(srcdir)/$$f" html/; done
 42+ for f in $(HTMLAUX); do $(CP_F) "$(srcdir)/$$f" html/; done
 43 $(MAKE) html/nasmdoc0.html
33  44
34 # exports 45 RDSRC = $(PERL) $(srcdir)/rdsrc.pl -I$(srcdir)/
35 export srcdir 46@@ -81,6 +82,7 @@ spotless: clean
36@@ -105,7 +106,8 @@ spotless: clean 47 -$(RM_F) *.hlp nasmdoc.txt *.inf *.pdf *.dvi
37  48
38 install: all 49 install: all
39 mkdir -p $(INSTALLROOT)$(infodir) 
40- $(INSTALL_DATA) info/* $(INSTALLROOT)$(infodir) 
41- mkdir -p $(INSTALLROOT)$(docdir)/html 50- mkdir -p $(INSTALLROOT)$(docdir)/html
42- $(INSTALL_DATA) html/* $(INSTALLROOT)$(docdir)/html 51- $(INSTALL_DATA) html/* $(INSTALLROOT)$(docdir)/html
43- $(INSTALL_DATA) nasmdoc.ps nasmdoc.pdf nasmdoc.txt $(INSTALLROOT)$(docdir) 52- $(INSTALL_DATA) nasmdoc.pdf nasmdoc.txt $(INSTALLROOT)$(docdir)
44+ $(BSD_INSTALL_DATA) info/* $(INSTALLROOT)$(infodir) 
45+ $(BSD_INSTALL_DATA_DIR) $(INSTALLROOT)$(docdir) 53+ $(BSD_INSTALL_DATA_DIR) $(INSTALLROOT)$(docdir)
46+ $(BSD_INSTALL_DATA_DIR) $(INSTALLROOT)$(htmldocdir) 54+ $(BSD_INSTALL_DATA_DIR) $(INSTALLROOT)$(htmldocdir)
47+ $(BSD_INSTALL_DATA) html/* $(INSTALLROOT)$(htmldocdir) 55+ $(BSD_INSTALL_DATA) html/* $(INSTALLROOT)$(htmldocdir)
48+ $(BSD_INSTALL_DATA) nasmdoc.ps nasmdoc.txt $(INSTALLROOT)$(docdir) 56+ $(BSD_INSTALL_DATA) nasmdoc.txt $(INSTALLROOT)$(docdir)