5 files changed, 53 insertions, 69 deletions

diff --git a/ftp/downloader/Makefile b/ftp/downloader/Makefile
index 9e612f3d20a7..f72abc626799 100644
--- a/ftp/downloader/Makefile
+++ b/ftp/downloader/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	downloader
-PORTVERSION=	2.0
+PORTVERSION=	2.01
 CATEGORIES=	ftp
 MASTER_SITES=	http://www.krasu.ru/soft/chuchelo/files/ \
 		ftp://ftp.chg.ru/pub/X11/applications/Xdownloader/ \
@@ -17,25 +17,39 @@ DISTNAME=	d4x-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gdk_pixbuf:${PORTSDIR}/graphics/gdk-pixbuf \
-		intl.2:${PORTSDIR}/devel/gettext \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
+		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
 
-USE_BISON=	yes
-USE_GLIB=	yes
 USE_GTK=	yes
 USE_ESOUND=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man
-USE_GMAKE=	yes
+CONFIGURE_ARGS=	--enable-release
 
 MAN1=		nt.1
 
+DOCSDIR=	${PREFIX}/share/doc/d4x
+PORTDOCS=	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 LICENSE NAMES THANKS TROUBLES
+
 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
+	@${PERL} -pi -e 's|CXXFLAGS="-O."|CXXFLAGS=\$$CXXFLAGS|g ; \
+		 s|OS_CXXFLAGS="-pthread"|OS_CXXFLAGS="${PTHREAD_CFLAGS}"|g ; \
+		 s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+	@${PERL} -pi -e 's| DOC||g' ${WRKSRC}/Makefile.in
+	@${PERL} -pi -e 's|-not|\\!|g' ${WRKSRC}/share/Makefile.in
+
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/DOC/nt.1 ${MANPREFIX}/man/man1
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/DOC/${file} ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/ftp/downloader/distinfo b/ftp/downloader/distinfo
index 2ac0f38841e5..33f6cdbb081d 100644
--- a/ftp/downloader/distinfo
+++ b/ftp/downloader/distinfo
@@ -1 +1 @@
-MD5 (d4x-2.0.tar.gz) = cf24d87c980684f3309ab5e5db77a252
+MD5 (d4x-2.01.tar.gz) = 85d1974895b6d5431dfd3c42bb887b4d
diff --git a/ftp/downloader/files/patch-DOC:Makefile.in b/ftp/downloader/files/patch-DOC:Makefile.in
deleted file mode 100644
index 7a37e8e22366..000000000000
--- a/ftp/downloader/files/patch-DOC:Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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-main:Makefile.in b/ftp/downloader/files/patch-main:Makefile.in
deleted file mode 100644
index c9d38e47d0ee..000000000000
--- a/ftp/downloader/files/patch-main:Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 1024254cde4f..695821171239 100644
--- a/ftp/downloader/pkg-plist
+++ b/ftp/downloader/pkg-plist
@@ -1,28 +1,4 @@
 bin/nt
-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
@@ -55,9 +31,34 @@ 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
+%%PORTDOCS%%share/doc/d4x/FAQ
+%%PORTDOCS%%share/doc/d4x/FAQ.de
+%%PORTDOCS%%share/doc/d4x/FAQ.es
+%%PORTDOCS%%share/doc/d4x/FAQ.fr
+%%PORTDOCS%%share/doc/d4x/FAQ.gr
+%%PORTDOCS%%share/doc/d4x/INSTALL
+%%PORTDOCS%%share/doc/d4x/INSTALL.de
+%%PORTDOCS%%share/doc/d4x/INSTALL.es
+%%PORTDOCS%%share/doc/d4x/INSTALL.fr
+%%PORTDOCS%%share/doc/d4x/INSTALL.gr
+%%PORTDOCS%%share/doc/d4x/INSTALL.he
+%%PORTDOCS%%share/doc/d4x/INSTALL.pl
+%%PORTDOCS%%share/doc/d4x/INSTALL.pt_BR
+%%PORTDOCS%%share/doc/d4x/LICENSE
+%%PORTDOCS%%share/doc/d4x/NAMES
+%%PORTDOCS%%share/doc/d4x/THANKS
+%%PORTDOCS%%share/doc/d4x/TROUBLES
+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/locale/uk/LC_MESSAGES/d4x.mo
+%%PORTDOCS%%@dirrm share/doc/d4x
 @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/sounds
 @dirrm share/d4x