4 files changed, 14 insertions, 58 deletions

diff --git a/databases/dbh/Makefile b/databases/dbh/Makefile
index 90c4aa386d43..1c9bdc9f9b3f 100644
--- a/databases/dbh/Makefile
+++ b/databases/dbh/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	dbh
-PORTVERSION=	1.0.11
-PORTREVISION=	1
+PORTVERSION=	1.0.14
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,8 +17,17 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Disk Based Hashtables
 
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+
+USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|libdir[)]/pkgconfig|prefix)/libdata/pkgconfig|g' \
+			${WRKSRC}/src/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/databases/dbh/distinfo b/databases/dbh/distinfo
index 681cf0cf6c38..e4c404a836e2 100644
--- a/databases/dbh/distinfo
+++ b/databases/dbh/distinfo
@@ -1 +1 @@
-MD5 (dbh_1.0-11.tgz) = 810706d04b97dd087f05af0ed2119b89
+MD5 (dbh_1.0-14.tgz) = 11352e539a3e40f23d539a52f2153b95
diff --git a/databases/dbh/files/patch-configure b/databases/dbh/files/patch-configure
deleted file mode 100644
index f2f11f1fd73b..000000000000
--- a/databases/dbh/files/patch-configure
+++ /dev/null
@@ -1,55 +0,0 @@
---- configure.orig	Wed Aug 14 06:39:38 2002
-+++ configure	Sat Oct 26 05:29:34 2002
-@@ -1400,7 +1400,7 @@
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf.  Sigh.
- if (aclocal --version) < /dev/null > /dev/null 2>&1; then
--   ACLOCAL=aclocal
-+   ACLOCAL=true
-    echo "$as_me:1404: result: found" >&5
- echo "${ECHO_T}found" >&6
- else
-@@ -1415,7 +1415,7 @@
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf.  Sigh.
- if (autoconf --version) < /dev/null > /dev/null 2>&1; then
--   AUTOCONF=autoconf
-+   AUTOCONF=true
-    echo "$as_me:1419: result: found" >&5
- echo "${ECHO_T}found" >&6
- else
-@@ -1430,7 +1430,7 @@
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf.  Sigh.
- if (automake --version) < /dev/null > /dev/null 2>&1; then
--   AUTOMAKE=automake
-+   AUTOMAKE=true
-    echo "$as_me:1434: result: found" >&5
- echo "${ECHO_T}found" >&6
- else
-@@ -1445,7 +1445,7 @@
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf.  Sigh.
- if (autoheader --version) < /dev/null > /dev/null 2>&1; then
--   AUTOHEADER=autoheader
-+   AUTOHEADER=true
-    echo "$as_me:1449: result: found" >&5
- echo "${ECHO_T}found" >&6
- else
-@@ -6802,6 +6802,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -10854,7 +10855,7 @@
- "NONE")
- ;;
- *)
--   CFLAGS="$CFLAGS -march=$target"
-+   CFLAGS="$CFLAGS"
-    ;;
- esac
- 
diff --git a/databases/dbh/pkg-plist b/databases/dbh/pkg-plist
index 8b0d8ef7422f..b2480da06c9d 100644
--- a/databases/dbh/pkg-plist
+++ b/databases/dbh/pkg-plist
@@ -2,6 +2,9 @@
 include/dbh.h
 include/dbh_config.h
 include/dbh_functions.h
+lib/libdbh-1.0.so
 lib/libdbh-1.0.so.1
 lib/libdbh.a
+lib/libdbh.la
 lib/libdbh.so
+libdata/pkgconfig/dbh-1.0.pc