X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=net%2Fnatpmp%2FMakefile;h=6f851a33f97713a8b8f1b47914e506c5f347c867;hb=aee10f688992d9581d72f527bea4a1b099b72128;hp=dd124ab52cb639f904b293055fd375ab61b2c4a3;hpb=a3a0cc1ce797a1205b7ad90f2befc2d1b3ccd234;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/net/natpmp/Makefile b/net/natpmp/Makefile
index dd124ab52c..6f851a33f9 100644
--- a/net/natpmp/Makefile
+++ b/net/natpmp/Makefile
@@ -1,16 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=natpmp
-PKG_VERSION:=0.2.1
+PKG_VERSION:=0.2.3
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://download.savannah.nongnu.org/releases/natpmp/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=b0b1fea34ecd2c99f75c01a6728c9a7b
-
-PKG_CAT:=zcat
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_MD5SUM:=f696565d59c488b9ad9f43625be93377
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -23,7 +19,8 @@ define Package/natpmp
 endef
 
 define Package/natpmp/description
-  stunnel replacement based on xyssl
+	This is a daemon implementing NAT-PMP. NAT-PMP is a protocol for
+	handling port forwarding requests from clients behind a NAT.
 endef
 
 define Build/Configure
@@ -33,21 +30,17 @@ define Build/Compile
 	rm -rf $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		CC=$(TARGET_CC) \
-		LD=$(TARGET_CC) \
-		CFLAGS="$(strip $(TARGET_CFLAGS))" \
+		CC="$(TARGET_CC)" \
+		LD="$(TARGET_CC)" \
+		CCFLAGS="$(strip $(TARGET_CFLAGS))" \
 		CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include" \
 		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
 		prefix="$(PKG_INSTALL_DIR)/usr"
-	mkdir -p $(PKG_INSTALL_DIR)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/natpmp $(PKG_INSTALL_DIR)/usr/sbin
 endef
 
 define Package/natpmp/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/natpmp $(1)/usr/sbin
-	$(RSTRIP) $(1)/usr/sbin/natpmp
-
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/natpmp $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DATA) ./files/natpmp.config $(1)/etc/config/natpmp
 	$(INSTALL_DIR) $(1)/etc/init.d