Index: head/net/ntpa/Makefile =================================================================== --- head/net/ntpa/Makefile (revision 445630) +++ head/net/ntpa/Makefile (revision 445631) @@ -1,61 +1,65 @@ # Created by: Carsten Larsen # $FreeBSD$ PORTNAME= ntpa PORTVERSION= 0.8.1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://dist.innolan.net/ MAINTAINER= cs@innolan.dk 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 OPTIONS_SUB= yes USE_RC_SUBR= ntpa USERS= ntpa GROUPS= ntpa SUB_FILES= ntpad ntpav ntpac ntpag 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 .include .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} (cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}) post-install: ${INSTALL_SCRIPT} ${WRKDIR}/ntpad ${STAGEDIR}${PREFIX}/sbin/ntpa ${INSTALL_SCRIPT} ${WRKDIR}/ntpav ${STAGEDIR}${PREFIX}/sbin ${INSTALL_SCRIPT} ${WRKDIR}/ntpag ${STAGEDIR}${PREFIX}/sbin ${INSTALL_SCRIPT} ${WRKDIR}/ntpac ${STAGEDIR}${PREFIX}/sbin ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/graph.conf ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/ntpd.conf ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/openntp.conf ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/small.conf ${STAGEDIR}${EXAMPLESDIR} ${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 .include Index: head/net/ntpa/files/patch-Makefile.am =================================================================== --- head/net/ntpa/files/patch-Makefile.am (revision 445630) +++ head/net/ntpa/files/patch-Makefile.am (revision 445631) @@ -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 \ Index: head/net/ntpa/files/patch-Ntp.Analyzer.Data_Makefile.am =================================================================== --- head/net/ntpa/files/patch-Ntp.Analyzer.Data_Makefile.am (nonexistent) +++ head/net/ntpa/files/patch-Ntp.Analyzer.Data_Makefile.am (revision 445631) @@ -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 Property changes on: head/net/ntpa/files/patch-Ntp.Analyzer.Data_Makefile.am ___________________________________________________________________ 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 Index: head/net/ntpa/files/patch-Ntp.Analyzer.Objects_Makefile.am =================================================================== --- head/net/ntpa/files/patch-Ntp.Analyzer.Objects_Makefile.am (nonexistent) +++ head/net/ntpa/files/patch-Ntp.Analyzer.Objects_Makefile.am (revision 445631) @@ -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 '$<' Property changes on: head/net/ntpa/files/patch-Ntp.Analyzer.Objects_Makefile.am ___________________________________________________________________ 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 Index: head/net/ntpa/files/patch-configure.ac =================================================================== --- head/net/ntpa/files/patch-configure.ac (revision 445630) +++ head/net/ntpa/files/patch-configure.ac (revision 445631) @@ -1,25 +1,26 @@ ---- 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]) fi +dnl pkg-config +AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +if test "x$PKG_CONFIG" = "xno"; then + AC_MSG_ERROR([You need to install pkg-config]) +fi + 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 Ntp.Common/Makefile Index: head/net/ntpa/pkg-plist =================================================================== --- head/net/ntpa/pkg-plist (revision 445630) +++ head/net/ntpa/pkg-plist (revision 445631) @@ -1,59 +1,58 @@ sbin/ntpa sbin/ntpac 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 libexec/ntpa/Ntp.Analyzer.Import.dll libexec/ntpa/Ntp.Analyzer.Monitor.Client.dll libexec/ntpa/Ntp.Analyzer.Monitor.Cli.exe libexec/ntpa/Ntp.Analyzer.Monitor.Server.dll libexec/ntpa/Ntp.Analyzer.Objects.dll libexec/ntpa/Ntp.Analyzer.Process.dll libexec/ntpa/Ntp.Analyzer.Validate.Cli.exe libexec/ntpa/Ntp.Analyzer.Validate.Gui.exe libexec/ntpa/Ntp.Common.dll libexec/ntpa/Ntp.Data.dll libexec/ntpa/Ntp.Data.Provider.dll man/man1/ntpa.1.gz @sample(,ntpa,640) %%ETCDIR%%/ntpa.conf.sample @owner www @group www %%WEBFILES%%%%WWWDIR%%/index.html %%WEBFILES%%%%WWWDIR%%/css/bootstrap.css %%WEBFILES%%%%WWWDIR%%/css/bootstrap.css.map %%WEBFILES%%%%WWWDIR%%/css/bootstrap.min.css %%WEBFILES%%%%WWWDIR%%/css/bootstrap.min.css.map %%WEBFILES%%%%WWWDIR%%/css/bootstrap-theme.css %%WEBFILES%%%%WWWDIR%%/css/bootstrap-theme.css.map %%WEBFILES%%%%WWWDIR%%/css/bootstrap-theme.min.css %%WEBFILES%%%%WWWDIR%%/css/bootstrap-theme.min.css.map %%WEBFILES%%%%WWWDIR%%/css/graph.css %%WEBFILES%%%%WWWDIR%%/css/host.css %%WEBFILES%%%%WWWDIR%%/css/peer.css %%WEBFILES%%%%WWWDIR%%/fonts/glyphicons-halflings-regular.eot %%WEBFILES%%%%WWWDIR%%/fonts/glyphicons-halflings-regular.svg %%WEBFILES%%%%WWWDIR%%/fonts/glyphicons-halflings-regular.ttf %%WEBFILES%%%%WWWDIR%%/fonts/glyphicons-halflings-regular.woff %%WEBFILES%%%%WWWDIR%%/fonts/glyphicons-halflings-regular.woff2 %%WEBFILES%%%%WWWDIR%%/js/bootstrap.js %%WEBFILES%%%%WWWDIR%%/js/bootstrap.min.js %%WEBFILES%%%%WWWDIR%%/js/jquery.js %%WEBFILES%%%%WWWDIR%%/js/jquery.min.js %%WEBFILES%%%%WWWDIR%%/js/npm.js @owner @group %%EXAMPLESDIR%%/graph.conf %%EXAMPLESDIR%%/ntpd.conf %%EXAMPLESDIR%%/openntp.conf %%EXAMPLESDIR%%/small.conf %%WEBFILES%%@dir(www,ntpa,775) %%WWWDIR%% %%WEBFILES%%@dir(www,www,) %%WWWDIR%%/css %%WEBFILES%%@dir(www,www,) %%WWWDIR%%/fonts %%WEBFILES%%@dir(www,www,) %%WWWDIR%%/js @dir(ntpa,ntpa,750) /var/log/ntpa @dir(ntpa,ntpa,755) /var/run/ntpa