Index: branches/2017Q4/security/hitch/Makefile
===================================================================
--- branches/2017Q4/security/hitch/Makefile	(revision 455660)
+++ branches/2017Q4/security/hitch/Makefile	(revision 455661)
@@ -1,37 +1,35 @@
 # Created by: Ryan Steinmetz <zi@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=		hitch
-PORTVERSION=		1.4.4
-DISTVERSIONPREFIX=	${PORTNAME}-
+PORTVERSION=		1.4.6
+PORTREVISION=		3
 CATEGORIES=		security
+MASTER_SITES=		http://hitch-tls.org/source/ \
+			ZI
 
 MAINTAINER=		zi@FreeBSD.org
 COMMENT=		TLS proxy to forward connections to an unencrypted backend
 
 LICENSE=		BSD2CLAUSE
 
-BUILD_DEPENDS=		rst2man:textproc/py-docutils \
-			pkg-config:devel/pkgconf
+BUILD_DEPENDS=		rst2man:textproc/py-docutils
 LIB_DEPENDS=		libev.so:devel/libev
 
 USERS=			nobody
 GROUPS=			nobody
 
-USES=			autoreconf ssl
+USES=			pkgconfig ssl
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--localstatedir=/var/run
 CONFIGURE_ENV=		CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB}" \
 			SSL_CFLAGS="-I${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB}"
 USE_RC_SUBR=		${PORTNAME}
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib -lcrypto -lssl
-USE_GITHUB=		yes
-GH_ACCOUNT=		varnish
-PORTSCOUT=		skipv:premerge
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.conf.sample ${STAGEDIR}${PREFIX}/etc/
 
 .include <bsd.port.mk>
Index: branches/2017Q4/security/hitch/distinfo
===================================================================
--- branches/2017Q4/security/hitch/distinfo	(revision 455660)
+++ branches/2017Q4/security/hitch/distinfo	(revision 455661)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485636726
-SHA256 (varnish-hitch-hitch-1.4.4_GH0.tar.gz) = 3c889637e1bc66010b8243fc91b9e26e134f6be77f38a770773dbbbb4dacdefc
-SIZE (varnish-hitch-hitch-1.4.4_GH0.tar.gz) = 125074
+TIMESTAMP = 1510149117
+SHA256 (hitch-1.4.6.tar.gz) = b095e465f0fc37c5e46cfc0fbcf987ba90ed660caf7f559547df8dea985fec2b
+SIZE (hitch-1.4.6.tar.gz) = 308210
Index: branches/2017Q4/security/hitch/files/patch-src_hitch.c
===================================================================
--- branches/2017Q4/security/hitch/files/patch-src_hitch.c	(revision 455660)
+++ branches/2017Q4/security/hitch/files/patch-src_hitch.c	(nonexistent)
@@ -1,22 +0,0 @@
-From cc92c25a5fcbc1d3e4ebb8771fe87d961f2079bf Mon Sep 17 00:00:00 2001
-From: Vanilla Hsu <vanilla@fatpipi.com>
-Date: Sat, 14 Jan 2017 09:36:57 +0800
-Subject: [PATCH] Fix building with libressl.
-
----
- src/hitch.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/hitch.c b/src/hitch.c
-index 5b48680..03b4580 100644
---- src/hitch.c.orig	2016-12-22 13:48:49 UTC
-+++ src/hitch.c
-@@ -683,7 +683,7 @@ load_privatekey(SSL_CTX *ctx, const char
- 		return NULL;
- 	}
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define SSL_CTX_get_default_passwd_cb(ctx) (ctx->default_passwd_callback)
- #define SSL_CTX_get_default_passwd_cb_userdata(ctx) (ctx->default_passwd_callback_userdata)
- #endif

Property changes on: branches/2017Q4/security/hitch/files/patch-src_hitch.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2017Q4/security/hitch/files/hitch.in
===================================================================
--- branches/2017Q4/security/hitch/files/hitch.in	(revision 455660)
+++ branches/2017Q4/security/hitch/files/hitch.in	(revision 455661)
@@ -1,38 +1,39 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: hitch
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
 # KEYWORD: shutdown
 
 #
 # Add some of the following variables to /etc/rc.conf to configure hitch:
 # hitch_enable (bool):	Set to "NO" by default.
 #				Set it to "YES" to enable hitch.
 # hitch_config (str):		Default "%%PREFIX%%/etc/hitch.conf"
 #				Set it to the full path to the config file
 #				that hitch will use during the automated
 #				start-up.
 # hitch_pidfile (str):	Default "%%PREFIX%%/var/hitch/hitch.pid"
 #				Set it to the value of 'pid' in
 #				the hitch.conf file.
 #
 
 . /etc/rc.subr
 
 name="hitch"
 rcvar=hitch_enable
 
 load_rc_config $name
 
 : ${hitch_enable="NO"}
 : ${hitch_config="%%PREFIX%%/etc/hitch.conf"}
 
 command="%%PREFIX%%/sbin/hitch"
 command_args="--daemon -u nobody -g nobody -s --config=${hitch_config}"
+extra_commands=reload
 
 required_files=${hitch_config}
 run_rc_command "$1"
Index: branches/2017Q4
===================================================================
--- branches/2017Q4	(revision 455660)
+++ branches/2017Q4	(revision 455661)

Property changes on: branches/2017Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r453712,453733,453741,455660