From 68ed2821231802dec28f2f1eae396beb14d6d28a Mon Sep 17 00:00:00 2001
From: jakemsr <jakemsr@openbsd.org>
Date: Fri, 30 Dec 2005 05:35:56 +0000
Subject: [PATCH] SHARED_LIBS USE_LIBTOOL fix LIB_DEPENDS (doesn't use vorbis
 at all, but does use Ogg headers) SEPARATE_BUILD=concurrent bump PKGNAME

SHARED_LIBS and USE_LIBTOOL ok steven@, rest ok jolan@
---
 multimedia/libtheora/Makefile                | 14 ++++++---
 multimedia/libtheora/patches/patch-configure | 33 ++++++--------------
 multimedia/libtheora/pkg/PFRAG.shared        |  4 +--
 3 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile
index 11143fa688a..fa509429e16 100644
--- a/multimedia/libtheora/Makefile
+++ b/multimedia/libtheora/Makefile
@@ -1,8 +1,12 @@
-# $OpenBSD: Makefile,v 1.2 2005/07/09 04:19:30 jolan Exp $
+# $OpenBSD: Makefile,v 1.3 2005/12/30 05:35:56 jakemsr Exp $
 
 COMMENT=	"open video codec"
 DISTNAME=	libtheora-1.0alpha4
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	multimedia
+SHARED_LIBS=		theora	1.0
+MODGNU_SHARED_LIBS=	theora	''
+
 MASTER_SITES=	http://downloads.xiph.org/releases/theora/
 
 HOMEPAGE=	http://www.theora.org/
@@ -16,11 +20,11 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 BUILD_DEPENDS=	:pkgconfig-*:devel/pkgconfig
+# uses Ogg headers
+LIB_DEPENDS=	ogg.5::audio/libogg
 
-LIB_DEPENDS=	vorbis.4,vorbisenc.2,vorbisfile.4::audio/libvorbis
-
-WANTLIB=	ogg
-
+USE_LIBTOOL=	Yes
+SEPARATE_BUILD=	concurrent
 CONFIGURE_STYLE=gnu
 
 post-install:
diff --git a/multimedia/libtheora/patches/patch-configure b/multimedia/libtheora/patches/patch-configure
index a4f8b529a7c..e06f07fd168 100644
--- a/multimedia/libtheora/patches/patch-configure
+++ b/multimedia/libtheora/patches/patch-configure
@@ -1,30 +1,15 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2005/07/09 00:35:02 jolan Exp $
---- configure.orig	Wed Dec 15 14:06:19 2004
-+++ configure	Fri Jul  8 19:11:17 2005
-@@ -20181,7 +20181,7 @@ rm -f conftest.err conftest.$ac_objext \
- fi
+$OpenBSD: patch-configure,v 1.2 2005/12/30 05:35:56 jakemsr Exp $
+--- configure.orig	Wed Dec 15 12:06:19 2004
++++ configure	Thu Dec 29 20:56:15 2005
+@@ -19863,6 +19863,7 @@ fi
  
+ HAVE_VORBIS=no
  
--
-+if false; then
- # Check whether --with-sdl-prefix or --without-sdl-prefix was given.
- if test "${with_sdl_prefix+set}" = set; then
-   withval="$with_sdl_prefix"
-@@ -20474,11 +20474,11 @@ echo "$as_me: WARNING: *** Unable to fin
++if false ; then
  
- 
-   rm -f conf.sdltest
-+fi
- 
- 
- 
--
--
-+if false; then
- for ac_header in sys/soundcard.h soundcard.h machine/soundcard.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-@@ -20632,7 +20632,7 @@ echo "$as_me: WARNING: OSS audio support
+ if test "x$HAVE_PKG_CONFIG" = "xyes"
+ then
+@@ -20632,7 +20633,7 @@ echo "$as_me: WARNING: OSS audio support
  fi
  
  done
diff --git a/multimedia/libtheora/pkg/PFRAG.shared b/multimedia/libtheora/pkg/PFRAG.shared
index cea430a76a1..0616d7037ba 100644
--- a/multimedia/libtheora/pkg/PFRAG.shared
+++ b/multimedia/libtheora/pkg/PFRAG.shared
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2005/07/09 00:35:02 jolan Exp $
-@lib lib/libtheora.so.1.0
+@comment $OpenBSD: PFRAG.shared,v 1.2 2005/12/30 05:35:56 jakemsr Exp $
+@lib lib/libtheora.so.${LIBtheora_VERSION}