Fails in tests the same as 3.8.0.2.
port-lib-depends-check and update-plist
indicate some adjustment may still be needed.
Stu
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/sqlite3/Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile
--- Makefile 28 Nov 2013 15:25:51 -0000 1.72
+++ Makefile 19 Oct 2014 04:33:17 -0000
@@ -3,8 +3,8 @@
COMMENT-main= embedded SQL implementation
COMMENT-tcl= TCL bindings for Sqlite3
COMMENT-lemon= LEMON LALR(1) parser generator
-V= 3.8.0.2
-DISTNAME = sqlite-src-3080002
+V= 3.8.6
+DISTNAME = sqlite-src-3080600
EXTRACT_SUFX = .zip
PKGNAME-main= sqlite3-${V}
PKGNAME-tcl= sqlite3-tcl-${V}
@@ -13,7 +13,7 @@ CATEGORIES= databases
IGNORE-main = "--${FULLPKGNAME-main} comes with OpenBSD as of release 5.2"
SUBPACKAGE ?= -lemon
-MASTER_SITES = ${HOMEPAGE}2013/
+MASTER_SITES = ${HOMEPAGE}2014/
HOMEPAGE= http://www.sqlite.org/
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/sqlite3/distinfo,v
retrieving revision 1.38
diff -u -p -r1.38 distinfo
--- distinfo 28 Nov 2013 15:25:51 -0000 1.38
+++ distinfo 19 Oct 2014 04:33:17 -0000
@@ -1,2 +1,2 @@
-SHA256 (sqlite-src-3080002.zip) = yTo4uIKED5DhWs89htS65mRiw2CQj12iiA8/u8tCwMI=
-SIZE (sqlite-src-3080002.zip) = 5363492
+SHA256 (sqlite-src-3080600.zip) = /+UkM07AEqJ6stJofzXS7TQobiuo+OE92fHsc86dzjE=
+SIZE (sqlite-src-3080600.zip) = 5683499
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/databases/sqlite3/patches/patch-Makefile_in,v
retrieving revision 1.23
diff -u -p -r1.23 patch-Makefile_in
--- patches/patch-Makefile_in 28 Nov 2013 15:25:51 -0000 1.23
+++ patches/patch-Makefile_in 19 Oct 2014 04:33:17 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.23 2013/11/28 15:25:51 stu Exp $
---- Makefile.in.orig Tue Sep 3 13:26:17 2013
-+++ Makefile.in Wed Nov 27 23:14:02 2013
+--- Makefile.in.orig Fri Aug 15 10:09:11 2014
++++ Makefile.in Sat Oct 18 23:32:26 2014
@@ -188,7 +188,7 @@ LIBOBJS1 = sqlite3.lo
# Determine the real value of LIBOBJ based on the 'configure' script
@@ -10,16 +10,16 @@ $OpenBSD: patch-Makefile_in,v 1.23 2013/
# All of the source code files.
-@@ -283,6 +283,8 @@ SRC = \
- $(TOP)/src/walker.c \
- $(TOP)/src/where.c
+@@ -286,6 +286,8 @@ SRC = \
+ $(TOP)/src/where.c \
+ $(TOP)/src/whereInt.h
+SRC += $(TOP)/src/pthread_stub.c
+
# Source code for extensions
#
SRC += \
-@@ -491,7 +493,7 @@ EXTHDR += \
+@@ -499,7 +501,7 @@ EXTHDR += \
# This is the default Makefile target. The objects listed here
# are what get build when you type just "make" with no arguments.
#
@@ -28,19 +28,19 @@ $OpenBSD: patch-Makefile_in,v 1.23 2013/
Makefile: $(TOP)/Makefile.in
./config.status
-@@ -503,9 +505,9 @@ libsqlite3.la: $(LIBOBJ)
- $(LTLINK) -o $@ $(LIBOBJ) $(TLIBS) \
+@@ -511,9 +513,9 @@ libsqlite3.la: $(LIBOBJ)
+ $(LTLINK) -no-undefined -o $@ $(LIBOBJ) $(TLIBS) \
${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8"
-libtclsqlite3.la: tclsqlite.lo libsqlite3.la
+libtclsqlite3.la: tclsqlite.lo
- $(LTLINK) -o $@ tclsqlite.lo \
+ $(LTLINK) -no-undefined -o $@ tclsqlite.lo \
- libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
+ -lsqlite3 @TCL_STUB_LIB_SPEC@ $(TLIBS) \
-rpath "$(TCLLIBDIR)" \
-version-info "8:6:8" \
-avoid-version
-@@ -793,6 +795,9 @@ tclsqlite3$(TEXE): tclsqlite-shell.lo libsqlite3.la
+@@ -801,6 +803,9 @@ tclsqlite3$(TEXE): tclsqlite-shell.lo libsqlite3.la
$(LTLINK) -o $@ tclsqlite-shell.lo \
libsqlite3.la $(LIBTCL)
@@ -50,7 +50,7 @@ $OpenBSD: patch-Makefile_in,v 1.23 2013/
# Rules to build opcodes.c and opcodes.h
#
opcodes.c: opcodes.h $(TOP)/mkopcodec.awk
-@@ -813,8 +818,12 @@ parse.c: $(TOP)/src/parse.y lemon$(BEXE) $(TOP)/addopc
+@@ -821,8 +826,12 @@ parse.c: $(TOP)/src/parse.y lemon$(BEXE) $(TOP)/addopc
$(NAWK) -f $(TOP)/addopcodes.awk parse.h.temp >parse.h
sqlite3.h: $(TOP)/src/sqlite.h.in $(TOP)/manifest.uuid $(TOP)/VERSION
@@ -65,7 +65,7 @@ $OpenBSD: patch-Makefile_in,v 1.23 2013/
keywordhash.h: $(TOP)/tool/mkkeywordhash.c
$(BCC) -o mkkeywordhash$(BEXE) $(OPT_FEATURE_FLAGS) $(OPTS)
$(TOP)/tool/mkkeywordhash.c
./mkkeywordhash$(BEXE) >keywordhash.h
-@@ -899,7 +908,7 @@ TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVAT
+@@ -907,7 +916,7 @@ TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVAT
TESTFIXTURE_FLAGS += -DBUILD_sqlite
TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
@@ -74,7 +74,7 @@ $OpenBSD: patch-Makefile_in,v 1.23 2013/
TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c
TESTFIXTURE_SRC += $(TESTFIXTURE_SRC$(USE_AMALGAMATION))
-@@ -937,18 +946,12 @@ lib_install: libsqlite3.la
+@@ -969,18 +978,12 @@ lib_install: libsqlite3.la
$(INSTALL) -d $(DESTDIR)$(libdir)
$(LTINSTALL) libsqlite3.la $(DESTDIR)$(libdir)
@@ -96,7 +96,7 @@ $OpenBSD: patch-Makefile_in,v 1.23 2013/
$(INSTALL) -d $(DESTDIR)$(TCLLIBDIR)
$(LTINSTALL) libtclsqlite3.la $(DESTDIR)$(TCLLIBDIR)
rm -f $(DESTDIR)$(TCLLIBDIR)/libtclsqlite3.la
$(DESTDIR)$(TCLLIBDIR)/libtclsqlite3.a
-@@ -975,6 +978,8 @@ clean:
+@@ -1010,6 +1013,8 @@ clean:
distclean: clean
rm -f config.log config.status libtool Makefile sqlite3.pc
Index: patches/patch-src_sqliteInt_h
===================================================================
RCS file: /cvs/ports/databases/sqlite3/patches/patch-src_sqliteInt_h,v
retrieving revision 1.12
diff -u -p -r1.12 patch-src_sqliteInt_h
--- patches/patch-src_sqliteInt_h 28 Nov 2013 15:25:51 -0000 1.12
+++ patches/patch-src_sqliteInt_h 19 Oct 2014 04:33:17 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_sqliteInt_h,v 1.12 2013/11/28 15:25:51 stu Exp $
---- src/sqliteInt.h.orig Wed Nov 27 23:31:08 2013
-+++ src/sqliteInt.h Wed Nov 27 23:30:35 2013
-@@ -61,10 +61,6 @@
+--- src/sqliteInt.h.orig Fri Aug 15 10:09:11 2014
++++ src/sqliteInt.h Sat Oct 18 23:35:29 2014
+@@ -104,10 +104,6 @@
#pragma warn -spa /* Suspicious pointer arithmetic */
#endif
@@ -12,49 +12,40 @@ $OpenBSD: patch-src_sqliteInt_h,v 1.12 2
#if defined(__OpenBSD__) && !defined(_BSD_SOURCE)
# define _BSD_SOURCE
-@@ -470,33 +466,26 @@ typedef INT8_TYPE i8; /* 1-byte signed in
- typedef u32 tRowcnt; /* 32-bit is the default */
- #endif
-
--/*
--** Macros to determine whether the machine is big or little endian,
--** evaluated at runtime.
--*/
+@@ -553,22 +549,13 @@ typedef INT16_TYPE LogEst;
+ ** -DSQLITE_RUNTIME_BYTEORDER=1 is set, then byte-order is determined
+ ** at run-time.
+ */
-#ifdef SQLITE_AMALGAMATION
-const int sqlite3one = 1;
-+#include <sys/endian.h>
-+#if _BYTE_ORDER == _BIG_ENDIAN
-+#define SQLITE_BIGENDIAN 1
-+#define SQLITE_LITTLEENDIAN 0
-+#define SQLITE_UTF16NATIVE SQLITE_UTF16BE
-+#elif _BYTE_ORDER == _LITTLE_ENDIAN
-+#define SQLITE_BIGENDIAN 0
-+#define SQLITE_LITTLEENDIAN 1
-+#define SQLITE_UTF16NATIVE SQLITE_UTF16LE
- #else
--extern const int sqlite3one;
-+#error "Help, I'm trapped in a PDP11"
- #endif
--#if defined(i386) || defined(__i386__) || defined(_M_IX86)\
-- || defined(__x86_64) || defined(__x86_64__)
--# define SQLITE_BIGENDIAN 0
--# define SQLITE_LITTLEENDIAN 1
--# define SQLITE_UTF16NATIVE SQLITE_UTF16LE
-#else
--# define SQLITE_BIGENDIAN (*(char *)(&sqlite3one)==0)
--# define SQLITE_LITTLEENDIAN (*(char *)(&sqlite3one)==1)
--# define SQLITE_UTF16NATIVE (SQLITE_BIGENDIAN?SQLITE_UTF16BE:SQLITE_UTF16LE)
+-extern const int sqlite3one;
-#endif
-
- /*
- ** Constants for the largest and smallest possible 64-bit signed integers.
+-#if (defined(i386) || defined(__i386__) || defined(_M_IX86) || \
+- defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \
+- defined(_M_AMD64) || defined(_M_ARM) || defined(__x86) || \
+- defined(__arm__)) && !defined(SQLITE_RUNTIME_BYTEORDER)
++#include <sys/endian.h>
++#if _BYTE_ORDER == _LITTLE_ENDIAN
+ # define SQLITE_BYTEORDER 1234
+ # define SQLITE_BIGENDIAN 0
+ # define SQLITE_LITTLEENDIAN 1
+ # define SQLITE_UTF16NATIVE SQLITE_UTF16LE
+-#endif
+-#if (defined(sparc) || defined(__ppc__)) \
+- && !defined(SQLITE_RUNTIME_BYTEORDER)
++#else
+ # define SQLITE_BYTEORDER 4321
+ # define SQLITE_BIGENDIAN 1
+ # define SQLITE_LITTLEENDIAN 0
+@@ -586,8 +573,8 @@ extern const int sqlite3one;
** These macros are designed to work correctly on both 32-bit and 64-bit
** compilers.
*/
-#define LARGEST_INT64 (0xffffffff|(((i64)0x7fffffff)<<32))
-#define SMALLEST_INT64 (((i64)-1) - LARGEST_INT64)
-+#define LARGEST_INT64 INT64_MAX
-+#define SMALLEST_INT64 INT64_MIN
++#define LARGEST_INT64 INT64_MAX
++#define SMALLEST_INT64 INT64_MIN
/*
** Round up a number to the next larger multiple of 8. This is used
