From owner-svn-ports-head@FreeBSD.ORG  Sun Feb  9 13:46:51 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 48D3020D;
 Sun,  9 Feb 2014 13:46:51 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 324521702;
 Sun,  9 Feb 2014 13:46:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s19DkpOd040317;
 Sun, 9 Feb 2014 13:46:51 GMT (envelope-from rm@svn.freebsd.org)
Received: (from rm@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s19DkohA040315;
 Sun, 9 Feb 2014 13:46:50 GMT (envelope-from rm@svn.freebsd.org)
Message-Id: <201402091346.s19DkohA040315@svn.freebsd.org>
From: Ruslan Makhmatkhanov <rm@FreeBSD.org>
Date: Sun, 9 Feb 2014 13:46:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r343501 - in head/databases/py-bsddb: . 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-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Feb 2014 13:46:51 -0000

Author: rm
Date: Sun Feb  9 13:46:50 2014
New Revision: 343501
URL: http://svnweb.freebsd.org/changeset/ports/343501
QAT: https://qat.redports.org/buildarchive/r343501/

Log:
  - remove patch for python26, that's not in tree anymore
  - turn extra-patch for python27 into regular patch and remove corresponding
    logic from Makefile

Added:
  head/databases/py-bsddb/files/patch-_bsddb.c
     - copied unchanged from r343500, head/databases/py-bsddb/files/extra-patch-py27-_bsddb.c
Deleted:
  head/databases/py-bsddb/files/extra-patch-py26-_bsddb.c
  head/databases/py-bsddb/files/extra-patch-py27-_bsddb.c
Modified:
  head/databases/py-bsddb/Makefile

Modified: head/databases/py-bsddb/Makefile
==============================================================================
--- head/databases/py-bsddb/Makefile	Sun Feb  9 13:07:02 2014	(r343500)
+++ head/databases/py-bsddb/Makefile	Sun Feb  9 13:46:50 2014	(r343501)
@@ -28,7 +28,6 @@ PYDISTUTILS_INSTALLARGS+=	--install-lib 
 PYDISTUTILS_AUTOPLIST=	yes
 
 MAKE_ENV=	BSDDB_VERSION=${BDB_LIB_NAME}
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-py${PYTHON_SUFFIX}-_bsddb.c
 
 .include <bsd.port.pre.mk>
 

Copied: head/databases/py-bsddb/files/patch-_bsddb.c (from r343500, head/databases/py-bsddb/files/extra-patch-py27-_bsddb.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/py-bsddb/files/patch-_bsddb.c	Sun Feb  9 13:46:50 2014	(r343501, copy of r343500, head/databases/py-bsddb/files/extra-patch-py27-_bsddb.c)
@@ -0,0 +1,11 @@
+--- ./_bsddb.c.orig	2013-04-06 18:02:34.000000000 +0400
++++ ./_bsddb.c	2013-05-12 09:27:38.000000000 +0400
+@@ -9699,7 +9699,7 @@
+     ADD_INT(d, DB_RPCCLIENT);
+ #endif
+ 
+-#if (DBVER < 48)
++#if (DBVER < 48 || DBVER > 51)
+     ADD_INT(d, DB_XA_CREATE);
+ #endif
+