4 files changed, 188 insertions, 191 deletions

diff --git a/www/httrack/Makefile b/www/httrack/Makefile
index 439034c54de5..9b19ff35f310 100644
--- a/www/httrack/Makefile
+++ b/www/httrack/Makefile
@@ -6,33 +6,41 @@
 #
 
 PORTNAME=	httrack
-PORTVERSION=	3.43.2
+PORTVERSION=	3.43.9
 CATEGORIES=	www
 MASTER_SITES=	http://www.httrack.com/ \
 		http://sunpoet.net/distfiles/
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/.([0-9]*)$/-\1/}
+DISTNAME=	${PORTNAME}-${PORTVERSION:C/.([0-9]*)$/-\1/}C
 
 MAINTAINER=	sunpoet@sunpoet.net
 COMMENT=	Easy-to-use offline browser utility and website copier
 
 CONFIGURE_ARGS=	--docdir="${DOCSDIR}"
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-USE_GNOME=	gnometarget
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:22
-USE_LDCONFIG=	yes
+USE_GMAKE=	yes
+USE_LDCONFIG=	${PREFIX}/lib
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 MAN1=		htsserver.1 httrack.1 proxytrack.1 webhttrack.1
 
-.if defined(NOPORTDATA) || defined(NOPORTDOCS)
-NOPORTDATA=	yes
-NOPORTDOCS=	yes
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Makefile.in
+.if !defined(NOPORTDATA)
+USE_LDCONFIG+=	${PREFIX}/lib/httrack
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-O -g3 ||g' \
+	@${REINPLACE_CMD} -e '/DEFAULT_CFLAGS=/ s|-O -g3 ||g' \
 		-e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e '/ install-data-hook/D' ${WRKSRC}/html/Makefile.in
+.if defined(NOPORTDATA)
+	@${REINPLACE_CMD} -E '/^SUBDIRS = / s/ (lang|libtest|templates)//g' ${WRKSRC}/Makefile.in
+.endif
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e '/^SUBDIRS = / s| html||' ${WRKSRC}/Makefile.in
+.endif
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${INSTALL_DATA} ${WRKSRC}/html/httrack.css ${DOCSDIR}/html/httrack.css
+.endif
 
 .include <bsd.port.mk>
diff --git a/www/httrack/distinfo b/www/httrack/distinfo
index faf11a6be7f0..c65179e77b91 100644
--- a/www/httrack/distinfo
+++ b/www/httrack/distinfo
@@ -1,3 +1,3 @@
-MD5 (httrack-3.43-2.tar.gz) = a6debc9fe8b7049e5de986357c7dadd8
-SHA256 (httrack-3.43-2.tar.gz) = 5c0cbb742c953aa4efde656cddff84fa1a3d6913be9919b1710479612de3f97b
-SIZE (httrack-3.43-2.tar.gz) = 1667656
+MD5 (httrack-3.43-9C.tar.gz) = d52539dfa39ee9bd2593ba44e2b3e149
+SHA256 (httrack-3.43-9C.tar.gz) = aaee0d769ceb2bed272d55aa3578c022fbc7ac746858701b1e496d4eaa19004a
+SIZE (httrack-3.43-9C.tar.gz) = 1676872
diff --git a/www/httrack/files/extra-patch-Makefile.in b/www/httrack/files/extra-patch-Makefile.in
deleted file mode 100644
index c0fdbbed1cc7..000000000000
--- a/www/httrack/files/extra-patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2008-07-29 05:17:53.000000000 +0800
-+++ Makefile.in	2008-09-03 23:21:49.313902785 +0800
-@@ -146,7 +146,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- 
--SUBDIRS = src man m4 libtest templates lang html
-+SUBDIRS = src man m4 libtest templates lang
- 
- EXTRA_DIST = INSTALL INSTALL.FreeBSD INSTALL.Linux \
- 		gpl.txt gpl-fr.txt license.txt greetings.txt history.txt \
diff --git a/www/httrack/pkg-plist b/www/httrack/pkg-plist
index 6ee670dce25d..306e498dfe89 100644
--- a/www/httrack/pkg-plist
+++ b/www/httrack/pkg-plist
@@ -12,46 +12,46 @@ include/httrack/htsmodules.h
 include/httrack/htsopt.h
 include/httrack/htswrap.h
 include/httrack/httrack-library.h
-lib/httrack/libbaselinks.a
-lib/httrack/libbaselinks.la
-lib/httrack/libbaselinks.so
-lib/httrack/libbaselinks.so.1
-lib/httrack/libchangecontent.a
-lib/httrack/libchangecontent.la
-lib/httrack/libchangecontent.so
-lib/httrack/libchangecontent.so.1
-lib/httrack/libcontentfilter.a
-lib/httrack/libcontentfilter.la
-lib/httrack/libcontentfilter.so
-lib/httrack/libcontentfilter.so.1
-lib/httrack/libdisplayheader.a
-lib/httrack/libdisplayheader.la
-lib/httrack/libdisplayheader.so
-lib/httrack/libdisplayheader.so.1
-lib/httrack/libfilename.a
-lib/httrack/libfilename.la
-lib/httrack/libfilename.so
-lib/httrack/libfilename.so.1
-lib/httrack/libfilename2.a
-lib/httrack/libfilename2.la
-lib/httrack/libfilename2.so
-lib/httrack/libfilename2.so.1
-lib/httrack/libfilenameiisbug.a
-lib/httrack/libfilenameiisbug.la
-lib/httrack/libfilenameiisbug.so
-lib/httrack/libfilenameiisbug.so.1
-lib/httrack/liblistlinks.a
-lib/httrack/liblistlinks.la
-lib/httrack/liblistlinks.so
-lib/httrack/liblistlinks.so.1
-lib/httrack/liblog.a
-lib/httrack/liblog.la
-lib/httrack/liblog.so
-lib/httrack/liblog.so.1
-lib/httrack/libsimple.a
-lib/httrack/libsimple.la
-lib/httrack/libsimple.so
-lib/httrack/libsimple.so.1
+%%PORTDATA%%lib/httrack/libbaselinks.a
+%%PORTDATA%%lib/httrack/libbaselinks.la
+%%PORTDATA%%lib/httrack/libbaselinks.so
+%%PORTDATA%%lib/httrack/libbaselinks.so.1
+%%PORTDATA%%lib/httrack/libchangecontent.a
+%%PORTDATA%%lib/httrack/libchangecontent.la
+%%PORTDATA%%lib/httrack/libchangecontent.so
+%%PORTDATA%%lib/httrack/libchangecontent.so.1
+%%PORTDATA%%lib/httrack/libcontentfilter.a
+%%PORTDATA%%lib/httrack/libcontentfilter.la
+%%PORTDATA%%lib/httrack/libcontentfilter.so
+%%PORTDATA%%lib/httrack/libcontentfilter.so.1
+%%PORTDATA%%lib/httrack/libdisplayheader.a
+%%PORTDATA%%lib/httrack/libdisplayheader.la
+%%PORTDATA%%lib/httrack/libdisplayheader.so
+%%PORTDATA%%lib/httrack/libdisplayheader.so.1
+%%PORTDATA%%lib/httrack/libfilename.a
+%%PORTDATA%%lib/httrack/libfilename.la
+%%PORTDATA%%lib/httrack/libfilename.so
+%%PORTDATA%%lib/httrack/libfilename.so.1
+%%PORTDATA%%lib/httrack/libfilename2.a
+%%PORTDATA%%lib/httrack/libfilename2.la
+%%PORTDATA%%lib/httrack/libfilename2.so
+%%PORTDATA%%lib/httrack/libfilename2.so.1
+%%PORTDATA%%lib/httrack/libfilenameiisbug.a
+%%PORTDATA%%lib/httrack/libfilenameiisbug.la
+%%PORTDATA%%lib/httrack/libfilenameiisbug.so
+%%PORTDATA%%lib/httrack/libfilenameiisbug.so.1
+%%PORTDATA%%lib/httrack/liblistlinks.a
+%%PORTDATA%%lib/httrack/liblistlinks.la
+%%PORTDATA%%lib/httrack/liblistlinks.so
+%%PORTDATA%%lib/httrack/liblistlinks.so.1
+%%PORTDATA%%lib/httrack/liblog.a
+%%PORTDATA%%lib/httrack/liblog.la
+%%PORTDATA%%lib/httrack/liblog.so
+%%PORTDATA%%lib/httrack/liblog.so.1
+%%PORTDATA%%lib/httrack/libsimple.a
+%%PORTDATA%%lib/httrack/libsimple.la
+%%PORTDATA%%lib/httrack/libsimple.so
+%%PORTDATA%%lib/httrack/libsimple.so.1
 lib/libhtsjava.a
 lib/libhtsjava.la
 lib/libhtsjava.so
@@ -63,119 +63,121 @@ lib/libhttrack.so.2
 %%PORTDOCS%%share/applications/WebHTTrack-Websites.desktop
 %%PORTDOCS%%share/applications/WebHTTrack.desktop
 %%PORTDOCS%%%%DOCSDIR%%/history.txt
-%%PORTDOCS%%%%DOCSDIR%%/html
+%%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/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-doc.html
-%%PORTDATA%%%%DATADIR%%/html/abuse.html
-%%PORTDATA%%%%DATADIR%%/html/addurl.html
-%%PORTDATA%%%%DATADIR%%/html/cache.html
-%%PORTDATA%%%%DATADIR%%/html/cmddoc.html
-%%PORTDATA%%%%DATADIR%%/html/contact.html
-%%PORTDATA%%%%DATADIR%%/html/dev.html
-%%PORTDATA%%%%DATADIR%%/html/div/search.sh
-%%PORTDATA%%%%DATADIR%%/html/faq.html
-%%PORTDATA%%%%DATADIR%%/html/fcguide.html
-%%PORTDATA%%%%DATADIR%%/html/filters.html
-%%PORTDATA%%%%DATADIR%%/html/greetings.txt
-%%PORTDATA%%%%DATADIR%%/html/history.txt
-%%PORTDATA%%%%DATADIR%%/html/httrack.man.html
-%%PORTDATA%%%%DATADIR%%/html/images/bg_rings.gif
-%%PORTDATA%%%%DATADIR%%/html/images/header_title_4.gif
-%%PORTDATA%%%%DATADIR%%/html/images/screenshot_01.jpg
-%%PORTDATA%%%%DATADIR%%/html/images/screenshot_01b.jpg
-%%PORTDATA%%%%DATADIR%%/html/img/addurl1.gif
-%%PORTDATA%%%%DATADIR%%/html/img/addurl2.gif
-%%PORTDATA%%%%DATADIR%%/html/img/addurl3.gif
-%%PORTDATA%%%%DATADIR%%/html/img/addurl4.gif
-%%PORTDATA%%%%DATADIR%%/html/img/addurl5.gif
-%%PORTDATA%%%%DATADIR%%/html/img/backblue.gif
-%%PORTDATA%%%%DATADIR%%/html/img/fade.gif
-%%PORTDATA%%%%DATADIR%%/html/img/httrack.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap1_a.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap1_b.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap1_c.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap2_a.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap2_b.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap3_a.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap4_a.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap5_a.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap9.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap9_a.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap9_b.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap9_c.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap9_d.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap9_d2.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap9_d3.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap9_d4.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap9_d5.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap9_d6.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap9_d7.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap9_d8.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap9_e.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap9_f.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap9_g.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap9_g2.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap9_g3.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap9_h.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap9_i.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap9_j.gif
-%%PORTDATA%%%%DATADIR%%/html/img/snap9_k.gif
-%%PORTDATA%%%%DATADIR%%/html/index.html
-%%PORTDATA%%%%DATADIR%%/html/library.html
-%%PORTDATA%%%%DATADIR%%/html/license.txt
-%%PORTDATA%%%%DATADIR%%/html/options.html
-%%PORTDATA%%%%DATADIR%%/html/overview.html
-%%PORTDATA%%%%DATADIR%%/html/plug.html
-%%PORTDATA%%%%DATADIR%%/html/plug_330.html
-%%PORTDATA%%%%DATADIR%%/html/scripting.html
-%%PORTDATA%%%%DATADIR%%/html/server/about.html
-%%PORTDATA%%%%DATADIR%%/html/server/addurl.html
-%%PORTDATA%%%%DATADIR%%/html/server/error.html
-%%PORTDATA%%%%DATADIR%%/html/server/exit.html
-%%PORTDATA%%%%DATADIR%%/html/server/file.html
-%%PORTDATA%%%%DATADIR%%/html/server/finished.html
-%%PORTDATA%%%%DATADIR%%/html/server/help.html
-%%PORTDATA%%%%DATADIR%%/html/server/images/bg_rings.gif
-%%PORTDATA%%%%DATADIR%%/html/server/images/fade.gif
-%%PORTDATA%%%%DATADIR%%/html/server/images/header_title_4.gif
-%%PORTDATA%%%%DATADIR%%/html/server/index.html
-%%PORTDATA%%%%DATADIR%%/html/server/option1.html
-%%PORTDATA%%%%DATADIR%%/html/server/option10.html
-%%PORTDATA%%%%DATADIR%%/html/server/option11.html
-%%PORTDATA%%%%DATADIR%%/html/server/option2.html
-%%PORTDATA%%%%DATADIR%%/html/server/option2b.html
-%%PORTDATA%%%%DATADIR%%/html/server/option3.html
-%%PORTDATA%%%%DATADIR%%/html/server/option4.html
-%%PORTDATA%%%%DATADIR%%/html/server/option5.html
-%%PORTDATA%%%%DATADIR%%/html/server/option6.html
-%%PORTDATA%%%%DATADIR%%/html/server/option7.html
-%%PORTDATA%%%%DATADIR%%/html/server/option8.html
-%%PORTDATA%%%%DATADIR%%/html/server/option9.html
-%%PORTDATA%%%%DATADIR%%/html/server/refresh.html
-%%PORTDATA%%%%DATADIR%%/html/server/sfx/finished.wav
-%%PORTDATA%%%%DATADIR%%/html/server/step2.html
-%%PORTDATA%%%%DATADIR%%/html/server/step3.html
-%%PORTDATA%%%%DATADIR%%/html/server/step4.html
-%%PORTDATA%%%%DATADIR%%/html/shelldoc.html
-%%PORTDATA%%%%DATADIR%%/html/start.html
-%%PORTDATA%%%%DATADIR%%/html/step.html
-%%PORTDATA%%%%DATADIR%%/html/step1.html
-%%PORTDATA%%%%DATADIR%%/html/step2.html
-%%PORTDATA%%%%DATADIR%%/html/step3.html
-%%PORTDATA%%%%DATADIR%%/html/step4.html
-%%PORTDATA%%%%DATADIR%%/html/step5.html
-%%PORTDATA%%%%DATADIR%%/html/step9.html
-%%PORTDATA%%%%DATADIR%%/html/step9_opt1.html
-%%PORTDATA%%%%DATADIR%%/html/step9_opt10.html
-%%PORTDATA%%%%DATADIR%%/html/step9_opt11.html
-%%PORTDATA%%%%DATADIR%%/html/step9_opt2.html
-%%PORTDATA%%%%DATADIR%%/html/step9_opt3.html
-%%PORTDATA%%%%DATADIR%%/html/step9_opt4.html
-%%PORTDATA%%%%DATADIR%%/html/step9_opt5.html
-%%PORTDATA%%%%DATADIR%%/html/step9_opt6.html
-%%PORTDATA%%%%DATADIR%%/html/step9_opt7.html
-%%PORTDATA%%%%DATADIR%%/html/step9_opt8.html
-%%PORTDATA%%%%DATADIR%%/html/step9_opt9.html
-%%PORTDATA%%%%DATADIR%%/icons/webhttrack.xpm
+%%PORTDOCS%%share/httrack/icons/webhttrack.xpm
+%%PORTDATA%%%%DATADIR%%/lang.def
+%%PORTDATA%%%%DATADIR%%/lang.indexes
 %%PORTDATA%%%%DATADIR%%/lang/Bulgarian.txt
 %%PORTDATA%%%%DATADIR%%/lang/Castellano.txt
 %%PORTDATA%%%%DATADIR%%/lang/Cesky.txt
@@ -204,8 +206,6 @@ lib/libhttrack.so.2
 %%PORTDATA%%%%DATADIR%%/lang/Svenska.txt
 %%PORTDATA%%%%DATADIR%%/lang/Turkish.txt
 %%PORTDATA%%%%DATADIR%%/lang/Ukrainian.txt
-%%PORTDATA%%%%DATADIR%%/lang.def
-%%PORTDATA%%%%DATADIR%%/lang.indexes
 %%PORTDATA%%%%DATADIR%%/libtest/callbacks-example-baselinks.c
 %%PORTDATA%%%%DATADIR%%/libtest/callbacks-example-changecontent.c
 %%PORTDATA%%%%DATADIR%%/libtest/callbacks-example-contentfilter.c
@@ -230,16 +230,16 @@ lib/libhttrack.so.2
 %%PORTDATA%%@dirrm %%DATADIR%%/templates
 %%PORTDATA%%@dirrm %%DATADIR%%/libtest
 %%PORTDATA%%@dirrm %%DATADIR%%/lang
-%%PORTDATA%%@dirrm %%DATADIR%%/icons
-%%PORTDATA%%@dirrm %%DATADIR%%/html/server/sfx
-%%PORTDATA%%@dirrm %%DATADIR%%/html/server/images
-%%PORTDATA%%@dirrm %%DATADIR%%/html/server
-%%PORTDATA%%@dirrm %%DATADIR%%/html/img
-%%PORTDATA%%@dirrm %%DATADIR%%/html/images
-%%PORTDATA%%@dirrm %%DATADIR%%/html/div
-%%PORTDATA%%@dirrm %%DATADIR%%/html
-%%PORTDATA%%@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm share/httrack/icons
+@dirrmtry share/httrack
+%%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%%
-@dirrm lib/httrack
-@dirrm include/httrack
 %%PORTDOCS%%@dirrmtry share/applications
+%%PORTDATA%%@dirrm lib/httrack
+@dirrm include/httrack