From owner-freebsd-ports Tue Sep 28 8:10:11 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 64F2215567 for ; Tue, 28 Sep 1999 08:10:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id IAA67777; Tue, 28 Sep 1999 08:10:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from wproxy2.nctu.edu.tw (w3-cache2.NCTU.edu.tw [163.28.64.112]) by hub.freebsd.org (Postfix) with ESMTP id 9E8D014A13 for ; Tue, 28 Sep 1999 08:06:35 -0700 (PDT) (envelope-from ijliao@Terry.Dorm8.NCTU.edu.tw) Received: from Terry.Dorm8.NCTU.edu.tw (IDENT:ijliao@Terry.Dorm8.NCTU.edu.tw [140.113.93.99]) by wproxy2.nctu.edu.tw (8.9.3/8.9.3) with ESMTP id XAA16264 for ; Tue, 28 Sep 1999 23:06:36 +0800 (CST) Received: (from ijliao@localhost) by Terry.Dorm8.NCTU.edu.tw (8.9.3/8.9.3) id XAA13000; Tue, 28 Sep 1999 23:06:33 +0800 (CST) (envelope-from ijliao) Message-Id: <199909281506.XAA13000@Terry.Dorm8.NCTU.edu.tw> Date: Tue, 28 Sep 1999 23:06:33 +0800 (CST) From: Ying-Chieh Liao Reply-To: ijliao@Terry.Dorm8.NCTU.edu.tw To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/14017: update ports : ftp/download to 1.0 beta 5 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 14017 >Category: ports >Synopsis: update ports : ftp/download to 1.0 beta 5 >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 Sep 28 08:10:00 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 #4: Thu Sep 9 22:18:46 CST 1999 root@:/usr/src/sys/compile/TERRY i386 >Description: update ports download from 1.0 beta 2 to 1.0 beta 5 >How-To-Repeat: >Fix: diff -ruN /usr/ports/ftp/downloader/Makefile downloader/Makefile --- /usr/ports/ftp/downloader/Makefile Fri Aug 27 07:08:20 1999 +++ downloader/Makefile Tue Sep 28 21:30:06 1999 @@ -6,8 +6,8 @@ # $FreeBSD: ports/ftp/downloader/Makefile,v 1.6 1999/08/26 23:08:20 cpiazza Exp $ # -DISTNAME= nt-1.0-BETA2 -PKGNAME= downloader-1.0b2 +DISTNAME= nt-1.05-BETA +PKGNAME= downloader-1.0b5 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 Fri Aug 27 07:08:21 1999 +++ downloader/files/md5 Tue Sep 28 22:37:33 1999 @@ -1 +1 @@ -MD5 (nt-1.0-BETA2.tar.gz) = 1c7ae8178c84bdad4282a475183e652b +MD5 (nt-1.05-BETA.tar.gz) = d2d9a71bf103f4e9d6336ee1e0904557 diff -ruN /usr/ports/ftp/downloader/patches/patch-aa downloader/patches/patch-aa --- /usr/ports/ftp/downloader/patches/patch-aa Fri Aug 27 07:08:22 1999 +++ downloader/patches/patch-aa Tue Sep 28 22:42:02 1999 @@ -1,19 +1,22 @@ ---- Makefile.orig Fri Aug 20 22:50:56 1999 -+++ Makefile Thu Aug 26 14:46:36 1999 -@@ -1,10 +1,10 @@ +--- Makefile.orig Tue Sep 28 22:40:25 1999 ++++ Makefile Tue Sep 28 22:41:24 1999 +@@ -1,13 +1,13 @@ -CC = gcc -CCPLUS = c++ +CC ?= gcc -+CCPLUS = ${CXX} ++CCPLUS = ${CXX} + NLS=-DENABLE_NLS # Remove or comment this line to disable gettext + DEST=/usr/local + LOCALEDIR=$(DEST)/share/locale -LIBS=-lpthread --CFLAGS=-Wall -O2 +-CFLAGS=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -GTKLIBS=`gtk-config --libs` -GTKFLAGS=`gtk-config --cflags` +LIBS=-pthread -+CFLAGS+=-Wall ++CFLAGS+=-Wall -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS +GTKLIBS=`gtk12-config --libs` +GTKFLAGS=`gtk12-config --cflags` - EXECC=$(CCPLUS) $(CFLAGS) $(GTKFLAGS) + EXECC=$(CCPLUS) $(CFLAGS) $(GTKFLAGS) $(NLS) -DLOCALE=\"${LOCALEDIR}\" diff -ruN /usr/ports/ftp/downloader/patches/patch-ad downloader/patches/patch-ad --- /usr/ports/ftp/downloader/patches/patch-ad Fri Aug 27 07:08:22 1999 +++ downloader/patches/patch-ad Tue Sep 28 22:45:53 1999 @@ -1,11 +1,15 @@ ---- socket.cc.orig Tue Jun 8 09:07:49 1999 -+++ socket.cc Wed Jun 23 00:54:19 1999 -@@ -36,14 +36,14 @@ +--- socket.cc.orig Tue Sep 28 22:44:21 1999 ++++ socket.cc Tue Sep 28 22:45:20 1999 +@@ -36,6 +36,7 @@ char buff[MAX_LEN]; hostent *hpr; int rval; +/* - gethostbyname_r(host,&hp,buff,MAX_LEN,&hpr,&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); - /* diff -ruN /usr/ports/ftp/downloader/patches/patch-ae downloader/patches/patch-ae --- /usr/ports/ftp/downloader/patches/patch-ae Fri Aug 27 07:08:23 1999 +++ downloader/patches/patch-ae Tue Sep 28 22:48:18 1999 @@ -1,9 +1,9 @@ ---- face/Makefile.orig Thu Aug 12 05:38:08 1999 -+++ face/Makefile Thu Aug 26 16:04:12 1999 +--- face/Makefile.orig Tue Sep 28 22:47:01 1999 ++++ face/Makefile Tue Sep 28 22:47:40 1999 @@ -1,7 +1,7 @@ -CCPLUS = c++ -+CCPLUS = ${CXX} - EXECC=$(CCPLUS) ++CCPLUS = ${CXX} + EXECC=$(CCPLUS) $(NLS) -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 Fri Aug 27 07:08:23 1999 +++ downloader/patches/patch-af Tue Sep 28 23:00:20 1999 @@ -1,54 +1,54 @@ ---- face/lmenu.cc.orig Sat Aug 14 15:15:53 1999 -+++ face/lmenu.cc Wed Aug 25 10:59:45 1999 -@@ -70,7 +70,7 @@ - GtkAccelGroup *accel_group=gtk_accel_group_new(); - gtk_accel_group_attach(accel_group,GTK_OBJECT(ListMenu)); +--- face/lmenu.cc.orig Tue Sep 28 22:50:35 1999 ++++ face/lmenu.cc Tue Sep 28 22:54:43 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,accel_group); -+ menu_item=make_menu_item("View log",(char*)NULL,pixmap,bitmap,accel_group); +- 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); -@@ -83,7 +83,7 @@ +@@ -79,7 +79,7 @@ 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,accel_group); -+ menu_item=make_menu_item("Continue downloads",(char*)NULL,pixmap,bitmap,accel_group); +- 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); -@@ -92,7 +92,7 @@ +@@ -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","E",NULL,NULL,accel_group); -+ menu_item=make_menu_item("Properties","E",(GdkPixmap *)NULL,(GdkBitmap *)NULL,accel_group); +- 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); -@@ -104,13 +104,13 @@ +@@ -100,13 +100,13 @@ 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,accel_group); -+ menu_item=make_menu_item("Delete completed",(char*)NULL,pixmap,bitmap,accel_group); +- 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,accel_group); -+ menu_item=make_menu_item("Delete failed",(char*)NULL,(GdkPixmap *)NULL,(GdkBitmap *)NULL,accel_group); +- 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); -@@ -132,7 +132,7 @@ +@@ -128,7 +128,7 @@ 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,accel_group); -+ menu_item=make_menu_item("Set limitation",(char*)NULL,(GdkPixmap *)NULL,(GdkBitmap *)NULL,accel_group); +- 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