From owner-svn-ports-head@FreeBSD.ORG  Thu Aug 30 12:08:46 2012
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D8C631065679;
	Thu, 30 Aug 2012 12:08:46 +0000 (UTC)
	(envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AABEB8FC15;
	Thu, 30 Aug 2012 12:08:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7UC8kUp037845;
	Thu, 30 Aug 2012 12:08:46 GMT
	(envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7UC8kwY037841;
	Thu, 30 Aug 2012 12:08:46 GMT
	(envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201208301208.q7UC8kwY037841@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 30 Aug 2012 12:08:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r303371 - in head: Mk www/kannel
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 30 Aug 2012 12:08:47 -0000

Author: bdrewery
Date: Thu Aug 30 12:08:46 2012
New Revision: 303371
URL: http://svn.freebsd.org/changeset/ports/303371

Log:
  - Convert to new options framework
  - Remove ABI version from LIB_DEPENDS
  
  Approved by:	eadler, bapt (mentors, implicit)

Modified:
  head/Mk/bsd.options.desc.mk
  head/www/kannel/Makefile

Modified: head/Mk/bsd.options.desc.mk
==============================================================================
--- head/Mk/bsd.options.desc.mk	Thu Aug 30 12:02:48 2012	(r303370)
+++ head/Mk/bsd.options.desc.mk	Thu Aug 30 12:08:46 2012	(r303371)
@@ -255,6 +255,7 @@ SPANDSP_DESC?=		Spandsp faxing support
 SPEEX_DESC?=		Speex audio format support
 SQL_DESC?=		SQL database backend
 SQLITE_DESC?=		SQLite backend
+SQLITE3_DESC?=		SQLite3 backend
 SSE_DESC?=		Use SSE optimized routines
 SSH_DESC?=		SSH support
 SSL_DESC?=		SSL support

Modified: head/www/kannel/Makefile
==============================================================================
--- head/www/kannel/Makefile	Thu Aug 30 12:02:48 2012	(r303370)
+++ head/www/kannel/Makefile	Thu Aug 30 12:08:46 2012	(r303371)
@@ -15,7 +15,7 @@ DISTNAME=	gateway-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	WAP / SMS Gateway
 
-LIB_DEPENDS=	pcre.1:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
 
 USE_RC_SUBR=	kannel
 USE_GNOME=	libxml2
@@ -31,30 +31,28 @@ CONFIGURE_ARGS=	--with-cflags="${CPPFLAG
 MAN1=		mtbatch.1 seewbmp.1 wmlsc.1 wmlsdasm.1
 MAN8=		kannel.8 run_kannel_box.8
 
-OPTIONS=	MYSQL	"Enable MySQL support"		off \
-		PGSQL	"Enable PostgreSQL support"	off \
-		SQLITE3	"Enable SQLite support"		off
+OPTIONS_DEFINE=	MYSQL PGSQL SQLITE3
 
 .include <bsd.port.options.mk>
 
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=--with-mysql
 .else
 CONFIGURE_ARGS+=--without-mysql
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=--with-pgsql
 .else
 CONFIGURE_ARGS+=--without-pgsql
 .endif
 
-.if defined(WITH_SQLITE3)
+.if ${PORT_OPTIONS:MSQLITE3}
 USE_SQLITE=	3
 CONFIGURE_ARGS+=--with-sqlite3
 .else