Update to 2.07

PR:		ports/137711 ports/136191
Submitted by:	Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>, bf1783@googlemail.com

4 files changed, 22 insertions, 20 deletions

diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile
index fbbbc19124af..645378e87363 100644
--- a/devel/nasm/Makefile
+++ b/devel/nasm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nasm
-PORTVERSION=	2.05.01
+PORTVERSION=	2.07
 PORTEPOCH=	1
 CATEGORIES=	devel lang
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20sources/${PORTVERSION} \
@@ -22,12 +22,15 @@ INSTALL_TARGET=	install install_rdf
 MAKE_JOBS_UNSAFE=	yes
 
 MAN1=		nasm.1 ndisasm.1 \
-		ldrdf.1 rdf2bin.1 rdf2com.1 rdfdump.1 rdflib.1 rdx.1
+		ldrdf.1 rdf2bin.1 rdf2com.1 rdf2ihx.1 rdf2ith.1 rdf2srec.1 rdfdump.1 rdflib.1 rdx.1
+PORTDOCS=	nasmdoc.txt
 
 post-install:
 .ifndef(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/doc/nasmdoc.txt ${DOCSDIR}
+.	for d in ${PORTDOCS}
+		${MKDIR} ${DOCSDIR}
+		${INSTALL_MAN} ${WRKSRC}/doc/$d ${DOCSDIR}
+.	endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/nasm/distinfo b/devel/nasm/distinfo
index 4bbc7d36845c..63c2cc27a554 100644
--- a/devel/nasm/distinfo
+++ b/devel/nasm/distinfo
@@ -1,6 +1,6 @@
-MD5 (nasm-2.05.01.tar.bz2) = da4977f6d9d9b8f00527f2c62109453b
-SHA256 (nasm-2.05.01.tar.bz2) = 9206ef45c650fdbad8e9907d7c6ff799f7fc0021e44bafef81a222d3a0a6595c
-SIZE (nasm-2.05.01.tar.bz2) = 791984
-MD5 (nasm-2.05.01-xdoc.tar.bz2) = f2cc41f0ee3554ef9ab6fedc67af5d93
-SHA256 (nasm-2.05.01-xdoc.tar.bz2) = 3221e944be87bec66dab89b2144101ebf269670c057d8cddc23c67611e824dad
-SIZE (nasm-2.05.01-xdoc.tar.bz2) = 799497
+MD5 (nasm-2.07.tar.bz2) = d8934231e81874c29374ddef1fbdb1ed
+SHA256 (nasm-2.07.tar.bz2) = ac70ee451c73d742c9ff830502e5f8b1f648b2abffa8fd00944243283ba8e87c
+SIZE (nasm-2.07.tar.bz2) = 779934
+MD5 (nasm-2.07-xdoc.tar.bz2) = ef3c3eeb62f155adf27a7185d603b1dd
+SHA256 (nasm-2.07-xdoc.tar.bz2) = 0f946fc70067cf56d94a8e0db48257f03faa7bcf1e8987cce39b8e0ab128ecf3
+SIZE (nasm-2.07-xdoc.tar.bz2) = 815521
diff --git a/devel/nasm/pkg-descr b/devel/nasm/pkg-descr
index 8276e0e3978d..bd531215356c 100644
--- a/devel/nasm/pkg-descr
+++ b/devel/nasm/pkg-descr
@@ -2,12 +2,13 @@ The Netwide Assembler, NASM, is an x86 and x86-64 assembler
 designed for portability and modularity.  It will output flat-form
 binary files, a.out (Linux and *BSD), COFF, ELF32, ELF64, Mach-O,
 Microsoft OMF (OBJ), Win32, Win64, as86 (Minix/Linux bin86 v0.3),
-LADsoft IEEE-695, and a home-grown format called RDOFF. NASM syntax
-is similar to Intel's but less complex.  It supports Pentium, P6,
-MMX, 3DNow!, SSE, SSE2, SSE3 and x64 opcodes, among others. It
-has strong support for macro conventions.
+LADsoft IEEE-695, Intel hex, Motorola S-record, and a home-grown 
+format called RDOFF. NASM syntax is similar to Intel's, but less
+complex.  It supports Pentium, P6, MMX. 3DNow!, SSE, SSE2, SSE3,
+SSE4.1, SSE4.2, XOP/FMA4/CVT16 (rev 3.03), and x64 opcodes, among
+others. It has strong support for macro conventions.
 
-Also included is NDISASM, binary-file disassembler
+Also included is NDISASM, a binary-file disassembler
 which uses the same instruction table as NASM.    
 
-WWW: http://nasm.sourceforge.net/
+WWW: http://www.nasm.us/
diff --git a/devel/nasm/pkg-plist b/devel/nasm/pkg-plist
index 5b2ac50fb1b2..8330a11fba70 100644
--- a/devel/nasm/pkg-plist
+++ b/devel/nasm/pkg-plist
@@ -2,10 +2,8 @@ bin/ldrdf
 bin/nasm
 bin/ndisasm
 bin/rdf2bin
-bin/rdf2com
-bin/rdf2ihx
+@unexec rm -f %B/rdf2com %B/rdf2ith %B/rdf2ihx %B/rdf2srec
+@exec for b in com ith ihx srec ; do ln -s %D/%F %B/rdf2$b ; done
 bin/rdfdump
 bin/rdflib
 bin/rdx
-%%PORTDOCS%%%%DOCSDIR%%/nasmdoc.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%