Index: head/net/ntpa/Makefile =================================================================== --- head/net/ntpa/Makefile (revision 485724) +++ head/net/ntpa/Makefile (revision 485725) @@ -1,71 +1,71 @@ # Created by: Carsten Larsen # $FreeBSD$ PORTNAME= ntpa PORTVERSION= 0.8.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net MASTER_SITES= http://dist1.innolan.net/ \ http://dist2.innolan.net/ MAINTAINER= cs@innolan.net COMMENT= NTP data collection and charting LICENSE= MIT BSD3CLAUSE PostgreSQL GPLv2 LICENSE_COMB= multi BUILD_DEPENDS= newtonsoft-json>=0:devel/newtonsoft-json RUN_DEPENDS= newtonsoft-json>=0:devel/newtonsoft-json USES= mono pkgconfig autoreconf gmake GNU_CONFIGURE= yes NO_ARCH= yes OPTIONS_SUB= yes USE_RC_SUBR= ntpa USERS= ntpa GROUPS= ntpa SUB_FILES= ntpad ntpav ntpac ntpag OPTIONS_DEFINE= WEBFILES GRAPH WEBFILES_DESC= Install web files GRAPH_DESC= Graph generation (requires Cairo) GRAPH_BUILD_DEPENDS= nplot>=0:graphics/nplot GRAPH_RUN_DEPENDS= nplot>=0:graphics/nplot CONFIGURE_ARGS+= --libdir=${LOCALBASE}/libexec --bindir=${LOCALBASE}/libexec/ntpa .include .if ! ${PORT_OPTIONS:MGRAPH} CONFIGURE_ENV+= NPLOT_CFLAGS=" " NPLOT_LIBS="-r:../packages/NPlot.0.9.10.0/lib/net20/NPlot.dll" .endif 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} ${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} ${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_DATA} ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/DATABASE ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR} ${MKDIR} ${STAGEDIR}/var/log/ntpa ${MKDIR} ${STAGEDIR}/var/run/ntpa ${INSTALL_DATA} ${FILESDIR}/newsyslog ${STAGEDIR}${ETCDIR}/ntpa.newsyslog .include Index: head/net/ntpa/pkg-install =================================================================== --- head/net/ntpa/pkg-install (nonexistent) +++ head/net/ntpa/pkg-install (revision 485725) @@ -0,0 +1,28 @@ +#! /bin/sh +# ex:sw=4 sts=4 + +move_newsyslog_conf() { + oldfile=${PKG_PREFIX}/etc/newsyslog.conf.d/ntpa + newfile=${PKG_PREFIX}/etc/newsyslog.conf.d/ntpa.conf + samplefile=${PKG_PREFIX}/etc/ntpa/ntpa.newsyslog + if [ -f ${oldfile} ]; then + echo "Configuration file found in old location: ${oldfile}" + if cmp -s ${samplefile} ${newfile} > /dev/null; then + echo "Configuration file in new location has not been modified from the default: ${newfile}" + echo " => Moving old configuration file to new location" + mv -f ${oldfile} ${newfile} + else + echo "Configuration file in new location has been modified from the default: ${newfile}" + echo " => Deleting old configuration file" + rm ${oldfile} + fi + fi +} + +######################################################################## + +case $2 in + POST-INSTALL) + move_newsyslog_conf + ;; +esac Property changes on: head/net/ntpa/pkg-install ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/ntpa/pkg-message =================================================================== --- head/net/ntpa/pkg-message (revision 485724) +++ head/net/ntpa/pkg-message (revision 485725) @@ -1,9 +1,25 @@ ************************************************************************ NTP Analyzer has been installed. If this is the first time remember to create a MariaDB, MySQL or PostgreSQL user and database first. If you are upgrading from a previous version of NTP Analyzer be sure to take a backup of your database before starting ntpa in upgrade mode. ************************************************************************ + +The ntpa newsyslog.conf(5) filename has been changed: + OLD: ${PREFIX}/etc/newsyslog.conf.d/ntpa + NEW: ${PREFIX}/etc/newsyslog.conf.d/ntpa.conf + +Any file found at the old location has been automatically moved to +the new location. This was done to ensure log rotation continued to +work after change r340318 made to FreeBSD base, where the default +newsyslog configuration now only includes filenames that end with +'.conf' and do not begin with '.'. + +If you use provisioning/configuration management tools to create or +edit this file, you will need to change their configuration to use +the new filename. + +************************************************************************ Index: head/net/ntpa/pkg-plist =================================================================== --- head/net/ntpa/pkg-plist (revision 485724) +++ head/net/ntpa/pkg-plist (revision 485725) @@ -1,63 +1,63 @@ sbin/ntpa sbin/ntpac sbin/ntpag sbin/ntpav 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.Import.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.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 %%ETCDIR%%/ntpa.newsyslog etc/newsyslog.conf.d/ntpa.conf @sample(,ntpa,640) %%ETCDIR%%/ntpa.conf.sample @owner www @group www %%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/npm.js @owner @group %%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 %%WEBFILES%%@dir(www,www,) %%WWWDIR%%/js @dir(ntpa,ntpa,750) /var/log/ntpa @dir(ntpa,ntpa,755) /var/run/ntpa