From d591f87be0dcd54fee44787999a46a4c6e2c6a0d Mon Sep 17 00:00:00 2001
From: okan <okan@openbsd.org>
Date: Thu, 26 Jun 2008 01:25:32 +0000
Subject: [PATCH] update to 2.03.01

from Gallon Sylvestre - thanks!

ok merdely@
---
 devel/nasm/Makefile                      |  4 +--
 devel/nasm/distinfo                      | 10 +++---
 devel/nasm/patches/patch-doc_Makefile.in | 39 ++++++++++++++++--------
 devel/nasm/pkg/PLIST                     |  4 +--
 4 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile
index f08332e5f19..0fea5227d6c 100644
--- a/devel/nasm/Makefile
+++ b/devel/nasm/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.24 2008/06/11 19:35:46 okan Exp $
+# $OpenBSD: Makefile,v 1.25 2008/06/26 01:25:32 okan Exp $
 
 COMMENT=	general-purpose multi-platform x86 assembler
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-DISTNAME=	nasm-2.03
+DISTNAME=	nasm-2.03.01
 CATEGORIES=	devel lang
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nasm/}
diff --git a/devel/nasm/distinfo b/devel/nasm/distinfo
index 50bc404c5c8..faf32f9ff00 100644
--- a/devel/nasm/distinfo
+++ b/devel/nasm/distinfo
@@ -1,5 +1,5 @@
-MD5 (nasm-2.03.tar.gz) = lhfiAfJ0fapxAwq/02z9nQ==
-RMD160 (nasm-2.03.tar.gz) = +gAePAx5c9yxcpPHHerWyj3C0IQ=
-SHA1 (nasm-2.03.tar.gz) = AVc+oIR+LifMnIQmXXGfRggcvzQ=
-SHA256 (nasm-2.03.tar.gz) = rpHjvZyC0WULH1VBvHNxo5ZAK6h2Hx9uUPeHPJVe3FU=
-SIZE (nasm-2.03.tar.gz) = 943350
+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
diff --git a/devel/nasm/patches/patch-doc_Makefile.in b/devel/nasm/patches/patch-doc_Makefile.in
index 150ff5901ee..a502438b1cf 100644
--- a/devel/nasm/patches/patch-doc_Makefile.in
+++ b/devel/nasm/patches/patch-doc_Makefile.in
@@ -1,5 +1,5 @@
---- doc/Makefile.in.orig	Mon Jun  9 19:29:26 2008
-+++ doc/Makefile.in	Tue Jun 10 20:30:52 2008
+--- 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 @@
  exec_prefix	= @exec_prefix@
  bindir		= @bindir@
@@ -13,8 +13,8 @@
  PS2PDF          = ps2pdf		# Part of GhostScript
  
  SRCS		= nasmdoc.src
--OUT		= nasm.info nasmdoc.ps nasmdoc.pdf
-+OUT		= nasm.info # nasmdoc.ps nasmdoc.pdf # don't build ps and pdf
+-OUT		= info html nasmdoc.txt nasmdoc.ps nasmdoc.pdf
++OUT		= info html nasmdoc.txt # nasmdoc.ps nasmdoc.pdf
  
 -# exports
 -export srcdir
@@ -22,16 +22,29 @@
  
  all: $(OUT)
  
-@@ -38,7 +35,7 @@
- # Consider html, txt and ps output a side effect
- nasmdoc.dip: nasmdoc.src rdsrc.pl inslist.src
+@@ -40,17 +37,17 @@
+ 
+ html/nasmdoc0.html: nasmdoc.src rdsrc.pl inslist.src
  	mkdir -p html
--	$(PERL) $(srcdir)/rdsrc.pl < $<
-+	$(PERL) $(srcdir)/rdsrc.pl < $(srcdir)/nasmdoc.src
+-	$(PERL) $(srcdir)/rdsrc.pl html < $<
++	$(PERL) $(srcdir)/rdsrc.pl html < $(srcdir)/nasmdoc.src
  	mv -f *.html html
  
- nasmdoc.texi: nasmdoc.dip
-@@ -55,7 +52,7 @@
+ nasmdoc.dip: nasmdoc.src rdsrc.pl inslist.src
+-	$(PERL) $(srcdir)/rdsrc.pl dip < $<
++	$(PERL) $(srcdir)/rdsrc.pl dip < $(srcdir)/nasmdoc.src
+ 
+ nasmdoc.texi: nasmdoc.src rdsrc.pl inslist.src
+-	$(PERL) $(srcdir)/rdsrc.pl texi < $<
++	$(PERL) $(srcdir)/rdsrc.pl texi < $(srcdir)/nasmdoc.src
+ 
+ nasmdoc.txt: nasmdoc.src rdsrc.pl inslist.src
+-	$(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 @@
  
  info/nasm.info: nasmdoc.texi
  	mkdir -p info
@@ -40,7 +53,7 @@
  	mv -f *.info *.info-* info
  
  # DVI output from texinfo (optional)
-@@ -64,13 +61,12 @@
+@@ -73,13 +70,12 @@
  
  # Rules for building an OS/2 book
  nasmdoc.ipf: nasmdoc.texi
@@ -56,7 +69,7 @@
  	-rm -f *.aux *.cp *.fn *.ky *.pg *.log *.toc *.tp *.vr
  
  spotless: clean
-@@ -82,4 +78,4 @@
+@@ -91,4 +87,4 @@
  	$(INSTALL_DATA) info/* $(INSTALLROOT)$(infodir)
  	mkdir -p $(INSTALLROOT)$(docdir)/html
  	$(INSTALL_DATA) html/* $(INSTALLROOT)$(docdir)/html
diff --git a/devel/nasm/pkg/PLIST b/devel/nasm/pkg/PLIST
index 44cf416634c..60b86b6461f 100644
--- a/devel/nasm/pkg/PLIST
+++ b/devel/nasm/pkg/PLIST
@@ -1,9 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.10 2008/06/11 19:35:46 okan Exp $
+@comment $OpenBSD: PLIST,v 1.11 2008/06/26 01:25:33 okan Exp $
 @bin bin/ldrdf
 @bin bin/nasm
 @bin bin/ndisasm
 @bin bin/rdf2bin
-@bin bin/rdf2com
+bin/rdf2com
 @bin bin/rdf2ihx
 @bin bin/rdfdump
 @bin bin/rdflib