From ohauer@FreeBSD.org  Fri Aug 24 18:50:31 2012
Return-Path: <ohauer@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 741A4106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 24 Aug 2012 18:50:31 +0000 (UTC)
	(envelope-from ohauer@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 45D698FC21;
	Fri, 24 Aug 2012 18:50:31 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q7OIoV5m055849;
	Fri, 24 Aug 2012 18:50:31 GMT
	(envelope-from ohauer@freefall.freebsd.org)
Received: (from ohauer@localhost)
	by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q7OIoUvW055848;
	Fri, 24 Aug 2012 18:50:30 GMT
	(envelope-from ohauer)
Message-Id: <201208241850.q7OIoUvW055848@freefall.freebsd.org>
Date: Fri, 24 Aug 2012 18:50:30 GMT
From: Olli Hauer <ohauer@freebsd.org>
Reply-To: Olli Hauer <ohauer@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: <venture37@geeklan.co.uk>
Subject: [patch] net-mgmt/chillispot use USE_APACHE_RUN + optionsNG
X-Send-Pr-Version: 3.113
X-GNATS-Notify: venture37@geeklan.co.uk

>Number:         171007
>Category:       ports
>Synopsis:       [patch] net-mgmt/chillispot use USE_APACHE_RUN + optionsNG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ohauer
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 24 19:00:02 UTC 2012
>Closed-Date:    Fri Aug 24 19:18:29 UTC 2012
>Last-Modified:  Mon Aug 27 01:57:30 UTC 2012
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->ohauer 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Aug 24 19:00:33 UTC 2012 
Responsible-Changed-Why:  
Submitter has GNATS access (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171007 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Fri Aug 24 19:00:39 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171007 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: venture37@geeklan.co.uk
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/171007: [patch] net-mgmt/chillispot use USE_APACHE_RUN + optionsNG
Date: Fri, 24 Aug 2012 19:00:35 UT

 Maintainer of net-mgmt/chillispot,
 
 Please note that PR ports/171007 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/171007
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

Date: Fri, 24 Aug 2012 19:52:48 +0100
From: Venture37 <venture37@geeklan.co.uk>
To: Olli Hauer <ohauer@freebsd.org>
Subject: Re: [patch] net-mgmt/chillispot use USE_APACHE_RUN + optionsNG

 Go ahead & commit please.
 
 Sevan
State-Changed-From-To: feedback->closed 
State-Changed-By: ohauer 
State-Changed-When: Fri Aug 24 19:18:01 UTC 2012 
State-Changed-Why:  
Committed, 
Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171007 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/171007: commit references a PR
Date: Fri, 24 Aug 2012 19:17:30 +0000 (UTC)

 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>
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
