pkg/52850: devel/fossil update

[dziltener%lyrion.ch@localhost]

>Number:         52850
>Category:       pkg
>Synopsis:       updated fossil to 2.4 and added an options.mk.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Dec 22 16:25:00 +0000 2017
>Originator:     dziltener%lyrion.ch@localhost
>Release:        NetBSD 7.1
>Organization:
	
>Environment:
System: NetBSD lyrion.ch 7.1 NetBSD 7.1 (GENERIC.201703111743Z) amd64
Architecture: x86_64
Machine: amd64
>Description:
	I updated fossil to version 2.4, added an options.mk and removed the patch.
>How-To-Repeat:
	Does not apply here.
>Fix:
	fossil.patch follows:
	
	diff -ENwbur /usr/pkgsrc/devel/fossil/Makefile /usr/pkgsrc/zilti/fossil/Makefile
	--- /usr/pkgsrc/devel/fossil/Makefile	2017-04-22 16:30:58.000000000 +0200
	+++ /usr/pkgsrc/devel/fossil/Makefile	2017-12-19 02:00:05.000000000 +0100
	@@ -1,6 +1,6 @@
	 # $NetBSD: Makefile,v 1.42 2017/04/22 14:30:58 joerg Exp $
	 
	-DISTNAME=	fossil-src-2.2
	+DISTNAME=	fossil-src-2.4
	 PKGNAME=	${DISTNAME:S/-src//}
	 WRKSRC=		${WRKDIR}/${PKGNAME}
	 CATEGORIES=	devel scm
	@@ -15,6 +15,8 @@
	 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl:Q}
	 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib:Q}
	 
	+.include "options.mk"
	+
	 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1 share/doc/${PKGBASE}
	 
	 pre-configure:
	diff -ENwbur /usr/pkgsrc/devel/fossil/distinfo /usr/pkgsrc/zilti/fossil/distinfo
	--- /usr/pkgsrc/devel/fossil/distinfo	2017-04-19 14:23:34.000000000 +0200
	+++ /usr/pkgsrc/devel/fossil/distinfo	2017-12-22 17:05:22.000000000 +0100
	@@ -1,7 +1,6 @@
	 $NetBSD: distinfo,v 1.28 2017/04/19 12:23:34 joerg Exp $
	 
	-SHA1 (fossil-src-2.2.tar.gz) = b4e1899a174af3631764c6ce5309c30ff9520b22
	-RMD160 (fossil-src-2.2.tar.gz) = 060a45797e4f688809f1790202ae16d04987274e
	-SHA512 (fossil-src-2.2.tar.gz) = 1a1aedf3f9883a64f9f98c9a01857f5fb69cff0be23817016a4bc405b2efc85f21ac86a771d5e7314128e3fabc21444ac717017cf0935241fd4af964b7c086e0
	-Size (fossil-src-2.2.tar.gz) = 4826890 bytes
	-SHA1 (patch-src_export.c) = 098ed4cfc33bc559e08f790307be2d526956f5e1
	+SHA1 (fossil-src-2.4.tar.gz) = 3851ae290a178853456ad39189b28e2256eaac88
	+RMD160 (fossil-src-2.4.tar.gz) = d30aead999eb8d1eb5f77b4ac509f2dcd17e1283
	+SHA512 (fossil-src-2.4.tar.gz) = de7f2321677df7f6dc2a3a20e58f456602d938f40125ef33d401f28cdaa93e38d3db10e109547df269bc95a2ac8669ade05b6fd6fad39e6633f15ffdd91c499f
	+Size (fossil-src-2.4.tar.gz) = 4919205 bytes
	diff -ENwbur /usr/pkgsrc/devel/fossil/options.mk /usr/pkgsrc/zilti/fossil/options.mk
	--- /usr/pkgsrc/devel/fossil/options.mk	1970-01-01 01:00:00.000000000 +0100
	+++ /usr/pkgsrc/devel/fossil/options.mk	2017-12-22 13:42:36.000000000 +0100
	@@ -0,0 +1,24 @@
	+PKG_OPTIONS_VAR=	PKG_OPTIONS.fossil
	+PKG_SUPPORTED_OPTIONS=	th1-hooks tcl json system-sqlite
	+
	+.include "../../mk/bsd.prefs.mk"
	+.include "../../mk/bsd.options.mk"
	+
	+.if !empty(PKG_OPTIONS:Mth1-hooks)
	+CONFIGURE_ARGS+=	--with-th1-hooks
	+.endif
	+
	+.if !empty(PKG_OPTIONS:Mtcl)
	+CONFIGURE_ARGS+=	--with-tcl
	+CONFIGURE_ARGS+=	--with-tcl-private-stubs
	+.include "../../lang/tcl/buildlink3.mk"
	+.endif
	+
	+.if !empty(PKG_OPTIONS:Mjson)
	+CONFIGURE_ARGS+=	--json
	+.endif
	+
	+.if !empty(PKG_OPTIONS:Msystem-sqlite)
	+CONFIGURE_ARGS+=	--disable-internal-sqlite
	+.include "../../databases/sqlite3/buildlink3.mk"
	+.endif
	diff -ENwbur /usr/pkgsrc/devel/fossil/patches/patch-src_export.c /usr/pkgsrc/zilti/fossil/patches/patch-src_export.c
	--- /usr/pkgsrc/devel/fossil/patches/patch-src_export.c	2017-04-19 14:23:34.000000000 +0200
	+++ /usr/pkgsrc/devel/fossil/patches/patch-src_export.c	1970-01-01 01:00:00.000000000 +0100
	@@ -1,12 +0,0 @@
	-$NetBSD: patch-src_export.c,v 1.1 2017/04/19 12:23:34 joerg Exp $
	-
	---- src/export.c.orig	2017-04-19 12:13:17.766852878 +0000
	-+++ src/export.c
	-@@ -511,6 +511,7 @@ void export_cmd(void){
	-   db_multi_exec("CREATE TEMPORARY TABLE oldblob(rid INTEGER PRIMARY KEY)");
	-   db_multi_exec("CREATE TEMPORARY TABLE oldcommit(rid INTEGER PRIMARY KEY)");
	-   db_multi_exec("CREATE TEMP TABLE xmark(tname TEXT UNIQUE, trid INT, tuuid TEXT)");
	-+  db_multi_exec("CREATE INDEX xmark_trid ON xmark(trid)");
	-   if( markfile_in!=0 ){
	-     Stmt qb,qc;
	-     FILE *f;