o Update to 0.6.0.20011220. Therefore, since this version is smaller

  than former, bump PORTEPOCH (will)
o Reorganize items inside Makefile to help with maintainance
o Both remove ONLY_FOR_ARCHS=i386 and add tweaks to hopefully
  enable this port outside of i386
o This port no longers USE_AUTOMAKE (will)
o New defaults: build with libmad and with optimized cflags. Thus,
  add both WITHOUT_MAD and WITHOUT_OPTIMIZED_CFLAGS options

Submitted by:	will
Reviewed by:	pat, Thomas E. Zander <riggs@rrr.de>,
		MAINTAINER

18 files changed, 262 insertions, 268 deletions

diff --git a/graphics/avifile/Makefile b/graphics/avifile/Makefile
index bb68028d6215..6ebb72c837e1 100644
--- a/graphics/avifile/Makefile
+++ b/graphics/avifile/Makefile
@@ -6,41 +6,33 @@
 #
 
 PORTNAME=	avifile
-PORTVERSION=	0.60.20010920
+PORTVERSION=	0.6.0.20011220
+PORTEPOCH=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://ernie.eit.uni-kl.de/avifile/ 
-DISTNAME=	${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	http://avifile.sourceforge.net/ \
+		http://ernie.eit.uni-kl.de/avifile/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/0.2/0-2/}admin
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	holger@eit.uni-kl.de
 
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 LIB_DEPENDS=	SDL-1.1.3:${PORTSDIR}/devel/sdl12
-.if !defined(WITHOUT_VORBIS)
-LIB_DEPENDS=	vorbis.1:${PORTSDIR}/audio/libvorbis
-.endif
-RUN_DEPENDS=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
 
-ONLY_FOR_ARCHS=	i386
 USE_QT_VER=	2
 USE_XLIB=	yes
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-0.6
+WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:S/.0.2/-2/}
 
-USE_AUTOMAKE_VER=15
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	acinclude.m4
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-win32-path=${LOCALBASE}/lib/win32 \
-		--enable-release --with-gnu-ld --enable-x86opt
+CONFIGURE_ARGS= --with-gnu-ld
 
 PLIST_SUB=	LIB_VERSION="${LIB_VERSION}" VERSION="${VERSION}"
-.if defined(WITHOUT_VORBIS)
-PLIST_SUB+=	VORBIS="@comment "
-.else
-PLIST_SUB+=	VORBIS=""
-.endif
 
 #CODEC_PORT=	${PORTSDIR}/graphics/win32-codecs
 CODEC_PORT=	${.CURDIR}/../win32-codecs
@@ -52,10 +44,40 @@ SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 DIFF?=		/usr/bin/diff
 FMT?=		/usr/bin/fmt
 
-.include <bsd.port.pre.mk>
+# compilation optimizations
+.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
+CONFIGURE_ARGS+=	--enable-release
+.endif
 
+# libmad
+.if !defined(WITHOUT_MAD)
+PLIST_SUB+=	MAD=""
+.else
+CONFIGURE_ARGS+=	--disable-mad
+
+PLIST_SUB+=	MAD="@comment "
+.endif
+
+# libvorbis; thus, libogg
 .if !defined(WITHOUT_VORBIS)
+LIB_DEPENDS=	vorbis.1:${PORTSDIR}/audio/libvorbis
+
+PLIST_SUB+=	VORBIS=""
+.else
+CONFIGURE_ARGS+=	--disable-vorbis
+
+PLIST_SUB+=	VORBIS="@comment "
+.endif
+
 pre-everything::
+.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
+	@${ECHO_MSG} "You can disable compilation optimizations by defining"
+	@${ECHO_MSG} "	WITHOUT_OPTIMIZED_CFLAGS."
+.endif
+.if !defined(WITHOUT_MAD)
+	@${ECHO_MSG} "You can disable mad support by defining WITHOUT_MAD."
+.endif
+.if !defined(WITHOUT_VORBIS)
 	@${ECHO_MSG} "You can disable vorbis support by defining WITHOUT_VORBIS."
 .endif
 
@@ -65,23 +87,48 @@ pre-extract:
 packet 'pth' is installed.";\
 	  ${FALSE};\
 	fi
-pre-patch:
-	@${PERL} -pi.orig -e 's|=autoconf|=${AUTOCONF}|; \
-		s|=autoheader|=${AUTOHEADER}|' ${WRKSRC}/autogen.sh
-	@${PERL} -pi.orig -e 's|=autoconf|=${AUTOCONF}|; \
-		s|=autoheader|=${AUTOHEADER}|' ${WRKSRC}/libmmxnow/autogen.sh
-do-configure:
-	(cd ${WRKSRC} && aclocal && ./autogen.sh &&\
-	${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS})
 
-# Libtool fix code kindly provided by Mr. Maxim Sobolev <sobomax@FreeBSD.org>
+pre-configure:
+	@${PERL} -pi -e "s|-lqt|-lqt2|g;s|qt-mt|qt2-mt|g;\
+		s|^(PACKAGE=avifile).*|\1|" \
+		${WRKSRC}/configure
+	@${PERL} -pi -e "s|-ljpeg|-L${LOCALBASE}/lib -ljpeg|g" \
+		${WRKSRC}/samples/mjpeg_plugin/Makefile.in
+	@${FIND} ${WRKSRC} \( -name Makefile.in -o -name configure \) | \
+		${XARGS} ${PERL} -pi -e "s|AUTOCONF.*=.*|AUTOCONF=true|g;\
+		s|ACLOCAL.*=.*|ACLOCAL=true|g;s|AUTOMAKE.*=.*|AUTOMAKE=true|g;\
+		s|AUTOHEADER.*=.*|AUTOHEADER=true|g;\
+		s|^INSTALL = .*|INSTALL=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP}|g;\
+		s|-release ..LT_RELEASE\)||"
+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e \
+		"s|#include.*<malloc.h>|#include <stdlib.h>|g"
+
 post-configure:
+# Libtool fix code kindly provided by Mr. Maxim Sobolev <sobomax@FreeBSD.org>
 	@${PERL} -pi -e \
 		's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \
 			${WRKSRC}/libtool
-	${PATCH} ${PATCH_ARGS} -p0 < ${FILESDIR}/libwin32loader.patch
 
 post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README
+.endif
 	@${FMT} < ${PKGMESSAGE}
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "i386"
+RUN_DEPENDS+=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
+
+CONFIGURE_ARGS+=	--enable-x86opt --with-win32-path=${LOCALBASE}/lib/win32
+
+PLIST_SUB+=	FFMPEG="" WIN32=""
+.else
+CONFIGURE_ARGS+=	--disable-x86opt --disable-win32 \
+			--disable-ffmpeg --disable-ffmpeg-divx --disable-ffmpeg-ac3
+
+PLIST_SUB+=	FFMPEG="@comment " WIN32="@comment "
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/graphics/avifile/distinfo b/graphics/avifile/distinfo
index 094503a7f83c..defe4d95bdfc 100644
--- a/graphics/avifile/distinfo
+++ b/graphics/avifile/distinfo
@@ -1 +1 @@
-MD5 (avifile-0.60.20010920.tar.gz) = 7c1c6bfd7f4871cf2e290bc891fdbddf
+MD5 (avifile-0.6.0-20011220admin.tgz) = 89c096520c14a68922669dbda0132baa
diff --git a/graphics/avifile/files/libwin32loader.patch b/graphics/avifile/files/libwin32loader.patch
deleted file mode 100644
index 2169b13bf5f4..000000000000
--- a/graphics/avifile/files/libwin32loader.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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/graphics/avifile/files/patch-configure.in b/graphics/avifile/files/patch-configure.in
deleted file mode 100644
index b8a7758306b0..000000000000
--- a/graphics/avifile/files/patch-configure.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.in.orig	Tue Sep 18 12:27:14 2001
-+++ configure.in	Mon Sep 24 13:56:59 2001
-@@ -92,8 +92,8 @@
- dnl some defaults
-  USE_I386=0
-  USE_VIDCAP=0
-- DEFAULTQTLIB="-lqt"
-- DEFAULTQTMTLIB="qt-mt"
-+ DEFAULTQTLIB="-lqt2"
-+ DEFAULTQTMTLIB="qt2-mt"
-  EXTRAINCLUDEPATH=
-  pthread_cflags="-D_REENTRANT"
-  pthread_lib="-lpthread"
diff --git a/graphics/avifile/files/patch-libavireadCache.h b/graphics/avifile/files/patch-libavireadCache.h
deleted file mode 100644
index 312b77abf0b4..000000000000
--- a/graphics/avifile/files/patch-libavireadCache.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/aviread/Cache.h.orig	Tue Aug 28 22:02:19 2001
-+++ lib/aviread/Cache.h	Tue Aug 28 22:02:22 2001
-@@ -19,6 +19,7 @@
- #include <string>
- #include <vector>
- #include <list>
-+#include <pthread.h>
- 
- // Isn't this bug in NetBSD configuration - it should not have HAVE_LSEEK64
- #ifdef __NetBSD__
diff --git a/graphics/avifile/files/patch-libavplayaviplay.cpp b/graphics/avifile/files/patch-libavplayaviplay.cpp
deleted file mode 100644
index dbba1034ef71..000000000000
--- a/graphics/avifile/files/patch-libavplayaviplay.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/aviplay/aviplay.cpp.orig	Tue Aug 28 21:53:40 2001
-+++ lib/aviplay/aviplay.cpp	Tue Aug 28 21:53:43 2001
-@@ -25,6 +25,7 @@
- #include "cpuinfo.h"
- #include "utils.h"
- #include "version.h"
-+#include <pthread.h>
- 
- //#include <iomanip>
- #include <iostream>
diff --git a/graphics/avifile/files/patch-libvideorenderer.cpp b/graphics/avifile/files/patch-libvideorenderer.cpp
deleted file mode 100644
index e864722f7190..000000000000
--- a/graphics/avifile/files/patch-libvideorenderer.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/video/renderer.cpp.orig	Tue Aug 28 22:53:20 2001
-+++ lib/video/renderer.cpp	Tue Aug 28 22:53:30 2001
-@@ -20,6 +20,7 @@
- #include <fcntl.h>
- #include <sys/ioctl.h>
- #include <sys/time.h>
-+#include <pthread.h>
- 
- #ifndef WITHOUT_X
- 
diff --git a/graphics/avifile/pkg-message b/graphics/avifile/pkg-message
index ab4ce4da9eeb..3c5ded4fd18a 100644
--- a/graphics/avifile/pkg-message
+++ b/graphics/avifile/pkg-message
@@ -20,3 +20,7 @@ port.
 
 Please, check the FreeBSD Handbook on
 updating your port tree if you need to.
+
+ALSO, remove ~/.avirc configuration file
+prior to running avifile. The newer version
+has problems with old configuration files.
diff --git a/graphics/avifile/pkg-plist b/graphics/avifile/pkg-plist
index 3966aca157b0..6ce73dbf4c2e 100644
--- a/graphics/avifile/pkg-plist
+++ b/graphics/avifile/pkg-plist
@@ -1,11 +1,21 @@
+bin/avibench
+bin/avicat
+bin/avifile-config
+bin/avimake
+bin/aviplay
+bin/avirecompress
+bin/avitype
+%%WIN32%%bin/mmxnow-config
 include/avifile/Locker.h
-include/avifile/ReadHandlers.h
 include/avifile/StreamInfo.h
 include/avifile/VideoDPMS.h
 include/avifile/audiodecoder.h
 include/avifile/audioencoder.h
 include/avifile/avifile.h
 include/avifile/aviplay.h
+include/avifile/avm_map.h
+include/avifile/avm_output.h
+include/avifile/avm_stl.h
 include/avifile/config.h
 include/avifile/configfile.h
 include/avifile/cpuinfo.h
@@ -25,53 +35,45 @@ include/avifile/utils.h
 include/avifile/version.h
 include/avifile/videodecoder.h
 include/avifile/videoencoder.h
-@dirrm include/avifile
-bin/avifile-config
-bin/aviplay
-bin/avibench
-bin/avicat
-bin/avitype
-bin/avimake
-bin/avirecompress
-lib/libaviplay-%%VERSION%%.so.%%LIB_VERSION%%
+%%WIN32%%include/mmxnow.h
+lib/avifile/libac3pass.la
+lib/avifile/libac3pass.so
+lib/avifile/libaudiodec.la
+lib/avifile/libaudiodec.so
+%%FFMPEG%%lib/avifile/libffmpeg.la
+%%FFMPEG%%lib/avifile/libffmpeg.so
+%%MAD%%lib/avifile/libmad_audiodec.la
+%%MAD%%lib/avifile/libmad_audiodec.so
+lib/avifile/libmjpeg.la
+lib/avifile/libmjpeg.so
+lib/avifile/libmp3lamebin_audioenc.la
+lib/avifile/libmp3lamebin_audioenc.so
+lib/avifile/libmpeg_audiodec.la
+lib/avifile/libmpeg_audiodec.so
+%%VORBIS%%lib/avifile/libvorbis_audio.la
+%%VORBIS%%lib/avifile/libvorbis_audio.so
+%%WIN32%%lib/avifile/libwin32.la
+%%WIN32%%lib/avifile/libwin32.so
 lib/libaviplay.la
 lib/libaviplay.so
-lib/libmmxnow-0.1.so.1
-lib/libmmxnow.la
-lib/libmmxnow.so
-lib/libmmxnow.a
-lib/avifile%%VERSION%%/libac3pass-%%VERSION%%.so.%%LIB_VERSION%%
-lib/avifile%%VERSION%%/libac3pass.la
-lib/avifile%%VERSION%%/libac3pass.so
-lib/avifile%%VERSION%%/libaudiodec-%%VERSION%%.so.%%LIB_VERSION%%
-lib/avifile%%VERSION%%/libaudiodec.la
-lib/avifile%%VERSION%%/libaudiodec.so
-lib/avifile%%VERSION%%/libffmpeg-%%VERSION%%.so.%%LIB_VERSION%%
-lib/avifile%%VERSION%%/libffmpeg.la
-lib/avifile%%VERSION%%/libffmpeg.so
-lib/avifile%%VERSION%%/libmjpeg-%%VERSION%%.so.%%LIB_VERSION%%
-lib/avifile%%VERSION%%/libmjpeg.la
-lib/avifile%%VERSION%%/libmjpeg.so
-lib/avifile%%VERSION%%/libmp3lamebin_audioenc-%%VERSION%%.so.%%LIB_VERSION%%
-lib/avifile%%VERSION%%/libmp3lamebin_audioenc.la
-lib/avifile%%VERSION%%/libmp3lamebin_audioenc.so
-lib/avifile%%VERSION%%/libmpeg_audiodec-%%VERSION%%.so.%%LIB_VERSION%%
-lib/avifile%%VERSION%%/libmpeg_audiodec.la
-lib/avifile%%VERSION%%/libmpeg_audiodec.so
-%%VORBIS%%lib/avifile%%VERSION%%/libvorbis_audio-%%VERSION%%.so.%%LIB_VERSION%%
-%%VORBIS%%lib/avifile%%VERSION%%/libvorbis_audio.la
-%%VORBIS%%lib/avifile%%VERSION%%/libvorbis_audio.so
-lib/avifile%%VERSION%%/libwin32-%%VERSION%%.so.%%LIB_VERSION%%
-lib/avifile%%VERSION%%/libwin32.la
-lib/avifile%%VERSION%%/libwin32.so
-@dirrm lib/avifile%%VERSION%%
-share/avifile%%VERSION%%/about.ppm
-share/avifile%%VERSION%%/mute.ppm
-share/avifile%%VERSION%%/open.ppm
-share/avifile%%VERSION%%/opena.ppm
-share/avifile%%VERSION%%/opens.ppm
-share/avifile%%VERSION%%/pause.ppm
-share/avifile%%VERSION%%/play.ppm
-share/avifile%%VERSION%%/stop.ppm
-share/avifile%%VERSION%%/test.png
-@dirrm share/avifile%%VERSION%%
+lib/libaviplay.so.6
+lib/libavqt.la
+lib/libavqt.so
+lib/libavqt.so.6
+%%WIN32%%lib/libmmxnow.la
+%%WIN32%%lib/libmmxnow.so
+%%WIN32%%lib/libmmxnow.so.1
+share/avifile/about.ppm
+share/avifile/mute.ppm
+share/avifile/open.ppm
+share/avifile/opena.ppm
+share/avifile/opens.ppm
+share/avifile/pause.ppm
+share/avifile/play.ppm
+share/avifile/stop.ppm
+share/avifile/test.png
+%%PORTDOCS%%share/doc/avifile/README
+%%PORTDOCS%%@dirrm share/doc/avifile
+@dirrm share/avifile
+@dirrm lib/avifile
+@dirrm include/avifile
diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index bb68028d6215..6ebb72c837e1 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -6,41 +6,33 @@
 #
 
 PORTNAME=	avifile
-PORTVERSION=	0.60.20010920
+PORTVERSION=	0.6.0.20011220
+PORTEPOCH=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://ernie.eit.uni-kl.de/avifile/ 
-DISTNAME=	${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	http://avifile.sourceforge.net/ \
+		http://ernie.eit.uni-kl.de/avifile/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/0.2/0-2/}admin
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	holger@eit.uni-kl.de
 
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 LIB_DEPENDS=	SDL-1.1.3:${PORTSDIR}/devel/sdl12
-.if !defined(WITHOUT_VORBIS)
-LIB_DEPENDS=	vorbis.1:${PORTSDIR}/audio/libvorbis
-.endif
-RUN_DEPENDS=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
 
-ONLY_FOR_ARCHS=	i386
 USE_QT_VER=	2
 USE_XLIB=	yes
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-0.6
+WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:S/.0.2/-2/}
 
-USE_AUTOMAKE_VER=15
 USE_LIBTOOL=	yes
 LIBTOOLFILES=	acinclude.m4
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-win32-path=${LOCALBASE}/lib/win32 \
-		--enable-release --with-gnu-ld --enable-x86opt
+CONFIGURE_ARGS= --with-gnu-ld
 
 PLIST_SUB=	LIB_VERSION="${LIB_VERSION}" VERSION="${VERSION}"
-.if defined(WITHOUT_VORBIS)
-PLIST_SUB+=	VORBIS="@comment "
-.else
-PLIST_SUB+=	VORBIS=""
-.endif
 
 #CODEC_PORT=	${PORTSDIR}/graphics/win32-codecs
 CODEC_PORT=	${.CURDIR}/../win32-codecs
@@ -52,10 +44,40 @@ SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 DIFF?=		/usr/bin/diff
 FMT?=		/usr/bin/fmt
 
-.include <bsd.port.pre.mk>
+# compilation optimizations
+.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
+CONFIGURE_ARGS+=	--enable-release
+.endif
 
+# libmad
+.if !defined(WITHOUT_MAD)
+PLIST_SUB+=	MAD=""
+.else
+CONFIGURE_ARGS+=	--disable-mad
+
+PLIST_SUB+=	MAD="@comment "
+.endif
+
+# libvorbis; thus, libogg
 .if !defined(WITHOUT_VORBIS)
+LIB_DEPENDS=	vorbis.1:${PORTSDIR}/audio/libvorbis
+
+PLIST_SUB+=	VORBIS=""
+.else
+CONFIGURE_ARGS+=	--disable-vorbis
+
+PLIST_SUB+=	VORBIS="@comment "
+.endif
+
 pre-everything::
+.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
+	@${ECHO_MSG} "You can disable compilation optimizations by defining"
+	@${ECHO_MSG} "	WITHOUT_OPTIMIZED_CFLAGS."
+.endif
+.if !defined(WITHOUT_MAD)
+	@${ECHO_MSG} "You can disable mad support by defining WITHOUT_MAD."
+.endif
+.if !defined(WITHOUT_VORBIS)
 	@${ECHO_MSG} "You can disable vorbis support by defining WITHOUT_VORBIS."
 .endif
 
@@ -65,23 +87,48 @@ pre-extract:
 packet 'pth' is installed.";\
 	  ${FALSE};\
 	fi
-pre-patch:
-	@${PERL} -pi.orig -e 's|=autoconf|=${AUTOCONF}|; \
-		s|=autoheader|=${AUTOHEADER}|' ${WRKSRC}/autogen.sh
-	@${PERL} -pi.orig -e 's|=autoconf|=${AUTOCONF}|; \
-		s|=autoheader|=${AUTOHEADER}|' ${WRKSRC}/libmmxnow/autogen.sh
-do-configure:
-	(cd ${WRKSRC} && aclocal && ./autogen.sh &&\
-	${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS})
 
-# Libtool fix code kindly provided by Mr. Maxim Sobolev <sobomax@FreeBSD.org>
+pre-configure:
+	@${PERL} -pi -e "s|-lqt|-lqt2|g;s|qt-mt|qt2-mt|g;\
+		s|^(PACKAGE=avifile).*|\1|" \
+		${WRKSRC}/configure
+	@${PERL} -pi -e "s|-ljpeg|-L${LOCALBASE}/lib -ljpeg|g" \
+		${WRKSRC}/samples/mjpeg_plugin/Makefile.in
+	@${FIND} ${WRKSRC} \( -name Makefile.in -o -name configure \) | \
+		${XARGS} ${PERL} -pi -e "s|AUTOCONF.*=.*|AUTOCONF=true|g;\
+		s|ACLOCAL.*=.*|ACLOCAL=true|g;s|AUTOMAKE.*=.*|AUTOMAKE=true|g;\
+		s|AUTOHEADER.*=.*|AUTOHEADER=true|g;\
+		s|^INSTALL = .*|INSTALL=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP}|g;\
+		s|-release ..LT_RELEASE\)||"
+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e \
+		"s|#include.*<malloc.h>|#include <stdlib.h>|g"
+
 post-configure:
+# Libtool fix code kindly provided by Mr. Maxim Sobolev <sobomax@FreeBSD.org>
 	@${PERL} -pi -e \
 		's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \
 			${WRKSRC}/libtool
-	${PATCH} ${PATCH_ARGS} -p0 < ${FILESDIR}/libwin32loader.patch
 
 post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README
+.endif
 	@${FMT} < ${PKGMESSAGE}
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "i386"
+RUN_DEPENDS+=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
+
+CONFIGURE_ARGS+=	--enable-x86opt --with-win32-path=${LOCALBASE}/lib/win32
+
+PLIST_SUB+=	FFMPEG="" WIN32=""
+.else
+CONFIGURE_ARGS+=	--disable-x86opt --disable-win32 \
+			--disable-ffmpeg --disable-ffmpeg-divx --disable-ffmpeg-ac3
+
+PLIST_SUB+=	FFMPEG="@comment " WIN32="@comment "
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/multimedia/avifile/distinfo b/multimedia/avifile/distinfo
index 094503a7f83c..defe4d95bdfc 100644
--- a/multimedia/avifile/distinfo
+++ b/multimedia/avifile/distinfo
@@ -1 +1 @@
-MD5 (avifile-0.60.20010920.tar.gz) = 7c1c6bfd7f4871cf2e290bc891fdbddf
+MD5 (avifile-0.6.0-20011220admin.tgz) = 89c096520c14a68922669dbda0132baa
diff --git a/multimedia/avifile/files/libwin32loader.patch b/multimedia/avifile/files/libwin32loader.patch
deleted file mode 100644
index 2169b13bf5f4..000000000000
--- a/multimedia/avifile/files/libwin32loader.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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-configure.in b/multimedia/avifile/files/patch-configure.in
deleted file mode 100644
index b8a7758306b0..000000000000
--- a/multimedia/avifile/files/patch-configure.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.in.orig	Tue Sep 18 12:27:14 2001
-+++ configure.in	Mon Sep 24 13:56:59 2001
-@@ -92,8 +92,8 @@
- dnl some defaults
-  USE_I386=0
-  USE_VIDCAP=0
-- DEFAULTQTLIB="-lqt"
-- DEFAULTQTMTLIB="qt-mt"
-+ DEFAULTQTLIB="-lqt2"
-+ DEFAULTQTMTLIB="qt2-mt"
-  EXTRAINCLUDEPATH=
-  pthread_cflags="-D_REENTRANT"
-  pthread_lib="-lpthread"
diff --git a/multimedia/avifile/files/patch-libavireadCache.h b/multimedia/avifile/files/patch-libavireadCache.h
deleted file mode 100644
index 312b77abf0b4..000000000000
--- a/multimedia/avifile/files/patch-libavireadCache.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/aviread/Cache.h.orig	Tue Aug 28 22:02:19 2001
-+++ lib/aviread/Cache.h	Tue Aug 28 22:02:22 2001
-@@ -19,6 +19,7 @@
- #include <string>
- #include <vector>
- #include <list>
-+#include <pthread.h>
- 
- // Isn't this bug in NetBSD configuration - it should not have HAVE_LSEEK64
- #ifdef __NetBSD__
diff --git a/multimedia/avifile/files/patch-libavplayaviplay.cpp b/multimedia/avifile/files/patch-libavplayaviplay.cpp
deleted file mode 100644
index dbba1034ef71..000000000000
--- a/multimedia/avifile/files/patch-libavplayaviplay.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/aviplay/aviplay.cpp.orig	Tue Aug 28 21:53:40 2001
-+++ lib/aviplay/aviplay.cpp	Tue Aug 28 21:53:43 2001
-@@ -25,6 +25,7 @@
- #include "cpuinfo.h"
- #include "utils.h"
- #include "version.h"
-+#include <pthread.h>
- 
- //#include <iomanip>
- #include <iostream>
diff --git a/multimedia/avifile/files/patch-libvideorenderer.cpp b/multimedia/avifile/files/patch-libvideorenderer.cpp
deleted file mode 100644
index e864722f7190..000000000000
--- a/multimedia/avifile/files/patch-libvideorenderer.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/video/renderer.cpp.orig	Tue Aug 28 22:53:20 2001
-+++ lib/video/renderer.cpp	Tue Aug 28 22:53:30 2001
-@@ -20,6 +20,7 @@
- #include <fcntl.h>
- #include <sys/ioctl.h>
- #include <sys/time.h>
-+#include <pthread.h>
- 
- #ifndef WITHOUT_X
- 
diff --git a/multimedia/avifile/pkg-message b/multimedia/avifile/pkg-message
index ab4ce4da9eeb..3c5ded4fd18a 100644
--- a/multimedia/avifile/pkg-message
+++ b/multimedia/avifile/pkg-message
@@ -20,3 +20,7 @@ port.
 
 Please, check the FreeBSD Handbook on
 updating your port tree if you need to.
+
+ALSO, remove ~/.avirc configuration file
+prior to running avifile. The newer version
+has problems with old configuration files.
diff --git a/multimedia/avifile/pkg-plist b/multimedia/avifile/pkg-plist
index 3966aca157b0..6ce73dbf4c2e 100644
--- a/multimedia/avifile/pkg-plist
+++ b/multimedia/avifile/pkg-plist
@@ -1,11 +1,21 @@
+bin/avibench
+bin/avicat
+bin/avifile-config
+bin/avimake
+bin/aviplay
+bin/avirecompress
+bin/avitype
+%%WIN32%%bin/mmxnow-config
 include/avifile/Locker.h
-include/avifile/ReadHandlers.h
 include/avifile/StreamInfo.h
 include/avifile/VideoDPMS.h
 include/avifile/audiodecoder.h
 include/avifile/audioencoder.h
 include/avifile/avifile.h
 include/avifile/aviplay.h
+include/avifile/avm_map.h
+include/avifile/avm_output.h
+include/avifile/avm_stl.h
 include/avifile/config.h
 include/avifile/configfile.h
 include/avifile/cpuinfo.h
@@ -25,53 +35,45 @@ include/avifile/utils.h
 include/avifile/version.h
 include/avifile/videodecoder.h
 include/avifile/videoencoder.h
-@dirrm include/avifile
-bin/avifile-config
-bin/aviplay
-bin/avibench
-bin/avicat
-bin/avitype
-bin/avimake
-bin/avirecompress
-lib/libaviplay-%%VERSION%%.so.%%LIB_VERSION%%
+%%WIN32%%include/mmxnow.h
+lib/avifile/libac3pass.la
+lib/avifile/libac3pass.so
+lib/avifile/libaudiodec.la
+lib/avifile/libaudiodec.so
+%%FFMPEG%%lib/avifile/libffmpeg.la
+%%FFMPEG%%lib/avifile/libffmpeg.so
+%%MAD%%lib/avifile/libmad_audiodec.la
+%%MAD%%lib/avifile/libmad_audiodec.so
+lib/avifile/libmjpeg.la
+lib/avifile/libmjpeg.so
+lib/avifile/libmp3lamebin_audioenc.la
+lib/avifile/libmp3lamebin_audioenc.so
+lib/avifile/libmpeg_audiodec.la
+lib/avifile/libmpeg_audiodec.so
+%%VORBIS%%lib/avifile/libvorbis_audio.la
+%%VORBIS%%lib/avifile/libvorbis_audio.so
+%%WIN32%%lib/avifile/libwin32.la
+%%WIN32%%lib/avifile/libwin32.so
 lib/libaviplay.la
 lib/libaviplay.so
-lib/libmmxnow-0.1.so.1
-lib/libmmxnow.la
-lib/libmmxnow.so
-lib/libmmxnow.a
-lib/avifile%%VERSION%%/libac3pass-%%VERSION%%.so.%%LIB_VERSION%%
-lib/avifile%%VERSION%%/libac3pass.la
-lib/avifile%%VERSION%%/libac3pass.so
-lib/avifile%%VERSION%%/libaudiodec-%%VERSION%%.so.%%LIB_VERSION%%
-lib/avifile%%VERSION%%/libaudiodec.la
-lib/avifile%%VERSION%%/libaudiodec.so
-lib/avifile%%VERSION%%/libffmpeg-%%VERSION%%.so.%%LIB_VERSION%%
-lib/avifile%%VERSION%%/libffmpeg.la
-lib/avifile%%VERSION%%/libffmpeg.so
-lib/avifile%%VERSION%%/libmjpeg-%%VERSION%%.so.%%LIB_VERSION%%
-lib/avifile%%VERSION%%/libmjpeg.la
-lib/avifile%%VERSION%%/libmjpeg.so
-lib/avifile%%VERSION%%/libmp3lamebin_audioenc-%%VERSION%%.so.%%LIB_VERSION%%
-lib/avifile%%VERSION%%/libmp3lamebin_audioenc.la
-lib/avifile%%VERSION%%/libmp3lamebin_audioenc.so
-lib/avifile%%VERSION%%/libmpeg_audiodec-%%VERSION%%.so.%%LIB_VERSION%%
-lib/avifile%%VERSION%%/libmpeg_audiodec.la
-lib/avifile%%VERSION%%/libmpeg_audiodec.so
-%%VORBIS%%lib/avifile%%VERSION%%/libvorbis_audio-%%VERSION%%.so.%%LIB_VERSION%%
-%%VORBIS%%lib/avifile%%VERSION%%/libvorbis_audio.la
-%%VORBIS%%lib/avifile%%VERSION%%/libvorbis_audio.so
-lib/avifile%%VERSION%%/libwin32-%%VERSION%%.so.%%LIB_VERSION%%
-lib/avifile%%VERSION%%/libwin32.la
-lib/avifile%%VERSION%%/libwin32.so
-@dirrm lib/avifile%%VERSION%%
-share/avifile%%VERSION%%/about.ppm
-share/avifile%%VERSION%%/mute.ppm
-share/avifile%%VERSION%%/open.ppm
-share/avifile%%VERSION%%/opena.ppm
-share/avifile%%VERSION%%/opens.ppm
-share/avifile%%VERSION%%/pause.ppm
-share/avifile%%VERSION%%/play.ppm
-share/avifile%%VERSION%%/stop.ppm
-share/avifile%%VERSION%%/test.png
-@dirrm share/avifile%%VERSION%%
+lib/libaviplay.so.6
+lib/libavqt.la
+lib/libavqt.so
+lib/libavqt.so.6
+%%WIN32%%lib/libmmxnow.la
+%%WIN32%%lib/libmmxnow.so
+%%WIN32%%lib/libmmxnow.so.1
+share/avifile/about.ppm
+share/avifile/mute.ppm
+share/avifile/open.ppm
+share/avifile/opena.ppm
+share/avifile/opens.ppm
+share/avifile/pause.ppm
+share/avifile/play.ppm
+share/avifile/stop.ppm
+share/avifile/test.png
+%%PORTDOCS%%share/doc/avifile/README
+%%PORTDOCS%%@dirrm share/doc/avifile
+@dirrm share/avifile
+@dirrm lib/avifile
+@dirrm include/avifile