TESTING: Diff for pkgsrc/databases/db4 on pkgsrc-current at 2016/06/16 to build on NetBSD/sh3 (and maybe NetBSD/vax)

pkgsrc-db4.diff

diff --git a/databases/db4/distinfo b/databases/db4/distinfo
index 04de09a..a056407 100644
--- a/databases/db4/distinfo
+++ b/databases/db4/distinfo
@@ -5,7 +5,7 @@ RMD160 (db-4.8.30.tar.gz) = dd2fcd4c9b857a91e2f491fd4fadb0c51b993a9c
 SHA512 (db-4.8.30.tar.gz) = d1a3c52b0ab54ae3fd6792e6396c9f74d25f36b2eb9e853b67ef9c872508a58c784c7818108d06d184f59601b70cc877916e67dfea6f0ee1ca2b07468c1041f1
 Size (db-4.8.30.tar.gz) = 22887305 bytes
 SHA1 (patch-aa) = 1004feec022eefbf3fd57b6d9af99edc5a2bf17a
-SHA1 (patch-ab) = 961c4ef5ad84739bd7eae57f407b89f42864b66e
+SHA1 (patch-ab) = 95b4e03dccdd723831a1076ff309995c2b28e161
 SHA1 (patch-ac) = 045a3b83b9c6c164382ec546b06ae248620552cf
 SHA1 (patch-ae) = 43e574154de93dba60392b09d6ebddbca1036849
 SHA1 (patch-dbinc_atomic.h) = d68db1b7e07b35ec070a18f0195b9f3b386114dd
diff --git a/databases/db4/options.mk b/databases/db4/options.mk
index 478225d..2c85620 100644
--- a/databases/db4/options.mk
+++ b/databases/db4/options.mk
@@ -2,10 +2,15 @@
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.db4
 
-PKG_SUPPORTED_OPTIONS=	doc
-PKG_SUGGESTED_OPTIONS=	doc
+PKG_SUPPORTED_OPTIONS=	doc posixmutexes
+PKG_SUGGESTED_OPTIONS=	doc 
 
 .include "../../mk/bsd.prefs.mk"
+.if (${MACHINE_ARCH} == "sh3el" || ${MACHINE_ARCH} == "sh3eb" || \
+     ${MACHINE_ARCH} == "vax" ) && (${OPSYS} == "NetBSD")
+PKG_SUGGESTED_OPTIONS+=	posixmutexes
+.endif
+
 
 .if ${OPSYS} == "MirBSD"
 PLIST_SRC+=		PLIST.${OPSYS}
@@ -26,3 +31,7 @@ SUBST_SED.docs=		-e '/^library_install:/s, install_docs,,'
 .else
 PLIST_SRC+=		PLIST.docs
 .endif
+
+.if !empty(PKG_OPTIONS:Mposixmutexes)
+CONFIGURE_ARGS+=	--enable-posixmutexes
+.endif
diff --git a/databases/db4/patches/patch-ab b/databases/db4/patches/patch-ab
index 0761d9c..f6e0a0d 100644
--- a/databases/db4/patches/patch-ab
+++ b/databases/db4/patches/patch-ab
@@ -2,7 +2,7 @@ $NetBSD: patch-ab,v 1.25 2014/06/07 08:19:14 obache Exp $
 
 --- dist/configure.orig	2010-04-12 20:25:23.000000000 +0000
 +++ dist/configure
-@@ -4523,11 +4523,12 @@ bsdi3*)	CC=${CC-"shlicc2"}
+@@ -4523,11 +4523,15 @@ bsdi3*)	CC=${CC-"shlicc2"}
  	LIBSO_LIBS="$LIBSO_LIBS -lipc";;
  cygwin*)
  	CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";;
@@ -12,11 +12,14 @@ $NetBSD: patch-ab,v 1.25 2014/06/07 08:19:14 obache Exp $
  	LDFLAGS="$LDFLAGS -pthread";;
  gnu*|k*bsd*-gnu|linux*)
  	CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";;
++netbsd*)
++	CPPFLAGS="$CPPFLAGS -pthread"
++	LDFLAGS="$LDFLAGS -pthread";;
 +haiku*)	LIBSO_LIBS="$LIBSO_LIBS -lnetwork";;
  hpux*)	CPPFLAGS="$CPPFLAGS -D_REENTRANT";;
  irix*)	optimize_debug="-O2"
  	CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";;
-@@ -6282,7 +6283,7 @@ fi
+@@ -6282,7 +6286,7 @@ fi
  # we're using.
  case "$host_os" in
  sysv5UnixWare*|sysv5OpenUNIX8*)
@@ -25,7 +28,7 @@ $NetBSD: patch-ab,v 1.25 2014/06/07 08:19:14 obache Exp $
  		CPPFLAGS="$CPPFLAGS -pthread"
  		LDFLAGS="$LDFLAGS -pthread"
  	else
-@@ -7343,6 +7344,10 @@ gnu*)
+@@ -7343,6 +7347,10 @@ gnu*)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -36,7 +39,7 @@ $NetBSD: patch-ab,v 1.25 2014/06/07 08:19:14 obache Exp $
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
    case $host_cpu in
-@@ -10131,6 +10136,12 @@ $as_echo_n "checking for $compiler optio
+@@ -10131,6 +10139,12 @@ $as_echo_n "checking for $compiler optio
        lt_prog_compiler_pic='-fno-common'
        ;;
  
@@ -49,7 +52,7 @@ $NetBSD: patch-ab,v 1.25 2014/06/07 08:19:14 obache Exp $
      hpux*)
        # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
        # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-@@ -11202,7 +11213,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -11202,7 +11216,7 @@ if test -z "$aix_libpath"; then aix_libp
        hardcode_shlibpath_var=no
        ;;
  
@@ -58,7 +61,7 @@ $NetBSD: patch-ab,v 1.25 2014/06/07 08:19:14 obache Exp $
        ld_shlibs=no
        ;;
  
-@@ -11977,6 +11988,19 @@ beos*)
+@@ -11977,6 +11991,19 @@ beos*)
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -78,7 +81,7 @@ $NetBSD: patch-ab,v 1.25 2014/06/07 08:19:14 obache Exp $
  bsdi[45]*)
    version_type=linux
    need_version=no
-@@ -12077,7 +12101,7 @@ dgux*)
+@@ -12077,7 +12104,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -87,7 +90,7 @@ $NetBSD: patch-ab,v 1.25 2014/06/07 08:19:14 obache Exp $
    dynamic_linker=no
    ;;
  
-@@ -12088,7 +12112,7 @@ freebsd* | dragonfly*)
+@@ -12088,7 +12115,7 @@ freebsd* | dragonfly*)
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -96,7 +99,7 @@ $NetBSD: patch-ab,v 1.25 2014/06/07 08:19:14 obache Exp $
      *) objformat=elf ;;
      esac
    fi
-@@ -13772,7 +13796,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -13772,7 +13799,7 @@ if test -z "$aix_libpath"; then aix_libp
          esac
          ;;
  
@@ -105,7 +108,7 @@ $NetBSD: patch-ab,v 1.25 2014/06/07 08:19:14 obache Exp $
          # C++ shared libraries reported to be fairly broken before
  	# switch to ELF
          ld_shlibs_CXX=no
-@@ -14666,6 +14690,11 @@ $as_echo_n "checking for $compiler optio
+@@ -14666,6 +14693,11 @@ $as_echo_n "checking for $compiler optio
        # Common symbols not allowed in MH_DYLIB files
        lt_prog_compiler_pic_CXX='-fno-common'
        ;;
@@ -117,7 +120,7 @@ $NetBSD: patch-ab,v 1.25 2014/06/07 08:19:14 obache Exp $
      *djgpp*)
        # DJGPP does not support shared libraries at all
        lt_prog_compiler_pic_CXX=
-@@ -15530,7 +15559,7 @@ dgux*)
+@@ -15530,7 +15562,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -126,7 +129,7 @@ $NetBSD: patch-ab,v 1.25 2014/06/07 08:19:14 obache Exp $
    dynamic_linker=no
    ;;
  
-@@ -15541,7 +15570,7 @@ freebsd* | dragonfly*)
+@@ -15541,7 +15573,7 @@ freebsd* | dragonfly*)
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -135,7 +138,7 @@ $NetBSD: patch-ab,v 1.25 2014/06/07 08:19:14 obache Exp $
      *) objformat=elf ;;
      esac
    fi
-@@ -15588,6 +15617,19 @@ gnu*)
+@@ -15588,6 +15620,19 @@ gnu*)
    hardcode_into_libs=yes
    ;;
  
@@ -155,7 +158,7 @@ $NetBSD: patch-ab,v 1.25 2014/06/07 08:19:14 obache Exp $
  hpux9* | hpux10* | hpux11*)
    # Give a soname corresponding to the major version so that dld.sl refuses to
    # link against other versions.
-@@ -16161,7 +16203,7 @@ LIBTOOL="./libtool"
+@@ -16161,7 +16206,7 @@ LIBTOOL="./libtool"
  INSTALLER="\$(LIBTOOL) --mode=install cp -p"
  
  MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
@@ -164,7 +167,7 @@ $NetBSD: patch-ab,v 1.25 2014/06/07 08:19:14 obache Exp $
  MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
  MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
  MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
-@@ -16890,7 +16932,7 @@ if test "$_JTOPDIR" != "/usr"; then
+@@ -16890,7 +16935,7 @@ if test "$_JTOPDIR" != "/usr"; then
  	aix*)		_JNI_INC_SUBDIRS="aix";;
  	bsdi*)		_JNI_INC_SUBDIRS="bsdos";;
  	cygwin*)	_JNI_INC_SUBDIRS="win32";;
@@ -173,3 +176,36 @@ $NetBSD: patch-ab,v 1.25 2014/06/07 08:19:14 obache Exp $
  	hp*)		_JNI_INC_SUBDIRS="hp-ux";;
  	linux*)		_JNI_INC_SUBDIRS="linux genunix";;
  	osf*)		_JNI_INC_SUBDIRS="alpha";;
+@@ -19807,25 +19852,25 @@ $as_echo "$db_cv_mutex" >&6; }
+ # Configure a pthreads-style mutex implementation.
+ hybrid=pthread
+ case "$db_cv_mutex" in
+-POSIX/pthreads*)	ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS"
+-			$as_echo "#define HAVE_MUTEX_PTHREADS 1" >>confdefs.h
+-
+-			;;
+ POSIX/pthreads/private*)ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS"
+ 			$as_echo "#define HAVE_MUTEX_PTHREADS 1" >>confdefs.h
+ 
+ 			$as_echo "#define HAVE_MUTEX_THREAD_ONLY 1" >>confdefs.h
+ 
+ 			;;
+-POSIX/pthreads/library*)ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS"
+-			$as_echo "#define HAVE_MUTEX_PTHREADS 1" >>confdefs.h
+-;;
+ POSIX/pthreads/library/private*)
+ 			ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS"
+ 			$as_echo "#define HAVE_MUTEX_PTHREADS 1" >>confdefs.h
+ 
+ 			$as_echo "#define HAVE_MUTEX_THREAD_ONLY 1" >>confdefs.h
+ ;;
++POSIX/pthreads/library*)ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS"
++			$as_echo "#define HAVE_MUTEX_PTHREADS 1" >>confdefs.h
++;;
++POSIX/pthreads*)	ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS"
++			$as_echo "#define HAVE_MUTEX_PTHREADS 1" >>confdefs.h
++
++			;;
+ Solaris/lwp*)		ADDITIONAL_OBJS="mut_pthread${o} $ADDITIONAL_OBJS"
+ 			$as_echo "#define HAVE_MUTEX_SOLARIS_LWP 1" >>confdefs.h
+