- new option WITH_CTRLPROXY_DOC for manpages and html doc

- use PORTDOCS
- make portlint happier

4 files changed, 61 insertions, 22 deletions

diff --git a/irc/ctrlproxy/Makefile b/irc/ctrlproxy/Makefile
index 85aafe2e989f..1217f601210f 100644
--- a/irc/ctrlproxy/Makefile
+++ b/irc/ctrlproxy/Makefile
@@ -23,16 +23,53 @@ USE_GNOME=	glib20 libxml2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+PORTDOCS1=	AUTHORS ChangeLog README TODO
 
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
+.if defined(WITH_CTRLPROXY_DOC)
+BUILD_DEPENDS+=	xmlto:${PORTSDIR}/textproc/xmlto
+BUILD_DEPENDS+=	dia:${PORTSDIR}/graphics/dia
+CONFIGURE_ARGS+=	--enable-docs
+MAN1=		ctrlproxy.1
+MAN5=		ctrlproxyrc.5
+MAN7=		admin.7ctrlproxy antiflood.7ctrlproxy \
+		auto-away.7ctrlproxy ctcp.7ctrlproxy \
+		linestack_file.7ctrlproxy linestack_memory.7ctrlproxy \
+		log_custom.7ctrlproxy log_irssi.7ctrlproxy \
+		motd-file.7ctrlproxy nickserv.7ctrlproxy \
+		noticelog.7ctrlproxy repl_command.7ctrlproxy \
+		repl_highlight.7ctrlproxy repl_none.7ctrlproxy \
+		repl_simple.7ctrlproxy socket.7ctrlproxy \
+		stats.7ctrlproxy strip.7ctrlproxy
+PORTDOCS2=	ctrlproxy.html overview.png overview2.png
+.endif
+
+PORTDOCS=	${PORTDOCS1} ${PORTDOCS2}
+
 post-install:
 .if !defined(NOPORTDOC)
 	@${MKDIR} ${DOCSDIR}
-.for file in AUTHORS ChangeLog README TODO
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.for i in ${PORTDOCS1}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
+.endfor
+.endif
+.if defined(WITH_CTRLPROXY_DOC)
+.for i in ${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/man/man1/
 .endfor
+.for i in ${MAN5}
+	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/man/man5/
+.endfor
+.for i in ${MAN7}
+	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/man/man7/
+.endfor
+.if !defined(NOPORTDOC)
+.for i in ${PORTDOCS2}
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}/
+.endfor
+.endif
 .endif
 
 .include <bsd.port.mk>
diff --git a/irc/ctrlproxy/files/patch-doc-Makefile.in b/irc/ctrlproxy/files/patch-doc-Makefile.in
new file mode 100644
index 000000000000..184c13379be2
--- /dev/null
+++ b/irc/ctrlproxy/files/patch-doc-Makefile.in
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig	Mon Jan  5 22:30:51 2004
++++ doc/Makefile.in	Tue Oct 11 07:25:39 2005
+@@ -2,7 +2,7 @@
+ MOD_MANPAGES = $(patsubst %.mod.xml,%.7ctrlproxy,$(MOD_SOURCES))
+ MOD_MANPAGES_HTML = $(patsubst %.mod.xml,%.7ctrlproxy.html,$(MOD_SOURCES))
+ MODS = $(patsubst %.mod.xml,%.xml,$(MOD_SOURCES))
+-DOCS = ctrlproxy.1 ctrlproxyrc.5 ctrlproxy.pdf ctrlproxy.html $(MOD_MANPAGES)
++DOCS = ctrlproxy.1 ctrlproxyrc.5 overview.png overview2.png ctrlproxy.html $(MOD_MANPAGES)
+ XSLTPROC = @XSLTPROC@ --xinclude
+ PDFLATEX = @PDFLATEX@
+ XMLTO = @XMLTO@
diff --git a/irc/ctrlproxy/files/patch-doc:Makefile.in b/irc/ctrlproxy/files/patch-doc:Makefile.in
index da82f1fdde71..184c13379be2 100644
--- a/irc/ctrlproxy/files/patch-doc:Makefile.in
+++ b/irc/ctrlproxy/files/patch-doc:Makefile.in
@@ -1,15 +1,11 @@
---- doc/Makefile.in.orig	Tue Jan 20 04:29:52 2004
-+++ doc/Makefile.in	Thu Mar  4 19:01:46 2004
-@@ -51,12 +51,9 @@
- 	$(INSTALL) -d $(DESTDIR)$(man1dir)
- 	$(INSTALL) -d $(DESTDIR)$(man5dir)
- 	$(INSTALL) -d $(DESTDIR)$(man7dir)
--	$(INSTALL) -d $(DESTDIR)$(docdir)
- 	$(INSTALL) ctrlproxy.1 $(DESTDIR)$(man1dir)
- 	$(INSTALL) ctrlproxyrc.5 $(DESTDIR)$(man5dir)
- 	$(INSTALL) $(MOD_MANPAGES) $(DESTDIR)$(man7dir)
--	$(INSTALL) ctrlproxy.pdf $(DESTDIR)$(docdir)
--	$(INSTALL) ctrlproxy.html $(DESTDIR)$(docdir)
- else
- 	@echo
- 	@echo "---------------------------------------------------------------"
+--- doc/Makefile.in.orig	Mon Jan  5 22:30:51 2004
++++ doc/Makefile.in	Tue Oct 11 07:25:39 2005
+@@ -2,7 +2,7 @@
+ MOD_MANPAGES = $(patsubst %.mod.xml,%.7ctrlproxy,$(MOD_SOURCES))
+ MOD_MANPAGES_HTML = $(patsubst %.mod.xml,%.7ctrlproxy.html,$(MOD_SOURCES))
+ MODS = $(patsubst %.mod.xml,%.xml,$(MOD_SOURCES))
+-DOCS = ctrlproxy.1 ctrlproxyrc.5 ctrlproxy.pdf ctrlproxy.html $(MOD_MANPAGES)
++DOCS = ctrlproxy.1 ctrlproxyrc.5 overview.png overview2.png ctrlproxy.html $(MOD_MANPAGES)
+ XSLTPROC = @XSLTPROC@ --xinclude
+ PDFLATEX = @PDFLATEX@
+ XMLTO = @XMLTO@
diff --git a/irc/ctrlproxy/pkg-plist b/irc/ctrlproxy/pkg-plist
index bf3b69a69dc0..cad90502fa0c 100644
--- a/irc/ctrlproxy/pkg-plist
+++ b/irc/ctrlproxy/pkg-plist
@@ -19,10 +19,5 @@ lib/ctrlproxy/libsocket.so
 lib/ctrlproxy/libstats.so
 lib/ctrlproxy/libstrip.so
 %%DATADIR%%/motd
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%
 @dirrm lib/ctrlproxy