From 4e54029c3a7982db7a8854bd3f86908b5b83e4cd Mon Sep 17 00:00:00 2001 From: madpilot Date: Wed, 29 Jun 2016 16:39:17 +0000 Subject: Update to 0.6.2. PR: 210643 Submitted by: Carsten Larsen (maintainer) --- net/ntpa/Makefile | 30 ++++++++++++++++++++------- net/ntpa/distinfo | 6 +++--- net/ntpa/files/ntpac.in | 2 ++ net/ntpa/files/ntpad.in | 2 ++ net/ntpa/files/ntpav.in | 2 ++ net/ntpa/pkg-message | 11 ++++------ net/ntpa/pkg-plist | 54 ++++++++++++++++++++++++------------------------- 7 files changed, 63 insertions(+), 44 deletions(-) create mode 100644 net/ntpa/files/ntpac.in create mode 100644 net/ntpa/files/ntpad.in create mode 100644 net/ntpa/files/ntpav.in (limited to 'net') diff --git a/net/ntpa/Makefile b/net/ntpa/Makefile index 892abab766db..b35e2e1297e3 100644 --- a/net/ntpa/Makefile +++ b/net/ntpa/Makefile @@ -1,7 +1,8 @@ +# Created by: Carsten Larsen # $FreeBSD$ PORTNAME= ntpa -PORTVERSION= 0.6.1 +PORTVERSION= 0.6.2 CATEGORIES= net MASTER_SITES= http://suyai.innolan.net/ @@ -10,14 +11,16 @@ COMMENT= NTP data collection and charting LICENSE= MIT -OPTIONS_DEFINE= GRAPH PGSQL MYSQL -OPTION_MULTI= PGSQL MYSQL -GRAPH_DESC= Graphs and HTML generation (requires Cairo) +OPTIONS_DEFINE= WEBFILES GRAPH +OPTIONS_DEFAULT= PGSQL +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 (GPL) -OPTIONS_DEFAULT= GRAPH PGSQL - GRAPH_LIB_DEPENDS= libgdiplus.so:x11-toolkits/libgdiplus \ libcairo.so:graphics/cairo \ libpng.so:graphics/png @@ -35,9 +38,22 @@ USE_RC_SUBR= ntpa USERS= ntpa GROUPS= ntpa -post-install: +SUB_FILES= ntpad ntpav ntpac +WRKSRC= ${WRKDIR}/anguist-ntpa-9204e1e36b8d + +.include + +pre-install: + @${MKDIR} ${WRKSRC}/script + ${MV} ${WRKDIR}/ntpad ${WRKSRC}/script/ntpa + ${MV} ${WRKDIR}/ntpav ${WRKSRC}/script/ntpav + ${MV} ${WRKDIR}/ntpac ${WRKSRC}/script/ntpac + +post-install-WEBFILES-on: ${MKDIR} ${STAGEDIR}${WWWDIR} (cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}) + +post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) ${INSTALL_MAN} ${WRKSRC}/docs/ntpa.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 diff --git a/net/ntpa/distinfo b/net/ntpa/distinfo index 74750bbbb73e..b470ad2b138a 100644 --- a/net/ntpa/distinfo +++ b/net/ntpa/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1464440774 -SHA256 (ntpa-0.6.1.tar.gz) = 93f6494039d21698de2e512169327caf447ef1143a9e8cc6c1ae304525d7984b -SIZE (ntpa-0.6.1.tar.gz) = 1336869 +TIMESTAMP = 1467206651 +SHA256 (ntpa-0.6.2.tar.gz) = f5d3471dae38f60d6a16b5d7610dc3b57fa80c797bf81bc273309a2515878710 +SIZE (ntpa-0.6.2.tar.gz) = 1314818 diff --git a/net/ntpa/files/ntpac.in b/net/ntpa/files/ntpac.in new file mode 100644 index 000000000000..9775a0e7d647 --- /dev/null +++ b/net/ntpa/files/ntpac.in @@ -0,0 +1,2 @@ +#!/bin/sh +exec %%LOCALBASE%%/bin/mono %%LOCALBASE%%/libexec/ntpa/Ntp.Monitor.Cli.exe "$@" diff --git a/net/ntpa/files/ntpad.in b/net/ntpa/files/ntpad.in new file mode 100644 index 000000000000..371f4e0b8206 --- /dev/null +++ b/net/ntpa/files/ntpad.in @@ -0,0 +1,2 @@ +#!/bin/sh +exec %%LOCALBASE%%/bin/mono %%LOCALBASE%%/libexec/ntpa/Ntp.Analyzer.Cli.exe "$@" diff --git a/net/ntpa/files/ntpav.in b/net/ntpa/files/ntpav.in new file mode 100644 index 000000000000..d672f7cbfbba --- /dev/null +++ b/net/ntpa/files/ntpav.in @@ -0,0 +1,2 @@ +#!/bin/sh +exec %%LOCALBASE%%/bin/mono %%LOCALBASE%%/libexec/ntpa/Ntp.Analyzer.Validate.Cli.exe "$@" diff --git a/net/ntpa/pkg-message b/net/ntpa/pkg-message index 125c9ba8449b..9ba7eb9b12e3 100644 --- a/net/ntpa/pkg-message +++ b/net/ntpa/pkg-message @@ -1,9 +1,6 @@ -ntpa has been installed. -It requires a MySQL or PostgreeSQL user and database configured for it. +************************************************************************ -You can do this with the following MySQL commands: +NTP Analyzer has been installed. If this is the first time remember to +create a MySQL or PostgreeSQL user and database first. -CREATE DATABASE ntpa; -CREATE USER 'ntpau'@'localhost' IDENTIFIED BY 'password'; -GRANT ALL PRIVILEGES ON ntpa.* TO 'ntpau'@'localhost'; -FLUSH PRIVILEGES; +************************************************************************ diff --git a/net/ntpa/pkg-plist b/net/ntpa/pkg-plist index 9a9671bc3693..35c77d876918 100644 --- a/net/ntpa/pkg-plist +++ b/net/ntpa/pkg-plist @@ -32,29 +32,29 @@ man/man8/ntpa.8.gz @sample(,ntpa,640) %%ETCDIR%%/ntpa.conf.sample @owner www @group www -%%WWWDIR%%/index.html -%%WWWDIR%%/css/bootstrap.css -%%WWWDIR%%/css/bootstrap.css.map -%%WWWDIR%%/css/bootstrap.min.css -%%WWWDIR%%/css/bootstrap.min.css.map -%%WWWDIR%%/css/bootstrap-theme.css -%%WWWDIR%%/css/bootstrap-theme.css.map -%%WWWDIR%%/css/bootstrap-theme.min.css -%%WWWDIR%%/css/bootstrap-theme.min.css.map -%%WWWDIR%%/css/graph.css -%%WWWDIR%%/css/host.css -%%WWWDIR%%/css/peer.css -%%WWWDIR%%/fonts/glyphicons-halflings-regular.eot -%%WWWDIR%%/fonts/glyphicons-halflings-regular.svg -%%WWWDIR%%/fonts/glyphicons-halflings-regular.ttf -%%WWWDIR%%/fonts/glyphicons-halflings-regular.woff -%%WWWDIR%%/fonts/glyphicons-halflings-regular.woff2 -%%WWWDIR%%/js/bootstrap.js -%%WWWDIR%%/js/bootstrap.min.js -%%WWWDIR%%/js/jquery.js -%%WWWDIR%%/js/jquery.min.js -%%WWWDIR%%/js/jquery.min.map -%%WWWDIR%%/js/npm.js +%%WEBFILES%%%%WWWDIR%%/index.html +%%WEBFILES%%%%WWWDIR%%/css/bootstrap.css +%%WEBFILES%%%%WWWDIR%%/css/bootstrap.css.map +%%WEBFILES%%%%WWWDIR%%/css/bootstrap.min.css +%%WEBFILES%%%%WWWDIR%%/css/bootstrap.min.css.map +%%WEBFILES%%%%WWWDIR%%/css/bootstrap-theme.css +%%WEBFILES%%%%WWWDIR%%/css/bootstrap-theme.css.map +%%WEBFILES%%%%WWWDIR%%/css/bootstrap-theme.min.css +%%WEBFILES%%%%WWWDIR%%/css/bootstrap-theme.min.css.map +%%WEBFILES%%%%WWWDIR%%/css/graph.css +%%WEBFILES%%%%WWWDIR%%/css/host.css +%%WEBFILES%%%%WWWDIR%%/css/peer.css +%%WEBFILES%%%%WWWDIR%%/fonts/glyphicons-halflings-regular.eot +%%WEBFILES%%%%WWWDIR%%/fonts/glyphicons-halflings-regular.svg +%%WEBFILES%%%%WWWDIR%%/fonts/glyphicons-halflings-regular.ttf +%%WEBFILES%%%%WWWDIR%%/fonts/glyphicons-halflings-regular.woff +%%WEBFILES%%%%WWWDIR%%/fonts/glyphicons-halflings-regular.woff2 +%%WEBFILES%%%%WWWDIR%%/js/bootstrap.js +%%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 @@ -69,9 +69,9 @@ man/man8/ntpa.8.gz %%EXAMPLESDIR%%/ntpa.stat.conf %%EXAMPLESDIR%%/ntpa.web.conf %%EXAMPLESDIR%%/ntpa.web.small.conf -@dir(www,ntpa,775) %%WWWDIR%% -@dir(www,www,) %%WWWDIR%%/css -@dir(www,www,) %%WWWDIR%%/fonts -@dir(www,www,) %%WWWDIR%%/js +%%WEBFILES%%@dir(www,ntpa,775) %%WWWDIR%% +%%WEBFILES%%@dir(www,www,) %%WWWDIR%%/css +%%WEBFILES%%@dir(www,www,) %%WWWDIR%%/fonts +%%WEBFILES%%@dir(www,www,) %%WWWDIR%%/js @dir(ntpa,ntpa,750) /var/log/ntpa @dir(ntpa,ntpa,755) /var/run/ntpa -- cgit