7 files changed, 52 insertions, 10 deletions

diff --git a/devel/yasm/Makefile b/devel/yasm/Makefile
index 60424068991e..733d74869dba 100644
--- a/devel/yasm/Makefile
+++ b/devel/yasm/Makefile
@@ -7,22 +7,23 @@
 #
 
 PORTNAME=	yasm
-PORTVERSION=	0.3.0
-PORTREVISION=	1
+PORTVERSION=	0.4.0
 CATEGORIES=	devel lang
 MASTER_SITES=	http://www.tortall.net/projects/yasm/releases/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A complete rewrite of the NASM assembler
 
-BUILD_DEPENDS=	re2c:${PORTSDIR}/devel/re2c
-
 USE_ICONV=	yes
 USE_GETTEXT=	yes
-USE_PERL5_BUILD=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
+.if !defined(NOPORTDOCS)
+INSTALL_TARGET=	install install-man
+MAN1=		yasm.1
+MAN7=		yasm_arch.7
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/yasm/distinfo b/devel/yasm/distinfo
index 3005164dde76..f10579343140 100644
--- a/devel/yasm/distinfo
+++ b/devel/yasm/distinfo
@@ -1,2 +1,2 @@
-MD5 (yasm-0.3.0.tar.gz) = ca5e82c3f567186cdf8811c0b785aa5e
-SIZE (yasm-0.3.0.tar.gz) = 1141208
+MD5 (yasm-0.4.0.tar.gz) = 2360e20c4e105ba95f4e9135a7901183
+SIZE (yasm-0.4.0.tar.gz) = 1116987
diff --git a/devel/yasm/files/patch-Makefile.in b/devel/yasm/files/patch-Makefile.in
new file mode 100644
index 000000000000..9f3c023e2ef7
--- /dev/null
+++ b/devel/yasm/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Tue Nov  2 00:46:16 2004
++++ Makefile.in	Tue Nov  2 00:47:10 2004
+@@ -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/files/patch-libltdl-Makefile.in b/devel/yasm/files/patch-libltdl-Makefile.in
new file mode 100644
index 000000000000..312bc27d7381
--- /dev/null
+++ b/devel/yasm/files/patch-libltdl-Makefile.in
@@ -0,0 +1,11 @@
+--- libltdl/Makefile.in.orig	Tue Nov  2 00:46:21 2004
++++ libltdl/Makefile.in	Tue Nov  2 00:47:17 2004
+@@ -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)"
diff --git a/devel/yasm/files/patch-ltmain.sh b/devel/yasm/files/patch-ltmain.sh
index f2a4a45d2345..d8a13a68823a 100644
--- a/devel/yasm/files/patch-ltmain.sh
+++ b/devel/yasm/files/patch-ltmain.sh
@@ -1,6 +1,6 @@
---- config/ltmain.sh.orig	Mon Apr  7 13:08:30 2003
-+++ config/ltmain.sh	Mon Apr  7 13:08:44 2003
-@@ -5288,10 +5288,12 @@
+--- 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.
diff --git a/devel/yasm/files/patch-m4-Makefile.in b/devel/yasm/files/patch-m4-Makefile.in
new file mode 100644
index 000000000000..8be163e7c34f
--- /dev/null
+++ b/devel/yasm/files/patch-m4-Makefile.in
@@ -0,0 +1,11 @@
+--- 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-plist b/devel/yasm/pkg-plist
index 81ca7b3770d9..783e5090368e 100644
--- a/devel/yasm/pkg-plist
+++ b/devel/yasm/pkg-plist
@@ -1,6 +1,7 @@
 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
@@ -15,6 +16,7 @@ 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
@@ -31,6 +33,10 @@ 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
@@ -41,6 +47,8 @@ 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