From 9044b1c073a75128845fca64054890d6d8339b4f Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 19 Dec 2010 04:37:51 +0000
Subject: [PATCH] [packages] move libiconv to libiconv-full

git-svn-id: svn://svn.openwrt.org/openwrt/packages@24704 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 libs/{libiconv => libiconv-full}/Makefile          | 31 +++++++++++-----------
 .../patches/100-strip_charsets.patch               |  0
 .../patches/101-autotools.patch                    |  0
 .../patches/103-configure_ac_fix.patch             |  0
 .../patches/200-work-with-libtool2.patch           |  0
 5 files changed, 16 insertions(+), 15 deletions(-)
 rename libs/{libiconv => libiconv-full}/Makefile (69%)
 rename libs/{libiconv => libiconv-full}/patches/100-strip_charsets.patch (100%)
 rename libs/{libiconv => libiconv-full}/patches/101-autotools.patch (100%)
 rename libs/{libiconv => libiconv-full}/patches/103-configure_ac_fix.patch (100%)
 rename libs/{libiconv => libiconv-full}/patches/200-work-with-libtool2.patch (100%)

diff --git a/libs/libiconv/Makefile b/libs/libiconv-full/Makefile
similarity index 69%
rename from libs/libiconv/Makefile
rename to libs/libiconv-full/Makefile
index c9b0f7713..287bd10cf 100644
--- a/libs/libiconv/Makefile
+++ b/libs/libiconv-full/Makefile
@@ -7,40 +7,41 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=libiconv
+PKG_NAME:=libiconv-full
 PKG_VERSION:=1.11.1
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=libiconv-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/libiconv
 PKG_MD5SUM:=d42b97f6ef5dd0ba4469d520ed732fed
+PKG_BUILD_DIR:=$(BUILD_DIR)/libiconv-$(PKG_VERSION)
 
 PKG_FIXUP = libtool no-autoreconf
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/libiconv/Default
+define Package/libiconv-full/Default
   URL:=http://www.gnu.org/software/libiconv/
   TITLE:=Character set conversion
 endef
 
-define Package/libiconv
-  $(call Package/libiconv/Default)
+define Package/libiconv-full
+  $(call Package/libiconv-full/Default)
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE+= library
 endef
 
 define Package/libcharset
-  $(call Package/libiconv/Default)
+  $(call Package/libiconv-full/Default)
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE+= library
 endef
 
 define Package/iconv
-  $(call Package/libiconv/Default)
-  DEPENDS:=+libiconv +libcharset
+  $(call Package/libiconv-full/Default)
+  DEPENDS:=+libiconv-full +libcharset
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE+= utility
@@ -62,11 +63,11 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/iconv.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcharset.{a,so*} $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.{a,so*} $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/include/libiconv-full
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/iconv.h $(1)/usr/include/libiconv-full/
+	$(INSTALL_DIR) $(1)/usr/lib/libiconv-full
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcharset.{a,so*} $(1)/usr/lib/libiconv-full/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.{a,so*} $(1)/usr/lib/libiconv-full/
 endef
 
 define Package/libcharset/install
@@ -74,11 +75,11 @@ define Package/libcharset/install
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcharset.so* $(1)/usr/lib/
 endef
 
-define Package/libiconv/install
+define Package/libiconv-full/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.so* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libcharset))
-$(eval $(call BuildPackage,libiconv))
+$(eval $(call BuildPackage,libiconv-full))
 $(eval $(call BuildPackage,iconv))
diff --git a/libs/libiconv/patches/100-strip_charsets.patch b/libs/libiconv-full/patches/100-strip_charsets.patch
similarity index 100%
rename from libs/libiconv/patches/100-strip_charsets.patch
rename to libs/libiconv-full/patches/100-strip_charsets.patch
diff --git a/libs/libiconv/patches/101-autotools.patch b/libs/libiconv-full/patches/101-autotools.patch
similarity index 100%
rename from libs/libiconv/patches/101-autotools.patch
rename to libs/libiconv-full/patches/101-autotools.patch
diff --git a/libs/libiconv/patches/103-configure_ac_fix.patch b/libs/libiconv-full/patches/103-configure_ac_fix.patch
similarity index 100%
rename from libs/libiconv/patches/103-configure_ac_fix.patch
rename to libs/libiconv-full/patches/103-configure_ac_fix.patch
diff --git a/libs/libiconv/patches/200-work-with-libtool2.patch b/libs/libiconv-full/patches/200-work-with-libtool2.patch
similarity index 100%
rename from libs/libiconv/patches/200-work-with-libtool2.patch
rename to libs/libiconv-full/patches/200-work-with-libtool2.patch
-- 
2.11.0