Update yasm to 0.4.0 using patches provided by FUKAUMI Naoki in PR pkg/30445.

New features since 0.2.2:
* ELF AMD64 and 32-bit shared object support (using the NASM notation
   "WRT ..got", etc).
* STABS debugging format (enable with "-g stabs").
* NASM-like list format.
* XDF object format (64-bit basic format, similar in spirit to NASM's RDF).
* Dozens of bugfixes in x86 and AMD64 support.
* Numerous cross-platform build fixes.
* No perl dependencies for standard build.
* New man pages: yasm(1) and yasm_arch(7).
*  Full support for ELF, including support for both AMD64 and 32-bit
   x86 targets; note: for AMD64 output, the machine type must be set
   to "amd64" using the "-m" command line option, e.g.
     "yasm -m amd64 -f elf test.asm".
* Full warnings for integer overflow.
* Full support for AMD64 RIP-relative addressing; the two forms supported
  are "[rip+val]" (direct index) and "[sym wrt rip]" (relocated relative).
* Many AMD64 bugfixes including correct operand size handling (and o64
  override); thanks to the many bug reports to help improve YASM in this area!

6 files changed, 69 insertions, 21 deletions

diff --git a/devel/yasm/Makefile b/devel/yasm/Makefile
index 3423c2bb6b7..3a967ac85b2 100644
--- a/devel/yasm/Makefile
+++ b/devel/yasm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:09 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/04 20:00:01 kristerw Exp $
 #
 
-DISTNAME=	yasm-0.2.2
-PKGREVISION=	2
+DISTNAME=	yasm-0.4.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.tortall.net/projects/yasm/releases/
 
@@ -14,7 +13,6 @@ BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-USE_TOOLS+=		perl
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/devel/yasm/PLIST b/devel/yasm/PLIST
index f704a2a5b52..38699b8dcd7 100644
--- a/devel/yasm/PLIST
+++ b/devel/yasm/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:30 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/12/04 20:00:01 kristerw Exp $
 bin/yasm
 include/libyasm.h
 include/libyasm/arch.h
+include/libyasm/assocdat.h
 include/libyasm/bc-int.h
 include/libyasm/bitvect.h
 include/libyasm/bytecode.h
 include/libyasm/compat-queue.h
-include/libyasm/config.h
 include/libyasm/coretype.h
 include/libyasm/dbgfmt.h
 include/libyasm/errwarn.h
@@ -17,23 +17,31 @@ include/libyasm/floatnum.h
 include/libyasm/hamt.h
 include/libyasm/intnum.h
 include/libyasm/linemgr.h
+include/libyasm/listfmt.h
 include/libyasm/objfmt.h
 include/libyasm/optimizer.h
 include/libyasm/parser.h
 include/libyasm/preproc.h
 include/libyasm/section.h
 include/libyasm/symrec.h
-include/libyasm/util.h
 include/libyasm/valparam.h
 lib/libyasm.la
-lib/yasm_basic.la
-lib/yasm_bin.la
-lib/yasm_coff.la
-lib/yasm_dbg.la
-lib/yasm_nasm.la
-lib/yasm_null.la
-lib/yasm_raw.la
-lib/yasm_win32.la
-lib/yasm_x86.la
-lib/yasm_yapp.la
+lib/yasm/arch_lc3b.la
+lib/yasm/arch_x86.la
+lib/yasm/dbgfmt_null.la
+lib/yasm/dbgfmt_stabs.la
+lib/yasm/listfmt_nasm.la
+lib/yasm/objfmt_bin.la
+lib/yasm/objfmt_coff.la
+lib/yasm/objfmt_dbg.la
+lib/yasm/objfmt_elf.la
+lib/yasm/objfmt_win32.la
+lib/yasm/objfmt_xdf.la
+lib/yasm/optimizer_basic.la
+lib/yasm/parser_nasm.la
+lib/yasm/preproc_nasm.la
+lib/yasm/preproc_raw.la
+man/man1/yasm.1
+man/man7/yasm_arch.7
+@dirrm lib/yasm
 @dirrm include/libyasm
diff --git a/devel/yasm/distinfo b/devel/yasm/distinfo
index f0c6f922683..69a12b54eae 100644
--- a/devel/yasm/distinfo
+++ b/devel/yasm/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 22:24:35 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/12/04 20:00:01 kristerw Exp $
 
-SHA1 (yasm-0.2.2.tar.gz) = 7d0a941de4ad047ce33d82cecaa20038b752754b
-RMD160 (yasm-0.2.2.tar.gz) = a4e5131064eef34124eba8ee35f0252a96a132ec
-Size (yasm-0.2.2.tar.gz) = 927830 bytes
+SHA1 (yasm-0.4.0.tar.gz) = 46f3666b0aabd64898066c37c4a3141dc7e94129
+RMD160 (yasm-0.4.0.tar.gz) = 714b54d30208112f012564f9ec4860375eae65d2
+Size (yasm-0.4.0.tar.gz) = 1116987 bytes
+SHA1 (patch-aa) = 30430443ba6826fd55019f02947bf287ffbd109c
+SHA1 (patch-ab) = 41d6252586451e624f6cabd1e7335b50344f4d06
+SHA1 (patch-ac) = bdc920d91cd6a1cf3a8382be2dda071bc362b257
diff --git a/devel/yasm/patches/patch-aa b/devel/yasm/patches/patch-aa
new file mode 100644
index 00000000000..dcb2830eeaf
--- /dev/null
+++ b/devel/yasm/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2005/12/04 20:00:01 kristerw Exp $
+
+--- m4/Makefile.in.orig	2004-10-31 13:00:09.000000000 +0900
++++ m4/Makefile.in	2005-06-05 01:46:32.000000000 +0900
+@@ -45,7 +45,7 @@
+ 	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+-mkinstalldirs = $(mkdir_p)
++mkinstalldirs = mkdir -p
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ SOURCES =
diff --git a/devel/yasm/patches/patch-ab b/devel/yasm/patches/patch-ab
new file mode 100644
index 00000000000..6755b08c8d7
--- /dev/null
+++ b/devel/yasm/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2005/12/04 20:00:01 kristerw Exp $
+
+--- Makefile.in.orig	2004-10-31 13:00:08.000000000 +0900
++++ Makefile.in	2005-06-05 01:46:38.000000000 +0900
+@@ -192,7 +192,7 @@
+ 	$(ACLOCAL_M4)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+  configure.lineno configure.status.lineno
+-mkinstalldirs = $(mkdir_p)
++mkinstalldirs = mkdir -p
+ CONFIG_HEADER = config.h
+ CONFIG_CLEAN_FILES =
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(modincludedir)"
diff --git a/devel/yasm/patches/patch-ac b/devel/yasm/patches/patch-ac
new file mode 100644
index 00000000000..e8d702d0dd2
--- /dev/null
+++ b/devel/yasm/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2005/12/04 20:00:01 kristerw Exp $
+
+--- libltdl/Makefile.in.orig	2004-10-31 13:00:09.000000000 +0900
++++ libltdl/Makefile.in	2005-06-05 01:48:33.000000000 +0900
+@@ -51,7 +51,7 @@
+ 	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+-mkinstalldirs = $(mkdir_p)
++mkinstalldirs = mkdir -p
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"