4 files changed, 57 insertions, 25 deletions

diff --git a/ftp/downloader/Makefile b/ftp/downloader/Makefile
index ea029453fcc9..cbeec1d32253 100644
--- a/ftp/downloader/Makefile
+++ b/ftp/downloader/Makefile
@@ -1,20 +1,24 @@
 # New ports collection makefile for:	downloader
-# Version required:	1.07.1
+# Version required:	1.11
 # Date Created:		23 June 1999
 # Whom:			Ying-Chieh Liao <ijliao@csie.nctu.edu.tw>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	nt-1.07.1
-PKGNAME=	downloader-1.07.1
+DISTNAME=	nt-1.11
+PKGNAME=	downloader-1.11
 CATEGORIES=	ftp
-MASTER_SITES=	http://www.krasu.ru/soft/chuchelo/files/
+MASTER_SITES=	ftp://ftp.server51.freshmeat.net/pub/d4x/ \
+		ftp://ftp.lonyay.edu.hu/pub/software/nt/ \
+		http://people.FreeBSD.org/~imura/distfiles/
 
-MAINTAINER=	ijliao@csie.nctu.edu.tw
+MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/main
 
+CFLAGS=		-pedantic
+
 .include <bsd.port.mk>
diff --git a/ftp/downloader/distinfo b/ftp/downloader/distinfo
index e1e7bb7c3a2e..c77a22f865bf 100644
--- a/ftp/downloader/distinfo
+++ b/ftp/downloader/distinfo
@@ -1 +1 @@
-MD5 (nt-1.07.1.tar.gz) = 85b8152bd1cf7186533cf23c527239b5
+MD5 (nt-1.11.tar.gz) = 6d76906c39e156704ec85670411ad715
diff --git a/ftp/downloader/files/patch-aa b/ftp/downloader/files/patch-aa
index 0d4c1b437792..23ce5f000a8d 100644
--- a/ftp/downloader/files/patch-aa
+++ b/ftp/downloader/files/patch-aa
@@ -1,24 +1,26 @@
-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 = $(CC)
-+CCPLUS = $(CXX)
+--- Makefile.orig	Sat Jan 29 05:02:17 2000
++++ Makefile	Sun Feb 13 13:18:26 2000
+@@ -1,21 +1,15 @@
+-CXX = c++
  
  NLS=-DENABLE_NLS # Remove or comment this line to disable gettext
+-ifeq ($(DEST),)
 -DEST=/usr/local
-+DEST=$(PREFIX)
+-endif
++DEST?=$(PREFIX)
  LOCALEDIR=$(DEST)/share/locale
--LIBS=-lpthread
--CFLAGS=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
--GTKLIBS=`gtk-config --libs`
--GTKFLAGS=`gtk-config --cflags`
-+GTKLIBS=`gtk12-config --libs`
-+GTKFLAGS=`gtk12-config --cflags`
-+LIBS=-pthread
-+CFLAGS+=-Wall -D_THREAD_SAFE -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
+ PTHREAD=-lpthread
+-GTKCONFIG=gtk-config
+ GLIBCONFIG=glib-config
  
- EXECC=$(CCPLUS) $(CFLAGS) $(GTKFLAGS) $(NLS) -DLOCALE=\"${LOCALEDIR}\"
+ #next strings were added for BSD support
+-ifeq ($(OSTYPE),BSD)
+ PTHREAD=-pthread
+ GTKCONFIG=gtk12-config
+-endif
  
+-CFLAGS=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
++CFLAGS+=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
+ GTKLIBS=`$(GTKCONFIG) --libs` 
+ GTKFLAGS=`$(GTKCONFIG) --cflags` `$(GLIBCONFIG) --cflags`
+ LIBS=$(PTHREAD) $(GTKLIBS)
diff --git a/ftp/downloader/pkg-plist b/ftp/downloader/pkg-plist
index a3d318599279..15c7bb582050 100644
--- a/ftp/downloader/pkg-plist
+++ b/ftp/downloader/pkg-plist
@@ -1,5 +1,6 @@
 bin/nt
 share/locale/bg/LC_MESSAGES/nt.mo
+share/locale/cs/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
@@ -9,4 +10,29 @@ 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
+share/locale/zh_CN.GBK/LC_MESSAGES/nt.mo
+@unexec rmdir %D/share/locale/zh_CN.GBK/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/zh_CN.GBK 2>/dev/null || true
+@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ru 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
+@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/nl 2>/dev/null || true
+@unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ja 2>/dev/null || true
+@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/it 2>/dev/null || true
+@unexec rmdir %D/share/locale/id/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/id 2>/dev/null || true
+@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/fr 2>/dev/null || true
+@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/es 2>/dev/null || true
+@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/de 2>/dev/null || true
+@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+@unexec rmdir %D/share/locale/bg/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/bg 2>/dev/null || true
+@unexec rmdir %D/share/locale 2>/dev/null || true