Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 93D407A263 for ; Thu, 27 Apr 2017 20:38:22 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 08F6C84E04; Thu, 27 Apr 2017 20:38:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8B95584DA9 for ; Thu, 27 Apr 2017 20:38:21 +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 wED1Ed1JiZQq for ; Thu, 27 Apr 2017 20:38:21 +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 0BDE484CE2 for ; Thu, 27 Apr 2017 20:38:21 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 02DB9FBE4; Thu, 27 Apr 2017 20:38:21 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1493325500239380" MIME-Version: 1.0 Date: Thu, 27 Apr 2017 20:38:20 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/mail/qmail-conf To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20170427203821.02DB9FBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1493325500239380 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Thu Apr 27 20:38:20 UTC 2017 Modified Files: pkgsrc/mail/qmail-conf: DESCR Makefile distinfo pkgsrc/mail/qmail-conf/patches: patch-aa Log Message: Format DESCR. Comment the patch. Replace LOCALBASE with PREFIX. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/qmail-conf/DESCR cvs rdiff -u -r1.28 -r1.29 pkgsrc/mail/qmail-conf/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/mail/qmail-conf/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/qmail-conf/patches/patch-aa Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1493325500239380 Content-Disposition: inline Content-Length: 3068 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mail/qmail-conf/DESCR diff -u pkgsrc/mail/qmail-conf/DESCR:1.3 pkgsrc/mail/qmail-conf/DESCR:1.4 --- pkgsrc/mail/qmail-conf/DESCR:1.3 Fri Apr 9 00:18:00 2004 +++ pkgsrc/mail/qmail-conf/DESCR Thu Apr 27 20:38:20 2017 @@ -4,10 +4,10 @@ They are like *-conf programs in djbdns. With qmail-conf, for example, setting up a minimal SMTP service takes the following four steps: -qmail-smtpd-conf qmaild qmaill /var/qmail/service/smtpd -cd /var/qmail/service/smtpd -make -ln -s /var/qmail/service/smtpd /service +# qmail-smtpd-conf qmaild qmaill /var/qmail/service/smtpd +# cd /var/qmail/service/smtpd +# make +# ln -s /var/qmail/service/smtpd /service qmail-conf assumes that (recent versions of) daemontools and ucspi-tcp have already been installed. It also assumes that svscan Index: pkgsrc/mail/qmail-conf/Makefile diff -u pkgsrc/mail/qmail-conf/Makefile:1.28 pkgsrc/mail/qmail-conf/Makefile:1.29 --- pkgsrc/mail/qmail-conf/Makefile:1.28 Mon Oct 8 12:19:29 2012 +++ pkgsrc/mail/qmail-conf/Makefile Thu Apr 27 20:38:20 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2012/10/08 12:19:29 asau Exp $ +# $NetBSD: Makefile,v 1.29 2017/04/27 20:38:20 schmonz Exp $ # DISTNAME= qmail-conf-0.60 @@ -19,7 +19,7 @@ DEPENDS+= ucspi-tcp>=0.86:../../net/ucs SITES.djbdns-1.05.tar.gz= http://cr.yp.to/djbdns/ ftp://cr.yp.to/djbdns/ DJB_RESTRICTED= NO -DJB_CONFIG_CMDS= ${ECHO} ${LOCALBASE:Q} > ${WRKSRC}/conf-ucspi-tcp +DJB_CONFIG_CMDS= ${ECHO} ${PREFIX:Q} > ${WRKSRC}/conf-ucspi-tcp SUBST_FILES.djbware+= ../djbdns-1.05/error.h Index: pkgsrc/mail/qmail-conf/distinfo diff -u pkgsrc/mail/qmail-conf/distinfo:1.5 pkgsrc/mail/qmail-conf/distinfo:1.6 --- pkgsrc/mail/qmail-conf/distinfo:1.5 Tue Nov 3 23:27:18 2015 +++ pkgsrc/mail/qmail-conf/distinfo Thu Apr 27 20:38:20 2017 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2015/11/03 23:27:18 agc Exp $ +$NetBSD: distinfo,v 1.6 2017/04/27 20:38:20 schmonz Exp $ SHA1 (qmail-conf-0.60.tar.gz) = d9a48e15394b0e7beaf5f7c64db4be101a71fb08 RMD160 (qmail-conf-0.60.tar.gz) = 41bb36cb644c3669be96abccce3b69a91aa44cd8 @@ -8,4 +8,4 @@ SHA1 (djbdns-1.05.tar.gz) = 2efdb3a039d0 RMD160 (djbdns-1.05.tar.gz) = a832cbfd93e4ccec6a565492a4ee0b3c1b4b68ed SHA512 (djbdns-1.05.tar.gz) = 20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9 Size (djbdns-1.05.tar.gz) = 85648 bytes -SHA1 (patch-aa) = f649a22f6b16ae1b84a21c2ae860b72af1121e13 +SHA1 (patch-aa) = fcb8da2264012753b484f91fcf10b7dbea17de42 Index: pkgsrc/mail/qmail-conf/patches/patch-aa diff -u pkgsrc/mail/qmail-conf/patches/patch-aa:1.1 pkgsrc/mail/qmail-conf/patches/patch-aa:1.2 --- pkgsrc/mail/qmail-conf/patches/patch-aa:1.1 Mon Mar 15 17:30:28 2010 +++ pkgsrc/mail/qmail-conf/patches/patch-aa Thu Apr 27 20:38:20 2017 @@ -1,4 +1,6 @@ -$NetBSD: patch-aa,v 1.1 2010/03/15 17:30:28 schmonz Exp $ +$NetBSD: patch-aa,v 1.2 2017/04/27 20:38:20 schmonz Exp $ + +DESTDIR support. --- Makefile.ini.orig 2001-09-02 07:47:33.000000000 +0000 +++ Makefile.ini --_----------=_1493325500239380--