packages/scpa5xx-view: use lowercase config option, use new service functions

[openwrt/svn-archive/archive.git] / net / linuxigd / Makefile

diff --git a/net/linuxigd/Makefile b/net/linuxigd/Makefile
index 4be8fbe01d0f0224fa3f9b219e0a5eebd011b3b3..97579a847487a82aa98da211228f75383069ef3e 100644 (file)
--- a/net/linuxigd/Makefile
+++ b/net/linuxigd/Makefile
@@ -1,26 +1,22 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 # Copyright (C) 2006 loswillios
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=linuxigd
-PKG_VERSION:=0.95
-PKG_RELEASE:=1
+PKG_VERSION:=1.0
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/linux-igd
-PKG_MD5SUM:=0f203a2db5e3fb01496b73e417dbd9a6
-PKG_CAT:=zcat
+PKG_MD5SUM:=929f5c4878c91d534613b7c7070215d9
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_BUILDDEP:=iptables libupnp
+PKG_BUILD_DEPENDS:=iptables libupnp
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -28,20 +24,23 @@ define Package/linuxigd
   SECTION:=net
   CATEGORY:=Network
   TITLE:=UPnP daemon
-  DEPENDS:=+libupnp +libpthread
-  DESCRIPTION:=\
-       It implements the UPnP Internet Gateway Device specification (IGD) \\\
-       and allows UPnP aware clients, such as MSN Messenger, Azureus or \\\
-       Miranda to work properly from behind a NAT firewall. \\\
-       \\\
-       Please edit /etc/upnpd.conf before using upnpd!
+  SUBMENU:=Firewall
+  DEPENDS:=+libiptc +libupnp +libpthread
   URL:=http://linux-igd.sourceforge.net/
 endef
 
+define Package/linuxigd/description
+       It implements the UPnP Internet Gateway Device specification (IGD)
+       and allows UPnP aware clients, such as MSN Messenger, Azureus or
+       Miranda to work properly from behind a NAT firewall.
+
+       Please edit /etc/upnpd.conf before using upnpd!
+endef
+
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR)  \
                $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
+               CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -DIPTABLES_143 -Wl,-rpath-link=$(STAGING_DIR)/usr/lib" \
                BINDIR="/usr/sbin" \
                MANDIR="/usr/man" \
                HAVE_LIBIPTC=1 \
@@ -57,11 +56,11 @@ endef
 define Package/linuxigd/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnpd $(1)/usr/sbin/
-       $(INSTALL_DIR) $(1)/etc
-       $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/upnpd.conf $(1)/etc/
        $(INSTALL_DIR) $(1)/etc/linuxigd
        $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/*.gif $(1)/etc/linuxigd/
        $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/*.xml $(1)/etc/linuxigd/
+       $(INSTALL_DIR) $(1)/etc
+       $(INSTALL_DATA) ./files/upnpd.conf $(1)/etc/
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/upnpd.init $(1)/etc/init.d/upnpd
 endef