From owner-svn-ports-all@FreeBSD.ORG  Fri Aug 24 19:17:16 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 70513106566B;
	Fri, 24 Aug 2012 19:17:16 +0000 (UTC)
	(envelope-from ohauer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5BAF58FC08;
	Fri, 24 Aug 2012 19:17:16 +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 q7OJHGEQ090558;
	Fri, 24 Aug 2012 19:17:16 GMT (envelope-from ohauer@svn.freebsd.org)
Received: (from ohauer@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7OJHGD3090556;
	Fri, 24 Aug 2012 19:17:16 GMT (envelope-from ohauer@svn.freebsd.org)
Message-Id: <201208241917.q7OJHGD3090556@svn.freebsd.org>
From: Olli Hauer <ohauer@FreeBSD.org>
Date: Fri, 24 Aug 2012 19:17:16 +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: r303097 - head/net-mgmt/chillispot
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Aug 2012 19:17:16 -0000

Author: ohauer
Date: Fri Aug 24 19:17:15 2012
New Revision: 303097
URL: http://svn.freebsd.org/changeset/ports/303097

Log:
  - remove deprecated apache versions
  - use USE_APACHE_RUN
  - convert to new options framework
  
  no bump since all options are off per default
  
  PR:		ports/171007
  Submitted by:	ohauer
  Approved by:	venture37@geeklan.co.uk (maintainer) per mail

Modified:
  head/net-mgmt/chillispot/Makefile

Modified: head/net-mgmt/chillispot/Makefile
==============================================================================
--- head/net-mgmt/chillispot/Makefile	Fri Aug 24 18:13:28 2012	(r303096)
+++ head/net-mgmt/chillispot/Makefile	Fri Aug 24 19:17:15 2012	(r303097)
@@ -24,28 +24,24 @@ USE_RC_SUBR=	chillispot
 SUB_FILES=	pkg-message installguide.txt
 MAN8=		chilli.8
 
-OPTIONS=	RAW "Latest Release Of Apache & mySQL" Off \
-		MATURE "Stable Releases of Apache with mod_ssl &  MySQL" Off \
-		FREE "freeRADIUS" Off \
-		OPENR "openradius" Off
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_RAW)
-RUN_DEPENDS+=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache20 \
-	${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql50-server
-.endif
+OPTIONS_DEFINE=	APACHE RADIUS
+OPTIONS_SINGLE=	RADIUS
+OPTIONS_SINGLE_RADIUS= FREERADIUS OPENRADIUS
+
+FREERADIUS_DESC=depend on FreeRADIUS
+OPENRADIUS_DESC=depend on OpenRADIUS
+
+.include <bsd.port.options.mk>
 
-.if defined(WITH_MATURE)
-RUN_DEPENDS+=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13-modssl \
-	${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql41-server
+.if ${PORT_OPTIONS:MAPACHE}
+USE_APACHE_RUN=	22+
 .endif
 
-.if defined(WITH_FREE)
+.if ${PORT_OPTIONS:MFREERADIUS}
 RUN_DEPENDS+=	radiusd:${PORTSDIR}/net/freeradius
 .endif
 
-.if defined(WITH_OPENR)
+.if ${PORT_OPTIONS:MOPENRADIUS}
 RUN_DEPENDS+=	radiusd:${PORTSDIR}/net/openradius
 .endif
 
@@ -62,4 +58,4 @@ post-install:
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>