X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=contrib%2Fpackage%2Fluci-addons%2FMakefile;h=ac31b639e801582cd54beeab5cd7be157a4daa13;hb=52326c28efacd6b6eadaf7bab72b8ec633192a00;hp=c223054a23e7d07dc9d05fe0ca2560e389eecd80;hpb=bbb44cf245c11bc0c1d59e836007c9e8c3bfa209;p=project%2Fluci.git

diff --git a/contrib/package/luci-addons/Makefile b/contrib/package/luci-addons/Makefile
index c223054a2..ac31b639e 100644
--- 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,\
@@ -181,7 +181,7 @@ $(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,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,7 +207,7 @@ $(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,transmission,LuCI Support for Transmission,transmission-daemon))
@@ -224,8 +224,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