Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 12 Apr 2016 05:43:16 +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: r413096 - head/databases/db48
Message-ID:  <201604120543.u3C5hGsE058160@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mandree
Date: Tue Apr 12 05:43:16 2016
New Revision: 413096
URL: https://svnweb.freebsd.org/changeset/ports/413096

Log:
  Revert unauthorized commit.

Modified:
  head/databases/db48/Makefile

Modified: head/databases/db48/Makefile
==============================================================================
--- head/databases/db48/Makefile	Tue Apr 12 03:45:44 2016	(r413095)
+++ head/databases/db48/Makefile	Tue Apr 12 05:43:16 2016	(r413096)
@@ -16,10 +16,9 @@ COMMENT=	Berkeley DB package, revision 4
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKDIR}/${DISTNAME}/LICENSE
 
-DEPRECATED=		Please migrate to db5 or db6
-# The port is not to be removed unless the bitcoin-related ports can
-# go without this.
-EXPIRATION_DATE=	2016-07-31
+DEPRECATED=		Please migrate to db5 or db6, make sure that bitcoin and siblings moved to another database or version by then
+# This port expires along with FreeBSD 10.X.
+EXPIRATION_DATE=	2018-04-30
 
 BDBVER=		${PORTVERSION:R:R}
 CONFIGURE_ARGS=	--enable-compat185 --enable-dump185 --enable-cxx \
@@ -35,6 +34,10 @@ USE_LDCONFIG=	yes
 
 .include <bsd.port.options.mk>
 
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100101
+IGNORE=		db48 is not supported on FreeBSD 11+ with clang 3.8 - upgrade to db5
+.endif
+
 .if ${ARCH} == "aarch64" || ${ARCH} == "armv6"
 # db48 uses a deprecated instruction for mutexes on ARM, fbsd bug#197227
 CONFIGURE_ARGS+=	--enable-posixmutexes
@@ -42,7 +45,6 @@ CONFIGURE_ARGS+=	--enable-posixmutexes
 
 post-patch:
 	${REINPLACE_CMD} -Ee 's|--mode=install cp -p|--mode=install ${INSTALL} -s|;' ${WRKSRC}/${CONFIGURE_SCRIPT}
-	${REINPLACE_CMD} -Ee 's/[[:<:]]atomic_init[[:>:]]/db_atomic_init/g' ${WRKSRC}/../dbinc/atomic.h ${WRKSRC}/../mp/mp_*.c ${WRKSRC}/../mutex/mut_*.c
 
 post-install:
 .for i in libdb libdb_cxx



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