3 files changed, 15 insertions, 23 deletions

diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index 446cfcf35d61..8c8baebd4ad6 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	avifile
-PORTVERSION=	0.7.18.20021107
-PORTREVISION=	1
+PORTVERSION=	0.7.22.20021129
 PORTEPOCH=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://avifile.sourceforge.net/
@@ -34,6 +33,8 @@ 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 \
+		--disable-v4l \
+		--disable-vidix \
 		--disable-divx4
 CONFIGURE_TARGET=
 
@@ -186,13 +187,17 @@ packet 'pth' is installed.";\
 
 post-extract:
 # grab does not work outside Linux for now
-	@${RM} -f ${WRKSRC}/ffmpeg/libav/grab.c
-	@${TOUCH} ${WRKSRC}/ffmpeg/libav/grab.c
+	@${RM} -f ${WRKSRC}/ffmpeg/libavformat/grab.c
+	@${TOUCH} ${WRKSRC}/ffmpeg/libavformat/grab.c
 
 post-patch:
 # linux/ioctl.h -> sys/ioctl.h
 	@${REINPLACE_CMD} -e 's|linux/ioctl.h|sys/ioctl.h|' \
 		${WRKSRC}/drivers/libdha/kernelhelper/dhahelper.h
+# FreeBSD does not support Video4Linux or equivalent
+# therefore, do not build qtvidcap
+	@${REINPLACE_CMD} -E -e 's|^(SUBDIRS.+)qtvidcap|\1|' \
+		${WRKSRC}/samples/Makefile.in
 .if !defined(WITHOUT_MAD)
 	@${REINPLACE_CMD} -e 's|MAD_LDADD = \@MAD_LDADD\@|MAD_LDADD = -L${LOCALBASE}/lib \@MAD_LDADD\@|' \
 		${WRKSRC}/plugins/libmad/Makefile.in
@@ -273,6 +278,8 @@ LIBA52_DEP_LIBS=
 .if exists(${LOCALBASE}/lib/libmp3lame.so)
 LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
 
+CONFIGURE_ARGS+=	--enable-lame-bin
+
 PLIST_SUB+=	NOLAME="@comment " LAME=""
 .else
 PLIST_SUB+=	NOLAME="" LAME="@comment "
diff --git a/multimedia/avifile/distinfo b/multimedia/avifile/distinfo
index 4c6628cc1d84..0ef7649b162a 100644
--- a/multimedia/avifile/distinfo
+++ b/multimedia/avifile/distinfo
@@ -1 +1 @@
-MD5 (avifile-0.7.18-20021107.tgz) = 27acbdb55f19cf474a109c05e0b7b377
+MD5 (avifile-0.7.22-20021129.tgz) = 0e73a68de65fe65d589d0f18486e503f
diff --git a/multimedia/avifile/pkg-plist b/multimedia/avifile/pkg-plist
index 9226b77ba15b..8acbcf0437db 100644
--- a/multimedia/avifile/pkg-plist
+++ b/multimedia/avifile/pkg-plist
@@ -3,6 +3,7 @@ bin/avicat
 bin/avifile-config
 bin/avimake
 %%QT%%bin/aviplay
+%%QT%%bin/avirecompress
 bin/avitype
 %%WIN32%%bin/mmxnow-config
 include/avifile/Locker.h
@@ -44,28 +45,12 @@ lib/avifile/audiodec.so
 %%MAD%%lib/avifile/mad_audiodec.so
 lib/avifile/mjpeg.la
 lib/avifile/mjpeg.so
-%%NOLAME%%lib/avifile/mp3lame_audioenc.la
-%%NOLAME%%lib/avifile/mp3lame_audioenc.so
+lib/avifile/mp3lame_audioenc.la
+lib/avifile/mp3lame_audioenc.so
 %%LAME%%lib/avifile/mp3lamebin_audioenc.la
 %%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