diff --git a/graphics/avifile/Makefile b/graphics/avifile/Makefile
index c252e6bc439d..8289c0686250 100644
--- a/graphics/avifile/Makefile
+++ b/graphics/avifile/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	avifile
-PORTVERSION=	0.7.11.20020711
+PORTVERSION=	0.7.16.20020913
 PORTEPOCH=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://avifile.sourceforge.net/
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/.(.{8})$/-\1/}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	holger@eit.uni-kl.de
+MAINTAINER=	holger@e-gitt.net
 
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
@@ -34,11 +34,13 @@ CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
 		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib `${ECHO_CMD} ${PTHREAD_LIBS}`"
 CONFIGURE_ARGS= --with-gnu-ld --enable-iconv \
-		--program-transform-name='' \
 		--disable-divx4
+CONFIGURE_TARGET=
 
 PLIST_SUB=	LIB_VERSION="${LIB_VERSION}" VERSION="${VERSION}"
 
+MAN1=		aviplay.1
+
 #CODEC_PORT=	${PORTSDIR}/graphics/win32-codecs
 CODEC_PORT=	${.CURDIR}/../win32-codecs
 CODEC_DETECTION_FILE!=	${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
@@ -49,6 +51,13 @@ SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 DIFF?=		/usr/bin/diff
 FMT?=		/usr/bin/fmt
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} != "i386"
+WITHOUT_A52=yes
+WITHOUT_XVID=yes
+.endif
+
 # compilation optimizations
 .if !defined(WITHOUT_OPTIMIZED_CFLAGS)
 CONFIGURE_ARGS+=	--enable-release
@@ -185,6 +194,9 @@ post-patch:
 .if !defined(WITHOUT_A52)
 	@${REINPLACE_CMD} -e 's|-la52|${LIBA52_DEP_LIBS} -la52|' \
 		${WRKSRC}/configure
+# linux/ioctl.h -> sys/ioctl.h
+	@${REINPLACE_CMD} -e 's|linux/ioctl.h|sys/ioctl.h|' \
+		${WRKSRC}/drivers/libdha/kernelhelper/dhahelper.h
 # XXX - fool ffmpeg to use ports' version of liba52, revise this
 # at EVERY avifile update
 	@${REINPLACE_CMD} -e 's|liba52/liba52.la|${LOCALBASE}/lib/liba52.la|; \
@@ -232,16 +244,11 @@ post-patch:
 	@${FIND} ${WRKSRC} \( -name Makefile.in -o -name configure \) | \
 		${XARGS} -n 10 ${REINPLACE_CMD} -E -e \
 		's|INSTALL = \@INSTALL\@|INSTALL = ${INSTALL}|; \
-		s!-release[[:space:]]+\$$\(LT_RELEASE\)!!; \
+		s!-release[[:space:]]+\$$\([^\)]+\)!!; \
 		s!ACLOCAL =!ACLOCAL = ${TRUE} || !; \
 		s!AUTOCONF =!AUTOCONF = ${TRUE} || !; \
 		s!AUTOHEADER =!AUTOHEADER = ${TRUE} || !; \
 		s!AUTOMAKE =!AUTOMAKE = ${TRUE} || !'
-# XXX - fix simple bugs in version.sh script, revise this
-# at EVERY avifile update
-	@${REINPLACE_CMD} -E -e 's|^(last_cvs_update=).+$$|\1|; \
-		s|cp[[:space:]]+-a|cp|' \
-		${WRKSRC}/admin/version.sh
 
 post-configure:
 # Libtool fix code kindly provided by Mr. Maxim Sobolev <sobomax@FreeBSD.org>
@@ -257,8 +264,6 @@ post-install:
 .endif
 	@${FMT} < ${PKGMESSAGE}
 
-.include <bsd.port.pre.mk>
-
 .if ${ARCH} == "i386"
 RUN_DEPENDS+=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
 
diff --git a/graphics/avifile/distinfo b/graphics/avifile/distinfo
index 3abea0aa8c87..45fe9326dc51 100644
--- a/graphics/avifile/distinfo
+++ b/graphics/avifile/distinfo
@@ -1 +1 @@
-MD5 (avifile-0.7.11-20020711.tgz) = 3e3cd43f2d383a364789bdf672ba10e8
+MD5 (avifile-0.7.16-20020913.tgz) = c8ea982ee735ccdb995830d18c366f1b
diff --git a/graphics/avifile/files/patch-drivers::libdha::mmi.c b/graphics/avifile/files/patch-drivers::libdha::mmi.c
new file mode 100644
index 000000000000..93e84112d06b
--- /dev/null
+++ b/graphics/avifile/files/patch-drivers::libdha::mmi.c
@@ -0,0 +1,10 @@
+--- drivers/libdha/mmi.c.orig	Wed Oct  2 16:00:07 2002
++++ drivers/libdha/mmi.c	Wed Oct  2 16:00:14 2002
+@@ -1,6 +1,7 @@
+ /* Memory manager interface */
+ #include <stdio.h>
+ #include <sys/ioctl.h>
++#include <sys/types.h>
+ #include <sys/mman.h> /* mlock */
+ #include <errno.h>
+ #include <unistd.h>
diff --git a/graphics/avifile/files/patch-drivers::vidix::drivers::radeon_vid.c b/graphics/avifile/files/patch-drivers::vidix::drivers::radeon_vid.c
new file mode 100644
index 000000000000..eca92d1380f9
--- /dev/null
+++ b/graphics/avifile/files/patch-drivers::vidix::drivers::radeon_vid.c
@@ -0,0 +1,10 @@
+--- drivers/vidix/drivers/radeon_vid.c.orig	Wed Oct  2 16:01:05 2002
++++ drivers/vidix/drivers/radeon_vid.c	Wed Oct  2 16:01:15 2002
+@@ -11,6 +11,7 @@
+ #include <string.h>
+ #include <math.h>
+ #include <inttypes.h>
++#include <sys/types.h>
+ #include <sys/mman.h>
+ #include "../../libdha/pci_ids.h"
+ #include "../../libdha/pci_names.h"
diff --git a/graphics/avifile/pkg-plist b/graphics/avifile/pkg-plist
index ddaa0fa07f5a..43910466e6f2 100644
--- a/graphics/avifile/pkg-plist
+++ b/graphics/avifile/pkg-plist
@@ -12,7 +12,6 @@ include/avifile/audiodecoder.h
 include/avifile/audioencoder.h
 include/avifile/avifile.h
 include/avifile/aviplay.h
-include/avifile/avm_output.h
 include/avifile/avm_stl.h
 include/avifile/configfile.h
 include/avifile/cpuinfo.h
@@ -47,6 +46,22 @@ lib/avifile/mjpeg.so
 %%LAME%%lib/avifile/mp3lamebin_audioenc.so
 lib/avifile/mpeg_audiodec.la
 lib/avifile/mpeg_audiodec.so
+lib/avifile/vidix/libgenfb.la
+lib/avifile/vidix/libgenfb.so
+lib/avifile/vidix/libmach64.la
+lib/avifile/vidix/libmach64.so
+lib/avifile/vidix/libmga.la
+lib/avifile/vidix/libmga.so
+lib/avifile/vidix/libmga_crtc2.la
+lib/avifile/vidix/libmga_crtc2.so
+lib/avifile/vidix/libnvidia.la
+lib/avifile/vidix/libnvidia.so
+lib/avifile/vidix/libpm3.la
+lib/avifile/vidix/libpm3.so
+lib/avifile/vidix/libradeon.la
+lib/avifile/vidix/libradeon.so
+lib/avifile/vidix/librage128.la
+lib/avifile/vidix/librage128.so
 %%VORBIS%%lib/avifile/vorbis_audio.la
 %%VORBIS%%lib/avifile/vorbis_audio.so
 %%WIN32%%lib/avifile/win32.la
@@ -64,6 +79,7 @@ lib/libaviplay.so.0
 %%QT%%lib/libqavm.la
 %%QT%%lib/libqavm.so
 %%QT%%lib/libqavm.so.0
+share/aclocal/avifile.m4
 share/avifile/about.ppm
 share/avifile/mute.ppm
 share/avifile/open.ppm
@@ -76,5 +92,6 @@ share/avifile/test.png
 %%PORTDOCS%%share/doc/avifile/README
 %%PORTDOCS%%@dirrm share/doc/avifile
 @dirrm share/avifile
+@dirrm lib/avifile/vidix
 @dirrm lib/avifile
 @dirrm include/avifile
diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index c252e6bc439d..8289c0686250 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	avifile
-PORTVERSION=	0.7.11.20020711
+PORTVERSION=	0.7.16.20020913
 PORTEPOCH=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://avifile.sourceforge.net/
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/.(.{8})$/-\1/}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	holger@eit.uni-kl.de
+MAINTAINER=	holger@e-gitt.net
 
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
@@ -34,11 +34,13 @@ CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
 		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib `${ECHO_CMD} ${PTHREAD_LIBS}`"
 CONFIGURE_ARGS= --with-gnu-ld --enable-iconv \
-		--program-transform-name='' \
 		--disable-divx4
+CONFIGURE_TARGET=
 
 PLIST_SUB=	LIB_VERSION="${LIB_VERSION}" VERSION="${VERSION}"
 
+MAN1=		aviplay.1
+
 #CODEC_PORT=	${PORTSDIR}/graphics/win32-codecs
 CODEC_PORT=	${.CURDIR}/../win32-codecs
 CODEC_DETECTION_FILE!=	${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
@@ -49,6 +51,13 @@ SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 DIFF?=		/usr/bin/diff
 FMT?=		/usr/bin/fmt
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} != "i386"
+WITHOUT_A52=yes
+WITHOUT_XVID=yes
+.endif
+
 # compilation optimizations
 .if !defined(WITHOUT_OPTIMIZED_CFLAGS)
 CONFIGURE_ARGS+=	--enable-release
@@ -185,6 +194,9 @@ post-patch:
 .if !defined(WITHOUT_A52)
 	@${REINPLACE_CMD} -e 's|-la52|${LIBA52_DEP_LIBS} -la52|' \
 		${WRKSRC}/configure
+# linux/ioctl.h -> sys/ioctl.h
+	@${REINPLACE_CMD} -e 's|linux/ioctl.h|sys/ioctl.h|' \
+		${WRKSRC}/drivers/libdha/kernelhelper/dhahelper.h
 # XXX - fool ffmpeg to use ports' version of liba52, revise this
 # at EVERY avifile update
 	@${REINPLACE_CMD} -e 's|liba52/liba52.la|${LOCALBASE}/lib/liba52.la|; \
@@ -232,16 +244,11 @@ post-patch:
 	@${FIND} ${WRKSRC} \( -name Makefile.in -o -name configure \) | \
 		${XARGS} -n 10 ${REINPLACE_CMD} -E -e \
 		's|INSTALL = \@INSTALL\@|INSTALL = ${INSTALL}|; \
-		s!-release[[:space:]]+\$$\(LT_RELEASE\)!!; \
+		s!-release[[:space:]]+\$$\([^\)]+\)!!; \
 		s!ACLOCAL =!ACLOCAL = ${TRUE} || !; \
 		s!AUTOCONF =!AUTOCONF = ${TRUE} || !; \
 		s!AUTOHEADER =!AUTOHEADER = ${TRUE} || !; \
 		s!AUTOMAKE =!AUTOMAKE = ${TRUE} || !'
-# XXX - fix simple bugs in version.sh script, revise this
-# at EVERY avifile update
-	@${REINPLACE_CMD} -E -e 's|^(last_cvs_update=).+$$|\1|; \
-		s|cp[[:space:]]+-a|cp|' \
-		${WRKSRC}/admin/version.sh
 
 post-configure:
 # Libtool fix code kindly provided by Mr. Maxim Sobolev <sobomax@FreeBSD.org>
@@ -257,8 +264,6 @@ post-install:
 .endif
 	@${FMT} < ${PKGMESSAGE}
 
-.include <bsd.port.pre.mk>
-
 .if ${ARCH} == "i386"
 RUN_DEPENDS+=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
 
diff --git a/multimedia/avifile/distinfo b/multimedia/avifile/distinfo
index 3abea0aa8c87..45fe9326dc51 100644
--- a/multimedia/avifile/distinfo
+++ b/multimedia/avifile/distinfo
@@ -1 +1 @@
-MD5 (avifile-0.7.11-20020711.tgz) = 3e3cd43f2d383a364789bdf672ba10e8
+MD5 (avifile-0.7.16-20020913.tgz) = c8ea982ee735ccdb995830d18c366f1b
diff --git a/multimedia/avifile/files/patch-drivers::libdha::mmi.c b/multimedia/avifile/files/patch-drivers::libdha::mmi.c
new file mode 100644
index 000000000000..93e84112d06b
--- /dev/null
+++ b/multimedia/avifile/files/patch-drivers::libdha::mmi.c
@@ -0,0 +1,10 @@
+--- drivers/libdha/mmi.c.orig	Wed Oct  2 16:00:07 2002
++++ drivers/libdha/mmi.c	Wed Oct  2 16:00:14 2002
+@@ -1,6 +1,7 @@
+ /* Memory manager interface */
+ #include <stdio.h>
+ #include <sys/ioctl.h>
++#include <sys/types.h>
+ #include <sys/mman.h> /* mlock */
+ #include <errno.h>
+ #include <unistd.h>
diff --git a/multimedia/avifile/files/patch-drivers::vidix::drivers::radeon_vid.c b/multimedia/avifile/files/patch-drivers::vidix::drivers::radeon_vid.c
new file mode 100644
index 000000000000..eca92d1380f9
--- /dev/null
+++ b/multimedia/avifile/files/patch-drivers::vidix::drivers::radeon_vid.c
@@ -0,0 +1,10 @@
+--- drivers/vidix/drivers/radeon_vid.c.orig	Wed Oct  2 16:01:05 2002
++++ drivers/vidix/drivers/radeon_vid.c	Wed Oct  2 16:01:15 2002
+@@ -11,6 +11,7 @@
+ #include <string.h>
+ #include <math.h>
+ #include <inttypes.h>
++#include <sys/types.h>
+ #include <sys/mman.h>
+ #include "../../libdha/pci_ids.h"
+ #include "../../libdha/pci_names.h"
diff --git a/multimedia/avifile/pkg-plist b/multimedia/avifile/pkg-plist
index ddaa0fa07f5a..43910466e6f2 100644
--- a/multimedia/avifile/pkg-plist
+++ b/multimedia/avifile/pkg-plist
@@ -12,7 +12,6 @@ include/avifile/audiodecoder.h
 include/avifile/audioencoder.h
 include/avifile/avifile.h
 include/avifile/aviplay.h
-include/avifile/avm_output.h
 include/avifile/avm_stl.h
 include/avifile/configfile.h
 include/avifile/cpuinfo.h
@@ -47,6 +46,22 @@ lib/avifile/mjpeg.so
 %%LAME%%lib/avifile/mp3lamebin_audioenc.so
 lib/avifile/mpeg_audiodec.la
 lib/avifile/mpeg_audiodec.so
+lib/avifile/vidix/libgenfb.la
+lib/avifile/vidix/libgenfb.so
+lib/avifile/vidix/libmach64.la
+lib/avifile/vidix/libmach64.so
+lib/avifile/vidix/libmga.la
+lib/avifile/vidix/libmga.so
+lib/avifile/vidix/libmga_crtc2.la
+lib/avifile/vidix/libmga_crtc2.so
+lib/avifile/vidix/libnvidia.la
+lib/avifile/vidix/libnvidia.so
+lib/avifile/vidix/libpm3.la
+lib/avifile/vidix/libpm3.so
+lib/avifile/vidix/libradeon.la
+lib/avifile/vidix/libradeon.so
+lib/avifile/vidix/librage128.la
+lib/avifile/vidix/librage128.so
 %%VORBIS%%lib/avifile/vorbis_audio.la
 %%VORBIS%%lib/avifile/vorbis_audio.so
 %%WIN32%%lib/avifile/win32.la
@@ -64,6 +79,7 @@ lib/libaviplay.so.0
 %%QT%%lib/libqavm.la
 %%QT%%lib/libqavm.so
 %%QT%%lib/libqavm.so.0
+share/aclocal/avifile.m4
 share/avifile/about.ppm
 share/avifile/mute.ppm
 share/avifile/open.ppm
@@ -76,5 +92,6 @@ share/avifile/test.png
 %%PORTDOCS%%share/doc/avifile/README
 %%PORTDOCS%%@dirrm share/doc/avifile
 @dirrm share/avifile
+@dirrm lib/avifile/vidix
 @dirrm lib/avifile
 @dirrm include/avifile