9 files changed, 212 insertions, 119 deletions

diff --git a/net-mgmt/ndoutils/Makefile b/net-mgmt/ndoutils/Makefile
index c3c09375d853..818e6f803ee1 100644
--- a/net-mgmt/ndoutils/Makefile
+++ b/net-mgmt/ndoutils/Makefile
@@ -1,76 +1,60 @@
 # $FreeBSD$
 
 PORTNAME=	ndoutils
-PORTVERSION=	1.4b8
-PORTREVISION=	6
+PORTVERSION=	2.0.0
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF/nagios/${PORTNAME}-1.x/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	SF/nagios/${PORTNAME}-2.x/${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Keep Nagios perfdata in MySQL or Postgresql database
+MAINTAINER=	5u623l20@gmail.com
+COMMENT=	Keep Nagios perfdata in MySQL database
 
-RUN_DEPENDS=	${LOCALBASE}/bin/nagios:${PORTSDIR}/net-mgmt/nagios
-
-OPTIONS_MULTI=		BACKEND
-OPTIONS_MULTI_BACKEND=	MYSQL PGSQL
-OPTIONS_DEFAULT=	MYSQL
-MYSQL_DESC=		MySQL backend support
-PGSQL_DESC=		Postgresql backend support
-
-MAKE_JOBS_UNSAFE=	yes
+LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include -fPIC
-CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc/ndoutils
-
-CFG_FILES=	misccommands ndo2db ndomod
-
+CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc/ndoutils \
+			--localstatedir=/var/run --enable-mysql \
+			--with-mysql=${LOCALBASE}
+
+OPTIONS_DEFINE=	DOCS NANOSLEEP
+OPTIONS_SINGLE=		NAGIOS_BACKEND
+OPTIONS_SINGLE_NAGIOS_BACKEND=	NAGIOS3X NAGIOS4X
+OPTIONS_DEFAULT=	NAGIOS3X NANOSLEEP
+NAGIOS3X_DESC=		For Nagios 3.X Series
+NAGIOS4X_DESC=		For Nagios 4.X Series
+NANOSLEEP_DESC=		Use of nanosleep in event timing
+NAGIOS3X_RUN_DEPENDS=	${LOCALBASE}/bin/nagios:${PORTSDIR}/net-mgmt/nagios
+NAGIOS4X_RUN_DEPENDS=	${LOCALBASE}/bin/nagios:${PORTSDIR}/net-mgmt/nagios4
+NANOSLEEP_CONFIGURE_ENABLE=	nanosleep
+
+USE_MYSQL=	yes
 USES=		perl5
 USE_RC_SUBR=	ndo2db
 SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=yes
-CONFIGURE_ARGS+=	--enable-mysql \
-					--with-mysql-lib=${LOCALBASE}/lib/mysql \
-					--with-mysql-inc=${LOCALBASE}/include
-.else
-CONFIGURE_ARGS+=	--disable-mysql
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=yes
-CONFIGURE_ARGS+=	--enable-pgsql \
-					--with-pgsql-lib=${LOCALBASE}/lib/pgsql \
-					--with-pgsql-inc=${LOCALBASE}/include/pgsql
-.else
-CONFIGURE_ARGS+=	--disable-pgsql
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/file2sock ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/log2ndo ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/sockdebug ${STAGEDIR}${PREFIX}/bin
+	(cd ${WRKSRC}/db && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/)
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/nagios
+	${INSTALL_DATA} ${WRKSRC}/config/misccommands.cfg ${STAGEDIR}${PREFIX}/etc/nagios/misccommands.cfg-sample
+	${INSTALL_DATA} ${WRKSRC}/config/nagios.cfg ${STAGEDIR}${PREFIX}/etc/nagios/ndoutils.cfg-sample
+	${INSTALL_DATA} ${WRKSRC}/config/ndo2db.cfg-sample ${STAGEDIR}${PREFIX}/etc/nagios/ndo2db.cfg-sample
+	${INSTALL_DATA} ${WRKSRC}/config/ndomod.cfg-sample ${STAGEDIR}${PREFIX}/etc/nagios/ndomod.cfg-sample
+.if ${PORT_OPTIONS:MNAGIOS3X}
+	${INSTALL_PROGRAM} ${WRKSRC}/src/ndo2db-3x ${STAGEDIR}${PREFIX}/bin/ndo2db
+	${INSTALL_PROGRAM} ${WRKSRC}/src/ndomod-3x.o ${STAGEDIR}${PREFIX}/bin/ndomod.o
 .endif
-
-.if !defined(NOPORTDOCS)
-PLIST_SUB+=	PORTDOCS=""
-.else
-PLIST_SUB+=	PORTDOCS="@comment "
+.if ${PORT_OPTIONS:MNAGIOS4X}
+	${INSTALL_PROGRAM} ${WRKSRC}/src/ndo2db-4x ${STAGEDIR}${PREFIX}/bin/ndo2db
+	${INSTALL_PROGRAM} ${WRKSRC}/src/ndomod-4x.o ${STAGEDIR}${PREFIX}/bin/ndomod.o
 .endif
-
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/ndo2db-3x ${PREFIX}/bin/
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/ndomod-3x.o ${PREFIX}/bin/
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/file2sock ${PREFIX}/bin/
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/log2ndo ${PREFIX}/bin/
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/sockdebug ${PREFIX}/bin/
-	@(cd ${WRKSRC}/db && ${COPYTREE_SHARE} \* ${DATADIR}/)
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${DOCSDIR}/)
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/)
 .endif
-	@for i in ${CFG_FILES}; do \
-		${INSTALL_DATA} ${WRKSRC}/config/$${i}.cfg ${PREFIX}/etc/nagios/$${i}.cfg-sample; \
-	done
-	@${INSTALL_DATA} ${WRKSRC}/config/nagios.cfg ${PREFIX}/etc/nagios/ndoutils.cfg-sample
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/ndoutils/distinfo b/net-mgmt/ndoutils/distinfo
index ae148607dded..d9097d54d21d 100644
--- a/net-mgmt/ndoutils/distinfo
+++ b/net-mgmt/ndoutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ndoutils-1.4b8.tar.gz) = 7cc358b55df92c7e0e4e0c64595eb3b64f91fd1cfe55e52be7789247bd53fa93
-SIZE (ndoutils-1.4b8.tar.gz) = 1558875
+SHA256 (ndoutils-2.0.0.tar.gz) = b95047c812fb61465e66a9e1a6d4a42bf00620f334f08a6faf5afe20bdd43ba1
+SIZE (ndoutils-2.0.0.tar.gz) = 2207263
diff --git a/net-mgmt/ndoutils/files/patch-config__misccommands.cfg b/net-mgmt/ndoutils/files/patch-config__misccommands.cfg
deleted file mode 100644
index 3f774fae4eba..000000000000
--- a/net-mgmt/ndoutils/files/patch-config__misccommands.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./config/misccommands.cfg.orig	2008-02-21 18:38:53.000000000 -0500
-+++ ./config/misccommands.cfg	2008-02-21 18:41:56.000000000 -0500
-@@ -5,7 +5,7 @@
- # to suit your needs.  This definition will need to be included in your
- # Nagios config files if you want to use it.
- 
--define command{
-+define command {
- 	command_name	rotate_ndo_log
--	command_line	/bin/mv /usr/local/nagios/var/ndo.dat /usr/local/nagios/var/ndo.`date +%s`
--        }
-+	command_line	/bin/mv /var/spool/nagios/ndo.dat /var/spool/ndo.`date +%s`
-+}
diff --git a/net-mgmt/ndoutils/files/patch-config__nagios.cfg b/net-mgmt/ndoutils/files/patch-config__nagios.cfg
deleted file mode 100644
index 3f4c7e79af5c..000000000000
--- a/net-mgmt/ndoutils/files/patch-config__nagios.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./config/nagios.cfg.orig	2008-02-21 18:38:58.000000000 -0500
-+++ ./config/nagios.cfg	2008-02-21 18:42:02.000000000 -0500
-@@ -5,7 +5,7 @@
- # configuration file (nagios.cfg).  Adjust the paths, etc. to suit your needs.
- 
- # Uncomment the line below if you're running Nagios 2.x
--broker_module=/usr/local/nagios/bin/ndomod-2x.o config_file=/usr/local/nagios/etc/ndomod.cfg
-+#broker_module=/usr/local/nagios/bin/ndomod-2x.o config_file=/usr/local/nagios/etc/ndomod.cfg
- 
- # Uncomment the line below if you're running Nagios 3.x
--#broker_module=/usr/local/nagios/bin/ndomod-3x.o config_file=/usr/local/nagios/etc/ndomod.cfg
-+broker_module=/usr/local/nagios/bin/ndomod-3x.o config_file=/usr/local/nagios/etc/ndomod.cfg
diff --git a/net-mgmt/ndoutils/files/patch-config__ndo2db.cfg b/net-mgmt/ndoutils/files/patch-config__ndo2db.cfg
deleted file mode 100644
index 5aeb1c7c360f..000000000000
--- a/net-mgmt/ndoutils/files/patch-config__ndo2db.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./config/ndo2db.cfg.orig	2008-02-21 18:39:05.000000000 -0500
-+++ ./config/ndo2db.cfg	2008-02-21 18:43:39.000000000 -0500
-@@ -32,7 +32,7 @@
- # This option is only valid if the socket type specified above
- # is "unix".
- 
--socket_name=/usr/local/nagios/var/ndo.sock
-+socket_name=/var/run/ndo.sock
- 
- 
- 
diff --git a/net-mgmt/ndoutils/files/patch-config__ndomod.cfg b/net-mgmt/ndoutils/files/patch-config__ndomod.cfg
deleted file mode 100644
index d686f34db617..000000000000
--- a/net-mgmt/ndoutils/files/patch-config__ndomod.cfg
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./config/ndomod.cfg.orig	2008-02-21 18:39:10.000000000 -0500
-+++ ./config/ndomod.cfg	2008-02-21 18:45:07.000000000 -0500
-@@ -35,9 +35,9 @@
- # of fully qualified domain name of the host that the module should
- # connect to for sending output.
- 
--#output=/usr/local/nagios/var/ndo.dat
-+#output=/var/spool/nagios/ndo.dat
- #output=127.0.0.1
--output=/usr/local/nagios/var/ndo.sock
-+output=/var/run/ndo.sock
- 
- 
- 
-@@ -68,7 +68,7 @@
- # Nagios (re)starts, the NDO NEB module will read the contents of this
- # file and send it to the NDO2DB daemon for processing.
- 
--buffer_file=/usr/local/nagios/var/ndomod.tmp
-+buffer_file=/var/spool/nagios/ndomod.tmp
- 
- 
- 
diff --git a/net-mgmt/ndoutils/files/patch-config__ndomod.cfg-sample.in b/net-mgmt/ndoutils/files/patch-config__ndomod.cfg-sample.in
new file mode 100644
index 000000000000..eaae6aa06012
--- /dev/null
+++ b/net-mgmt/ndoutils/files/patch-config__ndomod.cfg-sample.in
@@ -0,0 +1,11 @@
+--- config/ndomod.cfg-sample.in.orig	2014-05-27 03:33:53.216081844 +0600
++++ config/ndomod.cfg-sample.in	2014-05-27 03:37:39.843066041 +0600
+@@ -82,7 +82,7 @@
+ # Nagios (re)starts, the NDO NEB module will read the contents of this
+ # file and send it to the NDO2DB daemon for processing.
+ 
+-buffer_file=@localstatedir@/ndomod.tmp
++buffer_file=/var/spool/nagios/ndomod.tmp
+ 
+ 
+ 
diff --git a/net-mgmt/ndoutils/files/patch-src_Makefile.in b/net-mgmt/ndoutils/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..00a7fd26b279
--- /dev/null
+++ b/net-mgmt/ndoutils/files/patch-src_Makefile.in
@@ -0,0 +1,83 @@
+--- src/Makefile.in.orig	2014-05-27 04:25:19.498867720 +0600
++++ src/Makefile.in	2014-05-27 04:28:22.097854573 +0600
+@@ -60,13 +60,9 @@
+ 	$(CC) $(CFLAGS) -o $@ log2ndo.c $(COMMON_OBJS) $(LDFLAGS) $(LIBS) $(MATHLIBS) $(SOCKETLIBS) $(OTHERLIBS)
+ 
+ ndo2db:
+-	$(MAKE) ndo2db-2x
+ 	$(MAKE) ndo2db-3x
+ 	$(MAKE) ndo2db-4x
+ 
+-ndo2db-2x: queue.c ndo2db.c $(NDO_INC) $(NDO_OBJS) $(COMMON_INC) $(COMMON_OBJS) dbhandlers-2x.o
+-	$(CC) $(CFLAGS) $(DBCFLAGS) -D BUILD_NAGIOS_2X -o ndo2db-2x queue.c ndo2db.c dbhandlers-2x.o $(COMMON_OBJS) $(NDO_OBJS) $(LDFLAGS) $(DBLDFLAGS) $(LIBS) $(SOCKETLIBS) $(DBLIBS) $(MATHLIBS) $(OTHERLIBS)
+-
+ ndo2db-3x: queue.c ndo2db.c $(NDO_INC) $(NDO_OBJS) $(COMMON_INC) $(COMMON_OBJS) dbhandlers-3x.o
+ 	$(CC) $(CFLAGS) $(DBCFLAGS) -D BUILD_NAGIOS_3X -o ndo2db-3x queue.c ndo2db.c dbhandlers-3x.o $(COMMON_OBJS) $(NDO_OBJS) $(LDFLAGS) $(DBLDFLAGS) $(LIBS) $(SOCKETLIBS) $(DBLIBS) $(MATHLIBS) $(OTHERLIBS)
+ 
+@@ -74,13 +70,9 @@
+ 	$(CC) $(CFLAGS) $(DBCFLAGS) -D BUILD_NAGIOS_4X -o ndo2db-4x queue.c ndo2db.c dbhandlers-4x.o $(COMMON_OBJS) $(NDO_OBJS) $(LDFLAGS) $(DBLDFLAGS) $(LIBS) $(SOCKETLIBS) $(DBLIBS) $(MATHLIBS) $(OTHERLIBS)
+ 
+ ndomod: 
+-	$(MAKE) ndomod-2x.o
+ 	$(MAKE) ndomod-3x.o
+ 	$(MAKE) ndomod-4x.o
+ 
+-ndomod-2x.o: ndomod.c $(COMMON_INC) $(COMMON_OBJS)
+-	$(CC) $(MOD_CFLAGS) $(CFLAGS) -D BUILD_NAGIOS_2X -o ndomod-2x.o ndomod.c $(COMMON_OBJS) $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) $(SOCKETLIBS) $(OTHERLIBS)
+-
+ ndomod-3x.o: ndomod.c $(COMMON_INC) $(COMMON_OBJS)
+ 	$(CC) $(MOD_CFLAGS) $(CFLAGS) -D BUILD_NAGIOS_3X -o ndomod-3x.o ndomod.c $(COMMON_OBJS) $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) $(SOCKETLIBS) $(OTHERLIBS)
+ 
+@@ -99,9 +91,6 @@
+ db.o: db.c $(SRC_INCLUDE)/db.h
+ 	$(CC) $(CFLAGS) -c -o $@ db.c
+ 
+-dbhandlers-2x.o: dbhandlers.c $(SRC_INCLUDE)/dbhandlers.h
+-	$(CC) $(CFLAGS) -D BUILD_NAGIOS_2X -c -o $@ dbhandlers.c
+-
+ dbhandlers-3x.o: dbhandlers.c $(SRC_INCLUDE)/dbhandlers.h
+ 	$(CC) $(CFLAGS) -D BUILD_NAGIOS_3X -c -o $@ dbhandlers.c
+ 
+@@ -109,7 +98,7 @@
+ 	$(CC) $(CFLAGS) $(CFLAGS_4X) -D BUILD_NAGIOS_4X -c -o $@ dbhandlers.c
+ 
+ clean:
+-	rm -f core file2sock log2ndo ndo2db-2x ndo2db-3x ndo2db-4x sockdebug *.o
++	rm -f core file2sock log2ndo ndo2db-3x ndo2db-4x sockdebug *.o
+ 	rm -f *~ */*~
+ 
+ distclean: clean
+@@ -128,27 +117,24 @@
+ 	@echo "  If you want to install NDOUtils for Nagios v3.x"
+ 	@echo "  please type  'make install-3x"
+ 	@echo ""
+-	@echo "  If you want to install NDOUtils for Nagios v2.x"
+-	@echo "  please type  'make install-2x"
+-	@echo ""
+-	@echo ""
+ 	@echo "  Next step should be the database initialization/upgrade"
+ 	@echo "  cd into the db/ directory and either:"
+ 	@echo "     ./installdb  (for a new installation) or:"
+ 	@echo "     ./upgradedb  (for an existing one)"
+ 	@echo ""
+ 
+-install-2x:
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
+-	$(INSTALL) -m 755 $(INSTALL_OPTS) ndo2db-2x $(DESTDIR)$(BINDIR)/ndo2db
+-	$(INSTALL) -m 755 $(INSTALL_OPTS) ndomod-2x.o $(DESTDIR)$(BINDIR)/ndomod.o
+-
+ install-3x:
++	$(INSTALL) -m 774 $(INSTALL_OPTS) file2sock $(DESTDIR)$(BINDIR)
++	$(INSTALL) -m 774 $(INSTALL_OPTS) log2ndo $(DESTDIR)$(BINDIR)
++	$(INSTALL) -m 774 $(INSTALL_OPTS) sockdebug $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) -m 755 $(INSTALL_OPTS) ndo2db-3x $(DESTDIR)$(BINDIR)/ndo2db
+ 	$(INSTALL) -m 755 $(INSTALL_OPTS) ndomod-3x.o $(DESTDIR)$(BINDIR)/ndomod.o
+ 
+ install-4x:
++	$(INSTALL) -m 774 $(INSTALL_OPTS) file2sock $(DESTDIR)$(BINDIR)
++	$(INSTALL) -m 774 $(INSTALL_OPTS) log2ndo $(DESTDIR)$(BINDIR)
++	$(INSTALL) -m 774 $(INSTALL_OPTS) sockdebug $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) -m 755 $(INSTALL_OPTS) ndo2db-4x $(DESTDIR)$(BINDIR)/ndo2db
+ 	$(INSTALL) -m 755 $(INSTALL_OPTS) ndomod-4x.o $(DESTDIR)$(BINDIR)/ndomod.o
diff --git a/net-mgmt/ndoutils/pkg-plist b/net-mgmt/ndoutils/pkg-plist
index 2f3f56c58c85..149c30f27ad5 100644
--- a/net-mgmt/ndoutils/pkg-plist
+++ b/net-mgmt/ndoutils/pkg-plist
@@ -1,8 +1,8 @@
 @stopdaemon ndo2db
 bin/file2sock
 bin/log2ndo
-bin/ndo2db-3x
-bin/ndomod-3x.o
+bin/ndo2db
+bin/ndomod.o
 bin/sockdebug
 etc/nagios/misccommands.cfg-sample
 etc/nagios/ndo2db.cfg-sample
@@ -12,6 +12,70 @@ etc/nagios/ndoutils.cfg-sample
 %%PORTDOCS%%%%DOCSDIR%%/NDOUTILS DB Model.pdf
 %%PORTDOCS%%%%DOCSDIR%%/NDOUtils Documentation.odt
 %%PORTDOCS%%%%DOCSDIR%%/NDOUtils Documentation.pdf
+%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/Makefile
+%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/Makefile.in
+%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/NDOUtils.xml
+%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/all-entities.ent
+%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/components.xml
+%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/ent/documents.ent
+%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/ent/names.ent
+%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/ent/plugins.ent
+%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/ent/protocols.ent
+%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/ent/urls.ent
+%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/ent/version.ent
+%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/example-configs.xml
+%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/installation.xml
+%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/introduction.xml
+%%PORTDOCS%%%%DOCSDIR%%/docbook/en-en/whatsnew.xml
+%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig1.png
+%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig10.png
+%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig11.png
+%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig12.png
+%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig13.png
+%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig2.png
+%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig3.png
+%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig4.png
+%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig5.png
+%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig6.png
+%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig7.png
+%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig8.png
+%%PORTDOCS%%%%DOCSDIR%%/docbook/images/fig9.png
+%%PORTDOCS%%%%DOCSDIR%%/docbook/images/important.png
+%%PORTDOCS%%%%DOCSDIR%%/docbook/images/logofullsize.png
+%%PORTDOCS%%%%DOCSDIR%%/docbook/images/note.png
+%%PORTDOCS%%%%DOCSDIR%%/docbook/images/tip.png
+%%PORTDOCS%%%%DOCSDIR%%/docbook/xsl/fo.xsl
+%%PORTDOCS%%%%DOCSDIR%%/docbook/xsl/html-chunked.xsl
+%%PORTDOCS%%%%DOCSDIR%%/docbook/xsl/html-single.xsl
+%%PORTDOCS%%%%DOCSDIR%%/docbook/xsl/titlepage.xml
+%%PORTDOCS%%%%DOCSDIR%%/docbook/xsl/titlepage.xsl
+%%PORTDOCS%%%%DOCSDIR%%/html/en-en/ch01.html
+%%PORTDOCS%%%%DOCSDIR%%/html/en-en/ch02.html
+%%PORTDOCS%%%%DOCSDIR%%/html/en-en/ch03.html
+%%PORTDOCS%%%%DOCSDIR%%/html/en-en/ch04.html
+%%PORTDOCS%%%%DOCSDIR%%/html/en-en/components.html
+%%PORTDOCS%%%%DOCSDIR%%/html/en-en/example-configs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/en-en/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/en-en/installation.html
+%%PORTDOCS%%%%DOCSDIR%%/html/en-en/intro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/en-en/whatsnew.html
+%%PORTDOCS%%%%DOCSDIR%%/html/images/fig1.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/fig10.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/fig11.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/fig12.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/fig13.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/fig2.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/fig3.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/fig4.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/fig5.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/fig6.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/fig7.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/fig8.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/fig9.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/important.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/logofullsize.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/note.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/tip.png
 %%DATADIR%%/README
 %%DATADIR%%/installdb
 %%DATADIR%%/mysql-mods-1.4b5.sql
@@ -25,6 +89,8 @@ etc/nagios/ndoutils.cfg-sample
 %%DATADIR%%/mysql-upgrade-1.4b5.sql
 %%DATADIR%%/mysql-upgrade-1.4b6.sql
 %%DATADIR%%/mysql-upgrade-1.4b8.sql
+%%DATADIR%%/mysql-upgrade-2.0.0.sql
+%%DATADIR%%/mysql-upgrade-2.0.1.sql
 %%DATADIR%%/mysql.sql
 %%DATADIR%%/prepsql
 %%DATADIR%%/queries/comment_history.sql
@@ -63,4 +129,12 @@ etc/nagios/ndoutils.cfg-sample
 %%DATADIR%%/upgradedb
 @dirrm %%DATADIR%%/queries
 @dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docbook/en-en/ent
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docbook/en-en
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docbook/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docbook/xsl
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docbook
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/en-en
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%