svn commit: r320106 - in head/databases: rubygem-rubyrep sqlbuddy

[Baptiste Daroussin]

Author: bapt
Date: Thu Jun  6 15:41:26 2013
New Revision: 320106
URL: http://svnweb.freebsd.org/changeset/ports/320106

Log:
  Convert to new options framework

Modified:
  head/databases/rubygem-rubyrep/Makefile
  head/databases/sqlbuddy/Makefile

Modified: head/databases/rubygem-rubyrep/Makefile
==============================================================================
--- head/databases/rubygem-rubyrep/Makefile	Thu Jun  6 15:38:37 2013	(r320105)
+++ head/databases/rubygem-rubyrep/Makefile	Thu Jun  6 15:41:26 2013	(r320106)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	rubygem-rubyrep
-# Date created:		2011-07-30
-# Whom:			Steve Wills <swills at FreeBSD.org>
-#
+# Created by: Steve Wills <swills at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=		rubyrep
 PORTVERSION=		1.2.0
@@ -25,18 +21,18 @@ RUBYGEM_AUTOPLIST=	yes
 
 USE_RC_SUBR=	rubyrep
 
-OPTIONS =	MYSQL "Enable MySQL support" off \
-		PGSQL "Enable PostgreSQL support" on
+OPTIONS_DEFINE=	MYSQL PGSQL
+OPTIONS_DEFAULT=	PGSQL
 
 PLIST_FILES=	bin/rubyrep
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 RUN_DEPENDS+=	rubygem-pg>=0:${PORTSDIR}/databases/rubygem-pg
 .endif
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 RUN_DEPENDS+=	ruby-mysql>=0:${PORTSDIR}/databases/ruby-mysql
 .endif
 

Modified: head/databases/sqlbuddy/Makefile
==============================================================================
--- head/databases/sqlbuddy/Makefile	Thu Jun  6 15:38:37 2013	(r320105)
+++ head/databases/sqlbuddy/Makefile	Thu Jun  6 15:41:26 2013	(r320106)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   SQL Buddy
-# Date created:        17 August 2008
-# Whom:                Chenguang LI
-#
+# Created by: Chenguang LI
 # $FreeBSD$
-#
 
 PORTNAME=	sqlbuddy
 PORTVERSION=	1.3.3
@@ -22,17 +18,17 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_PHP=	ctype pcre session
 WANT_PHP_WEB=	yes
 
-OPTIONS+=	MYSQL  "MySQL support" on \
-		SQLITE "SQLite support" off
+OPTIONS_DEFINE=	MYSQL SQLITE
+OPTIONS_DEFAULT=	SQLITE
 
 SUB_FILES=	pkg-message
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_PHP+=	mysql
 .endif
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 USE_PHP+=	sqlite
 .endif
 
@@ -53,4 +49,4 @@ do-install:
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>