Received: by mail.netbsd.org (Postfix, from userid 605) id BCFE284D38; Sat, 1 Dec 2018 11:42:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B782384D38 for ; Sat, 1 Dec 2018 11:42:42 +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 lTWSvalNrxyp for ; Sat, 1 Dec 2018 11:42:42 +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 BD75984C81 for ; Sat, 1 Dec 2018 11:42:41 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A5AF8FB1F; Sat, 1 Dec 2018 11:42:41 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1543664561239020" MIME-Version: 1.0 Date: Sat, 1 Dec 2018 11:42:41 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/mail/dovecot2 To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20181201114241.A5AF8FB1F@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. --_----------=_1543664561239020 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Sat Dec 1 11:42:41 UTC 2018 Modified Files: pkgsrc/mail/dovecot2: Makefile.common Log Message: Move PKGPATH check after bsd.prefs.mk to fix circular dependency. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 pkgsrc/mail/dovecot2/Makefile.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1543664561239020 Content-Disposition: inline Content-Length: 1212 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mail/dovecot2/Makefile.common diff -u pkgsrc/mail/dovecot2/Makefile.common:1.22 pkgsrc/mail/dovecot2/Makefile.common:1.23 --- pkgsrc/mail/dovecot2/Makefile.common:1.22 Fri Nov 30 18:43:09 2018 +++ pkgsrc/mail/dovecot2/Makefile.common Sat Dec 1 11:42:41 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.22 2018/11/30 18:43:09 adam Exp $ +# $NetBSD: Makefile.common,v 1.23 2018/12/01 11:42:41 schmonz Exp $ # # when updating to a new release, update ABI depends in # the buildlink3.mk file as well, since the plugins' version @@ -23,16 +23,16 @@ LICENSE= mit AND gnu-lgpl-v2.1 AND modif DISTINFO_FILE= ${.CURDIR}/../../mail/dovecot2/distinfo PATCHDIR= ${.CURDIR}/../../mail/dovecot2/patches -.if "${PKGPATH}" != "mail/dovecot2" -DEPENDS+= dovecot>=${PKGVERSION_NOREV}{nb*,}:../../mail/dovecot2 -.endif - USE_LIBTOOL= yes USE_TOOLS+= gmake pkg-config rpcgen GNU_CONFIGURE= yes .include "../../mk/bsd.prefs.mk" +.if "${PKGPATH}" != "mail/dovecot2" +DEPENDS+= dovecot>=${PKGVERSION_NOREV}{nb*,}:../../mail/dovecot2 +.endif + CONFIGURE_ARGS+= --localstatedir=${VARBASE} CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-ssldir=${SSLDIR} --_----------=_1543664561239020--