upgrade to 0.60.20010429

PR:		26987
Submitted by:	maintainer

7 files changed, 73 insertions, 111 deletions

diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index 96fcc4d620f1..529dd15dca58 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	avifile
-PORTVERSION=	0.53.5
+PORTVERSION=	0.60.20010429
 CATEGORIES=	graphics
 MASTER_SITES=	http://ernie.eit.uni-kl.de/avifile/ \
 		http://divx.euro.ru/ \
@@ -23,14 +23,21 @@ USE_QT_VER=	2
 USE_XLIB=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-0.6
+LDCONFIG_DIRS=	%%PREFIX%%/lib/avifile
 
-USE_AUTOCONF=	yes
+USE_AUTOMAKE=	yes
 USE_LIBTOOL=	yes
-GNU_CONFIGURE=	yes
+LIBTOOLFILES=	acinclude.m4
+# GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-win32-path=${LOCALBASE}/lib/win32 \
-		--enable-release
+		--enable-release --with-gnu-ld
+.if defined(WITH_MGA)
+CONFIGURE_ARGS+=--enable-mga
+.endif
+
 PLIST_SUB=	LIB_VERSION="${LIB_VERSION}"
 
 FMT=	/usr/bin/fmt
@@ -44,13 +51,21 @@ LIB_VERSION=	0
 # qt is there but configure is not finding it
 # Therefore, it is avoiding this directories
 # At least, on lioux's homesystem with qt 2.2.3
-EXTRA_BUILD_DIR=	player samples/benchmark samples/qtrecompress
+EXTRA_BUILD_DIR=	player samples/misc samples/qtrecompress
 
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 DIFF?=		/usr/bin/diff
 
 .include <bsd.port.pre.mk>
 
+pre-extract:
+.if !defined(WITH_MGA)
+	@${ECHO_MSG} "You can enable special MGA support by building with -DWITH_MGA."
+.endif
+
+do-configure:
+	(cd ${WRKSRC} && aclocal && ./autogen.sh &&\
+	${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS})
 # Libtool fix code kindly provided by Mr. Maxim Sobolev <sobomax@FreeBSD.org>
 post-configure:
 	@${PERL} -pi -e \
@@ -65,7 +80,11 @@ post-build:
 post-install:
 	@${FMT} < ${PKGMESSAGE}
 	@${INSTALL_DATA} ${WRKSRC}/lib/libaviplay.la ${PREFIX}/lib
-	@${LN} -sf libaviplay.so.${LIB_VERSION} ${PREFIX}/lib/libaviplay.so
+	@${INSTALL_DATA} ${WRKSRC}/plugins/libaudiodec/libaudiodec.la ${PREFIX}/lib/avifile
+	@${INSTALL_DATA} ${WRKSRC}/plugins/libmp3lame_audioenc/libmp3lame_audioenc.la ${PREFIX}/lib/avifile
+	@${INSTALL_DATA} ${WRKSRC}/plugins/libmpeg_audiodec/libmpeg_audiodec.la ${PREFIX}/lib/avifile
+	@${INSTALL_DATA} ${WRKSRC}/plugins/libwin32/libwin32.la ${PREFIX}/lib/avifile
+#	@${LN} -sf libaviplay.so.${LIB_VERSION} ${PREFIX}/lib/libaviplay.so
 # Adhoc fix. Second part.
 # Install the missed applications.
 .if exists(${PREFIX}/bin/aviplay)
@@ -76,13 +95,13 @@ post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/player/.libs/aviplay ${PREFIX}/bin
 .endif
 .if exists(${PREFIX}/bin/benchmark)
-	${DIFF} ${WRKSRC}/samples/benchmark/.libs/benchmark \
+	${DIFF} ${WRKSRC}/samples/misc/.libs/benchmark \
 		${PREFIX}/bin > /dev/null || \
 			${INSTALL_PROGRAM} \
-				${WRKSRC}/samples/benchmark/.libs/benchmark \
+				${WRKSRC}/samples/misc/.libs/benchmark \
 					${PREFIX}/bin
 .else
-	${INSTALL_PROGRAM} ${WRKSRC}/samples/benchmark/.libs/benchmark \
+	${INSTALL_PROGRAM} ${WRKSRC}/samples/misc/.libs/benchmark \
 		${PREFIX}/bin
 .endif
 .if exists(${PREFIX}/bin/qtrecompress)
diff --git a/multimedia/avifile/distinfo b/multimedia/avifile/distinfo
index 6383afb6d335..b55f9ab6c2a2 100644
--- a/multimedia/avifile/distinfo
+++ b/multimedia/avifile/distinfo
@@ -1 +1 @@
-MD5 (avifile-0.53.5.tar.gz) = 3d51465e8a720af0bb1afa68aa4e7373
+MD5 (avifile-0.60.20010429.tar.gz) = e5b563661420b82f5fc834b3e8b57202
diff --git a/multimedia/avifile/files/patch-aa b/multimedia/avifile/files/patch-aa
index ededdb39d3f5..bf397cb1b906 100644
--- a/multimedia/avifile/files/patch-aa
+++ b/multimedia/avifile/files/patch-aa
@@ -1,14 +1,11 @@
---- lib/avifile/AviWrite.cpp.orig	Fri Oct  6 12:58:16 2000
-+++ lib/avifile/AviWrite.cpp	Fri Oct  6 12:59:14 2000
-@@ -23,7 +23,11 @@
-     try
-     {
-         m_status=0;
-+#ifdef O_LARGEFILE
- 	m_fd=new FileBuffer(name, O_WRONLY | O_CREAT | O_TRUNC | O_LARGEFILE, mask);
-+#else
-+	m_fd=new FileBuffer(name, O_WRONLY | O_CREAT | O_TRUNC, mask);
-+#endif
- 	const int junk_size=0x800;
-         char* junk=new char[junk_size];
- 	memset(junk, 0, junk_size);
+--- player/mywidget.h.orig	Wed Apr 18 22:06:31 2001
++++ player/mywidget.h	Wed Apr 18 22:06:41 2001
+@@ -7,7 +7,7 @@
+ #include <pthread.h>
+ 
+ #ifdef USE_SDL
+-#include <SDL/SDL_keysym.h>
++#include <SDL11/SDL_keysym.h>
+ #endif
+ 
+ 
diff --git a/multimedia/avifile/files/patch-ab b/multimedia/avifile/files/patch-ab
index 5b0f59a9bd72..ad26321f3929 100644
--- a/multimedia/avifile/files/patch-ab
+++ b/multimedia/avifile/files/patch-ab
@@ -1,23 +1,10 @@
---- lib/loader/win32.c.orig	Thu Jan  4 01:18:05 2001
-+++ lib/loader/win32.c	Thu Jan  4 01:18:10 2001
-@@ -1085,6 +1085,7 @@
- static double CPU_Freq()
- {
- //#ifdef USE_TSC
-+#ifdef __Linux__
- 	FILE *f = fopen ("/proc/cpuinfo", "r");
- 	char line[200];
- 	char model[200]="unknown";
-@@ -1121,9 +1122,9 @@
- 	fclose(f);
- 	if(freq<0)return old_freq();
- 	return freq;
--//#else
--//	return old_freq();
--//#endif    	
-+#else
-+	return old_freq();
-+#endif    	
- }
+--- lib/aviread/Cache.cpp.orig	Sun Apr 29 20:25:10 2001
++++ lib/aviread/Cache.cpp	Sun Apr 29 20:25:19 2001
+@@ -3,7 +3,6 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/time.h>
+-#include <stdint.h>
  
- long WINAPI expQueryPerformanceFrequency(long long* z)
+ #include <iomanip>
+ #include <iostream>
diff --git a/multimedia/avifile/files/patch-ac b/multimedia/avifile/files/patch-ac
deleted file mode 100644
index f2c4fefd748c..000000000000
--- a/multimedia/avifile/files/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/videocodec/Module.h.orig	Fri Oct  6 13:01:34 2000
-+++ lib/videocodec/Module.h	Fri Oct  6 13:02:09 2000
-@@ -4,6 +4,12 @@
- #include <videoencoder.h>
- #include <list>
- #include <string>
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+#if (defined(BSD) && (BSD >= 199103))
-+#include <sys/time.h>
-+#endif
- using namespace std;
- 
- class VideoCodecControl;
diff --git a/multimedia/avifile/files/patch-ae b/multimedia/avifile/files/patch-ae
deleted file mode 100644
index 38258f8a1512..000000000000
--- a/multimedia/avifile/files/patch-ae
+++ /dev/null
@@ -1,19 +0,0 @@
---- aclocal.m4.orig	Thu Dec 21 15:30:34 2000
-+++ aclocal.m4	Thu Dec 21 15:31:01 2000
-@@ -569,7 +569,7 @@
- 
-  if test "$qt_libdir" ; then
-   ac_QT_NAME=$DEFAULTQTLIB
--  AC_CHECK_LIB(qt-mt, main,ac_QT_NAME=-lqt-mt)
-+dnl  AC_CHECK_LIB(qt-mt, main,ac_QT_NAME=-lqt-mt)
-  fi;
-  LIBS="$LIBS $ac_QT_NAME -lXext -lX11 $LIBSOCKET"
- 
-@@ -609,7 +609,7 @@
- else
-   have_qt="yes"
-   ac_QT_NAME=$DEFAULTQTLIB
--  AC_CHECK_LIB(qt-mt, main,ac_QT_NAME=-lqt-mt)
-+dnl  AC_CHECK_LIB(qt-mt, main,ac_QT_NAME=-lqt-mt)
-   LIBS="$LIBS $ac_QT_NAME -lXext -lX11 $LIBSOCKET"
- fi
diff --git a/multimedia/avifile/pkg-plist b/multimedia/avifile/pkg-plist
index f8735a3b0180..ab6786c7c69b 100644
--- a/multimedia/avifile/pkg-plist
+++ b/multimedia/avifile/pkg-plist
@@ -1,60 +1,53 @@
+include/avifile/ReadHandlers.h
 include/avifile/audiodecoder.h
 include/avifile/audioencoder.h
 include/avifile/avifile.h
 include/avifile/avifmt.h
 include/avifile/aviplay.h
-include/avifile/aviutil.h
 include/avifile/com.h
 include/avifile/config.h
+include/avifile/configfile.h
+include/avifile/cpuinfo.h
+include/avifile/creators.h
 include/avifile/default.h
 include/avifile/except.h
+include/avifile/formats.h
 include/avifile/image.h
 include/avifile/infotypes.h
-include/avifile/loader.h
+include/avifile/mmx.h
+include/avifile/playerwidget.h
+include/avifile/plugin.h
 include/avifile/registry.h
+include/avifile/renderer.h
 include/avifile/version.h
 include/avifile/videodecoder.h
 include/avifile/videoencoder.h
-include/avifile/wine/basetsd.h
-include/avifile/wine/config.h
-include/avifile/wine/debugtools.h
-include/avifile/wine/driver.h
-include/avifile/wine/elfdll.h
-include/avifile/wine/heap.h
-include/avifile/wine/ldt.h
-include/avifile/wine/mmreg.h
-include/avifile/wine/module.h
-include/avifile/wine/msacm.h
-include/avifile/wine/msacmdrv.h
-include/avifile/wine/ntdef.h
-include/avifile/wine/pe_image.h
-include/avifile/wine/poppack.h
-include/avifile/wine/pshpack1.h
-include/avifile/wine/pshpack2.h
-include/avifile/wine/pshpack4.h
-include/avifile/wine/pshpack8.h
-include/avifile/wine/vfw.h
-include/avifile/wine/winbase.h
-include/avifile/wine/windef.h
-include/avifile/wine/windows.h
-include/avifile/wine/winerror.h
-include/avifile/wine/winestring.h
-include/avifile/wine/winnt.h
-include/avifile/wine/winreg.h
-include/avifile/wine/winuser.h
-@dirrm include/avifile/wine
 @dirrm include/avifile
 bin/avifile-config
 bin/aviplay
 bin/benchmark
 bin/qtrecompress
+share/avifile/about.ppm
+share/avifile/mute.ppm
 share/avifile/open.ppm
 share/avifile/pause.ppm
 share/avifile/play.ppm
 share/avifile/stop.ppm
-share/avifile/about.ppm
 share/avifile/test.png
 @dirrm share/avifile
+lib/avifile/libaudiodec.so
+lib/avifile/libaudiodec.so.0
+lib/avifile/libaudiodec.la
+lib/avifile/libmp3lame_audioenc.so
+lib/avifile/libmp3lame_audioenc.so.0
+lib/avifile/libmp3lame_audioenc.la
+lib/avifile/libmpeg_audiodec.so
+lib/avifile/libmpeg_audiodec.so.0
+lib/avifile/libmpeg_audiodec.la
+lib/avifile/libwin32.so
+lib/avifile/libwin32.so.0
+lib/avifile/libwin32.la
+@dirrm lib/avifile
 lib/libaviplay.la
 lib/libaviplay.so
 lib/libaviplay.so.%%LIB_VERSION%%