Version 2.12.02

Fix preprocessor errors, especially %error and %warning, inside %if statements.
Fix relative relocations in 32-bit Mach-O.
More Codeview debug format fixes.
If the MASM PTR keyword is encountered, issue a warning. This is much more likely to indicate a MASM-ism encountered in NASM than it is a valid label. This warning can be suppressed with -w-ptr, the [warning] directive (see section 2.1.24) or by the macro definition %idefine ptr %??.
When an error or a warning comes from the expansion of a multi-line macro, display the file and line numbers for the expanded macros. Macros defined with .nolist do not get displayed.
Add macros ilog2fw() and ilog2cw() to the ifunc macro package.

5 files changed, 28 insertions, 41 deletions

diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile
index 4c03d69720f..448773acca9 100644
--- a/devel/nasm/Makefile
+++ b/devel/nasm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2016/07/09 06:38:10 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2017/02/14 08:05:30 adam Exp $
 
-DISTNAME=	nasm-2.12.01
-PKGREVISION=	1
+DISTNAME=	nasm-2.12.02
 CATEGORIES=	devel lang
 MASTER_SITES=	http://www.nasm.us/pub/nasm/releasebuilds/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.xz
@@ -17,7 +16,6 @@ AUTO_MKDIRS=		yes
 USE_TOOLS+=		gmake makeinfo perl
 GCC_REQD+=		3.0
 GNU_CONFIGURE=		yes
-#MAKE_JOBS_SAFE=		NO
 
 INFO_FILES=		yes
 BUILD_TARGET=		everything
diff --git a/devel/nasm/distinfo b/devel/nasm/distinfo
index 1964fd5c5fc..8c0d5d1cecd 100644
--- a/devel/nasm/distinfo
+++ b/devel/nasm/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.25 2016/05/07 05:02:59 wen Exp $
+$NetBSD: distinfo,v 1.26 2017/02/14 08:05:30 adam Exp $
 
-SHA1 (nasm-2.12.01.tar.xz) = c290c7ace283c5da2a2ddcf5411fbaed590badf2
-RMD160 (nasm-2.12.01.tar.xz) = bd23e4fe270f672af8e5227fd65cae662761ab23
-SHA512 (nasm-2.12.01.tar.xz) = c016b2b26f2ef00fe8de673dc7b2effa55ddd23d1f15145380c2767a2cd4a5c60c77732faebcd5868b325f780c0bf76a5e0c49eb6189609b21e2493d2af9347c
-Size (nasm-2.12.01.tar.xz) = 780112 bytes
-SHA1 (patch-aa) = 36635ae37b09df164039563228b79cfba805e687
-SHA1 (patch-ab) = 8e3e96c8a04f348fcc94b13efaf00e63b03c5a64
-SHA1 (patch-ac) = 77d88fe7fc0c03bfc0ffc59ba02bca0d433fcf72
+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
diff --git a/devel/nasm/patches/patch-aa b/devel/nasm/patches/patch-Makefile.in
index a06f68622e1..6030b376dd9 100644
--- a/devel/nasm/patches/patch-aa
+++ b/devel/nasm/patches/patch-Makefile.in
@@ -1,17 +1,19 @@
-$NetBSD: patch-aa,v 1.5 2014/04/08 12:50:43 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.1 2017/02/14 08:05:30 adam Exp $
 
---- Makefile.in.orig	2014-02-20 00:04:27.000000000 +0000
+Use correct tools.
+
+--- Makefile.in.orig	2016-07-06 20:44:27.000000000 +0000
 +++ Makefile.in
-@@ -22,7 +22,7 @@ INTERNAL_CFLAGS = -I$(srcdir) -I.
+@@ -23,7 +23,7 @@ INTERNAL_CFLAGS = -I$(srcdir) -I.
  ALL_CFLAGS	= $(BUILD_CFLAGS) $(INTERNAL_CFLAGS)
  LDFLAGS		= @LDFLAGS@
  LIBS		= @LIBS@
--PERL		= perl -I$(srcdir)/perllib
+-PERL		= perl -I$(srcdir)/perllib -I$(srcdir)
 +PERL		= ${PERL5}
  
  XOBJS		= @XOBJS@
  
-@@ -201,12 +201,12 @@ perlreq: $(PERLREQ)
+@@ -216,12 +216,12 @@ nsis: nsis/nasm.nsi nsis/arch.nsh nsis/v
  manpages: nasm.1 ndisasm.1
  
  install: nasm$(X) ndisasm$(X)
diff --git a/devel/nasm/patches/patch-ac b/devel/nasm/patches/patch-ac
deleted file mode 100644
index 7bb137c0b7e..00000000000
--- a/devel/nasm/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2014/04/08 12:50:43 adam Exp $
-
-Add -Wno-char-subscripts to CFLAGS
-
---- configure.orig	2013-08-13 07:58:03.000000000 +0000
-+++ configure
-@@ -4299,7 +4299,7 @@ rm -f core conftest.err conftest.$ac_obj
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -Wall" >&5
- $as_echo_n "checking if $CC accepts -Wall... " >&6; }
-  pa_add_cflags__old_cflags="$CFLAGS"
-- CFLAGS="$CFLAGS -Wall"
-+ CFLAGS="$CFLAGS -Wall -Wno-char-subscripts"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <stdio.h>
diff --git a/devel/nasm/patches/patch-ab b/devel/nasm/patches/patch-doc_Makefile.in
index 93abc1851ee..44b5888be39 100644
--- a/devel/nasm/patches/patch-ab
+++ b/devel/nasm/patches/patch-doc_Makefile.in
@@ -1,8 +1,11 @@
-$NetBSD: patch-ab,v 1.7 2009/07/22 21:21:33 wiz Exp $
+$NetBSD: patch-doc_Makefile.in,v 1.1 2017/02/14 08:05:30 adam Exp $
 
---- doc/Makefile.in.orig	2009-07-20 05:22:29.000000000 +0000
+Use correct paths and tools.
+Do not build nasmdoc.pdf.
+
+--- doc/Makefile.in.orig	2016-07-06 20:44:04.000000000 +0000
 +++ doc/Makefile.in
-@@ -8,7 +8,8 @@ prefix		= @prefix@
+@@ -9,7 +9,8 @@ prefix		= @prefix@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
  mandir		= @mandir@
@@ -12,25 +15,25 @@ $NetBSD: patch-ab,v 1.7 2009/07/22 21:21:33 wiz Exp $
  infodir		= @infodir@
  datarootdir	= @datarootdir@
  
-@@ -16,7 +17,7 @@ INSTALL		= @INSTALL@
+@@ -17,7 +18,7 @@ INSTALL		= @INSTALL@
  INSTALL_PROGRAM	= @INSTALL_PROGRAM@
  INSTALL_DATA	= @INSTALL_DATA@
  
--PERL		= perl
+-PERL		= perl -I$(srcdir)
 +PERL		= ${PERL5}
  MAKEINFO	= makeinfo
  TEXI2DVI        = texi2dvi
  TEXI2IPF	= texi2ipf
-@@ -27,7 +28,7 @@ PSTOPDF		= @PSTOPDF@		# BSD/MacOS X util
+@@ -28,7 +29,7 @@ PSTOPDF		= @PSTOPDF@		# BSD/MacOS X util
  PS2PDF          = @PS2PDF@		# Part of GhostScript
  
- SRCS		= nasmdoc.src inslist.src changes.src
+ 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		= info html nasmdoc.txt nasmdoc.ps #nasmdoc.pdf
  
  # exports
  export srcdir
-@@ -96,7 +97,8 @@ spotless: clean
+@@ -105,7 +106,8 @@ spotless: clean
  
  install: all
  	mkdir -p $(INSTALLROOT)$(infodir)