Date: Fri, 3 Jan 2014 03:56:05 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338520 - in head: . net-mgmt net-mgmt/unifi net-mgmt/unifi3 net-mgmt/unifi3/files Message-ID: <201401030356.s033u5PC049291@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Fri Jan 3 03:56:05 2014 New Revision: 338520 URL: http://svnweb.freebsd.org/changeset/ports/338520 Log: - Move net-mgmt/unifi to net-mgmt/unifi3 - Update port to 3.1.9 Unifi 3.x is still considered "beta". There has been a request to see Unifi 2.x in the ports tree. They will live as separate ports, net-mgmt/unifi2 and net-mgmt/unifi3. PR: ports/185000 Approved by: swills (mentor) Added: head/net-mgmt/unifi3/ head/net-mgmt/unifi3/Makefile (contents, props changed) head/net-mgmt/unifi3/distinfo (contents, props changed) head/net-mgmt/unifi3/files/ head/net-mgmt/unifi3/files/unifi.in (contents, props changed) head/net-mgmt/unifi3/pkg-descr (contents, props changed) head/net-mgmt/unifi3/pkg-plist (contents, props changed) Deleted: head/net-mgmt/unifi/ Modified: head/MOVED head/net-mgmt/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Fri Jan 3 03:33:06 2014 (r338519) +++ head/MOVED Fri Jan 3 03:56:05 2014 (r338520) @@ -5343,6 +5343,7 @@ math/freemat-mpi||2013-12-23|Obsolete si devel/py-pmock||2013-12-27|Does not work with python 2.6 and beyond devel/ncurses-devel|devel/ncurses|2013-12-28|regular ncurses ports is more recent databases/mird||2013-12-28|Has expired: No longer maintained upstream +net-mgmt/unifi|net-mgmt/unifi3|2014-01-01|Rename to unifi3; unifi2 is coming to ports tree as well security/dazuko||2013-12-31|Has expired: Currently, the project has not an active development and maintainer mail/p5-Mail-SPF-Query||2013-12-31|Has expired: Use mail/p5-Mail-SPF instead x11-fonts/etlfonts||2013-12-31|Has expired: master site gone @@ -5356,3 +5357,4 @@ textproc/referrercop||2014-01-01|Has exp www/notftp||2014-01-01|Has expired: distfile unfetchable www/mod_lisp2||2014-01-01|Has expired: distfile unfetchable irc/xchat-gnome||2014-01-02|Has expired: broken and no release since 2009 +net-mgmt/unifi|net-mgmt/unifi3|2014-01-02|Rename to unifi3; unifi2 is coming to ports tree as well Modified: head/net-mgmt/Makefile ============================================================================== --- head/net-mgmt/Makefile Fri Jan 3 03:33:06 2014 (r338519) +++ head/net-mgmt/Makefile Fri Jan 3 03:56:05 2014 (r338520) @@ -313,7 +313,7 @@ SUBDIR += tcpreplay SUBDIR += tcptrack SUBDIR += torrus - SUBDIR += unifi + SUBDIR += unifi3 SUBDIR += vidalia SUBDIR += virt-viewer SUBDIR += virtinst Added: head/net-mgmt/unifi3/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/unifi3/Makefile Fri Jan 3 03:56:05 2014 (r338520) @@ -0,0 +1,42 @@ +# Created by: Mark Felder <feld@FreeBSD.org> +# $FreeBSD$ + +PORTNAME= unifi3 +PORTVERSION= 3.1.9 +CATEGORIES= net-mgmt java +MASTER_SITES= http://dl.ubnt.com/unifi/${PORTVERSION}/ +DISTNAME= UniFi.unix +DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} + +MAINTAINER= feld@FreeBSD.org +COMMENT= UniFi Wireless Controller + +RUN_DEPENDS= mongodb>0:${PORTSDIR}/databases/mongodb + +SUB_LIST+= USERS=${USERS} GROUPS=${GROUPS} JAVASHAREDIR=${JAVASHAREDIR} + +USE_ZIP= yes +USE_JAVA= yes +JAVA_VERSION= 1.6+ +JAVA_OS= native +JAVA_VENDOR= openjdk bsdjava +JAVA_RUN= yes + +NO_BUILD= yes + +USE_RC_SUBR= unifi + +USERS= unifi +GROUPS= unifi + +PLIST_SUB+= USERS="${USERS}" +PLIST_SUB+= GROUPS="${GROUPS}" +WRKSRC= ${WRKDIR}/UniFi + +RESTRICTED= Redistribution of bundled firmware images is not permitted + +do-install: + ${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/unifi + (cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${JAVASHAREDIR}/unifi/) + +.include <bsd.port.mk> Added: head/net-mgmt/unifi3/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/unifi3/distinfo Fri Jan 3 03:56:05 2014 (r338520) @@ -0,0 +1,2 @@ +SHA256 (unifi3-3.1.9/UniFi.unix.zip) = d22f3bc07b41619fbcbc6019a448863aede6157b685bf68a6a159f2d4b888fbd +SIZE (unifi3-3.1.9/UniFi.unix.zip) = 34868244 Added: head/net-mgmt/unifi3/files/unifi.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/unifi3/files/unifi.in Fri Jan 3 03:56:05 2014 (r338520) @@ -0,0 +1,74 @@ +#!/bin/sh +# +# Created by: Mark Felder <feld@feld.me> +# $FreeBSD: head/net-mgmt/unifi/files/unifi.in 334865 2013-11-25 16:52:21Z feld $ +# + +# PROVIDE: unifi +# REQUIRE: LOGIN +# KEYWORD: shutdown + +# +# Add the following line to /etc/rc.conf to enable `unifi': +# +# unifi_enable="YES" + +. /etc/rc.subr +name=unifi + +rcvar=unifi_enable +load_rc_config ${name} + +: ${unifi_enable:=NO} +: ${unifi_user:=%%USERS%%} +: ${unifi_group:=%%GROUPS%%} +: ${unifi_chdir=%%JAVASHAREDIR%%/unifi} + +command_interpreter=. +command="%%PREFIX%%/bin/java" +command_args="-Djava.awt.headless=true -Xmx1024M -jar lib/ace.jar" +start_cmd=start_cmd +start_precmd=start_precmd +stop_cmd=stop_cmd +status_cmd=status_cmd +pidfile="/var/run/${name}.pid" + +procname=$(JAVAVM_DRYRUN=yes ${command} | fgrep JAVAVM_COMMAND) + +start_precmd() +{ + if [ ! -e /var/run/unifi ] ; then + install -d -o %%USERS%% -g %%GROUPS%% /var/run/unifi; + fi +} + +start_cmd() +{ + check_startmsgs && echo "Starting ${name}." + cd ${unifi_chdir} + daemon -u %%USERS%% -f -p ${pidfile} ${command} ${command_args} start +} + +stop_cmd() +{ + check_startmsgs && echo "Stopping ${name}." + rc_pid=$(check_pidfile $pidfile $procname) + cd ${unifi_chdir} + ${command} ${command_args} stop + wait_for_pids $rc_pid +} + +status_cmd() +{ + if [ -e ${pidfile} ] && $(pgrep -F ${pidfile} > /dev/null) ; then + mypid=$(cat ${pidfile}) + fi + + if [ ! ${mypid} = '' ]; then + echo "${name} is running with PID ${mypid}."; + else + echo "${name} not running?"; + fi +} + +run_rc_command "$1" Added: head/net-mgmt/unifi3/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/unifi3/pkg-descr Fri Jan 3 03:56:05 2014 (r338520) @@ -0,0 +1,3 @@ +The UniFi Controller allows you to manage a UniFi Wireless Network. + +WWW: http://wiki.ubnt.com/UniFi_FAQ Added: head/net-mgmt/unifi3/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/unifi3/pkg-plist Fri Jan 3 03:56:05 2014 (r338520) @@ -0,0 +1,73 @@ +%%JAVASHAREDIR%%/unifi/bin/mongod +%%JAVASHAREDIR%%/unifi/dl/firmware/BZ2/3.1.9.2442/firmware.bin +%%JAVASHAREDIR%%/unifi/dl/firmware/U2S48/3.1.9.2442/firmware.bin +%%JAVASHAREDIR%%/unifi/dl/firmware/U7E/3.1.9.2442/firmware.bin +%%JAVASHAREDIR%%/unifi/dl/firmware/U7P/3.1.9.2442/firmware.bin +%%JAVASHAREDIR%%/unifi/dl/firmware/bundles.json +%%JAVASHAREDIR%%/unifi/lib/MRJAdapter.jar +%%JAVASHAREDIR%%/unifi/lib/ace.jar +%%JAVASHAREDIR%%/unifi/lib/annotations-api.jar +%%JAVASHAREDIR%%/unifi/lib/asm.jar +%%JAVASHAREDIR%%/unifi/lib/bootstrap.jar +%%JAVASHAREDIR%%/unifi/lib/catalina-ant.jar +%%JAVASHAREDIR%%/unifi/lib/catalina-ha.jar +%%JAVASHAREDIR%%/unifi/lib/catalina-tribes.jar +%%JAVASHAREDIR%%/unifi/lib/catalina.jar +%%JAVASHAREDIR%%/unifi/lib/cglib.jar +%%JAVASHAREDIR%%/unifi/lib/commons-beanutils.jar +%%JAVASHAREDIR%%/unifi/lib/commons-codec.jar +%%JAVASHAREDIR%%/unifi/lib/commons-daemon.jar +%%JAVASHAREDIR%%/unifi/lib/commons-httpclient.jar +%%JAVASHAREDIR%%/unifi/lib/commons-lang.jar +%%JAVASHAREDIR%%/unifi/lib/commons-logging.jar +%%JAVASHAREDIR%%/unifi/lib/commons-net.jar +%%JAVASHAREDIR%%/unifi/lib/dom4j.jar +%%JAVASHAREDIR%%/unifi/lib/ecj-4.2.1.jar +%%JAVASHAREDIR%%/unifi/lib/el-api.jar +%%JAVASHAREDIR%%/unifi/lib/jasper-el.jar +%%JAVASHAREDIR%%/unifi/lib/jasper.jar +%%JAVASHAREDIR%%/unifi/lib/jmdns.jar +%%JAVASHAREDIR%%/unifi/lib/jsp-api.jar +%%JAVASHAREDIR%%/unifi/lib/jstl.jar +%%JAVASHAREDIR%%/unifi/lib/jstun-0.7.3.jar +%%JAVASHAREDIR%%/unifi/lib/jul-log4j-bridge.jar +%%JAVASHAREDIR%%/unifi/lib/log4j.jar +%%JAVASHAREDIR%%/unifi/lib/mail.jar +%%JAVASHAREDIR%%/unifi/lib/mongo.jar +%%JAVASHAREDIR%%/unifi/lib/org.springframework.config.java-1.0.0.M4.jar +%%JAVASHAREDIR%%/unifi/lib/servlet-api.jar +%%JAVASHAREDIR%%/unifi/lib/slf4j-api.jar +%%JAVASHAREDIR%%/unifi/lib/slf4j-log4j12.jar +%%JAVASHAREDIR%%/unifi/lib/spring-beans-2.5.6.jar +%%JAVASHAREDIR%%/unifi/lib/spring-context-2.5.6.jar +%%JAVASHAREDIR%%/unifi/lib/spring-core-2.5.6.jar +%%JAVASHAREDIR%%/unifi/lib/sshj.jar +%%JAVASHAREDIR%%/unifi/lib/tomcat-api.jar +%%JAVASHAREDIR%%/unifi/lib/tomcat-coyote.jar +%%JAVASHAREDIR%%/unifi/lib/tomcat-dbcp.jar +%%JAVASHAREDIR%%/unifi/lib/tomcat-i18n-es.jar +%%JAVASHAREDIR%%/unifi/lib/tomcat-i18n-fr.jar +%%JAVASHAREDIR%%/unifi/lib/tomcat-i18n-ja.jar +%%JAVASHAREDIR%%/unifi/lib/tomcat-jdbc.jar +%%JAVASHAREDIR%%/unifi/lib/tomcat-juli-adapters.jar +%%JAVASHAREDIR%%/unifi/lib/tomcat-juli.jar +%%JAVASHAREDIR%%/unifi/lib/tomcat-util.jar +%%JAVASHAREDIR%%/unifi/readme.txt +%%JAVASHAREDIR%%/unifi/webapps/ROOT.war +@dirrmtry %%JAVASHAREDIR%%/unifi/webapps +@dirrmtry %%JAVASHAREDIR%%/unifi/lib +@dirrmtry %%JAVASHAREDIR%%/unifi/dl/firmware/U7P/3.1.9.2442 +@dirrmtry %%JAVASHAREDIR%%/unifi/dl/firmware/U7P +@dirrmtry %%JAVASHAREDIR%%/unifi/dl/firmware/U7E/3.1.9.2442 +@dirrmtry %%JAVASHAREDIR%%/unifi/dl/firmware/U7E +@dirrmtry %%JAVASHAREDIR%%/unifi/dl/firmware/U2S48/3.1.9.2442 +@dirrmtry %%JAVASHAREDIR%%/unifi/dl/firmware/U2S48 +@dirrmtry %%JAVASHAREDIR%%/unifi/dl/firmware/BZ2/3.1.9.2442 +@dirrmtry %%JAVASHAREDIR%%/unifi/dl/firmware/BZ2 +@dirrmtry %%JAVASHAREDIR%%/unifi/dl/firmware +@dirrmtry %%JAVASHAREDIR%%/unifi/dl +@dirrmtry %%JAVASHAREDIR%%/unifi/conf +@dirrmtry %%JAVASHAREDIR%%/unifi/bin +@dirrmtry %%JAVASHAREDIR%%/unifi +@exec chown -R %%USERS%%:%%GROUPS%% %D/%%JAVASHAREDIR%%/unifi +@exec ln -sf %D/bin/mongod %D/%%JAVASHAREDIR%%/unifi/bin/mongod
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401030356.s033u5PC049291>