diff -ruN --exclude=CVS /usr/ports/audio/libcddb.orig/Makefile /usr/ports/audio/libcddb/Makefile
--- /usr/ports/audio/libcddb.orig/Makefile	Fri Jul  9 13:41:53 2004
+++ /usr/ports/audio/libcddb/Makefile	Wed Jul 21 15:47:54 2004
@@ -5,8 +5,7 @@
 # $FreeBSD: ports/audio/libcddb/Makefile,v 1.5 2004/07/09 17:41:53 marcus Exp $
 
 PORTNAME=	libcddb
-PORTVERSION=	0.9.4
-PORTREVISION=	1
+PORTVERSION=	0.9.5
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,8 +13,8 @@
 MAINTAINER=	ahze@ahze.net
 COMMENT=	A library to access data on a CDDB server
 
-USE_INC_LIBTOOL_VER=	13
-USE_GNOME=	gnometarget lthack gnomehack pkgconfig
+USE_INC_LIBTOOL_VER=	15
+USE_GNOME=	gnometarget gnomehack pkgconfig
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
diff -ruN --exclude=CVS /usr/ports/audio/libcddb.orig/distinfo /usr/ports/audio/libcddb/distinfo
--- /usr/ports/audio/libcddb.orig/distinfo	Mon Mar  1 14:16:24 2004
+++ /usr/ports/audio/libcddb/distinfo	Wed Jul 21 15:32:33 2004
@@ -1,2 +1,2 @@
-MD5 (libcddb-0.9.4.tar.gz) = 366095f09e1d89d91915a2dd7c7c1478
-SIZE (libcddb-0.9.4.tar.gz) = 272751
+MD5 (libcddb-0.9.5.tar.gz) = 9db0b305a67ce0827966442bc0731c96
+SIZE (libcddb-0.9.5.tar.gz) = 380064
diff -ruN --exclude=CVS /usr/ports/audio/libcddb.orig/files/cddb.h-systypes-patch /usr/ports/audio/libcddb/files/cddb.h-systypes-patch
--- /usr/ports/audio/libcddb.orig/files/cddb.h-systypes-patch	Mon Mar  1 14:16:24 2004
+++ /usr/ports/audio/libcddb/files/cddb.h-systypes-patch	Wed Jul 21 15:35:52 2004
@@ -1,11 +1,10 @@
---- include/cddb/cddb.h.orig	Mon Mar  1 04:22:27 2004
-+++ include/cddb/cddb.h	Mon Mar  1 04:22:47 2004
-@@ -26,7 +26,7 @@
-     extern "C" {
+--- include/cddb/cddb.h.orig	Wed Jul 21 15:34:48 2004
++++ include/cddb/cddb.h	Wed Jul 21 15:35:03 2004
+@@ -27,6 +27,7 @@
  #endif
-
--
+ 
+ 
 +#include <sys/types.h>
+ #include <cddb/cddb_config.h>
  #include <cddb/cddb_error.h>
  #include <cddb/cddb_track.h>
- #include <cddb/cddb_disc.h>
diff -ruN --exclude=CVS /usr/ports/audio/libcddb.orig/files/cddb_ni.h-systypes-patch /usr/ports/audio/libcddb/files/cddb_ni.h-systypes-patch
--- /usr/ports/audio/libcddb.orig/files/cddb_ni.h-systypes-patch	Mon Mar  1 14:16:24 2004
+++ /usr/ports/audio/libcddb/files/cddb_ni.h-systypes-patch	Wed Jul 21 15:36:20 2004
@@ -1,10 +1,10 @@
---- include/cddb/cddb_ni.h.orig	Mon Mar  1 04:28:02 2004
-+++ include/cddb/cddb_ni.h	Mon Mar  1 04:28:16 2004
-@@ -18,6 +18,7 @@
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA  02111-1307, USA.
- */
+--- include/cddb/cddb_ni.h.orig	Wed Jul 21 15:35:13 2004
++++ include/cddb/cddb_ni.h	Wed Jul 21 15:35:32 2004
+@@ -31,6 +31,7 @@
+ #  include <config.h>
+ #endif
+ 
 +#include <sys/types.h>
-
- #ifndef CDDB_NI_H
- #define CDDB_NI_H 1
+ #include "cddb/cddb_regex.h"
+ #include "cddb/cddb.h"
+ #include "cddb/cddb_conn_ni.h"
diff -ruN --exclude=CVS /usr/ports/audio/libcddb.orig/files/patch-ltmain.sh /usr/ports/audio/libcddb/files/patch-ltmain.sh
--- /usr/ports/audio/libcddb.orig/files/patch-ltmain.sh	Wed Dec 31 19:00:00 1969
+++ /usr/ports/audio/libcddb/files/patch-ltmain.sh	Wed Jul 21 15:43:57 2004
@@ -0,0 +1,15 @@
+--- ltmain.sh.orig	Wed Jul 21 15:43:15 2004
++++ ltmain.sh	Wed Jul 21 15:43:45 2004
+@@ -5608,10 +5608,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff -ruN --exclude=CVS /usr/ports/audio/libcddb.orig/pkg-plist /usr/ports/audio/libcddb/pkg-plist
--- /usr/ports/audio/libcddb.orig/pkg-plist	Fri Apr  9 03:44:53 2004
+++ /usr/ports/audio/libcddb/pkg-plist	Wed Jul 21 15:40:05 2004
@@ -1,6 +1,7 @@
 bin/cddb_query
 include/cddb/cddb.h
 include/cddb/cddb_cmd.h
+include/cddb/cddb_config.h
 include/cddb/cddb_conn.h
 include/cddb/cddb_disc.h
 include/cddb/cddb_error.h