Update xvid to latest release and chase library dependencies in ports

that depend on it.

Approved by:	arved (Mentor)

9 files changed, 23 insertions, 13 deletions

diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index 575df38ab462..0dd6a5cc22b0 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -39,12 +39,12 @@ USE_GMAKE=	yes
 WITH_A52=	yes
 .endif
 
-.if exists(${LOCALBASE}/lib/libxvidcore.so.0)
+.if exists(${LOCALBASE}/lib/libxvidcore.so.2)
 WITH_XVID=	yes
 .endif
 
 .if defined(WITH_XVID)
-LIB_DEPENDS+=	xvidcore.0:${PORTSDIR}/multimedia/xvid
+LIB_DEPENDS+=	xvidcore.2:${PORTSDIR}/multimedia/xvid
 CONFIGURE_ARGS+=	--with-xvid-as-decoder
 .endif
 
diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index 7565625b12b0..c3df7ceaf6f6 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -154,7 +154,7 @@ PLIST_SUB+=	VORBIS="@comment "
 
 # xvid
 .if !defined(WITHOUT_XVID)
-LIB_DEPENDS+=	xvidcore.0:${PORTSDIR}/multimedia/xvid
+LIB_DEPENDS+=	xvidcore.2:${PORTSDIR}/multimedia/xvid
 
 CONFIGURE_ARGS+=	--with-xvid-prefix=${LOCALBASE}
 PLIST_SUB+=	XVID=""
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 3525ebdfaff7..d0f225401d05 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -421,7 +421,7 @@ BUILD_DEPENDS+=		${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/live
 .if defined(WITH_XVID)
 CONFIGURE_ARGS+=	--enable-xvid \
 			--with-xvidcore=${LOCALBASE}/lib/libxvidcore.so
-LIB_DEPENDS+=		xvidcore.0:${PORTSDIR}/multimedia/xvid
+LIB_DEPENDS+=		xvidcore.2:${PORTSDIR}/multimedia/xvid
 .endif
 
 .if defined(WITH_LZO)
diff --git a/multimedia/mplayerxp/Makefile b/multimedia/mplayerxp/Makefile
index c44858c142ff..656bbb1c7fbd 100644
--- a/multimedia/mplayerxp/Makefile
+++ b/multimedia/mplayerxp/Makefile
@@ -155,7 +155,7 @@ CONFIGURE_ARGS+=	--disable-sdl-image
 .endif
 # xvid
 .ifdef(WITH_XVID)
-LIB_DEPENDS+=	xvidcore.0:${PORTSDIR}/multimedia/xvid
+LIB_DEPENDS+=	xvidcore.2:${PORTSDIR}/multimedia/xvid
 
 CONFIGURE_ARGS+=	--enable-xvid \
 			--with-xvidcore=${LOCALBASE}
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 3657c9287a05..423a91831efa 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -175,7 +175,7 @@ PLIST_SUB+=	WITH_FAME="@comment "
 .endif
 
 .if defined(WITH_XVID)
-LIB_DEPENDS+=	xvidcore.0:${PORTSDIR}/multimedia/xvid
+LIB_DEPENDS+=	xvidcore.2:${PORTSDIR}/multimedia/xvid
 PLIST_SUB+=	WITH_XVID=""
 WITH_NASM=	YES
 .else
diff --git a/multimedia/xvid/Makefile b/multimedia/xvid/Makefile
index 2011fb1c8e23..6c6cf2322066 100644
--- a/multimedia/xvid/Makefile
+++ b/multimedia/xvid/Makefile
@@ -6,24 +6,23 @@
 #
 
 PORTNAME=	xvid
-PORTVERSION=	0.9.1
+PORTVERSION=	0.9.2
 PORTEPOCH=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://files.xvid.org/downloads/
 DISTNAME=	${PORTNAME}core-${PORTVERSION}
 
-MAINTAINER=	michaelnottebrock@gmx.net
+MAINTAINER=	lofi@freebsd.org
 COMMENT=	An opensource MPEG-4 codec, based on OpenDivx
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/nasm:${PORTSDIR}/devel/nasm
 
-HAS_CONFIGURE=	yes
-USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/build/generic
 
 post-install:
-	@ ${LN} -sf libxvidcore.so ${PREFIX}/lib/libxvidcore.so.0
+	@ ${LN} -sf ${PREFIX}/lib/libxvidcore.so.2 ${PREFIX}/lib/libxvidcore.so
 
 .include <bsd.port.mk>
diff --git a/multimedia/xvid/distinfo b/multimedia/xvid/distinfo
index a721732f2e5b..0ef96681d0a3 100644
--- a/multimedia/xvid/distinfo
+++ b/multimedia/xvid/distinfo
@@ -1 +1 @@
-MD5 (xvidcore-0.9.1.tar.gz) = d4b4cb185f074082e17b36c24b277276
+MD5 (xvidcore-0.9.2.tar.gz) = acccd38c78e155d5fc2337696913feac
diff --git a/multimedia/xvid/files/patch-configure b/multimedia/xvid/files/patch-configure
new file mode 100644
index 000000000000..a9edc2f516e0
--- /dev/null
+++ b/multimedia/xvid/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Mon Aug 11 17:59:21 2003
++++ configure	Mon Aug 11 17:59:37 2003
+@@ -3660,7 +3660,7 @@
+ 	echo "$as_me:$LINENO: result: -Wl,-soname,libxvidcore.so -shared -lc -lm" >&5
+ echo "${ECHO_T}-Wl,-soname,libxvidcore.so -shared -lc -lm" >&6
+ 	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
+-	SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)"
++	SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR)"
+ 	SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -lc -lm"
+ 	SPECIFIC_CFLAGS="-fPIC"
+ 	;;
diff --git a/multimedia/xvid/pkg-plist b/multimedia/xvid/pkg-plist
index bf69962c0f95..cebfd72e2dfc 100644
--- a/multimedia/xvid/pkg-plist
+++ b/multimedia/xvid/pkg-plist
@@ -1,4 +1,4 @@
 include/xvid.h
 lib/libxvidcore.a
 lib/libxvidcore.so
-lib/libxvidcore.so.0
+lib/libxvidcore.so.2