Attachment 85224 Details for Bug 121342 – file.diff

[patch] file.diff

file.diff (text/plain), 5.88 KB, created by bf on 2008-03-04 03:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: bf

Created: 2008-03-04 03:20:01 UTC

Size: 5.88 KB

patch

obsolete

>diff -ruN nasm.orig/Makefile nasm/Makefile
>--- nasm.orig/Makefile	2008-02-21 00:09:10.000000000 -0500
>+++ nasm/Makefile	2008-03-03 21:47:28.448364711 -0500
>@@ -6,28 +6,37 @@
> #
> 
> PORTNAME=	nasm
>-PORTVERSION=	0.98.39
>+PORTVERSION=	2.02
> PORTEPOCH=	1
> CATEGORIES=	devel lang
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	nasm
>+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}  ${DISTNAME}-xdoc${EXTRACT_SUFX}
> 
> MAINTAINER=	krion@FreeBSD.org
>-COMMENT=	General-purpose multi-platform x86 assembler
>+COMMENT=	General-purpose multi-platform x86 and x86-64 assembler
> 
> USE_BZIP2=	yes
> GNU_CONFIGURE=	yes
>-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
>-PLIST_SUB=	VERSION=${PORTVERSION}
>-
>-PLIST_FILES=	bin/nasm bin/nasm-%%VERSION%% bin/ndisasm
> 
> MAN1=		nasm.1 ndisasm.1
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|-std=c99||' ${WRKSRC}/configure
>+OPTIONS=	RDOFF "Install RDOFF utilities" Off
>+
>+.include <bsd.port.pre.mk>
>+
>+.ifdef(WITH_RDOFF)
>+MAN1+=		ldrdf.1 rdf2bin.1 rdf2com.1 rdfdump.1 rdflib.1 rdx.1
>+PLIST_SUB+=	RDOFF=""
>+INSTALL_TARGET= install install_rdf
>+.else
>+PLIST_SUB+=	RDOFF="@comment "
>+.endif
> 
> post-install:
>-	${LN} -sf nasm ${PREFIX}/bin/${DISTNAME}
>+.ifndef(NOPORTDOCS)
>+	${MKDIR} ${DOCSDIR}
>+	${INSTALL_MAN} ${WRKSRC}/doc/nasmdoc.txt ${DOCSDIR}
>+.endif
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -ruN nasm.orig/distinfo nasm/distinfo
>--- nasm.orig/distinfo	2008-02-21 00:09:10.000000000 -0500
>+++ nasm/distinfo	2008-03-03 21:47:28.448364711 -0500
>@@ -1,3 +1,6 @@
>-MD5 (nasm-0.98.39.tar.bz2) = 2032ad44c7359f7a9a166a40a633e772
>-SHA256 (nasm-0.98.39.tar.bz2) = 7865f74acac6b7dccb58eda9164a86da40968eea8aa650926594e0083eaaed77
>-SIZE (nasm-0.98.39.tar.bz2) = 543976
>+MD5 (nasm-2.02.tar.bz2) = 2662a090fb0d31ae27334a2393ef5240
>+SHA256 (nasm-2.02.tar.bz2) = 1746c4d0fbe6f1f37c54459143f3a03875c372896ed823e3fa826f14fe72fbd2
>+SIZE (nasm-2.02.tar.bz2) = 729602
>+MD5 (nasm-2.02-xdoc.tar.bz2) = e9db57c13a76bb588ced26b76db3705e
>+SHA256 (nasm-2.02-xdoc.tar.bz2) = a4a58d06b97cb5a6a4878668006a53fd0b40d8be4b6418b2252cf4ff0babea05
>+SIZE (nasm-2.02-xdoc.tar.bz2) = 581772
>diff -ruN nasm.orig/files/patch-output+outelf32.c nasm/files/patch-output+outelf32.c
>--- nasm.orig/files/patch-output+outelf32.c	1969-12-31 19:00:00.000000000 -0500
>+++ nasm/files/patch-output+outelf32.c	2008-03-03 21:47:28.448364711 -0500
>@@ -0,0 +1,11 @@
>+--- output/outelf32.c.orig	2008-03-03 16:15:43.564355152 -0500
>++++ output/outelf32.c	2008-03-03 16:21:02.242598895 -0500
>+@@ -1605,7 +1605,7 @@
>+         the source-file, the n_desc field should be set to the number
>+         of remaining stabs
>+         */
>+-        WRITE_STAB(sptr, fileidx[0], 0, 0, 0, strlen(allfiles[0] + 12));
>++        WRITE_STAB(sptr, fileidx[0], 0, 0, 0, stabstrlen);
>+ 
>+         /* this is the stab for the main source file */
>+         WRITE_STAB(sptr, fileidx[mainfileindex], N_SO, 0, 0, 0);
>diff -ruN nasm.orig/files/patch-output+outelf64.c nasm/files/patch-output+outelf64.c
>--- nasm.orig/files/patch-output+outelf64.c	1969-12-31 19:00:00.000000000 -0500
>+++ nasm/files/patch-output+outelf64.c	2008-03-03 21:47:28.448364711 -0500
>@@ -0,0 +1,11 @@
>+--- output/outelf64.c.orig	2008-03-03 16:15:57.373145096 -0500
>++++ output/outelf64.c	2008-03-03 16:23:30.075070061 -0500
>+@@ -1841,7 +1841,7 @@
>+         the source-file, the n_desc field should be set to the number
>+         of remaining stabs
>+         */
>+-        WRITE_STAB(sptr, fileidx[0], 0, 0, 0, strlen(allfiles[0] + 12));
>++        WRITE_STAB(sptr, fileidx[0], 0, 0, 0, stabstrlen);
>+ 
>+         /* this is the stab for the main source file */
>+         WRITE_STAB(sptr, fileidx[mainfileindex], N_SO, 0, 0, 0);
>diff -ruN nasm.orig/files/patch-output::outelf.c nasm/files/patch-output::outelf.c
>--- nasm.orig/files/patch-output::outelf.c	2008-02-21 00:09:10.000000000 -0500
>+++ nasm/files/patch-output::outelf.c	1969-12-31 19:00:00.000000000 -0500
>@@ -1,14 +0,0 @@
>-
>-$FreeBSD: ports/devel/nasm/files/patch-output::outelf.c,v 1.2 2005/01/24 23:14:54 krion Exp $
>-
>---- output/outelf.c.orig
>-+++ output/outelf.c
>-@@ -1431,7 +1431,7 @@
>-        the source-file, the n_desc field should be set to the number
>-        of remaining stabs
>-      */
>--    WRITE_STAB(sptr, fileidx[0], 0, 0, 0, strlen(allfiles[0] + 12));
>-+    WRITE_STAB(sptr, fileidx[0], 0, 0, 0, stabstrlen);
>- 
>-     ptr = stabslines;
>-     numstabs = 0;
>diff -ruN nasm.orig/pkg-descr nasm/pkg-descr
>--- nasm.orig/pkg-descr	2008-02-21 00:09:10.000000000 -0500
>+++ nasm/pkg-descr	2008-03-03 21:47:28.448364711 -0500
>@@ -1,10 +1,13 @@
>-This is a distribution of NASM, the Netwide Assembler. NASM is a
>-prototype general-purpose x86 assembler. It will currently output
>-flat-form binary files, a.out, COFF and ELF Unix object files,
>-Microsoft Win32 and 16-bit DOS object files, OS/2 object files, the
>-as86 object format, and a home-grown format called RDF.
>+The Netwide Assembler, NASM, is an x86 and x86-64 assembler
>+designed for portability and modularity.  It will output flat-form
>+binary files, a.out (Linux and *BSD), COFF, ELF32, ELF64, Mach-O,
>+Microsoft OMF (OBJ), Win32, Win64, as86 (Minix/Linux bin86 v0.3),
>+LADsoft IEEE-695, and a home-grown format called RDOFF. NASM syntax
>+is similar to Intel's but less complex.  It supports Pentium, P6,
>+MMX, 3DNow!, SSE, SSE2, SSE3 and x64 opcodes, among others. It
>+has strong support for macro conventions.
> 
>-Also included is NDISASM, a prototype x86 binary-file disassembler
>+Also included is NDISASM, binary-file disassembler
> which uses the same instruction table as NASM.    
> 
> WWW: http://nasm.sourceforge.net/
>diff -ruN nasm.orig/pkg-plist nasm/pkg-plist
>--- nasm.orig/pkg-plist	1969-12-31 19:00:00.000000000 -0500
>+++ nasm/pkg-plist	2008-03-03 21:47:28.448364711 -0500
>@@ -0,0 +1,11 @@
>+bin/nasm
>+bin/ndisasm
>+%%RDOFF%%bin/rdfdump
>+%%RDOFF%%bin/ldrdf
>+%%RDOFF%%bin/rdx
>+%%RDOFF%%bin/rdflib
>+%%RDOFF%%bin/rdf2bin
>+%%RDOFF%%bin/rdf2ihx
>+%%RDOFF%%bin/rdf2com
>+%%PORTDOCS%%%%DOCSDIR%%/nasmdoc.txt
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%

Actions: View | Diff

Attachments on bug 121342: 85224