Merge from bittboy/buildroot@db180c0

package/libnatpmp/Config.in

@@ -0,0 +1,16 @@
+config BR2_PACKAGE_LIBNATPMP
+	bool "libnatpmp"
+	depends on !BR2_BINFMT_FLAT
+	depends on !BR2_STATIC_LIBS
+	help
+	  libnatpmp is an attempt to make a portable and fully compliant
+	  implementation of the NAT-PMP protocol for the client side. It
+	  is based on non blocking sockets and all calls of the API are
+	  asynchronous. It is therefore very easy to integrate the
+	  NAT-PMP code to any event driven code.
+
+	  http://miniupnp.free.fr/libnatpmp.html
+
+comment "libnatpmp needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
+	depends on !BR2_BINFMT_FLAT

package/libnatpmp/libnatpmp.hash

@@ -0,0 +1,3 @@
+# Locally computed
+sha256 e1aa9c4c4219bc06943d6b2130f664daee213fb262fcb94dd355815b8f4536b0  libnatpmp-20150609.tar.gz
+sha256 e8d8277e1a101fcfedb0cd5a1cc76646522c0da69f3490dd5a4055fc87ea96a2  LICENSE

package/libnatpmp/libnatpmp.mk

@@ -0,0 +1,31 @@
+################################################################################
+#
+# libnatpmp
+#
+################################################################################
+
+LIBNATPMP_VERSION = 20150609
+LIBNATPMP_SITE = http://miniupnp.free.fr/files
+LIBNATPMP_INSTALL_STAGING = YES
+LIBNATPMP_LICENSE = BSD-3-Clause
+LIBNATPMP_LICENSE_FILES = LICENSE
+
+define LIBNATPMP_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+		CC="$(TARGET_CC)"
+endef
+
+define LIBNATPMP_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+		PREFIX=$(STAGING_DIR) \
+		HEADERS='declspec.h natpmp.h' \
+		$(TARGET_CONFIGURE_OPTS) install
+endef
+
+define LIBNATPMP_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+		PREFIX=$(TARGET_DIR) \
+		$(TARGET_CONFIGURE_OPTS) install
+endef
+
+$(eval $(generic-package))