update to 0.98.35; from cjeker@diehard.n-r-g.com via angelos@

This commit is contained in:
naddy 2002-11-21 17:38:39 +00:00
parent 4360a55f5d
commit 092d258af2
5 changed files with 55 additions and 39 deletions

View File

@ -1,20 +1,19 @@
# $OpenBSD: Makefile,v 1.15 2002/10/25 22:37:52 naddy Exp $
# $OpenBSD: Makefile,v 1.16 2002/11/21 17:38:39 naddy Exp $
COMMENT= "general-purpose multi-platform x86 assembler"
ONLY_FOR_ARCHS= i386
DISTNAME= nasm-0.98
DISTNAME= nasm-0.98.35
CATEGORIES= devel lang
MASTER_SITES= ${MASTER_SITE_SUNSITE:=devel/lang/assemblers/}
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nasm/}
HOMEPAGE= http://www.web-sites.co.uk/nasm/
HOMEPAGE= http://nasm.sourceforge.net/
MAINTAINER= Angelos D. Keromytis <angelos@openbsd.org>
# The license is basically NOFEE but requires permission for inclusion
# in a commercial procuct. See License file for info.
# LGPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -29,11 +28,7 @@ FAKE_FLAGS= INSTALLROOT="${WRKINST}"
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nasm
${INSTALL_SCRIPT} ${WRKSRC}/doc/rdsrc.pl ${PREFIX}/share/doc/nasm
${INSTALL_MAN} ${WRKSRC}/*.doc ${PREFIX}/share/doc/nasm
${INSTALL_DATA} ${WRKSRC}/doc/nasmdoc.src ${PREFIX}/share/doc/nasm
${INSTALL_DATA} ${WRKBUILD}/doc/nasmdoc.ps ${PREFIX}/share/doc/nasm
${INSTALL_DATA} ${WRKBUILD}/doc/nasmdoc.txt ${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

View File

@ -1,3 +1,3 @@
MD5 (nasm-0.98.tar.gz) = fc334b4b05b5f57fe3fc867c42320ef9
RMD160 (nasm-0.98.tar.gz) = 440faedf36e8f565279a62ca0037c30d9eb93efb
SHA1 (nasm-0.98.tar.gz) = c18adc9a543d785fa3b950dd2980a350a3eff772
MD5 (nasm-0.98.35.tar.gz) = 694167e9831052d29a6d3813b67e039b
RMD160 (nasm-0.98.35.tar.gz) = a83c22af24844e0b301fe55eb8be68d3bf00b26d
SHA1 (nasm-0.98.35.tar.gz) = 06df1034e58fab35d613c89cd4b11ac4a48900ff

View File

@ -1,10 +1,11 @@
--- Makefile.in.orig Thu Jun 3 16:24:33 1999
+++ Makefile.in Sat Oct 7 23:38:23 2000
@@ -50,6 +50,7 @@
$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 ndisasm nasm.man ndisasm.man
cd rdoff; $(MAKE) all
all: nasm$(X) ndisasm$(X) nasm.man ndisasm.man
cd rdoff && $(MAKE) all
+ cd doc; $(MAKE) all
nasm: $(NASM)
$(CC) $(LDFLAGS) -o nasm $(NASM)
nasm$(X): $(NASM)
$(CC) $(LDFLAGS) -o nasm$(X) $(NASM) $(LIBS)

View File

@ -1,28 +1,51 @@
--- doc/Makefile.in.orig Thu Jun 3 16:24:51 1999
+++ doc/Makefile.in Sat Oct 7 23:48:26 2000
@@ -17,7 +17,7 @@
$OpenBSD: patch-doc_Makefile.in,v 1.2 2002/11/21 17:38:39 naddy Exp $
--- doc/Makefile.in.orig Sun May 19 00:17:28 2002
+++ doc/Makefile.in Thu Nov 21 18:23:44 2002
@@ -17,12 +17,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
PERL = perl
-MAKEINFO = makeinfo
+MAKEINFO = makeinfo --no-split
TEXI2DVI = texi2dvi
PS2PDF = ps2pdf -dOptimize=true # Part of GhostScript
SRCS = nasmdoc.src
OUT = nasm.info
@@ -29,13 +29,13 @@
# Consider html, txt and src output a side effect
.src.texi:
-OUT = nasm.info nasmdoc.ps nasmdoc.pdf
+OUT = nasm.info # nasmdoc.ps nasmdoc.pdf # don't build ps and pdf
all: $(OUT)
@@ -31,7 +31,7 @@ os2: nasm.inf
# Consider html, txt and ps output a side effect
nasmdoc.dip: nasmdoc.src rdsrc.pl
mkdir -p html
- $(PERL) ./rdsrc.pl < $<
+ $(PERL) ${srcdir}/rdsrc.pl < $<
- $(PERL) $(srcdir)/rdsrc.pl < $<
+ $(PERL) $(srcdir)/rdsrc.pl < $(srcdir)/nasmdoc.src
mv -f *.html html
nasm.info: nasmdoc.texi
nasmdoc.texi: nasmdoc.dip
@@ -48,8 +48,8 @@ nasm.info: info/nasm.info
info/nasm.info: nasmdoc.texi
mkdir -p info
- $(MAKEINFO) $<
- mv -f *.info *.info-* info
+ $(MAKEINFO) $>
+ mv -f *.info* info
+ $(MAKEINFO) $?
+ mv -f *.info info
# DVI output from texinfo (optional)
nasmdoc.dvi: nasmdoc.texi
@@ -57,10 +57,10 @@ nasmdoc.dvi: nasmdoc.texi
# Rules for building an OS/2 book
nasmdoc.ipf: nasmdoc.texi
- texi2ipf $< >$@
+ texi2ipf $? >$@
nasm.inf: nasmdoc.ipf
- ipfc -i -s $< $@
+ ipfc -i -s $? $@
clean:
-rm -f *.rtf *.hpj *.texi *.ph *.gid
-rm -f *.rtf *.hpj *.texi *.gid *.ipf *.dip

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2000/10/08 04:27:10 brad Exp $
@comment $OpenBSD: PLIST,v 1.7 2002/11/21 17:38:39 naddy Exp $
bin/nasm
bin/ndisasm
@unexec install-info --delete --info-dir=%D/info %D/info/nasm.info
@ -8,9 +8,6 @@ man/man1/nasm.1
man/man1/ndisasm.1
share/doc/nasm/internal.doc
share/doc/nasm/nasmdo10.html
share/doc/nasm/nasmdoc.ps
share/doc/nasm/nasmdoc.src
share/doc/nasm/nasmdoc.txt
share/doc/nasm/nasmdoc0.html
share/doc/nasm/nasmdoc1.html
share/doc/nasm/nasmdoc2.html
@ -22,6 +19,6 @@ 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/rdsrc.pl
@dirrm share/doc/nasm