svn commit: r432224 - in head/devel/fossil: . files

[Guido Falsi]

Author: madpilot
Date: Mon Jan 23 14:19:16 2017
New Revision: 432224
URL: https://svnweb.freebsd.org/changeset/ports/432224

Log:
  - Update fossil to 1.37
  - Fix known regression [1]
  - Convert to USES=localbase
  
  Obtained from: http://fossil-scm.org/index.html/info/3eec799992757443 [1]

Added:
  head/devel/fossil/files/patch-src_checkin.c   (contents, props changed)
Modified:
  head/devel/fossil/Makefile
  head/devel/fossil/distinfo

Modified: head/devel/fossil/Makefile
==============================================================================
--- head/devel/fossil/Makefile	Mon Jan 23 14:11:26 2017	(r432223)
+++ head/devel/fossil/Makefile	Mon Jan 23 14:19:16 2017	(r432224)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	fossil
-PORTVERSION=	1.36
+PORTVERSION=	1.37
 DISTVERSIONPREFIX=	src-
 PORTEPOCH=	2
 CATEGORIES=	devel www
@@ -23,7 +23,7 @@ MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_DEFINE=	JSON FUSE STATIC
 OPTIONS_DEFAULT=	JSON
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME:C/^(.).*/\1/:tu}${PORTNAME:C/^.(.*)/\1/}_2017-01-16_205854_1669115ab9
 JSON_DESC=	JSON API support
 FUSE_DESC=	Enable fossil fusefs command
 
@@ -31,8 +31,10 @@ JSON_CONFIGURE_ON=	--json
 STATIC_CONFIGURE_ON=	--static
 FUSE_CONFIGURE_OFF=	--disable-fusefs
 FUSE_LIB_DEPENDS=	libfuse.so:sysutils/fusefs-libs
-FUSE_CFLAGS=		-I${LOCALBASE}/include
-FUSE_LDFLAGS=		-L${LOCALBASE}/lib
+FUSE_USES=		localbase:ldflags
+
+post-patch-FUSE-on:
+	@${REINPLACE_CMD} -e 's/define-append LIBS -lfuse/& -pthread/' ${WRKSRC}/auto.def
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fossil

Modified: head/devel/fossil/distinfo
==============================================================================
--- head/devel/fossil/distinfo	Mon Jan 23 14:11:26 2017	(r432223)
+++ head/devel/fossil/distinfo	Mon Jan 23 14:19:16 2017	(r432224)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477468560
-SHA256 (fossil-src-1.36.tar.gz) = 2676c35ec5e44099a3522e7e9f1d1f84a9338db4457618d5338cb6826d0dfd12
-SIZE (fossil-src-1.36.tar.gz) = 4721453
+TIMESTAMP = 1485158650
+SHA256 (fossil-src-1.37.tar.gz) = 81c19e81c4b2b60930bab3f2147b516525c855924ccc6d089748b0f5611be492
+SIZE (fossil-src-1.37.tar.gz) = 4796866

Added: head/devel/fossil/files/patch-src_checkin.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/fossil/files/patch-src_checkin.c	Mon Jan 23 14:19:16 2017	(r432224)
@@ -0,0 +1,11 @@
+--- src/checkin.c.orig	2017-01-16 20:58:54 UTC
++++ src/checkin.c
+@@ -173,7 +173,7 @@ static void status_report(
+       blob_append_sql(&sql, " UNION ALL");
+     }
+     blob_append_sql(&sql,
+-      " SELECT pathname, %s, %s, 0, 0, 0, 0, 0, 0"
++      " SELECT pathname, %s, %s, 0, 0, 0, 0, 0"
+       " FROM sfile WHERE pathname NOT IN (%s)%s",
+       flags & C_MTIME ? "datetime(mtime, 'unixepoch', toLocal())" : "''",
+       flags & C_SIZE ? "size" : "0",