Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8555284D26 for ; Thu, 16 Nov 2023 23:09:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id FC1jvtYdTgPC for ; Thu, 16 Nov 2023 23:09:14 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id EF9B984D0C for ; Thu, 16 Nov 2023 23:09:13 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E3A5FFA3D; Thu, 16 Nov 2023 23:09:13 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_17001761539760" MIME-Version: 1.0 Date: Thu, 16 Nov 2023 23:09:13 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/mail/qmail-conf To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20231116230913.E3A5FFA3D@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_17001761539760 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Thu Nov 16 23:09:13 UTC 2023 Modified Files: pkgsrc/mail/qmail-conf: Makefile options.mk Log Message: qmail-conf: bump PKGREVISION. Changes: - Remove inet6 option; simply depend on dual-stack ucspi-tcp6 (or v4-only original DJB ucspi-tcp, if that's already installed) - Set LICENSE to public-domain, as this is derived from djbdns-1.05 which has long been public-domain. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 pkgsrc/mail/qmail-conf/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/qmail-conf/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_17001761539760 Content-Disposition: inline Content-Length: 1900 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mail/qmail-conf/Makefile diff -u pkgsrc/mail/qmail-conf/Makefile:1.38 pkgsrc/mail/qmail-conf/Makefile:1.39 --- pkgsrc/mail/qmail-conf/Makefile:1.38 Thu Nov 19 09:35:41 2020 +++ pkgsrc/mail/qmail-conf/Makefile Thu Nov 16 23:09:13 2023 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.38 2020/11/19 09:35:41 schmonz Exp $ -# +# $NetBSD: Makefile,v 1.39 2023/11/16 23:09:13 schmonz Exp $ DISTNAME= qmail-conf-0.60 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= mail MASTER_SITES= http://woodsheep.jp/qmail-conf/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} djbdns-1.05${EXTRACT_SUFX} @@ -11,9 +10,11 @@ SITES.djbdns-1.05.tar.gz= http://cr.yp.t MAINTAINER= schmonz@NetBSD.org HOMEPAGE= http://woodsheep.jp/qmail-conf.html COMMENT= Collection of tools for setting up qmail services +LICENSE= public-domain DEPENDS+= daemontools>=0.70:../../sysutils/daemontools DEPENDS+= qmail>=1.03nb7:../../mail/qmail +DEPENDS+= {ucspi-tcp6-[0-9]*,ucspi-tcp-[0-9]*}:../../net/ucspi-tcp6 DJB_CONFIG_CMDS= ${ECHO} ${PREFIX:Q} > ${WRKSRC}/conf-ucspi-tcp; Index: pkgsrc/mail/qmail-conf/options.mk diff -u pkgsrc/mail/qmail-conf/options.mk:1.2 pkgsrc/mail/qmail-conf/options.mk:1.3 --- pkgsrc/mail/qmail-conf/options.mk:1.2 Thu Jan 10 13:23:16 2019 +++ pkgsrc/mail/qmail-conf/options.mk Thu Nov 16 23:09:13 2023 @@ -1,16 +1,10 @@ -# $NetBSD: options.mk,v 1.2 2019/01/10 13:23:16 schmonz Exp $ +# $NetBSD: options.mk,v 1.3 2023/11/16 23:09:13 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.qmail-conf -PKG_SUPPORTED_OPTIONS+= inet6 pam +PKG_SUPPORTED_OPTIONS+= pam .include "../../mk/bsd.options.mk" -.if !empty(PKG_OPTIONS:Minet6) -DEPENDS+= ucspi-tcp6-[0-9]*:../../net/ucspi-tcp6 -.else -DEPENDS+= {ucspi-tcp6-[0-9]*,ucspi-tcp-[0-9]*}:../../net/ucspi-tcp -.endif - .if !empty(PKG_OPTIONS:Mpam) DEPENDS+= checkpassword-pam-[0-9]*:../../sysutils/checkpassword-pam .else --_----------=_17001761539760--