5 files changed, 61 insertions, 18 deletions

diff --git a/ftp/downloader/Makefile b/ftp/downloader/Makefile
index fb353f42957c..ca6f4542d246 100644
--- a/ftp/downloader/Makefile
+++ b/ftp/downloader/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	downloader
-PORTVERSION=	1.19
+PORTVERSION=	1.20.p
 CATEGORIES=	ftp
 MASTER_SITES=	http://www.krasu.ru/soft/chuchelo/files/ \
 		ftp://ftp.server51.freshmeat.net/pub/d4x/ \
 		ftp://ftp.chg.ru/pub/X11/applications/Xdownloader/
-DISTNAME=	nt-${PORTVERSION}
+DISTNAME=	nt-1.20pre
 
 MAINTAINER=	andrew@chg.ru
 
diff --git a/ftp/downloader/distinfo b/ftp/downloader/distinfo
index ecf8eb8cd578..984babf2ddae 100644
--- a/ftp/downloader/distinfo
+++ b/ftp/downloader/distinfo
@@ -1 +1 @@
-MD5 (nt-1.19.tar.gz) = b15e66607521abd47f07a991c34eb895
+MD5 (nt-1.20pre.tar.gz) = b60fa51a498c38dc4565a840eb48518b
diff --git a/ftp/downloader/files/patch-aa b/ftp/downloader/files/patch-aa
index f87009420937..0ac4f045d27a 100644
--- a/ftp/downloader/files/patch-aa
+++ b/ftp/downloader/files/patch-aa
@@ -1,9 +1,19 @@
---- Makefile.orig	Sat Aug 26 10:16:05 2000
-+++ Makefile	Mon Aug 28 20:07:43 2000
-@@ -1,39 +1,19 @@
--CXXFLAGS=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
--# -ggdb
+--- Makefile.orig	Sun Oct 29 02:34:33 2000
++++ Makefile	Sun Oct 29 02:36:32 2000
+@@ -1,103 +1,44 @@
+-# Solaris Openwin 2.6 headers are not properly casted to for
+-# compilation with C++/g++. Three files Xlib.h, Xresource.h, Xutil.h
+-# need to be fixed to compile this. Or add a path to the X11R6 headers
+-ifeq ($(OSTYPE),Solaris)
+-SOLARIS_TYPECASTED_X11_HEADERS=-I/var/tmp/src
+-endif
+-ifndef CXXFLAGS
+-CXXFLAGS=-Wall -O2 $(SOLARIS_TYPECASTED_X11_HEADERS)
+-endif
+-
+-CXXFLAGS+=-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS $(SOLARIS_TYPECASTED_X11_HEADERS)
 -# -DDEBUG_ALL
+-# -ggdb
 +CXXFLAGS += -D_THREAD_SAFE -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
  
 -export CXXFLAGS LOCALEDIR
@@ -25,32 +35,47 @@
 -
 -#next strings were added for BSD support
 -ifeq ($(OSTYPE),BSD)
--PTHREAD=-pthread
+ PTHREAD=-pthread
 -GTKCONFIG=gtk12-config
 -MAKE=gmake
 -endif
--
++MSGFMT=${MSGFMT_CMD}
+ 
 -ifeq ($(OSTYPE),FreeBSD)
- PTHREAD=-pthread
+-PTHREAD=-pthread
 -GTKCONFIG=gtk12-config
 -MAKE=gmake
 -endif
-+MSGFMT=${MSGFMT_CMD}
- 
+-
 -GTKLIBS=$(shell $(GTKCONFIG) --libs) $(shell $(GLIBCONFIG) --libs)
 -GTKFLAGS=$(shell $(GTKCONFIG) --cflags) $(shell $(GLIBCONFIG) --cflags)
+-
+-ifeq ($(OSTYPE),Irix)
+-CTKFLIBS += lintl
+-MAKE=gmake
+-CXXFLAGS += -fpermissive
+-endif
 +GTKLIBS=`${GTK_CONFIG} --libs`
 +GTKFLAGS=`${GTK_CONFIG} --cflags`
- LDFLAGS=$(PTHREAD) $(GTKLIBS)
++LDFLAGS=$(PTHREAD) $(GTKLIBS)
+ 
+-LDFLAGS=$(PTHREAD) $(GTKLIBS)
 -CXXFLAGS += $(GTKFLAGS) $(NLS) -DLOCALE=\"${LOCALEDIR}\"
-+
 +EXECC=$(CXX) $(CXXFLAGS) $(GTKFLAGS) $(NLS) -DLOCALE=\"${LOCALEDIR}\"
  
  FACE=face/lmenu.o face/list.o face/addd.o face/graph.o face/log.o \
  	face/prefs.o face/buttons.o face/about.o face/edit.o \
-@@ -47,40 +27,18 @@
+ 	face/colors.o face/saveload.o face/limface.o face/misc.o \
+ 	face/lod.o face/columns.o face/dndtrash.o face/passface.o \
+ 	face/mywidget.o
+-MODULES1=base64.o addr.o queue.o liststr.o dlist.o mdlist.o locstr.o \
++MODULES=base64.o addr.o queue.o liststr.o dlist.o mdlist.o locstr.o \
+ 	log.o  sort.o meter.o socket.o history.o  speed.o srvclt.o html.o \
+ 	client.o ftp.o http.o download.o ftpd.o httpd.o hproxy.o signal.o \
+ 	main.o config.o savelog.o mainlog.o var.o sortstr.o db.o cookie.o \
  	pass.o eff.o
- MODULES += $(FACE)
+-MODULES = $(FACE) $(MODULES1)
++MODULES += $(FACE)
  
 -all:
 -	-rm -f nt
@@ -90,7 +115,7 @@
 -	$(MAKE) uninstall -C po
 -
 -Makefile.dep:
--	$(CXX) $(CXXFLAGS) -MM *.cc > Makefile.dep
+-	$(CXX) -I./ -Iface $(CXXFLAGS) -MM *.cc > Makefile.dep
 +	$(BSD_INSTALL_PROGRAM) nt $(DEST)/bin
 +	[ -z "$(NLS)" ] || cd po && LOCALEDIR=$(LOCALEDIR) $(MAKE) install
  
diff --git a/ftp/downloader/files/patch-ab b/ftp/downloader/files/patch-ab
new file mode 100644
index 000000000000..ed077c445896
--- /dev/null
+++ b/ftp/downloader/files/patch-ab
@@ -0,0 +1,17 @@
+--- speed.cc.orig	Sun Oct 29 03:19:48 2000
++++ speed.cc	Sun Oct 29 03:20:05 2000
+@@ -25,8 +25,12 @@
+ 	pthread_mutexattr_init(&ma);
+ #if !defined (__sparc__) && !defined(__mips__)
+ 	pthread_mutexattr_settype(&ma,MUTEX_TYPE_FAST);
+-#elseif defined(__mips__)
+-	pthread_mutexattr_settype(&ma,MUTEX_TYPE_NORMAL);	
++#else
++
++#if defined(__mips__)
++	pthread_mutexattr_settype(&ma,MUTEX_TYPE_NORMAL);
++#endif
++
+ #endif
+ 	pthread_mutex_init(&lock1,&ma);
+ 	pthread_mutexattr_destroy(&ma);
diff --git a/ftp/downloader/pkg-plist b/ftp/downloader/pkg-plist
index 80a5bebadd82..c50bc04d1b3b 100644
--- a/ftp/downloader/pkg-plist
+++ b/ftp/downloader/pkg-plist
@@ -28,6 +28,7 @@ share/locale/fr/LC_MESSAGES/nt.mo
 share/locale/hu/LC_MESSAGES/nt.mo
 share/locale/id/LC_MESSAGES/nt.mo
 share/locale/it/LC_MESSAGES/nt.mo
+share/locale/iw/LC_MESSAGES/nt.mo
 share/locale/ja/LC_MESSAGES/nt.mo
 share/locale/nl/LC_MESSAGES/nt.mo
 share/locale/pl/LC_MESSAGES/nt.mo