1) Update to version 0.53.1

2) Update codec distribution to version 001222
3) Add codec wmvds32.ax
4) Install avifile library (both shared and static) version .0
(distfile's numbering)
5) Have the binaries use the shared library
6) Add a libtool hack fix kindly provided by Maxim Sobolev
<sobomax@FreeBSD.org>
7) Add an adhoc fix to insure build of avifile utilities despite
possible misbehavior of the configure script
9) Update pkg-descr with more informative message
10) Update pkg-comment with more precise message
11) Update pkg-message with information about possible build
problems. This port requires qt with thread support.

PR:		ports/23941
Submitted by:	maintainer,
		Volker Stolz <stolz@i2.informatik.rwth-aachen.de>

9 files changed, 140 insertions, 63 deletions

diff --git a/multimedia/win32-codecs/Makefile b/multimedia/win32-codecs/Makefile
index d4f026215c73..2140e940e232 100644
--- a/multimedia/win32-codecs/Makefile
+++ b/multimedia/win32-codecs/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	avifile
-PORTVERSION=	0.50
+PORTVERSION=	0.53.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://ernie.eit.uni-kl.de/avifile/ \
 		http://divx.euro.ru/ \
 		http://www.toon.eu.org/divx/
 DISTFILES=	avifile-${PORTVERSION}.tar.gz \
-		binaries-${CODEC_VERSION}.zip
+		binaries-${CODEC_VERSION}.zip \
+		wmvds32.ax.gz
 EXTRACT_ONLY=	avifile-${PORTVERSION}.tar.gz
 
 MAINTAINER=	holger@eit.uni-kl.de
@@ -20,39 +21,91 @@ MAINTAINER=	holger@eit.uni-kl.de
 LIB_DEPENDS=	SDL-1.1.2:${PORTSDIR}/devel/sdl-devel
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
+WRKSRC=         ${WRKDIR}/${PORTNAME}-0.53
 RESTRICTED=	Unsure of codec\'s license
-RESTRICTED_FILES=	binaries-${CODEC_VERSION}.zip
+RESTRICTED_FILES=	binaries-${CODEC_VERSION}.zip \
+			wmvds32.ax.gz
 
 ONLY_FOR_ARCHS= i386
 USE_QT2=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
-USE_AUTOCONF=	yes
 INSTALLS_SHLIB=	yes
 
-HAS_CONFIGURE=	yes
+USE_AUTOCONF=	yes
+USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
-		MOC="${MOC}"
-CONFIGURE_ARGS+= --enable-mmx \
-		--with-qt-includes=${X11BASE}/include/qt2 \
+		MOC="${MOC}" \
+		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib \
-		--with-win32-path=${LOCALBASE}/lib/win32
+		--with-win32-path=${LOCALBASE}/lib/win32 \
+		--enable-release
+PLIST_SUB=	LIB_VERSION="${LIB_VERSION}"
 
-CODEC_VERSION=	000918
+CODEC_VERSION=	001222
+LIB_VERSION=	0
+# Adhoc fix. First part.
+# 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
 
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 MOC?=		${X11BASE}/bin/moc2
+DIFF?=		/usr/bin/diff
+
+.include <bsd.port.pre.mk>
 
 post-extract:
 	@${LOCALBASE}/bin/unzip ${DISTDIR}/binaries-${CODEC_VERSION}.zip \
 		-d ${WRKDIR}/codecs
+	@${GZCAT} ${DISTDIR}/wmvds32.ax.gz > ${WRKDIR}/codecs/wmvds32.ax
+
+# Libtool fix code kindly provided by Mr. Maxim Sobolev <sobomax@FreeBSD.org>
+post-configure:
+	@${PERL} -pi -e \
+		's|^deplibs_check_method=.*|deplibs_check_method=pass_all|' \
+			${WRKSRC}/libtool
 
-#post-build:
-#	(cd ${WRKSRC}/samples && ${SETENV} ${MAKE_ENV} ${GMAKE})
+post-build:
+.for dir in ${EXTRA_BUILD_DIR}
+	(cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE})
+.endfor
 
 post-install:
 	@${MKDIR} ${PREFIX}/lib/win32
 	@${INSTALL_DATA} ${WRKDIR}/codecs/* ${PREFIX}/lib/win32
 	@/usr/bin/fmt < ${PKGMESSAGE}
+	@${INSTALL_DATA} ${WRKSRC}/lib/libaviplay.la ${PREFIX}/lib
+	@${LN} -sf libaviplay.so.${LIB_VERSION} ${PREFIX}/lib/libaviplay.so
+# Adhoc fix. Second part.
+# Install the missed applications.
+.if exists(${PREFIX}/bin/aviplay)
+	${DIFF} ${WRKSRC}/player/.libs/aviplay ${PREFIX}/bin > /dev/null || \
+			${INSTALL_PROGRAM} ${WRKSRC}/player/.libs/aviplay \
+				${PREFIX}/bin
+.else
+	${INSTALL_PROGRAM} ${WRKSRC}/player/.libs/aviplay ${PREFIX}/bin
+.endif
+.if exists(${PREFIX}/bin/benchmark)
+	${DIFF} ${WRKSRC}/samples/benchmark/.libs/benchmark \
+		${PREFIX}/bin > /dev/null || \
+			${INSTALL_PROGRAM} \
+				${WRKSRC}/samples/benchmark/.libs/benchmark \
+					${PREFIX}/bin
+.else
+	${INSTALL_PROGRAM} ${WRKSRC}/samples/benchmark/.libs/benchmark \
+		${PREFIX}/bin
+.endif
+.if exists(${PREFIX}/bin/qtrecompress)
+	${DIFF} ${WRKSRC}/samples/qtrecompress/.libs/qtrecompress \
+		${PREFIX}/bin > /dev/null || \
+			${INSTALL_PROGRAM} ${WRKSRC}/samples/qtrecompress/.libs/qtrecompress ${PREFIX}/bin
+.else
+	${INSTALL_PROGRAM} ${WRKSRC}/samples/qtrecompress/.libs/qtrecompress \
+		${PREFIX}/bin
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/multimedia/win32-codecs/distinfo b/multimedia/win32-codecs/distinfo
index 1a091bfbe397..142b396d4b14 100644
--- a/multimedia/win32-codecs/distinfo
+++ b/multimedia/win32-codecs/distinfo
@@ -1,2 +1,3 @@
-MD5 (avifile-0.50.tar.gz) = 9c32bd25575de032ce4a4fae5bf596e2
-MD5 (binaries-000918.zip) = 2b59bf068c7508ad071fa9aca58cd1e7
+MD5 (avifile-0.53.1.tar.gz) = c74597c7b9e987dbcd0317ed26572e7b
+MD5 (binaries-001222.zip) = f8517cf28e33fb09e3f5da58ddcbf78d
+MD5 (wmvds32.ax.gz) = 886493bf1d0fa9ea088755c3fbddcfd7
diff --git a/multimedia/win32-codecs/files/patch-ab b/multimedia/win32-codecs/files/patch-ab
index 6079eb3293b3..5b0f59a9bd72 100644
--- a/multimedia/win32-codecs/files/patch-ab
+++ b/multimedia/win32-codecs/files/patch-ab
@@ -1,11 +1,23 @@
---- xmps-avi-plugin/Makefile.in.orig	Fri Oct  6 13:05:55 2000
-+++ xmps-avi-plugin/Makefile.in	Fri Oct  6 13:06:22 2000
-@@ -1,6 +1,6 @@
--LIBS = -lstdc++ -L../lib -L@libdir@ -laviplay -lpthread @XMPS_LIBS@ 
-+LIBS = -lstdc++ -L../lib -L@libdir@ -laviplay -lpthread @XMPS_LIBS@ @SDL_LIBS@
+--- 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    	
+ }
  
--INCLUDES = -I. -I../include -I@includedir@/avifile @XMPS_CFLAGS@ 
-+INCLUDES = -I. -I../include -I@includedir@/avifile @XMPS_CFLAGS@ @SDL_CFLAGS@
- 
- all: avi_configure.o avi_codec.o
- 	 $(CC) -shared avi_configure.o avi_codec.o $(LIBS) -o libavi.so
+ long WINAPI expQueryPerformanceFrequency(long long* z)
diff --git a/multimedia/win32-codecs/files/patch-ad b/multimedia/win32-codecs/files/patch-ad
deleted file mode 100644
index 03103c655807..000000000000
--- a/multimedia/win32-codecs/files/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.in.orig	Tue Oct  3 08:19:35 2000
-+++ Makefile.in	Fri Oct  6 13:36:01 2000
-@@ -66,17 +66,14 @@
- 	$(INSTALL_PROGRAM) -m0755 ./avifile-config $(bindir)
- 
- install:
--	-$(INSTALL_PROGRAM) -d $(datadir)
- 	-$(INSTALL_PROGRAM) -d $(includedir)/avifile/wine
- 	-$(INSTALL_PROGRAM) -d $(datadir)/avifile
--	-$(INSTALL_PROGRAM) -d $(libdir)
--	-$(INSTALL_PROGRAM) -d $(bindir)
- 	-$(INSTALL_PROGRAM) ./lib/libaviplay.so $(libdir)
- 	-$(INSTALL_PROGRAM) ./include/*.h $(includedir)/avifile
- 	-$(INSTALL_PROGRAM) ./include/wine/*.h $(includedir)/avifile/wine
- ifeq (@USE_QT@,1)	
--	-$(INSTALL_PROGRAM) ./bin/aviplay $(bindir)
--	-$(INSTALL_PROGRAM) ./bin/benchmark $(bindir)
-+	-$(INSTALL_PROGRAM) -s ./bin/aviplay $(bindir)
-+	-$(INSTALL_PROGRAM) -s ./bin/benchmark $(bindir)
- 	-$(INSTALL_PROGRAM) ./bin/*.ppm $(datadir)/avifile
- 	-$(INSTALL_PROGRAM) ./bin/*.png $(datadir)/avifile
- ifeq (@USE_VIDCAP@,1)
diff --git a/multimedia/win32-codecs/files/patch-ae b/multimedia/win32-codecs/files/patch-ae
index a981756b0a99..38258f8a1512 100644
--- a/multimedia/win32-codecs/files/patch-ae
+++ b/multimedia/win32-codecs/files/patch-ae
@@ -1,24 +1,19 @@
---- aclocal.m4.orig	Thu Oct 19 22:48:29 2000
-+++ aclocal.m4	Thu Oct 19 22:49:17 2000
-@@ -552,8 +552,8 @@
-  LDFLAGS="-L$qt_libdir $X_LDFLAGS"
+--- 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=-lqt
+   ac_QT_NAME=$DEFAULTQTLIB
 -  AC_CHECK_LIB(qt-mt, main,ac_QT_NAME=-lqt-mt)
-+  ac_QT_NAME=-lqt2
 +dnl  AC_CHECK_LIB(qt-mt, main,ac_QT_NAME=-lqt-mt)
   fi;
   LIBS="$LIBS $ac_QT_NAME -lXext -lX11 $LIBSOCKET"
  
-@@ -592,8 +592,8 @@
-  ])
+@@ -609,7 +609,7 @@
  else
    have_qt="yes"
--  ac_QT_NAME=-lqt
+   ac_QT_NAME=$DEFAULTQTLIB
 -  AC_CHECK_LIB(qt-mt, main,ac_QT_NAME=-lqt-mt)
-+  ac_QT_NAME=-lqt2
 +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/win32-codecs/pkg-comment b/multimedia/win32-codecs/pkg-comment
index ab338ddd7a65..6fb763deeba8 100644
--- a/multimedia/win32-codecs/pkg-comment
+++ b/multimedia/win32-codecs/pkg-comment
@@ -1 +1 @@
-An MPEG-4 (DivX) video player
+AVI player/converter with numerous codecs, including MPEG-4(DivX)
diff --git a/multimedia/win32-codecs/pkg-descr b/multimedia/win32-codecs/pkg-descr
index 3f99d86fc878..c299fbfa83c0 100644
--- a/multimedia/win32-codecs/pkg-descr
+++ b/multimedia/win32-codecs/pkg-descr
@@ -1,5 +1,22 @@
-An MPEG-4 (aka DivX) player built around the Windows binaries,
-but does not need Wine.
-There is also a xmps plugin you can build (manually).
+An AVI player and converter built around the 
+Windows binary codecs.
+Does not use Wine. It supports the following codecs:
+
+Video:
+  ATI VCR-2
+  Cinepak(R)
+  DivX ;-)
+  Indeo(R) Video 3.2, 4.1, 5.0
+  Intel v.263
+  Microsoft MPEG-4
+  Microsoft Windows Media Video 7 (ASF)
+Audio:
+  DivX ;-) Audio aka Windows Media Audio
+  Microsoft GSM 6.10
+  IMA ADPCM
+  IMC (Intel Media Coder )
+  MSN Audio
+  MPEG Layer-1,2,3 Audio
+  PCM
 
 WWW: http://divx.euro.ru/
diff --git a/multimedia/win32-codecs/pkg-message b/multimedia/win32-codecs/pkg-message
index 3dc3ad21d434..7f8dce2d55a1 100644
--- a/multimedia/win32-codecs/pkg-message
+++ b/multimedia/win32-codecs/pkg-message
@@ -3,9 +3,20 @@
 This port requires a kernel built with
 the directive:
 
-options USER_LDT
+options USE_LDT
 
 Please, check the FreeBSD Handbook for instructions
 on building a custom kernel. If you do not know
 where to find it, check the FreeBSD website
 http://www.freebsd.org/
+
+Also, if the port finished building but
+did not install the aviplay program. You
+should consider installing the very
+latest qt library supporting threads.
+Version 2.2.3 and over should be
+enough. Then, try rebuilding the avifile
+port.
+
+Please, check the FreeBSD Handbook on
+updating your port tree if you need to.
diff --git a/multimedia/win32-codecs/pkg-plist b/multimedia/win32-codecs/pkg-plist
index 6c8accd33013..11afe6dff486 100644
--- a/multimedia/win32-codecs/pkg-plist
+++ b/multimedia/win32-codecs/pkg-plist
@@ -4,12 +4,15 @@ 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/default.h
 include/avifile/except.h
 include/avifile/image.h
+include/avifile/infotypes.h
 include/avifile/loader.h
 include/avifile/registry.h
+include/avifile/version.h
 include/avifile/videodecoder.h
 include/avifile/videoencoder.h
 include/avifile/wine/basetsd.h
@@ -53,17 +56,24 @@ share/avifile/about.ppm
 share/avifile/test.png
 @dirrm share/avifile
 lib/win32/ativcr2.dll
+lib/win32/divx_c32.ax
 lib/win32/divxa32.acm
 lib/win32/divxc32.dll
 lib/win32/divxc32f.dll
 lib/win32/i263_32.drv
 lib/win32/iccvid.dll
+lib/win32/imc32.acm
 lib/win32/ir32_32.dll
 lib/win32/ir41_32.dll
 lib/win32/ir41_qc.dll
 lib/win32/ir50_32.dll
 lib/win32/ir50_qc.dll
+lib/win32/ir50_qcx.dll
 lib/win32/m3jpeg32.dll
 lib/win32/mpg4c32.dll
+lib/win32/msadp32.acm
+lib/win32/wmvds32.ax
 @dirrm lib/win32
+lib/libaviplay.la
 lib/libaviplay.so
+lib/libaviplay.so.%%LIB_VERSION%%