svn commit: r419399 - in head/net/ntpa: . files
Pawel Pekala
pawel at FreeBSD.org
Sun Jul 31 18:08:32 UTC 2016
Author: pawel
Date: Sun Jul 31 18:08:30 2016
New Revision: 419399
URL: https://svnweb.freebsd.org/changeset/ports/419399
Log:
- Change default options to include both database providers [1]
- Remove build of deselected database providers [1]
- Include option depended GPLv2 license [1]
- Patch error in default config file [1]
- Move options declaration block to the proper place
PR: 211342 [1]
Submitted by: Carsten Larsen (maintainer)
Added:
head/net/ntpa/files/patch-examples_ntpa.conf (contents, props changed)
Modified:
head/net/ntpa/Makefile
Modified: head/net/ntpa/Makefile
==============================================================================
--- head/net/ntpa/Makefile Sun Jul 31 17:53:52 2016 (r419398)
+++ head/net/ntpa/Makefile Sun Jul 31 18:08:30 2016 (r419399)
@@ -3,23 +3,39 @@
PORTNAME= ntpa
PORTVERSION= 0.6.2
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://suyai.innolan.net/
MAINTAINER= cs at 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 \
@@ -30,17 +46,13 @@ 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
-
-USERS= ntpa
-GROUPS= ntpa
-
-SUB_FILES= ntpad ntpav ntpac
-WRKSRC= ${WRKDIR}/anguist-ntpa-9204e1e36b8d
+do-patch-MYSQL-off:
+ @${REINPLACE_CMD} '/E9DF5ED1-4CBD-4226-B931-9A51610AC14D/,+1 d' \
+ ${WRKSRC}/Ntp.Analyzer.sln
+
+do-patch-PGSQL-off:
+ @${REINPLACE_CMD} '/9D13B739-62B1-4190-B386-7A9547304EB3/,+1 d' \
+ ${WRKSRC}/Ntp.Analyzer.sln
pre-install:
@${MKDIR} ${WRKSRC}/script
Added: head/net/ntpa/files/patch-examples_ntpa.conf
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/ntpa/files/patch-examples_ntpa.conf Sun Jul 31 18:08:30 2016 (r419399)
@@ -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
++}
More information about the svn-ports-all
mailing list