From owner-svn-ports-all@freebsd.org Sun Jul 31 18:08:32 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3B04BBAA27E; Sun, 31 Jul 2016 18:08:32 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 001971996; Sun, 31 Jul 2016 18:08:31 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6VI8Vgb078991; Sun, 31 Jul 2016 18:08:31 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6VI8VeY078989; Sun, 31 Jul 2016 18:08:31 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201607311808.u6VI8VeY078989@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Sun, 31 Jul 2016 18:08:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419399 - in head/net/ntpa: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Jul 2016 18:08:32 -0000 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@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 ++}