Index: head/dns/dq/Makefile
===================================================================
--- head/dns/dq/Makefile	(revision 428955)
+++ head/dns/dq/Makefile	(revision 428956)
@@ -1,43 +1,45 @@
 # Created by: Piotr Kubaj <pkubaj@anongoth.pl>
 # $FreeBSD$
 
 PORTNAME=	dq
-PORTVERSION=	20161128
+PORTVERSION=	20161210
 CATEGORIES=	dns
 
 MAINTAINER=	pkubaj@anongoth.pl
 COMMENT=	Recursive DNS/DNSCurve server
 
 LICENSE=	PD
 
 RUN_DEPENDS=	envuidgid:sysutils/daemontools
 
 OPTIONS_DEFINE=	DOCS
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	janmojzis
 
 USERS=		dq
 GROUPS=		dq
+SUB_FILES=	run
+SUB_LIST=	ETCDIR="${ETCDIR}" UID="${USERS}" GID="${GROUPS}"
 
 do-build:
 	${MAKE_CMD} -C ${WRKSRC} compile
 	${STRIP_CMD} ${WRKSRC}/build/bin/*
 
 do-install:
 	cd ${WRKSRC}/build/bin && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/bin/
 	cd ${WRKSRC}/build/include && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/
 	${MKDIR} ${STAGEDIR}${ETCDIR}cache/env ${STAGEDIR}${ETCDIR}cache/root/servers
-	${ECHO} 10000000 > ${STAGEDIR}${ETCDIR}cache/env/CACHESIZE
-	${ECHO} 127.0.0.1 > ${STAGEDIR}${ETCDIR}cache/env/IP
-	${ECHO} "${ETCDIR}cache/root" > ${STAGEDIR}${ETCDIR}cache/env/ROOT
-	${ECHO} envuidgid ${USERS} envdir ${ETCDIR}cache/env ${GROUPS} > ${STAGEDIR}${ETCDIR}cache/run
+	${ECHO_CMD} 10000000 > ${STAGEDIR}${ETCDIR}cache/env/CACHESIZE
+	${ECHO_CMD} 127.0.0.1 > ${STAGEDIR}${ETCDIR}cache/env/IP
+	${ECHO_CMD} "${ETCDIR}cache/root" > ${STAGEDIR}${ETCDIR}cache/env/ROOT
 	${CP} files/root-servers-list ${STAGEDIR}${ETCDIR}cache/root/servers/@
+	${CP} ${WRKDIR}/run ${STAGEDIR}${ETCDIR}cache/run
 	${INSTALL_LIB} ${WRKSRC}/build/lib/libtinynacl.a ${STAGEDIR}${PREFIX}/lib
 
 do-install-DOCS-on:
 	${GZIP_CMD} ${WRKSRC}/build/man/*
 	${INSTALL_MAN} ${WRKSRC}/build/man/dq*.1.gz ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/build/man/dq*.8.gz ${STAGEDIR}${MANPREFIX}/man/man8
 
 .include <bsd.port.mk>
Index: head/dns/dq/distinfo
===================================================================
--- head/dns/dq/distinfo	(revision 428955)
+++ head/dns/dq/distinfo	(revision 428956)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481131976
-SHA256 (janmojzis-dq-20161128_GH0.tar.gz) = de4e6892ec83feb5cea3518289d8a28018377c435561f905de3edb338a03ca73
-SIZE (janmojzis-dq-20161128_GH0.tar.gz) = 143373
+TIMESTAMP = 1481819599
+SHA256 (janmojzis-dq-20161210_GH0.tar.gz) = 24fc6ea8ad105bd2fb42ee4b79768529a40e417832b5963b81ee208cb2bb256d
+SIZE (janmojzis-dq-20161210_GH0.tar.gz) = 143408
Index: head/dns/dq/files/patch-dq_dqcache-start.c
===================================================================
--- head/dns/dq/files/patch-dq_dqcache-start.c	(revision 428955)
+++ head/dns/dq/files/patch-dq_dqcache-start.c	(nonexistent)
@@ -1,14 +0,0 @@
---- dq/dqcache-start.c.orig	2016-12-07 17:33:44 UTC
-+++ dq/dqcache-start.c
-@@ -1,7 +1,11 @@
- #include <unistd.h>
- #include <sys/types.h>
- #include <pwd.h>
-+/*
-+workaround for *BSD
- #include <stdlib.h>
-+*/
-+extern int setenv(const char *, const char *, int);
- #include "numtostr.h"
- #include "strtonum.h"
- #include "e.h"

Property changes on: head/dns/dq/files/patch-dq_dqcache-start.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: head/dns/dq/files/patch-dq_strtoip.c
===================================================================
--- head/dns/dq/files/patch-dq_strtoip.c	(revision 428955)
+++ head/dns/dq/files/patch-dq_strtoip.c	(nonexistent)
@@ -1,10 +0,0 @@
---- dq/strtoip.c.orig	2016-11-27 15:38:55 UTC
-+++ dq/strtoip.c
-@@ -7,6 +7,7 @@ Public domain.
- #include <arpa/inet.h>
- #include "byte.h"
- #include "strtoip.h"
-+#include <sys/socket.h>
- 
- /* taken from nacl-20110221, from curvecp/curvecpserver.c (public-domain) */
- int strtoip4(unsigned char *ip, const char *x) {

Property changes on: head/dns/dq/files/patch-dq_strtoip.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: head/dns/dq/files/run.in
===================================================================
--- head/dns/dq/files/run.in	(nonexistent)
+++ head/dns/dq/files/run.in	(revision 428956)
@@ -0,0 +1,2 @@
+#!/bin/sh
+envuidgid %%UID%% envdir %%ETCDIR%%cache/env dqcache

Property changes on: head/dns/dq/files/run.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+ON
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property