>> On 07/09/13 10:44, Stuart Cassoff wrote:
>>> An individual port of the Tcl Sqlite bindings.
I think I get it now.
Stu
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/sqlite3/Makefile,v
retrieving revision 1.71
diff -u -p -u -p -r1.71 Makefile
--- Makefile 21 Mar 2013 08:45:14 -0000 1.71
+++ Makefile 28 Nov 2013 05:37:31 -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.7.15.2
-DISTNAME= sqlite-src-3071502
+V= 3.8.0.2
+DISTNAME = sqlite-src-3080002
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}
+MASTER_SITES = ${HOMEPAGE}2013/
HOMEPAGE= http://www.sqlite.org/
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/sqlite3/distinfo,v
retrieving revision 1.37
diff -u -p -u -p -r1.37 distinfo
--- distinfo 18 Mar 2013 10:58:16 -0000 1.37
+++ distinfo 28 Nov 2013 05:37:31 -0000
@@ -1,2 +1,2 @@
-SHA256 (sqlite-src-3071502.zip) = pEs4yu2Z+VONB6atQX1WLJlBbsD3mtKdXmCtaaiGbYc=
-SIZE (sqlite-src-3071502.zip) = 5005498
+SHA256 (sqlite-src-3080002.zip) = yTo4uIKED5DhWs89htS65mRiw2CQj12iiA8/u8tCwMI=
+SIZE (sqlite-src-3080002.zip) = 5363492
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/databases/sqlite3/patches/patch-Makefile_in,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 patch-Makefile_in
--- patches/patch-Makefile_in 18 Mar 2013 10:58:16 -0000 1.22
+++ patches/patch-Makefile_in 28 Nov 2013 05:37:31 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.22 2013/03/18 10:58:16 espie Exp $
---- Makefile.in.orig Wed Jan 9 14:51:48 2013
-+++ Makefile.in Mon Mar 18 11:53:00 2013
-@@ -187,7 +187,7 @@ LIBOBJS1 = sqlite3.lo
+--- Makefile.in.orig Tue Sep 3 13:26:17 2013
++++ Makefile.in Wed Nov 27 23:14:02 2013
+@@ -188,7 +188,7 @@ LIBOBJS1 = sqlite3.lo
# Determine the real value of LIBOBJ based on the 'configure' script
#
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.22 2013/
# All of the source code files.
-@@ -282,6 +282,8 @@ SRC = \
+@@ -283,6 +283,8 @@ SRC = \
$(TOP)/src/walker.c \
$(TOP)/src/where.c
@@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile_in,v 1.22 2013/
# Source code for extensions
#
SRC += \
-@@ -476,7 +478,7 @@ EXTHDR += \
+@@ -491,7 +493,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,7 +28,7 @@ $OpenBSD: patch-Makefile_in,v 1.22 2013/
Makefile: $(TOP)/Makefile.in
./config.status
-@@ -488,9 +490,9 @@ libsqlite3.la: $(LIBOBJ)
+@@ -503,9 +505,9 @@ libsqlite3.la: $(LIBOBJ)
$(LTLINK) -o $@ $(LIBOBJ) $(TLIBS) \
${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8"
@@ -40,7 +40,7 @@ $OpenBSD: patch-Makefile_in,v 1.22 2013/
-rpath "$(TCLLIBDIR)" \
-version-info "8:6:8" \
-avoid-version
-@@ -772,6 +774,9 @@ tclsqlite3$(TEXE): tclsqlite-shell.lo libsqlite3.la
+@@ -793,6 +795,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.22 2013/
# Rules to build opcodes.c and opcodes.h
#
opcodes.c: opcodes.h $(TOP)/mkopcodec.awk
-@@ -792,8 +797,12 @@ parse.c: $(TOP)/src/parse.y lemon$(BEXE) $(TOP)/addopc
+@@ -813,8 +818,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,16 +65,16 @@ $OpenBSD: patch-Makefile_in,v 1.22 2013/
keywordhash.h: $(TOP)/tool/mkkeywordhash.c
$(BCC) -o mkkeywordhash$(BEXE) $(OPT_FEATURE_FLAGS) $(OPTS)
$(TOP)/tool/mkkeywordhash.c
./mkkeywordhash$(BEXE) >keywordhash.h
-@@ -875,7 +884,7 @@ TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVAT
+@@ -899,7 +908,7 @@ TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVAT
TESTFIXTURE_FLAGS += -DBUILD_sqlite
TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
-TESTFIXTURE_SRC1 = sqlite3.c
+TESTFIXTURE_SRC1 = sqlite3.c $(TOP)/src/pthread_stub.c
- TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c
$(TESTFIXTURE_SRC$(USE_AMALGAMATION))
+ TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c
+ TESTFIXTURE_SRC += $(TESTFIXTURE_SRC$(USE_AMALGAMATION))
- testfixture$(TEXE): $(TESTFIXTURE_SRC)
-@@ -912,18 +921,12 @@ lib_install: libsqlite3.la
+@@ -937,18 +946,12 @@ lib_install: libsqlite3.la
$(INSTALL) -d $(DESTDIR)$(libdir)
$(LTINSTALL) libsqlite3.la $(DESTDIR)$(libdir)
@@ -96,7 +96,7 @@ $OpenBSD: patch-Makefile_in,v 1.22 2013/
$(INSTALL) -d $(DESTDIR)$(TCLLIBDIR)
$(LTINSTALL) libtclsqlite3.la $(DESTDIR)$(TCLLIBDIR)
rm -f $(DESTDIR)$(TCLLIBDIR)/libtclsqlite3.la
$(DESTDIR)$(TCLLIBDIR)/libtclsqlite3.a
-@@ -947,6 +950,8 @@ clean:
+@@ -975,6 +978,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.11
diff -u -p -u -p -r1.11 patch-src_sqliteInt_h
--- patches/patch-src_sqliteInt_h 29 Nov 2012 05:32:04 -0000 1.11
+++ patches/patch-src_sqliteInt_h 28 Nov 2013 05:37:31 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_sqliteInt_h,v 1.11 2012/11/29 05:32:04 espie Exp $
---- src/sqliteInt.h.orig Thu Oct 4 21:49:22 2012
-+++ src/sqliteInt.h Thu Nov 29 06:30:18 2012
-@@ -61,11 +61,6 @@
+--- 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 @@
#pragma warn -spa /* Suspicious pointer arithmetic */
#endif
@@ -9,11 +9,10 @@ $OpenBSD: patch-src_sqliteInt_h,v 1.11 2
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE
-#endif
--
- /*
- ** Include standard header files as necessary
- */
-@@ -480,33 +475,26 @@ typedef INT8_TYPE i8; /* 1-byte signed in
+
+ #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
