From owner-svn-ports-all@freebsd.org Sun Jun 26 17:24:23 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 002F1B8166F; Sun, 26 Jun 2016 17:24:23 +0000 (UTC) (envelope-from sunpoet@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 CECA926B6; Sun, 26 Jun 2016 17:24:22 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5QHOMX5081395; Sun, 26 Jun 2016 17:24:22 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5QHOLdG081392; Sun, 26 Jun 2016 17:24:21 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201606261724.u5QHOLdG081392@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 26 Jun 2016 17:24:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417590 - in head/databases/db6: . files 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.22 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: Sun, 26 Jun 2016 17:24:23 -0000 Author: sunpoet Date: Sun Jun 26 17:24:21 2016 New Revision: 417590 URL: https://svnweb.freebsd.org/changeset/ports/417590 Log: - Use WRKSRC_SUBDIR - Convert to new options target helper Approved by: portmgr (blanket) Modified: head/databases/db6/Makefile head/databases/db6/files/patch-lang_sql_upgrade61.sh head/databases/db6/files/patch-src_dbinc_mutex__int.h Modified: head/databases/db6/Makefile ============================================================================== --- head/databases/db6/Makefile Sun Jun 26 17:24:17 2016 (r417589) +++ head/databases/db6/Makefile Sun Jun 26 17:24:21 2016 (r417590) @@ -15,6 +15,7 @@ MAINTAINER= mandree@FreeBSD.org COMMENT= Oracle Berkeley DB, revision ${BDBVER} LICENSE= AGPLv3 +LICENSE_FILE= ${WRKSRC}/../LICENSE BDBVER= ${PORTVERSION:R} BDBMAJ= ${BDBVER:R} @@ -27,8 +28,9 @@ CONFIGURE_SCRIPT= ../dist/configure GNU_CONFIGURE= yes USES= gmake libtool INSTALL_TARGET= install_include install_lib install_utilities -WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix -PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} +WRKSRC_SUBDIR= build_unix +#WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix +#PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} USE_LDCONFIG= yes PLIST_SUB= BDBMAJ=${BDBMAJ} BDBVER=${BDBVER} MAKE_ARGS+= docdir=${DOCSDIR} @@ -83,27 +85,28 @@ post-install: .endfor cd ${STAGEDIR}${PREFIX}/bin/${PORTNAME}; \ for i in *; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER} ; 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-SQL-on: + ${INSTALL_SCRIPT} ${WRKSRC}/../lang/sql/upgrade61.sh \ + ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-upgrade61.sh + +post-install-TCL-off: 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-on: .for i in api_reference/TCL ${RM} -r -f ${STAGEDIR}${DOCSDIR}/${i} .endfor -.endif - -post-install-SQL-on: - ${INSTALL_SCRIPT} ${WRKSRC}/../lang/sql/upgrade61.sh \ - ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-upgrade61.sh .include Modified: head/databases/db6/files/patch-lang_sql_upgrade61.sh ============================================================================== --- head/databases/db6/files/patch-lang_sql_upgrade61.sh Sun Jun 26 17:24:17 2016 (r417589) +++ head/databases/db6/files/patch-lang_sql_upgrade61.sh Sun Jun 26 17:24:21 2016 (r417590) @@ -1,5 +1,5 @@ ---- lang/sql/upgrade61.sh.orig 2016-03-28 19:45:53 UTC -+++ lang/sql/upgrade61.sh +--- ../lang/sql/upgrade61.sh.orig 2016-03-28 19:45:53 UTC ++++ ../lang/sql/upgrade61.sh @@ -1,12 +1,19 @@ #!/bin/sh # This script upgrades SQL databases from BDB 5.0 to early 6.1 Modified: head/databases/db6/files/patch-src_dbinc_mutex__int.h ============================================================================== --- head/databases/db6/files/patch-src_dbinc_mutex__int.h Sun Jun 26 17:24:17 2016 (r417589) +++ head/databases/db6/files/patch-src_dbinc_mutex__int.h Sun Jun 26 17:24:21 2016 (r417590) @@ -1,5 +1,5 @@ ---- src/dbinc/mutex_int.h.orig 2016-03-28 19:45:54 UTC -+++ src/dbinc/mutex_int.h +--- ../src/dbinc/mutex_int.h.orig 2016-03-28 19:45:54 UTC ++++ ../src/dbinc/mutex_int.h @@ -652,7 +652,7 @@ MUTEX_SET(int *tsl) { : "=&r" (__r), "+r" (tsl) :