7 files changed, 47 insertions, 94 deletions

diff --git a/net/ntpa/Makefile b/net/ntpa/Makefile
index 537fef2877a7..08f7f9293ac2 100644
--- a/net/ntpa/Makefile
+++ b/net/ntpa/Makefile
@@ -2,72 +2,54 @@
 # $FreeBSD$
 
 PORTNAME=	ntpa
-PORTVERSION=	0.6.2
-PORTREVISION=	1
+PORTVERSION=	0.7.1
 CATEGORIES=	net
-MASTER_SITES=	http://suyai.innolan.net/
+MASTER_SITES=	http://dist.innolan.net/
 
 MAINTAINER=	cs@innolan.dk
 COMMENT=	NTP data collection and charting
 
-LICENSE=	MIT GPLv2+
-LICENSE_COMB=	dual
-LICENSE_FILE_GPLv2+ =	${WRKSRC}/MySql/COPYING
+LICENSE=	MIT
 
 USES=		mono
 NO_ARCH=	yes
-HAS_CONFIGURE=	yes
 OPTIONS_SUB=	yes
 USE_RC_SUBR=	ntpa
 
 USERS=		ntpa
 GROUPS=		ntpa
 
-SUB_FILES=	ntpad ntpav ntpac
-WRKSRC=		${WRKDIR}/anguist-ntpa-9204e1e36b8d
+SUB_FILES=	ntpad ntpav ntpac ntpag
 
 OPTIONS_DEFINE=	WEBFILES GRAPH
-OPTIONS_DEFAULT=	PGSQL MYSQL
-OPTIONS_MULTI=		DATABASE
-OPTIONS_MULTI_DATABASE=	PGSQL MYSQL
-
-WEBFILES_IMPLIES=	GRAPH
 WEBFILES_DESC=	Install web files
 GRAPH_DESC=	Graph generation (requires Cairo)
-PGSQL_DESC=	PostgreSQL Connector
-MYSQL_DESC=	MySQL Connector (GPLv2)
-DATABASE_DESC=	Database provider
-
-GRAPH_LIB_DEPENDS=	libgdiplus.so:x11-toolkits/libgdiplus \
-			libcairo.so:graphics/cairo \
-			libpng.so:graphics/png
-GRAPH_RUN_DEPENDS=	${LOCALBASE}/share/fonts/webfonts/arial.ttf:x11-fonts/webfonts
-GRAPH_CONFIGURE_ON=	GRAPH
-MYSQL_CONFIGURE_ON=	MYSQL
-PGSQL_CONFIGURE_ON=	PGSQL
-
-do-patch-MYSQL-off:
-	@${REINPLACE_CMD} '/E9DF5ED1-4CBD-4226-B931-9A51610AC14D/,+1 d' \
-		${WRKSRC}/Ntp.Analyzer.sln
 
-do-patch-PGSQL-off:
-	@${REINPLACE_CMD} '/9D13B739-62B1-4190-B386-7A9547304EB3/,+1 d' \
-		${WRKSRC}/Ntp.Analyzer.sln
+GRAPH_RUN_DEPENDS=	nplot>=0:graphics/nplot
 
-pre-install:
-	@${MKDIR} ${WRKSRC}/script
-	${MV} ${WRKDIR}/ntpad ${WRKSRC}/script/ntpa
-	${MV} ${WRKDIR}/ntpav ${WRKSRC}/script/ntpav
-	${MV} ${WRKDIR}/ntpac ${WRKSRC}/script/ntpac
+do-patch:
+	@${REINPLACE_CMD} 's|NPlot.0.9.10.0\\lib\\net20|NPlot.0.9.10.1|' \
+	${WRKSRC}/Ntp.Analyzer/Ntp.Analyzer.csproj
+	@${REINPLACE_CMD} '/Mono.Posix.4.0.0.0/d' \
+	${WRKSRC}/Ntp.Common/Ntp.Common.csproj
 
 post-install-WEBFILES-on:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 post-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/ntpad ${STAGEDIR}${PREFIX}/sbin/ntpa
+	${INSTALL_SCRIPT} ${WRKDIR}/ntpav ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKDIR}/ntpag ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKDIR}/ntpac ${STAGEDIR}${PREFIX}/sbin
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
-	${INSTALL_MAN} ${WRKSRC}/docs/ntpa.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
+	${INSTALL_DATA} ${WRKSRC}/examples/graph.conf ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/ntpd.conf ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/openntp.conf ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/small.conf ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/bin/MySql.Data.dll ${STAGEDIR}${PREFIX}/libexec/ntpa
+	${INSTALL_DATA} ${WRKSRC}/bin/Npgsql.dll ${STAGEDIR}${PREFIX}/libexec/ntpa
+	${INSTALL_MAN} ${WRKSRC}/docs/ntpa.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${MKDIR} ${STAGEDIR}/var/log/ntpa
 	${MKDIR} ${STAGEDIR}/var/run/ntpa
 
diff --git a/net/ntpa/distinfo b/net/ntpa/distinfo
index b470ad2b138a..e3c22b5e1a60 100644
--- a/net/ntpa/distinfo
+++ b/net/ntpa/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1467206651
-SHA256 (ntpa-0.6.2.tar.gz) = f5d3471dae38f60d6a16b5d7610dc3b57fa80c797bf81bc273309a2515878710
-SIZE (ntpa-0.6.2.tar.gz) = 1314818
+TIMESTAMP = 1471982415
+SHA256 (ntpa-0.7.1.tar.gz) = a068465f4c326a1f6025d53f64c08ad9755212d9d448f1aa422f468018f7c11b
+SIZE (ntpa-0.7.1.tar.gz) = 3248313
diff --git a/net/ntpa/files/ntpa.in b/net/ntpa/files/ntpa.in
index bce837346811..0c477ae2df64 100644
--- a/net/ntpa/files/ntpa.in
+++ b/net/ntpa/files/ntpa.in
@@ -48,8 +48,9 @@ rcvar=${name}_enable
 start_cmd=ntpa_start
 stop_cmd=ntpa_stop
 reload_cmd=ntpa_reload
+configtest_cmd=ntpa_configtest
 
-extra_commands=reload
+extra_commands="reload configtest"
 
 load_rc_config ${name}
 
@@ -81,6 +82,11 @@ ntpa_start()
     fi
 }
 
+ntpa_configtest()
+{
+    su -m ${ntpauser} -c "sh -c '%%PREFIX%%/sbin/ntpav -v ${config}'"
+}
+
 ntpa_reload()
 {
     if [ ! -f ${pidfile} ]; then
diff --git a/net/ntpa/files/ntpac.in b/net/ntpa/files/ntpac.in
index 9775a0e7d647..d0cfbd9aaf91 100644
--- a/net/ntpa/files/ntpac.in
+++ b/net/ntpa/files/ntpac.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec %%LOCALBASE%%/bin/mono %%LOCALBASE%%/libexec/ntpa/Ntp.Monitor.Cli.exe "$@"
+exec %%LOCALBASE%%/bin/mono %%LOCALBASE%%/libexec/ntpa/Ntp.Analyzer.Monitor.Cli.exe "$@"
diff --git a/net/ntpa/files/ntpag.in b/net/ntpa/files/ntpag.in
new file mode 100644
index 000000000000..2fa99dd90e25
--- /dev/null
+++ b/net/ntpa/files/ntpag.in
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec %%LOCALBASE%%/bin/mono %%LOCALBASE%%/libexec/ntpa/Ntp.Analyzer.Validate.Gui.exe "$@"
diff --git a/net/ntpa/files/patch-examples_ntpa.conf b/net/ntpa/files/patch-examples_ntpa.conf
deleted file mode 100644
index a1df6a2c81ed..000000000000
--- a/net/ntpa/files/patch-examples_ntpa.conf
+++ /dev/null
@@ -1,18 +0,0 @@
---- examples/ntpa.conf.orig	2016-07-24 15:58:08 UTC
-+++ examples/ntpa.conf
-@@ -152,6 +152,8 @@ Server {
-                 Destinations {
-                         File about.html
-                 }
-+
-+		Link about.html
-         }
- 
-         ############### Bootstrap menu ##############
-@@ -289,4 +291,4 @@ Server {
-                         Link peers/delay-
-                 }
-         }
--}
-\ No newline at end of file
-+}
diff --git a/net/ntpa/pkg-plist b/net/ntpa/pkg-plist
index 35c77d876918..0a9a3ff56b15 100644
--- a/net/ntpa/pkg-plist
+++ b/net/ntpa/pkg-plist
@@ -1,34 +1,24 @@
 sbin/ntpa
 sbin/ntpac
+sbin/ntpag
 sbin/ntpav
-libexec/ntpa/NPlot.dll
+libexec/ntpa/MySql.Data.dll
+libexec/ntpa/Npgsql.dll
+libexec/ntpa/Ntp.Analyzer.dll
 libexec/ntpa/Ntp.Analyzer.Cli.exe
 libexec/ntpa/Ntp.Analyzer.Data.dll
-libexec/ntpa/Ntp.Analyzer.dll
 libexec/ntpa/Ntp.Analyzer.Import.dll
-libexec/ntpa/Ntp.Analyzer.Localize.dll
-libexec/ntpa/Ntp.Analyzer.Log.dll
+libexec/ntpa/Ntp.Analyzer.Monitor.Client.dll
+libexec/ntpa/Ntp.Analyzer.Monitor.Cli.exe
+libexec/ntpa/Ntp.Analyzer.Monitor.Server.dll
 libexec/ntpa/Ntp.Analyzer.Objects.dll
 libexec/ntpa/Ntp.Analyzer.Process.dll
 libexec/ntpa/Ntp.Analyzer.Validate.Cli.exe
+libexec/ntpa/Ntp.Analyzer.Validate.Gui.exe
 libexec/ntpa/Ntp.Common.dll
-libexec/ntpa/Ntp.Config.dll
 libexec/ntpa/Ntp.Data.dll
 libexec/ntpa/Ntp.Data.Provider.dll
-libexec/ntpa/Ntp.Interop.dll
-libexec/ntpa/Ntp.Monitor.Client.dll
-libexec/ntpa/Ntp.Monitor.Cli.exe
-libexec/ntpa/Ntp.Monitor.Server.dll
-libexec/ntpa/Ntp.Process.dll
-%%MYSQL%%libexec/ntpa/MySql.Data.dll
-%%PGSQL%%libexec/ntpa/Npgsql.dll
-%%PGSQL%%libexec/ntpa/de/Npgsql.resources.dll
-%%PGSQL%%libexec/ntpa/es/Npgsql.resources.dll
-%%PGSQL%%libexec/ntpa/fi/Npgsql.resources.dll
-%%PGSQL%%libexec/ntpa/fr/Npgsql.resources.dll
-%%PGSQL%%libexec/ntpa/ja/Npgsql.resources.dll
-%%PGSQL%%libexec/ntpa/zh-CN/Npgsql.resources.dll
-man/man8/ntpa.8.gz
+man/man1/ntpa.1.gz
 @sample(,ntpa,640) %%ETCDIR%%/ntpa.conf.sample
 @owner www
 @group www
@@ -53,22 +43,13 @@ man/man8/ntpa.8.gz
 %%WEBFILES%%%%WWWDIR%%/js/bootstrap.min.js
 %%WEBFILES%%%%WWWDIR%%/js/jquery.js
 %%WEBFILES%%%%WWWDIR%%/js/jquery.min.js
-%%WEBFILES%%%%WWWDIR%%/js/jquery.min.map
 %%WEBFILES%%%%WWWDIR%%/js/npm.js
 @owner
 @group
-%%EXAMPLESDIR%%/ntpa.conf
-%%EXAMPLESDIR%%/ntpa.graph.conf
-%%EXAMPLESDIR%%/ntpa.inc.conf
-%%EXAMPLESDIR%%/ntpa.inc.graphs1
-%%EXAMPLESDIR%%/ntpa.inc.graphs2
-%%EXAMPLESDIR%%/ntpa.inc.menu
-%%EXAMPLESDIR%%/ntpa.inc.pages1
-%%EXAMPLESDIR%%/ntpa.inc.pages2
-%%EXAMPLESDIR%%/ntpa.stat2.conf
-%%EXAMPLESDIR%%/ntpa.stat.conf
-%%EXAMPLESDIR%%/ntpa.web.conf
-%%EXAMPLESDIR%%/ntpa.web.small.conf
+%%EXAMPLESDIR%%/graph.conf
+%%EXAMPLESDIR%%/ntpd.conf
+%%EXAMPLESDIR%%/openntp.conf
+%%EXAMPLESDIR%%/small.conf
 %%WEBFILES%%@dir(www,ntpa,775) %%WWWDIR%%
 %%WEBFILES%%@dir(www,www,) %%WWWDIR%%/css
 %%WEBFILES%%@dir(www,www,) %%WWWDIR%%/fonts