svn commit: r445631 - in head/net/ntpa: . files
Steve Wills
swills at FreeBSD.org
Thu Jul 13 02:58:31 UTC 2017
Author: swills
Date: Thu Jul 13 02:58:30 2017
New Revision: 445631
URL: https://svnweb.freebsd.org/changeset/ports/445631
Log:
net/ntpa: use newtonsoft-json from ports tree
PR: 217596
Submitted by: Carsten Larsen <cs at innolan.dk> (maintainer)
Added:
head/net/ntpa/files/patch-Ntp.Analyzer.Data_Makefile.am (contents, props changed)
head/net/ntpa/files/patch-Ntp.Analyzer.Objects_Makefile.am (contents, props changed)
Modified:
head/net/ntpa/Makefile
head/net/ntpa/files/patch-Makefile.am
head/net/ntpa/files/patch-configure.ac
head/net/ntpa/pkg-plist
Modified: head/net/ntpa/Makefile
==============================================================================
--- head/net/ntpa/Makefile Thu Jul 13 02:42:40 2017 (r445630)
+++ head/net/ntpa/Makefile Thu Jul 13 02:58:30 2017 (r445631)
@@ -3,6 +3,7 @@
PORTNAME= ntpa
PORTVERSION= 0.8.1
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://dist.innolan.net/
@@ -12,6 +13,9 @@ 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
@@ -27,7 +31,7 @@ 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_BUILD_DEPENDS= nplot>=0:graphics/nplot
GRAPH_RUN_DEPENDS= nplot>=0:graphics/nplot
CONFIGURE_ARGS+= --libdir=${LOCALBASE}/libexec --bindir=${LOCALBASE}/libexec/ntpa
Modified: head/net/ntpa/files/patch-Makefile.am
==============================================================================
--- head/net/ntpa/files/patch-Makefile.am Thu Jul 13 02:42:40 2017 (r445630)
+++ head/net/ntpa/files/patch-Makefile.am Thu Jul 13 02:58:30 2017 (r445631)
@@ -1,10 +1,13 @@
--- Makefile.am.orig 2016-12-25 16:19:23 UTC
+++ Makefile.am
-@@ -2,7 +2,6 @@
+@@ -1,9 +1,7 @@
+
EXTRA_DIST = \
../MySql.Data \
- ../Npgsql \
+- ../Npgsql \
- ../NPlot \
- ../Newtonsoft.Json
+- ../Newtonsoft.Json
++ ../Npgsql
SUBDIRS = \
+ Ntp.Analyzer.Objects \
Added: head/net/ntpa/files/patch-Ntp.Analyzer.Data_Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/ntpa/files/patch-Ntp.Analyzer.Data_Makefile.am Thu Jul 13 02:58:30 2017 (r445631)
@@ -0,0 +1,53 @@
+--- Ntp.Analyzer.Data/Makefile.am.orig 2017-03-06 22:57:29 UTC
++++ Ntp.Analyzer.Data/Makefile.am
+@@ -30,7 +30,6 @@ NTP_DATA_PROVIDER_DLL_MDB_SOURCE=../bin/
+ NTP_DATA_PROVIDER_DLL_MDB=$(BUILD_DIR)/Ntp.Data.Provider.dll.mdb
+ MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll
+ NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll
+-NEWTONSOFT_DLL_SOURCE=../packages/Newtonsoft.Json.9.0.1/lib/net45/Newtonsoft.Json.dll
+
+ endif
+
+@@ -58,7 +57,6 @@ NTP_DATA_PROVIDER_DLL_SOURCE=../bin/Ntp.
+ NTP_DATA_PROVIDER_DLL_MDB=
+ MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll
+ NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll
+-NEWTONSOFT_DLL_SOURCE=../packages/Newtonsoft.Json.9.0.1/lib/net45/Newtonsoft.Json.dll
+
+ endif
+
+@@ -76,8 +74,7 @@ PROGRAMFILES = \
+ $(NTP_DATA_PROVIDER_DLL) \
+ $(NTP_DATA_PROVIDER_DLL_MDB) \
+ $(MYSQL_DATA_DLL) \
+- $(NPGSQL_DLL) \
+- $(NEWTONSOFT_DLL)
++ $(NPGSQL_DLL)
+
+ RESGEN=resgen2
+
+@@ -119,9 +116,10 @@ REFERENCES = \
+ System \
+ System.Data \
+ System.Core \
+- System.Xml
++ System.Xml \
++ $(NEWTONSOFT_LIBS)
+
+-DLL_REFERENCES = $(NEWTONSOFT_DLL)
++DLL_REFERENCES =
+
+ CLEANFILES = $(PROGRAMFILES)
+
+@@ -133,11 +131,9 @@ NTP_DATA_DLL = $(BUILD_DIR)/Ntp.Data.dll
+ NTP_DATA_PROVIDER_DLL = $(BUILD_DIR)/Ntp.Data.Provider.dll
+ MYSQL_DATA_DLL = $(BUILD_DIR)/MySql.Data.dll
+ NPGSQL_DLL = $(BUILD_DIR)/Npgsql.dll
+-NEWTONSOFT_DLL = $(BUILD_DIR)/Newtonsoft.Json.dll
+
+ $(eval $(call emit-deploy-target,MYSQL_DATA_DLL))
+ $(eval $(call emit-deploy-target,NPGSQL_DLL))
+-$(eval $(call emit-deploy-target,NEWTONSOFT_DLL))
+
+ $(eval $(call emit_resgen_targets))
+ $(build_xamlg_list): %.xaml.g.cs: %.xaml
Added: head/net/ntpa/files/patch-Ntp.Analyzer.Objects_Makefile.am
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/ntpa/files/patch-Ntp.Analyzer.Objects_Makefile.am Thu Jul 13 02:58:30 2017 (r445631)
@@ -0,0 +1,39 @@
+--- Ntp.Analyzer.Objects/Makefile.am.orig 2016-12-25 16:19:23 UTC
++++ Ntp.Analyzer.Objects/Makefile.am
+@@ -12,7 +12,6 @@ BUILD_DIR = ../bin
+
+ NTP_ANALYZER_OBJECTS_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Objects.dll.mdb
+ NTP_ANALYZER_OBJECTS_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Objects.dll.mdb
+-NEWTONSOFT_DLL_SOURCE=../packages/Newtonsoft.Json.9.0.1/lib/net45/Newtonsoft.Json.dll
+
+ endif
+
+@@ -26,7 +25,6 @@ PROJECT_REFERENCES =
+ BUILD_DIR = ../bin
+
+ NTP_ANALYZER_OBJECTS_DLL_MDB=
+-NEWTONSOFT_DLL_SOURCE=../packages/Newtonsoft.Json.9.0.1/lib/net45/Newtonsoft.Json.dll
+
+ endif
+
+@@ -68,18 +66,14 @@ RESOURCES =
+
+ EXTRAS =
+
+-REFERENCES = System
++REFERENCES = System $(NEWTONSOFT_LIBS)
+
+-DLL_REFERENCES = $(NEWTONSOFT_DLL)
++DLL_REFERENCES =
+
+ CLEANFILES = $(PROGRAMFILES)
+
+ include $(top_srcdir)/Makefile.include
+
+-NEWTONSOFT_DLL = $(BUILD_DIR)/Newtonsoft.Json.dll
+-
+-$(eval $(call emit-deploy-target,NEWTONSOFT_DLL))
+-
+ $(eval $(call emit_resgen_targets))
+ $(build_xamlg_list): %.xaml.g.cs: %.xaml
+ xamlg '$<'
Modified: head/net/ntpa/files/patch-configure.ac
==============================================================================
--- head/net/ntpa/files/patch-configure.ac Thu Jul 13 02:42:40 2017 (r445630)
+++ head/net/ntpa/files/patch-configure.ac Thu Jul 13 02:58:30 2017 (r445631)
@@ -1,4 +1,4 @@
---- configure.ac.orig 2016-12-26 13:35:44 UTC
+--- configure.ac.orig 2016-12-25 16:20:40 UTC
+++ configure.ac
@@ -12,6 +12,12 @@ if test "x$MCS" = "xno"; then
AC_MSG_ERROR([mcs Not found])
@@ -13,12 +13,13 @@
AC_ARG_ENABLE(debug,
AC_HELP_STRING([--enable-debug],
[Use 'DEBUG' Configuration [default=NO]]),
-@@ -33,6 +39,9 @@ if test -z "$CONFIG_REQUESTED" ; then
+@@ -33,6 +39,10 @@ if test -z "$CONFIG_REQUESTED" ; then
enable_release=yes
fi
+dnl package checks
+PKG_CHECK_MODULES([NPLOT], [NPlot])
++PKG_CHECK_MODULES([NEWTONSOFT], [Newtonsoft.Json])
+
AC_CONFIG_FILES([
Ntp.Analyzer.Objects/Makefile
Modified: head/net/ntpa/pkg-plist
==============================================================================
--- head/net/ntpa/pkg-plist Thu Jul 13 02:42:40 2017 (r445630)
+++ head/net/ntpa/pkg-plist Thu Jul 13 02:58:30 2017 (r445631)
@@ -4,7 +4,6 @@ sbin/ntpag
sbin/ntpav
libexec/ntpa/MySql.Data.dll
libexec/ntpa/Npgsql.dll
-libexec/ntpa/Newtonsoft.Json.dll
libexec/ntpa/Ntp.Analyzer.dll
libexec/ntpa/Ntp.Analyzer.Cli.exe
libexec/ntpa/Ntp.Analyzer.Data.dll
More information about the svn-ports-all
mailing list