From 51e81da25375ca1ec831bae165c2415a54717fbb Mon Sep 17 00:00:00 2001
From: Michael Johnson <ahze@FreeBSD.org>
Date: Wed, 8 Dec 2004 03:15:22 +0000
Subject: [PATCH] - Update to 1.8.18 - Grab MAINTAINER - Add WITH_DEBUG knob -
 Add iconv support to fix estraier search support in www/kazehakase - Remove
 "make check"

---
 databases/qdbm/Makefile  | 18 +++++++++++++-----
 databases/qdbm/distinfo  |  4 ++--
 databases/qdbm/pkg-plist |  4 ++--
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/databases/qdbm/Makefile b/databases/qdbm/Makefile
index f38d71b65072..e47d9d9e9cdd 100644
--- a/databases/qdbm/Makefile
+++ b/databases/qdbm/Makefile
@@ -6,17 +6,21 @@
 #
 
 PORTNAME=	qdbm
-PORTVERSION=	1.8.16
+PORTVERSION=	1.8.18
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED} \
 		http://qdbm.sourceforge.net/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Quick Database Manager
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-zlib
+USE_ICONV=	yes
+CONFIGURE_ARGS=	--enable-zlib \
+		--enable-iconv
+CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
+		LDFLAGS="${PTHREAD_LIBS}"
 MAKE_ARGS=	RELCFLAGS="${CFLAGS}" \
 		MYDATADIR="${DOCSDIR}" MYDOCS="${PORTDOCS}"
 INSTALLS_SHLIB=	yes
@@ -28,10 +32,15 @@ MAN3=		cabin.3 curia.3 depot.3 hovel.3 odeum.3 qdbm.3 relic.3 villa.3
 MLINKS=		curia.3 cropen.3 depot.3 dpopen.3 \
 		odeum.3 odopen.3 villa.3 vlopen.3 villa.3 vista.3
 
-OPTIONS=	PTHREAD "Enable pthread support !! USE IT WITH CARE !!" off
+OPTIONS=	PTHREAD "Enable pthread support !! USE IT WITH CARE !!" Off \
+		DEBUG "Enable debug" Off
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug
+.endif
+
 .if defined(WITH_PTHREAD)
 USE_REINPLACE=	yes
 CONFIGURE_ARGS+=	--enable-pthread
@@ -43,7 +52,6 @@ post-patch:
 
 post-build:
 	cd ${WRKSRC}/lab; ${MAKE} CC="${CC}" CFLAGS="${CFLAGS}" fmtcnv031127
-	cd ${WRKSRC}; ${SETENV} QDBMDBGFD=1 ${MAKE} check
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lab/fmtcnv031127 ${PREFIX}/bin
diff --git a/databases/qdbm/distinfo b/databases/qdbm/distinfo
index dd0326f8e3ea..890a0ef7bdea 100644
--- a/databases/qdbm/distinfo
+++ b/databases/qdbm/distinfo
@@ -1,2 +1,2 @@
-MD5 (qdbm-1.8.16.tar.gz) = 07c448901e3ea96482b834194fe9109c
-SIZE (qdbm-1.8.16.tar.gz) = 813953
+MD5 (qdbm-1.8.18.tar.gz) = 96378f13b4de8bb02cf32ff34b31ec54
+SIZE (qdbm-1.8.18.tar.gz) = 814646
diff --git a/databases/qdbm/pkg-plist b/databases/qdbm/pkg-plist
index 972afc45b648..896cd28b0469 100644
--- a/databases/qdbm/pkg-plist
+++ b/databases/qdbm/pkg-plist
@@ -27,5 +27,5 @@ include/villa.h
 include/vista.h
 lib/libqdbm.a
 lib/libqdbm.so
-lib/libqdbm.so.3
-lib/libqdbm.so.3.0.0
+lib/libqdbm.so.4
+lib/libqdbm.so.4.0.0