Remove maintainer -- email to him bounces with "no such user".

Update to non-prerelease version.
USE_GMAKE rather than make *huge* non-maintainable patches to the Makefiles.

6 files changed, 44 insertions, 160 deletions

diff --git a/ftp/downloader/Makefile b/ftp/downloader/Makefile
index ca6f4542d246..35fc6e436294 100644
--- a/ftp/downloader/Makefile
+++ b/ftp/downloader/Makefile
@@ -6,24 +6,21 @@
 #
 
 PORTNAME=	downloader
-PORTVERSION=	1.20.p
+PORTVERSION=	1.20
 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-1.20pre
+DISTNAME=	nt-1.20
 
-MAINTAINER=	andrew@chg.ru
+MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
-MSGFMT_CMD=	${LOCALBASE}/bin/msgfmt
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/main
-
 USE_GTK=	yes
-MAKE_ENV=	MSGFMT_CMD="${MSGFMT_CMD}"
-
+USE_GMAKE=	yes
+WRKSRC=		${WRKDIR}/${DISTNAME}/main
+MAKE_ENV=	MSGFMT_CMD="${LOCALBASE}/bin/msgfmt"
 MAN1=		nt.1
 
 D4X_DOC=	ChangeLog FAQ FAQ.de FAQ.es FAQ.fr FAQ.gr LICENSE     \
diff --git a/ftp/downloader/distinfo b/ftp/downloader/distinfo
index 984babf2ddae..ad6d9740080a 100644
--- a/ftp/downloader/distinfo
+++ b/ftp/downloader/distinfo
@@ -1 +1 @@
-MD5 (nt-1.20pre.tar.gz) = b60fa51a498c38dc4565a840eb48518b
+MD5 (nt-1.20.tar.gz) = 092405887addb482765d144613c07ee1
diff --git a/ftp/downloader/files/patch-aa b/ftp/downloader/files/patch-aa
index 0ac4f045d27a..3da9b93b8f72 100644
--- a/ftp/downloader/files/patch-aa
+++ b/ftp/downloader/files/patch-aa
@@ -1,124 +1,42 @@
---- 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
+--- Makefile.orig	Sat Dec 16 07:44:10 2000
++++ Makefile	Fri Jan  5 21:24:27 2001
+@@ -5,10 +5,10 @@
+ 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
--
--#CXX = c++
-+CXX ?= c++
++#CXXFLAGS=-Wall -O2 $(SOLARIS_TYPECASTED_X11_HEADERS)
+ endif
  
- NLS=-DENABLE_NLS # Remove or comment this line to disable gettext
--ifeq ($(DEST),)
--DEST=/usr/local
--endif
-+DEST=${PREFIX}
+-CXXFLAGS+=-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS $(SOLARIS_TYPECASTED_X11_HEADERS) -DDEBUG_ALL
++CXXFLAGS+=-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D_THREAD_SAFE
+ # -ggdb
  
- LOCALEDIR=$(DEST)/share/locale
--PTHREAD=-lpthread
--GTKCONFIG=gtk-config
--GLIBCONFIG=glib-config
--MAKE=make
--
--#next strings were added for BSD support
--ifeq ($(OSTYPE),BSD)
- PTHREAD=-pthread
--GTKCONFIG=gtk12-config
--MAKE=gmake
--endif
-+MSGFMT=${MSGFMT_CMD}
+ export CXXFLAGS LOCALEDIR
+@@ -33,11 +33,13 @@
+ MAKE=gmake
+ endif
  
 -ifeq ($(OSTYPE),FreeBSD)
--PTHREAD=-pthread
--GTKCONFIG=gtk12-config
--MAKE=gmake
--endif
--
--GTKLIBS=$(shell $(GTKCONFIG) --libs) $(shell $(GLIBCONFIG) --libs)
--GTKFLAGS=$(shell $(GTKCONFIG) --cflags) $(shell $(GLIBCONFIG) --cflags)
--
--ifeq ($(OSTYPE),Irix)
--CTKFLIBS += lintl
--MAKE=gmake
--CXXFLAGS += -fpermissive
++#	fsck'ing gmake won't recongize us as FreeBSD...
++#ifeq ($(OSTYPE),FreeBSD)
+ PTHREAD=-pthread
+ GTKCONFIG=gtk12-config
++GLIBCONFIG=glib12-config
+ MAKE=gmake
 -endif
-+GTKLIBS=`${GTK_CONFIG} --libs`
-+GTKFLAGS=`${GTK_CONFIG} --cflags`
-+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 \
- 	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) $(MODULES1)
-+MODULES += $(FACE)
- 
--all:
--	-rm -f nt
--	$(MAKE) nt
--	[ -z "$(NLS)" ] || $(MAKE) -C po
--	$(MAKE) strip
-+all: nt
-+	[ -z "$(NLS)" ] || cd po && MSGFMT=$(MSGFMT) $(MAKE)
++#endif
  
- $(FACE):
--	$(MAKE) -C face
-+	cd face && EXECC="$(EXECC)" $(MAKE)
+ GTKLIBS=$(shell $(GTKCONFIG) --libs) $(shell $(GLIBCONFIG) --libs)
+ GTKFLAGS=$(shell $(GTKCONFIG) --cflags) $(shell $(GLIBCONFIG) --cflags)
+@@ -81,8 +83,8 @@
  
- nt: $(MODULES)
--	$(MAKE) -C face
--	$(CXX) -lstdc++ $(MODULES) nt.cc -o nt $(CXXFLAGS) $(GTKLIBS) $(PTHREAD)
--
--strip: nt
--	strip nt
--
-+	$(EXECC) $(MODULES) nt.cc -o nt $(LDFLAGS)
  
  install: all
 -	install -c -m755 nt $(DEST)/bin
 -	[ -z "$(NLS)" ] || $(MAKE) install -C po
--
--clean: 
--	-rm -f *.o nt TAGS *~
--	$(MAKE) clean -C face
--	$(MAKE) clean -C po
--
--tags:
--	etags *.{cc,h} face/*.{cc,h}
--
--uninstall:
--	-rm -f $(DEST)/bin/nt
--	$(MAKE) uninstall -C po
--
--Makefile.dep:
--	$(CXX) -I./ -Iface $(CXXFLAGS) -MM *.cc > Makefile.dep
 +	$(BSD_INSTALL_PROGRAM) nt $(DEST)/bin
 +	[ -z "$(NLS)" ] || cd po && LOCALEDIR=$(LOCALEDIR) $(MAKE) install
  
---include Makefile.dep
-+.cc.o:
-+	$(EXECC) -c $<
+ clean: 
+ 	-rm -f *.o nt TAGS *~
diff --git a/ftp/downloader/files/patch-ab b/ftp/downloader/files/patch-ab
index ed077c445896..06c843e3db43 100644
--- a/ftp/downloader/files/patch-ab
+++ b/ftp/downloader/files/patch-ab
@@ -1,17 +1,8 @@
---- 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);
+--- signal.cc.orig	Fri Dec 22 05:58:17 2000
++++ signal.cc	Fri Jan  5 21:22:24 2001
+@@ -116 +116 @@
 -#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);
++#else if defined(__mips__)
+@@ -119 +119 @@
+-	pthread_mutex_init(&lock,&ma);
++	pthread_mutex_init(lock,&ma);
diff --git a/ftp/downloader/files/patch-ap b/ftp/downloader/files/patch-ap
deleted file mode 100644
index 6cd21d7db97c..000000000000
--- a/ftp/downloader/files/patch-ap
+++ /dev/null
@@ -1,16 +0,0 @@
---- face/Makefile.orig	Thu May 11 05:55:43 2000
-+++ face/Makefile	Tue May 16 17:36:58 2000
-@@ -2,10 +2,8 @@
- 	buttons.o about.o saveload.o limface.o misc.o lod.o columns.o \
- 	dndtrash.o passface.o mywidget.o
- 
-+.cc.o:
-+	$(EXECC) -c $<
-+
- clean:
- 	-rm -f *.o *~
--
--Makefile.dep:
--	$(CXX) $(CXXFLAGS) -MM *.cc > Makefile.dep
--
---include Makefile.dep
diff --git a/ftp/downloader/files/patch-aq b/ftp/downloader/files/patch-aq
index 371ba0087f0e..8cacdc1f5cd7 100644
--- a/ftp/downloader/files/patch-aq
+++ b/ftp/downloader/files/patch-aq
@@ -1,12 +1,6 @@
---- po/Makefile.orig	Mon Apr 17 05:32:26 2000
-+++ po/Makefile	Tue May 16 17:37:02 2000
-@@ -1,12 +1,12 @@
- all:
- 	for i in `ls *.po`; do \
--		msgfmt $$i -o `echo $$i | sed -e s/.po//`.gmo ; \
-+		${MSGFMT} $$i -o `echo $$i | sed -e s/.po//`.gmo ; \
- 	done
- 
+--- po/Makefile.orig	Thu Nov 30 22:46:52 2000
++++ po/Makefile	Fri Jan  5 21:24:09 2001
+@@ -6,7 +6,7 @@
  install:
  	for i in `ls *.gmo` ; do \
  		mkdir -p $(LOCALEDIR)/`echo $$i|sed -e s/.gmo//`/LC_MESSAGES;\