Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 9 Feb 2014 13:46:50 +0000 (UTC)
From:      Ruslan Makhmatkhanov <rm@FreeBSD.org>
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
Message-ID:  <201402091346.s19DkohA040315@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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
+ 



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