7 files changed, 13 insertions, 96 deletions

diff --git a/devel/yasm/Makefile b/devel/yasm/Makefile
index 8dc9ee076920..6645048f87b9 100644
--- a/devel/yasm/Makefile
+++ b/devel/yasm/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	yasm
-PORTVERSION=	0.4.0
+PORTVERSION=	0.5.0
 CATEGORIES=	devel lang
 MASTER_SITES=	http://www.tortall.net/projects/yasm/releases/
 
@@ -19,7 +19,6 @@ USE_AUTOTOOLS=	autoconf:259 libltdl:15
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-INSTALLS_SHLIB=	yes
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
@@ -33,8 +32,4 @@ MAN1=		yasm.1
 MAN7=		yasm_arch.7
 .endif
 
-post-configure:
-	@${REINPLACE_CMD} 's|$${top_builddir}/libltdl/libltdlc.la|-lltdl|' ${WRKSRC}/Makefile
-	@${RM} -rf ${WRKSRC}/libltdl
-
 .include <bsd.port.mk>
diff --git a/devel/yasm/distinfo b/devel/yasm/distinfo
index ff89dcc69dd7..c79a3fa30178 100644
--- a/devel/yasm/distinfo
+++ b/devel/yasm/distinfo
@@ -1,3 +1,3 @@
-MD5 (yasm-0.4.0.tar.gz) = 2360e20c4e105ba95f4e9135a7901183
-SHA256 (yasm-0.4.0.tar.gz) = 12223aeccc3901a317db22b3b27dbca40560dca1bea45ec4ae48ea3f73a04eec
-SIZE (yasm-0.4.0.tar.gz) = 1116987
+MD5 (yasm-0.5.0.tar.gz) = d4931fcce497bd4f80ed349384704240
+SHA256 (yasm-0.5.0.tar.gz) = a5629aea24b0e10e23bfd88663b52544888ebed5a59b57be24042ccbbeff823e
+SIZE (yasm-0.5.0.tar.gz) = 1171590
diff --git a/devel/yasm/files/patch-Makefile.in b/devel/yasm/files/patch-Makefile.in
deleted file mode 100644
index 3c0952d113cb..000000000000
--- a/devel/yasm/files/patch-Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig
-+++ Makefile.in
-@@ -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)"
-@@ -537,7 +537,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--SUBDIRS = libltdl m4 po .
-+SUBDIRS = m4 po .
- AM_YFLAGS = -d
- AM_CFLAGS = @MORE_CFLAGS@
- AM_CPPFLAGS = -DYASM_MODULEDIR="\"${pkglibdir}\"" -I$(top_srcdir)/check @INCLTDL@
diff --git a/devel/yasm/files/patch-ltmain.sh b/devel/yasm/files/patch-ltmain.sh
deleted file mode 100644
index d8a13a68823a..000000000000
--- a/devel/yasm/files/patch-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- config/ltmain.sh.orig	Sat Oct 30 20:55:58 2004
-+++ config/ltmain.sh	Sun Oct 31 16:12:55 2004
-@@ -5551,10 +5551,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false ; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/yasm/files/patch-m4-Makefile.in b/devel/yasm/files/patch-m4-Makefile.in
deleted file mode 100644
index 8be163e7c34f..000000000000
--- a/devel/yasm/files/patch-m4-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- m4/Makefile.in.orig	Tue Nov  2 00:46:25 2004
-+++ m4/Makefile.in	Tue Nov  2 00:47:02 2004
-@@ -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/pkg-descr b/devel/yasm/pkg-descr
index fd883e87fd11..e9bf222f60e6 100644
--- a/devel/yasm/pkg-descr
+++ b/devel/yasm/pkg-descr
@@ -1,8 +1,8 @@
 YASM is a complete rewrite of the NASM assembler under the "new" BSD License
-(some portions are currently under the GNU General Public License (GPL) or
-the GNU Lesser General Public License (LGPL)). It is designed from the ground
-up to allow for multiple assembler syntaxes to be supported (eg, NASM, TASM,
-GAS, etc.) in addition to multiple output object formats. Another primary
-module of the overall design is an optimizer module.
+(some portions are currently under the GNU Lesser General Public License
+(LGPL)). Yasm currently supports the x86 and AMD64 instruction sets, accepts
+NASM and GAS assembler syntaxes, outputs binary, ELF32, ELF64, COFF, Win32,
+and Win64 object formats, and generates source debugging information in
+STABS, DWARF 2, and CodeView 8 formats.
 
 WWW: http://www.tortall.net/projects/yasm/
diff --git a/devel/yasm/pkg-plist b/devel/yasm/pkg-plist
index 783e5090368e..ae9c4701d2fc 100644
--- a/devel/yasm/pkg-plist
+++ b/devel/yasm/pkg-plist
@@ -17,45 +17,16 @@ include/libyasm/hamt.h
 include/libyasm/intnum.h
 include/libyasm/linemgr.h
 include/libyasm/listfmt.h
+include/libyasm/md5.h
+include/libyasm/module.h
 include/libyasm/objfmt.h
 include/libyasm/optimizer.h
 include/libyasm/parser.h
+include/libyasm/phash.h
 include/libyasm/preproc.h
 include/libyasm/section.h
 include/libyasm/symrec.h
 include/libyasm/valparam.h
+include/libyasm/value.h
 lib/libyasm.a
-lib/libyasm.so
-lib/libyasm.so.0
-lib/yasm/arch_lc3b.a
-lib/yasm/arch_lc3b.so
-lib/yasm/arch_x86.a
-lib/yasm/arch_x86.so
-lib/yasm/dbgfmt_null.a
-lib/yasm/dbgfmt_null.so
-lib/yasm/dbgfmt_stabs.a
-lib/yasm/dbgfmt_stabs.so
-lib/yasm/listfmt_nasm.a
-lib/yasm/listfmt_nasm.so
-lib/yasm/objfmt_bin.a
-lib/yasm/objfmt_bin.so
-lib/yasm/objfmt_coff.a
-lib/yasm/objfmt_coff.so
-lib/yasm/objfmt_dbg.a
-lib/yasm/objfmt_dbg.so
-lib/yasm/objfmt_elf.a
-lib/yasm/objfmt_elf.so
-lib/yasm/objfmt_win32.a
-lib/yasm/objfmt_win32.so
-lib/yasm/objfmt_xdf.a
-lib/yasm/objfmt_xdf.so
-lib/yasm/optimizer_basic.a
-lib/yasm/optimizer_basic.so
-lib/yasm/parser_nasm.a
-lib/yasm/parser_nasm.so
-lib/yasm/preproc_nasm.a
-lib/yasm/preproc_nasm.so
-lib/yasm/preproc_raw.a
-lib/yasm/preproc_raw.so
-@dirrm lib/yasm
 @dirrm include/libyasm