From 78b40034d6df915e84588cd46fdff7c646833983 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 18 Feb 2010 19:07:12 +0100 Subject: remove cbtt, I never used it. And the makefiles just suckz --- package/Config.in | 1 - package/cbtt/Makefile | 52 ----------------------------- package/cbtt/patches/patch-Makefile | 61 ----------------------------------- package/cbtt/patches/patch-base64_cpp | 20 ------------ package/cbtt/patches/patch-bnbt_h | 11 ------- 5 files changed, 145 deletions(-) delete mode 100644 package/cbtt/Makefile delete mode 100644 package/cbtt/patches/patch-Makefile delete mode 100644 package/cbtt/patches/patch-base64_cpp delete mode 100644 package/cbtt/patches/patch-bnbt_h diff --git a/package/Config.in b/package/Config.in index 74e72e4bf..378ec7c2a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -484,7 +484,6 @@ source "package/rdate/Config.in" endmenu menu "P2P" -source "package/cbtt/Config.in" source "package/ctorrent/Config.in" source "package/rtorrent/Config.in" endmenu diff --git a/package/cbtt/Makefile b/package/cbtt/Makefile deleted file mode 100644 index 8f8573813..000000000 --- a/package/cbtt/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include ${TOPDIR}/rules.mk - -PKG_NAME:= cbtt -PKG_VERSION:= 20060211 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 19abea2817c49ccc9438e9671c402984 -PKG_DESCR:= Bittorrent tracker -PKG_SECTION:= net -PKG_DEPENDS:= zlib -PKG_BUILDDEP+= zlib -ifeq (${ADK_COMPILE_CBTT_WITH_UCLIBCXX},y) -PKG_BUILDDEP+= uclibc++ -endif -PKG_URL:= http://bnbtusermods.sourceforge.net -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=bnbtusermods/} - -PKG_HOST_DEPENDS:= !cygwin - -DISTFILES:= ${PKG_NAME}80-${PKG_VERSION}-src.tar.gz -WRKDIST= ${WRKDIR}/${PKG_NAME}80-${PKG_VERSION}-src - -include ${TOPDIR}/mk/package.mk - -ifeq ($(ADK_TARGET_LIB_UCLIBCXX),y) -PKG_DEPENDS+= uclibc++ -PKG_DEPENDS_1+= uclibc++ -else -PKG_DEPENDS+= libstdcxx -PKG_DEPENDS_1+= libstdcxx -endif - -$(eval $(call PKG_template,CBTT,cbtt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIG_STYLE:= manual -INSTALL_STYLE:= manual - -TLDFLAGS+= -shared -L. -lz -lpthread -lm -lgcc -ifeq ($(ADK_TARGET_LIB_UCLIBCXX),y) -TLDFLAGS+= -nodefaultlibs -lz -lpthread \ - -luClibc++ -lc -lm -lgcc -TCFLAGS+= -fno-builtin -nostdinc++ -endif -TCFLAGS+= -fPIC - -do-install: - ${INSTALL_DIR} ${IDIR_CBTT}/usr/bin - ${INSTALL_BIN} ${WRKBUILD}/bnbt ${IDIR_CBTT}/usr/bin/ - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/cbtt/patches/patch-Makefile b/package/cbtt/patches/patch-Makefile deleted file mode 100644 index ddcc23d82..000000000 --- a/package/cbtt/patches/patch-Makefile +++ /dev/null @@ -1,61 +0,0 @@ ---- cbtt80-20060211-src.orig/Makefile 2006-02-07 18:44:58.000000000 +0100 -+++ cbtt80-20060211-src/Makefile 2010-02-14 09:21:02.000000000 +0100 -@@ -1,10 +1,8 @@ --SHELL = /bin/sh --SYSTEM = $(shell uname) --C++ = g++ -+SHELL ?= /bin/sh -+SYSTEM = Linux - DFLAGS = --OFLAGS = -O2 -w - LFLAGS = -L. -lz --CFLAGS = -+CFLAGS ?= - - ifeq ($(SYSTEM),Linux) - DFLAGS += -D__LINUX__ -@@ -29,30 +27,31 @@ LFLAGS = -lresolv -lsocket -lnsl -lpthre - CFLAGS = - endif - --CFLAGS += $(OFLAGS) $(DFLAGS) -I. -+LDFLAGS += $(LFLAGS) -+CFLAGS += $(LDFLAGS) -I. - - OBJS = atom.o base64.o bencode.o client.o config.o link.o md5.o server.o sha1.o sort.o tracker_admin.o tracker_comments.o tracker_file.o tracker_index.o tracker_info.o tracker_login.o tracker_signup.o tracker_stats.o tracker_torrent.o tracker_upload.o tracker_users.o util.o - OBJS_BNBT = bnbt.o tracker.o tracker_announce.o tracker_scrape.o - OBJS_BNBTMYSQL = bnbt.mysql.o bnbt_mysql.mysql.o tracker.mysql.o tracker_announce.mysql.o tracker_scrape.mysql.o - --PROGS = ./bnbt ./bnbtmysql -+PROGS = ./bnbt - --all: $(OBJS) $(OBJS_BNBT) $(OBJS_BNBTMYSQL) $(PROGS) -+all: $(OBJS) $(OBJS_BNBT) $(PROGS) - - ./bnbt: $(OBJS) $(OBJS_BNBT) -- $(C++) -o ./bnbt $(OBJS) $(OBJS_BNBT) $(LFLAGS) -+ $(CXX) -o ./bnbt $(OBJS) $(OBJS_BNBT) $(LDFLAGS) - - ./bnbtmysql: $(OBJS) $(OBJS_BNBTMYSQL) -- $(C++) -o ./bnbtmysql $(OBJS) $(OBJS_BNBTMYSQL) $(LFLAGS) -L/usr/lib/mysql -lmysqlclient -+ $(CXX) -o ./bnbtmysql $(OBJS) $(OBJS_BNBTMYSQL) $(LDFLAGS) -L/usr/lib/mysql -lmysqlclient - - clean: - rm -f $(OBJS) $(OBJS_BNBT) $(OBJS_BNBTMYSQL) $(PROGS) - - %.o: %.cpp -- $(C++) -o $@ $(CFLAGS) -c $< -+ $(CXX) -o $@ $(CFLAGS) -c $< - - %.mysql.o: %.cpp -- $(C++) -o $@ $(CFLAGS) -DBNBT_MYSQL -c $< -+ $(CXX) -o $@ $(CFLAGS) -DBNBT_MYSQL -c $< - - ./bnbt: $(OBJS) $(OBJS_BNBT) - -@@ -91,4 +90,4 @@ bnbt.mysql.o: bnbt.h bnbt_mysql.h config - bnbt_mysql.mysql.o: bnbt.h bnbt_mysql.h util.h - tracker.mysql.o: bnbt.h bnbt_mysql.h atom.h bencode.h config.h md5.h server.h sort.h tracker.h util.h - tracker_announce.mysql.o: bnbt.h bnbt_mysql.h atom.h bencode.h link.h tracker.h util.h --tracker_scrape.mysql.o: bnbt.h bnbt_mysql.h atom.h bencode.h tracker.h util.h -+tracker_scrape.mysql.o: bnbt.h bnbt_mysql.h atom.h bencode.h tracker.h util.h diff --git a/package/cbtt/patches/patch-base64_cpp b/package/cbtt/patches/patch-base64_cpp deleted file mode 100644 index d69e6f997..000000000 --- a/package/cbtt/patches/patch-base64_cpp +++ /dev/null @@ -1,20 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- cbtt80-20060211-src.orig/base64.cpp 2006-02-07 18:44:58.000000000 +0100 -+++ cbtt80-20060211-src/base64.cpp 2009-06-01 19:00:07.000000000 +0200 -@@ -112,7 +112,7 @@ uchar pBase64[] = { - /* Returns: bool - True (!0) if the operation was successful. */ - /* False (0) if the operation was unsuccessful. */ - /*---------------------------------------------------------------------------*/ --char *b64decode(const char *s) -+char *b64decode(char *s) - { - int l = strlen(s); // Get length of Base64 string. - char *b; // Decoding buffer pointers. -@@ -121,7 +121,6 @@ char *b64decode(const char *s) - int y = 0; - - static // Collating sequence... -- const // ...independant "===". - char pPad[] = {0x3d, 0x3d, 0x3d, 0x00}; - - if (l % 4) // If it's not modulo 4, then it... diff --git a/package/cbtt/patches/patch-bnbt_h b/package/cbtt/patches/patch-bnbt_h deleted file mode 100644 index 6169a027c..000000000 --- a/package/cbtt/patches/patch-bnbt_h +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- cbtt80-20060211-src.orig/bnbt.h 2006-02-07 18:44:58.000000000 +0100 -+++ cbtt80-20060211-src/bnbt.h 2009-05-09 16:17:54.000000000 +0200 -@@ -5,6 +5,7 @@ - #ifndef BNBT_H - #define BNBT_H - -+#include - #include - #include - -- cgit v1.2.3