From 55dcdc7c642aaad414ca79b3165ab5dc6bf240d8 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Thu, 20 Sep 2007 22:07:50 +0000
Subject: [PATCH] update libcdaudio to 0.99.12; various small fixes.

ok steven@
---
 audio/libcdaudio/Makefile                       |  7 +++----
 audio/libcdaudio/distinfo                       | 10 +++++-----
 audio/libcdaudio/patches/patch-source_cdindex_c | 12 ------------
 audio/libcdaudio/patches/sup-powerpc            | 14 +++++++-------
 audio/libcdaudio/pkg/PLIST                      |  4 +++-
 5 files changed, 18 insertions(+), 29 deletions(-)
 delete mode 100644 audio/libcdaudio/patches/patch-source_cdindex_c

diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile
index 05fff2e60d9..5d4b99459dc 100644
--- a/audio/libcdaudio/Makefile
+++ b/audio/libcdaudio/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.13 2007/09/15 21:26:01 simon Exp $
+# $OpenBSD: Makefile,v 1.14 2007/09/20 22:07:50 sthen Exp $
 
 COMMENT=	multi-platform cd player development library
-DISTNAME=	libcdaudio-0.99.6
-PKGNAME=	${DISTNAME}p0
-SHARED_LIBS +=	cdaudio              1.0      # .1.0
+DISTNAME=	libcdaudio-0.99.12
+SHARED_LIBS +=	cdaudio              1.1      # .1.0
 CATEGORIES=	audio
 
 HOMEPAGE=	http://libcdaudio.sourceforge.net/
diff --git a/audio/libcdaudio/distinfo b/audio/libcdaudio/distinfo
index 84e3460cb65..daccc7af34d 100644
--- a/audio/libcdaudio/distinfo
+++ b/audio/libcdaudio/distinfo
@@ -1,5 +1,5 @@
-MD5 (libcdaudio-0.99.6.tar.gz) = TI9QQnElSXxRJJ2NdL2Rrw==
-RMD160 (libcdaudio-0.99.6.tar.gz) = 2UKkPsVLCbBMR3EiZhmwxKRTY9c=
-SHA1 (libcdaudio-0.99.6.tar.gz) = p1vYyCBAgdBfCefBE58m6cp8+AE=
-SHA256 (libcdaudio-0.99.6.tar.gz) = 1dGoPiewEd08w3DPB1rNeZsN5NLu4WefoV8bUE67fAU=
-SIZE (libcdaudio-0.99.6.tar.gz) = 262260
+MD5 (libcdaudio-0.99.12.tar.gz) = Y7Sc8U1T7tMeeofMoXo5Yw==
+RMD160 (libcdaudio-0.99.12.tar.gz) = V/dEbbbGXJaOtYqUBGUnGNZRe3Q=
+SHA1 (libcdaudio-0.99.12.tar.gz) = GGLT84djSiFvqoZxZNhAtvVVIpQ=
+SHA256 (libcdaudio-0.99.12.tar.gz) = 63n6ZrPhdCShoWuzVREIrjITG+qdbqDvPRA9EWxQa7w=
+SIZE (libcdaudio-0.99.12.tar.gz) = 357150
diff --git a/audio/libcdaudio/patches/patch-source_cdindex_c b/audio/libcdaudio/patches/patch-source_cdindex_c
deleted file mode 100644
index c2b3229ed6a..00000000000
--- a/audio/libcdaudio/patches/patch-source_cdindex_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-source_cdindex_c,v 1.1 2003/04/14 09:47:46 avsm Exp $
---- source/cdindex.c.orig	Mon Apr 14 10:06:46 2003
-+++ source/cdindex.c	Mon Apr 14 10:07:43 2003
-@@ -878,7 +878,7 @@ cdindex_http_submit(int cd_desc, struct 
-    strncpy(outbuffer, "Content-Type: text/plain\n", 512);
-    write(sock, outbuffer, strlen(outbuffer));
-    
--   snprintf(cdindex_file, 512, "%s/.cdindex/%s",
-+   snprintf(cdindex_file, sizeof cdindex_file, "%s/.cdindex/%s",
- 	    getenv("HOME"), entry.entry_cdindex_id);
-    stat(cdindex_file, &st);
-    
diff --git a/audio/libcdaudio/patches/sup-powerpc b/audio/libcdaudio/patches/sup-powerpc
index fd50f23d18a..3291c2af00d 100644
--- a/audio/libcdaudio/patches/sup-powerpc
+++ b/audio/libcdaudio/patches/sup-powerpc
@@ -1,12 +1,12 @@
---- source/Makefile.in.orig	Sun Mar 24 18:01:45 2002
-+++ source/Makefile.in	Sun Mar 24 18:03:35 2002
-@@ -149,6 +149,9 @@ distclean-libLTLIBRARIES:
- 
- maintainer-clean-libLTLIBRARIES:
+--- src/Makefile.in.orig	Sat Oct  2 18:53:33 2004
++++ src/Makefile.in	Thu Sep 20 22:44:36 2007
+@@ -272,6 +272,9 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extra_objs.Plo@am__quote@
  
 +cddb.lo:
 +	$(LIBTOOL) --mode=compile $(COMPILE) -O1 -c $<
 +
  .c.o:
- 	$(COMPILE) -c $<
- 
+ @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
diff --git a/audio/libcdaudio/pkg/PLIST b/audio/libcdaudio/pkg/PLIST
index 81842e30057..8031ce8ca2e 100644
--- a/audio/libcdaudio/pkg/PLIST
+++ b/audio/libcdaudio/pkg/PLIST
@@ -1,8 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/08/06 14:37:27 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2007/09/20 22:07:50 sthen Exp $
 bin/libcdaudio-config
 include/cdaudio.h
 lib/libcdaudio.a
 lib/libcdaudio.la
+lib/pkgconfig/
+lib/pkgconfig/libcdaudio.pc
 share/aclocal/
 share/aclocal/libcdaudio.m4
 %%SHARED%%