On Wed, Aug 08, 2012 at 12:29:18PM -0400, James Turner wrote:
> This is what I get for rushing. Attached is another new diff that
> removed CONFIGURE_ENV that is no longer needed is sqlite3 is in base.
>
> I've also added 2 patches that makes the fossil sqlite3 command work.
>
Maybe this is a better way to make sure the system sqlite3.h gets used?
Only requires one patch and no need for the post-extract. I'll defer to
the ports experts on which diff to go with.
--
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 9 Aug 2012 00:49:27 -0000
@@ -2,11 +2,10 @@
COMMENT = simple distributed software configuration management
-DISTNAME = fossil-src-20120317175325
-PKGNAME = fossil-1.22
+DISTNAME = fossil-src-20120808112557
+PKGNAME = fossil-1.23
EPOCH = 0
CATEGORIES = devel www
-REVISION = 0
MAINTAINER = James Turner <ja...@calminferno.net>
@@ -30,7 +29,6 @@ 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
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 9 Aug 2012 00:49:27 -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-20120808112557.tar.gz) =
/QynsRkG0N/UVBp6JRjtQUB7TCmF6wm2SqE5ClDFGko=
+SIZE (fossil-src-20120808112557.tar.gz) = 2811716
Index: patches/patch-src_shell_c
===================================================================
RCS file: patches/patch-src_shell_c
diff -N -u -p patches/patch-src_shell_c
--- /dev/null 8 Aug 2012 18:49:27 -0000
+++ patches/patch-src_shell_c 9 Aug 2012 00:49:27 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/shell.c.orig Wed Aug 8 20:43:51 2012
++++ src/shell.c Wed Aug 8 20:45:15 2012
+@@ -32,7 +32,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <assert.h>
+-#include "sqlite3.h"
++#include "/usr/include/sqlite3.h"
+ #include <ctype.h>
+ #include <stdarg.h>
+
