[Midnightbsd-cvs] mports [23724] trunk/databases/db5: fix build on current.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Aug 17 15:53:08 EDT 2018
Revision: 23724
http://svnweb.midnightbsd.org/mports/?rev=23724
Author: laffer1
Date: 2018-08-17 15:53:07 -0400 (Fri, 17 Aug 2018)
Log Message:
-----------
fix build on current.
Modified Paths:
--------------
trunk/databases/db5/Makefile
trunk/databases/db5/files/patch-dist_configure
trunk/databases/db5/files/patch-src_dbinc_atomic.h
trunk/databases/db5/pkg-descr
Added Paths:
-----------
trunk/databases/db5/files/patch-lang_tcl_tcl__db.c
trunk/databases/db5/files/patch-lang_tcl_tcl__env.c
trunk/databases/db5/files/patch-lang_tcl_tcl__seq.c
trunk/databases/db5/files/patch-src_dbinc_mutex__int.h
trunk/databases/db5/files/patch-src_heap_heap__verify.c
Modified: trunk/databases/db5/Makefile
===================================================================
--- trunk/databases/db5/Makefile 2018-08-17 18:47:37 UTC (rev 23723)
+++ trunk/databases/db5/Makefile 2018-08-17 19:53:07 UTC (rev 23724)
@@ -2,7 +2,7 @@
PORTNAME= db5
PORTVERSION= 5.3.28
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= databases java
MASTER_SITES= http://download.oracle.com/berkeley-db/
PKGNAMEPREFIX?=
@@ -14,7 +14,11 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= Oracle Berkeley DB, revision ${BDBVER}
-LICENSE= bdb
+LICENSE= SLEEPYCAT
+LICENSE_NAME= Sleepycat
+LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_FILE= ${WRKSRC}/../LICENSE
+LICENSE_GROUPS= FSF GPL OSI
BDBVER= ${PORTVERSION:R}
BDBMAJ= ${BDBVER:R}
@@ -23,14 +27,19 @@
--disable-tcl \
--includedir=${PREFIX}/include/${PORTNAME} \
--libdir=${PREFIX}/lib/${PORTNAME} \
- --bindir=${PREFIX}/bin/${PORTNAME}
+ --bindir=${PREFIX}/bin/${PORTNAME} \
+ --host=${ARCH}-portbld-midnightbsd${OSREL} \
+ --target=${ARCH}-portbld-midnightbsd${OSREL}
CONFIGURE_SCRIPT= ../dist/configure
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}
+CFLAGS+= -Wall -Wextra
OPTIONS_DEFINE= CRYPTO L10N SQL JAVA DOCS
OPTIONS_DEFAULT=CRYPTO
@@ -87,7 +96,7 @@
post-install:
.for i in libdb libdb_cxx libdb_stl ${libdb_sql} ${libdb_java}
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so.0
+# ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so.0
${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib
${LN} -s -f ${PORTNAME}/${i}-${BDBMAJ}.so ${STAGEDIR}${PREFIX}/lib
${LN} -s -f ${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib/${i}-${BDBVER}.so
Modified: trunk/databases/db5/files/patch-dist_configure
===================================================================
--- trunk/databases/db5/files/patch-dist_configure 2018-08-17 18:47:37 UTC (rev 23723)
+++ trunk/databases/db5/files/patch-dist_configure 2018-08-17 19:53:07 UTC (rev 23724)
@@ -1,6 +1,7 @@
---- ../dist/configure.orig Wed Dec 5 13:14:02 2001
-+++ ../dist/configure Wed Dec 5 13:24:01 2001
-@@ -20867,8 +20867,8 @@
+--- dist/configure.orig 2013-09-09 15:35:02 UTC
++++ dist/configure
+@@ -17712,10 +17712,10 @@ LIBTOOL="./libtool"
+ INSTALLER="\$(LIBTOOL) --mode=install cp -p"
MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
@@ -11,3 +12,4 @@
+MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -version-info 0:0:0"
MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}"
+
Added: trunk/databases/db5/files/patch-lang_tcl_tcl__db.c
===================================================================
--- trunk/databases/db5/files/patch-lang_tcl_tcl__db.c (rev 0)
+++ trunk/databases/db5/files/patch-lang_tcl_tcl__db.c 2018-08-17 19:53:07 UTC (rev 23724)
@@ -0,0 +1,30 @@
+--- lang/tcl/tcl_db.c.orig 2013-09-09 15:35:07 UTC
++++ lang/tcl/tcl_db.c
+@@ -3708,9 +3708,10 @@ tcl_DbGetFlags(interp, objc, objv, dbp)
+ for (i = 0; db_flags[i].flag != 0; i++)
+ if (LF_ISSET(db_flags[i].flag)) {
+ if (strlen(buf) > 0)
+- (void)strncat(buf, " ", sizeof(buf));
+- (void)strncat(
+- buf, db_flags[i].arg, sizeof(buf));
++ (void)strncat(buf, " ",
++ sizeof(buf) - (strlen(buf) + 1));
++ (void)strncat(buf, db_flags[i].arg,
++ sizeof(buf) - (strlen(buf) + 1));
+ }
+
+ res = NewStringObj(buf, strlen(buf));
+@@ -3764,9 +3765,10 @@ tcl_DbGetOpenFlags(interp, objc, objv, d
+ for (i = 0; open_flags[i].flag != 0; i++)
+ if (LF_ISSET(open_flags[i].flag)) {
+ if (strlen(buf) > 0)
+- (void)strncat(buf, " ", sizeof(buf));
+- (void)strncat(
+- buf, open_flags[i].arg, sizeof(buf));
++ (void)strncat(buf, " ",
++ sizeof(buf) - (strlen(buf) + 1));
++ (void)strncat(buf, open_flags[i].arg,
++ sizeof(buf) - (strlen(buf) + 1));
+ }
+
+ res = NewStringObj(buf, strlen(buf));
Property changes on: trunk/databases/db5/files/patch-lang_tcl_tcl__db.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/db5/files/patch-lang_tcl_tcl__env.c
===================================================================
--- trunk/databases/db5/files/patch-lang_tcl_tcl__env.c (rev 0)
+++ trunk/databases/db5/files/patch-lang_tcl_tcl__env.c 2018-08-17 19:53:07 UTC (rev 23724)
@@ -0,0 +1,44 @@
+--- lang/tcl/tcl_env.c.orig 2013-09-09 15:35:07 UTC
++++ lang/tcl/tcl_env.c
+@@ -2864,9 +2864,10 @@ env_GetFlags(interp, objc, objv, dbenv)
+ for (i = 0; open_flags[i].flag != 0; i++)
+ if (LF_ISSET(open_flags[i].flag)) {
+ if (strlen(buf) > 0)
+- (void)strncat(buf, " ", sizeof(buf));
+- (void)strncat(
+- buf, open_flags[i].arg, sizeof(buf));
++ (void)strncat(buf, " ",
++ sizeof(buf) - (strlen(buf) + 1));
++ (void)strncat(buf, open_flags[i].arg,
++ sizeof(buf) - (strlen(buf) + 1));
+ }
+
+ res = NewStringObj(buf, strlen(buf));
+@@ -2930,9 +2931,10 @@ env_GetOpenFlag(interp, objc, objv, dben
+ for (i = 0; open_flags[i].flag != 0; i++)
+ if (LF_ISSET(open_flags[i].flag)) {
+ if (strlen(buf) > 0)
+- (void)strncat(buf, " ", sizeof(buf));
+- (void)strncat(
+- buf, open_flags[i].arg, sizeof(buf));
++ (void)strncat(buf, " ",
++ sizeof(buf) - (strlen(buf) + 1));
++ (void)strncat(buf, open_flags[i].arg,
++ sizeof(buf) - (strlen(buf) + 1));
+ }
+
+ res = NewStringObj(buf, strlen(buf));
+@@ -2982,9 +2984,10 @@ tcl_EnvGetEncryptFlags(interp, objc, obj
+ for (i = 0; encrypt_flags[i].flag != 0; i++)
+ if (LF_ISSET(encrypt_flags[i].flag)) {
+ if (strlen(buf) > 0)
+- (void)strncat(buf, " ", sizeof(buf));
+- (void)strncat(
+- buf, encrypt_flags[i].arg, sizeof(buf));
++ (void)strncat(buf, " ",
++ sizeof(buf) - (strlen(buf) + 1));
++ (void)strncat(buf, encrypt_flags[i].arg,
++ sizeof(buf) - (strlen(buf) + 1));
+ }
+
+ res = NewStringObj(buf, strlen(buf));
Property changes on: trunk/databases/db5/files/patch-lang_tcl_tcl__env.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/db5/files/patch-lang_tcl_tcl__seq.c
===================================================================
--- trunk/databases/db5/files/patch-lang_tcl_tcl__seq.c (rev 0)
+++ trunk/databases/db5/files/patch-lang_tcl_tcl__seq.c 2018-08-17 19:53:07 UTC (rev 23724)
@@ -0,0 +1,16 @@
+--- lang/tcl/tcl_seq.c.orig 2013-09-09 15:35:07 UTC
++++ lang/tcl/tcl_seq.c
+@@ -555,9 +555,10 @@ tcl_SeqGetFlags(interp, objc, objv, seq)
+ for (i = 0; seq_flags[i].flag != 0; i++)
+ if (LF_ISSET(seq_flags[i].flag)) {
+ if (strlen(buf) > 0)
+- (void)strncat(buf, " ", sizeof(buf));
+- (void)strncat(
+- buf, seq_flags[i].arg, sizeof(buf));
++ (void)strncat(buf, " ",
++ sizeof(buf) - (strlen(buf) + 1));
++ (void)strncat(buf, seq_flags[i].arg,
++ sizeof(buf) - (strlen(buf) + 1));
+ }
+
+ res = NewStringObj(buf, strlen(buf));
Property changes on: trunk/databases/db5/files/patch-lang_tcl_tcl__seq.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/databases/db5/files/patch-src_dbinc_atomic.h
===================================================================
--- trunk/databases/db5/files/patch-src_dbinc_atomic.h 2018-08-17 18:47:37 UTC (rev 23723)
+++ trunk/databases/db5/files/patch-src_dbinc_atomic.h 2018-08-17 19:53:07 UTC (rev 23724)
@@ -1,5 +1,5 @@
---- ../src/dbinc/atomic.h.orig 2012-02-29 19:48:38.000000000 +0100
-+++ ../src/dbinc/atomic.h 2012-05-04 22:39:32.000000000 +0200
+--- src/dbinc/atomic.h.orig 2013-09-09 15:35:08 UTC
++++ src/dbinc/atomic.h
@@ -70,7 +70,7 @@ typedef struct {
* These have no memory barriers; the caller must include them when necessary.
*/
Added: trunk/databases/db5/files/patch-src_dbinc_mutex__int.h
===================================================================
--- trunk/databases/db5/files/patch-src_dbinc_mutex__int.h (rev 0)
+++ trunk/databases/db5/files/patch-src_dbinc_mutex__int.h 2018-08-17 19:53:07 UTC (rev 23724)
@@ -0,0 +1,11 @@
+--- src/dbinc/mutex_int.h.orig 2013-09-09 15:35:08 UTC
++++ src/dbinc/mutex_int.h
+@@ -596,7 +596,7 @@ MUTEX_SET(int *tsl) {
+ : "=&r" (__r), "+r" (tsl)
+ :
+ : "cr0", "memory");
+- return (int)tsl;
++ return (tsl != 0);
+ }
+
+ static inline int
Property changes on: trunk/databases/db5/files/patch-src_dbinc_mutex__int.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/databases/db5/files/patch-src_heap_heap__verify.c
===================================================================
--- trunk/databases/db5/files/patch-src_heap_heap__verify.c (rev 0)
+++ trunk/databases/db5/files/patch-src_heap_heap__verify.c 2018-08-17 19:53:07 UTC (rev 23724)
@@ -0,0 +1,11 @@
+--- src/heap/heap_verify.c.orig 2013-09-09 15:35:08 UTC
++++ src/heap/heap_verify.c
+@@ -122,7 +122,7 @@ __heap_vrfy(dbp, vdp, h, pgno, flags)
+ {
+ HEAPHDR *hdr;
+ int cnt, i, j, ret;
+- db_indx_t *offsets, *offtbl, end;
++ db_indx_t *offsets = NULL, *offtbl, end;
+
+ if ((ret = __db_vrfy_datapage(dbp, vdp, h, pgno, flags)) != 0)
+ goto err;
Property changes on: trunk/databases/db5/files/patch-src_heap_heap__verify.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/databases/db5/pkg-descr
===================================================================
--- trunk/databases/db5/pkg-descr 2018-08-17 18:47:37 UTC (rev 23723)
+++ trunk/databases/db5/pkg-descr 2018-08-17 19:53:07 UTC (rev 23724)
@@ -8,4 +8,4 @@
be confident that Oracle Berkeley DB will manage your persistence
needs.
-WWW: http://www.oracle.com/us/products/database/berkeley-db/db/
+WWW: https://www.oracle.com/database/berkeley-db/db.html
More information about the Midnightbsd-cvs
mailing list