6 files changed, 66 insertions, 36 deletions

diff --git a/ftp/downloader/Makefile b/ftp/downloader/Makefile
index 2d4cb4b65706..f45cde765e6b 100644
--- a/ftp/downloader/Makefile
+++ b/ftp/downloader/Makefile
@@ -7,36 +7,45 @@
 #
 
 PORTNAME=	downloader
-PORTVERSION=	2.5.6
-PORTREVISION=	1
+PORTVERSION=	2.5.7
 CATEGORIES=	ftp
-MASTER_SITES=	http://www.krasu.ru/soft/chuchelo/files/ \
+MASTER_SITES=	http://d4x.krasu.ru/files/ \
 		ftp://ftp.chg.ru/pub/X11/applications/Xdownloader/
 DISTNAME=	d4x-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Program for downloading via FTP or HTTP with GUI
 
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/smart_ptr.hpp:${PORTSDIR}/devel/boost \
+		bash:${PORTSDIR}/shells/bash
 
+USE_BZIP2=	yes
 USE_GNOME=	esound gnometarget gtk20
-USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		ac_cv_path_GENGETOPT=no
-CONFIGURE_ARGS=	--disable-openssl
 
 MAN1=		nt.1
 
 DATADIR=	${PREFIX}/share/d4x
 DOCSDIR=	${PREFIX}/share/doc/d4x
 
+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+
+.if defined(WITHOUT_OPENSSL)
+CONFIGURE_ARGS+=	--disable-openssl
+.else
+USE_OPENSSL=	yes
+CONFIGURE_ENV+=	SSL_CFLAGS="${OPENSSL_CFLAGS}" SSL_LIBS="${OPENSSL_LDFLAGS}"
+LDFLAGS+=	-lssl -lcrypto
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"
-BROKEN=		"Does not compile on sparc64"
+BROKEN=		Does not compile on sparc64
 .endif
 
 post-patch:
@@ -48,14 +57,18 @@ post-patch:
 	@${REINPLACE_CMD} -e 's| DOC||g ; \
 		 s| share||g' ${WRKSRC}/Makefile.in
 .if ${OSVERSION} < 500000
-.for file in main/addr.cc main/dlist.cc main/ftpd.cc main/face/mywidget.cc
+.for f in main/addr.cc main/dlist.cc main/ftpd.cc main/face/mywidget.cc
 	@${REINPLACE_CMD} -e 's|pass\.clear()|pass = ""|g ; \
 		 s|user\.clear()|user = ""|g ; \
 		 s|host\.clear()|host = ""|g ; \
 		 s|file\.clear()|file = ""|g ; \
 		 s|params\.clear()|params = ""|g ; \
 		 s|tag\.clear()|tag = ""|g ; \
-		 s|path\.clear()|path = ""|g' ${WRKSRC}/${file}
+		 s|path\.clear()|path = ""|g' ${WRKSRC}/${f}
+.endfor
+.for f in main/filter.h
+	@${REINPLACE_CMD} -e 's|<istream>|<iostream>|g ; \
+		 s|<ostream>|<iostream>|g' ${WRKSRC}/${f}
 .endfor
 .endif
 
diff --git a/ftp/downloader/distinfo b/ftp/downloader/distinfo
index c7a312db0d24..f992ed852a48 100644
--- a/ftp/downloader/distinfo
+++ b/ftp/downloader/distinfo
@@ -1,3 +1,3 @@
-MD5 (d4x-2.5.6.tar.gz) = 2cbaf9d4f466ba48d2ecb73518c76c78
-SHA256 (d4x-2.5.6.tar.gz) = 10c99977306eb536b47349a316dd38791de7a1d2c7c88cecfd63a93defad59e9
-SIZE (d4x-2.5.6.tar.gz) = 1945089
+MD5 (d4x-2.5.7.tar.bz2) = 16e27032bf1d3396b93453afde3266dd
+SHA256 (d4x-2.5.7.tar.bz2) = 203170ddeb5831fe18145e11f4b968c8d719c2878ebe880c23c2c171a4fa4f48
+SIZE (d4x-2.5.7.tar.bz2) = 1606613
diff --git a/ftp/downloader/files/patch-main__ftpd.cc b/ftp/downloader/files/patch-main__ftpd.cc
new file mode 100644
index 000000000000..2d099847f619
--- /dev/null
+++ b/ftp/downloader/files/patch-main__ftpd.cc
@@ -0,0 +1,13 @@
+--- main/ftpd.cc.orig	Thu Apr  6 04:02:36 2006
++++ main/ftpd.cc	Mon Apr 10 13:48:42 2006
+@@ -662,8 +662,9 @@
+ };
+ 
+ SocketPtr tFtpDownload::export_ctrl_socket(){
++	SocketPtr rval;
+ 	if (FTP) return(FTP->export_ctrl_socket());
+-	return(SocketPtr());
++	return rval;
+ };
+ 
+ tFtpDownload::~tFtpDownload() {
diff --git a/ftp/downloader/files/patch-main__httpd.cc b/ftp/downloader/files/patch-main__httpd.cc
new file mode 100644
index 000000000000..4b9ab109548d
--- /dev/null
+++ b/ftp/downloader/files/patch-main__httpd.cc
@@ -0,0 +1,13 @@
+--- main/httpd.cc.orig	Thu Apr  6 04:01:41 2006
++++ main/httpd.cc	Mon Apr 10 13:47:47 2006
+@@ -580,8 +580,9 @@
+ };
+ 
+ SocketPtr tHttpDownload::export_ctrl_socket(){
++	SocketPtr rval;
+ 	if (HTTP) return(HTTP->export_ctrl_socket());
+-	return(SocketPtr());
++	return rval;
+ };
+ 
+ tHttpDownload::~tHttpDownload() {
diff --git a/ftp/downloader/files/patch-main__sndserv.cc b/ftp/downloader/files/patch-main__sndserv.cc
deleted file mode 100644
index f592ea1f08dd..000000000000
--- a/ftp/downloader/files/patch-main__sndserv.cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- main/sndserv.cc.orig	Fri Jan 28 22:41:59 2005
-+++ main/sndserv.cc	Sun Oct  2 00:04:43 2005
-@@ -522,8 +522,8 @@
- };
- 
- void d4xSndServer::run(){
--	my_mutex.lock();
- 	while(1){
-+		my_mutex.lock();
- 		pthread_cond_wait(&cond,&(my_mutex.m));
- 		std::list<d4x::SndEvent> tmpqueue=queue;
- 		queue.clear();
-@@ -538,9 +538,7 @@
- 			tmpqueue.pop_front();
- 		};
- 		if (stop_now) break;
--		my_mutex.unlock();
- 	};
--	my_mutex.unlock();
- };
- 
- void d4xSndServer::set_sound_file(int event,char *path){
diff --git a/ftp/downloader/pkg-plist b/ftp/downloader/pkg-plist
index 5d15f1e1f5fa..9e522281ece5 100644
--- a/ftp/downloader/pkg-plist
+++ b/ftp/downloader/pkg-plist
@@ -77,6 +77,7 @@ bin/nt
 %%DATADIR%%/themes/gnome/popup/down.png
 %%DATADIR%%/themes/gnome/popup/log.png
 %%DATADIR%%/themes/gnome/popup/pause.png
+%%DATADIR%%/themes/gnome/popup/remove.png
 %%DATADIR%%/themes/gnome/popup/remove_completed.png
 %%DATADIR%%/themes/gnome/popup/start.png
 %%DATADIR%%/themes/gnome/popup/up.png
@@ -155,6 +156,16 @@ bin/nt
 %%DATADIR%%/themes/gnomeria/buttons/speedlow.png
 %%DATADIR%%/themes/gnomeria/buttons/speedmedium.png
 %%DATADIR%%/themes/gnomeria/buttons/stop.png
+%%DATADIR%%/themes/gnomeria/dnd1.png
+%%DATADIR%%/themes/gnomeria/dnd2.png
+%%DATADIR%%/themes/gnomeria/dndmini.png
+%%DATADIR%%/themes/gnomeria/log/error.png
+%%DATADIR%%/themes/gnomeria/log/from_server.png
+%%DATADIR%%/themes/gnomeria/log/ok.png
+%%DATADIR%%/themes/gnomeria/log/to_server.png
+%%DATADIR%%/themes/gnomeria/log/warning.png
+%%DATADIR%%/themes/gnomeria/offline.png
+%%DATADIR%%/themes/gnomeria/online.png
 %%DATADIR%%/themes/gnomeria/queue/complete.png
 %%DATADIR%%/themes/gnomeria/queue/failed.png
 %%DATADIR%%/themes/gnomeria/queue/paused.png
@@ -267,6 +278,7 @@ share/locale/fr/LC_MESSAGES/d4x.mo
 share/locale/hu/LC_MESSAGES/d4x.mo
 share/locale/it/LC_MESSAGES/d4x.mo
 share/locale/ja/LC_MESSAGES/d4x.mo
+share/locale/nl/LC_MESSAGES/d4x.mo
 share/locale/pl/LC_MESSAGES/d4x.mo
 share/locale/pt_BR/LC_MESSAGES/d4x.mo
 share/locale/ru/LC_MESSAGES/d4x.mo
@@ -285,6 +297,7 @@ share/locale/zh_CN/LC_MESSAGES/d4x.mo
 @dirrm %%DATADIR%%/themes/nuvola32
 @dirrm %%DATADIR%%/themes/gnomeria/toolbar
 @dirrm %%DATADIR%%/themes/gnomeria/queue
+@dirrm %%DATADIR%%/themes/gnomeria/log
 @dirrm %%DATADIR%%/themes/gnomeria/buttons
 @dirrm %%DATADIR%%/themes/gnomeria
 @dirrm %%DATADIR%%/themes/gnome/toolbar