CVS commit: pkgsrc/databases/db5

["Richard PALO" <richard%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   richard
Date:           Thu Aug 25 06:18:57 UTC 2016

Modified Files:
        pkgsrc/databases/db5: Makefile distinfo
        pkgsrc/databases/db5/patches: patch-ab

Log Message:
Modify conditions of a previous patch to setup.py which fixes
build on aarch64 Linux

Also add '--enable-dbm' to CONFIGURE_ARGS (legacy dbm interface) in
order to be compatible with db4 builds which happens to fix obscure
build errors on aarch64 Linux with packages such as python27.

bump PKGREVISION to pick up change


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/databases/db5/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/db5/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/db5/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/db5/Makefile
diff -u pkgsrc/databases/db5/Makefile:1.16 pkgsrc/databases/db5/Makefile:1.17
--- pkgsrc/databases/db5/Makefile:1.16  Thu Oct  9 14:06:05 2014
+++ pkgsrc/databases/db5/Makefile       Thu Aug 25 06:18:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/10/09 14:06:05 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2016/08/25 06:18:57 richard Exp $
 #
 # NOTE:
 # When updating this package, a change in the minor (5.n -> 5.(n+1))
@@ -8,6 +8,7 @@
 
 DISTNAME=      db-5.3.28
 PKGNAME=       ${DISTNAME:S/db/db5/}
+PKGREVISION=   1
 CATEGORIES=    databases
 MASTER_SITES=  http://download.oracle.com/berkeley-db/ \
                http://download-uk.oracle.com/berkeley-db/
@@ -25,6 +26,7 @@ GNU_CONFIGURE=                yes
 CONFIGURE_DIRS=                build_unix
 CONFIGURE_SCRIPT=      ../dist/configure
 CONFIGURE_ARGS+=       --enable-compat185
+CONFIGURE_ARGS+=       --enable-dbm
 CONFIGURE_ARGS+=       --enable-cxx
 CONFIGURE_ARGS+=       --includedir=${PREFIX}/include/db5
 CONFIGURE_ARGS+=       --program-transform-name=s,db_,db5_,

Index: pkgsrc/databases/db5/distinfo
diff -u pkgsrc/databases/db5/distinfo:1.12 pkgsrc/databases/db5/distinfo:1.13
--- pkgsrc/databases/db5/distinfo:1.12  Tue Nov  3 01:56:11 2015
+++ pkgsrc/databases/db5/distinfo       Thu Aug 25 06:18:57 2016
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.12 2015/11/03 01:56:11 agc Exp $
+$NetBSD: distinfo,v 1.13 2016/08/25 06:18:57 richard Exp $
 
 SHA1 (db-5.3.28.tar.gz) = fa3f8a41ad5101f43d08bc0efb6241c9b6fc1ae9
 RMD160 (db-5.3.28.tar.gz) = a4898908ef6dccb137df02e43843f7d3cfab6a3c
 SHA512 (db-5.3.28.tar.gz) = e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090
 Size (db-5.3.28.tar.gz) = 35090431 bytes
 SHA1 (patch-aa) = 9450e95f46787ddc1d661beaa239ea0ff4673f20
-SHA1 (patch-ab) = b09fac68d7d847c5660078de90a16f27268e9858
+SHA1 (patch-ab) = 00e496b6dae87363ab1a0ee6b36e732f6ddb0509
 SHA1 (patch-ac) = 0a243583ae2b66290fb83b112c539001bf3feef2
 SHA1 (patch-dist_aclocal_libtool.m4) = 2d56b318b4f0d14a9352f6c1eb14a4c2b8315fc0
 SHA1 (patch-src_dbinc_atomic.h) = c4fbe421d2c8ba68dc81aeeda1cad09a2c68fbe5

Index: pkgsrc/databases/db5/patches/patch-ab
diff -u pkgsrc/databases/db5/patches/patch-ab:1.5 pkgsrc/databases/db5/patches/patch-ab:1.6
--- pkgsrc/databases/db5/patches/patch-ab:1.5   Tue Apr 22 14:42:35 2014
+++ pkgsrc/databases/db5/patches/patch-ab       Thu Aug 25 06:18:57 2016
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2014/04/22 14:42:35 asau Exp $
+$NetBSD: patch-ab,v 1.6 2016/08/25 06:18:57 richard Exp $
 
 --- dist/configure.orig        2012-05-11 17:57:48.000000000 +0000
 +++ dist/configure
@@ -97,7 +97,7 @@ $NetBSD: patch-ab,v 1.5 2014/04/22 14:42
                ;;
            *)
 -              if test "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
-+              if test "$ac_cv_lib_pthread_main" = yes -a "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
++              if test "$ac_cv_lib_pthread_main" = yes -o "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
                        LIBS="$LIBS -lpthread"
  
  if test "$cross_compiling" = yes; then :