CVS commit: pkgsrc/databases/db6

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

Module Name:    pkgsrc
Committed By:   richard
Date:           Thu Aug 25 06:19:29 UTC 2016

Modified Files:
        pkgsrc/databases/db6: Makefile distinfo
        pkgsrc/databases/db6/patches: patch-dist_configure

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.2 -r1.3 pkgsrc/databases/db6/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/db6/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/db6/patches/patch-dist_configure

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

Modified files:

Index: pkgsrc/databases/db6/Makefile
diff -u pkgsrc/databases/db6/Makefile:1.2 pkgsrc/databases/db6/Makefile:1.3
--- pkgsrc/databases/db6/Makefile:1.2   Mon Sep 14 10:52:57 2015
+++ pkgsrc/databases/db6/Makefile       Thu Aug 25 06:19:29 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/09/14 10:52:57 adam Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/25 06:19:29 richard Exp $
 #
 # NOTE:
 # When updating this package, a change in the minor (6.n -> 6.(n+1))
@@ -8,6 +8,7 @@
 
 DISTNAME=      db-6.1.26
 PKGNAME=       ${DISTNAME:S/db/db6/}
+PKGREVISION=   1
 CATEGORIES=    databases
 MASTER_SITES=  http://download.oracle.com/berkeley-db/
 
@@ -23,6 +24,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/db6
 CONFIGURE_ARGS+=       --program-transform-name=s,db_,db6_,

Index: pkgsrc/databases/db6/distinfo
diff -u pkgsrc/databases/db6/distinfo:1.4 pkgsrc/databases/db6/distinfo:1.5
--- pkgsrc/databases/db6/distinfo:1.4   Tue Nov  3 01:56:11 2015
+++ pkgsrc/databases/db6/distinfo       Thu Aug 25 06:19:29 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 01:56:11 agc Exp $
+$NetBSD: distinfo,v 1.5 2016/08/25 06:19:29 richard Exp $
 
 SHA1 (db-6.1.26.tar.gz) = 5ae05c6c4a1766270fd5cfb28539e2b7a19c33b2
 RMD160 (db-6.1.26.tar.gz) = 6d242b65cd316060c5ed4634bb11e621f3cc6d93
@@ -6,7 +6,7 @@ SHA512 (db-6.1.26.tar.gz) = 2590ee3d9e30
 Size (db-6.1.26.tar.gz) = 37495772 bytes
 SHA1 (patch-dist_Makefile.in) = dbc5f8fd26e715f6dff8ff261a08b2856ea3c46e
 SHA1 (patch-dist_aclocal_libtool.m4) = 37367e10d9d856cf233b7a0efd3680f35728039e
-SHA1 (patch-dist_configure) = 2fb4c6cdd29ac5a9ad520af411517660b24e8768
+SHA1 (patch-dist_configure) = f38f66f7662a126c92df658158a7a2280c174edb
 SHA1 (patch-src_dbinc_atomic.h) = 240a4a6ec094e868d9a5e95ec4ab72d5b9ddfc23
 SHA1 (patch-src_hmac_sha1.c) = 0e98e6383c214adbb939839bb345e55efe8d89da
 SHA1 (patch-src_mp_mp__fget.c) = 059ecdb74bef29c17b445c305b6d4934b5a3c59b

Index: pkgsrc/databases/db6/patches/patch-dist_configure
diff -u pkgsrc/databases/db6/patches/patch-dist_configure:1.1 pkgsrc/databases/db6/patches/patch-dist_configure:1.2
--- pkgsrc/databases/db6/patches/patch-dist_configure:1.1       Thu Jan  1 18:52:52 2015
+++ pkgsrc/databases/db6/patches/patch-dist_configure   Thu Aug 25 06:19:29 2016
@@ -1,4 +1,4 @@
-$NetBSD: patch-dist_configure,v 1.1 2015/01/01 18:52:52 ryoon Exp $
+$NetBSD: patch-dist_configure,v 1.2 2016/08/25 06:19:29 richard Exp $
 
 --- dist/configure.orig        2014-06-10 15:32:54.000000000 +0000
 +++ dist/configure
@@ -97,7 +97,7 @@ $NetBSD: patch-dist_configure,v 1.1 2015
                ;;
            *)
 -              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 :