[or-cvs] r19175: {torvm} Clean up libupnp package desc. (in torvm/trunk/build/kamikaze: patches scripts)

[coderman at seul.org]

Author: coderman
Date: 2009-03-28 07:02:32 -0400 (Sat, 28 Mar 2009)
New Revision: 19175

Modified:
   torvm/trunk/build/kamikaze/patches/005-kamikaze-build-config.patch
   torvm/trunk/build/kamikaze/patches/006-kamikaze-upnptools.patch
   torvm/trunk/build/kamikaze/scripts/genlicense.sh
Log:
Clean up libupnp package desc.

Modified: torvm/trunk/build/kamikaze/patches/005-kamikaze-build-config.patch
===================================================================
--- torvm/trunk/build/kamikaze/patches/005-kamikaze-build-config.patch	2009-03-28 09:57:11 UTC (rev 19174)
+++ torvm/trunk/build/kamikaze/patches/005-kamikaze-build-config.patch	2009-03-28 11:02:32 UTC (rev 19175)
@@ -1,6 +1,6 @@
 diff -Naur a/.config b/.config
 --- a/.config	1970-01-01 00:00:00.000000000 +0000
-+++ b/.config	2009-03-28 08:56:09.096039064 +0000
++++ b/.config	2009-03-28 10:58:13.348583432 +0000
 @@ -0,0 +1,1292 @@
 +#
 +# Automatically generated make config: don't edit
@@ -992,7 +992,7 @@
 +# CONFIG_PACKAGE_libuuid is not set
 +# CONFIG_PACKAGE_linux-atm is not set
 +CONFIG_PACKAGE_zlib=y
-+CONFIG_PACKAGE_upnptools=y
++CONFIG_PACKAGE_libupnp=y
 +
 +#
 +# Network

Modified: torvm/trunk/build/kamikaze/patches/006-kamikaze-upnptools.patch
===================================================================
--- torvm/trunk/build/kamikaze/patches/006-kamikaze-upnptools.patch	2009-03-28 09:57:11 UTC (rev 19174)
+++ torvm/trunk/build/kamikaze/patches/006-kamikaze-upnptools.patch	2009-03-28 11:02:32 UTC (rev 19175)
@@ -1,47 +1,46 @@
-diff -Naur a/package/upnptools/Makefile b/package/upnptools/Makefile
---- a/package/upnptools/Makefile	1970-01-01 00:00:00.000000000 +0000
-+++ b/package/upnptools/Makefile	2009-03-28 08:53:49.935194728 +0000
-@@ -0,0 +1,43 @@
+diff -Naur a/package/libupnp/Makefile b/package/libupnp/Makefile
+--- a/package/libupnp/Makefile	1970-01-01 00:00:00.000000000 +0000
++++ b/package/libupnp/Makefile	2009-03-28 10:54:57.220399448 +0000
+@@ -0,0 +1,42 @@
 +# Copyright (C) 2009 The Tor Project, Inc.
 +#
 +include $(TOPDIR)/rules.mk
-+PKG_NAME:=upnptools
++PKG_NAME:=libupnp
 +PKG_VERSION:=1.6.6
 +PKG_RELEASE:=1
 +
-+PKG_SOURCE:=libupnp-$(PKG_VERSION).tar.bz2
-+PKG_SOURCE_URL:=http://downloads.sourceforge.net/pupnp/libupnp-1.6.6.tar.bz2
++PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
++PKG_SOURCE_URL:=http://downloads.sourceforge.net/pupnp/$(PKG_SOURCE)
 +PKG_MD5SUM:=8918dcf7428cd119d0c8275765ff2833
 +
 +include $(INCLUDE_DIR)/package.mk
 +
-+define Package/upnptools
++define Package/libupnp
 +  SECTION:=libs
 +  CATEGORY:=Libraries
 +  TITLE:=UPnP Tools
 +  URL:=pupnp.sourceforce.net
 +endef
 +
-+define Package/upnptools/description
++define Package/libupnp/description
 + UPnP port forwarding tools
 +endef
 +
 +CONFIGURE_ARGS += \
 +	--enable-shared \
 +	--enable-static \
-+	--with-build-cc="$(HOSTCC)" \
 +	--disable-webserver \
 +	--disable-samples
 +
 +define Build/Compile
 +	$(MAKE) -C $(PKG_BUILD_DIR) \
 +		DESTDIR="$(PKG_INSTALL_DIR)" \
-+		all install
++		install
 +endef
 +
-+define Package/upnptools/install
++define Package/libupnp/install
 +	$(INSTALL_DIR) $(1)/usr/lib
 +	$(CP) -a $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
 +endef
 +
-+$(eval $(call BuildPackage,upnptools))
++$(eval $(call BuildPackage,libupnp))

Modified: torvm/trunk/build/kamikaze/scripts/genlicense.sh
===================================================================
--- torvm/trunk/build/kamikaze/scripts/genlicense.sh	2009-03-28 09:57:11 UTC (rev 19174)
+++ torvm/trunk/build/kamikaze/scripts/genlicense.sh	2009-03-28 11:02:32 UTC (rev 19175)
@@ -8,7 +8,7 @@
 lf="linux:linux:COPYING $lf"
 lf="linux:iptables:COPYING $lf"
 lf="linux:tor:LICENSE $lf"
-lf="target:upnptools:LICENSE $lf"
+lf="target:libupnp:LICENSE $lf"
 function usage () {
   if (( $# )); then
     echo "Error: $1" >&2