4 files changed, 42 insertions, 2 deletions

diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index 4cd178a25065..5ecf7641c5e0 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -28,8 +28,7 @@ USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.6
 
-USE_AUTOCONF=	yes
-USE_AUTOMAKE=	yes
+USE_AUTOMAKE_VER=15
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	acinclude.m4
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
@@ -70,11 +69,13 @@ packet 'pth' is installed.";\
 do-configure:
 	(cd ${WRKSRC} && aclocal && ./autogen.sh &&\
 	${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS})
+
 # Libtool fix code kindly provided by Mr. Maxim Sobolev <sobomax@FreeBSD.org>
 post-configure:
 	@${PERL} -pi -e \
 		's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \
 			${WRKSRC}/libtool
+	${PATCH} ${PATCH_ARGS} -p0 < ${FILESDIR}/libwin32loader.patch
 
 post-install:
 	@${FMT} < ${PKGMESSAGE}
diff --git a/multimedia/avifile/files/libwin32loader.patch b/multimedia/avifile/files/libwin32loader.patch
new file mode 100644
index 000000000000..2169b13bf5f4
--- /dev/null
+++ b/multimedia/avifile/files/libwin32loader.patch
@@ -0,0 +1,13 @@
+--- plugins/libwin32/loader/Makefile.orig	Fri Dec 28 10:36:49 2001
++++ plugins/libwin32/loader/Makefile	Fri Dec 28 10:35:55 2001
+@@ -534,8 +534,8 @@
+ # so we eliminate .rel.text section from library
+ # it works this way too
+ # we actually don't need this line
+-#stubs.lo: stubs.s
+-#	$(CC) -c $(srcdir)/stubs.s -o stubs.lo
++stubs.lo: stubs.s
++	$(CC) -c $(srcdir)/stubs.s -o stubs.lo
+ 
+ #win32.lo: win32.c
+ #	$(CC) -O2 -fno-inline -fno-strict-aliasing $(DEFS) $(WINFLAGS) -c $< -o $@
diff --git a/multimedia/avifile/files/patch-autogen.sh b/multimedia/avifile/files/patch-autogen.sh
new file mode 100644
index 000000000000..ad2ec0bc0bd9
--- /dev/null
+++ b/multimedia/avifile/files/patch-autogen.sh
@@ -0,0 +1,13 @@
+--- autogen.sh.orig	Thu Jan 10 23:25:46 2002
++++ autogen.sh	Thu Jan 10 23:25:57 2002
+@@ -8,8 +8,8 @@
+ 
+ # Debian unstable allows to have several different versions of autoconf
+ # in the one system
+-use_autoconf=autoconf
+-use_autoheader=autoheader
++use_autoconf=autoconf213
++use_autoheader=autoheader213
+ # I think links are now OK
+ use_copy=
+ #"--copy" 
diff --git a/multimedia/avifile/files/patch-libmmxnow-autogen.sh b/multimedia/avifile/files/patch-libmmxnow-autogen.sh
new file mode 100644
index 000000000000..792b0f908216
--- /dev/null
+++ b/multimedia/avifile/files/patch-libmmxnow-autogen.sh
@@ -0,0 +1,13 @@
+--- libmmxnow/autogen.sh.orig	Thu Jan 10 23:27:57 2002
++++ libmmxnow/autogen.sh	Thu Jan 10 23:28:06 2002
+@@ -8,8 +8,8 @@
+ 
+ # Debian unstable allows to have several different versions of autoconf
+ # in the one system
+-use_autoconf=autoconf
+-use_autoheader=autoheader
++use_autoconf=autoconf213
++use_autoheader=autoheader213
+ use_copy="--copy"
+ ( which autoconf2.50 2>/dev/null | grep -q "^/" ) && use_autoconf=autoconf2.50
+ ( which autoheader2.50 2>/dev/null | grep -q "^/" ) && use_autoheader=autoheader2.50