X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=net%2Fminiupnpd%2FMakefile;h=586f39164499985547aaf573c1913b1e6a58d2b6;hp=da0a8f489602d554aeb6554a0836712bad77c919;hb=a5c6e8534ed7247404ad2791fda9efc0c39fc800;hpb=a4d4891a11a74e6d02ee2f76355a4261df166110

diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index da0a8f4896..586f391644 100644
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -1,18 +1,20 @@
-# $Id$
+#
+# Copyright (C) 2006-2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=miniupnpd
-PKG_VERSION:=0.1
-PKG_RELEASE:=2
-PKG_MD5SUM:=4ba2a49c593d0c1088cc5791b8c6a985
+PKG_VERSION:=1.4
+PKG_RELEASE:=1
+PKG_MD5SUM:=ffa33d4ed8732c662bdb7d511e86db76
 
-PKG_SOURCE_URL:=http://ftp.berlios.de/pub/xwrt/storage/
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_SOURCE_URL:=http://miniupnp.free.fr/files
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -21,26 +23,29 @@ define Package/miniupnpd
   CATEGORY:=Network
   DEPENDS:=+iptables
   TITLE:=Lightweight UPnP daemon
-  DESCRIPTION:=\
-	Lightweight UPnP daemon
-  URL:=http://miniupnp.tuxfamily.org/
+  URL:=http://miniupnp.free.fr/
+  MAINTAINER:=Daniel Dickinson <ddickinson@vertical.com>
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) -f Makefile.openwrt
+define Package/miniupnpd/conffiles
+/etc/config/upnpd
 endef
 
-define Build/Clean
-	# remove the client dir since the build system doesnt know about it
-	rm -rf $(PKG_BUILD_DIR)/../miniupnpc
+define Build/Compile
+	ln -sf $(PKG_BUILD_DIR)/config.h.openwrt $(PKG_BUILD_DIR)/config.h
+	$(MAKE) -C $(PKG_BUILD_DIR) -f Makefile.openwrt \
+		$(TARGET_CONFIGURE_OPTS) \
+		STAGING_DIR="$(STAGING_DIR)" \
+		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(firstword $(wildcard $(KERNEL_BUILD_DIR)/iptables-*/include)) -DIPTABLES_143" \
+		LIBS="$(STAGING_DIR)/usr/lib/libiptc.so $(STAGING_DIR)/usr/lib/libip4tc.so $(STAGING_DIR)/usr/lib/libip6tc.so"
 endef
 
 define Package/miniupnpd/install
-	$(INSTALL_DIR) $(1)/usr/bin $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/miniupnpd $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/linux/*.sh $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/bin $(1)/etc/init.d $(1)/etc/config $(1)/etc/hotplug.d/firewall
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/miniupnpd $(1)/usr/bin/miniupnpd
 	$(INSTALL_BIN) ./files/miniupnpd.init $(1)/etc/init.d/miniupnpd
-	$(STRIP) $(1)/usr/bin/miniupnpd
+	$(INSTALL_CONF) ./files/upnpd.config $(1)/etc/config/upnpd
+	$(INSTALL_DATA) ./files/miniupnpd.hotplug $(1)/etc/hotplug.d/firewall/50-miniupnpd
 endef
 
 $(eval $(call BuildPackage,miniupnpd))