contrib: fix a typo in luci makefile
[project/luci.git] / contrib / package / luci / Makefile
index d1995f3..bd2db78 100644 (file)
 include $(TOPDIR)/rules.mk
 
 PKG_BRANCH:=trunk
-PKG_SOURCE_URL:=https://dev.leipzig.freifunk.net/svn/ff-luci/$(PKG_BRANCH)
-PKG_REV:=$(shell LC_ALL=C svn info ${PKG_SOURCE_URL} | sed -ne's/^Last Changed Rev: //p')
+
+ifeq ($(DUMP),)
+  USELOCAL:=$(shell grep luci ../../../.project 2>/dev/null >/dev/null && echo 1)
+endif
 
 PKG_NAME:=luci
-PKG_VERSION:=0.5+svn$(PKG_REV)
 PKG_RELEASE:=1
 
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
-PKG_SOURCE_PROTO:=svn
-PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_BUILD_PARALLEL:=0
+
+ifeq ($(USELOCAL),1)
+  PKG_VERSION:=0.10+svn
+else
+  PKG_SOURCE_URL:=http://svn.luci.subsignal.org/luci/$(PKG_BRANCH)
+  ifeq ($(DUMP),)
+    PKG_REV:=$(shell LC_ALL=C svn info $(CURDIR) | sed -ne's/^Revision: //p')
+    PKG_VERSION:=0.10+svn$(PKG_REV)
+  endif
+  PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+  PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
+  PKG_SOURCE_PROTO:=svn
+  PKG_SOURCE_VERSION:=$(PKG_REV)
+endif
 
+PKG_BUILD_DEPENDS:=$(if $(STAGING_DIR_ROOT),lua/host)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-# LUA_TARGET:=compile LUAC=$(BUILD_DIR_HOST)/lua/luac
 LUA_TARGET:=source
-PKG_SELECTED_MODULES:=
+LUCI_CFLAGS:=
+LUCI_BUILD_PACKAGES:=
+LUCI_SELECTED_MODULES:=
+
+ifeq ($(BOARD),brcm-2.4)
+  MAKE_FLAGS += CRAP="1"
+endif
 
 
 include $(INCLUDE_DIR)/package.mk
 
+ifeq ($(USELOCAL),1)
+  define Build/Prepare
+       mkdir -p $(PKG_BUILD_DIR)
+       $(TAR) c -C ../../../ . \
+               --exclude=.pc --exclude=.svn --exclude=.git \
+               --exclude='boa-0*' --exclude='*.o' --exclude='*.so' \
+               --exclude=dist | \
+                       tar x -C $(PKG_BUILD_DIR)/
+  endef
+endif
+
 define Build/Configure
 endef
 
+MAKE_FLAGS += \
+       MODULES="$(LUCI_SELECTED_MODULES)" \
+       LUA_TARGET="$(LUA_TARGET)" \
+       LUA_SHLIBS="-llua -lm -ldl -lcrypt" \
+       CFLAGS="$(TARGET_CFLAGS) $(LUCI_CFLAGS) -I$(STAGING_DIR)/usr/include" \
+       LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \
+       NIXIO_TLS="$(NIXIO_TLS)" OS="Linux"
 
-define Build/Compile 
-       for i in '$(PKG_SELECTED_MODULES)'; do $(MAKE) -C$(PKG_BUILD_DIR)/$$i build LUA_TARGET=$(LUA_TARGET); done
-endef
 
 ### Templates ###
+define Package/luci/install/template
+       $(CP) -a $(PKG_BUILD_DIR)/$(2)/dist/* $(1)/ -R
+       $(CP) -a $(PKG_BUILD_DIR)/$(2)/ipkg/* $(1)/CONTROL/ 2>/dev/null || true
+endef
 
-define Package/luci/libtemplate
-  SECTION:=admin
-  CATEGORY:=Administration
+
+### Core package ###
+define Package/luci-lib-core
+  SECTION:=luci
+  CATEGORY:=LuCI
   TITLE:=LuCI - Lua Configuration Interface
-  URL:=http://luci.freifunk-halle.net/
-  MAINTAINER:=Steven Barth <steven-at-midlink-dot-org>
-  SUBMENU:=LuCI - Libraries
-  DEPENDS:=+luci-core
+  URL:=http://luci.subsignal.org/
+  MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
+  SUBMENU:=Libraries
+  DEPENDS:=+lua +libuci-lua
+  TITLE:=LuCI core libraries
 endef
 
-define Package/luci/fftemplate
-  $(call Package/luci/libtemplate)
-  SUBMENU:=LuCI - Freifunk Support
-  DEPENDS:=+luci-mod-freifunk
+define Package/luci-lib-core/install
+       $(call Package/luci/install/template,$(1),libs/core)
+       $(PKG_BUILD_DIR)/build/mkversion.sh $(1)/usr/lib/lua/luci/version.lua \
+               "OpenWrt Firmware" \
+               "$(OPENWRTVERSION)" \
+               "$(PKG_BRANCH)" \
+               "$(PKG_VERSION)"
 endef
 
-define Package/luci/webtemplate
-  $(call Package/luci/libtemplate)
-  SUBMENU:=LuCI - Webinterface Components
-endef
+define Package/luci-lib-core/config
+       choice
+               prompt "Build Target"
+               default PACKAGE_luci-lib-core_source
 
+       config PACKAGE_luci-lib-core_compile
+               bool "Precompiled"
 
-define Package/luci/install/template
-       $(CP) $(PKG_BUILD_DIR)/$(2)/dist/* $(1)/ -R
+       config PACKAGE_luci-lib-core_stripped
+               bool "Stripped"
+
+       config PACKAGE_luci-lib-core_source
+               bool "Full Source"
+
+       endchoice
 endef
 
+ifneq ($(CONFIG_PACKAGE_luci-lib-core_compile),)
+  LUA_TARGET:=compile
+endif
 
+ifneq ($(CONFIG_PACKAGE_luci-lib-core_stripped),)
+  LUA_TARGET:=strip
+endif
 
-### Core package ###
+ifneq ($(CONFIG_PACKAGE_luci-lib-core_zipped),)
+  LUA_TARGET:=gzip
+endif
 
-define Package/luci-core
-  $(call Package/luci/libtemplate)
-  DEPENDS:=+lua +luaposix
-  TITLE:=LuCI core libraries
-endef
+ifneq ($(CONFIG_PACKAGE_luci-lib-core),)
+  LUCI_SELECTED_MODULES+=libs/core
+endif
 
-define Package/luci-core/install               
-       $(call Package/luci/install/template,$(1),libs/core)
-endef
+LUCI_BUILD_PACKAGES += luci-lib-core
 
 
 ### Libraries ###
-define Package/luci-cbi
-  $(call Package/luci/libtemplate)
-  DEPENDS+=+luci-web
-  TITLE:=Configuration Binding Interface
+define library
+  define Package/luci-lib-$(1)
+    SECTION:=luci
+    CATEGORY:=LuCI
+    TITLE:=LuCI - Lua Configuration Interface
+    URL:=http://luci.subsignal.org/
+    MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
+    SUBMENU:=Libraries
+    TITLE:=$(if $(2),$(2),LuCI $(1) library)
+    $(if $(3),DEPENDS:=+luci-lib-core $(3))
+  endef
+
+  define Package/luci-lib-$(1)/install
+       $(call Package/luci/install/template,$$(1),libs/$(1))
+       $(call Package/luci-lib-$(1)/extra-install)
+  endef
+
+  ifneq ($(CONFIG_PACKAGE_luci-lib-$(1)),)
+    LUCI_SELECTED_MODULES+=libs/$(1)
+  endif
+
+  LUCI_BUILD_PACKAGES += luci-lib-$(1)
+endef
+
+define Package/luci-lib-web/conffiles
+/etc/config/luci
 endef
 
-define Package/luci-cbi/install
-       $(call Package/luci/install/template,$(1),libs/cbi)
-endef
+define Package/luci-lib-nixio/config
+       choice
+               prompt "TLS Provider"
+               default PACKAGE_luci-lib-nixio_notls
 
+               config PACKAGE_luci-lib-nixio_notls
+                       bool "Disabled"
 
-define Package/luci-web
-  $(call Package/luci/libtemplate)
-  DEPENDS+=+luci-addons
-  TITLE:=MVC Webframework
-endef
+               config PACKAGE_luci-lib-nixio_axtls
+                       bool "Builtin (axTLS)"
 
-define Package/luci-web/conffiles
-/etc/config/luci
-endef
+               config PACKAGE_luci-lib-nixio_cyassl
+                       bool "CyaSSL"
+                       select PACKAGE_libcyassl
 
-define Package/luci-web/install
-       $(call Package/luci/install/template,$(1),libs/web)
-       $(call Package/luci/install/template,$(1),themes/fledermaus)
+               config PACKAGE_luci-lib-nixio_openssl
+                       bool "OpenSSL"
+                       select PACKAGE_libopenssl
+       endchoice
 endef
 
 
+NIXIO_TLS:=
 
-### Community Packages ###
+ifneq ($(CONFIG_PACKAGE_luci-lib-nixio_axtls),)
+  NIXIO_TLS:=axtls
+endif
 
-define Package/luci-ff-halle
-  $(call Package/luci/fftemplate)
-  DEPENDS+= \
-   +luci-sgi-haserl +luci-app-splash \
-   +luci-app-ffwizard-leipzig \
-   +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice \
-   +kmod-tun +ip
-  TITLE:=Freifunk Halle Community Meta-Package
-endef
+ifneq ($(CONFIG_PACKAGE_luci-lib-nixio_openssl),)
+  NIXIO_TLS:=openssl
+endif
 
-define Package/luci-ff-halle/install
-       $(call Package/luci/install/template,$(1),applications/community-halle)
-       $(CP) -a ./ipkg/luci-ff-halle.postinst $(1)/CONTROL/postinst
-endef
+ifneq ($(CONFIG_PACKAGE_luci-lib-nixio_cyassl),)
+  NIXIO_TLS:=cyassl
+  LUCI_CFLAGS+=-I$(STAGING_DIR)/usr/include/cyassl
+endif
 
 
-define Package/luci-ff-leipzig
-  $(call Package/luci/fftemplate)
+$(eval $(call library,fastindex,Fastindex indexing module))
+$(eval $(call library,httpclient,HTTP(S) client library,+luci-lib-web +luci-lib-nixio))
+$(eval $(call library,ipkg,LuCI IPKG/OPKG call abstraction library))
+$(eval $(call library,json,LuCI JSON library))
+$(eval $(call library,lmo,LuCI LMO I18N library))
+$(eval $(call library,lucid,LuCId Full-Stack Webserver,+luci-lib-nixio +luci-lib-web +luci-lib-px5g))
+$(eval $(call library,lucid-http,LuCId HTTP Backend,+luci-lib-lucid))
+$(eval $(call library,lucid-rpc,LuCId RPC Backend,+luci-lib-lucid))
+$(eval $(call library,nixio,NIXIO POSIX library,+PACKAGE_luci-lib-nixio_openssl:libopenssl +PACKAGE_luci-lib-nixio_cyassl:libcyassl))
+$(eval $(call library,px5g,RSA/X.509 Key Generator (required for LuCId SSL support),+luci-lib-nixio))
+$(eval $(call library,sys,LuCI Linux/POSIX system library,+libiwinfo))
+$(eval $(call library,web,MVC Webframework,+luci-lib-sys +luci-lib-nixio +luci-lib-core +luci-sgi-cgi +luci-lib-lmo))
+$(eval $(call library,uvl,UVL - UCI Validation Layer,+luci-lib-sys +luci-lib-core))
+
+
+### Community Packages ###
+define Package/luci-mod-freifunk-community
+  SECTION:=luci
+  CATEGORY:=LuCI
+  TITLE:=LuCI - Lua Configuration Interface
+  URL:=http://luci.subsignal.org/
+  MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
+  SUBMENU:=Freifunk
+  TITLE:=Freifunk Community Meta-Package
   DEPENDS+= \
-   +luci-sgi-haserl +luci-app-splash \
+   +luci-lib-web +luci-app-splash \
    +luci-app-ffwizard-leipzig \
-   +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice \
-   +kmod-tun +ip
-  TITLE:=Freifunk Leipzig Community Meta-Package
+   +luci-i18n-german \
+   +PACKAGE_luci-mod-freifunk-community:olsrd-luci +PACKAGE_luci-mod-freifunk-community:olsrd-luci-mod-dyn-gw-plain \
+   +PACKAGE_luci-mod-freifunk-community:olsrd-luci-mod-txtinfo +PACKAGE_luci-mod-freifunk-community:olsrd-luci-mod-nameservice \
+   +PACKAGE_luci-mod-freifunk-community:olsrd-luci-mod-watchdog +PACKAGE_luci-mod-freifunk-community:kmod-tun \
+   +PACKAGE_luci-mod-freifunk-community:ip +PACKAGE_luci-mod-freifunk-community:freifunk-watchdog +luci-app-olsr
 endef
 
-define Package/luci-ff-leipzig/install
-       $(call Package/luci/install/template,$(1),applications/community-leipzig)
-       $(CP) -a ./ipkg/luci-ff-leipzig.postinst $(1)/CONTROL/postinst
+define Package/luci-mod-freifunk-community/install
+       $(call Package/luci/install/template,$(1),applications/freifunk-community)
 endef
 
+ifneq ($(CONFIG_PACKAGE_luci-mod-freifunk-community),)
+       LUCI_SELECTED_MODULES+=applications/freifunk-community
+endif
 
-define Package/luci-ff-hannover
-  $(call Package/luci/fftemplate)
-  DEPENDS+= \
-   +luci-sgi-haserl +luci-app-splash \
-   +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice
-  TITLE:=Freifunk Hannover Community Meta-Package
-  URL:=http://www.freifunk-hannover.de/
-  MAINTAINER:=Mickey Knox <mickey-at-netfreaks-dot-org>
-endef
-
-define Package/luci-ff-hannover/install
-       $(call Package/luci/install/template,$(1),applications/community-hannover)
-       $(CP) -a ./ipkg/luci-ff-hannover.postinst $(1)/CONTROL/postinst
-endef
+LUCI_BUILD_PACKAGES += luci-mod-freifunk-community
 
 
 ### Modules ###
+define module
+  define Package/luci-mod-$(1)
+    SECTION:=luci
+    CATEGORY:=LuCI
+    TITLE:=LuCI - Lua Configuration Interface
+    URL:=http://luci.subsignal.org/
+    MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
+    SUBMENU:=Modules
+    TITLE:=$(if $(2),$(2),LuCI $(1) module)
+    $(if $(3),DEPENDS+=$(3))
+  endef
 
-define Package/luci-mod-admin-core
-  $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-web +luci-cbi
-  TITLE:=Administration module
-endef
+  define Package/luci-mod-$(1)/install
+       $(call Package/luci/install/template,$$(1),modules/$(1))
+       $(call Package/luci-mod-$(1)/extra-install)
+  endef
+
+  ifneq ($(CONFIG_PACKAGE_luci-mod-$(1)),)
+    LUCI_SELECTED_MODULES+=modules/$(1)
+  endif
 
-define Package/luci-mod-admin-core/install
-       $(call Package/luci/install/template,$(1),modules/admin-core)
+  LUCI_BUILD_PACKAGES += luci-mod-$(1)
 endef
 
 
-define Package/luci-mod-freifunk
-  $(call Package/luci/fftemplate)
-  DEPENDS:=+luci-mod-admin-core
-  TITLE:=LuCI Freifunk module
+define Package/luci-mod-admin-core/extra-install
+       touch $(1)/etc/init.d/luci_fixtime || true
 endef
 
 define Package/luci-mod-freifunk/conffiles
 /etc/config/freifunk
 endef
 
-define Package/luci-mod-freifunk/install
-       $(call Package/luci/install/template,$(1),modules/freifunk)
-endef
-
+$(eval $(call module,admin-core,Web UI Core module,+luci-lib-web +luci-i18n-english))
+$(eval $(call module,admin-mini,LuCI Essentials - stripped down and user-friendly,+luci-mod-admin-core))
+$(eval $(call module,admin-full,LuCI Administration - full-featured for full control,+luci-mod-admin-core +luci-lib-ipkg))
+$(eval $(call module,rpc,LuCI RPC - JSON-RPC API,+luci-lib-json))
+$(eval $(call module,freifunk,LuCI Freifunk module,+luci-mod-admin-full +luci-lib-json +PACKAGE_luci-mod-freifunk:freifunk-firewall))
+$(eval $(call module,niu,NIU - Next Generation Interface,+luci-mod-admin-core @BROKEN))
 
 
 ### Applications ###
+define application
+  define Package/luci-app-$(1)
+    SECTION:=luci
+    CATEGORY:=LuCI
+    TITLE:=LuCI - Lua Configuration Interface
+    URL:=http://luci.subsignal.org/
+    MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
+    SUBMENU:=Applications
+    TITLE:=$(if $(2),$(2),LuCI $(1) application)
+       DEPENDS:=+luci-mod-admin-core $(3)
+  endef
 
-define Package/luci-app-ffwizard-leipzig
-  $(call Package/luci/fftemplate)
-  DEPENDS+=+luci-app-firewall
-  TITLE:=Freifunk Leipzig configuration wizard
-endef
+  define Package/luci-app-$(1)/install
+       $(call Package/luci/install/template,$$(1),applications/luci-$(1))
+  endef
 
-define Package/luci-app-ffwizard-leipzig/install
-       $(call Package/luci/install/template,$(1),applications/luci-ffwizard-leipzig)
-endef
+  ifneq ($(CONFIG_PACKAGE_luci-app-$(1)),)
+    LUCI_SELECTED_MODULES+=applications/luci-$(1)
+  endif
 
+  LUCI_BUILD_PACKAGES += luci-app-$(1)
+endef
 
-define Package/luci-app-firewall
-  $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-mod-admin-core
-  TITLE:=Firewall and Portforwarding application
+define Package/luci-app-splash/conffiles
+/etc/config/luci_splash
 endef
 
-define Package/luci-app-firewall/conffiles
-/etc/config/luci_fw
+define Package/luci-app-statistics/conffiles
+/etc/config/luci_statistics
 endef
 
-define Package/luci-app-firewall/install
-       $(call Package/luci/install/template,$(1),applications/luci-fw)
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-fw/dist/etc/init.d/luci_fw $(1)/etc/init.d
+define Package/luci-app-diag-devinfo/conffiles
+/etc/config/luci_devinfo
 endef
 
 
-define Package/luci-app-splash
-  $(call Package/luci/fftemplate)
-  DEPENDS+=+luci-sgi-haserl +iptables-mod-nat +iptables-mod-ipopt
-  TITLE:=Freifunk DHCP-Splash application
-endef
+$(eval $(call application,ffwizard-leipzig,Freifunk Leipzig configuration wizard))
 
-define Package/luci-app-splash/conffiles
-/etc/config/luci_splash
-endef
+$(eval $(call application,siitwizard,SIIT IPv4-over-IPv6 configuration wizard,\
+       +PACKAGE_luci-app-siitwizard:kmod-siit))
 
-define Package/luci-app-splash/install
-       $(call Package/luci/install/template,$(1),applications/luci-splash)
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-splash/dist/usr/sbin/luci-splash $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-splash/dist/etc/init.d/luci_splash $(1)/etc/init.d
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-splash/dist/etc/cron.minutely/luci_splash $(1)/etc/cron.minutely
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-splash/dist/usr/lib/luci-splash/htdocs/cgi-bin/index.cgi $(1)/usr/lib/luci-splash/htdocs/cgi-bin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-splash/dist/www/cgi-bin/luci-splash $(1)/www/cgi-bin/luci-splash
-endef
+$(eval $(call application,firewall,Firmware and Portforwarding application,\
+       +PACKAGE_luci-app-firewall:firewall))
 
+$(eval $(call application,olsr,OLSR configuration and status module,\
+       +luci-mod-admin-full +PACKAGE_luci-app-olsr:olsrd-luci +PACKAGE_luci-app-olsr:olsrd-luci-mod-txtinfo))
 
-define Package/luci-app-statistics
-  $(call Package/luci/webtemplate)
-  DEPENDS+=+luci-mod-admin-core +collectd +collectd-mod-rrdtool1 +rrdtool1
-  TITLE:=LuCI Statistics Application (incomplete)
-endef
+$(eval $(call application,qos,Quality of Service configuration module,\
+       +PACKAGE_luci-app-qos:qos-scripts))
 
-define Package/luci-app-statistics/conffiles
-/etc/config/luci_statistics
-endef
+$(eval $(call application,splash,Freifunk DHCP-Splash application,\
+       +luci-lib-nixio +PACKAGE_luci-app-splash:tc \
+       +PACKAGE_luci-app-splash:kmod-sched +PACKAGE_luci-app-splash:iptables-mod-nat-extra \
+       +PACKAGE_luci-app-splash:iptables-mod-ipopt))
 
-define Package/luci-app-statistics/install
-       $(call Package/luci/install/template,$(1),applications/luci-statistics)
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-statistics/dist/usr/bin/stat-genconfig $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-statistics/dist/etc/init.d/luci_statistics $(1)/etc/init.d
-endef
+$(eval $(call application,statistics,LuCI Statistics Application,\
+       +luci-mod-admin-full +PACKAGE_luci-app-statistics:collectd \
+       +PACKAGE_luci-app-statistics:rrdtool1 \
+       +PACKAGE_luci-app-statistics:collectd-mod-rrdtool \
+       +PACKAGE_luci-app-statistics:collectd-mod-wireless \
+       +PACKAGE_luci-app-statistics:collectd-mod-interface \
+       +PACKAGE_luci-app-statistics:collectd-mod-load))
 
 
-### Server Gateway Interfaces ###
+$(eval $(call application,diag-core,LuCI Diagnostics Tools (Core)))
 
-define Package/luci-sgi-haserl
-  $(call Package/luci/libtemplate)
-  DEPENDS+=+luci-web +haserl-lua
-  TITLE:=SGI for Haserl
-endef
+$(eval $(call application,diag-devinfo,LuCI Diagnostics Tools (Device Info),\
+       +luci-app-diag-core \
+       +PACKAGE_luci-app-diag-devinfo:smap \
+       +PACKAGE_luci-app-diag-devinfo:netdiscover \
+       +PACKAGE_luci-app-diag-devinfo:mac-to-devinfo \
+       +PACKAGE_luci-app-diag-devinfo:httping \
+       +PACKAGE_luci-app-diag-devinfo:smap-to-devinfo \
+       +PACKAGE_luci-app-diag-devinfo:netdiscover-to-devinfo))
 
-define Package/luci-sgi-haserl/install
-       $(call Package/luci/install/template,$(1),libs/sgi-haserl)
-       $(CP) -a ./ipkg/luci-sgi-haserl.postinst $(1)/CONTROL/postinst
-endef
+$(eval $(call application,voice-core,LuCI Voice Software (Core)))
 
+$(eval $(call application,voice-diag,LuCI Voice Software (Diagnostics),\
+       +luci-app-voice-core +luci-app-diag-devinfo))
 
-define Package/luci-sgi-webuci
-  $(call Package/luci/libtemplate)
-  DEPENDS+=+luci-web
-  TITLE:=SGI for Webuci
-endef
 
-define Package/luci-sgi-webuci/install
-       $(call Package/luci/install/template,$(1),libs/sgi-webuci)
-endef
+$(eval $(call application,upnp,Universal Plug & Play configuration module,\
+       +PACKAGE_luci-app-upnp:miniupnpd))
 
-### Compile Templates ###
-ifneq ($(CONFIG_PACKAGE_luci-core),)
-       PKG_SELECTED_MODULES+=libs/core
-endif
-ifneq ($(CONFIG_PACKAGE_luci-cbi),)
-       PKG_SELECTED_MODULES+=libs/cbi
-endif
-ifneq ($(CONFIG_PACKAGE_luci-web),)
-       PKG_SELECTED_MODULES+=libs/web
-endif
+$(eval $(call application,ntpc,NTP time synchronisation configuration module,\
+       +PACKAGE_luci-app-ntpc:ntpclient))
 
-ifneq ($(CONFIG_PACKAGE_luci-ff-halle),)
-       PKG_SELECTED_MODULES+=applications/community-halle
-endif
-ifneq ($(CONFIG_PACKAGE_luci-ff-leipzig),)
-       PKG_SELECTED_MODULES+=applications/community-leipzig
-endif
-ifneq ($(CONFIG_PACKAGE_luci-ff-hannover),)
-       PKG_SELECTED_MODULES+=applications/community-hannover
-endif
+$(eval $(call application,ddns,Dynamic DNS configuration module,\
+       +PACKAGE_luci-app-ddns:ddns-scripts))
 
-ifneq ($(CONFIG_PACKAGE_luci-mod-admin-core),)
-       PKG_SELECTED_MODULES+=modules/admin-core
-endif
-ifneq ($(CONFIG_PACKAGE_luci-mod-freifunk),)
-       PKG_SELECTED_MODULES+=modules/freifunk
-endif
+$(eval $(call application,samba,Network Shares - Samba SMB/CIFS module,\
+       +luci-mod-admin-full +PACKAGE_luci-app-samba:samba3))
 
-ifneq ($(CONFIG_PACKAGE_luci-app-ffwizard-leipzig),)
-       PKG_SELECTED_MODULES+=applications/luci-ffwizard-leipzig
-endif
-ifneq ($(CONFIG_PACKAGE_luci-app-splash),)
-       PKG_SELECTED_MODULES+=applications/luci-splash
-endif
-ifneq ($(CONFIG_PACKAGE_luci-app-statistics),)
-       PKG_SELECTED_MODULES+=applications/luci-statistics
-endif
+$(eval $(call application,mmc-over-gpio,MMC-over-GPIO configuration module,\
+       +luci-mod-admin-full +PACKAGE_luci-app-mmc-over-gpio:kmod-mmc-over-gpio))
 
-ifneq ($(CONFIG_PACKAGE_luci-sgi-haserl),)
-       PKG_SELECTED_MODULES+=libs/sgi-haserl
-endif
-ifneq ($(CONFIG_PACKAGE_luci-sgi-webuci),)
-       PKG_SELECTED_MODULES+=libs/sgi-webuci
-endif
+$(eval $(call application,p910nd,p910nd - Printer server module,\
+       +luci-mod-admin-full +PACKAGE_luci-app-p910nd:p910nd))
+
+$(eval $(call application,ushare,uShare - UPnP A/V & DLNA Media Server,\
+       +luci-mod-admin-full +PACKAGE_luci-app-ushare:ushare))
+
+$(eval $(call application,hd-idle,Hard Disk Idle Spin-Down module,\
+       +luci-mod-admin-full +PACKAGE_luci-app-hd-idle:hd-idle))
+
+$(eval $(call application,tinyproxy,Tinyproxy - HTTP(S)-Proxy configuration,\
+       +luci-mod-admin-full +PACKAGE_luci-app-tinyproxy:tinyproxy))
 
+$(eval $(call application,initmgr,LuCI Initscript Management,\
+       +luci-mod-admin-full))
 
-$(eval $(call BuildPackage,luci-core))
-$(eval $(call BuildPackage,luci-cbi))
-$(eval $(call BuildPackage,luci-web))
+$(eval $(call application,livestats,LuCI Realtime Statistics,\
+       +luci-mod-rpc))
 
-$(eval $(call BuildPackage,luci-ff-halle))
-$(eval $(call BuildPackage,luci-ff-leipzig))
-$(eval $(call BuildPackage,luci-ff-hannover))
+$(eval $(call application,asterisk,LuCI Support for Asterisk PBX,\
+       @BROKEN +PACKAGE_luci-app-asterisk:asterisk14-xip-core))
 
-$(eval $(call BuildPackage,luci-mod-admin-core))
-$(eval $(call BuildPackage,luci-mod-freifunk))
+$(eval $(call application,polipo,LuCI Support for the Polipo Proxy,\
+       +PACKAGE_luci-app-polipo:polipo))
 
-$(eval $(call BuildPackage,luci-app-ffwizard-leipzig))
-$(eval $(call BuildPackage,luci-app-firewall))
-$(eval $(call BuildPackage,luci-app-splash))
-$(eval $(call BuildPackage,luci-app-statistics))
+$(eval $(call application,openvpn,LuCI Support for OpenVPN,\
+       +PACKAGE_luci-app-openvpn:openvpn))
 
-$(eval $(call BuildPackage,luci-sgi-haserl))
-$(eval $(call BuildPackage,luci-sgi-webuci))
+$(eval $(call application,p2pblock,LuCI Support for the Freifunk P2P-Block addon,\
+       +luci-app-firewall +PACKAGE_luci-app-p2pblock:freifunk-p2pblock))
+
+$(eval $(call application,multiwan,LuCI Support for the OpenWrt MultiWAN agent,\
+       +luci-app-firewall +PACKAGE_luci-app-multiwan:multiwan))
+
+$(eval $(call application,wol,LuCI Support for Wake-on-LAN,\
+       +PACKAGE_luci-app-wol:etherwake))
+
+$(eval $(call application,vnstat,LuCI Support for VnStat,\
+       +PACKAGE_luci-app-vnstat:vnstat \
+    +PACKAGE_luci-app-vnstat:vnstati))
+
+$(eval $(call application,lqtapifoss,Lantiq voip))
+
+### Server Gateway Interfaces ###
+define sgi
+  define Package/luci-sgi-$(1)
+    SECTION:=luci
+    CATEGORY:=LuCI
+    TITLE:=LuCI - Lua Configuration Interface
+    URL:=http://luci.subsignal.org/
+    MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
+    SUBMENU:=Server Interfaces
+    TITLE:=$(if $(2),$(2),LuCI $(1) server gateway interface)
+       $(if $(3),DEPENDS:=$(3))
+  endef
+
+  define Package/luci-sgi-$(1)/install
+       $(call Package/luci/install/template,$$(1),libs/sgi-$(1))
+  endef
+
+  ifneq ($(CONFIG_PACKAGE_luci-sgi-$(1)),)
+    LUCI_SELECTED_MODULES+=libs/sgi-$(1)
+  endif
+
+  LUCI_BUILD_PACKAGES += luci-sgi-$(1)
+endef
+
+$(eval $(call sgi,cgi,CGI Gateway behind existing Webserver))
+$(eval $(call sgi,uhttpd,Binding for the uHTTPd server,+uhttpd +uhttpd-mod-lua))
+
+
+### Themes ###
+define theme
+  define Package/luci-theme-$(1)
+    SECTION:=luci
+    CATEGORY:=LuCI
+    TITLE:=LuCI - Lua Configuration Interface
+    URL:=http://luci.subsignal.org/
+    SUBMENU:=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:=y if PACKAGE_luci-lib-core)
+  endef
+
+  define Package/luci-theme-$(1)/install
+       $(call Package/luci/install/template,$$(1),themes/$(1))
+  endef
+
+  ifneq ($(CONFIG_PACKAGE_luci-theme-$(1)),)
+    LUCI_SELECTED_MODULES+=themes/$(1)
+  endif
+
+  LUCI_BUILD_PACKAGES += luci-theme-$(1)
+endef
+
+$(eval $(call theme,base,Common base for all themes,,+luci-lib-web))
+$(eval $(call theme,openwrt,OpenWrt.org (default),,,1))
+$(eval $(call theme,fledermaus,Fledermaus Theme))
+
+$(eval $(call theme,freifunk,alternative Freifunk Theme,\
+       Stefan Pirwitz <stefan-at-freifunk-bno-dot-de>))
+
+$(eval $(call theme,freifunk-bno,Freifunk Berlin Nordost Theme,\
+       Stefan Pirwitz <stefan-at-freifunk-bno-dot-de>))
+
+$(eval $(call theme,freifunk-hannover,Freifunk Hannover Theme,\
+       Mikolas Bingemer <mickey-at-freifunk-hannover-dot-de>))
+
+
+### Translations ###
+define translation
+  define Package/luci-i18n-$(1)
+    SECTION:=luci
+    CATEGORY:=LuCI
+    TITLE:=LuCI - Lua Configuration Interface
+    URL:=http://luci.subsignal.org/
+    MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
+    SUBMENU:=Translations
+    TITLE:=$(if $(2),$(2),$(1))
+  endef
+
+  define Package/luci-i18n-$(1)/install
+       $(call Package/luci/install/template,$$(1),i18n/$(1))
+  endef
+
+  ifneq ($(CONFIG_PACKAGE_luci-i18n-$(1)),)
+    LUCI_SELECTED_MODULES+=i18n/$(1)
+  endif
+
+  LUCI_BUILD_PACKAGES += luci-i18n-$(1)
+endef
+
+$(eval $(call translation,german,German))
+$(eval $(call translation,english,English))
+$(eval $(call translation,french,French (by Florian Fainelli)))
+$(eval $(call translation,italian,Italian (by Matteo Croce)))
+$(eval $(call translation,russian,Russian (by Skryabin Dmitry)))
+$(eval $(call translation,portuguese_brazilian,Portuguese (Brazilian) (by Carlos Cesario)))
+$(eval $(call translation,japanese,Japanese (by Tsukasa Hamano)))
+$(eval $(call translation,greek,Greek (by Vasilis Tsiligiannis)))
+$(eval $(call translation,catalan,Catalan (by Eduard Duran)))
+$(eval $(call translation,portuguese,Portuguese (by Jose Monteiro)))
+$(eval $(call translation,spanish,Spanish (by Guillermo Javier Nardoni)))
+$(eval $(call translation,vietnamese,Vietnamese (by Hong Phuc Dang)))
+$(eval $(call translation,malay,Malay (by Teow Wai Chet)))
+$(eval $(call translation,norwegian,Norwegian (by Lars Hardy)))
+
+
+### Collections ###
+define collection
+  define Package/luci$(if $(1),-$(1))
+    SECTION:=luci
+    CATEGORY:=LuCI
+    TITLE:=LuCI - Lua Configuration Interface
+    URL:=http://luci.subsignal.org/
+    MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
+    SUBMENU:=Collections
+    TITLE:=$(if $(2),$(2),LuCI $(if $(1),$(1),general) collection)
+    $(if $(3),DEPENDS:=$(3))
+  endef
+
+  define Package/luci$(if $(1),-$(1))/install
+       true
+  endef
+
+  LUCI_BUILD_PACKAGES += luci$(if $(1),-$(1))
+endef
+
+$(eval $(call collection,,\
+       Standard OpenWrt set including full and mini admin and the standard theme,\
+       +uhttpd +luci-mod-admin-full +luci-theme-openwrt +luci-app-firewall \
+       +luci-app-initmgr))
+
+$(eval $(call collection,ssl,\
+       Standard OpenWrt set with HTTPS support,\
+       +uhttpd +uhttpd-mod-tls +px5g +luci-mod-admin-full +luci-theme-openwrt \
+       +luci-app-firewall +luci-app-initmgr))
+
+$(eval $(call collection,light,\
+       Minimum package set using only admin mini and the standard theme,\
+       +uhttpd +luci-mod-admin-mini +luci-theme-openwrt-light))
+
+
+### Compile ###
+PKG_CONFIG_DEPENDS := $(patsubst %,CONFIG_PACKAGE_%,$(LUCI_BUILD_PACKAGES))
+$(foreach b,$(LUCI_BUILD_PACKAGES),$(eval $(call BuildPackage,$(b))))