Date: Tue, 5 Jan 2016 16:08:15 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405298 - head/mail/qmail Message-ID: <201601051608.u05G8FQ0081292@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601051608.u05G8FQ0081292>