From owner-svn-ports-head@FreeBSD.ORG  Thu Apr  4 13:43:15 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id D16C0400;
 Thu,  4 Apr 2013 13:43:15 +0000 (UTC)
 (envelope-from bapt@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 ABC52245;
 Thu,  4 Apr 2013 13:43:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r34DhF4S071053;
 Thu, 4 Apr 2013 13:43:15 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r34DhF8t071052;
 Thu, 4 Apr 2013 13:43:15 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201304041343.r34DhF8t071052@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 4 Apr 2013 13:43:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r315722 - head/irc/inspircd12
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, 04 Apr 2013 13:43:15 -0000

Author: bapt
Date: Thu Apr  4 13:43:15 2013
New Revision: 315722
URL: http://svnweb.freebsd.org/changeset/ports/315722

Log:
  Fix conversion to new option framework
  
  Reported by:	bdrewery
  Approved by:	portmgr (implicit)
  With hat:	portmgr

Modified:
  head/irc/inspircd12/Makefile

Modified: head/irc/inspircd12/Makefile
==============================================================================
--- head/irc/inspircd12/Makefile	Thu Apr  4 13:37:18 2013	(r315721)
+++ head/irc/inspircd12/Makefile	Thu Apr  4 13:43:15 2013	(r315722)
@@ -124,7 +124,7 @@ PLIST_SUB+=	SQLITE3="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSQLMODULES}
-.if ! ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MPGSQL} && !defined(WITH_SQLITE3}
+.if ! ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MPGSQL} && ! ${PORT_OPTIONS:MSQLITE3}
 BROKEN=		Please enable at least one of MYSQL, PGSQL or SQLITE3 required by SQLMODULES
 .endif
 SYMLINK_FILES+=	m_sqlauth.cpp m_sqllog.cpp m_sqloper.cpp m_sqlutils.cpp \
@@ -134,7 +134,7 @@ PLIST_SUB+=	SQLMODULES=""
 PLIST_SUB+=	SQLMODULES="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MGNUTLS) && !defined(WITHOUT_GNUTLS}
+.if ${PORT_OPTIONS:MGNUTLS}
 LIB_DEPENDS+=	gnutls.26:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=	--enable-gnutls
 SYMLINK_FILES+=	m_ssl_gnutls.cpp
@@ -143,7 +143,7 @@ PLIST_SUB+=	GNUTLS=""
 PLIST_SUB+=	GNUTLS="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MOPENSSL) && !defined(WITHOUT_OPENSSL}
+.if ${PORT_OPTIONS:MOPENSSL}
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=	--enable-openssl
 SYMLINK_FILES+=	m_ssl_openssl.cpp
@@ -152,8 +152,8 @@ PLIST_SUB+=	OPENSSL=""
 PLIST_SUB+=	OPENSSL="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MSSLMODULES) && !defined(WITHOUT_SSLMODULES}
-.if ! ${PORT_OPTIONS:MGNUTLS) && !defined(WITH_OPENSSL}
+.if ${PORT_OPTIONS:MSSLMODULES}
+.if ! ${PORT_OPTIONS:MGNUTLS} && ! ${PORT_OPTIONS:MOPENSSL}
 BROKEN=		Please enable at least one of GNUTLS or OPENSSL required by SSLMODULES
 .endif
 SYMLINK_FILES+=	m_ssl_oper_cert.cpp m_sslinfo.cpp
@@ -162,7 +162,7 @@ PLIST_SUB+=	SSLMODULES=""
 PLIST_SUB+=	SSLMODULES="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MZIPLINK) && !defined(WITHOUT_ZIPLINK}
+.if ${PORT_OPTIONS:MZIPLINK}
 SYMLINK_FILES+=	m_ziplink.cpp
 PLIST_SUB+=	ZIPLINK=""
 .else