contrib: move luci-app-ocserv to luci-addons, fix recusrive deps

[project/luci.git] / contrib / package / luci-addons / Makefile

diff --git a/contrib/package/luci-addons/Makefile b/contrib/package/luci-addons/Makefile
index c1c0992..859390c 100644 (file)
--- a/contrib/package/luci-addons/Makefile
+++ b/contrib/package/luci-addons/Makefile
@@ -49,7 +49,7 @@ define Package/luci-mod-freifunk-community
   TITLE:=Freifunk Community Meta-Package
   DEPENDS+=$(call add_deps,mod-freifunk-community, \
     iptables-mod-nat-extra iptables-mod-ipopt \
-       luci-lib-web luci-app-splash luci-i18n-german \
+       luci-app-splash luci-i18n-german \
        olsrd olsrd-mod-dyn-gw-plain \
        olsrd-mod-jsoninfo olsrd-mod-nameservice \
        olsrd-mod-watchdog kmod-tun \
@@ -142,9 +142,9 @@ $(eval $(call application,freifunk-policyrouting,Policy routing for mesh traffic
 $(eval $(call application,freifunk-widgets,Widgets for the Freifunk index page,luci-mod-freifunk))
 $(eval $(call application,meshwizard, Shellscript based wizard to setup mesh networks,meshwizard))
 $(eval $(call application,olsr,OLSR configuration and status module,olsrd olsrd-mod-jsoninfo luci-lib-luaneightbl))
-$(eval $(call application,olsr-viz,OLSR Visualisation,luci-app-olsr olsrd-mod-txtinfo))
+$(eval $(call application,olsr-viz,OLSR Visualisation,luci-app-olsr olsrd olsrd-mod-txtinfo))
 $(eval $(call application,freifunk-diagnostics,Tools for network diagnosis like traceroute and ping))
-$(eval $(call application,olsr-services,Show services announced with the nameservice plugin,luci-app-olsr olsrd-mod-nameservice))
+$(eval $(call application,olsr-services,Show services announced with the nameservice plugin,luci-app-olsr olsrd olsrd-mod-nameservice))
 $(eval $(call application,splash,Freifunk DHCP-Splash application,luci-lib-nixio tc kmod-sched iptables-mod-nat-extra iptables-mod-ipopt))
 
 $(eval $(call application,statistics,LuCI Statistics Application,\
@@ -171,9 +171,11 @@ $(eval $(call application,diag-devinfo,LuCI Diagnostics Tools (Device Info),\
 $(eval $(call application,voice-core,LuCI Voice Software (Core)))
 $(eval $(call application,voice-diag,LuCI Voice Software (Diagnostics),luci-app-diag-devinfo))
 
+$(eval $(call application,udpxy,LuCI Support for udpxy,udpxy))
 $(eval $(call application,upnp,Universal Plug & Play configuration module,miniupnpd))
 $(eval $(call application,ntpc,NTP time synchronisation configuration module,ntpclient))
 $(eval $(call application,ddns,Dynamic DNS configuration module,ddns-scripts))
+$(eval $(call application,dump1090,LuCI Support for dump1090,dump1090))
 $(eval $(call application,samba,Network Shares - Samba SMB/CIFS module,samba36-server))
 $(eval $(call application,mmc-over-gpio,MMC-over-GPIO configuration module,kmod-mmc-over-gpio))
 $(eval $(call application,p910nd,p910nd - Printer server module,p910nd))
@@ -181,7 +183,8 @@ $(eval $(call application,ushare,uShare - UPnP A/V & DLNA Media Server,ushare))
 $(eval $(call application,hd-idle,Hard Disk Idle Spin-Down module,hd-idle))
 $(eval $(call application,tinyproxy,Tinyproxy - HTTP(S)-Proxy configuration,tinyproxy))
 $(eval $(call application,polipo,LuCI Support for the Polipo Proxy,polipo))
-$(eval $(call application,openvpn,LuCI Support for OpenVPN,openvpn @BROKEN))
+$(eval $(call application,ocserv,LuCI Support for OpenConnect VPN,ocserv certtool))
+$(eval $(call application,openvpn,LuCI Support for OpenVPN,openvpn))
 $(eval $(call application,p2pblock,LuCI Support for the Freifunk P2P-Block addon,luci-app-firewall freifunk-p2pblock))
 $(eval $(call application,multiwan,LuCI Support for the OpenWrt MultiWAN agent,luci-app-firewall multiwan))
 $(eval $(call application,wol,LuCI Support for Wake-on-LAN,etherwake))
@@ -207,9 +210,11 @@ $(eval $(call application,pbx,LuCI PBX Administration,\
        asterisk18-app-senddtmf \
        asterisk18-res-crypto))
 
-$(eval $(call application,pbx-voicemail,LuCI PBX Administration Voicemail Support,luci-app-pbx msmtp coreutils-base64))
+$(eval $(call application,pbx-voicemail,LuCI PBX Administration Voicemail Support,luci-app-pbx asterisk18 msmtp coreutils-base64))
 $(eval $(call application,ltqtapi,Lantiq voip))
 $(eval $(call application,minidlna,LuCI Support for miniDLNA,minidlna))
+$(eval $(call application,shairplay,LuCI Support for Shairplay,shairplay))
+$(eval $(call application,shairport,LuCI Support for Shairport,shairport))
 $(eval $(call application,transmission,LuCI Support for Transmission,transmission-daemon))
 $(eval $(call application,watchcat,LuCI Support for Watchcat,watchcat))
 
@@ -224,8 +229,7 @@ define theme
     SUBMENU:=4. Themes
     TITLE:=$(if $(2),$(2),LuCI $(1) theme)
        MAINTAINER:=$(if $(3),$(3),LuCI Development Team <luci@lists.subsignal.org>)
-       DEPENDS:=$(if $(filter-out base,$(1)),+luci-theme-base) $(4)
-       $(if $(5),DEFAULT:=PACKAGE_luci-lib-core)
+       DEPENDS:=+luci-base $(4)
   endef
 
   define Package/luci-theme-$(1)/install
@@ -262,7 +266,7 @@ define Build/Prepare
        mkdir -p $(PKG_BUILD_DIR)
        $(TAR) c -C $(LUCI_TOPDIR) . \
                --exclude=.pc --exclude=.svn --exclude=.git \
-               --exclude='boa-0*' --exclude='*.o' --exclude='*.so' \
+               --exclude='*.o' --exclude='*.so' \
                --exclude=dist | \
                        tar x -C $(PKG_BUILD_DIR)/
        $(call Build/Prepare/Default)