4 files changed, 29 insertions, 49 deletions

diff --git a/dns/dq/Makefile b/dns/dq/Makefile
index cad28a7a8217..30cd023c8efa 100644
--- a/dns/dq/Makefile
+++ b/dns/dq/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	dq
-PORTVERSION=	20181021
+PORTVERSION=	20220822
 CATEGORIES=	dns
 
 MAINTAINER=	pkubaj@FreeBSD.org
@@ -16,20 +16,15 @@ USERS=		dq
 GROUPS=		dq
 SUB_FILES=	run
 SUB_LIST=	ETCDIR="${ETCDIR}" UID="${USERS}" GID="${GROUPS}"
-ALL_TARGET=	compile
 
-do-install:
-	cd ${WRKSRC}/build/bin && ${INSTALL_PROGRAM} * ${STAGEDIR}${PREFIX}/bin/
-	cd ${WRKSRC}/build/include && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/
+post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}cache/env ${STAGEDIR}${ETCDIR}cache/root/servers
 	${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_DATA} ${WRKSRC}/build/lib/libtinynacl.a ${STAGEDIR}${PREFIX}/lib
-
-	${INSTALL_MAN} ${WRKSRC}/build/man/dq*.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/build/man/dq*.8 ${STAGEDIR}${MANPREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/man/dq*.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/dq*.8 ${STAGEDIR}${MANPREFIX}/man/man8
 
 .include <bsd.port.mk>
diff --git a/dns/dq/distinfo b/dns/dq/distinfo
index 2b8f2869f6b9..744af5f990ca 100644
--- a/dns/dq/distinfo
+++ b/dns/dq/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579706349
-SHA256 (janmojzis-dq-20181021_GH0.tar.gz) = b1797538dd7dfe8e6d9c2964eee0b569589b448c8a2e636bbee4cf2a19bc7ea4
-SIZE (janmojzis-dq-20181021_GH0.tar.gz) = 142389
+TIMESTAMP = 1661267835
+SHA256 (janmojzis-dq-20220822_GH0.tar.gz) = 6f64b248154e852d0da2f6cc81e5578e7fb3387737aadf1b0bd3e14fec92e316
+SIZE (janmojzis-dq-20220822_GH0.tar.gz) = 67676
diff --git a/dns/dq/files/patch-Makefile b/dns/dq/files/patch-Makefile
new file mode 100644
index 000000000000..e6de23f74b34
--- /dev/null
+++ b/dns/dq/files/patch-Makefile
@@ -0,0 +1,17 @@
+--- Makefile.orig	2022-08-23 15:51:28 UTC
++++ Makefile
+@@ -457,10 +457,10 @@ dqcache-start: dqcache-start.o $(OBJECTS)
+ 
+ 
+ install: dq dqcache dqcache-makekey dqcache-start
+-	install -D -m 0755 dq $(DESTDIR)/usr/bin/dq
+-	install -D -m 0755 dqcache $(DESTDIR)/usr/sbin/dqcache
+-	install -D -m 0755 dqcache-makekey $(DESTDIR)/usr/sbin/dqcache-makekey
+-	install -D -m 0755 dqcache-start $(DESTDIR)/usr/sbin/dqcache-start
++	install -m 0755 dq $(DESTDIR)${PREFIX}/bin/dq
++	install -m 0755 dqcache $(DESTDIR)${PREFIX}/sbin/dqcache
++	install -m 0755 dqcache-makekey $(DESTDIR)${PREFIX}/sbin/dqcache-makekey
++	install -m 0755 dqcache-start $(DESTDIR)${PREFIX}/sbin/dqcache-start
+ 
+ clean:
+ 	rm -f *.o *.out $(BINARIES)
diff --git a/dns/dq/pkg-plist b/dns/dq/pkg-plist
index f600ceb43ca7..ea7beac0cee6 100644
--- a/dns/dq/pkg-plist
+++ b/dns/dq/pkg-plist
@@ -1,45 +1,13 @@
 bin/dq
-bin/dqcache
-bin/dqcache-makekey
-bin/dqcache-start
 %%ETCDIR%%cache/env/CACHESIZE
 %%ETCDIR%%cache/env/IP
 %%ETCDIR%%cache/env/ROOT
 %%ETCDIR%%cache/root/servers/@
 %%ETCDIR%%cache/run
-include/cleanup.h
-include/crypto.h
-include/crypto_auth_siphash24.h
-include/crypto_box_curve25519xsalsa20poly1305.h
-include/crypto_core_hsalsa20.h
-include/crypto_int16.h
-include/crypto_int32.h
-include/crypto_int64.h
-include/crypto_int8.h
-include/crypto_onetimeauth_poly1305.h
-include/crypto_scalarmult_curve25519.h
-include/crypto_secretbox_xsalsa20poly1305.h
-include/crypto_stream_salsa20.h
-include/crypto_stream_xsalsa20.h
-include/crypto_uint16.h
-include/crypto_uint32.h
-include/crypto_uint64.h
-include/crypto_uint8.h
-include/crypto_verify_16.h
-include/crypto_verify_32.h
-include/crypto_verify_8.h
-include/direntry.h
-include/hasasmvolatilememory.h
-include/hasipv6.h
-include/randombytes.h
-include/uint32_pack.h
-include/uint32_pack_big.h
-include/uint32_unpack.h
-include/uint32_unpack_big.h
-include/uint64_pack.h
-include/uint64_unpack.h
-lib/libtinynacl.a
 man/man1/dq.1.gz
-man/man1/dqcache-makekey.1.gz
-man/man1/dqcache-start.1.gz
+man/man8/dqcache-makekey.8.gz
+man/man8/dqcache-start.8.gz
 man/man8/dqcache.8.gz
+sbin/dqcache
+sbin/dqcache-makekey
+sbin/dqcache-start