Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Aug 2012 19:17:16 +0000 (UTC)
From:      Olli Hauer <ohauer@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r303097 - head/net-mgmt/chillispot
Message-ID:  <201208241917.q7OJHGD3090556@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208241917.q7OJHGD3090556>