Index: head/net/ntpa/Makefile
===================================================================
--- head/net/ntpa/Makefile	(revision 419398)
+++ head/net/ntpa/Makefile	(revision 419399)
@@ -1,62 +1,74 @@
 # Created by: Carsten Larsen <cs@innolan.dk>
 # $FreeBSD$
 
 PORTNAME=	ntpa
 PORTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://suyai.innolan.net/
 
 MAINTAINER=	cs@innolan.dk
 COMMENT=	NTP data collection and charting
 
-LICENSE=	MIT
+LICENSE=	MIT GPLv2+
+LICENSE_COMB=	dual
+LICENSE_FILE_GPLv2+ =	${WRKSRC}/MySql/COPYING
 
+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
+
 OPTIONS_DEFINE=	WEBFILES GRAPH
-OPTIONS_DEFAULT=	PGSQL
+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 (GPL)
+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
 
-USES=		mono
-NO_ARCH=	yes
-HAS_CONFIGURE=	yes
-OPTIONS_SUB=	yes
-USE_RC_SUBR=	ntpa
+do-patch-MYSQL-off:
+	@${REINPLACE_CMD} '/E9DF5ED1-4CBD-4226-B931-9A51610AC14D/,+1 d' \
+		${WRKSRC}/Ntp.Analyzer.sln
 
-USERS=		ntpa
-GROUPS=		ntpa
-
-SUB_FILES=	ntpad ntpav ntpac
-WRKSRC=		${WRKDIR}/anguist-ntpa-9204e1e36b8d
+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
 
 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
 	${MKDIR} ${STAGEDIR}/var/log/ntpa
 	${MKDIR} ${STAGEDIR}/var/run/ntpa
 
 .include <bsd.port.mk>
Index: head/net/ntpa/files/patch-examples_ntpa.conf
===================================================================
--- head/net/ntpa/files/patch-examples_ntpa.conf	(nonexistent)
+++ head/net/ntpa/files/patch-examples_ntpa.conf	(revision 419399)
@@ -0,0 +1,18 @@
+--- examples/ntpa.conf.orig	2016-07-24 15:58:08 UTC
++++ examples/ntpa.conf
+@@ -152,6 +152,8 @@ Server {
+                 Destinations {
+                         File about.html
+                 }
++
++		Link about.html
+         }
+ 
+         ############### Bootstrap menu ##############
+@@ -289,4 +291,4 @@ Server {
+                         Link peers/delay-
+                 }
+         }
+-}
+\ No newline at end of file
++}

Property changes on: head/net/ntpa/files/patch-examples_ntpa.conf
___________________________________________________________________
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