ports/171007: [patch] net-mgmt/chillispot use USE_APACHE_RUN + optionsNG

Olli Hauer ohauer at FreeBSD.org
Fri Aug 24 19:00:03 UTC 2012


>Number:         171007
>Category:       ports
>Synopsis:       [patch] net-mgmt/chillispot use USE_APACHE_RUN + optionsNG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 24 19:00:02 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Olli Hauer
>Release:        
>Organization:
>Environment:

>Description:
apache13/20 are no longer in the portstree so the option should be removed.

Since apache is only used to serve a cgi-form, chillispot does not depend
on the version (indeed this cgi-form can run on any web-server with cgi support)

Additional remove the dependency on MySQL which is not used by chillispot
but *maybe* by the radius server if radius was build with SQL support.

No PORTREVISION bump, all OPTIONS are off per default

>How-To-Repeat:

>Fix:

--- net-mgmt__chillispot.diff begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 303095)
+++ Makefile	(working copy)
@@ -24,28 +24,22 @@
 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
+OPTIONS_DEFINE=	APACHE FREERADIUS OPENRADIUS
 
-.include <bsd.port.pre.mk>
+FREERADIUS_DESC=depend on FreeRADIUS
+OPENRADIUS_DESC=depend on OpenRADIUS
 
-.if defined(WITH_RAW)
-RUN_DEPENDS+=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache20 \
-	${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql50-server
-.endif
+.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 +56,4 @@
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- net-mgmt__chillispot.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list