From owner-svn-ports-all@freebsd.org Fri Oct 7 18:47:37 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 08A28C056E7; Fri, 7 Oct 2016 18:47:37 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B2FC6A1F; Fri, 7 Oct 2016 18:47:36 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u97IlZM7063064; Fri, 7 Oct 2016 18:47:35 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u97IlZ1q063063; Fri, 7 Oct 2016 18:47:35 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201610071847.u97IlZ1q063063@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Fri, 7 Oct 2016 18:47:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423478 - head/databases/db5 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Oct 2016 18:47:37 -0000 Author: mandree Date: Fri Oct 7 18:47:35 2016 New Revision: 423478 URL: https://svnweb.freebsd.org/changeset/ports/423478 Log: Clean up, modernize, add LICENSE. The clean up drops an obsolete comment (overcome by a patch), drops the --disable-tcl that is overridden anyhow, and replaces a few .if empty(PORT_OPTIONS:Mfoo) by post-install-FOO-{on|off}: targets. This is to get the port closer to db6. Modified: head/databases/db5/Makefile Modified: head/databases/db5/Makefile ============================================================================== --- head/databases/db5/Makefile Fri Oct 7 18:35:04 2016 (r423477) +++ head/databases/db5/Makefile Fri Oct 7 18:47:35 2016 (r423478) @@ -15,11 +15,13 @@ DIST_SUBDIR= bdb MAINTAINER= mandree@FreeBSD.org COMMENT= Oracle Berkeley DB, revision ${BDBVER} +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/../LICENSE + BDBVER= ${PORTVERSION:R} BDBMAJ= ${BDBVER:R} CONFIGURE_ARGS= --enable-cxx --enable-stl \ --enable-compat185 --enable-dump185 \ - --disable-tcl \ --includedir=${PREFIX}/include/${PORTNAME} \ --libdir=${PREFIX}/lib/${PORTNAME} \ --bindir=${PREFIX}/bin/${PORTNAME} @@ -34,11 +36,7 @@ PLIST_SUB= BDBMAJ=${BDBMAJ} BDBVER=${BDB MAKE_ARGS+= docdir=${DOCSDIR} CFLAGS+= -Wall -Wextra -OPTIONS_DEFINE= CRYPTO L10N SQL JAVA DOCS TCL -# WARNING: DO NOT ADD TCL TO OPTIONS: -# On FreeBSD 10.3 this causes a heap of warnings of the following kind -# and is deemed unsafe. -# ./lang/tcl/tcl_*.c:*:*: warning: the value of the size argument in 'strncat' is too large, might lead to a buffer overflow [-Wstrncat-size] +OPTIONS_DEFINE= CRYPTO L10N SQL JAVA TCL DOCS OPTIONS_DEFAULT=CRYPTO OPTIONS_SUB= yes CRYPTO_DESC= Cryptography support @@ -91,23 +89,24 @@ post-install: cd ${STAGEDIR}${PREFIX}/bin/${PORTNAME}; \ for i in *; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; \ ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBMAJ} ; done -.if empty(PORT_OPTIONS:MJAVA) + +post-install-JAVA-off: ${RM} -r -f ${STAGEDIR}${DOCSDIR}/java .for i in gsg gsg_db_rep gsg_txn ${RM} -r -f ${STAGEDIR}${DOCSDIR}/${i}/JAVA .endfor -.endif -.if empty(PORT_OPTIONS:MSQL) + +post-install-SQL-off: ${RM} -r -f ${STAGEDIR}${DOCSDIR}/bdb-sql -.endif -.if !empty(PORT_OPTIONS:MTCL) + +post-install-TCL-on: echo "package ifneeded Db_tcl ${BDBVER} \ [list load [file join $$dir libdb_tcl-${BDBVER}.so]] \ " > ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/pkgIndex.tcl -.else + +post-install-TCL-off: .for i in api_reference/TCL ${RM} -r -f ${STAGEDIR}${DOCSDIR}/${i} .endfor -.endif .include