- Update to 3.32.03

- use DOCSDIR and DATADIR

2 files changed, 174 insertions, 174 deletions

diff --git a/www/httrack/Makefile b/www/httrack/Makefile
index 4ea5a4b7422d..b10820a2b81d 100644
--- a/www/httrack/Makefile
+++ b/www/httrack/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	httrack
-PORTVERSION=	3.32.00
+PORTVERSION=	3.32.03
 CATEGORIES=	www
 MASTER_SITES=	http://httrack.free.fr/mirror/ \
 		http://www.httrack.com/
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}-2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Easy-to-use offline browser utility and website copier
diff --git a/www/httrack/pkg-plist b/www/httrack/pkg-plist
index e6d457e99452..6e99aa97a5a9 100644
--- a/www/httrack/pkg-plist
+++ b/www/httrack/pkg-plist
@@ -34,179 +34,179 @@ lib/libhttrack.so
 lib/libhttrack.so.1
 share/applications/WebHTTrack-Websites.desktop
 share/applications/WebHTTrack.desktop
-share/doc/httrack/history.txt
-share/doc/httrack/html/abuse.html
-share/doc/httrack/html/addurl.html
-share/doc/httrack/html/cache.html
-share/doc/httrack/html/cmddoc.html
-share/doc/httrack/html/contact.html
-share/doc/httrack/html/dev.html
-share/doc/httrack/html/div/search.sh
-share/doc/httrack/html/faq.html
-share/doc/httrack/html/fcguide.html
-share/doc/httrack/html/filters.html
-share/doc/httrack/html/greetings.txt
-share/doc/httrack/html/history.txt
-share/doc/httrack/html/httrack.man.html
-share/doc/httrack/html/images/bg_rings.gif
-share/doc/httrack/html/images/header_title_4.gif
-share/doc/httrack/html/images/screenshot_01.jpg
-share/doc/httrack/html/images/screenshot_01b.jpg
-share/doc/httrack/html/img/addurl1.gif
-share/doc/httrack/html/img/addurl2.gif
-share/doc/httrack/html/img/addurl3.gif
-share/doc/httrack/html/img/addurl4.gif
-share/doc/httrack/html/img/addurl5.gif
-share/doc/httrack/html/img/backblue.gif
-share/doc/httrack/html/img/fade.gif
-share/doc/httrack/html/img/httrack.gif
-share/doc/httrack/html/img/snap1_a.gif
-share/doc/httrack/html/img/snap1_b.gif
-share/doc/httrack/html/img/snap1_c.gif
-share/doc/httrack/html/img/snap2_a.gif
-share/doc/httrack/html/img/snap2_b.gif
-share/doc/httrack/html/img/snap3_a.gif
-share/doc/httrack/html/img/snap4_a.gif
-share/doc/httrack/html/img/snap5_a.gif
-share/doc/httrack/html/img/snap9.gif
-share/doc/httrack/html/img/snap9_a.gif
-share/doc/httrack/html/img/snap9_b.gif
-share/doc/httrack/html/img/snap9_c.gif
-share/doc/httrack/html/img/snap9_d.gif
-share/doc/httrack/html/img/snap9_d2.gif
-share/doc/httrack/html/img/snap9_d3.gif
-share/doc/httrack/html/img/snap9_d4.gif
-share/doc/httrack/html/img/snap9_d5.gif
-share/doc/httrack/html/img/snap9_d6.gif
-share/doc/httrack/html/img/snap9_d7.gif
-share/doc/httrack/html/img/snap9_d8.gif
-share/doc/httrack/html/img/snap9_e.gif
-share/doc/httrack/html/img/snap9_f.gif
-share/doc/httrack/html/img/snap9_g.gif
-share/doc/httrack/html/img/snap9_g2.gif
-share/doc/httrack/html/img/snap9_g3.gif
-share/doc/httrack/html/img/snap9_h.gif
-share/doc/httrack/html/img/snap9_i.gif
-share/doc/httrack/html/img/snap9_j.gif
-share/doc/httrack/html/img/snap9_k.gif
-share/doc/httrack/html/index.html
-share/doc/httrack/html/library.html
-share/doc/httrack/html/license.txt
-share/doc/httrack/html/options.html
-share/doc/httrack/html/overview.html
-share/doc/httrack/html/plug.html
-share/doc/httrack/html/scripting.html
-share/doc/httrack/html/server/about.html
-share/doc/httrack/html/server/addurl.html
-share/doc/httrack/html/server/error.html
-share/doc/httrack/html/server/exit.html
-share/doc/httrack/html/server/file.html
-share/doc/httrack/html/server/finished.html
-share/doc/httrack/html/server/help.html
-share/doc/httrack/html/server/images/bg_rings.gif
-share/doc/httrack/html/server/images/fade.gif
-share/doc/httrack/html/server/images/header_title_4.gif
-share/doc/httrack/html/server/index.html
-share/doc/httrack/html/server/option1.html
-share/doc/httrack/html/server/option10.html
-share/doc/httrack/html/server/option11.html
-share/doc/httrack/html/server/option2.html
-share/doc/httrack/html/server/option2b.html
-share/doc/httrack/html/server/option3.html
-share/doc/httrack/html/server/option4.html
-share/doc/httrack/html/server/option5.html
-share/doc/httrack/html/server/option6.html
-share/doc/httrack/html/server/option7.html
-share/doc/httrack/html/server/option8.html
-share/doc/httrack/html/server/option9.html
-share/doc/httrack/html/server/refresh.html
-share/doc/httrack/html/server/step2.html
-share/doc/httrack/html/server/step3.html
-share/doc/httrack/html/server/step4.html
-share/doc/httrack/html/shelldoc.html
-share/doc/httrack/html/start.html
-share/doc/httrack/html/step.html
-share/doc/httrack/html/step1.html
-share/doc/httrack/html/step2.html
-share/doc/httrack/html/step3.html
-share/doc/httrack/html/step4.html
-share/doc/httrack/html/step5.html
-share/doc/httrack/html/step9.html
-share/doc/httrack/html/step9_opt1.html
-share/doc/httrack/html/step9_opt10.html
-share/doc/httrack/html/step9_opt11.html
-share/doc/httrack/html/step9_opt2.html
-share/doc/httrack/html/step9_opt3.html
-share/doc/httrack/html/step9_opt4.html
-share/doc/httrack/html/step9_opt5.html
-share/doc/httrack/html/step9_opt6.html
-share/doc/httrack/html/step9_opt7.html
-share/doc/httrack/html/step9_opt8.html
-share/doc/httrack/html/step9_opt9.html
-share/doc/httrack/httrack-doc.html
-share/httrack/html
-share/httrack/icons/webhttrack.xpm
-share/httrack/lang/Bulgarian.txt
-share/httrack/lang/Castellano.txt
-share/httrack/lang/Cesky.txt
-share/httrack/lang/Chinese-BIG5.txt
-share/httrack/lang/Chinese-Simplified.txt
-share/httrack/lang/Dansk.txt
-share/httrack/lang/Deutsch.txt
-share/httrack/lang/Eesti.txt
-share/httrack/lang/English.txt
-share/httrack/lang/Francais.txt
-share/httrack/lang/Greek.txt
-share/httrack/lang/Italiano.txt
-share/httrack/lang/Japanese.txt
-share/httrack/lang/Macedonian.txt
-share/httrack/lang/Magyar.txt
-share/httrack/lang/Nederlands.txt
-share/httrack/lang/Norsk.txt
-share/httrack/lang/Polski.txt
-share/httrack/lang/Portugues-Brasil.txt
-share/httrack/lang/Portugues.txt
-share/httrack/lang/Romanian.txt
-share/httrack/lang/Russian.txt
-share/httrack/lang/Slovak.txt
-share/httrack/lang/Slovenian.txt
-share/httrack/lang/Svenska.txt
-share/httrack/lang/Turkish.txt
-share/httrack/lang/Ukrainian.txt
-share/httrack/lang.def
-share/httrack/lang.indexes
-share/httrack/libtest/callbacks-example-baselinks.c
-share/httrack/libtest/callbacks-example-contentfilter.c
-share/httrack/libtest/callbacks-example-displayheader.c
-share/httrack/libtest/callbacks-example-filename.c
-share/httrack/libtest/callbacks-example-filename2.c
-share/httrack/libtest/callbacks-example-listlinks.c
-share/httrack/libtest/example.c
-share/httrack/libtest/example.dsp
-share/httrack/libtest/example.dsw
-share/httrack/libtest/example.h
-share/httrack/libtest/htssystem.h
-share/httrack/libtest/readme.txt
-share/httrack/templates/index-body.html
-share/httrack/templates/index-footer.html
-share/httrack/templates/index-header.html
-share/httrack/templates/topindex-body.html
-share/httrack/templates/topindex-bodycat.html
-share/httrack/templates/topindex-footer.html
-share/httrack/templates/topindex-header.html
+%%DOCSDIR%%/history.txt
+%%DOCSDIR%%/html/abuse.html
+%%DOCSDIR%%/html/addurl.html
+%%DOCSDIR%%/html/cache.html
+%%DOCSDIR%%/html/cmddoc.html
+%%DOCSDIR%%/html/contact.html
+%%DOCSDIR%%/html/dev.html
+%%DOCSDIR%%/html/div/search.sh
+%%DOCSDIR%%/html/faq.html
+%%DOCSDIR%%/html/fcguide.html
+%%DOCSDIR%%/html/filters.html
+%%DOCSDIR%%/html/greetings.txt
+%%DOCSDIR%%/html/history.txt
+%%DOCSDIR%%/html/httrack.man.html
+%%DOCSDIR%%/html/images/bg_rings.gif
+%%DOCSDIR%%/html/images/header_title_4.gif
+%%DOCSDIR%%/html/images/screenshot_01.jpg
+%%DOCSDIR%%/html/images/screenshot_01b.jpg
+%%DOCSDIR%%/html/img/addurl1.gif
+%%DOCSDIR%%/html/img/addurl2.gif
+%%DOCSDIR%%/html/img/addurl3.gif
+%%DOCSDIR%%/html/img/addurl4.gif
+%%DOCSDIR%%/html/img/addurl5.gif
+%%DOCSDIR%%/html/img/backblue.gif
+%%DOCSDIR%%/html/img/fade.gif
+%%DOCSDIR%%/html/img/httrack.gif
+%%DOCSDIR%%/html/img/snap1_a.gif
+%%DOCSDIR%%/html/img/snap1_b.gif
+%%DOCSDIR%%/html/img/snap1_c.gif
+%%DOCSDIR%%/html/img/snap2_a.gif
+%%DOCSDIR%%/html/img/snap2_b.gif
+%%DOCSDIR%%/html/img/snap3_a.gif
+%%DOCSDIR%%/html/img/snap4_a.gif
+%%DOCSDIR%%/html/img/snap5_a.gif
+%%DOCSDIR%%/html/img/snap9.gif
+%%DOCSDIR%%/html/img/snap9_a.gif
+%%DOCSDIR%%/html/img/snap9_b.gif
+%%DOCSDIR%%/html/img/snap9_c.gif
+%%DOCSDIR%%/html/img/snap9_d.gif
+%%DOCSDIR%%/html/img/snap9_d2.gif
+%%DOCSDIR%%/html/img/snap9_d3.gif
+%%DOCSDIR%%/html/img/snap9_d4.gif
+%%DOCSDIR%%/html/img/snap9_d5.gif
+%%DOCSDIR%%/html/img/snap9_d6.gif
+%%DOCSDIR%%/html/img/snap9_d7.gif
+%%DOCSDIR%%/html/img/snap9_d8.gif
+%%DOCSDIR%%/html/img/snap9_e.gif
+%%DOCSDIR%%/html/img/snap9_f.gif
+%%DOCSDIR%%/html/img/snap9_g.gif
+%%DOCSDIR%%/html/img/snap9_g2.gif
+%%DOCSDIR%%/html/img/snap9_g3.gif
+%%DOCSDIR%%/html/img/snap9_h.gif
+%%DOCSDIR%%/html/img/snap9_i.gif
+%%DOCSDIR%%/html/img/snap9_j.gif
+%%DOCSDIR%%/html/img/snap9_k.gif
+%%DOCSDIR%%/html/index.html
+%%DOCSDIR%%/html/library.html
+%%DOCSDIR%%/html/license.txt
+%%DOCSDIR%%/html/options.html
+%%DOCSDIR%%/html/overview.html
+%%DOCSDIR%%/html/plug.html
+%%DOCSDIR%%/html/scripting.html
+%%DOCSDIR%%/html/server/about.html
+%%DOCSDIR%%/html/server/addurl.html
+%%DOCSDIR%%/html/server/error.html
+%%DOCSDIR%%/html/server/exit.html
+%%DOCSDIR%%/html/server/file.html
+%%DOCSDIR%%/html/server/finished.html
+%%DOCSDIR%%/html/server/help.html
+%%DOCSDIR%%/html/server/images/bg_rings.gif
+%%DOCSDIR%%/html/server/images/fade.gif
+%%DOCSDIR%%/html/server/images/header_title_4.gif
+%%DOCSDIR%%/html/server/index.html
+%%DOCSDIR%%/html/server/option1.html
+%%DOCSDIR%%/html/server/option10.html
+%%DOCSDIR%%/html/server/option11.html
+%%DOCSDIR%%/html/server/option2.html
+%%DOCSDIR%%/html/server/option2b.html
+%%DOCSDIR%%/html/server/option3.html
+%%DOCSDIR%%/html/server/option4.html
+%%DOCSDIR%%/html/server/option5.html
+%%DOCSDIR%%/html/server/option6.html
+%%DOCSDIR%%/html/server/option7.html
+%%DOCSDIR%%/html/server/option8.html
+%%DOCSDIR%%/html/server/option9.html
+%%DOCSDIR%%/html/server/refresh.html
+%%DOCSDIR%%/html/server/step2.html
+%%DOCSDIR%%/html/server/step3.html
+%%DOCSDIR%%/html/server/step4.html
+%%DOCSDIR%%/html/shelldoc.html
+%%DOCSDIR%%/html/start.html
+%%DOCSDIR%%/html/step.html
+%%DOCSDIR%%/html/step1.html
+%%DOCSDIR%%/html/step2.html
+%%DOCSDIR%%/html/step3.html
+%%DOCSDIR%%/html/step4.html
+%%DOCSDIR%%/html/step5.html
+%%DOCSDIR%%/html/step9.html
+%%DOCSDIR%%/html/step9_opt1.html
+%%DOCSDIR%%/html/step9_opt10.html
+%%DOCSDIR%%/html/step9_opt11.html
+%%DOCSDIR%%/html/step9_opt2.html
+%%DOCSDIR%%/html/step9_opt3.html
+%%DOCSDIR%%/html/step9_opt4.html
+%%DOCSDIR%%/html/step9_opt5.html
+%%DOCSDIR%%/html/step9_opt6.html
+%%DOCSDIR%%/html/step9_opt7.html
+%%DOCSDIR%%/html/step9_opt8.html
+%%DOCSDIR%%/html/step9_opt9.html
+%%DOCSDIR%%/httrack-doc.html
+%%DATADIR%%/html
+%%DATADIR%%/icons/webhttrack.xpm
+%%DATADIR%%/lang/Bulgarian.txt
+%%DATADIR%%/lang/Castellano.txt
+%%DATADIR%%/lang/Cesky.txt
+%%DATADIR%%/lang/Chinese-BIG5.txt
+%%DATADIR%%/lang/Chinese-Simplified.txt
+%%DATADIR%%/lang/Dansk.txt
+%%DATADIR%%/lang/Deutsch.txt
+%%DATADIR%%/lang/Eesti.txt
+%%DATADIR%%/lang/English.txt
+%%DATADIR%%/lang/Francais.txt
+%%DATADIR%%/lang/Greek.txt
+%%DATADIR%%/lang/Italiano.txt
+%%DATADIR%%/lang/Japanese.txt
+%%DATADIR%%/lang/Macedonian.txt
+%%DATADIR%%/lang/Magyar.txt
+%%DATADIR%%/lang/Nederlands.txt
+%%DATADIR%%/lang/Norsk.txt
+%%DATADIR%%/lang/Polski.txt
+%%DATADIR%%/lang/Portugues-Brasil.txt
+%%DATADIR%%/lang/Portugues.txt
+%%DATADIR%%/lang/Romanian.txt
+%%DATADIR%%/lang/Russian.txt
+%%DATADIR%%/lang/Slovak.txt
+%%DATADIR%%/lang/Slovenian.txt
+%%DATADIR%%/lang/Svenska.txt
+%%DATADIR%%/lang/Turkish.txt
+%%DATADIR%%/lang/Ukrainian.txt
+%%DATADIR%%/lang.def
+%%DATADIR%%/lang.indexes
+%%DATADIR%%/libtest/callbacks-example-baselinks.c
+%%DATADIR%%/libtest/callbacks-example-contentfilter.c
+%%DATADIR%%/libtest/callbacks-example-displayheader.c
+%%DATADIR%%/libtest/callbacks-example-filename.c
+%%DATADIR%%/libtest/callbacks-example-filename2.c
+%%DATADIR%%/libtest/callbacks-example-listlinks.c
+%%DATADIR%%/libtest/example.c
+%%DATADIR%%/libtest/example.dsp
+%%DATADIR%%/libtest/example.dsw
+%%DATADIR%%/libtest/example.h
+%%DATADIR%%/libtest/htssystem.h
+%%DATADIR%%/libtest/readme.txt
+%%DATADIR%%/templates/index-body.html
+%%DATADIR%%/templates/index-footer.html
+%%DATADIR%%/templates/index-header.html
+%%DATADIR%%/templates/topindex-body.html
+%%DATADIR%%/templates/topindex-bodycat.html
+%%DATADIR%%/templates/topindex-footer.html
+%%DATADIR%%/templates/topindex-header.html
 share/pixmaps/httrack.xpm
-@dirrm share/httrack/templates
-@dirrm share/httrack/libtest
-@dirrm share/httrack/lang
-@dirrm share/httrack/icons
-@dirrm share/httrack
-@dirrm share/doc/httrack/html/server/images
-@dirrm share/doc/httrack/html/server
-@dirrm share/doc/httrack/html/img
-@dirrm share/doc/httrack/html/images
-@dirrm share/doc/httrack/html/div
-@dirrm share/doc/httrack/html
-@dirrm share/doc/httrack
+@dirrm %%DATADIR%%/templates
+@dirrm %%DATADIR%%/libtest
+@dirrm %%DATADIR%%/lang
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%/html/server/images
+@dirrm %%DOCSDIR%%/html/server
+@dirrm %%DOCSDIR%%/html/img
+@dirrm %%DOCSDIR%%/html/images
+@dirrm %%DOCSDIR%%/html/div
+@dirrm %%DOCSDIR%%/html
+@dirrm %%DOCSDIR%%
 @dirrm lib/httrack
 @dirrm include/httrack
 @unexec rmdir %D/share/pixmaps 2>/dev/null || true