* upgrade dbh to 4.5.0

* keep old dbh 1.0 as dbh10
* reassign XFCE dependent to dbh10

Approved by: oliver (maintainer of XFCE4)

databases/Makefile

@@ -32,6 +32,7 @@
     SUBDIR += dbf
     SUBDIR += dbf2mysql
     SUBDIR += dbh
+    SUBDIR += dbh10
     SUBDIR += dbmetrix
     SUBDIR += dbow
     SUBDIR += dbtool

databases/dbh/Makefile

@@ -7,11 +7,10 @@
 #
 
 PORTNAME=	dbh
-PORTVERSION=	1.0.24
-PORTREVISION=	1
+PORTVERSION=	4.5.0
+PORTREVISION=	0
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Disk Based Hashtables

databases/dbh/distinfo

@@ -1,3 +1,3 @@
-MD5 (dbh-1.0.24.tar.gz) = 42e122a321089f2429986d0d161ed92a
-SHA256 (dbh-1.0.24.tar.gz) = a95844cdea142c1db4f8b75e9854068e9d38ced83aa71783063febb3a1cc0410
-SIZE (dbh-1.0.24.tar.gz) = 371463
+MD5 (dbh-4.5.0.tar.gz) = 52b4b0d5ee0513dc796e989220c11bc6
+SHA256 (dbh-4.5.0.tar.gz) = 85c5a90b83032f7eddaebb445b38c6dfc0ae5cc202be8028bd0b554bd0b567bb
+SIZE (dbh-4.5.0.tar.gz) = 365506

databases/dbh/files/patch-ltmain.sh

@@ -0,0 +1,15 @@
+--- ltmain.sh.orig	Tue Oct 31 11:13:51 2006
++++ ltmain.sh	Tue Oct 31 11:14:02 2006
+@@ -6103,10 +6103,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"

databases/dbh/pkg-plist

@@ -2,9 +2,8 @@
 include/dbh.h
 include/dbh_config.h
 include/dbh_functions.h
-lib/libdbh-1.0.so
-lib/libdbh-1.0.so.1
+lib/libdbh-4.5.so
+lib/libdbh-4.5.so.4
 lib/libdbh.a
-lib/libdbh.la
 lib/libdbh.so
-libdata/pkgconfig/dbh-1.0.pc
+libdata/pkgconfig/dbh.pc

x11-toolkits/libxfce4gui/Makefile

@@ -19,7 +19,7 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 widget library required by xfce4 and xfwm4
 
-LIB_DEPENDS=	dbh-1.0.1:${PORTSDIR}/databases/dbh \
+LIB_DEPENDS=	dbh-1.0.1:${PORTSDIR}/databases/dbh10 \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util
 
 USE_GNOME=	gtk20 gnomehack