add curl package

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1792 3c298f89-4303-0410-b956-a3cf2f4a3e73

6 files changed, 177 insertions, 0 deletions

diff --git a/package/Config.in b/package/Config.in
index 1a7cfb8c94..470ec1b217 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -115,6 +115,7 @@ source "package/cgilib/Config.in"
 source "package/glib/Config.in"
 source "package/libamsel/Config.in"
 source "package/libart/Config.in"
+source "package/curl/Config.in" # libcurl
 source "package/libdaemon/Config.in"
 source "package/libdb/Config.in"
 source "package/libelf/Config.in"
diff --git a/package/Makefile b/package/Makefile
index d081bf98eb..cf7945a5a4 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -20,6 +20,7 @@ package-$(BR2_PACKAGE_CGILIB) += cgilib
 package-$(BR2_PACKAGE_CHILLISPOT) += chillispot
 package-$(BR2_PACKAGE_CIFSMOUNT) += cifsmount
 package-$(BR2_PACKAGE_CUPS) += cups
+package-$(BR2_COMPILE_CURL) += curl
 package-$(BR2_PACKAGE_CYRUS_SASL) += cyrus-sasl
 package-$(BR2_PACKAGE_DHCP) += dhcp
 package-$(BR2_PACKAGE_DHCP_FORWARDER) += dhcp-forwarder
@@ -184,6 +185,7 @@ amwall-compile: libamsel-compile
 arpwatch-compile: libpcap-compile
 avahi-compile: libdaemon-compile expat-compile
 bind-compile: openssl-compile
+curl-compile: openssl-compile zlib-compile
 cyrus-sasl-compile: openssl-compile
 dropbear-compile: zlib-compile
 dsniff-compile: libnids-compile openssl-compile libgdbm-compile
diff --git a/package/curl/Config.in b/package/curl/Config.in
new file mode 100644
index 0000000000..6f360557f4
--- /dev/null
+++ b/package/curl/Config.in
@@ -0,0 +1,29 @@
+config BR2_COMPILE_CURL
+	bool
+	default n
+	depends BR2_PACKAGE_LIBCURL
+
+config BR2_PACKAGE_LIBCURL
+	tristate "libcurl - A client-side URL transfer library"
+#	default m if CONFIG_DEVEL
+	default n
+	select BR2_COMPILE_CURL
+	select BR2_PACKAGE_LIBOPENSSL
+	select BR2_PACKAGE_ZLIB
+	help
+	  A client-side URL transfer library.
+	  
+	  http://curl.haxx.se/
+	  
+
+config BR2_PACKAGE_CURL
+	tristate "curl - A client-side URL transfer tool"
+#	default m if CONFIG_DEVEL
+	default n
+	depends BR2_PACKAGE_LIBCURL
+	help
+	  A client-side URL transfer tool.
+	  
+	  http://curl.haxx.se/
+	  
+
diff --git a/package/curl/Makefile b/package/curl/Makefile
new file mode 100644
index 0000000000..681308f53b
--- /dev/null
+++ b/package/curl/Makefile
@@ -0,0 +1,131 @@
+# $Id$
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=curl
+PKG_VERSION:=7.14.0
+PKG_RELEASE:=1
+PKG_MD5SUM:=46ce665e47d37fce1a0bad935cce58a9
+
+PKG_SOURCE_URL:=http://curl.haxx.se/download/ \
+	http://www.mirrorspace.org/curl/ \
+	http://curl.mirror.internet.tp/download/ \
+	ftp://ftp.sunet.se/pub/www/utilities/curl/ \
+	ftp://ftp.planetmirror.com/pub/curl/ \
+	http://www.mirrormonster.com/curl/download/ \
+	http://curl.mirrors.cyberservers.net/download/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_CAT:=bzcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(TOPDIR)/package/rules.mk
+
+$(eval $(call PKG_template,CURL,curl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,LIBCURL,libcurl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(PKG_BUILD_DIR)/.configured:
+	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(strip $(TARGET_CFLAGS))" \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
+		./configure \
+			--target=$(GNU_TARGET_NAME) \
+			--host=$(GNU_TARGET_NAME) \
+			--build=$(GNU_HOST_NAME) \
+			--program-prefix="" \
+			--program-suffix="" \
+			--prefix=/usr \
+			--exec-prefix=/usr \
+			--bindir=/usr/bin \
+			--datadir=/usr/share \
+			--includedir=/usr/include \
+			--infodir=/usr/share/info \
+			--libdir=/usr/lib \
+			--libexecdir=/usr/lib \
+			--localstatedir=/var \
+			--mandir=/usr/share/man \
+			--sbindir=/usr/sbin \
+			--sysconfdir=/etc \
+			$(DISABLE_LARGEFILE) \
+			$(DISABLE_NLS) \
+			--enable-shared \
+			--enable-static \
+			--disable-rpath \
+			--with-gnu-ld \
+			--disable-thread \
+			--enable-cookies \
+			--enable-crypto-auth \
+			--enable-nonblocking \
+			--enable-file \
+			--enable-ftp \
+			--enable-http \
+			--enable-ipv6 \
+			--disable-ares \
+			--disable-debug \
+			--disable-dict \
+			--disable-gopher \
+			--disable-ldap \
+			--disable-manual \
+			--disable-sspi \
+			--disable-telnet \
+			--disable-verbose \
+			--with-random="/dev/urandom" \
+			--with-ssl="$(STAGING_DIR)/usr" \
+			--without-ca-bundle \
+			--without-gnutls \
+			--without-libidn \
+	)
+	touch $@
+
+$(PKG_BUILD_DIR)/.built:
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
+	touch $@
+
+$(IPKG_CURL):
+	install -m0755 -d $(IDIR_CURL)/usr/bin
+	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/curl $(IDIR_CURL)/usr/bin/
+	$(RSTRIP) $(IDIR_CURL)
+	$(IPKG_BUILD) $(IDIR_CURL) $(PACKAGE_DIR)
+
+$(IPKG_LIBCURL):
+	install -m0755 -d $(IDIR_LIBCURL)/usr/lib
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libcurl.so.* $(IDIR_LIBCURL)/usr/lib/
+	$(RSTRIP) $(IDIR_LIBCURL)
+	$(IPKG_BUILD) $(IDIR_LIBCURL) $(PACKAGE_DIR)
+
+$(STAGING_DIR)/usr/lib/libcurl.so: $(PKG_BUILD_DIR)/.built
+	mkdir -p $(STAGING_DIR)/usr/bin
+	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/curl-config $(STAGING_DIR)/usr/bin/
+	mkdir -p $(STAGING_DIR)/usr/include
+	cp -fpR $(PKG_INSTALL_DIR)/usr/include/curl $(STAGING_DIR)/usr/include/
+	mkdir -p $(STAGING_DIR)/usr/lib
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libcurl.a $(STAGING_DIR)/usr/lib/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libcurl.so* $(STAGING_DIR)/usr/lib/
+	$(SED) 's,-I/usr/include,,g' $(STAGING_DIR)/usr/bin/curl-config
+	$(SED) 's,-L/usr/lib,,g' $(STAGING_DIR)/usr/bin/curl-config
+	touch $@
+
+install-dev: $(STAGING_DIR)/usr/lib/libcurl.so
+
+uninstall-dev:
+	rm -rf \
+		$(STAGING_DIR)/usr/bin/curl-config \
+		$(STAGING_DIR)/usr/include/curl \
+		$(STAGING_DIR)/usr/lib/libcurl.a \
+		$(STAGING_DIR)/usr/lib/libcurl.so* \
+
+compile: install-dev
+clean: uninstall-dev
+
+mostlyclean:
+	-$(MAKE) -C $(PKG_BUILD_DIR) clean
+	rm -f $(PKG_BUILD_DIR)/.built
+
diff --git a/package/curl/ipkg/curl.control b/package/curl/ipkg/curl.control
new file mode 100644
index 0000000000..47a7aa78b5
--- /dev/null
+++ b/package/curl/ipkg/curl.control
@@ -0,0 +1,7 @@
+Package: curl
+Priority: optional
+Section: net
+Maintainer: OpenWrt Developers Team <bugs@openwrt.org>
+Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/curl/
+Depends: libcurl
+Description: a client-side URL transfer tool
diff --git a/package/curl/ipkg/libcurl.control b/package/curl/ipkg/libcurl.control
new file mode 100644
index 0000000000..83204171da
--- /dev/null
+++ b/package/curl/ipkg/libcurl.control
@@ -0,0 +1,7 @@
+Package: curl
+Priority: optional
+Section: libs
+Maintainer: OpenWrt Developers Team <bugs@openwrt.org>
+Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/curl/
+Depends: libopenssl, zlib
+Description: a client-side URL transfer library