Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 48A9484D26 for ; Thu, 16 Nov 2023 23:13:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 6lB_CJnBKhXM for ; Thu, 16 Nov 2023 23:13:16 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id AD25884D0C for ; Thu, 16 Nov 2023 23:13:16 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A0643FA3D; Thu, 16 Nov 2023 23:13:16 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1700176396222130" MIME-Version: 1.0 Date: Thu, 16 Nov 2023 23:13:16 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/mail/qmail To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20231116231316.A0643FA3D@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1700176396222130 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:13:16 UTC 2023 Modified Files: pkgsrc/mail/qmail: Makefile options.mk Log Message: qmail: 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) To generate a diff of this commit: cvs rdiff -u -r1.129 -r1.130 pkgsrc/mail/qmail/Makefile cvs rdiff -u -r1.71 -r1.72 pkgsrc/mail/qmail/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1700176396222130 Content-Disposition: inline Content-Length: 1891 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mail/qmail/Makefile diff -u pkgsrc/mail/qmail/Makefile:1.129 pkgsrc/mail/qmail/Makefile:1.130 --- pkgsrc/mail/qmail/Makefile:1.129 Wed Nov 15 16:49:26 2023 +++ pkgsrc/mail/qmail/Makefile Thu Nov 16 23:13:16 2023 @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.129 2023/11/15 16:49:26 schmonz Exp $ -# +# $NetBSD: Makefile,v 1.130 2023/11/16 23:13:16 schmonz Exp $ DISTNAME= notqmail-1.08 PKGNAME= qmail-1.03 -PKGREVISION= 53 +PKGREVISION= 54 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_GITHUB:=notqmail/} GITHUB_PROJECT= notqmail @@ -15,6 +14,7 @@ COMMENT= Community-driven open-source s LICENSE= public-domain DEPENDS+= daemontools-[0-9]*:../../sysutils/daemontools +DEPENDS+= {ucspi-tcp6>=1.10.7nb1,ucspi-tcp-[0-9]*}:../../net/ucspi-tcp6 CONFLICTS+= courier-maildirmake-[0-9]* CONFLICTS+= courier-mta-[0-9]* Index: pkgsrc/mail/qmail/options.mk diff -u pkgsrc/mail/qmail/options.mk:1.71 pkgsrc/mail/qmail/options.mk:1.72 --- pkgsrc/mail/qmail/options.mk:1.71 Mon Apr 24 17:22:59 2023 +++ pkgsrc/mail/qmail/options.mk Thu Nov 16 23:13:16 2023 @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.71 2023/04/24 17:22:59 schmonz Exp $ +# $NetBSD: options.mk,v 1.72 2023/11/16 23:13:16 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.qmail -PKG_SUPPORTED_OPTIONS+= eai inet6 pam syncdir tai-system-clock tls +PKG_SUPPORTED_OPTIONS+= eai pam syncdir tai-system-clock tls PKG_SUPPORTED_OPTIONS+= qmail-customerror qmail-srs PKG_SUGGESTED_OPTIONS+= eai syncdir tls PKG_SUGGESTED_OPTIONS+= qmail-customerror qmail-srs @@ -105,9 +105,4 @@ DEPENDS+= ucspi-ssl>=0.999.10.11nb2:.. .else BUILDLINK_TRANSFORM+= rm:-lssl BUILDLINK_TRANSFORM+= rm:-lcrypto -. if !empty(PKG_OPTIONS:Minet6) -DEPENDS+= ucspi-tcp6>=1.10.7nb1:../../net/ucspi-tcp6 -. else -DEPENDS+= {ucspi-tcp6>=1.10.7nb1,ucspi-tcp-[0-9]*}:../../net/ucspi-tcp -. endif .endif --_----------=_1700176396222130--