Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 16 Oct 2015 19:09:53 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r399505 - in head/databases/dbtool: . files
Message-ID:  <201510161909.t9GJ9rn9038581@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Fri Oct 16 19:09:52 2015
New Revision: 399505
URL: https://svnweb.freebsd.org/changeset/ports/399505

Log:
  - Update to version 1.9.1
  - Add LICENSE_FILE
  - Convert to USES=shebangfix, option helpers, PLIST_FILES
  
  PR:		203242
  Submitted by:	tkato432@yahoo.com

Deleted:
  head/databases/dbtool/files/
  head/databases/dbtool/pkg-plist
Modified:
  head/databases/dbtool/Makefile
  head/databases/dbtool/distinfo

Modified: head/databases/dbtool/Makefile
==============================================================================
--- head/databases/dbtool/Makefile	Fri Oct 16 18:57:28 2015	(r399504)
+++ head/databases/dbtool/Makefile	Fri Oct 16 19:09:52 2015	(r399505)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dbtool
-PORTVERSION=	1.8
+PORTVERSION=	1.9.1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.daemon.de/idisk/Apps/dbtool/
 
@@ -10,46 +10,43 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Store and retrieve data in a key/value format in a hash database
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
-OPTIONS_DEFINE=	BDB EXAMPLES
-
-EXAMPLES_RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
-
+USES=		gmake shebangfix
+SHEBANG_FILES=	samples/account-db/accdb
+bash_OLD_CMD=	/bin/sh
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
 
-USES=		gmake
-REINPLACE_ARGS=	-i ""
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-SH2BASH=	samples/account-db/accdb
-UB2PFX=		samples/locate/locate samples/locate/updatedb
-EXTRACT_AFTER_ARGS+=	--no-same-permissions --no-same-owner --exclude '*~'
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MBDB}
-USE_BDB=	48+
-CPPFLAGS+=	-I${BDB_INCLUDE_DIR}
-LIBS+=		-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}
-CONFIGURE_ARGS+=	--with-berkeley
-.else
-LIB_DEPENDS+=	libgdbm.so:${PORTSDIR}/databases/gdbm
-CONFIGURE_ARGS+=	--without-berkeley
-.endif
+PORTEXAMPLES=	*
+PLIST_FILES=	bin/dbtool man/man1/dbtool.1.gz
+
+OPTIONS_DEFINE=		EXAMPLES
+OPTIONS_SINGLE=		BACKEND
+OPTIONS_SINGLE_BACKEND=	BDB GDBM
+OPTIONS_DEFAULT=	GDBM
+
+BACKEND_DESC=		Database backend
+BDB_USE=		bdb=yes
+BDB_CONFIGURE_ON=	--with-berkeley \
+			--with-bdb-include-dir=${BDB_INCLUDE_DIR} \
+			--with-bdb-lib-dir=${BDB_LIB_DIR}
+EXAMPLES_RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+GDBM_LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
+GDBM_CONFIGURE_ON=	--with-gdbm \
+			--with-gdbm-dir=${LOCALBASE}
 
 post-patch:
-	${REINPLACE_CMD} -e "s,stdin,input,g" ${WRKSRC}/dbtool.cc ${WRKSRC}/engine.cc ${WRKSRC}/engine.h
-.if ${PORT_OPTIONS:MEXAMPLES}
-	${REINPLACE_CMD} -e "s|/bin/sh|${LOCALBASE}/bin/bash|" ${SH2BASH:S|^|${WRKSRC}/|}
-	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${UB2PFX:S|^|${WRKSRC}/|}
-	${RM} ${UB2PFX:C|.*|${WRKSRC}/&.orig|}
+	@${REINPLACE_CMD} -e \
+		'/try_libs=/s|"-ldb_cxx.*"|"-ldb_cxx"| ; \
+		 /try_headers=/s|"db.*"|"db_cxx.h"|' ${WRKSRC}/configure
 
-post-install:
-	#@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+post-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/samples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>

Modified: head/databases/dbtool/distinfo
==============================================================================
--- head/databases/dbtool/distinfo	Fri Oct 16 18:57:28 2015	(r399504)
+++ head/databases/dbtool/distinfo	Fri Oct 16 19:09:52 2015	(r399505)
@@ -1,2 +1,2 @@
-SHA256 (dbtool-1.8.tar.gz) = a66e1150cce006daecedd9a592efe75fa19c642addad97ec117f1a2219c4f079
-SIZE (dbtool-1.8.tar.gz) = 133262
+SHA256 (dbtool-1.9.1.tar.gz) = afd3fa03d4b69f25c689817dc1b6ac452eb16ed4b9712c20695b3b4d13a5e647
+SIZE (dbtool-1.9.1.tar.gz) = 965751



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510161909.t9GJ9rn9038581>