pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/nasm Update to version 2.01. There are far too ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/ddc3a206bfa5
branches: trunk
changeset: 538085:ddc3a206bfa5
user: bjs <bjs%pkgsrc.org@localhost>
date: Mon Jan 28 05:38:20 2008 +0000
description:
Update to version 2.01. There are far too many changes to include here;
please see the ChangeLog if interested.
All patches except Makefile patches are no longer necessary.
While here, add -Wno-signed-char to quiet these warnings.
Also change INSTALLATION_DIRS to AUTO_MKDIRS, quiet pkglint
by setting INFO_FILES=yes.
diffstat:
devel/nasm/Makefile | 9 +-
devel/nasm/PLIST | 10 +-
devel/nasm/distinfo | 16 +-
devel/nasm/patches/patch-aa | 21 +-
devel/nasm/patches/patch-ab | 17 +-
devel/nasm/patches/patch-ac | 24 +-
devel/nasm/patches/patch-ad | 1324 -------------------------------------------
devel/nasm/patches/patch-ae | 61 -
8 files changed, 46 insertions(+), 1436 deletions(-)
diffs (truncated from 1586 to 300 lines):
diff -r f38831fafbb0 -r ddc3a206bfa5 devel/nasm/Makefile
--- a/devel/nasm/Makefile Mon Jan 28 02:57:26 2008 +0000
+++ b/devel/nasm/Makefile Mon Jan 28 05:38:20 2008 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2007/02/22 19:26:22 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2008/01/28 05:38:20 bjs Exp $
-DISTNAME= nasm-0.98.39
-PKGREVISION= 3
+DISTNAME= nasm-2.01
CATEGORIES= devel lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nasm/}
EXTRACT_SUFX= .tar.bz2
@@ -17,7 +16,7 @@
GCC_REQD+= 3.0
GNU_CONFIGURE= yes
-INFO_FILES= # PLIST
+INFO_FILES= yes
BUILD_TARGET= everything
INSTALL_TARGET= install_everything
@@ -26,7 +25,7 @@
MAKE_ENV+= PERL5=${PERL5:Q} \
INSTALL_DATA_DIR=${INSTALL_DATA_DIR:Q}
-INSTALLATION_DIRS= bin ${PKGINFODIR} ${PKGMANDIR}/man1 share/doc/html
+AUTO_MKDIRS= yes
.include "../../mk/compiler.mk"
diff -r f38831fafbb0 -r ddc3a206bfa5 devel/nasm/PLIST
--- a/devel/nasm/PLIST Mon Jan 28 02:57:26 2008 +0000
+++ b/devel/nasm/PLIST Mon Jan 28 05:38:20 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2006/03/31 05:37:09 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/01/28 05:38:20 bjs Exp $
bin/ldrdf
bin/nasm
bin/ndisasm
@@ -9,9 +9,16 @@
bin/rdflib
bin/rdx
info/nasm.info
+man/man1/ldrdf.1
man/man1/nasm.1
man/man1/ndisasm.1
+man/man1/rdf2bin.1
+man/man1/rdf2com.1
+man/man1/rdfdump.1
+man/man1/rdflib.1
+man/man1/rdx.1
share/doc/html/nasm/nasmdo10.html
+share/doc/html/nasm/nasmdo11.html
share/doc/html/nasm/nasmdoc0.html
share/doc/html/nasm/nasmdoc1.html
share/doc/html/nasm/nasmdoc2.html
@@ -23,7 +30,6 @@
share/doc/html/nasm/nasmdoc8.html
share/doc/html/nasm/nasmdoc9.html
share/doc/html/nasm/nasmdoca.html
-share/doc/html/nasm/nasmdocb.html
share/doc/html/nasm/nasmdoci.html
share/doc/nasm/nasmdoc.ps
share/doc/nasm/nasmdoc.txt
diff -r f38831fafbb0 -r ddc3a206bfa5 devel/nasm/distinfo
--- a/devel/nasm/distinfo Mon Jan 28 02:57:26 2008 +0000
+++ b/devel/nasm/distinfo Mon Jan 28 05:38:20 2008 +0000
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.12 2008/01/05 21:49:42 rillig Exp $
+$NetBSD: distinfo,v 1.13 2008/01/28 05:38:20 bjs Exp $
-SHA1 (nasm-0.98.39.tar.bz2) = 73d64812bb95774355f737c0fb0271382d23db67
-RMD160 (nasm-0.98.39.tar.bz2) = b5587b1b81f58cef3a50e438e8efb365945df587
-Size (nasm-0.98.39.tar.bz2) = 543976 bytes
-SHA1 (patch-aa) = 27409c3b71634dc5c3aa02b3cae49ebad2db6579
-SHA1 (patch-ab) = bbe1d7219dd2e5ade8f97a4f3070bc87d3a7d4b5
-SHA1 (patch-ac) = 7ae622ab78b1cf30ca027d652476d7d48deae182
-SHA1 (patch-ad) = 6ef567e104be9d1a16eac2a0eaf5a03398a6373c
-SHA1 (patch-ae) = f6029c8574c4e11d59d161819a379e9f687bc346
+SHA1 (nasm-2.01.tar.bz2) = e532443eb5a984c9711062d329d4ec07ec154250
+RMD160 (nasm-2.01.tar.bz2) = 9589f146fb242fa8ebc0ce2b53e6a8629022e8ca
+Size (nasm-2.01.tar.bz2) = 722479 bytes
+SHA1 (patch-aa) = 8514d241d017f0396e7ee8bfe0008d99ca29683c
+SHA1 (patch-ab) = f59ec4b8b342af6c0986cb0fb6be604675523c42
+SHA1 (patch-ac) = 35b69553570023019193c9de915913b1994dcd5b
diff -r f38831fafbb0 -r ddc3a206bfa5 devel/nasm/patches/patch-aa
--- a/devel/nasm/patches/patch-aa Mon Jan 28 02:57:26 2008 +0000
+++ b/devel/nasm/patches/patch-aa Mon Jan 28 05:38:20 2008 +0000
@@ -1,22 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2007/01/06 15:11:58 jmmv Exp $
+$NetBSD: patch-aa,v 1.3 2008/01/28 05:38:20 bjs Exp $
---- Makefile.in.orig 2005-01-15 00:05:31.000000000 +0100
+--- Makefile.in.orig 2008-01-17 15:22:39.000000000 -0500
+++ Makefile.in
-@@ -18,7 +18,7 @@ CC = @CC@
- CFLAGS = @CFLAGS@ @GCCFLAGS@ @DEFS@ -I$(srcdir) -I.
+@@ -22,7 +22,7 @@ INTERNAL_CFLAGS = -I$(srcdir) -I.
+ ALL_CFLAGS = $(BUILD_CFLAGS) $(INTERNAL_CFLAGS)
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
--PERL = perl
+-PERL = perl -I$(srcdir)/perllib
+PERL = ${PERL5}
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -51,7 +51,7 @@ NASM = nasm.$(O) nasmlib.$(O) float.$(O)
- labels.$(O) parser.$(O) outform.$(O) output/outbin.$(O) \
- output/outaout.$(O) output/outcoff.$(O) output/outelf.$(O) \
- output/outobj.$(O) output/outas86.$(O) output/outrdf2.$(O) \
-- output/outdbg.$(O) output/outieee.$(O) \
-+ output/outdbg.$(O) output/outieee.$(O) output/outmacho.$(O) \
- preproc.$(O) listing.$(O) eval.$(O)
+ XOBJS = @XOBJS@
- NDISASM = ndisasm.$(O) disasm.$(O) sync.$(O) nasmlib.$(O) insnsd.$(O)
diff -r f38831fafbb0 -r ddc3a206bfa5 devel/nasm/patches/patch-ab
--- a/devel/nasm/patches/patch-ab Mon Jan 28 02:57:26 2008 +0000
+++ b/devel/nasm/patches/patch-ab Mon Jan 28 05:38:20 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2003/09/17 16:40:14 jmmv Exp $
+$NetBSD: patch-ab,v 1.2 2008/01/28 05:38:20 bjs Exp $
---- doc/Makefile.in.orig 2002-05-18 22:17:28.000000000 +0000
+--- doc/Makefile.in.orig 2008-01-17 15:22:17.000000000 -0500
+++ doc/Makefile.in
-@@ -9,20 +9,20 @@ prefix = @prefix@
+@@ -8,7 +8,8 @@ prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
mandir = @mandir@
@@ -10,8 +10,9 @@
+docdir = $(prefix)/share/doc/nasm
+htmldocdir = $(prefix)/share/doc/html/nasm
infodir = @infodir@
+ datarootdir = @datarootdir@
- INSTALL = @INSTALL@
+@@ -16,13 +17,12 @@ INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
@@ -19,15 +20,15 @@
-MAKEINFO = makeinfo
+PERL = ${PERL5}
TEXI2DVI = texi2dvi
- PS2PDF = ps2pdf -dOptimize=true # Part of GhostScript
+ PS2PDF = ps2pdf # Part of GhostScript
SRCS = nasmdoc.src
-OUT = nasm.info nasmdoc.ps nasmdoc.pdf
+OUT = nasm.info nasmdoc.ps # nasmdoc.pdf
- all: $(OUT)
-
-@@ -73,6 +73,7 @@ spotless: clean
+ # exports
+ export srcdir
+@@ -77,6 +77,7 @@ spotless: clean
install: all
$(INSTALL_DATA) info/* $(INSTALLROOT)$(infodir)
diff -r f38831fafbb0 -r ddc3a206bfa5 devel/nasm/patches/patch-ac
--- a/devel/nasm/patches/patch-ac Mon Jan 28 02:57:26 2008 +0000
+++ b/devel/nasm/patches/patch-ac Mon Jan 28 05:38:20 2008 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2005/05/05 20:12:46 adrianp Exp $
+$NetBSD: patch-ac,v 1.4 2008/01/28 05:38:20 bjs Exp $
---- output/outieee.c.orig 2005-05-05 21:05:26.000000000 +0100
-+++ output/outieee.c
-@@ -1120,7 +1120,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)
+--- configure.orig 2008-01-17 15:22:18.000000000 -0500
++++ configure
+@@ -4498,7 +4498,7 @@ rm -f core conftest.err conftest.$ac_obj
+ { echo "$as_me:$LINENO: checking if $CC accepts -Wall" >&5
+ echo $ECHO_N "checking if $CC accepts -Wall... $ECHO_C" >&6; }
+ pa_add_cflags__old_cflags="$CFLAGS"
+- CFLAGS="$CFLAGS -Wall"
++ CFLAGS="$CFLAGS -Wall -Wno-char-subscripts"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
diff -r f38831fafbb0 -r ddc3a206bfa5 devel/nasm/patches/patch-ad
--- a/devel/nasm/patches/patch-ad Mon Jan 28 02:57:26 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1324 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2008/01/05 21:49:42 rillig Exp $
-
---- /dev/null 2007-01-06 13:50:40.000000000 +0100
-+++ output/outmacho.c 2006-02-02 22:50:47.000000000 +0100
-@@ -0,0 +1,1319 @@
-+/* outmacho.c output routines for the Netwide Assembler to produce
-+ * NeXTstep/OpenStep/Rhapsody/Darwin/MacOS X object files
-+ *
-+ * The Netwide Assembler is copyright (C) 1996 Simon Tatham and
-+ * Julian Hall. All rights reserved. The software is
-+ * redistributable under the licence given in the file "Licence"
-+ * distributed in the NASM archive.
-+ */
-+
-+/* Most of this file is, like Mach-O itself, based on a.out. For more
-+ * guidelines see outaout.c. */
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <ctype.h>
-+
-+#include "nasm.h"
-+#include "nasmlib.h"
-+#include "outform.h"
-+
-+#if defined(OF_MACHO)
-+
-+/* Mach-O in-file header structure sizes */
-+#define MACHO_HEADER_SIZE (28)
-+#define MACHO_SEGCMD_SIZE (56)
-+#define MACHO_SECTCMD_SIZE (68)
-+#define MACHO_SYMCMD_SIZE (24)
-+#define MACHO_NLIST_SIZE (12)
-+#define MACHO_RELINFO_SIZE (8)
-+
-+/* Mach-O file header values */
-+#define MH_MAGIC (0xfeedface)
-+#define CPU_TYPE_I386 (7) /* x86 platform */
-+#define CPU_SUBTYPE_I386_ALL (3) /* all-x86 compatible */
-+#define MH_OBJECT (0x1) /* object file */
-+
-+#define LC_SEGMENT (0x1) /* segment load command */
-+#define LC_SYMTAB (0x2) /* symbol table load command */
-+
-+#define VM_PROT_NONE (0x00)
-+#define VM_PROT_READ (0x01)
-+#define VM_PROT_WRITE (0x02)
-+#define VM_PROT_EXECUTE (0x04)
-+
-+#define VM_PROT_DEFAULT (VM_PROT_READ | VM_PROT_WRITE | VM_PROT_EXECUTE)
-+#define VM_PROT_ALL (VM_PROT_READ | VM_PROT_WRITE | VM_PROT_EXECUTE)
-+
-+struct section {
-+ /* nasm internal data */
-+ struct section *next;
-+ struct SAA *data;
-+ long index;
-+ struct reloc *relocs;
-+ int align;
-+
-+ /* data that goes into the file */
-+ char sectname[16]; /* what this section is called */
-+ char segname[16]; /* segment this section will be in */
-+ unsigned long size; /* in-memory and -file size */
-+ unsigned long nreloc; /* relocation entry count */
-+ unsigned long flags; /* type and attributes (masked) */
-+};
-+
-+#define SECTION_TYPE 0x000000ff /* section type mask */
-+
-+#define S_REGULAR (0x0) /* standard section */
-+#define S_ZEROFILL (0x1) /* zerofill, in-memory only */
-+
-+#define SECTION_ATTRIBUTES_SYS 0x00ffff00 /* system setable attributes */
-+#define S_ATTR_SOME_INSTRUCTIONS 0x00000400 /* section contains some
-+ machine instructions */
-+#define S_ATTR_EXT_RELOC 0x00000200 /* section has external
-+ relocation entries */
-+#define S_ATTR_LOC_RELOC 0x00000100 /* section has local
-+ relocation entries */
-+
-+
-+static struct sectmap {
-+ const char *nasmsect;
-+ const char *segname;
-+ const char *sectname;
-+ const long flags;
-+} sectmap[] = { {
-+".text", "__TEXT", "__text", S_REGULAR|S_ATTR_SOME_INSTRUCTIONS}, {
-+".data", "__DATA", "__data", S_REGULAR}, {
-+".rodata", "__DATA", "__const", S_REGULAR}, {
-+".bss", "__DATA", "__bss", S_ZEROFILL}, {
-+NULL, NULL, NULL}};
-+
-+struct reloc {
-+ /* nasm internal data */
-+ struct reloc *next;
-+
-+ /* data that goes into the file */
-+ long addr; /* op's offset in section */
-+ unsigned int snum:24, /* contains symbol index if
-+ ** ext otherwise in-file
Home |
Main Index |
Thread Index |
Old Index