diff options
author | Kirill Ponomarev <krion@FreeBSD.org> | 2004-04-09 18:20:43 +0000 |
---|---|---|
committer | Kirill Ponomarev <krion@FreeBSD.org> | 2004-04-09 18:20:43 +0000 |
commit | 42baadd690585613c5da65589aa5eb87fbe8c737 (patch) | |
tree | 87a7a1c5e264eba422c4448c201297092528f0fa /www/aria | |
parent | 73afac411e919dc3ee7c2d4ccd0ceb6b9787687e (diff) | |
download | ports-42baadd690585613c5da65589aa5eb87fbe8c737.tar.gz ports-42baadd690585613c5da65589aa5eb87fbe8c737.zip |
Notes
Diffstat (limited to 'www/aria')
-rw-r--r-- | www/aria/Makefile | 15 | ||||
-rw-r--r-- | www/aria/files/patch-src::GtrlSocket.cc | 11 | ||||
-rw-r--r-- | www/aria/files/patch-src::HistoryWindow.cc | 11 | ||||
-rw-r--r-- | www/aria/files/patch-src::ItemList.h | 11 | ||||
-rw-r--r-- | www/aria/files/patch-src::ProxyList.cc | 17 | ||||
-rw-r--r-- | www/aria/files/patch-src::RetrieveFTP.h | 11 | ||||
-rw-r--r-- | www/aria/files/patch-src::gui_download.cc | 11 | ||||
-rw-r--r-- | www/aria/files/patch-src::gui_file.cc | 16 | ||||
-rw-r--r-- | www/aria/files/patch-src::gui_main.cc | 13 | ||||
-rw-r--r-- | www/aria/files/patch-src::gui_popup.cc | 11 | ||||
-rw-r--r-- | www/aria/files/patch-src::md5.c | 13 |
11 files changed, 128 insertions, 12 deletions
diff --git a/www/aria/Makefile b/www/aria/Makefile index 59ef6e0fc09e..e19ba9cebc5f 100644 --- a/www/aria/Makefile +++ b/www/aria/Makefile @@ -17,14 +17,12 @@ COMMENT= Yet another download tool USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= gtk12 +USE_GNOME= gnometarget gtk12 USE_OPENSSL= yes -USE_GETOPT_LONG=yes +USE_GETOPT_LONG= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_LIBTOOL_VER=13 - -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +USE_LIBTOOL_VER= 13 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT @@ -47,13 +45,6 @@ post-patch: @${REINPLACE_CMD} -e 's|"getopt.h"|<getopt.h>|g' \ ${WRKSRC}/src/main.cc -pre-build: -.for file in src/AppOption.cc src/HistoryWindow.cc src/RetrieveHTTP.cc \ - src/RetrieveHTTP2.cc src/gui_file_open_and_save.cc - @cd ${WRKSRC} && ${MV} ${file} ${file}.pre_iconv \ - && iconv -c -t ascii ${file}.pre_iconv > ${file} || ${TRUE} -.endfor - post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} diff --git a/www/aria/files/patch-src::GtrlSocket.cc b/www/aria/files/patch-src::GtrlSocket.cc new file mode 100644 index 000000000000..6654d1017149 --- /dev/null +++ b/www/aria/files/patch-src::GtrlSocket.cc @@ -0,0 +1,11 @@ +--- src/CtrlSocket.cc.orig 2002-10-01 17:32:00.000000000 +0200 ++++ src/CtrlSocket.cc 2004-01-10 02:13:30.000000000 +0100 +@@ -183,7 +183,7 @@ + stored_uid = getuid(); + euid = geteuid(); + setuid(euid); +- sprintf(saddr.sun_path, "%s/aria_%s.%d", g_get_tmp_dir(), g_get_user_name(), session); ++ snprintf(saddr.sun_path, sizeof(saddr.sun_path)-1, "%s/aria_%s.%d", g_get_tmp_dir(), g_get_user_name(), session); + setreuid(stored_uid, euid); + if (connect(fd, (struct sockaddr *) &saddr, sizeof (saddr)) != -1) + return fd; diff --git a/www/aria/files/patch-src::HistoryWindow.cc b/www/aria/files/patch-src::HistoryWindow.cc new file mode 100644 index 000000000000..f6f8aed8cdd2 --- /dev/null +++ b/www/aria/files/patch-src::HistoryWindow.cc @@ -0,0 +1,11 @@ +--- src/HistoryWindow.cc.orig Wed Oct 2 00:32:00 2002 ++++ src/HistoryWindow.cc Thu Apr 8 22:41:14 2004 +@@ -479,7 +479,7 @@ + { + ifstream infile(filename.c_str(), ios::in); + +- if(infile.bad()) return false; ++ if(!infile.is_open() || infile.bad()) return false; + int count = 0; + while(!infile.eof() && count < maxHistory) { + string line; diff --git a/www/aria/files/patch-src::ItemList.h b/www/aria/files/patch-src::ItemList.h new file mode 100644 index 000000000000..ca2c8edbdcc0 --- /dev/null +++ b/www/aria/files/patch-src::ItemList.h @@ -0,0 +1,11 @@ +--- src/ItemList.h.orig Sat Mar 16 23:13:00 2002 ++++ src/ItemList.h Thu Apr 8 22:56:34 2004 +@@ -31,7 +31,7 @@ + #include <string> + #include <fstream> + //#include <map> +-#include <pair.h> ++//#include <pair.h> + #include "aria.h" + #include "utils.h" + #include "ProxyList.h" diff --git a/www/aria/files/patch-src::ProxyList.cc b/www/aria/files/patch-src::ProxyList.cc new file mode 100644 index 000000000000..4ba2539c4877 --- /dev/null +++ b/www/aria/files/patch-src::ProxyList.cc @@ -0,0 +1,17 @@ +--- src/ProxyList.cc.orig Sun Nov 4 19:18:08 2001 ++++ src/ProxyList.cc Thu Apr 8 22:41:14 2004 +@@ -130,12 +130,12 @@ + bool ProxyList::Read_proxy_list(const string& file_proxy_list) + { + ifstream infile(file_proxy_list.c_str(), ios::in);//ios::skipws|ios::in); +- if(infile.bad() || infile.eof()) return false; ++ if(!infile.is_open() || infile.bad() || infile.eof()) return false; + + while(!infile.eof()) { + string line; + getline(infile, line, '\n'); +- if(infile.bad()) return false; ++ if(!infile.is_open() || infile.bad()) return false; + line = Remove_white(line); + if(line.empty() || line.at(0) == '#') continue; + string server_name = Token_splitter(line, ": \t"); diff --git a/www/aria/files/patch-src::RetrieveFTP.h b/www/aria/files/patch-src::RetrieveFTP.h new file mode 100644 index 000000000000..56d625abb833 --- /dev/null +++ b/www/aria/files/patch-src::RetrieveFTP.h @@ -0,0 +1,11 @@ +--- src/RetrieveFTP.h.orig Wed Feb 13 21:09:24 2002 ++++ src/RetrieveFTP.h Thu Apr 8 22:57:28 2004 +@@ -27,7 +27,7 @@ + #include <arpa/inet.h> + #include <errno.h> + #include <fstream> +-#include <pair.h> ++//#include <pair.h> + #include "aria.h" + #include "FTPcontainer.h" + #include "ItemCell.h" diff --git a/www/aria/files/patch-src::gui_download.cc b/www/aria/files/patch-src::gui_download.cc new file mode 100644 index 000000000000..1559b6359b01 --- /dev/null +++ b/www/aria/files/patch-src::gui_download.cc @@ -0,0 +1,11 @@ +--- src/gui_download.cc.orig Wed Oct 2 00:32:00 2002 ++++ src/gui_download.cc Thu Apr 8 22:55:40 2004 +@@ -24,7 +24,7 @@ + #include <sys/time.h> + #include <sys/types.h> + #include <sys/socket.h> +-#include <pair.h> ++//#include <pair.h> + #include <list> + #include <algorithm> + #include "aria.h" diff --git a/www/aria/files/patch-src::gui_file.cc b/www/aria/files/patch-src::gui_file.cc new file mode 100644 index 000000000000..32a11ab2b4fe --- /dev/null +++ b/www/aria/files/patch-src::gui_file.cc @@ -0,0 +1,16 @@ +--- src/gui_file.cc.orig Mon Sep 30 22:29:46 2002 ++++ src/gui_file.cc Thu Apr 8 22:58:36 2004 +@@ -19,12 +19,12 @@ + + // $Id: gui_file.cc,v 1.45 2002/09/30 13:29:46 tujikawa Exp $ + +-#include <fstream.h> + #include <stdlib.h> + #include <unistd.h> + #include <sys/time.h> + #include <sys/types.h> + #include <sys/stat.h> ++#include <fstream> + #include "aria.h" + #include "ItemCell.h" + #include "ListManager.h" diff --git a/www/aria/files/patch-src::gui_main.cc b/www/aria/files/patch-src::gui_main.cc new file mode 100644 index 000000000000..7e5f03800dfa --- /dev/null +++ b/www/aria/files/patch-src::gui_main.cc @@ -0,0 +1,13 @@ +--- src/gui_main.cc.orig Thu Dec 19 00:41:05 2002 ++++ src/gui_main.cc Thu Apr 8 22:41:14 2004 +@@ -830,8 +830,8 @@ + */ + ifstream infile(filename.c_str(), ios::in); + map<string, string> guiInfoMap; +- if(infile.bad()) return false; +- ++ if(!infile.is_open() || infile.bad()) return false; ++ + if(infile.eof()) return false; + while(!infile.eof()) { + string line; diff --git a/www/aria/files/patch-src::gui_popup.cc b/www/aria/files/patch-src::gui_popup.cc new file mode 100644 index 000000000000..0f4308b8db11 --- /dev/null +++ b/www/aria/files/patch-src::gui_popup.cc @@ -0,0 +1,11 @@ +--- src/gui_popup.cc.orig Wed Apr 3 22:33:52 2002 ++++ src/gui_popup.cc Thu Apr 8 22:59:27 2004 +@@ -19,7 +19,7 @@ + + // $Id: gui_popup.cc,v 1.14 2002/04/03 13:33:52 tujikawa Exp $ + +-#include <iostream.h> ++#include <iostream> + #include "aria.h" + #include "gui_utils.h" + diff --git a/www/aria/files/patch-src::md5.c b/www/aria/files/patch-src::md5.c new file mode 100644 index 000000000000..2d2c158736f8 --- /dev/null +++ b/www/aria/files/patch-src::md5.c @@ -0,0 +1,13 @@ +--- src/md5.c.orig 2001-05-19 20:38:59.000000000 +0200 ++++ src/md5.c 2003-08-07 01:34:12.000000000 +0200 +@@ -291,8 +291,8 @@ + + p = hd->buf; + #ifdef BIG_ENDIAN_HOST +- #define X(a) do { *p++ = hd->##a ; *p++ = hd->##a >> 8; \ +- *p++ = hd->##a >> 16; *p++ = hd->##a >> 24; } while(0) ++ #define X(a) do { *p++ = hd->a ; *p++ = hd->a >> 8; \ ++ *p++ = hd->a >> 16; *p++ = hd->a >> 24; } while(0) + #else /* little endian */ + /*#define X(a) do { *(u32*)p = hd->##a ; p += 4; } while(0)*/ + /* Unixware's cpp doesn't like the above construct so we do it his way: |