Bug 136191 - [PATCH]devel/nasm: update to 2.06
Summary: [PATCH]devel/nasm: update to 2.06
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Kirill Ponomarev
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2009-06-30 19:50 UTC by bf
Modified: 2009-09-07 13:10 UTC (History)
0 users

See Also:


Attachments
file.diff (1.47 KB, patch)
2009-06-30 19:50 UTC, bf
no flags Details | Diff
nasm_207_diff.txt (3.54 KB, text/plain; charset=US-ASCII)
2009-07-25 09:32 UTC, b. f.
no flags Details
nasm_207_diff.txt (3.54 KB, text/plain; charset=US-ASCII)
2009-07-29 02:56 UTC, b. f.
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description bf 2009-06-30 19:50:01 UTC
Fix: Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2009-06-30 19:50:14 UTC
Responsible Changed
From-To: freebsd-ports-bugs->krion

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 b. f. 2009-07-25 09:32:42 UTC
Please consider the attached patch instead.  (Base64-encoded by gmail,
sorry.)  It updates to 2.07, updates the description, uses the
PORTDOCS macro, and fixes a pkg-plist problem related to packages.  I
also note that there has been no response to the original submission
for nearly a month.

Regards,
                  b.

P.S. Changes:

http://www.nasm.us/doc/nasmdocc.html
Comment 3 Kirill Ponomarev freebsd_committer freebsd_triage 2009-07-28 21:38:22 UTC
State Changed
From-To: open->feedback

Could you please mail me the latest patch, it seems GNATS did not format it correctly.
Comment 4 b. f. 2009-07-29 02:56:42 UTC
On 7/28/09, krion@freebsd.org <krion@freebsd.org> wrote:
> Synopsis: [PATCH]devel/nasm: update to 2.06
>
> State-Changed-From-To: open->feedback
> State-Changed-By: krion
> State-Changed-When: Tue Jul 28 20:38:22 UTC 2009
> State-Changed-Why:
> Could you please mail me the latest patch, it seems GNATS did not format it
> correctly.
>
> http://www.freebsd.org/cgi/query-pr.cgi?pr=136191
>

I'll send it again, in the body of this message (but the whitespace
may not be preserved), and as an attachment.  But I don't think it is
GNATS, but rather gmail -- they encode almost all attachments in
Base64, and as far as I know the user has no ability to control this.
Of course, there are decoders in the base system and in ports, and
most MUAs can decode it, but it is not always convenient.  If you
would like it in another form, and you know of a workaround, then
contact me and I'll try to accommodate you.

b.


diff -ruN nasm.orig/Makefile nasm/Makefile
--- nasm.orig/Makefile	2009-07-25 04:12:18.000000000 -0400
+++ nasm/Makefile	2009-07-25 02:44:48.000000000 -0400
@@ -6,13 +6,12 @@
 #

 PORTNAME=	nasm
-PORTVERSION=	2.05.01
+PORTVERSION=	2.07
 PORTEPOCH=	1
 CATEGORIES=	devel lang
 MASTER_SITES=	SFE http://www.nasm.us/pub/nasm/releasebuilds/${PORTVERSION}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-xdoc${EXTRACT_SUFX}

-
 MAINTAINER=	krion@FreeBSD.org
 COMMENT=	General-purpose multi-platform x86 and x86-64 assembler

@@ -22,12 +21,15 @@
 MAKE_JOBS_UNSAFE=	yes

 MAN1=		nasm.1 ndisasm.1 \
-		ldrdf.1 rdf2bin.1 rdf2com.1 rdfdump.1 rdflib.1 rdx.1
+		ldrdf.1 rdf2bin.1 rdf2com.1 rdf2ihx.1 rdf2ith.1 rdf2srec.1
rdfdump.1 rdflib.1 rdx.1
+PORTDOCS=	nasmdoc.txt

 post-install:
 .ifndef(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/doc/nasmdoc.txt ${DOCSDIR}
+.	for d in ${PORTDOCS}
+		${MKDIR} ${DOCSDIR}
+		${INSTALL_MAN} ${WRKSRC}/doc/$d ${DOCSDIR}
+.	endfor
 .endif

 .include <bsd.port.mk>
diff -ruN nasm.orig/distinfo nasm/distinfo
--- nasm.orig/distinfo	2009-07-25 04:12:18.000000000 -0400
+++ nasm/distinfo	2009-07-25 02:15:42.000000000 -0400
@@ -1,6 +1,6 @@
-MD5 (nasm-2.05.01.tar.bz2) = da4977f6d9d9b8f00527f2c62109453b
-SHA256 (nasm-2.05.01.tar.bz2) =
9206ef45c650fdbad8e9907d7c6ff799f7fc0021e44bafef81a222d3a0a6595c
-SIZE (nasm-2.05.01.tar.bz2) = 791984
-MD5 (nasm-2.05.01-xdoc.tar.bz2) = f2cc41f0ee3554ef9ab6fedc67af5d93
-SHA256 (nasm-2.05.01-xdoc.tar.bz2) =
3221e944be87bec66dab89b2144101ebf269670c057d8cddc23c67611e824dad
-SIZE (nasm-2.05.01-xdoc.tar.bz2) = 799497
+MD5 (nasm-2.07.tar.bz2) = d8934231e81874c29374ddef1fbdb1ed
+SHA256 (nasm-2.07.tar.bz2) =
ac70ee451c73d742c9ff830502e5f8b1f648b2abffa8fd00944243283ba8e87c
+SIZE (nasm-2.07.tar.bz2) = 779934
+MD5 (nasm-2.07-xdoc.tar.bz2) = ef3c3eeb62f155adf27a7185d603b1dd
+SHA256 (nasm-2.07-xdoc.tar.bz2) =
0f946fc70067cf56d94a8e0db48257f03faa7bcf1e8987cce39b8e0ab128ecf3
+SIZE (nasm-2.07-xdoc.tar.bz2) = 815521
diff -ruN nasm.orig/pkg-descr nasm/pkg-descr
--- nasm.orig/pkg-descr	2009-07-25 04:12:18.000000000 -0400
+++ nasm/pkg-descr	2009-07-25 02:00:31.000000000 -0400
@@ -2,12 +2,13 @@
 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.
+LADsoft IEEE-695, Intel hex, Motorola S-record, 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,
+SSE4.1, SSE4.2, XOP/FMA4/CVT16 (rev 3.03), and x64 opcodes, among
+others. It has strong support for macro conventions.

-Also included is NDISASM, binary-file disassembler
+Also included is NDISASM, a binary-file disassembler
 which uses the same instruction table as NASM.

-WWW: http://nasm.sourceforge.net/
+WWW: http://www.nasm.us/
diff -ruN nasm.orig/pkg-plist nasm/pkg-plist
--- nasm.orig/pkg-plist	2009-07-25 04:12:18.000000000 -0400
+++ nasm/pkg-plist	2009-07-25 03:22:19.000000000 -0400
@@ -2,10 +2,8 @@
 bin/nasm
 bin/ndisasm
 bin/rdf2bin
-bin/rdf2com
-bin/rdf2ihx
+@unexec rm -f %B/rdf2com %B/rdf2ith %B/rdf2ihx %B/rdf2srec
+@exec for b in com ith ihx srec ; do ln -s %D/%F %B/rdf2$b ; done
 bin/rdfdump
 bin/rdflib
 bin/rdx
-%%PORTDOCS%%%%DOCSDIR%%/nasmdoc.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
Comment 5 b. f. 2009-07-29 03:04:06 UTC
On 7/28/09, krion@freebsd.org <krion@freebsd.org> wrote:
> Synopsis: [PATCH]devel/nasm: update to 2.06
>
> State-Changed-From-To: open->feedback
> State-Changed-By: krion
> State-Changed-When: Tue Jul 28 20:38:22 UTC 2009
> State-Changed-Why:
> Could you please mail me the latest patch, it seems GNATS did not format it
> correctly.
>
> http://www.freebsd.org/cgi/query-pr.cgi?pr=136191
>

Incidentally, I should mention, as it says in the changelog, that with
version 2.07 nasm is now under a 2-clause BSD license.  Maybe the
people working on the bsd-licensed ELF toolchain would be interested
to know this, as they can now borrow or freely adapt  nasm code if
they want to:

" NASM is now under the so-called 2-clause BSD license, also known as
the simplified BSD license.

Copyright 1996-2009 the NASM Authors - All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. "
Comment 6 dfilter service freebsd_committer freebsd_triage 2009-09-07 13:07:05 UTC
krion       2009-09-07 12:06:56 UTC

  FreeBSD ports repository

  Modified files:
    devel/nasm           Makefile distinfo pkg-descr pkg-plist 
  Log:
  Update to 2.07
  
  PR:             ports/137711 ports/136191
  Submitted by:   Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>, bf1783@googlemail.com
  
  Revision  Changes    Path
  1.34      +7 -4      ports/devel/nasm/Makefile
  1.17      +6 -6      ports/devel/nasm/distinfo
  1.7       +7 -6      ports/devel/nasm/pkg-descr
  1.12      +2 -4      ports/devel/nasm/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 7 Kirill Ponomarev freebsd_committer freebsd_triage 2009-09-07 13:07:20 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!