Date: Thu, 25 Nov 1999 18:38:02 -0800 (PST) From: lioux@linf.unb.br To: freebsd-gnats-submit@freebsd.org Subject: ports/15094: Updated port to ftp/downloader to version 1.07.1 Message-ID: <19991126023802.A05A714F7D@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 15094 >Category: ports >Synopsis: Updated port to ftp/downloader to version 1.07.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Nov 25 18:40:00 PST 1999 >Closed-Date: >Last-Modified: >Originator: Mario Ferreira >Release: 3.3-Stable >Organization: >Environment: FreeBSD Home.here 3.3-STABLE FreeBSD 3.3-STABLE #1: Thu Nov 18 00:18:50 GMT 1999 lioux@home.here:/usr/src/sys/compile/LIOUX i386 >Description: Updated the port to the latest software release, reworked the old patches so as to hopefully make them transparent across plataforms (Linux and BSD). However, the Makefile patches (patch-aa & patch-ab) are not portable. I also added the .mo installation. The patches have been sent to the author but it is almost certain they won't be commited untill the next release, so ... The number of patch files has been maintained [aa-af]. >How-To-Repeat: >Fix: diff -ruN downloader.OLD/Makefile downloader/Makefile --- downloader.OLD/Makefile Mon Oct 25 20:39:45 1999 +++ downloader/Makefile Fri Nov 26 00:08:48 1999 @@ -1,13 +1,13 @@ # New ports collection makefile for: downloader -# Version required: 1.0b2 +# Version required: 1.0b2 # Date Created: 23 June 1999 # Whom: Ying-Chieh Liao <ijliao@csie.nctu.edu.tw> # # $FreeBSD: ports/ftp/downloader/Makefile,v 1.8 1999/10/25 20:39:45 mharo Exp $ # -DISTNAME= nt-1.06 -PKGNAME= downloader-1.06 +DISTNAME= nt-1.07.1 +PKGNAME= downloader-1.07.1 CATEGORIES= ftp MASTER_SITES= http://www.krasu.ru/soft/chuchelo/files/ @@ -16,8 +16,5 @@ LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 WRKSRC= ${WRKDIR}/${DISTNAME}/main - -do-install: - cd ${WRKSRC}; ${INSTALL_PROGRAM} nt ${PREFIX}/bin .include <bsd.port.mk> diff -ruN downloader.OLD/files/md5 downloader/files/md5 --- downloader.OLD/files/md5 Mon Oct 25 20:39:47 1999 +++ downloader/files/md5 Sun Nov 14 16:43:05 1999 @@ -1 +1 @@ -MD5 (nt-1.06.tar.gz) = 8cda42fd02b074bc5af601b0b803059b +MD5 (nt-1.07.1.tar.gz) = 85b8152bd1cf7186533cf23c527239b5 diff -ruN downloader.OLD/patches/patch-aa downloader/patches/patch-aa --- downloader.OLD/patches/patch-aa Sat Oct 2 16:52:49 1999 +++ downloader/patches/patch-aa Thu Nov 25 23:47:47 1999 @@ -1,20 +1,21 @@ ---- Makefile.orig Tue Sep 28 22:40:25 1999 -+++ Makefile Tue Sep 28 22:41:24 1999 +diff -ru ./Makefile ../../nt-1.07.1/main/Makefile +--- ./Makefile Wed Nov 3 05:20:49 1999 ++++ ../../nt-1.07.1/main/Makefile Thu Nov 25 22:18:21 1999 @@ -1,13 +1,13 @@ -CC = gcc -CCPLUS = c++ -+CC ?= gcc -+CCPLUS = ${CXX} ++CC = $(CC) ++CCPLUS = $(CXX) NLS=-DENABLE_NLS # Remove or comment this line to disable gettext - DEST=/usr/local +-DEST=/usr/local ++DEST=$(PREFIX) LOCALEDIR=$(DEST)/share/locale -LIBS=-lpthread --CFLAGS=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS ++LIBS=-pthread + CFLAGS=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -GTKLIBS=`gtk-config --libs` -GTKFLAGS=`gtk-config --cflags` -+LIBS=-pthread -+CFLAGS+=-Wall -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS +GTKLIBS=`gtk12-config --libs` +GTKFLAGS=`gtk12-config --cflags` diff -ruN downloader.OLD/patches/patch-ab downloader/patches/patch-ab --- downloader.OLD/patches/patch-ab Thu Aug 26 23:08:22 1999 +++ downloader/patches/patch-ab Thu Nov 25 23:48:15 1999 @@ -1,11 +1,18 @@ ---- log.cc.orig Thu Jun 3 14:24:11 1999 -+++ log.cc Wed Jun 23 00:38:00 1999 -@@ -15,7 +15,7 @@ - //for messages queue - #include <sys/types.h> - #include <sys/ipc.h> --#include <sys/msg.h> -+#include <sys/msgbuf.h> +diff -ru ./face/Makefile ../../nt-1.07.1/main/face/Makefile +--- ./face/Makefile Wed Nov 3 05:20:58 1999 ++++ ../../nt-1.07.1/main/face/Makefile Thu Nov 25 22:18:21 1999 +@@ -1,10 +1,10 @@ +-DEST=/usr/local ++DEST=$(PREFIX) + LOCALEDIR=$(DEST)/share/locale +-CCPLUS = c++ ++CCPLUS = $(CXX) + 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` ++GTKLIBS=`gtk12-config --libs` - #include "dlist.h" - #include "face/log.h" + all:list.o colors.o addd.o graph.o edit.o log.o prefs.o lmenu.o buttons.o about.o saveload.o \ + limface.o misc.o lod.o columns.o dndtrash.o diff -ruN downloader.OLD/patches/patch-ac downloader/patches/patch-ac --- downloader.OLD/patches/patch-ac Mon Nov 1 22:17:30 1999 +++ downloader/patches/patch-ac Thu Nov 25 22:38:10 1999 @@ -1,26 +1,34 @@ ---- 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 <sys/time.h> - #include <unistd.h> - #include <fcntl.h> - #include <stdio.h> -@@ -861,9 +861,9 @@ - }; +diff -ru ./face/lmenu.cc ../../nt-1.07.1/main/face/lmenu.cc +--- ./face/lmenu.cc Mon Oct 18 05:04:55 1999 ++++ ../../nt-1.07.1/main/face/lmenu.cc Thu Nov 25 22:18:21 1999 +@@ -8,6 +8,10 @@ + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ ++#if (defined(__unix__) || defined(unix)) && !defined(USG) ++#include <sys/param.h> ++#endif ++ + #include "list.h" + #include "lmenu.h" + #include "misc.h" +@@ -106,7 +110,8 @@ + gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(ask_delete_completed_downloads),NULL); - 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); - }; - void tMain::speed() { +- menu_item=make_menu_item(_("Delete failed"),(char *)NULL,NULL,NULL); ++ menu_item=make_menu_item(_("Delete failed"),(char *)NULL,(GdkPixmap *)NULL,(GdkPixmap *)NULL); ++ gtk_menu_append(GTK_MENU(ListMenu),menu_item); + 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 +133,8 @@ + 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"),(char *)NULL,NULL,NULL); ++ menu_item=make_menu_item(_("Set limitation"),(char *)NULL,(GdkPixmap *)NULL,(GdkPixmap *)NULL); ++ gtk_menu_append(GTK_MENU(ListMenu),menu_item); + 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); diff -ruN downloader.OLD/patches/patch-ad downloader/patches/patch-ad --- downloader.OLD/patches/patch-ad Mon Nov 1 22:17:30 1999 +++ downloader/patches/patch-ad Thu Nov 25 22:38:56 1999 @@ -1,23 +1,25 @@ ---- 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; -+/* - #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); -- /* -+*/ - 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 -ru ./log.cc ../../nt-1.07.1/main/log.cc +--- ./log.cc Sun Oct 24 10:00:39 1999 ++++ ../../nt-1.07.1/main/log.cc Thu Nov 25 22:18:21 1999 +@@ -9,13 +9,21 @@ + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + ++#if (defined(__unix__) || defined(unix)) && !defined(USG) ++#include <sys/param.h> ++#endif ++ + #include "log.h" + #include <time.h> + #include <stdio.h> + //for messages queue + #include <sys/types.h> + #include <sys/ipc.h> ++#if (defined(BSD) && (BSD >= 199306)) ++#include <sys/msgbuf.h> ++#else + #include <sys/msg.h> ++#endif + + #include "dlist.h" + #include "face/log.h" diff -ruN downloader.OLD/patches/patch-ae downloader/patches/patch-ae --- downloader.OLD/patches/patch-ae Mon Nov 1 22:17:36 1999 +++ downloader/patches/patch-ae Thu Nov 25 22:39:37 1999 @@ -1,14 +1,40 @@ ---- 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} - 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` -+GTKLIBS=`gtk12-config --libs` +diff -ru ./main.cc ../../nt-1.07.1/main/main.cc +--- ./main.cc Thu Nov 4 10:28:18 1999 ++++ ../../nt-1.07.1/main/main.cc Thu Nov 25 22:18:21 1999 +@@ -9,11 +9,20 @@ + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ - all:list.o colors.o addd.o graph.o edit.o log.o prefs.o lmenu.o buttons.o about.o saveload.o \ - limface.o misc.o ++#if (defined(__unix__) || defined(unix)) && !defined(USG) ++#include <sys/param.h> ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/ipc.h> ++#if (defined(BSD) && (BSD >= 199306)) ++#include <sys/msgbuf.h> ++#include <sys/time.h> ++#else + #include <sys/msg.h> + #include <sys/timeb.h> ++#endif + #include <unistd.h> + #include <fcntl.h> + #include <stdio.h> +@@ -865,9 +874,15 @@ + }; + + unsigned int tMain::get_precise_time(){ ++#if (defined(BSD) && (BSD >= 199306)) ++ struct timeval tp; ++ gettimeofday(&tp, NULL); ++ return(tp.tv_sec*1000+tp.tv_usec); ++#else + struct timeb tp; + ftime(&tp); + return(tp.time*1000+tp.millitm); ++#endif + }; + + void tMain::speed() { diff -ruN downloader.OLD/patches/patch-af downloader/patches/patch-af --- downloader.OLD/patches/patch-af Mon Nov 1 22:17:36 1999 +++ downloader/patches/patch-af Thu Nov 25 22:39:46 1999 @@ -1,45 +1,36 @@ ---- 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); -@@ -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); -+ 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); - - 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); -@@ -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); -+ 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); +diff -ru ./socket.cc ../../nt-1.07.1/main/socket.cc +--- ./socket.cc Thu Nov 4 02:49:09 1999 ++++ ../../nt-1.07.1/main/socket.cc Thu Nov 25 22:18:21 1999 +@@ -9,6 +9,10 @@ + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + ++#if (defined(__unix__) || defined(unix)) && !defined(USG) ++#include <sys/param.h> ++#endif ++ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +@@ -37,6 +41,7 @@ + if (!buffer) buffer=new char[MAX_LEN]; + hostent *hpr=&hp; + temp_variable=0; ++#if !(defined(BSD) && (BSD >= 199306)) + #ifdef __sparc__ + gethostbyname_r(host,&hp,buffer,MAX_LEN,&temp_variable); + #else +@@ -44,11 +49,11 @@ + #endif + if (temp_variable) return -1; + memcpy((char *)&info.sin_addr,(char *)hpr->h_addr,hpr->h_length); +- /* ++#else /* !(defined(BSD) && (BSD >= 199306)) */ + hostent *hp=gethostbyname(host); + if (!hp) return -1; + memcpy((char *)&info.sin_addr,(char *)hp->h_addr,hp->h_length); +- */ ++#endif /* !(defined(BSD) && (BSD >= 199306)) */ + } else info.sin_addr.s_addr=INADDR_ANY; + info.sin_port=htons(port); + return sizeof(info); diff -ruN downloader.OLD/pkg/PLIST downloader/pkg/PLIST --- downloader.OLD/pkg/PLIST Wed Jun 23 00:43:50 1999 +++ downloader/pkg/PLIST Thu Nov 25 23:44:14 1999 @@ -1 +1,12 @@ bin/nt +share/locale/bg/LC_MESSAGES/nt.mo +share/locale/de/LC_MESSAGES/nt.mo +share/locale/es/LC_MESSAGES/nt.mo +share/locale/fr/LC_MESSAGES/nt.mo +share/locale/id/LC_MESSAGES/nt.mo +share/locale/it/LC_MESSAGES/nt.mo +share/locale/ja/LC_MESSAGES/nt.mo +share/locale/nl/LC_MESSAGES/nt.mo +share/locale/pt_BR/LC_MESSAGES/nt.mo +share/locale/ru/LC_MESSAGES/nt.mo +share/locale/zh_CN.EUC/LC_MESSAGES/nt.mo >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?19991126023802.A05A714F7D>