5 files changed, 81 insertions, 23 deletions

diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index c3df7ceaf6f6..5710a65a1e7a 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	avifile
-PORTVERSION=	0.7.34.20030319
+PORTVERSION=	0.7.38
 PORTEPOCH=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/.(.{8})$/-\1/}
-EXTRACT_SUFX=	.tgz
+DISTNAME=	${PORTNAME}-0.7-${PORTVERSION}
 
 MAINTAINER=	holger@e-gitt.net
 COMMENT=	AVI player/converter with numerous codecs, including MPEG-4(DivX ;-))
@@ -27,8 +26,6 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:C/^(.{3}).*/\1/}-${PORTVERSION:C/^(.{6}).+$/\1/}
-
 LIBTOOLFILES=	acinclude.m4
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" \
@@ -250,6 +247,7 @@ post-patch:
 # CFLAGS safeness
 # do not version library names
 # fix incorrect behavior of configure script
+# make doc follow our hier
 	@${FIND} ${WRKSRC} \( -name Makefile.in -o -name configure \) | \
 		${XARGS} -n 10 ${REINPLACE_CMD} -E -e \
 		's|INSTALL = \@INSTALL\@|INSTALL = ${INSTALL}|; \
@@ -258,7 +256,8 @@ post-patch:
 		s!ACLOCAL =!ACLOCAL = ${TRUE} || !; \
 		s!AUTOCONF =!AUTOCONF = ${TRUE} || !; \
 		s!AUTOHEADER =!AUTOHEADER = ${TRUE} || !; \
-		s!AUTOMAKE =!AUTOMAKE = ${TRUE} || !'
+		s!AUTOMAKE =!AUTOMAKE = ${TRUE} || !; \
+		s|[(]datadir[)]/[$$][(]PACKAGE[)]/doc|(prefix)/share/doc/$$(PACKAGE)|'
 # fix location of pkgconfig dir
 	@${REINPLACE_CMD} -E \
 		-e 's|^(pkgconfigdir).*|\1=${PREFIX}/libdata/pkgconfig|' \
@@ -276,10 +275,6 @@ post-configure:
 	@${LN} -sf ${LIBTOOL} ${WRKSRC}
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${PKGMESSAGE} ${DOCSDIR}/README
-.endif
 	@${FMT} < ${PKGMESSAGE}
 
 .if ${ARCH} == "i386"
diff --git a/multimedia/avifile/distinfo b/multimedia/avifile/distinfo
index 179ae25badec..9dfd0783ecd2 100644
--- a/multimedia/avifile/distinfo
+++ b/multimedia/avifile/distinfo
@@ -1 +1 @@
-MD5 (avifile-0.7.34-20030319.tgz) = 5b3a831ed3d12a5d12d23b8d9673b88d
+MD5 (avifile-0.7-0.7.38.tar.gz) = db90c4bc0a8a8182b1ec084feca86bbb
diff --git a/multimedia/avifile/files/patch-ffmpeg::libavformat::flvenc.c b/multimedia/avifile/files/patch-ffmpeg::libavformat::flvenc.c
new file mode 100644
index 000000000000..8f2617293e7b
--- /dev/null
+++ b/multimedia/avifile/files/patch-ffmpeg::libavformat::flvenc.c
@@ -0,0 +1,18 @@
+--- ffmpeg/libavformat/flvenc.c.orig	Wed Nov 19 10:06:53 2003
++++ ffmpeg/libavformat/flvenc.c	Wed Nov 19 10:08:10 2003
+@@ -226,11 +226,12 @@
+ {
+     ByteIOContext *pb = &s->pb;
+     FLVContext *flv = s->priv_data;
+-
++    int64_t file_size;
++    int flags = 0;
++    
+     Dump(flv,pb,1);
+ 
+-    int64_t file_size = url_ftell(pb);
+-    int flags = 0;
++    file_size = url_ftell(pb);
+     flags |= flv->hasAudio ? 4 : 0;
+     flags |= flv->hasVideo ? 1 : 0;
+     url_fseek(pb, 4, SEEK_SET);
diff --git a/multimedia/avifile/files/patch-lib::common::String.cpp b/multimedia/avifile/files/patch-lib::common::String.cpp
new file mode 100644
index 000000000000..2475511a8b01
--- /dev/null
+++ b/multimedia/avifile/files/patch-lib::common::String.cpp
@@ -0,0 +1,19 @@
+--- lib/common/String.cpp.orig	Wed Nov 19 10:51:12 2003
++++ lib/common/String.cpp	Wed Nov 19 10:52:01 2003
+@@ -3,6 +3,7 @@
+ #include <ctype.h>
+ #include <stdio.h>
+ #include <stdarg.h>
++#include <stdlib.h>
+ 
+ AVM_BEGIN_NAMESPACE;
+ 
+@@ -170,7 +171,7 @@
+ #else
+     // a bit poor hack but should be sufficient
+     // eventually write full implementation
+-    s = malloc(1000);
++    s = (char *)malloc(1000);
+     r = vsnprintf(str, 999, fmt, ap);
+ #endif
+     if (s)
diff --git a/multimedia/avifile/pkg-plist b/multimedia/avifile/pkg-plist
index 6781c15f00bc..1b576110fcd7 100644
--- a/multimedia/avifile/pkg-plist
+++ b/multimedia/avifile/pkg-plist
@@ -13,7 +13,10 @@ include/avifile/audioencoder.h
 include/avifile/avifile.h
 include/avifile/aviplay.h
 include/avifile/avm_args.h
+include/avifile/avm_cpuinfo.h
+include/avifile/avm_creators.h
 include/avifile/avm_default.h
+include/avifile/avm_except.h
 include/avifile/avm_fourcc.h
 include/avifile/avm_locker.h
 include/avifile/avm_output.h
@@ -82,19 +85,42 @@ lib/libaviplay.so.0
 %%QT%%lib/libqavm.so.0
 libdata/pkgconfig/avifile.pc
 share/aclocal/avifile.m4
-share/avifile/about.ppm
 share/avifile/action.cfg
-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
-share/avifile/test.xpm
-%%PORTDOCS%%share/doc/avifile/README
-%%PORTDOCS%%@dirrm share/doc/avifile
+share/doc/avifile/avicap/avicap.html
+share/doc/avifile/avicap/configuration.html
+share/doc/avifile/avicap/epg.html
+share/doc/avifile/avicap/shutdown_resume.html
+share/doc/avifile/avicap/timertable.html
+share/doc/avifile/COPYING
+share/doc/avifile/CREDITS
+share/doc/avifile/EXCEPTIONS
+share/doc/avifile/FreeBSD
+share/doc/avifile/ChangeLog
+share/doc/avifile/KNOWN_BUGS
+share/doc/avifile/LICENSING
+share/doc/avifile/README
+share/doc/avifile/README.ac3pass
+share/doc/avifile/README-DEVEL
+share/doc/avifile/TODO
+share/doc/avifile/VIDEO-PERFORMANCE
+share/doc/avifile/WARNINGS
+share/avifile/pixmaps/about.ppm
+share/avifile/pixmaps/bottom.ppm
+share/avifile/pixmaps/down.ppm
+share/avifile/pixmaps/mute.ppm
+share/avifile/pixmaps/open.ppm
+share/avifile/pixmaps/opena.ppm
+share/avifile/pixmaps/opens.ppm
+share/avifile/pixmaps/pause.ppm
+share/avifile/pixmaps/play.ppm
+share/avifile/pixmaps/stop.ppm
+share/avifile/pixmaps/test.png
+share/avifile/pixmaps/test.xpm
+share/avifile/pixmaps/top.ppm
+share/avifile/pixmaps/up.ppm
+@dirrm share/doc/avifile/avicap
+@dirrm share/doc/avifile
+@dirrm share/avifile/pixmaps
 @dirrm share/avifile
 @unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true
 @unexec rmdir %D/lib/avifile/vidix 2>/dev/null || true