Index: head/security/hitch/Makefile
===================================================================
--- head/security/hitch/Makefile	(revision 472970)
+++ head/security/hitch/Makefile	(revision 472971)
@@ -1,34 +1,35 @@
 # Created by: Ryan Steinmetz <zi@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=		hitch
 PORTVERSION=		1.4.8
+PORTREVISION=		1
 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
 LIB_DEPENDS=		libev.so:devel/libev
 
 USERS=			nobody
 GROUPS=			nobody
 
 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
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.conf.sample ${STAGEDIR}${PREFIX}/etc/
 
 .include <bsd.port.mk>
Index: head/security/hitch/files/hitch.in
===================================================================
--- head/security/hitch/files/hitch.in	(revision 472970)
+++ head/security/hitch/files/hitch.in	(revision 472971)
@@ -1,41 +1,41 @@
 #!/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"}
-: ${hitch_user:=nobody}
-: ${hitch_group:=nobody}
+: ${hitch_huser:=nobody}
+: ${hitch_hgroup:=nobody}
 
 command="%%PREFIX%%/sbin/hitch"
-command_args="--daemon -u ${hitch_user} -g ${hitch_group} -s --config=${hitch_config}"
+command_args="--daemon -u ${hitch_huser} -g ${hitch_hgroup} -s --config=${hitch_config}"
 extra_commands=reload
 
 required_files=${hitch_config}
 run_rc_command "$1"