Index: branches/2018Q4/ports-mgmt/portshaker/Makefile
===================================================================
--- branches/2018Q4/ports-mgmt/portshaker/Makefile	(revision 487723)
+++ branches/2018Q4/ports-mgmt/portshaker/Makefile	(revision 487724)
@@ -1,50 +1,50 @@
 # Created by: Romain Tartiere <romain@blogreen.org>
 # $FreeBSD$
 
 PORTNAME?=	portshaker
-PORTVERSION=	1.0.16
+PORTVERSION=	1.0.17
 DISTVERSIONPREFIX=	v
 PORTREVISION?=	0
 CATEGORIES?=	ports-mgmt
 
 MAINTAINER?=	romain@FreeBSD.org
 COMMENT?=	Maintain ports tree using multiple sources
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES+=		uidfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	smortex
 GH_PROJECT=	portshaker
 
 .if ${PORTNAME} == "portshaker"
 OPTIONS_DEFINE=	RSYNC SVN GIT HG
 OPTIONS_DEFAULT=	RSYNC SVN
 RSYNC_DESC=	rsync support
 GIT_DESC=	git support
 HG_DESC=	mercurial support
 RSYNC_RUN_DEPENDS=	rsync:net/rsync
 SVN_RUN_DEPENDS=	svn:devel/subversion${WITH_SUBVERSION_VER}
 GIT_RUN_DEPENDS=	git:devel/git
 HG_RUN_DEPENDS=		hg:devel/mercurial
 .else
 OPTIONS_DEFINE=	BSDSHARP ENLIGHTENMENT GECKO HASKELL MARCUSCOM TEXLIVE XORG
 OPTIONS_DEFAULT=	BSDSHARP
 BSDSHARP_DESC=		Enable BSD-sharp ports
 ENLIGHTENMENT_DESC=	Enable Enlightnement ports
 GECKO_DESC=		Enable Gecko ports
 HASKELL_DESC=		Enable Haskell ports
 MARCUSCOM_DESC=		Enable GNOME development ports
 TEXLIVE_DESC=		Enable TeXLive ports (Experimental)
 XORG_DESC=		Enable Xorg development ports
 BSDSHARP_MAKE_ENV=	WITH_BSDSHARP=1
 ENLIGHTENMENT_MAKE_ENV=	WITH_ENLIGHTENMENT=1
 GECKO_MAKE_ENV=		WITH_GECKO=1
 HASKELL_MAKE_ENV=	WITH_HASKELL=1
 MARCUSCOM_MAKE_ENV=	WITH_MARCUSCOM=1
 TEXLIVE_MAKE_ENV=	WITH_TEXLIVE=1
 XORG_MAKE_ENV=		WITH_XORG=1
 .endif
 
 .include <bsd.port.mk>
Index: branches/2018Q4/ports-mgmt/portshaker/distinfo
===================================================================
--- branches/2018Q4/ports-mgmt/portshaker/distinfo	(revision 487723)
+++ branches/2018Q4/ports-mgmt/portshaker/distinfo	(revision 487724)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527934591
-SHA256 (smortex-portshaker-v1.0.16_GH0.tar.gz) = 448096ba72a78672cae55f322b2c8837422f3054fb6ec3624d8dff8caa3893b1
-SIZE (smortex-portshaker-v1.0.16_GH0.tar.gz) = 21688
+TIMESTAMP = 1543343273
+SHA256 (smortex-portshaker-v1.0.17_GH0.tar.gz) = cabc3d2c111caa6c268a6c1037bca00371c467e94672c6c6f5576bb0556e8480
+SIZE (smortex-portshaker-v1.0.17_GH0.tar.gz) = 21678
Index: branches/2018Q4
===================================================================
--- branches/2018Q4	(revision 487723)
+++ branches/2018Q4	(revision 487724)

Property changes on: branches/2018Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r486047