From owner-svn-ports-head@FreeBSD.ORG  Thu Jun  6 01:12:57 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 4DB0394C;
 Thu,  6 Jun 2013 01:12:57 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3E0971D10;
 Thu,  6 Jun 2013 01:12:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r561CvCF021499;
 Thu, 6 Jun 2013 01:12:57 GMT (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r561CuN0021497;
 Thu, 6 Jun 2013 01:12:56 GMT (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201306060112.r561CuN0021497@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 6 Jun 2013 01:12:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r320041 - in head: mail/dspam www/squid
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Jun 2013 01:12:57 -0000

Author: bdrewery
Date: Thu Jun  6 01:12:56 2013
New Revision: 320041
URL: http://svnweb.freebsd.org/changeset/ports/320041

Log:
  Fix options conversion with bmake

Modified:
  head/mail/dspam/Makefile
  head/www/squid/Makefile

Modified: head/mail/dspam/Makefile
==============================================================================
--- head/mail/dspam/Makefile	Thu Jun  6 01:08:39 2013	(r320040)
+++ head/mail/dspam/Makefile	Thu Jun  6 01:12:56 2013	(r320041)
@@ -248,7 +248,7 @@ WANT_MYSQL_VER=	55
 #PKGNAMESUFFIX=	-mysql55
 .endif
 
-.if ${PORT_OPTIONS:MMYSQL51) || ${PORT_OPTIONS:MMYSQL55}
+.if ${PORT_OPTIONS:MMYSQL51} || ${PORT_OPTIONS:MMYSQL55}
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=	--with-mysql-includes=${LOCALBASE}/include/mysql \
 		--with-mysql-libraries=${LOCALBASE}/lib/mysql
@@ -494,7 +494,7 @@ pre-configure:
 	@${ECHO_CMD} "DOMAIN_SCALE and LARGE_SCALE are incopatible"
 	@${FALSE}
 .endif
-.if ${PORT_OPTIONS:MLIGHTHTTPD) && ! ${PORT_OPTIONS:MWEBUI}
+.if ${PORT_OPTIONS:MLIGHTHTTPD} && ! ${PORT_OPTIONS:MWEBUI)
 	@${ECHO_CMD} "There's no reason to depend on LightHTTPD if you're not using WebUI"
 	@${FALSE}
 .endif

Modified: head/www/squid/Makefile
==============================================================================
--- head/www/squid/Makefile	Thu Jun  6 01:08:39 2013	(r320040)
+++ head/www/squid/Makefile	Thu Jun  6 01:12:56 2013	(r320041)
@@ -239,7 +239,7 @@ basic_auth+=	SASL
 libexec+=	sasl_auth
 .endif
 # POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
-.if ${PORT_OPTIONS:MNIS_AUTH) && !defined(NO_NIS) && !defined(WITHOUT_NIS}
+.if ${PORT_OPTIONS:MNIS_AUTH} && !defined(NO_NIS) && !defined(WITHOUT_NIS)
 basic_auth+=	YP
 libexec+=	yp_auth
 .endif