From owner-svn-ports-head@FreeBSD.ORG Sun Jan 19 18:40:27 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CF4E51F2; Sun, 19 Jan 2014 18:40:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B01FE12B4; Sun, 19 Jan 2014 18:40:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0JIeRZk043170; Sun, 19 Jan 2014 18:40:27 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0JIeRO1043168; Sun, 19 Jan 2014 18:40:27 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401191840.s0JIeRO1043168@svn.freebsd.org> From: Baptiste Daroussin Date: Sun, 19 Jan 2014 18:40:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340334 - head/net-mgmt/chillispot X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jan 2014 18:40:28 -0000 Author: bapt Date: Sun Jan 19 18:40:27 2014 New Revision: 340334 URL: http://svnweb.freebsd.org/changeset/ports/340334 QAT: https://qat.redports.org/buildarchive/r340334/ Log: Support stage Fix shebang Modified: head/net-mgmt/chillispot/Makefile head/net-mgmt/chillispot/pkg-plist Modified: head/net-mgmt/chillispot/Makefile ============================================================================== --- head/net-mgmt/chillispot/Makefile Sun Jan 19 18:34:41 2014 (r340333) +++ head/net-mgmt/chillispot/Makefile Sun Jan 19 18:40:27 2014 (r340334) @@ -14,11 +14,12 @@ COMMENT= Wireless LAN Access Point Contr CONFLICTS= coovachilli-[0-9]* +USES= shebangfix +SHEBANG_FILES= doc/hotspotlogin.cgi GNU_CONFIGURE= yes CONFIGURE_ARGS=-sysconfdir=${PREFIX}/etc USE_RC_SUBR= chillispot SUB_FILES= pkg-message installguide.txt -MAN8= chilli.8 USE_GCC= any OPTIONS_DEFINE= APACHE RADIUS @@ -28,32 +29,18 @@ OPTIONS_SINGLE_RADIUS= FREERADIUS OPENRA FREERADIUS_DESC=depend on FreeRADIUS OPENRADIUS_DESC=depend on OpenRADIUS -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MAPACHE} -USE_APACHE_RUN= 22+ -.endif - -.if ${PORT_OPTIONS:MFREERADIUS} -RUN_DEPENDS+= radiusd:${PORTSDIR}/net/freeradius -.endif - -.if ${PORT_OPTIONS:MOPENRADIUS} -RUN_DEPENDS+= radiusd:${PORTSDIR}/net/openradius -.endif +APACHE_USE= apache_run=22+ +FREERADIUS_RUN_DEPENDS= radiusd:${PORTSDIR}/net/freeradius +OPENRADIUS_RUN_DEPENDS= radiusd:${PORTSDIR}/net/openradius post-install: -.if !defined(NOPORTDATA) - ${MKDIR} ${DATADIR} - ${INSTALL_MAN} ${WRKSRC}/doc/chilli.conf ${DATADIR}/chilli.conf.sample - ${INSTALL_MAN} ${WRKSRC}/doc/dictionary.chillispot ${DATADIR} - ${INSTALL_MAN} ${WRKSRC}/doc/freeradius.users ${DATADIR} - ${INSTALL_MAN} ${WRKSRC}/doc/hotspotlogin.cgi ${DATADIR} - ${INSTALL_MAN} ${WRKDIR}/installguide.txt ${DATADIR} - ${INSTALL_MAN} ${FILESDIR}/pf.conf.sample ${DATADIR} - ${INSTALL_MAN} ${FILESDIR}/ipfw-config.sample ${DATADIR} -.endif - @${CAT} ${PKGMESSAGE} + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/doc/chilli.conf ${STAGEDIR}${DATADIR}/chilli.conf.sample + ${INSTALL_DATA} ${WRKSRC}/doc/dictionary.chillispot ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/doc/freeradius.users ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/doc/hotspotlogin.cgi ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKDIR}/installguide.txt ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${FILESDIR}/pf.conf.sample ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${FILESDIR}/ipfw-config.sample ${STAGEDIR}${DATADIR} .include Modified: head/net-mgmt/chillispot/pkg-plist ============================================================================== --- head/net-mgmt/chillispot/pkg-plist Sun Jan 19 18:34:41 2014 (r340333) +++ head/net-mgmt/chillispot/pkg-plist Sun Jan 19 18:40:27 2014 (r340334) @@ -1,5 +1,6 @@ @stopdaemon chillispot sbin/chilli +man/man8/chilli.8.gz %%PORTDATA%%%%DATADIR%%/chilli.conf.sample %%PORTDATA%%%%DATADIR%%/dictionary.chillispot %%PORTDATA%%%%DATADIR%%/freeradius.users