From owner-svn-ports-all@freebsd.org  Tue Apr 12 05:43:17 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
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 9922FB0C8C2;
 Tue, 12 Apr 2016 05:43:17 +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 673BC147C;
 Tue, 12 Apr 2016 05:43:17 +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 u3C5hGfJ058161;
 Tue, 12 Apr 2016 05:43:16 GMT (envelope-from mandree@FreeBSD.org)
Received: (from mandree@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3C5hGsE058160;
 Tue, 12 Apr 2016 05:43:16 GMT (envelope-from mandree@FreeBSD.org)
Message-Id: <201604120543.u3C5hGsE058160@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mandree set sender to
 mandree@FreeBSD.org using -f
From: Matthias Andree <mandree@FreeBSD.org>
Date: Tue, 12 Apr 2016 05:43:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r413096 - head/databases/db48
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.21
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Apr 2016 05:43:17 -0000

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