Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Dec 2018 16:08:53 +0000 (UTC)
From:      Eugene Grosbein <eugen@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r487694 - head/sysutils/fusefs-webdavfs
Message-ID:  <201812171608.wBHG8rnx049397@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: eugen
Date: Mon Dec 17 16:08:52 2018
New Revision: 487694
URL: https://svnweb.freebsd.org/changeset/ports/487694

Log:
  sysutils/fusefs-webdavfs: update to g20181010
  
  - mount options: cookie and rwdirops;
  
  - specify multiple licenses (BSD3CLAUSE, BSD4CLAUSE and MIT)
    for this multi-distfiles port;
  
  - optimize post-patch target to look only for '*.go' files
    and recurse only to two needed directories;
    this prevents it from descending into .ccache
    directory mounted by poudriere+ccache inside WORKDIR. (*)
  
  PR:		234099
  Reported by:	Kai <freebsd_ports@k-worx.org> (*)

Modified:
  head/sysutils/fusefs-webdavfs/Makefile
  head/sysutils/fusefs-webdavfs/distinfo

Modified: head/sysutils/fusefs-webdavfs/Makefile
==============================================================================
--- head/sysutils/fusefs-webdavfs/Makefile	Mon Dec 17 15:15:05 2018	(r487693)
+++ head/sysutils/fusefs-webdavfs/Makefile	Mon Dec 17 16:08:52 2018	(r487694)
@@ -2,24 +2,33 @@
 # $FreeBSD$
 
 PORTNAME=	fusefs-webdavfs
-DISTVERSION=	g20180413
+DISTVERSION=	g20181010
 CATEGORIES=	sysutils
 
 MAINTAINER=	eugen@FreeBSD.org
 COMMENT=	FUSE filesystem for WEBDAV shares
 
-LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKDIR}/fuse-${FUSE_GH_TAGNAME}/LICENSE
+LICENSE=	BSD3CLAUSE BSD4CLAUSE MIT
+LICENSE_COMB=	multi
+LICENSE_FILE_BSD3CLAUSE=	${WRKDIR}/fuse-${FUSE_GH_TAGNAME}/LICENSE
+LICENSE_FILE_BSD4CLAUSE=	${WRKDIR}/getopt-${GETOPT_GH_TAGNAME}/LICENSE
+LICENSE_FILE_MIT=		${WRKDIR}/webdavfs-${GH_TAGNAME}/LICENSE.md
+LICENSE_DISTFILES_MIT=		${DISTNAME}${EXTRACT_SUFX}
+LICENSE_DISTFILES_BSD3CLAUSE=	${DISTNAME_fuse}_GH${_GITHUB_REV}${EXTRACT_SUFX}
+LICENSE_DISTFILES_BSD4CLAUSE=	${DISTNAME_getopt}_GH${_GITHUB_REV}${EXTRACT_SUFX}
 
+# This needs to be Go 1.7 or newer.
+USES=		go
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	miquels
 GH_PROJECT=	webdavfs
-GH_TAGNAME=	c503b3c
+GH_TAGNAME=	c03fa01
 
-# 2017-01-13
+# 2018-08-11
 GETOPT_GH_ACCOUNT=	pborman
 GETOPT_GH_PROJECT=	getopt
-GETOPT_GH_TAGNAME=	7148bc3
+GETOPT_GH_TAGNAME=	2b5b3bf
 GETOPT_WRKSRCDIR=	${GO_WRKSRC}/../src/github.com/${GETOPT_GH_ACCOUNT}/${GETOPT_GH_PROJECT}
 
 # 2018-04-21
@@ -36,11 +45,9 @@ PLIST_FILES=	sbin/mount.webdavfs sbin/mount_webdavfs
 
 SUB_FILES=	pkg-message mount_webdavfs
 
-# This needs to be Go 1.7 or newer.
-USES=		go
-
 post-patch:
-	${GREP} -Flr '"golang.org/x/net/context"' ${WRKDIR} |\
+	${GREP} -Flr --include '*.go' '"golang.org/x/net/context"' \
+	    ${WRKDIR}/fuse-${FUSE_GH_TAGNAME} ${WRKDIR}/webdavfs-${GH_TAGNAME} |\
 	    ${XARGS} ${REINPLACE_CMD} -i '' 's,golang.org/x/net/context,context,'
 	${MKDIR} ${GETOPT_WRKSRCDIR} ${FUSE_WRKSRCDIR}
 	${LN} -s ${WRKDIR}/getopt-${GETOPT_GH_TAGNAME}/v2 ${GETOPT_WRKSRCDIR}

Modified: head/sysutils/fusefs-webdavfs/distinfo
==============================================================================
--- head/sysutils/fusefs-webdavfs/distinfo	Mon Dec 17 15:15:05 2018	(r487693)
+++ head/sysutils/fusefs-webdavfs/distinfo	Mon Dec 17 16:08:52 2018	(r487694)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1528138200
-SHA256 (miquels-webdavfs-g20180413-c503b3c_GH0.tar.gz) = 585eb08f0ca0ba74921bf09f989df64a4edbba4f4b7bd2ea1532f68e44a509c3
-SIZE (miquels-webdavfs-g20180413-c503b3c_GH0.tar.gz) = 19344
-SHA256 (pborman-getopt-7148bc3_GH0.tar.gz) = 5828aab17ad7c149535cb87b5db6ca2b0bb1a9209e051bef00a3ac73809a4528
-SIZE (pborman-getopt-7148bc3_GH0.tar.gz) = 37914
+TIMESTAMP = 1545061102
+SHA256 (miquels-webdavfs-g20181010-c03fa01_GH0.tar.gz) = 3631c83203b5b75a4584702f47dde941c6fe6726d98a2e5d831a9d15284b2278
+SIZE (miquels-webdavfs-g20181010-c03fa01_GH0.tar.gz) = 20207
+SHA256 (pborman-getopt-2b5b3bf_GH0.tar.gz) = 057df545a42dd3b439ed73f3b93b9858888c729d4a623f82774c40e8f967b79c
+SIZE (pborman-getopt-2b5b3bf_GH0.tar.gz) = 38203
 SHA256 (bazil-fuse-65cc252_GH0.tar.gz) = bfff5537e4b9edd9cc757f9022fb3cb41574342bc82d7df3d1400b9d8764eae9
 SIZE (bazil-fuse-65cc252_GH0.tar.gz) = 187854



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812171608.wBHG8rnx049397>