net/ntpa: Update to 0.8.2

PR:		221033
Submitted by:	Carsten Larsen <cs@innolan.dk> (maintainer)

8 files changed, 21 insertions, 63 deletions

diff --git a/net/ntpa/Makefile b/net/ntpa/Makefile
index 88271e91576e..8ba05e6f78d9 100644
--- a/net/ntpa/Makefile
+++ b/net/ntpa/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	ntpa
-PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTVERSION=	0.8.2
 CATEGORIES=	net
-MASTER_SITES=	http://dist.innolan.net/
+MASTER_SITES=	http://dist1.innolan.net/ \
+		http://dist2.innolan.net/
 
-MAINTAINER=	cs@innolan.dk
+MAINTAINER=	cs@innolan.net
 COMMENT=	NTP data collection and charting
 
 LICENSE=	MIT BSD3CLAUSE PostgreSQL GPLv2
@@ -59,7 +59,12 @@ post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/ntpa/
 	${INSTALL_DATA} ${WRKSRC}/examples/ntpa.conf ${STAGEDIR}${PREFIX}/etc/ntpa/ntpa.conf.sample
 	${INSTALL_MAN} ${WRKSRC}/docs/ntpa.1 ${STAGEDIR}${PREFIX}/man/man1
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/DATABASE ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}/var/log/ntpa
 	${MKDIR} ${STAGEDIR}/var/run/ntpa
+	${INSTALL_DATA} ${FILESDIR}/newsyslog ${STAGEDIR}${ETCDIR}/ntpa.newsyslog
 
 .include <bsd.port.mk>
diff --git a/net/ntpa/distinfo b/net/ntpa/distinfo
index f1f4d6a3d777..f748cd5be99d 100644
--- a/net/ntpa/distinfo
+++ b/net/ntpa/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482761372
-SHA256 (ntpa-0.8.1.tar.gz) = 38954b130aaecb255961272080c800ec700db108deb2b05a18a98c575f7f5978
-SIZE (ntpa-0.8.1.tar.gz) = 1426223
+TIMESTAMP = 1501060995
+SHA256 (ntpa-0.8.2.tar.gz) = 26a763b64cd5bd8e9cfa35c9c51a1cf4b11fa84a26404623679008d1df6ec9eb
+SIZE (ntpa-0.8.2.tar.gz) = 1422714
diff --git a/net/ntpa/files/newsyslog b/net/ntpa/files/newsyslog
new file mode 100644
index 000000000000..77b541f0ee99
--- /dev/null
+++ b/net/ntpa/files/newsyslog
@@ -0,0 +1 @@
+/var/log/ntpa/ntpa.log	root:ntpa	660  10	   *	@T00  C     /var/run/ntpa/ntpa.pid SIGUSR2
diff --git a/net/ntpa/pkg-deinstall b/net/ntpa/pkg-deinstall
deleted file mode 100644
index 9de39eba00f9..000000000000
--- a/net/ntpa/pkg-deinstall
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-
-delnewsyslog() {
-    tmp="/etc/#ntpa$$"
-    sed -e '/^\/var\/log\/ntpa\/ntpa.log /d' /etc/newsyslog.conf >${tmp}
-    cat ${tmp} > /etc/newsyslog.conf
-    rm ${tmp}
-}
-
-newsyslog() {
-    ENTRY=`grep /var/log/ntpa/ntpa.log /etc/newsyslog.conf`
-    DEFAULT='/var/log/ntpa/ntpa.log root:ntpa       660  10    *    @T00  C  /var/run/ntpa/ntpa.pid SIGUSR2'
-    if [ -z "$ENTRY" ]; then
-        exit 0
-    elif [ "$ENTRY" = "$DEFAULT" ]; then
-        delnewsyslog
-    else
-    echo "You have changed the default ntpa entry in \"/etc/newsyslog.conf\"".
-    echo "If you deinstall ntpa permanently, you have to manually remove it"
-    fi
-}
-
-
-case $2 in
-    DEINSTALL)
-        if [ -z "${PACKAGE_BUILDING}" ]; then
-            newsyslog
-        fi
-        ;;
-    POST-DEINSTALL)
-        ;;
-esac
diff --git a/net/ntpa/pkg-descr b/net/ntpa/pkg-descr
index 6a35af0a9b52..da82f663aded 100644
--- a/net/ntpa/pkg-descr
+++ b/net/ntpa/pkg-descr
@@ -5,4 +5,4 @@ NTP Analyzer collects data from ntp daemons and can be configured
 to generate graphs and web pages to visualize the activities of
 supervised hosts and peers.
 
-WWW: https://bitbucket.org/anguist/ntpa
+WWW: http://ntpa.innolan.net/
diff --git a/net/ntpa/pkg-install b/net/ntpa/pkg-install
deleted file mode 100644
index da18ed5f380a..000000000000
--- a/net/ntpa/pkg-install
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh
-
-newsyslog() {
-    if grep -q /var/log/ntpa/ntpa.log /etc/newsyslog.conf; then
-        :
-    else
-        cat >> /etc/newsyslog.conf <<EOT
-/var/log/ntpa/ntpa.log root:ntpa       660  10    *    @T00  C  /var/run/ntpa/ntpa.pid SIGUSR2
-EOT
-    fi
-}
-
-case $2 in
-    PRE-INSTALL)
-        ;;      
-    POST-INSTALL)
-        if [ -z "${PACKAGE_BUILDING}" ]; then
-            newsyslog
-        fi
-        ;;
-esac
diff --git a/net/ntpa/pkg-message b/net/ntpa/pkg-message
index c8941d96cc5a..f3043bd74204 100644
--- a/net/ntpa/pkg-message
+++ b/net/ntpa/pkg-message
@@ -1,9 +1,9 @@
 ************************************************************************
 
 NTP Analyzer has been installed. If this is the first time remember to
-create a MySQL or PostgreSQL user and database first.
+create a MariaDB, MySQL or PostgreSQL user and database first.
 
 If you are upgrading from a previous version of NTP Analyzer be sure to
-make a backup of your database before starting ntpa in upgrade mode.
+take a backup of your database before starting ntpa in upgrade mode.
 
 ************************************************************************
diff --git a/net/ntpa/pkg-plist b/net/ntpa/pkg-plist
index 0a9a3ff56b15..3cd7ad37c88c 100644
--- a/net/ntpa/pkg-plist
+++ b/net/ntpa/pkg-plist
@@ -19,6 +19,11 @@ libexec/ntpa/Ntp.Common.dll
 libexec/ntpa/Ntp.Data.dll
 libexec/ntpa/Ntp.Data.Provider.dll
 man/man1/ntpa.1.gz
+%%DOCSDIR%%/CHANGES
+%%DOCSDIR%%/DATABASE
+%%DOCSDIR%%/INSTALL
+@dir etc/newsyslog.conf.d
+@sample %%ETCDIR%%/ntpa.newsyslog etc/newsyslog.conf.d/ntpa
 @sample(,ntpa,640) %%ETCDIR%%/ntpa.conf.sample
 @owner www
 @group www