CVS commit: pkgsrc/devel/nasm

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/nasm
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Thu, 18 May 2017 21:44:42 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu May 18 21:44:42 UTC 2017

Modified Files:
        pkgsrc/devel/nasm: Makefile PLIST distinfo
        pkgsrc/devel/nasm/patches: patch-Makefile.in patch-doc_Makefile.in

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/devel/nasm/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/nasm/PLIST
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/nasm/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/nasm/patches/patch-Makefile.in \
    pkgsrc/devel/nasm/patches/patch-doc_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/nasm/Makefile
diff -u pkgsrc/devel/nasm/Makefile:1.53 pkgsrc/devel/nasm/Makefile:1.54
--- pkgsrc/devel/nasm/Makefile:1.53     Tue Feb 14 08:05:30 2017
+++ pkgsrc/devel/nasm/Makefile  Thu May 18 21:44:42 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2017/02/14 08:05:30 adam Exp $
+# $NetBSD: Makefile,v 1.54 2017/05/18 21:44:42 adam Exp $
 
-DISTNAME=      nasm-2.12.02
+DISTNAME=      nasm-2.13.01
 CATEGORIES=    devel lang
 MASTER_SITES=  http://www.nasm.us/pub/nasm/releasebuilds/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.xz
@@ -8,21 +8,18 @@ EXTRACT_SUFX= .tar.xz
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.nasm.us/
 COMMENT=       General-purpose x86 assembler
-# actually only 2-clause BSD
-LICENSE=       modified-bsd
+LICENSE=       2-clause-bsd
 
-AUTO_MKDIRS=           yes
+#AUTO_MKDIRS=          yes
 
 USE_TOOLS+=            gmake makeinfo perl
 GCC_REQD+=             3.0
 GNU_CONFIGURE=         yes
 
-INFO_FILES=            yes
 BUILD_TARGET=          everything
 INSTALL_TARGET=                install_everything
 
 INSTALL_ENV+=  INSTALLROOT=${DESTDIR}
-
 MAKE_ENV+=     PERL5=${PERL5:Q}
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/nasm/PLIST
diff -u pkgsrc/devel/nasm/PLIST:1.11 pkgsrc/devel/nasm/PLIST:1.12
--- pkgsrc/devel/nasm/PLIST:1.11        Wed Jul 22 21:21:33 2009
+++ pkgsrc/devel/nasm/PLIST     Thu May 18 21:44:42 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/07/22 21:21:33 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2017/05/18 21:44:42 adam Exp $
 bin/ldrdf
 bin/nasm
 bin/ndisasm
@@ -10,7 +10,6 @@ bin/rdf2srec
 bin/rdfdump
 bin/rdflib
 bin/rdx
-info/nasm.info
 man/man1/ldrdf.1
 man/man1/nasm.1
 man/man1/ndisasm.1
@@ -22,9 +21,11 @@ man/man1/rdf2srec.1
 man/man1/rdfdump.1
 man/man1/rdflib.1
 man/man1/rdx.1
+share/doc/nasm/html/local.css
 share/doc/nasm/html/nasmdo10.html
 share/doc/nasm/html/nasmdo11.html
 share/doc/nasm/html/nasmdo12.html
+share/doc/nasm/html/nasmdoc.css
 share/doc/nasm/html/nasmdoc0.html
 share/doc/nasm/html/nasmdoc1.html
 share/doc/nasm/html/nasmdoc2.html
@@ -38,6 +39,8 @@ share/doc/nasm/html/nasmdoc9.html
 share/doc/nasm/html/nasmdoca.html
 share/doc/nasm/html/nasmdocb.html
 share/doc/nasm/html/nasmdocc.html
+share/doc/nasm/html/nasmdocd.html
+share/doc/nasm/html/nasmdoce.html
 share/doc/nasm/html/nasmdoci.html
-share/doc/nasm/nasmdoc.ps
+share/doc/nasm/html/nasmlogw.png
 share/doc/nasm/nasmdoc.txt

Index: pkgsrc/devel/nasm/distinfo
diff -u pkgsrc/devel/nasm/distinfo:1.26 pkgsrc/devel/nasm/distinfo:1.27
--- pkgsrc/devel/nasm/distinfo:1.26     Tue Feb 14 08:05:30 2017
+++ pkgsrc/devel/nasm/distinfo  Thu May 18 21:44:42 2017
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2017/02/14 08:05:30 adam Exp $
+$NetBSD: distinfo,v 1.27 2017/05/18 21:44:42 adam Exp $
 
-SHA1 (nasm-2.12.02.tar.xz) = a0e6e655d04009178d4b7c15d935a46a691a617c
-RMD160 (nasm-2.12.02.tar.xz) = 7929d01e0a53860c2e6a5c2d3b819d4abd693975
-SHA512 (nasm-2.12.02.tar.xz) = a2b4728386aa451160cee00455d5052dbf983866693c5faa9532c57b9d246c27a4f4f07cf7ca77ee7547c1702f685e9bee8f370dd0aedb5b5fa1898f25389b83
-Size (nasm-2.12.02.tar.xz) = 782444 bytes
-SHA1 (patch-Makefile.in) = 256fb7cb3483cbce67f2f608fa83732f3bcbfad6
-SHA1 (patch-doc_Makefile.in) = 9e5e8bd407c1516a99dd76396dc0ff4197f01dee
+SHA1 (nasm-2.13.01.tar.xz) = b2ff7fbb085cfc7ba29f48cd79cb1e88bbcc128b
+RMD160 (nasm-2.13.01.tar.xz) = 04a53df091350466ec5bb270662ac0da63a5d219
+SHA512 (nasm-2.13.01.tar.xz) = 6561a2efb3ffea77a1a8cd364edf1ecedb2c14e1902469d7c59d743f25ca612529113d1099818abbe0a9f2592f12604f1810855bbdf8dc9de3648094a83529ae
+Size (nasm-2.13.01.tar.xz) = 800244 bytes
+SHA1 (patch-Makefile.in) = a85054afeb827b61b0db3352825088454e3013d4
+SHA1 (patch-doc_Makefile.in) = 20bb04e4fb00ec14d1e2bb31a3fe2497673132ef

Index: pkgsrc/devel/nasm/patches/patch-Makefile.in
diff -u pkgsrc/devel/nasm/patches/patch-Makefile.in:1.1 pkgsrc/devel/nasm/patches/patch-Makefile.in:1.2
--- pkgsrc/devel/nasm/patches/patch-Makefile.in:1.1     Tue Feb 14 08:05:30 2017
+++ pkgsrc/devel/nasm/patches/patch-Makefile.in Thu May 18 21:44:42 2017
@@ -1,19 +1,19 @@
-$NetBSD: patch-Makefile.in,v 1.1 2017/02/14 08:05:30 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2017/05/18 21:44:42 adam Exp $
 
 Use correct tools.
 
---- Makefile.in.orig   2016-07-06 20:44:27.000000000 +0000
+--- Makefile.in.orig   2017-05-02 05:18:51.000000000 +0000
 +++ Makefile.in
-@@ -23,7 +23,7 @@ INTERNAL_CFLAGS = -I$(srcdir) -I.
- ALL_CFLAGS    = $(BUILD_CFLAGS) $(INTERNAL_CFLAGS)
- LDFLAGS               = @LDFLAGS@
- LIBS          = @LIBS@
--PERL          = perl -I$(srcdir)/perllib -I$(srcdir)
-+PERL          = ${PERL5}
+@@ -35,7 +35,7 @@ AR           = @AR@
+ RANLIB                = @RANLIB@
+ STRIP         = @STRIP@
  
- XOBJS         = @XOBJS@
+-PERL          = perl
++PERL          = ${PERL5}
+ PERLFLAGS     = -I$(srcdir)/perllib -I$(srcdir)
+ RUNPERL         = $(PERL) $(PERLFLAGS)
  
-@@ -216,12 +216,12 @@ nsis: nsis/nasm.nsi nsis/arch.nsh nsis/v
+@@ -334,12 +334,12 @@ nsis: nsis/nasm.nsi nsis/arch.nsh nsis/v
  manpages: nasm.1 ndisasm.1
  
  install: nasm$(X) ndisasm$(X)
@@ -31,4 +31,4 @@ Use correct tools.
 +      $(BSD_INSTALL_MAN) $(srcdir)/ndisasm.1 $(INSTALLROOT)$(mandir)/man1/ndisasm.1
  
  clean:
-       $(RM) -f *.$(O) *.s *.i
+       for d in . $(SUBDIRS) $(XSUBDIRS); do \
Index: pkgsrc/devel/nasm/patches/patch-doc_Makefile.in
diff -u pkgsrc/devel/nasm/patches/patch-doc_Makefile.in:1.1 pkgsrc/devel/nasm/patches/patch-doc_Makefile.in:1.2
--- pkgsrc/devel/nasm/patches/patch-doc_Makefile.in:1.1 Tue Feb 14 08:05:30 2017
+++ pkgsrc/devel/nasm/patches/patch-doc_Makefile.in     Thu May 18 21:44:42 2017
@@ -1,9 +1,10 @@
-$NetBSD: patch-doc_Makefile.in,v 1.1 2017/02/14 08:05:30 adam Exp $
+$NetBSD: patch-doc_Makefile.in,v 1.2 2017/05/18 21:44:42 adam Exp $
 
 Use correct paths and tools.
 Do not build nasmdoc.pdf.
+Avoid cp -u, it is not portable.
 
---- doc/Makefile.in.orig       2016-07-06 20:44:04.000000000 +0000
+--- doc/Makefile.in.orig       2017-05-02 05:18:37.000000000 +0000
 +++ doc/Makefile.in
 @@ -9,7 +9,8 @@ prefix         = @prefix@
  exec_prefix   = @exec_prefix@
@@ -20,29 +21,36 @@ Do not build nasmdoc.pdf.
  INSTALL_DATA  = @INSTALL_DATA@
  
 -PERL          = perl -I$(srcdir)
-+PERL          = ${PERL5}
- MAKEINFO      = makeinfo
- TEXI2DVI        = texi2dvi
- TEXI2IPF      = texi2ipf
-@@ -28,7 +29,7 @@ PSTOPDF              = @PSTOPDF@             # BSD/MacOS X util
- PS2PDF          = @PS2PDF@            # Part of GhostScript
++PERL          = ${PERL5} -I$(srcdir)
+ 
+ PDFOPT                = @PDFOPT@
+ 
+@@ -30,7 +31,7 @@ CP_UF                = cp -ufv
+ HTMLAUX               = nasmdoc.css local.css nasmlogw.png
  
  SRCS          = nasmdoc.src inslist.src changes.src version.src
--OUT           = info html nasmdoc.txt nasmdoc.ps nasmdoc.pdf
-+OUT           = info html nasmdoc.txt nasmdoc.ps #nasmdoc.pdf
+-OUT           = html nasmdoc.txt nasmdoc.pdf
++OUT           = html nasmdoc.txt
+ 
+ .SUFFIXES: .pfa .ph
+ 
+@@ -42,7 +43,7 @@ inslist.src: inslist.pl ../x86/insns.dat
+ .PHONY: html
+ html: $(HTMLAUX)
+       mkdir -p html
+-      for f in $(HTMLAUX); do $(CP_UF) "$(srcdir)/$$f" html/; done
++      for f in $(HTMLAUX); do $(CP_F) "$(srcdir)/$$f" html/; done
+       $(MAKE) html/nasmdoc0.html
  
- # exports
- export srcdir
-@@ -105,7 +106,8 @@ spotless: clean
+ RDSRC = $(PERL) $(srcdir)/rdsrc.pl -I$(srcdir)/
+@@ -81,6 +82,7 @@ spotless: clean
+       -$(RM_F) *.hlp nasmdoc.txt *.inf *.pdf *.dvi
  
  install: all
-       mkdir -p $(INSTALLROOT)$(infodir)
--      $(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)
-+      $(BSD_INSTALL_DATA) info/* $(INSTALLROOT)$(infodir)
+-      $(INSTALL_DATA) nasmdoc.pdf nasmdoc.txt $(INSTALLROOT)$(docdir)
 +      $(BSD_INSTALL_DATA_DIR) $(INSTALLROOT)$(docdir)
 +      $(BSD_INSTALL_DATA_DIR) $(INSTALLROOT)$(htmldocdir)
 +      $(BSD_INSTALL_DATA) html/* $(INSTALLROOT)$(htmldocdir)
-+      $(BSD_INSTALL_DATA) nasmdoc.ps nasmdoc.txt $(INSTALLROOT)$(docdir)
++      $(BSD_INSTALL_DATA) nasmdoc.txt $(INSTALLROOT)$(docdir)

Prev by Date: CVS commit: pkgsrc/security/crypto++
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/security/crypto++
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index