- Update to 3.47.19

- Fix MASTER_SITES

Changes:	https://code.google.com/p/httrack/source/list
		https://code.google.com/p/httrack/source/browse/trunk/history.txt

3 files changed, 123 insertions, 125 deletions

diff --git a/www/httrack/Makefile b/www/httrack/Makefile
index e0607bf2660a..02a2c1a8ef88 100644
--- a/www/httrack/Makefile
+++ b/www/httrack/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	httrack
-PORTVERSION=	3.47.18
+PORTVERSION=	3.47.19
 CATEGORIES=	www
 MASTER_SITES=	http://download.httrack.com/ \
-		http://mirror.httrack.com/ \
+		http://mirror.httrack.com/historical/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -32,13 +32,13 @@ post-patch:
 	@${REINPLACE_CMD} -e '/DEFAULT_CFLAGS=/ s|-O -g3 ||g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/ install-data-hook/d' ${WRKSRC}/html/Makefile.in
 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' ${WRKSRC}/html/server/div/WebHTTrack*
-.if empty(PORT_OPTIONS:MDOCS)
+.if ! ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e '/^SUBDIRS = / s| html||' ${WRKSRC}/Makefile.in
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${INSTALL_DATA} ${WRKSRC}/html/httrack.css ${DOCSDIR}/html/httrack.css
+	${INSTALL_DATA} ${WRKSRC}/html/httrack.css ${DOCSDIR}/httrack.css
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/httrack/distinfo b/www/httrack/distinfo
index 0cd0a41f8504..616568ef75c6 100644
--- a/www/httrack/distinfo
+++ b/www/httrack/distinfo
@@ -1,2 +1,2 @@
-SHA256 (httrack-3.47.18.tar.gz) = 3a7c7e62404162bcdfecb01a899b085d9ee2cf34a4297788852d3b70e3826657
-SIZE (httrack-3.47.18.tar.gz) = 1762843
+SHA256 (httrack-3.47.19.tar.gz) = b9c02edd3b27cbfe836e7e544cb4d6f00edf0e5293e753a1aebe31e589b606f6
+SIZE (httrack-3.47.19.tar.gz) = 1779503
diff --git a/www/httrack/pkg-plist b/www/httrack/pkg-plist
index 08be00cd8857..5ee200b847e1 100644
--- a/www/httrack/pkg-plist
+++ b/www/httrack/pkg-plist
@@ -62,119 +62,118 @@ lib/libhttrack.so
 lib/libhttrack.so.2
 %%PORTDOCS%%share/applications/WebHTTrack-Websites.desktop
 %%PORTDOCS%%share/applications/WebHTTrack.desktop
+%%PORTDOCS%%%%DOCSDIR%%/abuse.html
+%%PORTDOCS%%%%DOCSDIR%%/addurl.html
+%%PORTDOCS%%%%DOCSDIR%%/cache.html
+%%PORTDOCS%%%%DOCSDIR%%/cmddoc.html
+%%PORTDOCS%%%%DOCSDIR%%/contact.html
+%%PORTDOCS%%%%DOCSDIR%%/dev.html
+%%PORTDOCS%%%%DOCSDIR%%/div/search.sh
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/fcguide.html
+%%PORTDOCS%%%%DOCSDIR%%/filters.html
+%%PORTDOCS%%%%DOCSDIR%%/greetings.txt
 %%PORTDOCS%%%%DOCSDIR%%/history.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/abuse.html
-%%PORTDOCS%%%%DOCSDIR%%/html/addurl.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cache.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cmddoc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/contact.html
-%%PORTDOCS%%%%DOCSDIR%%/html/dev.html
-%%PORTDOCS%%%%DOCSDIR%%/html/div/search.sh
-%%PORTDOCS%%%%DOCSDIR%%/html/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/html/fcguide.html
-%%PORTDOCS%%%%DOCSDIR%%/html/filters.html
-%%PORTDOCS%%%%DOCSDIR%%/html/greetings.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/history.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/httrack.css
-%%PORTDOCS%%%%DOCSDIR%%/html/httrack.man.html
-%%PORTDOCS%%%%DOCSDIR%%/html/images/bg_rings.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/images/header_title_4.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/images/screenshot_01.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/screenshot_01b.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/img/addurl1.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/addurl2.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/addurl3.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/addurl4.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/addurl5.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/backblue.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/fade.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/httrack.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap1_a.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap1_b.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap1_c.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap2_a.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap2_b.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap3_a.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap4_a.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap5_a.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap9.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap9_a.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap9_b.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap9_c.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap9_d.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap9_d2.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap9_d3.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap9_d4.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap9_d5.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap9_d6.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap9_d7.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap9_d8.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap9_e.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap9_f.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap9_g.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap9_g2.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap9_g3.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap9_h.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap9_i.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap9_j.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/img/snap9_k.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/library.html
-%%PORTDOCS%%%%DOCSDIR%%/html/license.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/options.html
-%%PORTDOCS%%%%DOCSDIR%%/html/overview.html
-%%PORTDOCS%%%%DOCSDIR%%/html/plug.html
-%%PORTDOCS%%%%DOCSDIR%%/html/plug_330.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scripting.html
-%%PORTDOCS%%%%DOCSDIR%%/html/server/about.html
-%%PORTDOCS%%%%DOCSDIR%%/html/server/addurl.html
-%%PORTDOCS%%%%DOCSDIR%%/html/server/error.html
-%%PORTDOCS%%%%DOCSDIR%%/html/server/exit.html
-%%PORTDOCS%%%%DOCSDIR%%/html/server/file.html
-%%PORTDOCS%%%%DOCSDIR%%/html/server/finished.html
-%%PORTDOCS%%%%DOCSDIR%%/html/server/help.html
-%%PORTDOCS%%%%DOCSDIR%%/html/server/images/bg_rings.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/server/images/fade.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/server/images/header_title_4.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/server/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/server/option1.html
-%%PORTDOCS%%%%DOCSDIR%%/html/server/option10.html
-%%PORTDOCS%%%%DOCSDIR%%/html/server/option11.html
-%%PORTDOCS%%%%DOCSDIR%%/html/server/option2.html
-%%PORTDOCS%%%%DOCSDIR%%/html/server/option2b.html
-%%PORTDOCS%%%%DOCSDIR%%/html/server/option3.html
-%%PORTDOCS%%%%DOCSDIR%%/html/server/option4.html
-%%PORTDOCS%%%%DOCSDIR%%/html/server/option5.html
-%%PORTDOCS%%%%DOCSDIR%%/html/server/option6.html
-%%PORTDOCS%%%%DOCSDIR%%/html/server/option7.html
-%%PORTDOCS%%%%DOCSDIR%%/html/server/option8.html
-%%PORTDOCS%%%%DOCSDIR%%/html/server/option9.html
-%%PORTDOCS%%%%DOCSDIR%%/html/server/refresh.html
-%%PORTDOCS%%%%DOCSDIR%%/html/server/sfx/finished.wav
-%%PORTDOCS%%%%DOCSDIR%%/html/server/sfx/silent.wav
-%%PORTDOCS%%%%DOCSDIR%%/html/server/step2.html
-%%PORTDOCS%%%%DOCSDIR%%/html/server/step3.html
-%%PORTDOCS%%%%DOCSDIR%%/html/server/step4.html
-%%PORTDOCS%%%%DOCSDIR%%/html/shelldoc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/start.html
-%%PORTDOCS%%%%DOCSDIR%%/html/step.html
-%%PORTDOCS%%%%DOCSDIR%%/html/step1.html
-%%PORTDOCS%%%%DOCSDIR%%/html/step2.html
-%%PORTDOCS%%%%DOCSDIR%%/html/step3.html
-%%PORTDOCS%%%%DOCSDIR%%/html/step4.html
-%%PORTDOCS%%%%DOCSDIR%%/html/step5.html
-%%PORTDOCS%%%%DOCSDIR%%/html/step9.html
-%%PORTDOCS%%%%DOCSDIR%%/html/step9_opt1.html
-%%PORTDOCS%%%%DOCSDIR%%/html/step9_opt10.html
-%%PORTDOCS%%%%DOCSDIR%%/html/step9_opt11.html
-%%PORTDOCS%%%%DOCSDIR%%/html/step9_opt2.html
-%%PORTDOCS%%%%DOCSDIR%%/html/step9_opt3.html
-%%PORTDOCS%%%%DOCSDIR%%/html/step9_opt4.html
-%%PORTDOCS%%%%DOCSDIR%%/html/step9_opt5.html
-%%PORTDOCS%%%%DOCSDIR%%/html/step9_opt6.html
-%%PORTDOCS%%%%DOCSDIR%%/html/step9_opt7.html
-%%PORTDOCS%%%%DOCSDIR%%/html/step9_opt8.html
-%%PORTDOCS%%%%DOCSDIR%%/html/step9_opt9.html
+%%PORTDOCS%%%%DOCSDIR%%/httrack.css
+%%PORTDOCS%%%%DOCSDIR%%/httrack.man.html
+%%PORTDOCS%%%%DOCSDIR%%/images/bg_rings.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/header_title_4.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/screenshot_01.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/screenshot_01b.jpg
+%%PORTDOCS%%%%DOCSDIR%%/img/addurl1.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/addurl2.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/addurl3.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/addurl4.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/addurl5.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/backblue.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/fade.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/httrack.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap1_a.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap1_b.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap1_c.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap2_a.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap2_b.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap3_a.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap4_a.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap5_a.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap9.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap9_a.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap9_b.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap9_c.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap9_d.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap9_d2.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap9_d3.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap9_d4.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap9_d5.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap9_d6.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap9_d7.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap9_d8.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap9_e.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap9_f.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap9_g.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap9_g2.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap9_g3.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap9_h.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap9_i.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap9_j.gif
+%%PORTDOCS%%%%DOCSDIR%%/img/snap9_k.gif
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/library.html
+%%PORTDOCS%%%%DOCSDIR%%/license.txt
+%%PORTDOCS%%%%DOCSDIR%%/options.html
+%%PORTDOCS%%%%DOCSDIR%%/overview.html
+%%PORTDOCS%%%%DOCSDIR%%/plug.html
+%%PORTDOCS%%%%DOCSDIR%%/plug_330.html
+%%PORTDOCS%%%%DOCSDIR%%/scripting.html
+%%PORTDOCS%%%%DOCSDIR%%/server/about.html
+%%PORTDOCS%%%%DOCSDIR%%/server/addurl.html
+%%PORTDOCS%%%%DOCSDIR%%/server/error.html
+%%PORTDOCS%%%%DOCSDIR%%/server/exit.html
+%%PORTDOCS%%%%DOCSDIR%%/server/file.html
+%%PORTDOCS%%%%DOCSDIR%%/server/finished.html
+%%PORTDOCS%%%%DOCSDIR%%/server/help.html
+%%PORTDOCS%%%%DOCSDIR%%/server/images/bg_rings.gif
+%%PORTDOCS%%%%DOCSDIR%%/server/images/fade.gif
+%%PORTDOCS%%%%DOCSDIR%%/server/images/header_title_4.gif
+%%PORTDOCS%%%%DOCSDIR%%/server/index.html
+%%PORTDOCS%%%%DOCSDIR%%/server/option1.html
+%%PORTDOCS%%%%DOCSDIR%%/server/option10.html
+%%PORTDOCS%%%%DOCSDIR%%/server/option11.html
+%%PORTDOCS%%%%DOCSDIR%%/server/option2.html
+%%PORTDOCS%%%%DOCSDIR%%/server/option2b.html
+%%PORTDOCS%%%%DOCSDIR%%/server/option3.html
+%%PORTDOCS%%%%DOCSDIR%%/server/option4.html
+%%PORTDOCS%%%%DOCSDIR%%/server/option5.html
+%%PORTDOCS%%%%DOCSDIR%%/server/option6.html
+%%PORTDOCS%%%%DOCSDIR%%/server/option7.html
+%%PORTDOCS%%%%DOCSDIR%%/server/option8.html
+%%PORTDOCS%%%%DOCSDIR%%/server/option9.html
+%%PORTDOCS%%%%DOCSDIR%%/server/refresh.html
+%%PORTDOCS%%%%DOCSDIR%%/server/sfx/finished.wav
+%%PORTDOCS%%%%DOCSDIR%%/server/sfx/silent.wav
+%%PORTDOCS%%%%DOCSDIR%%/server/step2.html
+%%PORTDOCS%%%%DOCSDIR%%/server/step3.html
+%%PORTDOCS%%%%DOCSDIR%%/server/step4.html
+%%PORTDOCS%%%%DOCSDIR%%/shelldoc.html
+%%PORTDOCS%%%%DOCSDIR%%/start.html
+%%PORTDOCS%%%%DOCSDIR%%/step.html
+%%PORTDOCS%%%%DOCSDIR%%/step1.html
+%%PORTDOCS%%%%DOCSDIR%%/step2.html
+%%PORTDOCS%%%%DOCSDIR%%/step3.html
+%%PORTDOCS%%%%DOCSDIR%%/step4.html
+%%PORTDOCS%%%%DOCSDIR%%/step5.html
+%%PORTDOCS%%%%DOCSDIR%%/step9.html
+%%PORTDOCS%%%%DOCSDIR%%/step9_opt1.html
+%%PORTDOCS%%%%DOCSDIR%%/step9_opt10.html
+%%PORTDOCS%%%%DOCSDIR%%/step9_opt11.html
+%%PORTDOCS%%%%DOCSDIR%%/step9_opt2.html
+%%PORTDOCS%%%%DOCSDIR%%/step9_opt3.html
+%%PORTDOCS%%%%DOCSDIR%%/step9_opt4.html
+%%PORTDOCS%%%%DOCSDIR%%/step9_opt5.html
+%%PORTDOCS%%%%DOCSDIR%%/step9_opt6.html
+%%PORTDOCS%%%%DOCSDIR%%/step9_opt7.html
+%%PORTDOCS%%%%DOCSDIR%%/step9_opt8.html
+%%PORTDOCS%%%%DOCSDIR%%/step9_opt9.html
 %%PORTDOCS%%%%DOCSDIR%%/httrack-doc.html
 %%PORTDATA%%%%DATADIR%%/lang.def
 %%PORTDATA%%%%DATADIR%%/lang.indexes
@@ -244,13 +243,12 @@ lib/libhttrack.so.2
 %%PORTDATA%%@dirrm %%DATADIR%%/libtest
 %%PORTDATA%%@dirrm %%DATADIR%%/lang
 %%PORTDATA%%@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/server/sfx
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/server/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/server
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/img
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/div
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/server/sfx
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/server/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/server
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/img
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/div
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTDOCS%%@dirrmtry share/applications
 %%PORTDATA%%@dirrm lib/httrack