Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Oct 2016 18:47:35 +0000 (UTC)
From:      Matthias Andree <mandree@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r423478 - head/databases/db5
Message-ID:  <201610071847.u97IlZ1q063063@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>



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