7 files changed, 57 insertions, 29 deletions

diff --git a/ftp/downloader/Makefile b/ftp/downloader/Makefile
index f34669d624b3..df6238262995 100644
--- a/ftp/downloader/Makefile
+++ b/ftp/downloader/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	downloader
-PORTVERSION=	1.23
+PORTVERSION=	1.24.1
 CATEGORIES=	ftp
 MASTER_SITES=	http://www.krasu.ru/soft/chuchelo/files/ \
 		ftp://ftp.server51.freshmeat.net/pub/d4x/ \
@@ -24,7 +24,7 @@ MAKE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" DEST="${PREFIX}" \
 MAN1=		nt.1
 
 PORTDOCS=	ChangeLog FAQ FAQ.de FAQ.es FAQ.fr FAQ.gr LICENSE     \
-		NAMES PLANS README README.de README.es README.gr      \
+		NAMES PLANS README README.de README.en README.es README.gr \
 		README.pl README.pt_BR README.ru THANKS TODO TROUBLES
 
 post-install:
diff --git a/ftp/downloader/distinfo b/ftp/downloader/distinfo
index 109f5623d972..eb2f32c50113 100644
--- a/ftp/downloader/distinfo
+++ b/ftp/downloader/distinfo
@@ -1 +1 @@
-MD5 (nt-1.23.tar.gz) = d88055ca8fd6f87a47fd6426ba3ccaba
+MD5 (nt-1.24.1.tar.gz) = 885aa758d2ce6fa6d3dbc912b9d6665b
diff --git a/ftp/downloader/files/patch-aa b/ftp/downloader/files/patch-aa
index 16127a1a8411..9be173b928fb 100644
--- a/ftp/downloader/files/patch-aa
+++ b/ftp/downloader/files/patch-aa
@@ -1,14 +1,5 @@
---- Makefile.orig	Fri Jan 26 18:05:26 2001
-+++ Makefile	Fri Jan 26 21:58:20 2001
-@@ -8,7 +8,7 @@
- CXXFLAGS=-Wall -O2 $(SOLARIS_TYPECASTED_X11_HEADERS)
- endif
- 
--CXXFLAGS+=-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS $(SOLARIS_TYPECASTED_X11_HEADERS)
-+CXXFLAGS+=-D_THREAD_SAFE -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS $(SOLARIS_TYPECASTED_X11_HEADERS)
- #-DDEBUG_ALL
- # -ggdb
- 
+--- Makefile.orig	Mon Mar 19 21:41:01 2001
++++ Makefile	Mon Mar 19 21:42:05 2001
 @@ -34,8 +34,9 @@
  
  ifeq ($(OSTYPE),FreeBSD)
@@ -18,10 +9,10 @@
 +GTKCONFIG=${GTK_CONFIG}
 +GLIBCONFIG=${GLIB_CONFIG}
 +MAKE=${MAKE_CMD}
+ CXXFLAGS+=-D_THREAD_SAFE
  endif
  
- GTKLIBS=$(shell $(GTKCONFIG) --libs) $(shell $(GLIBCONFIG) --libs)
-@@ -80,7 +81,7 @@
+@@ -82,7 +83,7 @@
  
  
  install: all
diff --git a/ftp/downloader/files/patch-ab b/ftp/downloader/files/patch-ab
deleted file mode 100644
index 06c843e3db43..000000000000
--- a/ftp/downloader/files/patch-ab
+++ /dev/null
@@ -1,8 +0,0 @@
---- signal.cc.orig	Fri Dec 22 05:58:17 2000
-+++ signal.cc	Fri Jan  5 21:22:24 2001
-@@ -116 +116 @@
--#elseif defined(__mips__)
-+#else if defined(__mips__)
-@@ -119 +119 @@
--	pthread_mutex_init(&lock,&ma);
-+	pthread_mutex_init(lock,&ma);
diff --git a/ftp/downloader/files/patch-aq b/ftp/downloader/files/patch-aq
index 8cacdc1f5cd7..ce222de9cb62 100644
--- a/ftp/downloader/files/patch-aq
+++ b/ftp/downloader/files/patch-aq
@@ -1,11 +1,11 @@
---- po/Makefile.orig	Thu Nov 30 22:46:52 2000
-+++ po/Makefile	Fri Jan  5 21:24:09 2001
-@@ -6,7 +6,7 @@
+--- po/Makefile.orig	Mon Mar 19 21:44:54 2001
++++ po/Makefile	Mon Mar 19 21:45:14 2001
+@@ -28,7 +28,7 @@
  install:
  	for i in `ls *.gmo` ; do \
  		mkdir -p $(LOCALEDIR)/`echo $$i|sed -e s/.gmo//`/LC_MESSAGES;\
--		install -c -m644 $$i $(LOCALEDIR)/`echo $$i | sed -e s/.gmo//`/LC_MESSAGES/nt.mo ; \
-+		${BSD_INSTALL_DATA} $$i $(LOCALEDIR)/`echo $$i | sed -e s/.gmo//`/LC_MESSAGES/nt.mo ; \
+-		install -c -m644 $$i $(LOCALEDIR)/`echo $$i | sed -e s/.gmo//`/LC_MESSAGES/$(PACKAGE).mo ; \
++		${BSD_INSTALL_DATA} $$i $(LOCALEDIR)/`echo $$i | sed -e s/.gmo//`/LC_MESSAGES/$(PACKAGE).mo ; \
  	done
  
  uninstall:
diff --git a/ftp/downloader/files/patch-main::dlist.cc b/ftp/downloader/files/patch-main::dlist.cc
new file mode 100644
index 000000000000..78716702b24c
--- /dev/null
+++ b/ftp/downloader/files/patch-main::dlist.cc
@@ -0,0 +1,43 @@
+--- dlist.cc.orig	Wed Mar 14 10:52:01 2001
++++ dlist.cc	Wed Mar 14 16:47:21 2001
+@@ -62,7 +62,7 @@
+ 	a.l_type=F_WRLCK;
+ 	a.l_whence=SEEK_SET;
+ 	a.l_start=0;
+-	a.l_len=1;
++	a.l_len=0;
+ 	if (fcntl(fd,F_SETLK,&a)==-1)
+ 		return(-1);
+ 	return(0);
+@@ -73,7 +73,7 @@
+ 	a.l_type=F_UNLCK;
+ 	a.l_whence=SEEK_SET;
+ 	a.l_start=0;
+-	a.l_len=1;
++	a.l_len=0;
+ 	fcntl(fd,F_SETLK,&a);
+ };
+ 
+@@ -360,11 +360,17 @@
+ 	im_first=0;
+ 	if (segments==NULL){
+ 		/*trying to lock*/
+-		if (d4x_f_lock(fdesc)){
+-			WL->log(LOG_ERROR,_("File is already opened by another download!"));
+-			close(fdesc);
+-			return(-1);
+-		};
++		if(d4x_f_lock(fdesc))
++			switch(errno) {
++		 		case EINVAL:
++					WL->log(LOG_WARNING,_("Filesystem seems not to support advisory record locking!"));
++					WL->log(LOG_WARNING,_("Will proceed without it but beware that you might have problems."));
++					break;
++				default:
++					WL->log(LOG_ERROR,_("File is already opened by another download!"));
++					close(fdesc);
++					return(-1);
++			};
+ 		/*end of trying */
+ 		segments=new tSegmentator;
+ 		char *segname=sum_strings(name,".segments",NULL);
diff --git a/ftp/downloader/pkg-plist b/ftp/downloader/pkg-plist
index 1ffeb3ceeed5..92f3ad489e4c 100644
--- a/ftp/downloader/pkg-plist
+++ b/ftp/downloader/pkg-plist
@@ -10,6 +10,7 @@ bin/nt
 %%PORTDOCS%%share/doc/downloader/PLANS
 %%PORTDOCS%%share/doc/downloader/README
 %%PORTDOCS%%share/doc/downloader/README.de
+%%PORTDOCS%%share/doc/downloader/README.en
 %%PORTDOCS%%share/doc/downloader/README.es
 %%PORTDOCS%%share/doc/downloader/README.gr
 %%PORTDOCS%%share/doc/downloader/README.pl
@@ -25,6 +26,7 @@ share/locale/el_GR/LC_MESSAGES/nt.mo
 share/locale/es/LC_MESSAGES/nt.mo
 share/locale/fi/LC_MESSAGES/nt.mo
 share/locale/fr/LC_MESSAGES/nt.mo
+share/locale/he/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