- update to 2.05.01, based on one from Gallon Sylvestre

- sync patches
- new homepage

ok brad

devel/nasm/Makefile

@@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.25 2008/06/26 01:25:32 okan Exp $
+# $OpenBSD: Makefile,v 1.26 2008/11/07 18:38:22 okan Exp $
 
 COMMENT=	general-purpose multi-platform x86 assembler
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-DISTNAME=	nasm-2.03.01
+DISTNAME=	nasm-2.05.01
 CATEGORIES=	devel lang
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nasm/}
 
-HOMEPAGE=	http://nasm.sourceforge.net/
+HOMEPAGE=	http://www.nasm.us/
 
 # LGPL
 PERMIT_PACKAGE_CDROM=	Yes

devel/nasm/distinfo

@@ -1,5 +1,5 @@
-MD5 (nasm-2.03.01.tar.gz) = EWZX0vshJAF+OnBPCZPPhQ==
-RMD160 (nasm-2.03.01.tar.gz) = ENtz2gRIff6T31OAMWfTTWw/C/Q=
-SHA1 (nasm-2.03.01.tar.gz) = PY08YFGYGetgmf2nUz0NMmwEeYc=
-SHA256 (nasm-2.03.01.tar.gz) = V06mdGpPWQlx9OaUxVgRrfd/5QlRtdoTNkf3TItfzFM=
-SIZE (nasm-2.03.01.tar.gz) = 945087
+MD5 (nasm-2.05.01.tar.gz) = W6Zab8Dg+Z1tJmfQljcZ+A==
+RMD160 (nasm-2.05.01.tar.gz) = A5CfFY4BY6fl+PgGxGFuiYbqypU=
+SHA1 (nasm-2.05.01.tar.gz) = TGg4TnAKNpk0Mz0l0iDjJI9AQj0=
+SHA256 (nasm-2.05.01.tar.gz) = 8sqWQKXcDfZodcaXDUDaeoI1CyoBo5gbDnrEupc2Rew=
+SIZE (nasm-2.05.01.tar.gz) = 977366

devel/nasm/patches/patch-doc_Makefile.in

@@ -1,6 +1,6 @@
---- doc/Makefile.in.orig	Tue Jun 17 06:31:16 2008
-+++ doc/Makefile.in	Tue Jun 17 15:12:31 2008
-@@ -8,7 +8,7 @@
+--- doc/Makefile.in.orig	Wed Oct 29 13:57:33 2008
++++ doc/Makefile.in	Sun Nov  2 21:43:50 2008
+@@ -8,7 +8,7 @@ prefix		= @prefix@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
  mandir		= @mandir@
@@ -9,42 +9,43 @@
  infodir		= @infodir@
  datarootdir	= @datarootdir@
  
-@@ -22,11 +22,8 @@
- PS2PDF          = ps2pdf		# Part of GhostScript
+@@ -27,12 +27,8 @@ PSTOPDF		= @PSTOPDF@		# BSD/MacOS X utility
+ 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
 -export PERL
- 
+-
  all: $(OUT)
  
-@@ -40,17 +37,17 @@
+ os2: nasm.inf
+@@ -45,17 +41,17 @@ html: html/nasmdoc0.html
  
- html/nasmdoc0.html: nasmdoc.src rdsrc.pl inslist.src
+ html/nasmdoc0.html: $(SRCS) rdsrc.pl
  	mkdir -p html
 -	$(PERL) $(srcdir)/rdsrc.pl html < $<
 +	$(PERL) $(srcdir)/rdsrc.pl html < $(srcdir)/nasmdoc.src
  	mv -f *.html html
  
- nasmdoc.dip: nasmdoc.src rdsrc.pl inslist.src
+ nasmdoc.dip: $(SRCS) rdsrc.pl
 -	$(PERL) $(srcdir)/rdsrc.pl dip < $<
 +	$(PERL) $(srcdir)/rdsrc.pl dip < $(srcdir)/nasmdoc.src
  
- nasmdoc.texi: nasmdoc.src rdsrc.pl inslist.src
+ nasmdoc.texi: $(SRCS) rdsrc.pl
 -	$(PERL) $(srcdir)/rdsrc.pl texi < $<
 +	$(PERL) $(srcdir)/rdsrc.pl texi < $(srcdir)/nasmdoc.src
  
- nasmdoc.txt: nasmdoc.src rdsrc.pl inslist.src
+ nasmdoc.txt: $(SRCS) rdsrc.pl
 -	$(PERL) $(srcdir)/rdsrc.pl txt < $<
 +	$(PERL) $(srcdir)/rdsrc.pl txt < $(srcdir)/nasmdoc.src
  
  nasmdoc.ps: nasmdoc.dip nasmlogo.eps $(srcdir)/../version genpsdriver.pl \
  	    genps.pl psfonts.ph pswidth.ph head.ps
-@@ -64,7 +61,7 @@
+@@ -71,7 +67,7 @@ info: info/nasm.info
  
  info/nasm.info: nasmdoc.texi
  	mkdir -p info
@@ -53,23 +54,23 @@
  	mv -f *.info *.info-* info
  
  # DVI output from texinfo (optional)
-@@ -73,13 +70,12 @@
+@@ -80,13 +76,12 @@ nasmdoc.dvi: nasmdoc.texi
  
  # Rules for building an OS/2 book
  nasmdoc.ipf: nasmdoc.texi
--	texi2ipf $< >$@
-+	texi2ipf $? >$@
+-	$(TEXI2IPF) $< >$@
++	$(TEXI2IPF) $? >$@
  
  nasm.inf: nasmdoc.ipf
--	ipfc -i -s $< $@
-+	ipfc -i -s $? $@
+-	$(IPFC) -i -s $< $@
++	$(IPFC) -i -s $? $@
  
  clean:
 -	-rm -f *.rtf *.hpj *.texi *.gid *.ipf *.dip
  	-rm -f *.aux *.cp *.fn *.ky *.pg *.log *.toc *.tp *.vr
  
  spotless: clean
-@@ -91,4 +87,4 @@
+@@ -98,4 +93,4 @@ install: all
  	$(INSTALL_DATA) info/* $(INSTALLROOT)$(infodir)
  	mkdir -p $(INSTALLROOT)$(docdir)/html
  	$(INSTALL_DATA) html/* $(INSTALLROOT)$(docdir)/html

devel/nasm/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.11 2008/06/26 01:25:33 okan Exp $
+@comment $OpenBSD: PLIST,v 1.12 2008/11/07 18:38:22 okan Exp $
 @bin bin/ldrdf
 @bin bin/nasm
 @bin bin/ndisasm
@@ -21,6 +21,7 @@ share/doc/nasm/
 share/doc/nasm/html/
 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
@@ -33,6 +34,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/internal.doc
 share/doc/nasm/nasmdoc.txt