6 files changed, 7 insertions, 111 deletions
diff --git a/package/ctorrent/Config.in b/package/ctorrent/Config.in
deleted file mode 100644
index 862b8c460..000000000
--- a/package/ctorrent/Config.in
+++ /dev/null
@@ -1,29 +0,0 @@
-config ADK_PACKAGE_CTORRENT
-	prompt "ctorrent.......................... console-based BitTorrent client"
-	tristate
-	default n
-	depends on ADK_CXX
-	help
-	  CTorrent is a BitTorrent client written in the C programming language, known to
-	  be a very robust and mature programming language, which produces fast and
-	  optimized application.
-
-	  http://www.rahul.net/dholmes/ctorrent/
-
-choice
-prompt "C++ library to use"
-depends on ADK_PACKAGE_CTORRENT
-default ADK_COMPILE_CTORRENT_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-default ADK_COMPILE_CTORRENT_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
-
-config ADK_COMPILE_CTORRENT_WITH_STDCXX
-	bool "Standard C++ library"
-	select ADK_PACKAGE_LIBSTDCXX
-	help
-
-config ADK_COMPILE_CTORRENT_WITH_UCLIBCXX
-	bool "Embedded uClibc++ library"
-	select ADK_PACKAGE_UCLIBCXX
-	help
-
-endchoice
diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile
index 23ba6ac71..aad41b850 100755
--- a/package/ctorrent/Makefile
+++ b/package/ctorrent/Makefile
@@ -4,37 +4,21 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ctorrent
-PKG_VERSION:=		1.3.4-dnh2
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		6635e2d0d0ee21faeb85d95cd93c137b
+PKG_VERSION:=		dnh3.3.2
+PKG_RELEASE:=		1
+PKG_BUILDDEP+=		openssl
+PKG_MD5SUM:=		59b23dd05ff70791cd6449effa7fc3b6
 PKG_DESCR:=		console-based BitTorrent client
 PKG_SECTION:=		net
 PKG_URL:=		http://www.rahul.net/dholmes/ctorrent
-PKG_SITES:=		http://www.rahul.net/dholmes/ctorrent/
-
-WRKDIST=		${WRKDIR}/${PKG_NAME}-dnh2
-
-ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y)
-PKG_DEPENDS:=            uclibc++
-else
-PKG_DEPENDS:=            libstdcxx
-endif
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=dtorrent/}
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y)
-TCXXFLAGS+=		-fno-builtin -fno-rtti -nostdinc++
-TLDFLAGS+=		-lgcc_s -luClibc++ -lc -lm -nodefaultlibs
-endif
-
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
-
 post-install:
-	${INSTALL_DIR} ${IDIR_CTORRENT}
-	${CP} ${WRKINST}/* ${IDIR_CTORRENT}/
+	${INSTALL_DIR} ${IDIR_CTORRENT}/usr/bin
+	${CP} ${WRKINST}/usr/bin/ctorrent ${IDIR_CTORRENT}/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ctorrent/patches/patch-bencode_cpp b/package/ctorrent/patches/patch-bencode_cpp
deleted file mode 100644
index 9f2a4381e..000000000
--- a/package/ctorrent/patches/patch-bencode_cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- ctorrent-dnh2.orig/bencode.cpp	2006-01-02 03:38:01.000000000 +0100
-+++ ctorrent-dnh2/bencode.cpp	2009-06-01 19:10:05.000000000 +0200
-@@ -213,10 +213,10 @@ size_t bencode_end_dict_list(FILE *fp)
-   return (EOF == fputc('e',fp)) ? 0 : 1;
- }
- 
--size_t bencode_path2list(const char *pathname, FILE *fp)
-+size_t bencode_path2list(char *pathname, FILE *fp)
- {
-   char *pn;
--  const char *p = pathname;
-+  char *p = pathname;
-   
-   if( bencode_begin_list(fp) != 1 ) return 0;
-   
diff --git a/package/ctorrent/patches/patch-bencode_h b/package/ctorrent/patches/patch-bencode_h
deleted file mode 100644
index 594fa668a..000000000
--- a/package/ctorrent/patches/patch-bencode_h
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- ctorrent-dnh2.orig/bencode.h	2005-08-27 05:43:00.000000000 +0200
-+++ ctorrent-dnh2/bencode.h	2009-06-01 19:11:29.000000000 +0200
-@@ -31,6 +31,6 @@ size_t bencode_int(const int integer, FI
- size_t bencode_begin_dict(FILE *fp);
- size_t bencode_begin_list(FILE *fp);
- size_t bencode_end_dict_list(FILE *fp);
--size_t bencode_path2list(const char *pathname, FILE *fp);
-+size_t bencode_path2list(char *pathname, FILE *fp);
- 
- #endif
diff --git a/package/ctorrent/patches/patch-btcontent_cpp b/package/ctorrent/patches/patch-btcontent_cpp
deleted file mode 100644
index e402465f8..000000000
--- a/package/ctorrent/patches/patch-btcontent_cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$Id$
---- ctorrent-dnh2.orig/btcontent.cpp	2006-01-02 03:40:49.000000000 +0100
-+++ ctorrent-dnh2/btcontent.cpp	2007-01-22 23:43:50.000000000 +0100
-@@ -9,12 +9,8 @@
- #else
- #include <unistd.h>
- #include <sys/param.h>
--#if defined(HAVE_LIBCRYPT) || defined(HAVE_LIBMD) || defined(HAVE_LIBCRYPTO)
--#include <sha.h>
--#elif defined(HAVE_LIBSSL)
- #include <openssl/sha.h>
- #endif
--#endif
- 
- #include <time.h>
- #include <sys/stat.h>
diff --git a/package/ctorrent/patches/patch-btfiles_cpp b/package/ctorrent/patches/patch-btfiles_cpp
deleted file mode 100644
index e390083bb..000000000
--- a/package/ctorrent/patches/patch-btfiles_cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$Id$
---- ctorrent-dnh2.orig/btfiles.cpp	2006-01-02 03:41:21.000000000 +0100
-+++ ctorrent-dnh2/btfiles.cpp	2007-01-22 23:46:13.000000000 +0100
-@@ -8,12 +8,8 @@
- #include <unistd.h>
- #include <dirent.h>
- #include <sys/param.h>
--#if defined(HAVE_LIBCRYPT) || defined(HAVE_LIBMD) || defined(HAVE_LIBCRYPTO)
--#include <sha.h>
--#elif defined(HAVE_LIBSSL)
- #include <openssl/sha.h>
- #endif
--#endif
- 
- #include <time.h>
- #include <sys/stat.h>