View | Details | Raw Unified | Return to bug 15094
Collapse All | Expand All

(-)downloader/Makefile (-6 / +3 lines)
Lines 1-13 Link Here
1
# New ports collection makefile for:	downloader
1
# New ports collection makefile for:	downloader
2
# Version required:	1.0b2	
2
# Version required:	1.0b2
3
# Date Created:		23 June 1999
3
# Date Created:		23 June 1999
4
# Whom:			Ying-Chieh Liao <ijliao@csie.nctu.edu.tw>
4
# Whom:			Ying-Chieh Liao <ijliao@csie.nctu.edu.tw>
5
#
5
#
6
# $FreeBSD: ports/ftp/downloader/Makefile,v 1.8 1999/10/25 20:39:45 mharo Exp $
6
# $FreeBSD: ports/ftp/downloader/Makefile,v 1.8 1999/10/25 20:39:45 mharo Exp $
7
#
7
#
8
8
9
DISTNAME=	nt-1.06
9
DISTNAME=	nt-1.07.1
10
PKGNAME=	downloader-1.06
10
PKGNAME=	downloader-1.07.1
11
CATEGORIES=	ftp
11
CATEGORIES=	ftp
12
MASTER_SITES=	http://www.krasu.ru/soft/chuchelo/files/
12
MASTER_SITES=	http://www.krasu.ru/soft/chuchelo/files/
13
13
Lines 16-23 Link Here
16
LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
16
LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
17
17
18
WRKSRC=		${WRKDIR}/${DISTNAME}/main
18
WRKSRC=		${WRKDIR}/${DISTNAME}/main
19
20
do-install:
21
		cd ${WRKSRC}; ${INSTALL_PROGRAM} nt ${PREFIX}/bin
22
19
23
.include <bsd.port.mk>
20
.include <bsd.port.mk>
(-)downloader/files/md5 (-1 / +1 lines)
Line 1 Link Here
1
MD5 (nt-1.06.tar.gz) = 8cda42fd02b074bc5af601b0b803059b
1
MD5 (nt-1.07.1.tar.gz) = 85b8152bd1cf7186533cf23c527239b5
(-)downloader/patches/patch-aa (-8 / +9 lines)
Lines 1-20 Link Here
1
--- Makefile.orig	Tue Sep 28 22:40:25 1999
1
diff -ru ./Makefile ../../nt-1.07.1/main/Makefile
2
+++ Makefile	Tue Sep 28 22:41:24 1999
2
--- ./Makefile	Wed Nov  3 05:20:49 1999
3
+++ ../../nt-1.07.1/main/Makefile	Thu Nov 25 22:18:21 1999
3
@@ -1,13 +1,13 @@
4
@@ -1,13 +1,13 @@
4
-CC = gcc
5
-CC = gcc
5
-CCPLUS = c++
6
-CCPLUS = c++
6
+CC ?= gcc
7
+CC = $(CC)
7
+CCPLUS = ${CXX}
8
+CCPLUS = $(CXX)
8
 
9
 
9
 NLS=-DENABLE_NLS # Remove or comment this line to disable gettext
10
 NLS=-DENABLE_NLS # Remove or comment this line to disable gettext
10
 DEST=/usr/local
11
-DEST=/usr/local
12
+DEST=$(PREFIX)
11
 LOCALEDIR=$(DEST)/share/locale
13
 LOCALEDIR=$(DEST)/share/locale
12
-LIBS=-lpthread
14
-LIBS=-lpthread
13
-CFLAGS=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
15
+LIBS=-pthread
16
 CFLAGS=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
14
-GTKLIBS=`gtk-config --libs`
17
-GTKLIBS=`gtk-config --libs`
15
-GTKFLAGS=`gtk-config --cflags`
18
-GTKFLAGS=`gtk-config --cflags`
16
+LIBS=-pthread
17
+CFLAGS+=-Wall -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
18
+GTKLIBS=`gtk12-config --libs`
19
+GTKLIBS=`gtk12-config --libs`
19
+GTKFLAGS=`gtk12-config --cflags`
20
+GTKFLAGS=`gtk12-config --cflags`
20
 
21
 
(-)downloader/patches/patch-ab (-10 / +17 lines)
Lines 1-11 Link Here
1
--- log.cc.orig	Thu Jun  3 14:24:11 1999
1
diff -ru ./face/Makefile ../../nt-1.07.1/main/face/Makefile
2
+++ log.cc	Wed Jun 23 00:38:00 1999
2
--- ./face/Makefile	Wed Nov  3 05:20:58 1999
3
@@ -15,7 +15,7 @@
3
+++ ../../nt-1.07.1/main/face/Makefile	Thu Nov 25 22:18:21 1999
4
 //for messages queue
4
@@ -1,10 +1,10 @@
5
 #include <sys/types.h>
5
-DEST=/usr/local
6
 #include <sys/ipc.h>
6
+DEST=$(PREFIX)
7
-#include <sys/msg.h>
7
 LOCALEDIR=$(DEST)/share/locale
8
+#include <sys/msgbuf.h>
8
-CCPLUS = c++
9
+CCPLUS = $(CXX)
10
 CFLAGS=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
11
 EXECC=$(CCPLUS) $(CFLAGS) $(GTKFLAGS) $(NLS) -DLOCALE=\"${LOCALEDIR}\"
12
-GTKFLAGS=`gtk-config --cflags`
13
-GTKLIBS=`gtk-config --libs`
14
+GTKFLAGS=`gtk12-config --cflags`
15
+GTKLIBS=`gtk12-config --libs`
9
 
16
 
10
 #include "dlist.h"
17
 all:list.o colors.o addd.o graph.o edit.o log.o prefs.o lmenu.o buttons.o about.o saveload.o \
11
 #include "face/log.h"
18
 limface.o misc.o lod.o columns.o dndtrash.o
(-)downloader/patches/patch-ac (-24 / +32 lines)
Lines 1-26 Link Here
1
--- main.cc.orig	Wed Oct 20 03:12:39 1999
1
diff -ru ./face/lmenu.cc ../../nt-1.07.1/main/face/lmenu.cc
2
+++ main.cc	Wed Oct 20 03:14:32 1999
2
--- ./face/lmenu.cc	Mon Oct 18 05:04:55 1999
3
@@ -12,8 +12,8 @@
3
+++ ../../nt-1.07.1/main/face/lmenu.cc	Thu Nov 25 22:18:21 1999
4
 #include <sys/types.h>
4
@@ -8,6 +8,10 @@
5
 #include <sys/stat.h>
5
  *	but WITHOUT ANY WARRANTY; without even the implied warranty of
6
 #include <sys/ipc.h>
6
  *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
7
-#include <sys/msg.h>
7
  */
8
-#include <sys/timeb.h>
8
+#if (defined(__unix__) || defined(unix)) && !defined(USG)
9
+#include <sys/msgbuf.h>
9
+#include <sys/param.h>
10
+#include <sys/time.h>
10
+#endif
11
 #include <unistd.h>
11
+
12
 #include <fcntl.h>
12
 #include "list.h"
13
 #include <stdio.h>
13
 #include "lmenu.h"
14
@@ -861,9 +861,9 @@
14
 #include "misc.h"
15
 };
15
@@ -106,7 +110,8 @@
16
 	gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(ask_delete_completed_downloads),NULL);
16
 
17
 
17
 unsigned int tMain::get_precise_time(){
18
-	struct timeb tp;
19
-	ftime(&tp);
20
-	return(tp.time*1000+tp.millitm);
21
+	struct timeval tp;
22
+	gettimeofday(&tp, NULL);
23
+	return(tp.tv_sec*1000+tp.tv_usec);
24
 };
25
 
18
 
26
 void tMain::speed() {
19
-	menu_item=make_menu_item(_("Delete failed"),(char *)NULL,NULL,NULL);
20
+	menu_item=make_menu_item(_("Delete failed"),(char *)NULL,(GdkPixmap *)NULL,(GdkPixmap *)NULL);
21
+ 	gtk_menu_append(GTK_MENU(ListMenu),menu_item);
22
 	gtk_menu_append(GTK_MENU(ListMenu),menu_item);
23
 	ListMenuArray[LM_DELF]=menu_item;
24
 	gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(ask_delete_fataled_downloads),NULL);
25
@@ -128,7 +133,8 @@
26
 	ListMenuArray[LM_MOVEDOWN]=menu_item;
27
 	gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(move_download_down),NULL);
28
 
29
-	menu_item=make_menu_item(_("Set limitation"),(char *)NULL,NULL,NULL);
30
+	menu_item=make_menu_item(_("Set limitation"),(char *)NULL,(GdkPixmap *)NULL,(GdkPixmap *)NULL);
31
+ 	gtk_menu_append(GTK_MENU(ListMenu),menu_item);
32
 	gtk_menu_append(GTK_MENU(ListMenu),menu_item);
33
 	ListMenuArray[LM_SET_LIMIT]=menu_item;
34
 	gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(set_limit_to_download),NULL);
(-)downloader/patches/patch-ad (-23 / +25 lines)
Lines 1-23 Link Here
1
--- socket.cc.orig	Wed Oct 20 02:44:18 1999
1
diff -ru ./log.cc ../../nt-1.07.1/main/log.cc
2
+++ socket.cc	Wed Oct 20 02:45:01 1999
2
--- ./log.cc	Sun Oct 24 10:00:39 1999
3
@@ -36,6 +36,7 @@
3
+++ ../../nt-1.07.1/main/log.cc	Thu Nov 25 22:18:21 1999
4
 		char buff[MAX_LEN];
4
@@ -9,13 +9,21 @@
5
 		hostent *hpr;
5
  *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
6
 		int rval;
6
  */
7
+/*
7
 
8
 #ifdef __sparc__
8
+#if (defined(__unix__) || defined(unix)) && !defined(USG)
9
 		gethostbyname_r(host,hpr,buff,MAX_LEN,&rval);
9
+#include <sys/param.h>
10
 #else
10
+#endif
11
@@ -43,11 +44,10 @@
11
+
12
 #endif
12
 #include "log.h"
13
 		if (rval) return -1;
13
 #include <time.h>
14
 		memcpy((char *)&info.sin_addr,(char *)hpr->h_addr,hpr->h_length);
14
 #include <stdio.h>
15
-		/*
15
 //for messages queue
16
+*/
16
 #include <sys/types.h>
17
 		hostent *hp=gethostbyname(host);
17
 #include <sys/ipc.h>
18
 		if (!hp) return -1;
18
+#if (defined(BSD) && (BSD >= 199306))
19
 		memcpy((char *)&info.sin_addr,(char *)hp->h_addr,hp->h_length);
19
+#include <sys/msgbuf.h>
20
-		*/
20
+#else
21
 	} else info.sin_addr.s_addr=INADDR_ANY;
21
 #include <sys/msg.h>
22
 	info.sin_port=htons(port);
22
+#endif
23
 	return sizeof(info);
23
 
24
 #include "dlist.h"
25
 #include "face/log.h"
(-)downloader/patches/patch-ae (-13 / +39 lines)
Lines 1-14 Link Here
1
--- face/Makefile.orig	Wed Oct 20 02:46:13 1999
1
diff -ru ./main.cc ../../nt-1.07.1/main/main.cc
2
+++ face/Makefile	Wed Oct 20 02:46:50 1999
2
--- ./main.cc	Thu Nov  4 10:28:18 1999
3
@@ -1,8 +1,8 @@
3
+++ ../../nt-1.07.1/main/main.cc	Thu Nov 25 22:18:21 1999
4
-CCPLUS = c++
4
@@ -9,11 +9,20 @@
5
+CCPLUS = ${CXX}
5
  *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
6
 CFLAGS=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
6
  */
7
 EXECC=$(CCPLUS) $(CFLAGS) $(GTKFLAGS) $(NLS) -DLOCALE=\"${LOCALEDIR}\"
8
-GTKFLAGS=`gtk-config --cflags`
9
-GTKLIBS=`gtk-config --libs`
10
+GTKFLAGS=`gtk12-config --cflags`
11
+GTKLIBS=`gtk12-config --libs`
12
 
7
 
13
 all:list.o colors.o addd.o graph.o edit.o log.o prefs.o lmenu.o buttons.o about.o saveload.o \
8
+#if (defined(__unix__) || defined(unix)) && !defined(USG)
14
 limface.o misc.o
9
+#include <sys/param.h>
10
+#endif
11
+
12
 #include <sys/types.h>
13
 #include <sys/stat.h>
14
 #include <sys/ipc.h>
15
+#if (defined(BSD) && (BSD >= 199306))
16
+#include <sys/msgbuf.h>
17
+#include <sys/time.h>
18
+#else
19
 #include <sys/msg.h>
20
 #include <sys/timeb.h>
21
+#endif
22
 #include <unistd.h>
23
 #include <fcntl.h>
24
 #include <stdio.h>
25
@@ -865,9 +874,15 @@
26
 };
27
 
28
 unsigned int tMain::get_precise_time(){
29
+#if (defined(BSD) && (BSD >= 199306))
30
+	struct timeval tp;
31
+	gettimeofday(&tp, NULL);
32
+	return(tp.tv_sec*1000+tp.tv_usec);
33
+#else
34
 	struct timeb tp;
35
 	ftime(&tp);
36
 	return(tp.time*1000+tp.millitm);
37
+#endif
38
 };
39
 
40
 void tMain::speed() {
(-)downloader/patches/patch-af (-45 / +36 lines)
Lines 1-45 Link Here
1
--- face/lmenu.cc.orig	Wed Oct 20 02:49:13 1999
1
diff -ru ./socket.cc ../../nt-1.07.1/main/socket.cc
2
+++ face/lmenu.cc	Wed Oct 20 02:52:39 1999
2
--- ./socket.cc	Thu Nov  4 02:49:09 1999
3
@@ -66,7 +66,7 @@
3
+++ ../../nt-1.07.1/main/socket.cc	Thu Nov 25 22:18:21 1999
4
 
4
@@ -9,6 +9,10 @@
5
 	ListMenu=gtk_menu_new();
5
  *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
6
 	pixmap=make_pixmap_from_xpm(&bitmap,logmini_xpm);
6
  */
7
-	menu_item=make_menu_item(_("View log"),NULL,pixmap,bitmap);
7
 
8
+	menu_item=make_menu_item(_("View log"),(char*)NULL,pixmap,bitmap);
8
+#if (defined(__unix__) || defined(unix)) && !defined(USG)
9
 	gtk_menu_append(GTK_MENU(ListMenu),menu_item);
9
+#include <sys/param.h>
10
 	ListMenuArray[LM_LOG]=menu_item;
10
+#endif
11
 	gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(open_log_for_selected),NULL);
11
+
12
@@ -79,7 +79,7 @@
12
 #include <stdio.h>
13
 	gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(stop_downloads),NULL);
13
 #include <stdlib.h>
14
 
14
 #include <string.h>
15
 	pixmap=make_pixmap_from_xpm(&bitmap,runmini_xpm);
15
@@ -37,6 +41,7 @@
16
-	menu_item=make_menu_item(_("Continue downloads"),NULL,pixmap,bitmap);
16
 		if (!buffer) buffer=new char[MAX_LEN];
17
+	menu_item=make_menu_item(_("Continue downloads"),(char*)NULL,pixmap,bitmap);
17
 		hostent *hpr=&hp;
18
 	gtk_menu_append(GTK_MENU(ListMenu),menu_item);
18
 		temp_variable=0;
19
 	ListMenuArray[LM_CONTINUE]=menu_item;
19
+#if !(defined(BSD) && (BSD >= 199306))
20
 	gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(continue_downloads),NULL);
20
 #ifdef __sparc__
21
@@ -100,13 +100,13 @@
21
 		gethostbyname_r(host,&hp,buffer,MAX_LEN,&temp_variable);
22
 	gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(ask_delete_download),NULL);
22
 #else
23
 
23
@@ -44,11 +49,11 @@
24
 	pixmap=make_pixmap_from_xpm(&bitmap,delcommini_xpm);
24
 #endif
25
-	menu_item=make_menu_item(_("Delete completed"),NULL,pixmap,bitmap);
25
 		if (temp_variable) return -1;
26
+	menu_item=make_menu_item(_("Delete completed"),(char*)NULL,pixmap,bitmap);
26
 		memcpy((char *)&info.sin_addr,(char *)hpr->h_addr,hpr->h_length);
27
 	gtk_menu_append(GTK_MENU(ListMenu),menu_item);
27
-		/*
28
 	ListMenuArray[LM_DELC]=menu_item;
28
+#else /* !(defined(BSD) && (BSD >= 199306)) */		
29
 	gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(ask_delete_completed_downloads),NULL);
29
 		hostent *hp=gethostbyname(host);
30
 
30
 		if (!hp) return -1;
31
 
31
 		memcpy((char *)&info.sin_addr,(char *)hp->h_addr,hp->h_length);
32
-	menu_item=make_menu_item(_("Delete failed"),NULL,NULL,NULL);
32
-		*/
33
+	menu_item=make_menu_item(_("Delete failed"),(char*)NULL,(GdkPixmap*)NULL,(GdkBitmap*)NULL);
33
+#endif /* !(defined(BSD) && (BSD >= 199306)) */
34
 	gtk_menu_append(GTK_MENU(ListMenu),menu_item);
34
 	} else info.sin_addr.s_addr=INADDR_ANY;
35
 	ListMenuArray[LM_DELF]=menu_item;
35
 	info.sin_port=htons(port);
36
 	gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(ask_delete_fataled_downloads),NULL);
36
 	return sizeof(info);
37
@@ -128,7 +128,7 @@
38
 	ListMenuArray[LM_MOVEDOWN]=menu_item;
39
 	gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(move_download_down),NULL);
40
 
41
-	menu_item=make_menu_item(_("Set limitation"),NULL,NULL,NULL);
42
+	menu_item=make_menu_item(_("Set limitation"),(char*)NULL,(GdkPixmap*)NULL,(GdkBitmap*)NULL);
43
 	gtk_menu_append(GTK_MENU(ListMenu),menu_item);
44
 	ListMenuArray[LM_SET_LIMIT]=menu_item;
45
 	gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(set_limit_to_download),NULL);
(-)downloader/pkg/PLIST (+11 lines)
Line 1 Link Here
1
bin/nt
1
bin/nt
2
share/locale/bg/LC_MESSAGES/nt.mo
3
share/locale/de/LC_MESSAGES/nt.mo
4
share/locale/es/LC_MESSAGES/nt.mo
5
share/locale/fr/LC_MESSAGES/nt.mo
6
share/locale/id/LC_MESSAGES/nt.mo
7
share/locale/it/LC_MESSAGES/nt.mo
8
share/locale/ja/LC_MESSAGES/nt.mo
9
share/locale/nl/LC_MESSAGES/nt.mo
10
share/locale/pt_BR/LC_MESSAGES/nt.mo
11
share/locale/ru/LC_MESSAGES/nt.mo
12
share/locale/zh_CN.EUC/LC_MESSAGES/nt.mo

Return to bug 15094