diff options
| author | Matthias Andree <mandree@FreeBSD.org> | 2016-05-23 20:59:55 +0000 |
|---|---|---|
| committer | Matthias Andree <mandree@FreeBSD.org> | 2016-05-23 20:59:55 +0000 |
| commit | a15880181aa7108919cf1233d5fa6e265ed87026 (patch) | |
| tree | 0218357613edaf29902b3a04890cd7acc351e51e /databases/db6 | |
| parent | c86e9d97241f251304781abec881b7b5a934f12a (diff) | |
| download | ports-a15880181aa7108919cf1233d5fa6e265ed87026.tar.gz ports-a15880181aa7108919cf1233d5fa6e265ed87026.zip | |
Notes
Diffstat (limited to 'databases/db6')
| -rw-r--r-- | databases/db6/Makefile | 3 | ||||
| -rw-r--r-- | databases/db6/files/patch-dbinc_mutex_int.h | 11 | ||||
| -rw-r--r-- | databases/db6/files/patch-lang_sql_upgrade61.sh | 4 | ||||
| -rw-r--r-- | databases/db6/files/patch-src_dbinc_mutex__int.h | 11 |
4 files changed, 15 insertions, 14 deletions
diff --git a/databases/db6/Makefile b/databases/db6/Makefile index 4279e5befba8..fbadf1794543 100644 --- a/databases/db6/Makefile +++ b/databases/db6/Makefile @@ -12,7 +12,7 @@ DISTNAME= db-${PORTVERSION} DIST_SUBDIR= bdb MAINTAINER= mandree@FreeBSD.org -COMMENT= The Oracle Berkeley DB, revision ${BDBVER} +COMMENT= Oracle Berkeley DB, revision ${BDBVER} LICENSE= AGPLv3 @@ -28,6 +28,7 @@ GNU_CONFIGURE= yes USES= gmake libtool INSTALL_TARGET= install_include install_lib install_utilities WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix +PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} USE_LDCONFIG= yes PLIST_SUB= BDBMAJ=${BDBMAJ} BDBVER=${BDBVER} MAKE_ARGS+= docdir=${DOCSDIR} diff --git a/databases/db6/files/patch-dbinc_mutex_int.h b/databases/db6/files/patch-dbinc_mutex_int.h deleted file mode 100644 index 8e1ea186217f..000000000000 --- a/databases/db6/files/patch-dbinc_mutex_int.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src/dbinc/mutex_int.h.orig 2010-04-12 13:25:22.000000000 -0700 -+++ ../src/dbinc/mutex_int.h 2014-06-28 01:16:48.321255725 -0700 -@@ -596,7 +596,7 @@ - : "=&r" (__r), "+r" (tsl) - : - : "cr0", "memory"); -- return (int)tsl; -+ return (tsl != 0); - } - - static inline int diff --git a/databases/db6/files/patch-lang_sql_upgrade61.sh b/databases/db6/files/patch-lang_sql_upgrade61.sh index 0867a8ba9332..894fbe49ba76 100644 --- a/databases/db6/files/patch-lang_sql_upgrade61.sh +++ b/databases/db6/files/patch-lang_sql_upgrade61.sh @@ -1,5 +1,5 @@ ---- ../lang/sql/upgrade61.sh 2016-03-28 21:45:53.000000000 +0200 -+++ ../../db6-upgrade61.sh 2016-05-23 21:55:49.741020000 +0200 +--- lang/sql/upgrade61.sh.orig 2016-03-28 19:45:53 UTC ++++ lang/sql/upgrade61.sh @@ -1,12 +1,19 @@ #!/bin/sh # This script upgrades SQL databases from BDB 5.0 to early 6.1 diff --git a/databases/db6/files/patch-src_dbinc_mutex__int.h b/databases/db6/files/patch-src_dbinc_mutex__int.h new file mode 100644 index 000000000000..750f9c3504a4 --- /dev/null +++ b/databases/db6/files/patch-src_dbinc_mutex__int.h @@ -0,0 +1,11 @@ +--- src/dbinc/mutex_int.h.orig 2016-03-28 19:45:54 UTC ++++ src/dbinc/mutex_int.h +@@ -652,7 +652,7 @@ MUTEX_SET(int *tsl) { + : "=&r" (__r), "+r" (tsl) + : + : "cr0", "memory"); +- return (int)tsl; ++ return (tsl != 0); + } + + static inline int |