From owner-svn-ports-head@freebsd.org  Tue Jan  5 16:08:16 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 61204A629A0;
 Tue,  5 Jan 2016 16:08:16 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 31CF412B9;
 Tue,  5 Jan 2016 16:08:16 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u05G8F2E081293;
 Tue, 5 Jan 2016 16:08:15 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u05G8FQ0081292;
 Tue, 5 Jan 2016 16:08:15 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201601051608.u05G8FQ0081292@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Tue, 5 Jan 2016 16:08:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r405298 - head/mail/qmail
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jan 2016 16:08:16 -0000

Author: marino
Date: Tue Jan  5 16:08:15 2016
New Revision: 405298
URL: https://svnweb.freebsd.org/changeset/ports/405298

Log:
  mail/qmail: Rename Make var from SELECTED_OPTIONS to SEL_OPTIONS
  
  SELECTED_OPTIONS is now a framework informational variable, so there
  is a name clash with qmail and its slave ports.  Just rename the
  variable here to remove the conflict (No-op)
  
  Approved by:	Just fix it

Modified:
  head/mail/qmail/Makefile

Modified: head/mail/qmail/Makefile
==============================================================================
--- head/mail/qmail/Makefile	Tue Jan  5 16:05:14 2016	(r405297)
+++ head/mail/qmail/Makefile	Tue Jan  5 16:08:15 2016	(r405298)
@@ -621,13 +621,13 @@ PLIST_SUB+=	RCDLINK="@comment "
 RCDLINK=	\#
 .endif
 
-# Fill SELECTED_OPTIONS with options to write conf-spamcontrol
+# Fill SEL_OPTIONS with options to write conf-spamcontrol
 .if defined(SLAVE_SPAMCONTROL)
 
 . if ${PORT_OPTIONS:MPAM111421}
-SELECTED_OPTIONS+=	pam111421=yes
+SEL_OPTIONS+=	pam111421=yes
 . else
-SELECTED_OPTIONS+=	pam111421=no
+SEL_OPTIONS+=	pam111421=no
 . endif
 
 .endif
@@ -671,7 +671,7 @@ pre-patch:
 	@${ECHO_CMD} ${WRKDIR} > ${WRKSRC}/conf-qmail
 	@${ECHO_CMD} "# Generated by qmail-spamcontrol FreeBSD port" \
 		> ${WRKSRC}/conf-spamcontrol
-. for option in ${SELECTED_OPTIONS}
+. for option in ${SEL_OPTIONS}
 	@${ECHO_CMD} ${option} >> ${WRKSRC}/conf-spamcontrol
 . endfor
 	@${ECHO_CMD} "${UCSPISRC}/compile" > ${WRKSRC}/conf-ucspissl