Bug 171007 - [patch] net-mgmt/chillispot use USE_APACHE_RUN + optionsNG
Summary: [patch] net-mgmt/chillispot use USE_APACHE_RUN + optionsNG
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Olli Hauer
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-08-24 20:00 UTC by Olli Hauer
Modified: 2012-08-27 02:57 UTC (History)
1 user (show)

See Also:


Attachments
net-mgmt__chillispot.diff (1.28 KB, patch)
2012-08-24 20:00 UTC, Olli Hauer
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Sevan Janiyan 2012-08-24 19:52:48 UTC
Go ahead & commit please.

Sevan
Comment 1 Olli Hauer freebsd_committer 2012-08-24 20:00:02 UTC
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
Comment 2 Edwin Groothuis freebsd_committer 2012-08-24 20:00:33 UTC
Responsible Changed
From-To: freebsd-ports-bugs->ohauer

Submitter has GNATS access (via the GNATS Auto Assign Tool)
Comment 3 Edwin Groothuis freebsd_committer 2012-08-24 20:00:35 UTC
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
Comment 4 Edwin Groothuis freebsd_committer 2012-08-24 20:00:39 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 5 dfilter service freebsd_committer 2012-08-24 20:17:30 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"
Comment 6 Olli Hauer freebsd_committer 2012-08-24 20:18:01 UTC
State Changed
From-To: feedback->closed

Committed, 
Thanks!