7 files changed, 155 insertions, 46 deletions

diff --git a/ftp/downloader/Makefile b/ftp/downloader/Makefile
index b66adc219638..c80f25dad7e3 100644
--- a/ftp/downloader/Makefile
+++ b/ftp/downloader/Makefile
@@ -6,19 +6,36 @@
 #
 
 PORTNAME=	downloader
-PORTVERSION=	1.11
+PORTVERSION=	1.15
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.server51.freshmeat.net/pub/d4x/ \
-		ftp://ftp.lonyay.edu.hu/pub/software/nt/ \
-		http://people.FreeBSD.org/~imura/distfiles/
+		ftp://ftp.chg.ru/pub/X11/applications/Xdownloader/
 DISTNAME=	nt-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+MSGFMT_CMD=	${LOCALBASE}/bin/msgfmt
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/main
 
-CFLAGS=		-pedantic
+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
+		MSGFMT_CMD="${MSGFMT_CMD}"
+
+MAN1=		nt.1
+
+D4X_DOC=	ChangeLog FAQ FAQ.es FAQ.fr FAQ.gr INSTALL INSTALL.gr LICENSE \
+		NAMES PLANS README README.gr README.ru THANKS TODO TROUBLES
+
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/../nt.1 ${PREFIX}/man/man1
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/downloader
+.for file in ${D4X_DOC}
+	${INSTALL_DATA} ${WRKSRC}/../${file} ${PREFIX}/share/doc/downloader
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/ftp/downloader/distinfo b/ftp/downloader/distinfo
index c77a22f865bf..ee7af01057a0 100644
--- a/ftp/downloader/distinfo
+++ b/ftp/downloader/distinfo
@@ -1 +1 @@
-MD5 (nt-1.11.tar.gz) = 6d76906c39e156704ec85670411ad715
+MD5 (nt-1.15.tar.gz) = 845fc9dbb705031ac410a39dee1b9c44
diff --git a/ftp/downloader/files/patch-aa b/ftp/downloader/files/patch-aa
index 23ce5f000a8d..d29a08b2085a 100644
--- a/ftp/downloader/files/patch-aa
+++ b/ftp/downloader/files/patch-aa
@@ -1,26 +1,92 @@
---- Makefile.orig	Sat Jan 29 05:02:17 2000
-+++ Makefile	Sun Feb 13 13:18:26 2000
-@@ -1,21 +1,15 @@
--CXX = c++
+--- Makefile.orig	Thu Apr 20 11:24:29 2000
++++ Makefile	Sat Apr 22 06:00:00 2000
+@@ -1,40 +1,19 @@
+-CXXFLAGS=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
+-# -ggdb
+-#-lefence
++CXXFLAGS += -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
+ 
+-
+-export CXXFLAGS LOCALEDIR
+-
+-#CXX = c++
++CXX ?= c++
  
  NLS=-DENABLE_NLS # Remove or comment this line to disable gettext
 -ifeq ($(DEST),)
 -DEST=/usr/local
 -endif
-+DEST?=$(PREFIX)
++DEST=${PREFIX}
+ 
  LOCALEDIR=$(DEST)/share/locale
- PTHREAD=-lpthread
+-PTHREAD=-lpthread
 -GTKCONFIG=gtk-config
- GLIBCONFIG=glib-config
- 
- #next strings were added for BSD support
+-GLIBCONFIG=glib-config
+-MAKE=make
+-
+-#next strings were added for BSD support
 -ifeq ($(OSTYPE),BSD)
  PTHREAD=-pthread
- GTKCONFIG=gtk12-config
+-GTKCONFIG=gtk12-config
+-MAKE=gmake
+-endif
++MSGFMT=${MSGFMT_CMD}
+ 
+-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)
++GTKLIBS=`${GTK_CONFIG} --libs`
++GTKFLAGS=`${GTK_CONFIG} --cflags`
+ 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 \
+@@ -50,23 +29,20 @@
+ all:
+ 	-rm -f nt
+ 	$(MAKE) nt
+-	[ -z "$(NLS)" ] || $(MAKE) -C po
+-	$(MAKE) strip
++	[ -z "$(NLS)" ] || cd po && MSGFMT=$(MSGFMT) $(MAKE)
+ 
+ $(FACE):
+-	$(MAKE) -C face
++	cd face && EXECC="$(EXECC)" $(MAKE)
+ 
+ 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
++	${BSD_INSTALL_PROGRAM} nt $(DEST)/bin
++	[ -z "$(NLS)" ] || cd po && LOCALEDIR=$(LOCALEDIR) $(MAKE) install
++
++.cc.o:
++	$(EXECC) -c $<
  
--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)
+ clean: 
+ 	-rm -f *.o nt TAGS *~
+@@ -79,8 +55,3 @@
+ uninstall:
+ 	-rm -f $(DEST)/bin/nt
+ 	$(MAKE) uninstall -C po
+-
+-Makefile.dep:
+-	$(CXX) $(CXXFLAGS) -MM *.cc > Makefile.dep
+-
+--include Makefile.dep
diff --git a/ftp/downloader/files/patch-ap b/ftp/downloader/files/patch-ap
new file mode 100644
index 000000000000..e4ba598c7ea8
--- /dev/null
+++ b/ftp/downloader/files/patch-ap
@@ -0,0 +1,16 @@
+--- face/Makefile.orig	Sun Apr 16 16:18:45 2000
++++ face/Makefile	Sat Apr 22 06:00:00 2000
+@@ -2,10 +2,8 @@
+ 	buttons.o about.o saveload.o limface.o misc.o lod.o columns.o \
+ 	dndtrash.o passface.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
new file mode 100644
index 000000000000..17e8efbff550
--- /dev/null
+++ b/ftp/downloader/files/patch-aq
@@ -0,0 +1,17 @@
+--- po/Makefile.orig	Mon Apr 17 10:32:26 2000
++++ po/Makefile	Fri Apr 21 21:00:00 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
+ 
+ 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 ; \
+ 	done
+ 
+ uninstall:
diff --git a/ftp/downloader/pkg-descr b/ftp/downloader/pkg-descr
index 5b1c8ca29ae3..411e39a78263 100644
--- a/ftp/downloader/pkg-descr
+++ b/ftp/downloader/pkg-descr
@@ -1,7 +1,7 @@
 This program is a graphical program for downloading files through the
 internet which support both ftp and http (not completed yet) protocols.
 Program also supports REGET if server side supports it too. It is like kget
-for linux and ReGet or GetRight for Windows. 
+for KDE and ReGet or GetRight for Microsoft Windows. 
 
 This program supports queue of downloads, regets files after connection break
 and many other features:  
diff --git a/ftp/downloader/pkg-plist b/ftp/downloader/pkg-plist
index 15c7bb582050..daf81aa598e9 100644
--- a/ftp/downloader/pkg-plist
+++ b/ftp/downloader/pkg-plist
@@ -1,9 +1,27 @@
 bin/nt
+share/doc/downloader/ChangeLog
+share/doc/downloader/FAQ
+share/doc/downloader/FAQ.es
+share/doc/downloader/FAQ.fr
+share/doc/downloader/FAQ.gr 
+share/doc/downloader/INSTALL
+share/doc/downloader/INSTALL.gr
+share/doc/downloader/LICENSE
+share/doc/downloader/NAMES
+share/doc/downloader/PLANS
+share/doc/downloader/README
+share/doc/downloader/README.gr
+share/doc/downloader/README.ru
+share/doc/downloader/THANKS
+share/doc/downloader/TODO
+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
+share/locale/el_GR/LC_MESSAGES/nt.mo
 share/locale/es/LC_MESSAGES/nt.mo
 share/locale/fr/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
 share/locale/ja/LC_MESSAGES/nt.mo
@@ -11,28 +29,3 @@ 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.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