From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Apr 10 16:10:51 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2344316A408 for ; Mon, 10 Apr 2006 16:10:51 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 28B5A43D6D for ; Mon, 10 Apr 2006 16:10:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k3AGALvG020803 for ; Mon, 10 Apr 2006 16:10:21 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3AGALuC020801; Mon, 10 Apr 2006 16:10:21 GMT (envelope-from gnats) Resent-Date: Mon, 10 Apr 2006 16:10:21 GMT Resent-Message-Id: <200604101610.k3AGALuC020801@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2E9AE16A413 for ; Mon, 10 Apr 2006 16:01:30 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from nm05omta057.dion.ne.jp (nm05mta.dion.ne.jp [219.125.112.7]) by mx1.FreeBSD.org (Postfix) with SMTP id 6444143D91 for ; Mon, 10 Apr 2006 16:01:15 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from localhost ([61.198.243.170]) by nm05mta.dion.ne.jp id <20060411010112086.MA69.8119408@nm05mta.dion.ne.jp>; Tue, 11 Apr 2006 01:01:12 +0900 Message-Id: <20060411010022.2d090829.tkato432@yahoo.com> Date: Tue, 11 Apr 2006 01:00:22 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/95593: Update port: ftp/downloader to 2.5.7 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 16:10:51 -0000 >Number: 95593 >Category: ports >Synopsis: Update port: ftp/downloader to 2.5.7 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Apr 10 16:10:20 GMT 2006 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.11-RELEASE-p15 i386 >Organization: >Environment: >Description: - Update to version 2.5.7 New file: files./patch-main__ftpd.cc files./patch-main__httpd.cc Remove file: files./patch-main__sndserv.cc >How-To-Repeat: >Fix: diff -urN /usr/ports/ftp/downloader/Makefile ftp/downloader/Makefile --- /usr/ports/ftp/downloader/Makefile Sat Nov 5 20:49:17 2005 +++ ftp/downloader/Makefile Tue Apr 11 00:35:50 2006 @@ -7,32 +7,41 @@ # 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 .if ${ARCH} == "sparc64" @@ -56,6 +65,10 @@ s|params\.clear()|params = ""|g ; \ s|tag\.clear()|tag = ""|g ; \ s|path\.clear()|path = ""|g' ${WRKSRC}/${file} +.endfor +.for file in main/filter.h + @${REINPLACE_CMD} -e 's|||g ; \ + s|||g' ${WRKSRC}/${file} .endfor .endif diff -urN /usr/ports/ftp/downloader/distinfo ftp/downloader/distinfo --- /usr/ports/ftp/downloader/distinfo Fri Nov 25 13:34:36 2005 +++ ftp/downloader/distinfo Mon Apr 10 12:43:46 2006 @@ -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 -urN /usr/ports/ftp/downloader/files/patch-main__ftpd.cc ftp/downloader/files/patch-main__ftpd.cc --- /usr/ports/ftp/downloader/files/patch-main__ftpd.cc Thu Jan 1 09:00:00 1970 +++ ftp/downloader/files/patch-main__ftpd.cc Mon Apr 10 13:48:50 2006 @@ -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 -urN /usr/ports/ftp/downloader/files/patch-main__httpd.cc ftp/downloader/files/patch-main__httpd.cc --- /usr/ports/ftp/downloader/files/patch-main__httpd.cc Thu Jan 1 09:00:00 1970 +++ ftp/downloader/files/patch-main__httpd.cc Mon Apr 10 13:48:01 2006 @@ -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 -urN /usr/ports/ftp/downloader/files/patch-main__sndserv.cc ftp/downloader/files/patch-main__sndserv.cc --- /usr/ports/ftp/downloader/files/patch-main__sndserv.cc Sun Oct 2 00:30:46 2005 +++ ftp/downloader/files/patch-main__sndserv.cc Thu Jan 1 09:00:00 1970 @@ -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 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 -urN /usr/ports/ftp/downloader/pkg-plist ftp/downloader/pkg-plist --- /usr/ports/ftp/downloader/pkg-plist Wed Nov 2 22:11:21 2005 +++ ftp/downloader/pkg-plist Mon Apr 10 14:59:42 2006 @@ -77,6 +77,7 @@ %%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 @@ %%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/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 @@ @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 >Release-Note: >Audit-Trail: >Unformatted: