- fix WWW [1]

- portlint(1) [1]
- Respect NOPORTDOCS [2]

PR:		ports/94321 [1]
Submitted by:	Ion-Mihai "IOnut" Tetcu <itetcu@people.tecnik93.com> [1]
Reworked by:	garga [2]
Approved by:	maintainer timeout (15 days)

4 files changed, 87 insertions, 80 deletions

diff --git a/textproc/ctpp/Makefile b/textproc/ctpp/Makefile
index ab6204ca853a..c0cd0fb72112 100644
--- a/textproc/ctpp/Makefile
+++ b/textproc/ctpp/Makefile
@@ -26,6 +26,10 @@ CONFIGURE_ARGS+=	--enable-optimization
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
+.if !defined(NOPORTDOCS)
+INSTALL_TARGET=	install install-doc
+.endif
+
 post-patch:
 	@${RM} -f ${WRKSRC}/obj/*.o
 
diff --git a/textproc/ctpp/files/patch-Makefile.in b/textproc/ctpp/files/patch-Makefile.in
index 8e01d4a45b2e..c9aa8ee1ef48 100644
--- a/textproc/ctpp/files/patch-Makefile.in
+++ b/textproc/ctpp/files/patch-Makefile.in
@@ -1,8 +1,11 @@
---- Makefile.in.orig	Wed Feb  9 11:50:31 2005
-+++ Makefile.in	Wed Feb  9 22:09:28 2005
-@@ -75,8 +75,8 @@
+--- Makefile.in.orig	Wed Feb  9 10:50:31 2005
++++ Makefile.in	Sat Mar 25 17:56:33 2006
+@@ -74,9 +74,11 @@
+ 			fi; \
  		fi; \
  	done;
++
++install-doc::
  	@echo -------------------------------------- Installing documentation ----------
 -	if test ! -d "$(PREFIX)/doc"; then \
 -		$(INSTALL) -d -m 0755 $(PREFIX)/doc; \
@@ -11,7 +14,7 @@
  	fi; \
  	ELEM_LIST=`ls -R -1 $(BUILDROOT)/doc | sed 's!:$$!!';` ; \
  	CURR_DIR=''; \
-@@ -85,10 +85,10 @@
+@@ -85,10 +87,10 @@
  			EXCL_PATH=`echo $(BUILDROOT)/doc | sed 's!\.!\\\\.!g'`; \
  			INST_PATH=`eval "echo $$ELEMENT | sed 's!^$$EXCL_PATH!!g'"`; \
  			CURR_DIR=$$ELEMENT; \
diff --git a/textproc/ctpp/pkg-descr b/textproc/ctpp/pkg-descr
index 59dea472cdc2..776d1d3ca609 100644
--- a/textproc/ctpp/pkg-descr
+++ b/textproc/ctpp/pkg-descr
@@ -1,6 +1,6 @@
 This is a simple set of C++ classes which allow to use
 templates like perl module HTML::Template
 
-WWW: http://www.reki.ru/products/ctpp
+WWW: http://reki.ru/products/ctpp/
 
 - shetuhin@corp.mail.ru
diff --git a/textproc/ctpp/pkg-plist b/textproc/ctpp/pkg-plist
index b5231d54ef51..bfc40d1d9c19 100644
--- a/textproc/ctpp/pkg-plist
+++ b/textproc/ctpp/pkg-plist
@@ -15,82 +15,82 @@ include/ctpp/functions/value_in_set.hpp
 include/ctpp/util/d2str.hpp
 lib/libctpp.so
 lib/libctpp.a
-share/doc/ctpp/en/ctpp.chm
-share/doc/ctpp/en/html/ctpp_compile.html
-share/doc/ctpp/en/html/ctpp_context_vars.html
-share/doc/ctpp/en/html/ctpp_cover.html
-share/doc/ctpp/en/html/ctpp.css
-share/doc/ctpp/en/html/ctpp_def.html
-share/doc/ctpp/en/html/ctpp_dev_algorithm.html
-share/doc/ctpp/en/html/ctpp_dev_api.html
-share/doc/ctpp/en/html/ctpp_dev_intro.html
-share/doc/ctpp/en/html/ctpp_dev_sample.html
-share/doc/ctpp/en/html/ctpp_dev_udf.html
-share/doc/ctpp/en/html/ctpp_errors.html
-share/doc/ctpp/en/html/ctpp_function_form_param.html
-share/doc/ctpp/en/html/ctpp_function_href_param.html
-share/doc/ctpp/en/html/ctpp_function_htmlescape.html
-share/doc/ctpp/en/html/ctpp_function_in_set.html
-share/doc/ctpp/en/html/ctpp_function_is_a.html
-share/doc/ctpp/en/html/ctpp_function_num_format.html
-share/doc/ctpp/en/html/ctpp_function_re.html
-share/doc/ctpp/en/html/ctpp_function_sprintf.html
-share/doc/ctpp/en/html/ctpp_function_urlescape.html
-share/doc/ctpp/en/html/ctpp.hhc
-share/doc/ctpp/en/html/ctpp.hhk
-share/doc/ctpp/en/html/ctpp.hhp
-share/doc/ctpp/en/html/ctpp_intro.html
-share/doc/ctpp/en/html/ctpp_license.html
-share/doc/ctpp/en/html/ctpp_operators.html
-share/doc/ctpp/en/html/ctpp_thanks.html
-share/doc/ctpp/en/html/ctpp_tmpl_if.html
-share/doc/ctpp/en/html/ctpp_tmpl_include.html
-share/doc/ctpp/en/html/ctpp_tmpl_loop.html
-share/doc/ctpp/en/html/ctpp_tmpl_udf.html
-share/doc/ctpp/en/html/ctpp_tmpl_var.html
-share/doc/ctpp/en/html/index.html
-share/doc/ctpp/en/html/index_left.html
-share/doc/ctpp/ru/ctpp.chm
-share/doc/ctpp/ru/html/ctpp_compile.html
-share/doc/ctpp/ru/html/ctpp_context_vars.html
-share/doc/ctpp/ru/html/ctpp_cover.html
-share/doc/ctpp/ru/html/ctpp.css
-share/doc/ctpp/ru/html/ctpp_def.html
-share/doc/ctpp/ru/html/ctpp_dev_algorithm.html
-share/doc/ctpp/ru/html/ctpp_dev_api.html
-share/doc/ctpp/ru/html/ctpp_dev_intro.html
-share/doc/ctpp/ru/html/ctpp_dev_sample.html
-share/doc/ctpp/ru/html/ctpp_dev_udf.html
-share/doc/ctpp/ru/html/ctpp_errors.html
-share/doc/ctpp/ru/html/ctpp_function_form_param.html
-share/doc/ctpp/ru/html/ctpp_function_href_param.html
-share/doc/ctpp/ru/html/ctpp_function_htmlescape.html
-share/doc/ctpp/ru/html/ctpp_function_in_set.html
-share/doc/ctpp/ru/html/ctpp_function_is_a.html
-share/doc/ctpp/ru/html/ctpp_function_num_format.html
-share/doc/ctpp/ru/html/ctpp_function_re.html
-share/doc/ctpp/ru/html/ctpp_function_sprintf.html
-share/doc/ctpp/ru/html/ctpp_function_urlescape.html
-share/doc/ctpp/ru/html/ctpp.hhc
-share/doc/ctpp/ru/html/ctpp.hhk
-share/doc/ctpp/ru/html/ctpp.hhp
-share/doc/ctpp/ru/html/ctpp_intro.html
-share/doc/ctpp/ru/html/ctpp_license.html
-share/doc/ctpp/ru/html/ctpp_operators.html
-share/doc/ctpp/ru/html/ctpp_thanks.html
-share/doc/ctpp/ru/html/ctpp_tmpl_if.html
-share/doc/ctpp/ru/html/ctpp_tmpl_include.html
-share/doc/ctpp/ru/html/ctpp_tmpl_loop.html
-share/doc/ctpp/ru/html/ctpp_tmpl_udf.html
-share/doc/ctpp/ru/html/ctpp_tmpl_var.html
-share/doc/ctpp/ru/html/index.html
-share/doc/ctpp/ru/html/index_left.html
+%%PORTDOCS%%%%DOCSDIR%%/en/ctpp.chm
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_compile.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_context_vars.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_cover.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp.css
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_def.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_dev_algorithm.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_dev_api.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_dev_intro.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_dev_sample.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_dev_udf.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_errors.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_function_form_param.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_function_href_param.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_function_htmlescape.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_function_in_set.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_function_is_a.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_function_num_format.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_function_re.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_function_sprintf.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_function_urlescape.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp.hhc
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp.hhk
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp.hhp
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_intro.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_license.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_operators.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_thanks.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_tmpl_if.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_tmpl_include.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_tmpl_loop.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_tmpl_udf.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/ctpp_tmpl_var.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/index_left.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/ctpp.chm
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_compile.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_context_vars.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_cover.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp.css
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_def.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_dev_algorithm.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_dev_api.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_dev_intro.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_dev_sample.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_dev_udf.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_errors.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_function_form_param.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_function_href_param.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_function_htmlescape.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_function_in_set.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_function_is_a.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_function_num_format.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_function_re.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_function_sprintf.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_function_urlescape.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp.hhc
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp.hhk
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp.hhp
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_intro.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_license.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_operators.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_thanks.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_tmpl_if.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_tmpl_include.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_tmpl_loop.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_tmpl_udf.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/ctpp_tmpl_var.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/html/index_left.html
 @dirrm include/ctpp/util
 @dirrm include/ctpp/functions
 @dirrm include/ctpp/ctpp
 @dirrm include/ctpp
-@dirrm share/doc/ctpp/en/html
-@dirrm share/doc/ctpp/en
-@dirrm share/doc/ctpp/ru/html
-@dirrm share/doc/ctpp/ru
-@dirrm share/doc/ctpp
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ru/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ru
+%%PORTDOCS%%@dirrm %%DOCSDIR%%