3 files changed, 10 insertions, 38 deletions
diff --git a/package/curl/Config.in b/package/curl/Config.in
deleted file mode 100644
index f8b8da8e6..000000000
--- a/package/curl/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_COMPILE_CURL
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBCURL
-
-config ADK_PACKAGE_CURL
-	prompt   "curl.............................. A client-side URL transfer tool"
-	tristate
-	default n
-	depends on ADK_PACKAGE_LIBCURL
-	help
-	  http://curl.haxx.se/
diff --git a/package/curl/Config.in.lib b/package/curl/Config.in.lib
deleted file mode 100644
index 1e49d8521..000000000
--- a/package/curl/Config.in.lib
+++ /dev/null
@@ -1,20 +0,0 @@
-config ADK_PACKAGE_LIBCURL
-	prompt "libcurl........................... A client-side URL transfer library"
-	tristate
-	default n
-	select ADK_COMPILE_CURL
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_ZLIB
-	help
-	  http://curl.haxx.se/
-
-config ADK_PACKAGE_LIBCURL_DEV
-	prompt "libcurl-dev....................... development files for libcurl"
-	tristate
-	default n
-	select ADK_COMPILE_CURL
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_ZLIB
-	help
-	  http://curl.haxx.se/
-
diff --git a/package/curl/Makefile b/package/curl/Makefile
index 69768dc63..26037200c 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		ecb2e37e45c9933e2a963cabe03670ab
 PKG_DESCR:=		a client-side URL transfer tool
 PKG_SECTION:=		net
+PKG_DEPENDS:=		libcurl
+PKG_BUILDDEP+=		openssl zlib
 PKG_URL:=		http://curl.haxx.se
 PKG_SITES:=		http://curl.haxx.se/download/ \
 			http://www.mirrorspace.org/curl/ \
@@ -18,15 +20,17 @@ PKG_SITES:=		http://curl.haxx.se/download/ \
 			http://www.mirrormonster.com/curl/download/ \
 			http://curl.mirrors.cyberservers.net/download/
 
-PKG_DESCR_1:=		a client-side URL transfer library
-PKG_SECTION_1:=		libs
-PKG_DEPENDS_1:=		libopenssl zlib
+PKG_DESCR_LIB:=		a client-side URL transfer library
+PKG_SECTION_LIB:=	libs
+PKG_DEPENDS_LIB:=	libopenssl zlib
+PKG_DESCR_LIB_DEV:=	development files for libcurl
+PKG_SECTION_LIB_DEV:=	devel
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION_1}))
-$(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION_1}))
+$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_LIB},${PKG_DESCR_LIB},${PKG_SECTION_LIB}))
+$(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_LIB_DEV},${PKG_SECTION_LIB_DEV}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		curl_typeof_curl_socklen_t=socklen_t
@@ -55,9 +59,9 @@ INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_CURL}/usr/bin ${IDIR_LIBCURL}/usr/lib
-	${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/include/curl
 	${CP} ${WRKINST}/usr/bin/curl ${IDIR_CURL}/usr/bin/
 	${CP} ${WRKINST}/usr/lib/libcurl.so* ${IDIR_LIBCURL}/usr/lib/
+	${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/include/curl
 	${CP} ${WRKINST}/usr/include/curl/*.h ${IDIR_LIBCURL_DEV}/usr/include/curl/
 
 include ${TOPDIR}/mk/pkg-bottom.mk