Finish repocopy from graphics to multimedia.

Update to alpha4, based on [1]

PR:		75961 [1]
Submitted by:	Stefan Walter sw AT gegenunendlich dot de
Repocopyed by:	marcus

11 files changed, 25 insertions, 102 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 027ae935bec3..83e921b462ce 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -268,7 +268,6 @@
     SUBDIR += librsvg2
     SUBDIR += libsvg
     SUBDIR += libsvg-cairo
-    SUBDIR += libtheora
     SUBDIR += libungif
     SUBDIR += libv3d
     SUBDIR += libvisual
diff --git a/graphics/libtheora/Makefile b/graphics/libtheora/Makefile
deleted file mode 100644
index 4cbd3bb98a7c..000000000000
--- a/graphics/libtheora/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# New ports collection makefile for:	theora
-# Date created:				09 februari 2003
-# Whom:					Koop Mast <kwm@rainbow-runner.nl>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libtheora
-PORTVERSION=	1.0.a3
-CATEGORIES=	graphics
-MASTER_SITES=	http://www.theora.org/files/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.a3/alpha3/}
-
-MAINTAINER=	kwm@FreeBSD.org
-COMMENT=	Theora video codec for the Ogg multimedia streaming system
-
-LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis
-
-WRKSRC=		${WRKDIR}/${DISTNAME}
-
-USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
-INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include " \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		LIBS="${PTHEAD_LIBS}"
-CONFIGURE_ARGS=	--disable-sdltest \
-		--enable-shared
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|sdl-config|sdl11-config|g; \
-		s|-O2||g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|SDL/SDL.h|SDL11/SDL.h|g; \
-		s|machine/soundcard.h|sys/soundcard.h|g' \
-		${WRKSRC}/examples/player_example.c
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/examples/Makefile.in
-
-do-install:
-	for i in ${WRKSRC}/lib/.libs/libtheora.so.0		\
-			${WRKSRC}/lib/.libs/libtheora.so	\
-			${WRKSRC}/lib/.libs/libtheora.a ; do	\
-		${INSTALL_DATA} $$i ${PREFIX}/lib ;		\
-	done
-	@${MKDIR} ${PREFIX}/include/theora
-	@${INSTALL_DATA} ${WRKSRC}/include/theora/theora.h	\
-		${PREFIX}/include/theora/
-
-.include <bsd.port.mk>
diff --git a/graphics/libtheora/distinfo b/graphics/libtheora/distinfo
deleted file mode 100644
index 3f966da0822a..000000000000
--- a/graphics/libtheora/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (libtheora-1.0alpha3.tar.gz) = eab566a0c7fdc21da1ce503edfa43bb4
-SIZE (libtheora-1.0alpha3.tar.gz) = 1015002
diff --git a/graphics/libtheora/files/patch-Makefile.in b/graphics/libtheora/files/patch-Makefile.in
deleted file mode 100644
index ad71736b4e26..000000000000
--- a/graphics/libtheora/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sat Mar 20 06:43:22 2004
-+++ Makefile.in	Tue Mar 23 00:28:57 2004
-@@ -148,7 +148,7 @@
- 
- AUTOMAKE_OPTIONS = foreign dist-zip
- 
--SUBDIRS = lib include doc examples debian
-+SUBDIRS = lib include doc debian
- 
- EXTRA_DIST = COPYING autogen.sh win32
- subdir = .
diff --git a/graphics/libtheora/pkg-descr b/graphics/libtheora/pkg-descr
deleted file mode 100644
index 6370a23db61d..000000000000
--- a/graphics/libtheora/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Theora is Xiph.Org's video codec, intended for use within the Ogg
-project's Ogg multimedia streaming system. Theora is derived
-directly from On2's VP3 codec.
-
-This is alpha testing software; the API will probably change.
-
-WWW: http://www.theora.org
diff --git a/graphics/libtheora/pkg-plist b/graphics/libtheora/pkg-plist
deleted file mode 100644
index aeaca0944fe0..000000000000
--- a/graphics/libtheora/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-include/theora/theora.h
-lib/libtheora.a
-lib/libtheora.so
-lib/libtheora.so.0
-@dirrm include/theora
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 565de5513149..5a1cf0f79f11 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -70,6 +70,7 @@
     SUBDIR += libmovtar
     SUBDIR += libmpeg2
     SUBDIR += libquicktime
+    SUBDIR += libtheora
     SUBDIR += libxine
     SUBDIR += linux-divx4linux
     SUBDIR += linux-divx4linux4
diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile
index 4cbd3bb98a7c..f57a44c49327 100644
--- a/multimedia/libtheora/Makefile
+++ b/multimedia/libtheora/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libtheora
-PORTVERSION=	1.0.a3
+PORTVERSION=	1.0.a4
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.theora.org/files/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.a3/alpha3/}
+MASTER_SITES=	http://downloads.xiph.org/releases/theora/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.a4/alpha4/}
 
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Theora video codec for the Ogg multimedia streaming system
@@ -19,7 +19,8 @@ LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=13
+USE_BZIP2=	yes
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include " \
@@ -36,15 +37,6 @@ post-patch:
 		${WRKSRC}/examples/player_example.c
 	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/examples/Makefile.in
-
-do-install:
-	for i in ${WRKSRC}/lib/.libs/libtheora.so.0		\
-			${WRKSRC}/lib/.libs/libtheora.so	\
-			${WRKSRC}/lib/.libs/libtheora.a ; do	\
-		${INSTALL_DATA} $$i ${PREFIX}/lib ;		\
-	done
-	@${MKDIR} ${PREFIX}/include/theora
-	@${INSTALL_DATA} ${WRKSRC}/include/theora/theora.h	\
-		${PREFIX}/include/theora/
+	@${REINPLACE_CMD} -e 's|doc||g' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/multimedia/libtheora/distinfo b/multimedia/libtheora/distinfo
index 3f966da0822a..3d3f1cbd509d 100644
--- a/multimedia/libtheora/distinfo
+++ b/multimedia/libtheora/distinfo
@@ -1,2 +1,2 @@
-MD5 (libtheora-1.0alpha3.tar.gz) = eab566a0c7fdc21da1ce503edfa43bb4
-SIZE (libtheora-1.0alpha3.tar.gz) = 1015002
+MD5 (libtheora-1.0alpha4.tar.bz2) = a71ac42ec0f848da327930841a80ff2b
+SIZE (libtheora-1.0alpha4.tar.bz2) = 1755132
diff --git a/multimedia/libtheora/files/patch-Makefile.in b/multimedia/libtheora/files/patch-Makefile.in
index ad71736b4e26..529fdae393a1 100644
--- a/multimedia/libtheora/files/patch-Makefile.in
+++ b/multimedia/libtheora/files/patch-Makefile.in
@@ -1,11 +1,16 @@
---- Makefile.in.orig	Sat Mar 20 06:43:22 2004
-+++ Makefile.in	Tue Mar 23 00:28:57 2004
-@@ -148,7 +148,7 @@
- 
- AUTOMAKE_OPTIONS = foreign dist-zip
- 
+--- Makefile.in.orig	Wed Dec 15 21:06:17 2004
++++ Makefile.in	Thu Jan 13 18:51:47 2005
+@@ -206,11 +206,11 @@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2
 -SUBDIRS = lib include doc examples debian
-+SUBDIRS = lib include doc debian
++SUBDIRS = lib include debian
+ EXTRA_DIST = COPYING autogen.sh win32 libtheora.spec libtheora.spec.in \
+ 	theora-uninstalled.pc.in
  
- EXTRA_DIST = COPYING autogen.sh win32
- subdir = .
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = theora.pc
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/multimedia/libtheora/pkg-plist b/multimedia/libtheora/pkg-plist
index aeaca0944fe0..25c26cc6f0c6 100644
--- a/multimedia/libtheora/pkg-plist
+++ b/multimedia/libtheora/pkg-plist
@@ -1,5 +1,6 @@
 include/theora/theora.h
 lib/libtheora.a
 lib/libtheora.so
-lib/libtheora.so.0
+lib/libtheora.so.1
+libdata/pkgconfig/theora.pc
 @dirrm include/theora