[pkgsrc/trunk]: pkgsrc/net/dq Update to 20220822. From the changelog:

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9d39b67ae123
branches:  trunk
changeset: 384001:9d39b67ae123
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Thu Aug 25 17:59:08 2022 +0000

description:
Update to 20220822. From the changelog:

- switch to simple Makefile
- crypto_onetimeauth_poly1305.c update

diffstat:

 net/dq/Makefile                      |  28 ++++++++++++++++------------
 net/dq/distinfo                      |  10 +++++-----
 net/dq/patches/patch-Makefile        |  21 +++++++++++++++++++++
 net/dq/patches/patch-make-install.sh |  14 --------------
 4 files changed, 42 insertions(+), 31 deletions(-)

diffs (119 lines):

diff -r 77ad0ac2b0fc -r 9d39b67ae123 net/dq/Makefile
--- a/net/dq/Makefile   Thu Aug 25 11:22:26 2022 +0000
+++ b/net/dq/Makefile   Thu Aug 25 17:59:08 2022 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2022/01/27 15:31:09 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2022/08/25 17:59:08 schmonz Exp $
 
-GITHUB_PROJECT=                dq
-GITHUB_TAG=            20220101
 DISTNAME=              ${GITHUB_PROJECT}
 PKGNAME=               ${GITHUB_PROJECT}-${GITHUB_TAG}
 CATEGORIES=            net
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=janmojzis/}
+GITHUB_PROJECT=                dq
+GITHUB_TAG=            20220822
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
 HOMEPAGE=              https://github.com/janmojzis/dq/
@@ -14,14 +14,15 @@
 
 DEPENDS+=              daemontools-[0-9]*:../../sysutils/daemontools
 
-DJB_MAKE_TARGETS=      no
-BUILD_TARGET=          compile
-
 SUBST_CLASSES+=                etc
 SUBST_STAGE.etc=       do-configure
-SUBST_FILES.etc=       dq/dns_rcrw.c dq/dq.c man/dq.1
+SUBST_FILES.etc=       dns_rcrw.c dq.c man/dq.1
 SUBST_SED.etc=         -e 's|/etc/dnsrewrite|${PKG_SYSCONFBASE}/dnsrewrite|g'
-SUBST_MESSAGE.etc=     Fixing prefix.
+
+SUBST_CLASSES+=                prefix
+SUBST_STAGE.prefix=    do-configure
+SUBST_FILES.prefix=    Makefile
+SUBST_VARS.prefix=     PREFIX
 
 EGDIR=                 share/examples/${PKGBASE}
 INSTALLATION_DIRS=     ${EGDIR}
@@ -38,14 +39,17 @@
 FILES_SUBST+=          DQCACHE_USER=${DQCACHE_USER:Q}
 FILES_SUBST+=          PKGNAME=${PKGNAME:Q}
 
-post-configure:
-       ${RUN}cd ${DJB_CONFIG_DIR}; \
-       [ -f conf-sbin ] && ${ECHO} ${DJB_CONFIG_PREFIX}/sbin > conf-sbin
+INSTALLATION_DIRS+=    bin sbin man/man1 man/man8
 
 post-install:
+       for i in ${WRKSRC}/man/dq*.1; do \
+               ${INSTALL_MAN} $$i ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/; \
+       done
+       for i in ${WRKSRC}/man/dq*.8; do \
+               ${INSTALL_MAN} $$i ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/; \
+       done
        for i in examples.md dnscurveroots.global; do \
                ${INSTALL_DATA} ${FILESDIR}/$$i ${DESTDIR}${PREFIX}/${EGDIR}/; \
        done
 
-.include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 77ad0ac2b0fc -r 9d39b67ae123 net/dq/distinfo
--- a/net/dq/distinfo   Thu Aug 25 11:22:26 2022 +0000
+++ b/net/dq/distinfo   Thu Aug 25 17:59:08 2022 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2022/01/27 15:31:09 schmonz Exp $
+$NetBSD: distinfo,v 1.2 2022/08/25 17:59:08 schmonz Exp $
 
-BLAKE2s (dq-20220101.tar.gz) = 3b340e5217e58061e38fdafc407f40e64877a61f680c7f43409b8b6a4fe290ba
-SHA512 (dq-20220101.tar.gz) = 5c4fd8a8f37b2f8707abde80af7efe943dd00f0e725b406bff9ee8aae889f820fb76fe137be8223943c76ec14d41579de9a66f5d4c440d493e6d527bb24b175a
-Size (dq-20220101.tar.gz) = 140727 bytes
-SHA1 (patch-make-install.sh) = f8d8460015ab6a849e5bc25d341bb993c3bdcb3c
+BLAKE2s (dq-20220822.tar.gz) = 7035c2a8c9899f58772d034831cf7481b00670ae4537e77724b666235199eb27
+SHA512 (dq-20220822.tar.gz) = a743fc87b1db741b6348e1ebc30728963b239afe2629127d342608e0b80c96b8c8a70bb45edb29ad54297c5064ce821ebea697e2a13a5a581e8797f7b7dd01e3
+Size (dq-20220822.tar.gz) = 67676 bytes
+SHA1 (patch-Makefile) = bcea88dbd1c9d31e290dcf8a98f4eed4ec34968f
diff -r 77ad0ac2b0fc -r 9d39b67ae123 net/dq/patches/patch-Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/dq/patches/patch-Makefile     Thu Aug 25 17:59:08 2022 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-Makefile,v 1.1 2022/08/25 17:59:08 schmonz Exp $
+
+Follow hier(7).
+
+--- Makefile.orig      2022-08-22 18:03:33.000000000 +0000
++++ 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
++      $(BSD_INSTALL_PROGRAM) dq $(DESTDIR)@PREFIX@/bin/dq
++      $(BSD_INSTALL_PROGRAM) dqcache $(DESTDIR)@PREFIX@/sbin/dqcache
++      $(BSD_INSTALL_PROGRAM) dqcache-makekey $(DESTDIR)@PREFIX@/sbin/dqcache-makekey
++      $(BSD_INSTALL_PROGRAM) dqcache-start $(DESTDIR)@PREFIX@/sbin/dqcache-start
+ 
+ clean:
+       rm -f *.o *.out $(BINARIES)
diff -r 77ad0ac2b0fc -r 9d39b67ae123 net/dq/patches/patch-make-install.sh
--- a/net/dq/patches/patch-make-install.sh      Thu Aug 25 11:22:26 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-make-install.sh,v 1.1 2022/01/27 15:31:09 schmonz Exp $
-
-DESTDIR support.
-
---- make-install.sh.orig       2021-12-28 17:36:08.000000000 +0000
-+++ make-install.sh
-@@ -28,7 +28,6 @@ do
-   mkdir -p "$1/${confbin}" || exit 111
-   cp "${bin}/${x}" "$1/${confbin}" || exit 111
-   chmod 755 "$1/${confbin}/${x}" || exit 111
--  chown 0:0 "$1/${confbin}/${x}" || exit 111
- done
- echo "=== `date` === finishing"
-