4 files changed, 15 insertions, 53 deletions

diff --git a/ftp/downloader/Makefile b/ftp/downloader/Makefile
index df6238262995..335c9d887198 100644
--- a/ftp/downloader/Makefile
+++ b/ftp/downloader/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	downloader
-PORTVERSION=	1.24.1
+PORTVERSION=	1.25
 CATEGORIES=	ftp
 MASTER_SITES=	http://www.krasu.ru/soft/chuchelo/files/ \
 		ftp://ftp.server51.freshmeat.net/pub/d4x/ \
@@ -20,7 +20,8 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/main
 USE_GTK=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" DEST="${PREFIX}" \
-		OSTYPE="${OPSYS}" MAKE_CMD="${GMAKE}"
+		OSTYPE="${OPSYS}" MAKE_CMD="${GMAKE}" \
+		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
 MAN1=		nt.1
 
 PORTDOCS=	ChangeLog FAQ FAQ.de FAQ.es FAQ.fr FAQ.gr LICENSE     \
@@ -28,11 +29,11 @@ PORTDOCS=	ChangeLog FAQ FAQ.de FAQ.es FAQ.fr FAQ.gr LICENSE     \
 		README.pl README.pt_BR README.ru THANKS TODO TROUBLES
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/../nt.1 ${PREFIX}/man/man1
+	@${INSTALL_MAN} ${WRKSRC}/../nt.1 ${PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/downloader
 .for file in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/../${file} ${PREFIX}/share/doc/downloader
+	@${INSTALL_DATA} ${WRKSRC}/../${file} ${PREFIX}/share/doc/downloader
 .endfor
 .endif
 
diff --git a/ftp/downloader/distinfo b/ftp/downloader/distinfo
index eb2f32c50113..ba5f5cacfb80 100644
--- a/ftp/downloader/distinfo
+++ b/ftp/downloader/distinfo
@@ -1 +1 @@
-MD5 (nt-1.24.1.tar.gz) = 885aa758d2ce6fa6d3dbc912b9d6665b
+MD5 (nt-1.25.tar.gz) = 5b4afed4e6c3ba40a6db706e4488e03b
diff --git a/ftp/downloader/files/patch-aa b/ftp/downloader/files/patch-aa
index 9be173b928fb..c8aff8ab490c 100644
--- a/ftp/downloader/files/patch-aa
+++ b/ftp/downloader/files/patch-aa
@@ -1,17 +1,21 @@
---- Makefile.orig	Mon Mar 19 21:41:01 2001
-+++ Makefile	Mon Mar 19 21:42:05 2001
-@@ -34,8 +34,9 @@
+--- Makefile.orig	Sat Mar 24 02:54:02 2001
++++ Makefile	Fri Mar 30 11:30:16 2001
+@@ -33,10 +33,11 @@
+ endif
  
  ifeq ($(OSTYPE),FreeBSD)
- PTHREAD=-pthread
+-PTHREAD=-pthread
 -GTKCONFIG=gtk12-config
 -MAKE=gmake
+-CXXFLAGS+=-D_THREAD_SAFE
++PTHREAD=$(PTHREAD_LIBS)
 +GTKCONFIG=${GTK_CONFIG}
 +GLIBCONFIG=${GLIB_CONFIG}
 +MAKE=${MAKE_CMD}
- CXXFLAGS+=-D_THREAD_SAFE
++CXXFLAGS+=$(PTHREAD_CFLAGS)
  endif
  
+ GTKLIBS=$(shell $(GTKCONFIG) --libs) $(shell $(GLIBCONFIG) --libs)
 @@ -82,7 +83,7 @@
  
  
diff --git a/ftp/downloader/files/patch-main::dlist.cc b/ftp/downloader/files/patch-main::dlist.cc
deleted file mode 100644
index 78716702b24c..000000000000
--- a/ftp/downloader/files/patch-main::dlist.cc
+++ /dev/null
@@ -1,43 +0,0 @@
---- 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);