Mon Mar 17 19:07:36 2014 UTC ()
FreeBSD 10 is not FreeBSD 1.


(asau)
diff -r1.39 -r1.40 pkgsrc/databases/db4/distinfo
diff -r1.23 -r1.24 pkgsrc/databases/db4/patches/patch-ab
cvs diff -r1.39 -r1.40 pkgsrc/databases/db4/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/db4/distinfo 2012/05/29 20:18:28 1.39
+++ pkgsrc/databases/db4/distinfo 2014/03/17 19:07:36 1.40
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.39 2012/05/29 20:18:28 joerg Exp $ 1$NetBSD: distinfo,v 1.40 2014/03/17 19:07:36 asau Exp $
2 2
3SHA1 (db-4.8.30.tar.gz) = ab36c170dda5b2ceaad3915ced96e41c6b7e493c 3SHA1 (db-4.8.30.tar.gz) = ab36c170dda5b2ceaad3915ced96e41c6b7e493c
4RMD160 (db-4.8.30.tar.gz) = dd2fcd4c9b857a91e2f491fd4fadb0c51b993a9c 4RMD160 (db-4.8.30.tar.gz) = dd2fcd4c9b857a91e2f491fd4fadb0c51b993a9c
5Size (db-4.8.30.tar.gz) = 22887305 bytes 5Size (db-4.8.30.tar.gz) = 22887305 bytes
6SHA1 (patch-aa) = 1004feec022eefbf3fd57b6d9af99edc5a2bf17a 6SHA1 (patch-aa) = 1004feec022eefbf3fd57b6d9af99edc5a2bf17a
7SHA1 (patch-ab) = 8f9ecc47527d338e28ee1ce71e694eaf2bdceb92 7SHA1 (patch-ab) = 43327c18df2de0baffe89310a30cd4c2634f7376
8SHA1 (patch-ac) = 045a3b83b9c6c164382ec546b06ae248620552cf 8SHA1 (patch-ac) = 045a3b83b9c6c164382ec546b06ae248620552cf
9SHA1 (patch-ae) = 43e574154de93dba60392b09d6ebddbca1036849 9SHA1 (patch-ae) = 43e574154de93dba60392b09d6ebddbca1036849
10SHA1 (patch-dbinc_atomic.h) = ff60e3af41ac1b000ebccc91bc673adde5c7463b 10SHA1 (patch-dbinc_atomic.h) = ff60e3af41ac1b000ebccc91bc673adde5c7463b
cvs diff -r1.23 -r1.24 pkgsrc/databases/db4/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/databases/db4/patches/patch-ab 2011/02/04 12:26:01 1.23
+++ pkgsrc/databases/db4/patches/patch-ab 2014/03/17 19:07:36 1.24
@@ -1,35 +1,89 @@ @@ -1,35 +1,89 @@
1$NetBSD: patch-ab,v 1.23 2011/02/04 12:26:01 obache Exp $ 1$NetBSD: patch-ab,v 1.24 2014/03/17 19:07:36 asau Exp $
2 2
3--- dist/configure.orig 2010-04-12 20:25:23.000000000 +0000 3--- dist/configure.orig 2010-04-12 20:25:23.000000000 +0000
4+++ dist/configure 4+++ dist/configure
5@@ -4523,7 +4523,7 @@ bsdi3*) CC=${CC-"shlicc2"} 5@@ -4523,7 +4523,7 @@ bsdi3*) CC=${CC-"shlicc2"}
6 LIBSO_LIBS="$LIBSO_LIBS -lipc";; 6 LIBSO_LIBS="$LIBSO_LIBS -lipc";;
7 cygwin*) 7 cygwin*)
8 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";; 8 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";;
9-freebsd*) 9-freebsd*)
10+freebsd*|dragonfly*) 10+freebsd*|dragonfly*)
11 CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" 11 CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
12 LDFLAGS="$LDFLAGS -pthread";; 12 LDFLAGS="$LDFLAGS -pthread";;
13 gnu*|k*bsd*-gnu|linux*) 13 gnu*|k*bsd*-gnu|linux*)
14@@ -6282,7 +6282,7 @@ fi 14@@ -6282,7 +6282,7 @@ fi
15 # we're using. 15 # we're using.
16 case "$host_os" in 16 case "$host_os" in
17 sysv5UnixWare*|sysv5OpenUNIX8*) 17 sysv5UnixWare*|sysv5OpenUNIX8*)
18- if test "$GCC" == "yes"; then 18- if test "$GCC" == "yes"; then
19+ if test "$GCC" = "yes"; then 19+ if test "$GCC" = "yes"; then
20 CPPFLAGS="$CPPFLAGS -pthread" 20 CPPFLAGS="$CPPFLAGS -pthread"
21 LDFLAGS="$LDFLAGS -pthread" 21 LDFLAGS="$LDFLAGS -pthread"
22 else 22 else
 23@@ -11202,7 +11202,7 @@ if test -z "$aix_libpath"; then aix_libp
 24 hardcode_shlibpath_var=no
 25 ;;
 26
 27- freebsd1*)
 28+ freebsd1|freebsd1.*)
 29 ld_shlibs=no
 30 ;;
 31
 32@@ -12077,7 +12077,7 @@ dgux*)
 33 shlibpath_var=LD_LIBRARY_PATH
 34 ;;
 35
 36-freebsd1*)
 37+freebsd1|freebsd1.*)
 38 dynamic_linker=no
 39 ;;
 40
 41@@ -12088,7 +12088,7 @@ freebsd* | dragonfly*)
 42 objformat=`/usr/bin/objformat`
 43 else
 44 case $host_os in
 45- freebsd[123]*) objformat=aout ;;
 46+ freebsd[123].freebsd[123].*) objformat=aout ;;
 47 *) objformat=elf ;;
 48 esac
 49 fi
 50@@ -13772,7 +13772,7 @@ if test -z "$aix_libpath"; then aix_libp
 51 esac
 52 ;;
 53
 54- freebsd[12]*)
 55+ freebsd[12]|freebsd[12].*)
 56 # C++ shared libraries reported to be fairly broken before
 57 # switch to ELF
 58 ld_shlibs_CXX=no
 59@@ -15530,7 +15530,7 @@ dgux*)
 60 shlibpath_var=LD_LIBRARY_PATH
 61 ;;
 62
 63-freebsd1*)
 64+freebsd1|freebsd1.*)
 65 dynamic_linker=no
 66 ;;
 67
 68@@ -15541,7 +15541,7 @@ freebsd* | dragonfly*)
 69 objformat=`/usr/bin/objformat`
 70 else
 71 case $host_os in
 72- freebsd[123]*) objformat=aout ;;
 73+ freebsd[123]|freebsd[123].*) objformat=aout ;;
 74 *) objformat=elf ;;
 75 esac
 76 fi
23@@ -16161,7 +16161,7 @@ LIBTOOL="./libtool" 77@@ -16161,7 +16161,7 @@ LIBTOOL="./libtool"
24 INSTALLER="\$(LIBTOOL) --mode=install cp -p" 78 INSTALLER="\$(LIBTOOL) --mode=install cp -p"
25  79
26 MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}" 80 MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
27-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version" 81-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
28+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" 82+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
29 MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" 83 MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
30 MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}" 84 MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
31 MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version" 85 MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
32@@ -16890,7 +16890,7 @@ if test "$_JTOPDIR" != "/usr"; then 86@@ -16890,7 +16890,7 @@ if test "$_JTOPDIR" != "/usr"; then
33 aix*) _JNI_INC_SUBDIRS="aix";; 87 aix*) _JNI_INC_SUBDIRS="aix";;
34 bsdi*) _JNI_INC_SUBDIRS="bsdos";; 88 bsdi*) _JNI_INC_SUBDIRS="bsdos";;
35 cygwin*) _JNI_INC_SUBDIRS="win32";; 89 cygwin*) _JNI_INC_SUBDIRS="win32";;