Date: Fri, 26 Aug 2016 20:25:52 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420947 - in head/net/ntpa: . files Message-ID: <201608262025.u7QKPqfZ081523@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Fri Aug 26 20:25:52 2016 New Revision: 420947 URL: https://svnweb.freebsd.org/changeset/ports/420947 Log: - Update to version 0.7.1 - Remove MYSQL and PGSQL options - Add configtest command to ntpa rc file Changelog: - New configuration validator GUI - New internal configuration engine - SSL support for databases - Unified code for all platforms - Improved code quality & Several bugfixes - Updated MySQL Connector to official v6.9.9 - Updated PostgreSQL data provider to v3.1.7 - Updated Bootstrap to v3.3.7 - Updated jQuery to v2.2.4 PR: 212081 Submitted by: Carsten Larsen (maintainer) Added: head/net/ntpa/files/ntpag.in (contents, props changed) Deleted: head/net/ntpa/files/patch-examples_ntpa.conf Modified: head/net/ntpa/Makefile head/net/ntpa/distinfo head/net/ntpa/files/ntpa.in head/net/ntpa/files/ntpac.in head/net/ntpa/pkg-plist Modified: head/net/ntpa/Makefile ============================================================================== --- head/net/ntpa/Makefile Fri Aug 26 20:17:44 2016 (r420946) +++ head/net/ntpa/Makefile Fri Aug 26 20:25:52 2016 (r420947) @@ -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 - -pre-install: - @${MKDIR} ${WRKSRC}/script - ${MV} ${WRKDIR}/ntpad ${WRKSRC}/script/ntpa - ${MV} ${WRKDIR}/ntpav ${WRKSRC}/script/ntpav - ${MV} ${WRKDIR}/ntpac ${WRKSRC}/script/ntpac + +GRAPH_RUN_DEPENDS= nplot>=0:graphics/nplot + +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 Modified: head/net/ntpa/distinfo ============================================================================== --- head/net/ntpa/distinfo Fri Aug 26 20:17:44 2016 (r420946) +++ head/net/ntpa/distinfo Fri Aug 26 20:25:52 2016 (r420947) @@ -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 Modified: head/net/ntpa/files/ntpa.in ============================================================================== --- head/net/ntpa/files/ntpa.in Fri Aug 26 20:17:44 2016 (r420946) +++ head/net/ntpa/files/ntpa.in Fri Aug 26 20:25:52 2016 (r420947) @@ -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 Modified: head/net/ntpa/files/ntpac.in ============================================================================== --- head/net/ntpa/files/ntpac.in Fri Aug 26 20:17:44 2016 (r420946) +++ head/net/ntpa/files/ntpac.in Fri Aug 26 20:25:52 2016 (r420947) @@ -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 "$@" Added: head/net/ntpa/files/ntpag.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ntpa/files/ntpag.in Fri Aug 26 20:25:52 2016 (r420947) @@ -0,0 +1,2 @@ +#!/bin/sh +exec %%LOCALBASE%%/bin/mono %%LOCALBASE%%/libexec/ntpa/Ntp.Analyzer.Validate.Gui.exe "$@" Modified: head/net/ntpa/pkg-plist ============================================================================== --- head/net/ntpa/pkg-plist Fri Aug 26 20:17:44 2016 (r420946) +++ head/net/ntpa/pkg-plist Fri Aug 26 20:25:52 2016 (r420947) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608262025.u7QKPqfZ081523>