svn commit: r428342 - head/net/ntpa

[Kurt Jaeger]

Author: pi
Date: Sun Dec 11 10:20:09 2016
New Revision: 428342
URL: https://svnweb.freebsd.org/changeset/ports/428342

Log:
  net/ntpa: update 0.7.4 -> 0.7.6
  
  - Added BSD3CLAUSE PostgreSQL GPLv2 to license list
  - Updated PostgreSQL data provider to v3.1.9
  - Build with NPlot from ports tree
  - Improved logging of database errors
  - Sanitized default configuration
  - Change build script to autotools
  - Fixed threadpool issue in mono 2.6
  
  PR:		215181
  Submitted by:	Carsten Larsen <cs at innolan.dk> (maintainer)

Modified:
  head/net/ntpa/Makefile
  head/net/ntpa/distinfo
  head/net/ntpa/pkg-plist

Modified: head/net/ntpa/Makefile
==============================================================================
--- head/net/ntpa/Makefile	Sun Dec 11 09:00:48 2016	(r428341)
+++ head/net/ntpa/Makefile	Sun Dec 11 10:20:09 2016	(r428342)
@@ -2,16 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	ntpa
-PORTVERSION=	0.7.4
+PORTVERSION=	0.7.6
 CATEGORIES=	net
 MASTER_SITES=	http://dist.innolan.net/
 
 MAINTAINER=	cs at innolan.dk
 COMMENT=	NTP data collection and charting
 
-LICENSE=	MIT
+LICENSE=	MIT BSD3CLAUSE PostgreSQL GPLv2
+LICENSE_COMB=	multi
 
-USES=		mono
+USES=		mono pkgconfig autoreconf gmake
+GNU_CONFIGURE=	yes
 NO_ARCH=	yes
 OPTIONS_SUB=	yes
 USE_RC_SUBR=	ntpa
@@ -25,13 +27,16 @@ OPTIONS_DEFINE=	WEBFILES GRAPH
 WEBFILES_DESC=	Install web files
 GRAPH_DESC=	Graph generation (requires Cairo)
 
+GRAPH_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/NPlot.pc:graphics/nplot
 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
+CONFIGURE_ARGS+=	--libdir=${LOCALBASE}/libexec --bindir=${LOCALBASE}/libexec/ntpa
+
+.include <bsd.port.options.mk>
+
+.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}
@@ -47,10 +52,9 @@ post-install:
 	${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_DATA} ${WRKSRC}/bin/NPlot.dll ${STAGEDIR}${PREFIX}/libexec/ntpa
-	${INSTALL_MAN} ${WRKSRC}/docs/ntpa.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${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}/var/log/ntpa
 	${MKDIR} ${STAGEDIR}/var/run/ntpa
 

Modified: head/net/ntpa/distinfo
==============================================================================
--- head/net/ntpa/distinfo	Sun Dec 11 09:00:48 2016	(r428341)
+++ head/net/ntpa/distinfo	Sun Dec 11 10:20:09 2016	(r428342)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473636210
-SHA256 (ntpa-0.7.4.tar.gz) = 21e755203552df6f27f38f1d58d06dcd71a4a113db97b89f1578217e69d5e544
-SIZE (ntpa-0.7.4.tar.gz) = 1095489
+TIMESTAMP = 1481372685
+SHA256 (ntpa-0.7.6.tar.gz) = 0c24c2640dc78edf8bdcb405df02f81835e6938eb5c4ca2780106091d057bfb5
+SIZE (ntpa-0.7.6.tar.gz) = 3245250

Modified: head/net/ntpa/pkg-plist
==============================================================================
--- head/net/ntpa/pkg-plist	Sun Dec 11 09:00:48 2016	(r428341)
+++ head/net/ntpa/pkg-plist	Sun Dec 11 10:20:09 2016	(r428342)
@@ -4,7 +4,6 @@ sbin/ntpag
 sbin/ntpav
 libexec/ntpa/MySql.Data.dll
 libexec/ntpa/Npgsql.dll
-libexec/ntpa/NPlot.dll
 libexec/ntpa/Ntp.Analyzer.dll
 libexec/ntpa/Ntp.Analyzer.Cli.exe
 libexec/ntpa/Ntp.Analyzer.Data.dll