- Changes so it should run on Alpha

- Add Option WITHOUT_DIVX, cause libdivx* do not build
- configure with "--enable-iconv"
- Fix overwriting of LIB_DEPENDS when WITHOUT_VORBIS was not defined
- Changed dependency so installed sdl12 is found.

PR:		34075
Submitted by:	holger@eit.uni-kl.de

3 files changed, 37 insertions, 11 deletions

diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index 4b802db0ebb5..e8311d3e7991 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	avifile
 PORTVERSION=	0.6.0.20011220
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://avifile.sourceforge.net/ \
@@ -17,7 +18,10 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	holger@eit.uni-kl.de
 
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
-LIB_DEPENDS=	SDL-1.1.3:${PORTSDIR}/devel/sdl12
+.if !defined(WITHOUT_DIVX)
+LIB_DEPENDS+=	divxdecore.1:${PORTSDIR}/graphics/libdivxdecore-devel
+LIB_DEPENDS+=	divxencore.0:${PORTSDIR}/graphics/libdivxencore
+.endif
 
 USE_QT_VER=	2
 USE_XLIB=	yes
@@ -30,7 +34,7 @@ USE_LIBTOOL=	yes
 LIBTOOLFILES=	acinclude.m4
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --with-gnu-ld
+CONFIGURE_ARGS= --with-gnu-ld --enable-iconv
 
 PLIST_SUB=	LIB_VERSION="${LIB_VERSION}" VERSION="${VERSION}"
 
@@ -60,7 +64,7 @@ PLIST_SUB+=	MAD="@comment "
 
 # libvorbis; thus, libogg
 .if !defined(WITHOUT_VORBIS)
-LIB_DEPENDS=	vorbis.1:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis.1:${PORTSDIR}/audio/libvorbis
 
 PLIST_SUB+=	VORBIS=""
 .else
@@ -77,6 +81,9 @@ pre-everything::
 .if !defined(WITHOUT_MAD)
 	@${ECHO_MSG} "You can disable mad support by defining WITHOUT_MAD."
 .endif
+.if !defined(WITHOUT_DIVX)
+	@${ECHO_MSG} "You can disable divx support by defining WITHOUT_DIVX."
+.endif
 .if !defined(WITHOUT_VORBIS)
 	@${ECHO_MSG} "You can disable vorbis support by defining WITHOUT_VORBIS."
 .endif
@@ -88,14 +95,12 @@ packet 'pth' is installed.";\
 	  ${FALSE};\
 	fi
 
-post-patch:
-	@${PERL} -pi -e "s|decore.h|divx/decore.h|; \
-		s|encore2.h|divx/encore.h|" ${WRKSRC}/plugins/libdivx4/*
-
 pre-configure:
 	@${PERL} -pi -e "s|-lqt|-lqt2|g;s|qt-mt|qt2-mt|g;\
-		s|^(PACKAGE=avifile).*|\1|" \
-		${WRKSRC}/configure
+		s|^(PACKAGE=avifile).*|\1|;s|<decore.h>|<divx/decore.h>|; \
+		s|<encore2.h>|<divx/encore.h>|" ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e \
+		"s|decore.h|divx/decore.h|; s|encore2.h|divx/encore.h|"
 	@${PERL} -pi -e "s|-ljpeg|-L${LOCALBASE}/lib -ljpeg|g" \
 		${WRKSRC}/samples/mjpeg_plugin/Makefile.in
 	@${FIND} ${WRKSRC} \( -name Makefile.in -o -name configure \) | \
@@ -123,6 +128,7 @@ post-install:
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
+LIB_DEPENDS+=	SDL-1.1:${PORTSDIR}/devel/sdl12
 RUN_DEPENDS+=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
 
 CONFIGURE_ARGS+=	--enable-x86opt --with-win32-path=${LOCALBASE}/lib/win32
diff --git a/multimedia/avifile/files/patch-libvideorenderer.cpp b/multimedia/avifile/files/patch-libvideorenderer.cpp
new file mode 100644
index 000000000000..d7d335fb535b
--- /dev/null
+++ b/multimedia/avifile/files/patch-libvideorenderer.cpp
@@ -0,0 +1,20 @@
+--- lib/video/renderer.cpp.orig	Sat Jan 19 18:52:21 2002
++++ lib/video/renderer.cpp	Sat Jan 19 18:53:21 2002
+@@ -1166,7 +1166,7 @@
+ 		    cout<<"iconv open error"<<endl;
+ 		}
+ 		else {
+-		    sts = iconv(icvsts, (char **)&sub,&in_size,
++		    sts = iconv(icvsts, (const char **)&sub,&in_size,
+ 					(char **)&out_p,&out_size);
+ 		    if (sts == (uint_t)(-1)) {
+ 			cout <<"iconv convert error"<<endl;
+@@ -1214,7 +1214,7 @@
+ 		        cout<<"iconv open error"<<endl;
+ 		    }
+ 		    else {
+-		        sts = iconv(icvsts, (char **)&sub,&in_size,
++		        sts = iconv(icvsts, (const char **)&sub,&in_size,
+ 					(char **)&out_p,&out_size);
+ 		        if (sts == (uint_t)(-1)) {
+ 			    cout <<"iconv convert error"<<endl;
diff --git a/multimedia/avifile/pkg-plist b/multimedia/avifile/pkg-plist
index 6ce73dbf4c2e..4c1ff3dc05f4 100644
--- a/multimedia/avifile/pkg-plist
+++ b/multimedia/avifile/pkg-plist
@@ -46,8 +46,8 @@ lib/avifile/libaudiodec.so
 %%MAD%%lib/avifile/libmad_audiodec.so
 lib/avifile/libmjpeg.la
 lib/avifile/libmjpeg.so
-lib/avifile/libmp3lamebin_audioenc.la
-lib/avifile/libmp3lamebin_audioenc.so
+lib/avifile/libmp3lame_audioenc.la
+lib/avifile/libmp3lame_audioenc.so
 lib/avifile/libmpeg_audiodec.la
 lib/avifile/libmpeg_audiodec.so
 %%VORBIS%%lib/avifile/libvorbis_audio.la