6 files changed, 41 insertions, 25 deletions

diff --git a/multimedia/libdivxdecore-devel/Makefile b/multimedia/libdivxdecore-devel/Makefile
index 47221f8a47be..88bed1b19820 100644
--- a/multimedia/libdivxdecore-devel/Makefile
+++ b/multimedia/libdivxdecore-devel/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	libdivxdecore
+# New ports collection makefile for:	libdivxdecore developer version
 # Date created:		03 Feb 20001
 # Whom:			Mario S F Ferreira <lioux@FreeBSD.org>
 #
@@ -6,12 +6,20 @@
 #
 
 PORTNAME=	libdivxdecore
-PORTVERSION=	0.4.7
+PORTVERSION=	0.4.0.48
 CATEGORIES=	graphics
-MASTER_SITES=	http://download.projectmayo.com/dnload/divx4linux/xmps/
+MASTER_SITES=	http://download.projectmayo.com/dnload/divxcore/
+PKGNAMESUFFIX=	-devel
+DISTNAME=	decore48src
 
 MAINTAINER=	lioux@FreeBSD.org
 
+BUILD_DEPENDS=	${NONEXISTENT}:${LIBDIVXDECORE_PORT}:patch
+
+WRKSRC=		${WRKDIR}/${LIBDIVXDECORE_PORT_WRKSRC:C/.+\///}
+
+USE_ZIP=	yes
+EXTRACT_BEFORE_ARGS=	-a
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
@@ -20,7 +28,24 @@ PLIST_SUB=	LIB_VERSION="${LIB_VERSION}"
 
 LIB_VERSION=	0
 
+post-extract:
+	@${CP} -Rp ${LIBDIVXDECORE_PORT_WRKSRC} ${WRKDIR}
+	@${MV} ${WRKSRC}/src ${WRKSRC}/src.old
+	@${MV} ${WRKDIR}/decore/src ${WRKSRC}/src
+	@${CP} ${WRKSRC}/src.old/Makefile.* ${WRKSRC}/src
+
 post-install:
 	@${LN} -sf ${PORTNAME}.so ${PREFIX}/lib/${PORTNAME}.so.${LIB_VERSION}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+#LIBDIVXDECORE_PORT=	${PORTSDIR}/graphics/libdivxdecore
+LIBDIVXDECORE_PORT=	${.CURDIR}/../libdivxdecore
+LIBDIVXDECORE_PORT_WRKSRC!=	cd ${LIBDIVXDECORE_PORT} && ${MAKE} -V WRKSRC
+
+# We will inherit most of the comment files from the non-devel
+# version
+PLIST=	${LIBDIVXDECORE_PORT}/pkg-plist
+DESCR=	${LIBDIVXDECORE_PORT}/pkg-descr
+
+.include <bsd.port.post.mk>
diff --git a/multimedia/libdivxdecore-devel/distinfo b/multimedia/libdivxdecore-devel/distinfo
index 0d73e81cc629..345c0e732974 100644
--- a/multimedia/libdivxdecore-devel/distinfo
+++ b/multimedia/libdivxdecore-devel/distinfo
@@ -1 +1 @@
-MD5 (libdivxdecore-0.4.7.tar.gz) = 0defab7d519308aacfb1a0c1448341a1
+MD5 (decore48src.zip) = fa9b964823c5e14a0907c62a2d791ef7
diff --git a/multimedia/libdivxdecore-devel/files/patch-src::Makefile.am b/multimedia/libdivxdecore-devel/files/patch-src::Makefile.am
new file mode 100644
index 000000000000..9954a7105773
--- /dev/null
+++ b/multimedia/libdivxdecore-devel/files/patch-src::Makefile.am
@@ -0,0 +1,10 @@
+--- src/Makefile.am.orig	Fri Mar  9 23:38:01 2001
++++ src/Makefile.am	Fri Mar  9 23:38:08 2001
+@@ -30,6 +30,7 @@
+ postprocess.h \
+ transferIDCT.c \
+ transferIDCT.h \
++yuv2rgb.c \
+ yuv2rgb.h
+ 
+ libdivxdecoreincludedir = $(includedir)/divx
diff --git a/multimedia/libdivxdecore-devel/pkg-comment b/multimedia/libdivxdecore-devel/pkg-comment
index 2c7efb2d62fe..ce27621921a5 100644
--- a/multimedia/libdivxdecore-devel/pkg-comment
+++ b/multimedia/libdivxdecore-devel/pkg-comment
@@ -1 +1 @@
-OpenDivX decoding engine from Project Mayo
+OpenDivX decoding engine from Project Mayo (development version)
diff --git a/multimedia/libdivxdecore-devel/pkg-descr b/multimedia/libdivxdecore-devel/pkg-descr
deleted file mode 100644
index 9cf1a226d7d2..000000000000
--- a/multimedia/libdivxdecore-devel/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-Decore [excerpt from OpenDivX Project Mayo site]
-
-"Decore" is our decoder core - that part of the codec that decodes
-video from DivX video bitstream into uncompressed RGB bitmaps. Its
-API is defined in decore.h. The API is another frame-in, frame-out
-scheme, you give it a chunk of OpenDivX bitstream and it comes back
-to you with an uncompressed RGB frame. Like "encore", "decore" is
-truly independent of any other code, making no system calls.
-
-"Decore" is a decoder compliant with MPEG-4 natural video, simple
-profile. It also incorporates a video postprocessor which postprocessor,
-which hides many of the artifacts inherent in low bit-rate video.
-
-
-WWW: http://www.projectmayo.com/linux/divx4linux/
diff --git a/multimedia/libdivxdecore-devel/pkg-plist b/multimedia/libdivxdecore-devel/pkg-plist
deleted file mode 100644
index 344069f1cbb2..000000000000
--- a/multimedia/libdivxdecore-devel/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-include/divx/decore.h
-lib/libdivxdecore.so
-lib/libdivxdecore.so.%%LIB_VERSION%%
-@dirrm include/divx