3 files changed, 43 insertions, 35 deletions

diff --git a/ftp/downloader/Makefile b/ftp/downloader/Makefile
index 9aa736ccc20d..f34e7c384913 100644
--- a/ftp/downloader/Makefile
+++ b/ftp/downloader/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	downloader
-PORTVERSION=	2.03
+PORTVERSION=	2.4.1
 CATEGORIES=	ftp
 MASTER_SITES=	http://www.krasu.ru/soft/chuchelo/files/ \
 		ftp://ftp.chg.ru/pub/X11/applications/Xdownloader/ \
@@ -17,40 +17,41 @@ DISTNAME=	d4x-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
 
-USE_REINPLACE=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gtk12 esound
+USE_GNOME=	esound
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--enable-release
 
 MAN1=		nt.1
 
+DATADIR=	${PREFIX}/share/d4x
 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:
-	@${REINPLACE_CMD} -e 's|CXXFLAGS="-O."|CXXFLAGS=\$$CXXFLAGS|g ; \
+	@${REINPLACE_CMD} -e 's| $$OPTFLAGS||g ; \
 		 s|OS_CXXFLAGS="-pthread"|OS_CXXFLAGS="${PTHREAD_CFLAGS}"|g ; \
-		 s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's| DOC||g' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|-not|\\!|g' ${WRKSRC}/share/Makefile.in
+		 s|-pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's| DOC||g ; \
+		 s| share||g' ${WRKSRC}/Makefile.in
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/DOC/nt.1 ${MANPREFIX}/man/man1
+	@${MKDIR} ${DATADIR}
+	${TAR} -C ${WRKSRC}/share --exclude "Makefile*" \
+		-cf - . | ${TAR} -C ${DATADIR} --unlink -xf -
+	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${DATADIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/DOC/${file} ${DOCSDIR}
-.endfor
+	${TAR} -C ${WRKSRC}/DOC --exclude "Makefile*" --exclude "nt.1" \
+		-cf - . | ${TAR} -C ${DOCSDIR} --unlink -xf -
+	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/ftp/downloader/distinfo b/ftp/downloader/distinfo
index b631b6656481..85216b8286e5 100644
--- a/ftp/downloader/distinfo
+++ b/ftp/downloader/distinfo
@@ -1 +1 @@
-MD5 (d4x-2.03.tar.gz) = a60b293746cc4b6d64f108bcf2bbc3ba
+MD5 (d4x-2.4.1.tar.gz) = 9ff1521a6c7ecedb6d71f1e1a6a6696a
diff --git a/ftp/downloader/pkg-plist b/ftp/downloader/pkg-plist
index 81385d7888bc..6aa7e7a17afa 100644
--- a/ftp/downloader/pkg-plist
+++ b/ftp/downloader/pkg-plist
@@ -1,18 +1,26 @@
+bin/d4x
 bin/nt
+share/d4x/d4x_aqua.png
 share/d4x/ftpsearch.xml
+share/d4x/nt-gray.png
+share/d4x/nt-mini.xpm
+share/d4x/nt-wm.png
+share/d4x/nt.desktop
+share/d4x/nt.png
+share/d4x/nt.wmconfig
+share/d4x/nt.xpm
 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/glass.xml
 share/d4x/themes/glass2/dnd1.png
 share/d4x/themes/glass2/dnd2.png
 share/d4x/themes/glass2.xml
-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
@@ -31,6 +39,9 @@ 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/old_theme/queue/complete.png
 share/d4x/themes/old_theme/queue/failed.png
 share/d4x/themes/old_theme/queue/paused.png
@@ -39,25 +50,22 @@ share/d4x/themes/old_theme/queue/runbad.png
 share/d4x/themes/old_theme/queue/runpart.png
 share/d4x/themes/old_theme/queue/stopwait.png
 share/d4x/themes/old_theme/queue/wait.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/old_theme.xml
 share/d4x/themes/tooltip.xml
 %%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/README
+%%PORTDOCS%%share/doc/d4x/README.de
+%%PORTDOCS%%share/doc/d4x/README.en
+%%PORTDOCS%%share/doc/d4x/README.es
+%%PORTDOCS%%share/doc/d4x/README.gr
+%%PORTDOCS%%share/doc/d4x/README.pl
+%%PORTDOCS%%share/doc/d4x/README.pt_BR
+%%PORTDOCS%%share/doc/d4x/README.ru
 %%PORTDOCS%%share/doc/d4x/THANKS
 %%PORTDOCS%%share/doc/d4x/TROUBLES
 share/locale/bg/LC_MESSAGES/d4x.mo
@@ -69,11 +77,10 @@ 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/queue
+@dirrm share/d4x/themes/old_theme/buttons
 @dirrm share/d4x/themes/old_theme
 @dirrm share/d4x/themes/glass2
 @dirrm share/d4x/themes/glass
 @dirrm share/d4x/themes
 @dirrm share/d4x/sounds
-@dirrm share/d4x