Date: Wed, 20 Oct 1999 03:23:19 +0800 (CST) From: Ying-Chieh Liao <ijliao@Terry.Dorm8.NCTU.edu.tw> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/14424: update ports: ftp/download to 1.06 Message-ID: <199910191923.DAA13717@Terry.Dorm8.NCTU.edu.tw>
next in thread | raw e-mail | index | archive | help
>Number: 14424 >Category: ports >Synopsis: update ports: ftp/download to 1.06 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Oct 19 12:30:01 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Ying-Chieh Liao >Release: FreeBSD 4.0-CURRENT i386 >Organization: NCTU CSIE >Environment: FreeBSD Terry.Dorm8.NCTU.edu.tw 4.0-CURRENT FreeBSD 4.0-CURRENT #6: Mon Oct 18 23:07:37 CST 1999 root@Terry.Dorm8.NCTU.edu.tw:/usr/src/sys/compile/TERRY i386 >Description: update ftp/download from 1.0beta5 to 1.0.6 >How-To-Repeat: >Fix: diff -ruN /usr/ports/ftp/downloader/Makefile downloader/Makefile --- /usr/ports/ftp/downloader/Makefile Tue Oct 5 21:16:41 1999 +++ downloader/Makefile Tue Oct 19 12:16:30 1999 @@ -6,8 +6,8 @@ # $FreeBSD: ports/ftp/downloader/Makefile,v 1.7 1999/10/02 16:52:48 cpiazza Exp $ # -DISTNAME= nt-1.05-BETA -PKGNAME= downloader-1.0b5 +DISTNAME= nt-1.06 +PKGNAME= downloader-1.06 CATEGORIES= ftp MASTER_SITES= http://www.krasu.ru/soft/chuchelo/ diff -ruN /usr/ports/ftp/downloader/files/md5 downloader/files/md5 --- /usr/ports/ftp/downloader/files/md5 Tue Oct 5 21:16:41 1999 +++ downloader/files/md5 Tue Oct 19 12:16:54 1999 @@ -1 +1 @@ -MD5 (nt-1.05-BETA.tar.gz) = d2d9a71bf103f4e9d6336ee1e0904557 +MD5 (nt-1.06.tar.gz) = 8cda42fd02b074bc5af601b0b803059b diff -ruN /usr/ports/ftp/downloader/patches/patch-ac downloader/patches/patch-ac --- /usr/ports/ftp/downloader/patches/patch-ac Fri Aug 27 07:08:22 1999 +++ downloader/patches/patch-ac Wed Oct 20 03:14:49 1999 @@ -1,11 +1,26 @@ ---- main.cc.orig Sat Aug 21 11:46:05 1999 -+++ main.cc Wed Aug 25 10:48:22 1999 -@@ -16,7 +16,7 @@ - #include <stdio.h> - #include <string.h> +--- main.cc.orig Wed Oct 20 03:12:39 1999 ++++ main.cc Wed Oct 20 03:14:32 1999 +@@ -12,8 +12,8 @@ + #include <sys/types.h> + #include <sys/stat.h> #include <sys/ipc.h> -#include <sys/msg.h> +-#include <sys/timeb.h> +#include <sys/msgbuf.h> - #include <errno.h> ++#include <sys/time.h> + #include <unistd.h> + #include <fcntl.h> + #include <stdio.h> +@@ -861,9 +861,9 @@ + }; + + unsigned int tMain::get_precise_time(){ +- struct timeb tp; +- ftime(&tp); +- return(tp.time*1000+tp.millitm); ++ struct timeval tp; ++ gettimeofday(&tp, NULL); ++ return(tp.tv_sec*1000+tp.tv_usec); + }; - #include "var.h" + void tMain::speed() { diff -ruN /usr/ports/ftp/downloader/patches/patch-ad downloader/patches/patch-ad --- /usr/ports/ftp/downloader/patches/patch-ad Tue Oct 5 21:16:41 1999 +++ downloader/patches/patch-ad Wed Oct 20 02:45:17 1999 @@ -1,23 +1,23 @@ ---- socket.cc.orig Tue Sep 28 22:44:21 1999 -+++ socket.cc Tue Sep 28 22:45:20 1999 +--- socket.cc.orig Wed Oct 20 02:44:18 1999 ++++ socket.cc Wed Oct 20 02:45:01 1999 @@ -36,6 +36,7 @@ - char buff[MAX_LEN]; - hostent *hpr; - int rval; + char buff[MAX_LEN]; + hostent *hpr; + int rval; +/* #ifdef __sparc__ gethostbyname_r(host,hpr,buff,MAX_LEN,&rval); #else @@ -43,11 +44,10 @@ #endif - if (rval) return -1; - memcpy((char *)&info.sin_addr,(char *)hpr->h_addr,hpr->h_length); -- /* + if (rval) return -1; + memcpy((char *)&info.sin_addr,(char *)hpr->h_addr,hpr->h_length); +- /* +*/ - hostent *hp=gethostbyname(host); - if (!hp) return -1; - memcpy((char *)&info.sin_addr,(char *)hp->h_addr,hp->h_length); -- */ - } else info.sin_addr.s_addr=INADDR_ANY; - info.sin_port=htons(port); - return sizeof(info); + hostent *hp=gethostbyname(host); + if (!hp) return -1; + memcpy((char *)&info.sin_addr,(char *)hp->h_addr,hp->h_length); +- */ + } else info.sin_addr.s_addr=INADDR_ANY; + info.sin_port=htons(port); + return sizeof(info); diff -ruN /usr/ports/ftp/downloader/patches/patch-ae downloader/patches/patch-ae --- /usr/ports/ftp/downloader/patches/patch-ae Tue Oct 5 21:16:41 1999 +++ downloader/patches/patch-ae Wed Oct 20 02:54:03 1999 @@ -1,9 +1,10 @@ ---- face/Makefile.orig Tue Sep 28 22:47:01 1999 -+++ face/Makefile Tue Sep 28 22:47:40 1999 -@@ -1,7 +1,7 @@ +--- face/Makefile.orig Wed Oct 20 02:46:13 1999 ++++ face/Makefile Wed Oct 20 02:46:50 1999 +@@ -1,8 +1,8 @@ -CCPLUS = c++ +CCPLUS = ${CXX} - EXECC=$(CCPLUS) $(NLS) + CFLAGS=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS + EXECC=$(CCPLUS) $(CFLAGS) $(GTKFLAGS) $(NLS) -DLOCALE=\"${LOCALEDIR}\" -GTKFLAGS=`gtk-config --cflags` -GTKLIBS=`gtk-config --libs` +GTKFLAGS=`gtk12-config --cflags` diff -ruN /usr/ports/ftp/downloader/patches/patch-af downloader/patches/patch-af --- /usr/ports/ftp/downloader/patches/patch-af Tue Oct 5 21:16:41 1999 +++ downloader/patches/patch-af Wed Oct 20 02:53:27 1999 @@ -1,54 +1,45 @@ ---- face/lmenu.cc.orig Tue Sep 28 22:50:35 1999 -+++ face/lmenu.cc Tue Sep 28 22:54:43 1999 +--- face/lmenu.cc.orig Wed Oct 20 02:49:13 1999 ++++ face/lmenu.cc Wed Oct 20 02:52:39 1999 @@ -66,7 +66,7 @@ - ListMenu=gtk_menu_new(); - pixmap=make_pixmap_from_xpm(&bitmap,logmini_xpm); -- menu_item=make_menu_item(_("View log"),NULL,pixmap,bitmap); -+ menu_item=make_menu_item(_("View log"),(char*)NULL,pixmap,bitmap); - gtk_menu_append(GTK_MENU(ListMenu),menu_item); - ListMenuArray[LM_LOG]=menu_item; - gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(open_log_for_selected),NULL); + ListMenu=gtk_menu_new(); + pixmap=make_pixmap_from_xpm(&bitmap,logmini_xpm); +- menu_item=make_menu_item(_("View log"),NULL,pixmap,bitmap); ++ menu_item=make_menu_item(_("View log"),(char*)NULL,pixmap,bitmap); + gtk_menu_append(GTK_MENU(ListMenu),menu_item); + ListMenuArray[LM_LOG]=menu_item; + gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(open_log_for_selected),NULL); @@ -79,7 +79,7 @@ - gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(stop_downloads),NULL); + gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(stop_downloads),NULL); - pixmap=make_pixmap_from_xpm(&bitmap,runmini_xpm); -- menu_item=make_menu_item(_("Continue downloads"),NULL,pixmap,bitmap); -+ menu_item=make_menu_item(_("Continue downloads"),(char*)NULL,pixmap,bitmap); - gtk_menu_append(GTK_MENU(ListMenu),menu_item); - ListMenuArray[LM_CONTINUE]=menu_item; - gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(continue_downloads),NULL); -@@ -88,7 +88,7 @@ - gtk_widget_set_sensitive(menu_item,FALSE); - gtk_menu_append(GTK_MENU(ListMenu),menu_item); - -- menu_item=make_menu_item(_("Properties"),"Alt+E",NULL,NULL); -+ menu_item=make_menu_item(_("Properties"),"Alt+E",(GdkPixmap*)NULL,(GdkBitmap*)NULL); - gtk_menu_append(GTK_MENU(ListMenu),menu_item); - ListMenuArray[LM_EDIT]=menu_item; - gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(open_edit_for_selected),NULL); + pixmap=make_pixmap_from_xpm(&bitmap,runmini_xpm); +- menu_item=make_menu_item(_("Continue downloads"),NULL,pixmap,bitmap); ++ menu_item=make_menu_item(_("Continue downloads"),(char*)NULL,pixmap,bitmap); + gtk_menu_append(GTK_MENU(ListMenu),menu_item); + ListMenuArray[LM_CONTINUE]=menu_item; + gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(continue_downloads),NULL); @@ -100,13 +100,13 @@ - gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(ask_delete_download),NULL); + gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(ask_delete_download),NULL); - pixmap=make_pixmap_from_xpm(&bitmap,delcommini_xpm); -- menu_item=make_menu_item(_("Delete completed"),NULL,pixmap,bitmap); -+ menu_item=make_menu_item(_("Delete completed"),(char*)NULL,pixmap,bitmap); - gtk_menu_append(GTK_MENU(ListMenu),menu_item); - ListMenuArray[LM_DELC]=menu_item; - gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(ask_delete_completed_downloads),NULL); + pixmap=make_pixmap_from_xpm(&bitmap,delcommini_xpm); +- menu_item=make_menu_item(_("Delete completed"),NULL,pixmap,bitmap); ++ menu_item=make_menu_item(_("Delete completed"),(char*)NULL,pixmap,bitmap); + gtk_menu_append(GTK_MENU(ListMenu),menu_item); + ListMenuArray[LM_DELC]=menu_item; + gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(ask_delete_completed_downloads),NULL); -- menu_item=make_menu_item(_("Delete failed"),NULL,NULL,NULL); -+ menu_item=make_menu_item(_("Delete failed"),(char*)NULL,(GdkPixmap*)NULL,(GdkBitmap*)NULL); - gtk_menu_append(GTK_MENU(ListMenu),menu_item); - ListMenuArray[LM_DELF]=menu_item; - gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(ask_delete_fataled_downloads),NULL); +- menu_item=make_menu_item(_("Delete failed"),NULL,NULL,NULL); ++ menu_item=make_menu_item(_("Delete failed"),(char*)NULL,(GdkPixmap*)NULL,(GdkBitmap*)NULL); + gtk_menu_append(GTK_MENU(ListMenu),menu_item); + ListMenuArray[LM_DELF]=menu_item; + gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(ask_delete_fataled_downloads),NULL); @@ -128,7 +128,7 @@ - ListMenuArray[LM_MOVEDOWN]=menu_item; - gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(move_download_down),NULL); + ListMenuArray[LM_MOVEDOWN]=menu_item; + gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(move_download_down),NULL); -- menu_item=make_menu_item(_("Set limitation"),NULL,NULL,NULL); -+ menu_item=make_menu_item(_("Set limitation"),(char*)NULL,(GdkPixmap*)NULL,(GdkBitmap*)NULL); - gtk_menu_append(GTK_MENU(ListMenu),menu_item); - ListMenuArray[LM_SET_LIMIT]=menu_item; - gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(set_limit_to_download),NULL); +- menu_item=make_menu_item(_("Set limitation"),NULL,NULL,NULL); ++ menu_item=make_menu_item(_("Set limitation"),(char*)NULL,(GdkPixmap*)NULL,(GdkBitmap*)NULL); + gtk_menu_append(GTK_MENU(ListMenu),menu_item); + ListMenuArray[LM_SET_LIMIT]=menu_item; + gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(set_limit_to_download),NULL); >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199910191923.DAA13717>