Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1661450348219870"
MIME-Version: 1.0
Date: Thu, 25 Aug 2022 17:59:08 +0000
From: "Amitai Schleier" <schmonz@netbsd.org>
Subject: CVS commit: pkgsrc/net/dq
To: pkgsrc-changes@NetBSD.org
Reply-To: schmonz@netbsd.org
Message-Id: <20220825175908.D9839F9E9@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1661450348219870
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	schmonz
Date:		Thu Aug 25 17:59:08 UTC 2022

Modified Files:
	pkgsrc/net/dq: Makefile distinfo
Added Files:
	pkgsrc/net/dq/patches: patch-Makefile
Removed Files:
	pkgsrc/net/dq/patches: patch-make-install.sh

Log Message:
Update to 20220822. From the changelog:

- switch to simple Makefile
- crypto_onetimeauth_poly1305.c update


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/dq/Makefile pkgsrc/net/dq/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/dq/patches/patch-Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/net/dq/patches/patch-make-install.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1661450348219870
Content-Disposition: inline
Content-Length: 4139
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/net/dq/Makefile
diff -u pkgsrc/net/dq/Makefile:1.1 pkgsrc/net/dq/Makefile:1.2
--- pkgsrc/net/dq/Makefile:1.1	Thu Jan 27 15:31:09 2022
+++ pkgsrc/net/dq/Makefile	Thu Aug 25 17:59:08 2022
@@ -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
 HOMEPAGE=		https://github.com/janmojzis/dq/
@@ -14,14 +14,15 @@ LICENSE=		public-domain
 
 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 @@ RCD_SCRIPTS=		dqcache
 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"
Index: pkgsrc/net/dq/distinfo
diff -u pkgsrc/net/dq/distinfo:1.1 pkgsrc/net/dq/distinfo:1.2
--- pkgsrc/net/dq/distinfo:1.1	Thu Jan 27 15:31:09 2022
+++ pkgsrc/net/dq/distinfo	Thu Aug 25 17:59:08 2022
@@ -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

Added files:

Index: pkgsrc/net/dq/patches/patch-Makefile
diff -u /dev/null pkgsrc/net/dq/patches/patch-Makefile:1.1
--- /dev/null	Thu Aug 25 17:59:08 2022
+++ pkgsrc/net/dq/patches/patch-Makefile	Thu Aug 25 17:59:08 2022
@@ -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)


--_----------=_1661450348219870--