upgrade to 2.0

drop maintainership

6 files changed, 118 insertions, 77 deletions

diff --git a/ftp/downloader/Makefile b/ftp/downloader/Makefile
index 7f6ede2ef307..9e612f3d20a7 100644
--- a/ftp/downloader/Makefile
+++ b/ftp/downloader/Makefile
@@ -7,38 +7,35 @@
 #
 
 PORTNAME=	downloader
-PORTVERSION=	1.30
+PORTVERSION=	2.0
 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}
+		ftp://ftp.chg.ru/pub/X11/applications/Xdownloader/ \
+		http://www.scutty.co.uk/downloader/software/ \
+		ftp://ftp.uni-klu.ac.at/pub/linux/internet/downloader/
+DISTNAME=	d4x-${PORTVERSION}
 
-MAINTAINER=	ijliao@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/main
+LIB_DEPENDS=	gdk_pixbuf:${PORTSDIR}/graphics/gdk-pixbuf \
+		intl.2:${PORTSDIR}/devel/gettext \
+		iconv.3:${PORTSDIR}/converters/libiconv
 
+USE_BISON=	yes
+USE_GLIB=	yes
 USE_GTK=	yes
+USE_ESOUND=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 USE_GMAKE=	yes
-MAKE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" DEST="${PREFIX}" \
-		OSTYPE="${OPSYS}" MAKE_CMD="${GMAKE}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
-MAN1=		nt.1
 
-PORTDOCS=	ChangeLog LICENSE NAMES PLANS THANKS TODO TROUBLES \
-		FAQ FAQ.de FAQ.es FAQ.fr FAQ.gr \
-		INSTALL INSTALL.de INSTALL.es INSTALL.fr INSTALL.gr \
-		INSTALL.he INSTALL.pl INSTALL.pt_BR \
-		README README.de README.en README.es README.gr \
-		README.pl README.pt_BR README.ru
+MAN1=		nt.1
 
-post-install:
-	@${INSTALL_MAN} ${WRKSRC}/../nt.1 ${PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/../${file} ${DOCSDIR}
-.endfor
-.endif
+post-patch:
+	@${PERL} -pi -e "s,Bison ,Bison,g ; \
+		s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
+	@${PERL} -pi -e 's,-not,\\!,g' ${WRKSRC}/share/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/ftp/downloader/distinfo b/ftp/downloader/distinfo
index 8b4d93ccc845..2ac0f38841e5 100644
--- a/ftp/downloader/distinfo
+++ b/ftp/downloader/distinfo
@@ -1 +1 @@
-MD5 (nt-1.30.tar.gz) = 969f5a5acd6fd88901031a87b5b3f1a6
+MD5 (d4x-2.0.tar.gz) = cf24d87c980684f3309ab5e5db77a252
diff --git a/ftp/downloader/files/patch-DOC:Makefile.in b/ftp/downloader/files/patch-DOC:Makefile.in
new file mode 100644
index 000000000000..7a37e8e22366
--- /dev/null
+++ b/ftp/downloader/files/patch-DOC:Makefile.in
@@ -0,0 +1,20 @@
+--- DOC/Makefile.in.orig	Wed May  1 03:22:50 2002
++++ DOC/Makefile.in	Wed May  1 03:27:40 2002
+@@ -37,7 +37,7 @@
+ mandir = @mandir@
+ includedir = @includedir@
+ oldincludedir = /usr/include
+-pkgdatadir = $(datadir)/@PACKAGE@
++pkgdatadir = $(datadir)/doc/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
+@@ -161,7 +161,7 @@
+ 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
++	  inst=`echo $$inst`.$$ext; \
+ 	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
+ 	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
diff --git a/ftp/downloader/files/patch-locstr.cc b/ftp/downloader/files/patch-locstr.cc
new file mode 100644
index 000000000000..e7ec87654be3
--- /dev/null
+++ b/ftp/downloader/files/patch-locstr.cc
@@ -0,0 +1,11 @@
+--- main/locstr.cc.orig	Wed May  1 02:32:33 2002
++++ main/locstr.cc	Wed May  1 02:50:38 2002
+@@ -711,7 +711,7 @@
+ 			sscanf_int(tmpdata,&(date.tm_sec));
+ 		};
+ 	};
+-	return(mktime(&date)+timezone);
++	return(mktime(&date)+date.tm_gmtoff);
+ };
+ 
+ /* check_mask();
diff --git a/ftp/downloader/files/patch-main:Makefile.in b/ftp/downloader/files/patch-main:Makefile.in
new file mode 100644
index 000000000000..c9d38e47d0ee
--- /dev/null
+++ b/ftp/downloader/files/patch-main:Makefile.in
@@ -0,0 +1,11 @@
+--- main/Makefile.in.orig	Wed May  1 03:16:32 2002
++++ main/Makefile.in	Wed May  1 03:17:03 2002
+@@ -251,7 +251,7 @@
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	  ; then \
+-	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
++	    f=`echo $$p1|sed 's/$$/$(EXEEXT)/'`; \
+ 	   echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
+ 	   $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
+ 	  else :; fi; \
diff --git a/ftp/downloader/pkg-plist b/ftp/downloader/pkg-plist
index 477051030fa8..1024254cde4f 100644
--- a/ftp/downloader/pkg-plist
+++ b/ftp/downloader/pkg-plist
@@ -1,61 +1,63 @@
 bin/nt
-%%PORTDOCS%%share/doc/downloader/ChangeLog
-%%PORTDOCS%%share/doc/downloader/LICENSE
-%%PORTDOCS%%share/doc/downloader/NAMES
-%%PORTDOCS%%share/doc/downloader/PLANS
-%%PORTDOCS%%share/doc/downloader/THANKS
-%%PORTDOCS%%share/doc/downloader/TODO
-%%PORTDOCS%%share/doc/downloader/TROUBLES
-%%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/INSTALL
-%%PORTDOCS%%share/doc/downloader/INSTALL.de
-%%PORTDOCS%%share/doc/downloader/INSTALL.es
-%%PORTDOCS%%share/doc/downloader/INSTALL.fr
-%%PORTDOCS%%share/doc/downloader/INSTALL.gr
-%%PORTDOCS%%share/doc/downloader/INSTALL.he
-%%PORTDOCS%%share/doc/downloader/INSTALL.pl
-%%PORTDOCS%%share/doc/downloader/INSTALL.pt_BR
-%%PORTDOCS%%share/doc/downloader/README
-%%PORTDOCS%%share/doc/downloader/README.de
-%%PORTDOCS%%share/doc/downloader/README.en
-%%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%%@dirrm share/doc/downloader
-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/fi/LC_MESSAGES/nt.mo
-share/locale/fr/LC_MESSAGES/nt.mo
-share/locale/he/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/iw/LC_MESSAGES/nt.mo
-share/locale/ja/LC_MESSAGES/nt.mo
-share/locale/ko/LC_MESSAGES/nt.mo
-share/locale/nl/LC_MESSAGES/nt.mo
-share/locale/pl/LC_MESSAGES/nt.mo
-share/locale/pt_BR/LC_MESSAGES/nt.mo
-share/locale/ru/LC_MESSAGES/nt.mo
-share/locale/sk/LC_MESSAGES/nt.mo
-share/locale/tr/LC_MESSAGES/nt.mo
-share/locale/uk/LC_MESSAGES/nt.mo
-share/locale/zh_CN.GBK/LC_MESSAGES/nt.mo
-share/locale/zh_TW/LC_MESSAGES/nt.mo
+share/doc/d4x/FAQ
+share/doc/d4x/FAQ.de
+share/doc/d4x/FAQ.es
+share/doc/d4x/FAQ.fr
+share/doc/d4x/FAQ.gr
+share/doc/d4x/INSTALL
+share/doc/d4x/INSTALL.de
+share/doc/d4x/INSTALL.es
+share/doc/d4x/INSTALL.fr
+share/doc/d4x/INSTALL.gr
+share/doc/d4x/INSTALL.he
+share/doc/d4x/INSTALL.pl
+share/doc/d4x/INSTALL.pt_BR
+share/doc/d4x/LICENSE
+share/doc/d4x/NAMES
+share/doc/d4x/THANKS
+share/doc/d4x/TROUBLES
+@dirrm share/doc/d4x
+share/locale/bg/LC_MESSAGES/d4x.mo
+share/locale/de/LC_MESSAGES/d4x.mo
+share/locale/es/LC_MESSAGES/d4x.mo
+share/locale/fr/LC_MESSAGES/d4x.mo
+share/locale/it/LC_MESSAGES/d4x.mo
+share/locale/ru/LC_MESSAGES/d4x.mo
 share/d4x/sounds/add.wav
 share/d4x/sounds/complete.wav
 share/d4x/sounds/dnd.wav
 share/d4x/sounds/fail.wav
 share/d4x/sounds/finish.wav
 share/d4x/sounds/startup.wav
+share/d4x/themes/glass.xml
+share/d4x/themes/glass/dnd1.png
+share/d4x/themes/glass/dnd2.png
+share/d4x/themes/old_theme.xml
+share/d4x/themes/old_theme/buttons/add.png
+share/d4x/themes/old_theme/buttons/clearlist.png
+share/d4x/themes/old_theme/buttons/clipboardadd.png
+share/d4x/themes/old_theme/buttons/continue.png
+share/d4x/themes/old_theme/buttons/del.png
+share/d4x/themes/old_theme/buttons/delcompleted.png
+share/d4x/themes/old_theme/buttons/dnd.png
+share/d4x/themes/old_theme/buttons/load.png
+share/d4x/themes/old_theme/buttons/movedown.png
+share/d4x/themes/old_theme/buttons/moveup.png
+share/d4x/themes/old_theme/buttons/openlog.png
+share/d4x/themes/old_theme/buttons/preferences.png
+share/d4x/themes/old_theme/buttons/progress.png
+share/d4x/themes/old_theme/buttons/save.png
+share/d4x/themes/old_theme/buttons/speedhigh.png
+share/d4x/themes/old_theme/buttons/speedlow.png
+share/d4x/themes/old_theme/buttons/speedmedium.png
+share/d4x/themes/old_theme/buttons/stop.png
+share/d4x/themes/old_theme/dnd1.png
+share/d4x/themes/old_theme/dnd2.png
+share/d4x/themes/old_theme/dndmini.png
+share/d4x/themes/tooltip.xml
 @dirrm share/d4x/sounds
+@dirrm share/d4x/themes/old_theme/buttons
+@dirrm share/d4x/themes/old_theme
+@dirrm share/d4x/themes/glass
+@dirrm share/d4x/themes
 @dirrm share/d4x