cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 2.02

Browse Source 
based on a patch (and testing) from syl - thanks.

comments from sthen@, brad@ and ajacoutot@

suggestions and ok brad@
This commit is contained in:
okan 2008-04-23 20:48:33 +00:00
parent 6e38f42909
commit 907a4205f7
8 changed files with 91 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
devel/nasm/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.22 2008/01/04 17:48:34 espie Exp $
# $OpenBSD: Makefile,v 1.23 2008/04/23 20:48:33 okan Exp $
COMMENT= general-purpose multi-platform x86 assembler
ONLY_FOR_ARCHS= i386
ONLY_FOR_ARCHS= i386 amd64
DISTNAME= nasm-0.98.38
PKGNAME= ${DISTNAME}p0
DISTNAME= nasm-2.02
CATEGORIES= devel lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nasm/}
@ -19,17 +18,15 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= gnu
DESTDIRNAME= INSTALLROOT
ALL_TARGET= everything
INSTALL_TARGET= install_everything
NO_REGRESS= Yes
DESTDIRNAME= INSTALLROOT
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nasm
${INSTALL_MAN} ${WRKSRC}/doc/*.doc ${PREFIX}/share/doc/nasm
${INSTALL_DATA} ${WRKBUILD}/doc/html/*.html ${PREFIX}/share/doc/nasm
${INSTALL_DATA} ${WRKBUILD}/doc/info/* $(PREFIX)/info
${INSTALL_DATA} ${WRKSRC}/doc/*.doc ${PREFIX}/share/doc/nasm
.include <bsd.port.mk>

10
devel/nasm/distinfo
View File

@ -1,5 +1,5 @@
MD5 (nasm-0.98.38.tar.gz) = nB35FWBlHL+qc1lf5rq7hQ==
RMD160 (nasm-0.98.38.tar.gz) = FZBw2bw5CYxWAHxQsMCY/uJbif8=
SHA1 (nasm-0.98.38.tar.gz) = y1i6pGkA6M5JD9x8LK2jXCzEnOA=
SHA256 (nasm-0.98.38.tar.gz) = Aqxbav8s20SoVo2dDdyq5DavVpCic3Rwt9NTQhdCA9Q=
SIZE (nasm-0.98.38.tar.gz) = 641727
MD5 (nasm-2.02.tar.gz) = JTq8SPB20+KTcP1PVSJwlA==
RMD160 (nasm-2.02.tar.gz) = NOim+sZLJduyw1QDtpx1IUb0mME=
SHA1 (nasm-2.02.tar.gz) = KyQHbuvr+F+ASNp42uHugBxPppM=
SHA256 (nasm-2.02.tar.gz) = B9/+/3B+AIjTyVCYa71IrmHWU05HciTFVcoV/AfCgr4=
SIZE (nasm-2.02.tar.gz) = 902568

11
devel/nasm/patches/patch-Makefile.in
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-Makefile.in,v 1.2 2002/11/21 17:38:39 naddy Exp $
--- Makefile.in.orig Fri Sep 13 02:25:44 2002
+++ Makefile.in Thu Nov 14 00:04:09 2002
@@ -58,6 +58,7 @@ NDISASM = ndisasm.$(O) disasm.$(O) sync.
all: nasm$(X) ndisasm$(X) nasm.man ndisasm.man
cd rdoff && $(MAKE) all
+ cd doc; $(MAKE) all
nasm$(X): $(NASM)
$(CC) $(LDFLAGS) -o nasm$(X) $(NASM) $(LIBS)

42
devel/nasm/patches/patch-doc_Makefile.in
View File

@ -1,25 +1,38 @@
$OpenBSD: patch-doc_Makefile.in,v 1.3 2005/01/27 02:09:52 naddy Exp $
--- doc/Makefile.in.orig Sun May 19 00:17:28 2002
+++ doc/Makefile.in Thu Jan 27 02:41:55 2005
@@ -22,7 +22,7 @@ TEXI2DVI = texi2dvi
PS2PDF = ps2pdf -dOptimize=true # Part of GhostScript
$OpenBSD: patch-doc_Makefile.in,v 1.4 2008/04/23 20:48:33 okan Exp $
--- doc/Makefile.in.orig Tue Feb 19 14:08:57 2008
+++ doc/Makefile.in Mon Apr 21 15:47:03 2008
@@ -8,7 +8,7 @@ prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
mandir = @mandir@
-docdir = $(prefix)/doc/nasm
+docdir = $(prefix)/share/doc/nasm
infodir = @infodir@
datarootdir = @datarootdir@
@@ -22,11 +22,8 @@ TEXI2DVI = texi2dvi
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
-# exports
-export srcdir
-export PERL
all: $(OUT)
@@ -31,7 +31,7 @@ os2: nasm.inf
@@ -38,7 +35,7 @@ inslist.src: inslist.pl ../insns.dat
# Consider html, txt and ps output a side effect
nasmdoc.dip: nasmdoc.src rdsrc.pl
nasmdoc.dip: nasmdoc.src rdsrc.pl inslist.src
mkdir -p html
- $(PERL) $(srcdir)/rdsrc.pl < $<
+ $(PERL) $(srcdir)/rdsrc.pl < $(srcdir)/nasmdoc.src
mv -f *.html html
nasmdoc.texi: nasmdoc.dip
@@ -48,7 +48,7 @@ nasm.info: info/nasm.info
@@ -55,7 +52,7 @@ nasm.info: info/nasm.info
info/nasm.info: nasmdoc.texi
mkdir -p info
@ -28,7 +41,7 @@ $OpenBSD: patch-doc_Makefile.in,v 1.3 2005/01/27 02:09:52 naddy Exp $
mv -f *.info *.info-* info
# DVI output from texinfo (optional)
@@ -57,10 +57,10 @@ nasmdoc.dvi: nasmdoc.texi
@@ -64,13 +61,12 @@ nasmdoc.dvi: nasmdoc.texi
# Rules for building an OS/2 book
nasmdoc.ipf: nasmdoc.texi
@ -40,4 +53,13 @@ $OpenBSD: patch-doc_Makefile.in,v 1.3 2005/01/27 02:09:52 naddy Exp $
+ ipfc -i -s $? $@
clean:
-rm -f *.rtf *.hpj *.texi *.gid *.ipf *.dip
- -rm -f *.rtf *.hpj *.texi *.gid *.ipf *.dip
-rm -f *.aux *.cp *.fn *.ky *.pg *.log *.toc *.tp *.vr
spotless: clean
@@ -82,4 +78,4 @@ install: all
$(INSTALL_DATA) info/* $(INSTALLROOT)$(infodir)
mkdir -p $(INSTALLROOT)$(docdir)/html
$(INSTALL_DATA) html/* $(INSTALLROOT)$(docdir)/html
- $(INSTALL_DATA) nasmdoc.ps nasmdoc.pdf nasmdoc.txt $(INSTALLROOT)$(docdir)
+ $(INSTALL_DATA) nasmdoc.txt $(INSTALLROOT)$(docdir)

12
devel/nasm/patches/patch-output_outieee_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-output_outieee_c,v 1.1 2005/05/19 13:04:17 robert Exp $
--- output/outieee.c.orig Thu Sep 12 04:23:54 2002
+++ output/outieee.c Thu May 19 14:52:19 2005
@@ -1096,7 +1096,7 @@ static void ieee_putascii(char *format,
va_list ap;
va_start(ap, format);
- vsprintf(buffer, format, ap);
+ vsnprintf(buffer, sizeof(buffer), format, ap);
l = strlen(buffer);
for (i=0; i < l; i++)
if ((buffer[i] & 0xff) > 31)

12
devel/nasm/patches/patch-preproc_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-preproc_c,v 1.1 2005/05/19 13:04:17 robert Exp $
--- preproc.c.orig Mon Sep 8 00:46:26 2003
+++ preproc.c Thu May 19 14:52:19 2005
@@ -4067,7 +4067,7 @@ error(int severity, const char *fmt, ...
return;
va_start(arg, fmt);
- vsprintf(buff, fmt, arg);
+ vsnprintf(buff, sizeof(buff), fmt, arg);
va_end(arg);
if (istk && istk->mstk && istk->mstk->name)

15
devel/nasm/patches/patch-rdf2bin.c Normal file
View File

@ -0,0 +1,15 @@
--- rdoff/rdf2bin.c.orig Tue Feb 19 14:08:57 2008
+++ rdoff/rdf2bin.c Mon Apr 21 15:18:26 2008
@@ -119,9 +119,9 @@ int main(int argc, char **argv)
return 1;
}
- if (fwrite(m->t, 1, m->f.seg[0].length, of) != m->f.seg[0].length ||
- fwrite(padding, 1, codepad, of) != codepad ||
- fwrite(m->d, 1, m->f.seg[1].length, of) != m->f.seg[1].length) {
+ if (fwrite(m->t, 1, m->f.seg[0].length, of) != (unsigned int)m->f.seg[0].length ||
+ fwrite(padding, 1, codepad, of) != (unsigned int)codepad ||
+ fwrite(m->d, 1, m->f.seg[1].length, of) != (unsigned int)m->f.seg[1].length) {
fprintf(stderr, "rdf2bin: error writing to %s\n", *argv);
return 1;
}

46
devel/nasm/pkg/PLIST
View File

@ -1,22 +1,38 @@
@comment $OpenBSD: PLIST,v 1.8 2004/08/09 11:09:10 espie Exp $
@comment $OpenBSD: PLIST,v 1.9 2008/04/23 20:48:33 okan Exp $
bin/ldrdf
bin/nasm
bin/ndisasm
bin/rdf2bin
bin/rdf2com
bin/rdf2ihx
bin/rdfdump
bin/rdflib
bin/rdx
@info info/nasm.info
@man man/man1/ldrdf.1
@man man/man1/nasm.1
@man man/man1/ndisasm.1
@man man/man1/rdf2bin.1
@man man/man1/rdf2com.1
@man man/man1/rdfdump.1
@man man/man1/rdflib.1
@man man/man1/rdx.1
share/doc/nasm/
share/doc/nasm/html/
share/doc/nasm/html/nasmdo10.html
share/doc/nasm/html/nasmdo11.html
share/doc/nasm/html/nasmdoc0.html
share/doc/nasm/html/nasmdoc1.html
share/doc/nasm/html/nasmdoc2.html
share/doc/nasm/html/nasmdoc3.html
share/doc/nasm/html/nasmdoc4.html
share/doc/nasm/html/nasmdoc5.html
share/doc/nasm/html/nasmdoc6.html
share/doc/nasm/html/nasmdoc7.html
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/nasmdoci.html
share/doc/nasm/internal.doc
share/doc/nasm/nasmdo10.html
share/doc/nasm/nasmdoc0.html
share/doc/nasm/nasmdoc1.html
share/doc/nasm/nasmdoc2.html
share/doc/nasm/nasmdoc3.html
share/doc/nasm/nasmdoc4.html
share/doc/nasm/nasmdoc5.html
share/doc/nasm/nasmdoc6.html
share/doc/nasm/nasmdoc7.html
share/doc/nasm/nasmdoc8.html
share/doc/nasm/nasmdoc9.html
share/doc/nasm/nasmdoca.html
share/doc/nasm/nasmdocb.html
share/doc/nasm/nasmdoci.html
share/doc/nasm/nasmdoc.txt