Update to 0.7.34.20030319

Approved by:	maintainer

3 files changed, 24 insertions, 5 deletions

diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index 57d0938180e8..47cf7f7c70d8 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	avifile
-PORTVERSION=	0.7.27.20030122
+PORTVERSION=	0.7.34.20030319
 PORTEPOCH=	2
 CATEGORIES=	multimedia
-MASTER_SITES=	http://avifile.sourceforge.net/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/.(.{8})$/-\1/}
 EXTRACT_SUFX=	.tgz
 
@@ -32,7 +33,7 @@ LIBTOOLFILES=	acinclude.m4
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" \
 		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib `${ECHO_CMD} ${PTHREAD_LIBS}`"
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS= --with-gnu-ld --enable-iconv \
 		--disable-v4l \
 		--disable-divx4
@@ -40,7 +41,8 @@ CONFIGURE_TARGET=
 
 PLIST_SUB=	LIB_VERSION="${LIB_VERSION}" VERSION="${VERSION}"
 
-MAN1=		aviplay.1
+MAN1=	avibench.1 avicap.1 avicat.1 avifile-config.1 avimake.1 \
+	aviplay.1 avirec.1 avirecompress.1 avitype.1
 
 #CODEC_PORT=	${PORTSDIR}/multimedia/win32-codecs
 CODEC_PORT=	${.CURDIR}/../win32-codecs
@@ -111,6 +113,8 @@ PLIST_SUB+=	A52="@comment "
 .if !defined(WITHOUT_MAD)
 LIB_DEPENDS+=	mad.1:${PORTSDIR}/audio/mad
 
+CONFIGURE_ARGS+=	--enable-mad \
+			--enable-libmad
 PLIST_SUB+=	MAD=""
 .else
 CONFIGURE_ARGS+=	--disable-mad
@@ -255,6 +259,18 @@ post-patch:
 		s!AUTOCONF =!AUTOCONF = ${TRUE} || !; \
 		s!AUTOHEADER =!AUTOHEADER = ${TRUE} || !; \
 		s!AUTOMAKE =!AUTOMAKE = ${TRUE} || !'
+# fix location of pkgconfig dir
+	@${REINPLACE_CMD} -E \
+		-e 's|^(pkgconfigdir).*|\1=${PREFIX}/libdata/pkgconfig|' \
+		${WRKSRC}/Makefile.in
+# do not install man page for v4l
+	@${REINPLACE_CMD} -E \
+		-e 's|kv4lsetup.1||' ${WRKSRC}/doc/Makefile.in
+# libmad's configure script has problems in this release
+# therefore, we avoid it since we do not need it anyway
+	@${REINPLACE_CMD} -E \
+		-e 's|^subdirs[[:space:]]*=.*libmad.*$$||' \
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-configure:
 	@${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}
diff --git a/multimedia/avifile/distinfo b/multimedia/avifile/distinfo
index 6adcb2bd0cac..179ae25badec 100644
--- a/multimedia/avifile/distinfo
+++ b/multimedia/avifile/distinfo
@@ -1 +1 @@
-MD5 (avifile-0.7.27-20030122.tgz) = e8431bc88e0f49059077ac7138e7e47d
+MD5 (avifile-0.7.34-20030319.tgz) = 5b3a831ed3d12a5d12d23b8d9673b88d
diff --git a/multimedia/avifile/pkg-plist b/multimedia/avifile/pkg-plist
index 6dbff48408c1..6781c15f00bc 100644
--- a/multimedia/avifile/pkg-plist
+++ b/multimedia/avifile/pkg-plist
@@ -16,6 +16,7 @@ include/avifile/avm_args.h
 include/avifile/avm_default.h
 include/avifile/avm_fourcc.h
 include/avifile/avm_locker.h
+include/avifile/avm_output.h
 include/avifile/avm_stl.h
 include/avifile/configfile.h
 include/avifile/cpuinfo.h
@@ -79,6 +80,7 @@ lib/libaviplay.so.0
 %%QT%%lib/libqavm.la
 %%QT%%lib/libqavm.so
 %%QT%%lib/libqavm.so.0
+libdata/pkgconfig/avifile.pc
 share/aclocal/avifile.m4
 share/avifile/about.ppm
 share/avifile/action.cfg
@@ -94,6 +96,7 @@ share/avifile/test.xpm
 %%PORTDOCS%%share/doc/avifile/README
 %%PORTDOCS%%@dirrm share/doc/avifile
 @dirrm share/avifile
+@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true
 @unexec rmdir %D/lib/avifile/vidix 2>/dev/null || true
 @dirrm lib/avifile
 @dirrm include/avifile