Update to 2.05.01:

Version 2.05.01

    * Fix the -w/-W option parsing, which was broken in NASM 2.05.

Version 2.05

    * Fix redundant REX.W prefix on JMP reg64.
    * Make the behaviour of -O0 match NASM 0.98 legacy behavior.
    See section 2.1.22.
    * -w-user can be used to suppress the output of %warning
    directives. See section 2.1.24.
    * Fix bug where ALIGN would issue a full alignment datum instead
    of zero bytes.
    * Fix offsets in list files.
    * Fix %include inside multi-line macros or loops.
    * Fix error where NASM would generate a spurious warning on
    valid optimizations of immediate values.
    * Fix arguments to a number of the CVT SSE instructions.
    * Fix RIP-relative offsets when the instruction carries an immediate.
    * Massive overhaul of the ELF64 backend for spec compliance.
    * Fix the Geode PFRCPV and PFRSQRTV instruction.
    * Fix the SSE 4.2 CRC32 instruction.

Version 2.04

    * Sanitize macro handing in the %error directive.
    * New %warning directive to issue user-controlled warnings.
    * %error directives are now deferred to the final assembly phase.
    * New %fatal directive to immediately terminate assembly.
    * New %strcat directive to join quoted strings together.
    * New %use macro directive to support standard macro directives.
    See section 4.6.4.
    * Excess default parameters to %macro now issues a warning by
    default. See section 4.3.
    * Fix %ifn and %elifn.
    * Fix nested %else clauses.
    * Correct the handling of nested %reps.
    * New %unmacro directive to undeclare a multi-line macro. See
    section 4.3.10.
    * Builtin macro __PASS__ which expands to the current assembly
    pass. See section 4.11.9.
    * __utf16__ and __utf32__ operators to generate UTF-16 and
    UTF-32 strings. See section 3.4.5.
    * Fix bug in case-insensitive matching when compiled on platforms
    that don't use the configure script. Of the official release
    binaries, that only affected the OS/2 binary.
    * Support for x87 packed BCD constants. See section 3.4.7.
    * Correct the LTR and SLDT instructions in 64-bit mode.
    * Fix unnecessary REX.W prefix on indirect jumps in 64-bit mode.
    * Add AVX versions of the AES instructions (VAES...).
    * Fix the 256-bit FMA instructions.
    * Add 256-bit AVX stores per the latest AVX spec.
    * VIA XCRYPT instructions can now be written either with or
    without REP, apparently different versions of the VIA spec
    wrote them differently.
    * Add missing 64-bit MOVNTI instruction.
    * Fix the operand size of VMREAD and VMWRITE.
    * Numerous bug fixes, especially to the AES, AVX and VTX instructions.
    * The optimizer now always runs until it converges. It also
    runs even when disabled, but doesn't optimize. This allows most
    forward references to be resolved properly.

4 files changed, 19 insertions, 15 deletions

diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile
index e08c252ac95..862f66cfab6 100644
--- a/devel/nasm/Makefile
+++ b/devel/nasm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2008/09/07 14:09:40 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2008/11/05 12:48:35 wiz Exp $
 
-DISTNAME=	nasm-2.03.01
+DISTNAME=	nasm-2.05.01
 CATEGORIES=	devel lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nasm/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/nasm/PLIST b/devel/nasm/PLIST
index b91e6a86ed4..48a13b45672 100644
--- a/devel/nasm/PLIST
+++ b/devel/nasm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2008/03/12 21:16:12 drochner Exp $
+@comment $NetBSD: PLIST,v 1.9 2008/11/05 12:48:35 wiz Exp $
 bin/ldrdf
 bin/nasm
 bin/ndisasm
@@ -19,6 +19,7 @@ man/man1/rdflib.1
 man/man1/rdx.1
 share/doc/nasm/html/nasmdo10.html
 share/doc/nasm/html/nasmdo11.html
+share/doc/nasm/html/nasmdo12.html
 share/doc/nasm/html/nasmdoc0.html
 share/doc/nasm/html/nasmdoc1.html
 share/doc/nasm/html/nasmdoc2.html
@@ -31,6 +32,7 @@ share/doc/nasm/html/nasmdoc8.html
 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/nasmdoci.html
 share/doc/nasm/nasmdoc.ps
 share/doc/nasm/nasmdoc.txt
diff --git a/devel/nasm/distinfo b/devel/nasm/distinfo
index 4213fed9523..e4cad4929a0 100644
--- a/devel/nasm/distinfo
+++ b/devel/nasm/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17 2008/09/07 14:09:40 wiz Exp $
+$NetBSD: distinfo,v 1.18 2008/11/05 12:48:35 wiz Exp $
 
-SHA1 (nasm-2.03.01.tar.bz2) = 45590099abaf8e46f43c430c51ec29174e33c818
-RMD160 (nasm-2.03.01.tar.bz2) = 45af4c74f0f0dc446db57155cf71ed14cca7412c
-Size (nasm-2.03.01.tar.bz2) = 767490 bytes
+SHA1 (nasm-2.05.01.tar.bz2) = 5e8b37b7b9ddbbd7ffde4ca674384755061e501b
+RMD160 (nasm-2.05.01.tar.bz2) = ae66431f955a8559eabe9180c1034fa3f80044c8
+Size (nasm-2.05.01.tar.bz2) = 791984 bytes
 SHA1 (patch-aa) = 3f05734250b81898f15fc4323d95ec5606c91cb1
-SHA1 (patch-ab) = 0cd095efb69cb1618062127972e61ae5b422345e
+SHA1 (patch-ab) = 59f3ac5c7a36785a9241fb32ca722661756224dd
 SHA1 (patch-ac) = 35b69553570023019193c9de915913b1994dcd5b
diff --git a/devel/nasm/patches/patch-ab b/devel/nasm/patches/patch-ab
index e32f0a39972..56ef2d77d94 100644
--- a/devel/nasm/patches/patch-ab
+++ b/devel/nasm/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2008/09/07 14:09:40 wiz Exp $
+$NetBSD: patch-ab,v 1.6 2008/11/05 12:48:35 wiz Exp $
 
---- doc/Makefile.in.orig	2008-06-17 06:31:16.000000000 +0200
+--- doc/Makefile.in.orig	2008-10-29 17:57:33.000000000 +0000
 +++ doc/Makefile.in
 @@ -8,7 +8,8 @@ prefix		= @prefix@
  exec_prefix	= @exec_prefix@
@@ -12,23 +12,25 @@ $NetBSD: patch-ab,v 1.5 2008/09/07 14:09:40 wiz Exp $
  infodir		= @infodir@
  datarootdir	= @datarootdir@
  
-@@ -16,13 +17,12 @@ INSTALL		= @INSTALL@
+@@ -16,7 +17,7 @@ INSTALL		= @INSTALL@
  INSTALL_PROGRAM	= @INSTALL_PROGRAM@
  INSTALL_DATA	= @INSTALL_DATA@
  
 -PERL		= perl
--MAKEINFO	= makeinfo
 +PERL		= ${PERL5}
+ MAKEINFO	= makeinfo
  TEXI2DVI        = texi2dvi
- PS2PDF          = ps2pdf		# Part of GhostScript
+ TEXI2IPF	= texi2ipf
+@@ -27,7 +28,7 @@ PSTOPDF		= @PSTOPDF@		# BSD/MacOS X util
+ PS2PDF          = @PS2PDF@		# Part of GhostScript
  
- SRCS		= nasmdoc.src
+ SRCS		= nasmdoc.src inslist.src changes.src
 -OUT		= info html nasmdoc.txt nasmdoc.ps nasmdoc.pdf
 +OUT		= info html nasmdoc.txt nasmdoc.ps # nasmdoc.pdf
  
  # exports
  export srcdir
-@@ -88,7 +88,8 @@ spotless: clean
+@@ -95,7 +96,8 @@ spotless: clean
  	-rm -f nasmdoc*.ps inslist.src
  
  install: all