On Mon, Oct 15, 2012 at 07:47:06PM -0400, James Turner wrote:
> Here is a resubmit diff to bring fossil up to 1.23. It also fixes the
> fossil sqlite3 command by making sure the system sqlite.h file is used.
> Tested on amd64. Thanks.
>
Fossil 1.24 was released today, updated patch attached. Tested on amd64.
--
James Turner
ja...@calminferno.net
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/fossil/Makefile,v
retrieving revision 1.34
diff -N -u -p Makefile
--- Makefile 30 Apr 2012 13:12:15 -0000 1.34
+++ Makefile 23 Oct 2012 01:26:25 -0000
@@ -2,11 +2,10 @@
COMMENT = simple distributed software configuration management
-DISTNAME = fossil-src-20120317175325
-PKGNAME = fossil-1.22
+DISTNAME = fossil-src-20121022124804
+PKGNAME = fossil-1.24
EPOCH = 0
CATEGORIES = devel www
-REVISION = 0
MAINTAINER = James Turner <ja...@calminferno.net>
@@ -30,13 +29,15 @@ BUILD_DEPENDS = ${MODTCL_BUILD_DEPENDS}
CONFIGURE_STYLE = simple
CONFIGURE_ARGS = --disable-internal-sqlite --disable-lineedit
-CONFIGURE_ENV = CFLAGS="-I${LOCALBASE}/include
-L${LOCALBASE}/lib"
.if ${FLAVOR} == "static"
CONFIGURE_ARGS += --static --with-openssl=none
.endif
REGRESS_DEPENDS = ${MODTCL_RUN_DEPENDS}
+
+post-extract:
+ @rm -f ${WRKSRC}/src/sqlite3.h
do-regress:
@cd ${WRKSRC} && ${MODTCL_BIN} test/tester.tcl fossil
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/fossil/distinfo,v
retrieving revision 1.24
diff -N -u -p distinfo
--- distinfo 4 Apr 2012 22:49:48 -0000 1.24
+++ distinfo 23 Oct 2012 01:26:25 -0000
@@ -1,5 +1,2 @@
-MD5 (fossil-src-20120317175325.tar.gz) = pxBkUHIuhHeXLSMPpTVwLw==
-RMD160 (fossil-src-20120317175325.tar.gz) = zInAfxq4We4yzF+sqqHkWVS2k3Y=
-SHA1 (fossil-src-20120317175325.tar.gz) = Aum+PPawct/SyY+n3QWi30oUz7Y=
-SHA256 (fossil-src-20120317175325.tar.gz) =
jqNGKinmRf4L0GLVdC3k4ZIaOKzO1RB9CEZYIdlaqbA=
-SIZE (fossil-src-20120317175325.tar.gz) = 2759495
+SHA256 (fossil-src-20121022124804.tar.gz) =
Naa/I1rj1WFcFBFYc4ADDT8WFTv3wJdO60whM1pmmz0=
+SIZE (fossil-src-20121022124804.tar.gz) = 2843987
Index: patches/patch-src_main_mk
===================================================================
RCS file: /cvs/ports/devel/fossil/patches/Attic/patch-src_main_mk,v
diff -N -u -p patches/patch-src_main_mk
--- /dev/null 22 Oct 2012 19:26:25 -0000
+++ patches/patch-src_main_mk 23 Oct 2012 01:26:25 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- src/main.mk.orig Mon Oct 22 21:20:42 2012
++++ src/main.mk Mon Oct 22 21:21:05 2012
+@@ -380,7 +380,7 @@ clean:
+ $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
+ $(OBJDIR)/mkindex $(TRANS_SRC) >$@
+ $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders
$(OBJDIR)/VERSION.h
+- $(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h
$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h
$(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h
$(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h
$(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h
$(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h
$(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h
$(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h
$(OBJDIR)/clone_.c:$(OBJDIR)/clone.h
$(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h
$(OBJDIR)/configure_.c:$(OBJDIR)/configure.h
$(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h
$(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h
$(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h
$(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h
$(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h
$(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h
$(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h
$(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h
$(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h
$(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h
$(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h
$(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h
$(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h
$(OBJDIR)/json_.c:$(OBJDIR)/json.h
$(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h
$(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h
$(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h
$(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h
$(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h
$(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.h
$(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h
$(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h
$(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h
$(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h
$(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h
$(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h
$(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h
$(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h
$(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h
$(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h
$(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h
$(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h
$(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h
$(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h
$(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h
$(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h
$(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h
$(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h
$(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h
$(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h
$(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h
$(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h
$(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h
$(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h
$(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h
$(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h
$(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h
$(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h
$(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h
$(OBJDIR)/wysiwyg_.c:$(OBJDIR)/wysiwyg.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h
$(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h
$(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
++ $(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h
$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h
$(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h
$(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h
$(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h
$(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h
$(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h
$(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h
$(OBJDIR)/clone_.c:$(OBJDIR)/clone.h
$(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h
$(OBJDIR)/configure_.c:$(OBJDIR)/configure.h
$(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h
$(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h
$(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h
$(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h
$(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h
$(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h
$(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h
$(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h
$(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h
$(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h
$(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h
$(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h
$(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h
$(OBJDIR)/json_.c:$(OBJDIR)/json.h
$(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h
$(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h
$(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h
$(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h
$(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h
$(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.h
$(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h
$(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h
$(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h
$(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h
$(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h
$(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h
$(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h
$(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h
$(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h
$(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h
$(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h
$(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h
$(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h
$(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h
$(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h
$(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h
$(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h
$(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h
$(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h
$(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h
$(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h
$(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h
$(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h
$(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h
$(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h
$(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h
$(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h
$(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h
$(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h
$(OBJDIR)/wysiwyg_.c:$(OBJDIR)/wysiwyg.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h
$(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h
$(SRCDIR)/th.h $(OBJDIR)/VERSION.h
+ touch $(OBJDIR)/headers
+ $(OBJDIR)/headers: Makefile
+ $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o
$(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o
$(OBJDIR)/json_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o
$(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o
$(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
+@@ -1074,7 +1074,7 @@ $(OBJDIR)/zip.h: $(OBJDIR)/headers
+ $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
+ $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0
-DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3
-Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c
$(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
+
+-$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
++$(OBJDIR)/shell.o: $(SRCDIR)/shell.c
+ $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c
$(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
+
+ $(OBJDIR)/th.o: $(SRCDIR)/th.c
Index: patches/patch-src_shell_c
===================================================================
RCS file: patches/patch-src_shell_c
diff -N -u -p patches/patch-src_shell_c
--- /dev/null 22 Oct 2012 19:26:25 -0000
+++ patches/patch-src_shell_c 23 Oct 2012 01:26:25 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/shell.c.orig Wed Aug 8 12:15:08 2012
++++ src/shell.c Wed Aug 8 12:15:16 2012
+@@ -32,7 +32,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <assert.h>
+-#include "sqlite3.h"
++#include <sqlite3.h>
+ #include <ctype.h>
+ #include <stdarg.h>
+
