Attachment #41859 for bug #65371

View | Details | Raw Unified | Return to bug 65371
Collapse All | Expand All





USE_BZIP2=	yes
USE_X_PREFIX=	yes
USE_GNOME=	gnometarget gtk12
USE_OPENSSL=	yes
USE_GETOPT_LONG=	yes
USE_REINPLACE=	yes
USE_GMAKE=	yes
USE_LIBTOOL_VER=	13

CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"

CPPFLAGS=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT

		${WRKSRC}/src/Makefile.in
	@${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)

Line 0 Link Here

(-)www/aria/files/patch-src::GtrlSocket.cc (+11 lines)
	1	--- src/CtrlSocket.cc.orig 2002-10-01 17:32:00.000000000 +0200
	2	+++ src/CtrlSocket.cc 2004-01-10 02:13:30.000000000 +0100
	3	@@ -183,7 +183,7 @@
	4	stored_uid = getuid();
	5	euid = geteuid();
	6	setuid(euid);
	7	- sprintf(saddr.sun_path, "%s/aria_%s.%d", g_get_tmp_dir(), g_get_user_name(), session);
	8	+ snprintf(saddr.sun_path, sizeof(saddr.sun_path)-1, "%s/aria_%s.%d", g_get_tmp_dir(), g_get_user_name(), session);
	9	setreuid(stored_uid, euid);
	10	if (connect(fd, (struct sockaddr *) &saddr, sizeof (saddr)) != -1)
	11	return fd;

Line 0 Link Here

(-)www/aria/files/patch-src::HistoryWindow.cc (+11 lines)
	1	--- src/HistoryWindow.cc.orig Wed Oct 2 00:32:00 2002
	2	+++ src/HistoryWindow.cc Thu Apr 8 22:41:14 2004
	3	@@ -479,7 +479,7 @@
	4	{
	5	ifstream infile(filename.c_str(), ios::in);
	6
	7	- if(infile.bad()) return false;
	8	+ if(!infile.is_open() \|\| infile.bad()) return false;
	9	int count = 0;
	10	while(!infile.eof() && count < maxHistory) {
	11	string line;

Line 0 Link Here

(-)www/aria/files/patch-src::ItemList.h (+11 lines)
	1	--- src/ItemList.h.orig Sat Mar 16 23:13:00 2002
	2	+++ src/ItemList.h Thu Apr 8 22:56:34 2004
	3	@@ -31,7 +31,7 @@
	4	#include <string>
	5	#include <fstream>
	6	//#include <map>
	7	-#include <pair.h>
	8	+//#include <pair.h>
	9	#include "aria.h"
	10	#include "utils.h"
	11	#include "ProxyList.h"




--- 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");

Line 0 Link Here

(-)www/aria/files/patch-src::RetrieveFTP.h (+11 lines)
	1	--- src/RetrieveFTP.h.orig Wed Feb 13 21:09:24 2002
	2	+++ src/RetrieveFTP.h Thu Apr 8 22:57:28 2004
	3	@@ -27,7 +27,7 @@
	4	#include <arpa/inet.h>
	5	#include <errno.h>
	6	#include <fstream>
	7	-#include <pair.h>
	8	+//#include <pair.h>
	9	#include "aria.h"
	10	#include "FTPcontainer.h"
	11	#include "ItemCell.h"

Line 0 Link Here

(-)www/aria/files/patch-src::gui_download.cc (+11 lines)
	1	--- src/gui_download.cc.orig Wed Oct 2 00:32:00 2002
	2	+++ src/gui_download.cc Thu Apr 8 22:55:40 2004
	3	@@ -24,7 +24,7 @@
	4	#include <sys/time.h>
	5	#include <sys/types.h>
	6	#include <sys/socket.h>
	7	-#include <pair.h>
	8	+//#include <pair.h>
	9	#include <list>
	10	#include <algorithm>
	11	#include "aria.h"




--- 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"




--- 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;

Line 0 Link Here

(-)www/aria/files/patch-src::gui_popup.cc (+11 lines)
	1	--- src/gui_popup.cc.orig Wed Apr 3 22:33:52 2002
	2	+++ src/gui_popup.cc Thu Apr 8 22:59:27 2004
	3	@@ -19,7 +19,7 @@
	4
	5	// $Id: gui_popup.cc,v 1.14 2002/04/03 13:33:52 tujikawa Exp $
	6
	7	-#include <iostream.h>
	8	+#include <iostream>
	9	#include "aria.h"
	10	#include "gui_utils.h"
	11

Line 0 Link Here

(-)www/aria/files/patch-src::md5.c (+13 lines)
	1	--- src/md5.c.orig 2001-05-19 20:38:59.000000000 +0200
	2	+++ src/md5.c 2003-08-07 01:34:12.000000000 +0200
	3	@@ -291,8 +291,8 @@
	4
	5	p = hd->buf;
	6	#ifdef BIG_ENDIAN_HOST
	7	- #define X(a) do { p++ = hd->##a ; p++ = hd->##a >> 8; \
	8	- p++ = hd->##a >> 16; p++ = hd->##a >> 24; } while(0)
	9	+ #define X(a) do { p++ = hd->a ; p++ = hd->a >> 8; \
	10	+ p++ = hd->a >> 16; p++ = hd->a >> 24; } while(0)
	11	#else /* little endian */
	12	/#define X(a) do { (u32)p = hd->##a ; p += 4; } while(0)/
	13	/* Unixware's cpp doesn't like the above construct so we do it his way:

Return to bug 65371

Lines 17-30 Link Here

(-)www/aria/Makefile (-12 / +3 lines)
17		17
18	USE_BZIP2= yes	18	USE_BZIP2= yes
19	USE_X_PREFIX= yes	19	USE_X_PREFIX= yes
20	USE_GNOME= gtk12	20	USE_GNOME= gnometarget gtk12
21	USE_OPENSSL= yes	21	USE_OPENSSL= yes
22	USE_GETOPT_LONG=yes	22	USE_GETOPT_LONG= yes
23	USE_REINPLACE= yes	23	USE_REINPLACE= yes
24	USE_GMAKE= yes	24	USE_GMAKE= yes
25	USE_LIBTOOL_VER=13	25	USE_LIBTOOL_VER= 13
26
27	CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
28	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"	26	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
29		27
30	CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT	28	CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT
Lines 46-58 Link Here
46	${WRKSRC}/src/Makefile.in	44	${WRKSRC}/src/Makefile.in
47	@${REINPLACE_CMD} -e 's\|"getopt.h"\|<getopt.h>\|g' \	45	@${REINPLACE_CMD} -e 's\|"getopt.h"\|<getopt.h>\|g' \
48	${WRKSRC}/src/main.cc	46	${WRKSRC}/src/main.cc
49
50	pre-build:
51	.for file in src/AppOption.cc src/HistoryWindow.cc src/RetrieveHTTP.cc \
52	src/RetrieveHTTP2.cc src/gui_file_open_and_save.cc
53	@cd ${WRKSRC} && ${MV} ${file} ${file}.pre_iconv \
54	&& iconv -c -t ascii ${file}.pre_iconv > ${file} \|\| ${TRUE}
55	.endfor
56		47
57	post-install:	48	post-install:
58	.if !defined(NOPORTDOCS)	49	.if !defined(NOPORTDOCS)

Line 0 Link Here

(-)www/aria/files/patch-src::ProxyList.cc (+17 lines)
	1	--- src/ProxyList.cc.orig Sun Nov 4 19:18:08 2001
	2	+++ src/ProxyList.cc Thu Apr 8 22:41:14 2004
	3	@@ -130,12 +130,12 @@
	4	bool ProxyList::Read_proxy_list(const string& file_proxy_list)
	5	{
	6	ifstream infile(file_proxy_list.c_str(), ios::in);//ios::skipws\|ios::in);
	7	- if(infile.bad() \|\| infile.eof()) return false;
	8	+ if(!infile.is_open() \|\| infile.bad() \|\| infile.eof()) return false;
	9
	10	while(!infile.eof()) {
	11	string line;
	12	getline(infile, line, '\n');
	13	- if(infile.bad()) return false;
	14	+ if(!infile.is_open() \|\| infile.bad()) return false;
	15	line = Remove_white(line);
	16	if(line.empty() \|\| line.at(0) == '#') continue;
	17	string server_name = Token_splitter(line, ": \t");

Line 0 Link Here

(-)www/aria/files/patch-src::gui_file.cc (+16 lines)
	1	--- src/gui_file.cc.orig Mon Sep 30 22:29:46 2002
	2	+++ src/gui_file.cc Thu Apr 8 22:58:36 2004
	3	@@ -19,12 +19,12 @@
	4
	5	// $Id: gui_file.cc,v 1.45 2002/09/30 13:29:46 tujikawa Exp $
	6
	7	-#include <fstream.h>
	8	#include <stdlib.h>
	9	#include <unistd.h>
	10	#include <sys/time.h>
	11	#include <sys/types.h>
	12	#include <sys/stat.h>
	13	+#include <fstream>
	14	#include "aria.h"
	15	#include "ItemCell.h"
	16	#include "ListManager.h"

Line 0 Link Here

(-)www/aria/files/patch-src::gui_main.cc (+13 lines)
	1	--- src/gui_main.cc.orig Thu Dec 19 00:41:05 2002
	2	+++ src/gui_main.cc Thu Apr 8 22:41:14 2004
	3	@@ -830,8 +830,8 @@
	4	*/
	5	ifstream infile(filename.c_str(), ios::in);
	6	map<string, string> guiInfoMap;
	7	- if(infile.bad()) return false;
	8	-
	9	+ if(!infile.is_open() \|\| infile.bad()) return false;
	10	+
	11	if(infile.eof()) return false;
	12	while(!infile.eof()) {
	13	string line;