4 files changed, 39 insertions, 55 deletions

diff --git a/ftp/downloader/Makefile b/ftp/downloader/Makefile
index a8df9506e16a..1e4fc1c6c2b4 100644
--- a/ftp/downloader/Makefile
+++ b/ftp/downloader/Makefile
@@ -6,23 +6,21 @@
 #
 
 PORTNAME=	downloader
-PORTVERSION=	1.20
-PORTREVISION=	1
+PORTVERSION=	1.21
 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}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ijliao@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/main
 
 USE_GTK=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" DEST="${PREFIX}" \
-		GTKCONFIG="${GTK_CONFIG}" MAKE="${GMAKE}" \
-		MSGFMT_CMD="${LOCALBASE}/bin/msgfmt" PTHREAD=-pthread
+		OSTYPE="${OPSYS}" MAKE_CMD="${GMAKE}"
 MAN1=		nt.1
 
 PORTDOCS=	ChangeLog FAQ FAQ.de FAQ.es FAQ.fr FAQ.gr LICENSE     \
diff --git a/ftp/downloader/distinfo b/ftp/downloader/distinfo
index ad6d9740080a..3347f91298a4 100644
--- a/ftp/downloader/distinfo
+++ b/ftp/downloader/distinfo
@@ -1 +1 @@
-MD5 (nt-1.20.tar.gz) = 092405887addb482765d144613c07ee1
+MD5 (nt-1.21.tar.gz) = 0c518fe1d051b78beb00766f310da15b
diff --git a/ftp/downloader/files/patch-aa b/ftp/downloader/files/patch-aa
index 51da11bdacd4..3b0ca012806a 100644
--- a/ftp/downloader/files/patch-aa
+++ b/ftp/downloader/files/patch-aa
@@ -1,41 +1,27 @@
---- Makefile.orig	Sat Dec 16 16:44:10 2000
-+++ Makefile	Fri Jan 12 19:12:32 2001
+--- 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) -DDEBUG_ALL
-+CXXFLAGS+=-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D_THREAD_SAFE
+-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
  
- export CXXFLAGS LOCALEDIR
-@@ -21,10 +21,10 @@
- endif
- 
- LOCALEDIR=$(DEST)/share/locale
--PTHREAD=-lpthread
--GTKCONFIG=gtk-config
--GLIBCONFIG=glib-config
--MAKE=make
-+PTHREAD?=-lpthread
-+GTKCONFIG?=gtk-config
-+GLIBCONFIG?=glib-config
-+MAKE?=make
+@@ -34,8 +34,9 @@
  
- #next strings were added for BSD support
- ifeq ($(OSTYPE),BSD)
-@@ -39,8 +39,8 @@
- MAKE=gmake
+ ifeq ($(OSTYPE),FreeBSD)
+ PTHREAD=-pthread
+-GTKCONFIG=gtk12-config
+-MAKE=gmake
++GTKCONFIG=${GTK_CONFIG}
++GLIBCONFIG=${GLIB_CONFIG}
++MAKE=${MAKE_CMD}
  endif
  
--GTKLIBS=$(shell $(GTKCONFIG) --libs) $(shell $(GLIBCONFIG) --libs)
--GTKFLAGS=$(shell $(GTKCONFIG) --cflags) $(shell $(GLIBCONFIG) --cflags)
-+GTKLIBS=$(shell $(GTKCONFIG) --libs) #$(shell $(GLIBCONFIG) --libs)
-+GTKFLAGS=$(shell $(GTKCONFIG) --cflags) #$(shell $(GLIBCONFIG) --cflags)
- 
- ifeq ($(OSTYPE),Irix)
- CTKFLIBS += lintl
-@@ -81,7 +81,7 @@
+ GTKLIBS=$(shell $(GTKCONFIG) --libs) $(shell $(GLIBCONFIG) --libs)
+@@ -80,7 +81,7 @@
  
  
  install: all
diff --git a/ftp/downloader/pkg-plist b/ftp/downloader/pkg-plist
index a3eac54b6f2e..1ffeb3ceeed5 100644
--- a/ftp/downloader/pkg-plist
+++ b/ftp/downloader/pkg-plist
@@ -1,23 +1,23 @@
 bin/nt
-share/doc/downloader/ChangeLog
-share/doc/downloader/FAQ
-share/doc/downloader/FAQ.de
-share/doc/downloader/FAQ.es
-share/doc/downloader/FAQ.fr
-share/doc/downloader/FAQ.gr
-share/doc/downloader/LICENSE
-share/doc/downloader/NAMES
-share/doc/downloader/PLANS
-share/doc/downloader/README
-share/doc/downloader/README.de
-share/doc/downloader/README.es
-share/doc/downloader/README.gr
-share/doc/downloader/README.pl
-share/doc/downloader/README.pt_BR
-share/doc/downloader/README.ru
-share/doc/downloader/THANKS
-share/doc/downloader/TODO
-share/doc/downloader/TROUBLES
+%%PORTDOCS%%share/doc/downloader/ChangeLog
+%%PORTDOCS%%share/doc/downloader/FAQ
+%%PORTDOCS%%share/doc/downloader/FAQ.de
+%%PORTDOCS%%share/doc/downloader/FAQ.es
+%%PORTDOCS%%share/doc/downloader/FAQ.fr
+%%PORTDOCS%%share/doc/downloader/FAQ.gr
+%%PORTDOCS%%share/doc/downloader/LICENSE
+%%PORTDOCS%%share/doc/downloader/NAMES
+%%PORTDOCS%%share/doc/downloader/PLANS
+%%PORTDOCS%%share/doc/downloader/README
+%%PORTDOCS%%share/doc/downloader/README.de
+%%PORTDOCS%%share/doc/downloader/README.es
+%%PORTDOCS%%share/doc/downloader/README.gr
+%%PORTDOCS%%share/doc/downloader/README.pl
+%%PORTDOCS%%share/doc/downloader/README.pt_BR
+%%PORTDOCS%%share/doc/downloader/README.ru
+%%PORTDOCS%%share/doc/downloader/THANKS
+%%PORTDOCS%%share/doc/downloader/TODO
+%%PORTDOCS%%share/doc/downloader/TROUBLES
 share/locale/bg/LC_MESSAGES/nt.mo
 share/locale/cs/LC_MESSAGES/nt.mo
 share/locale/de/LC_MESSAGES/nt.mo
@@ -37,4 +37,4 @@ share/locale/pt_BR/LC_MESSAGES/nt.mo
 share/locale/ru/LC_MESSAGES/nt.mo
 share/locale/sk/LC_MESSAGES/nt.mo
 share/locale/zh_CN.GBK/LC_MESSAGES/nt.mo
-@dirrm share/doc/downloader
+%%PORTDOCS%%@dirrm share/doc/downloader