Attachment #178606 for bug #215581

Lines 2-8 Link Here

(-)Makefile (-3 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= ntpa	4	PORTNAME= ntpa
5	PORTVERSION= 0.7.10	5	PORTVERSION= 0.8.1
6	CATEGORIES= net	6	CATEGORIES= net
7	MASTER_SITES= http://dist.innolan.net/	7	MASTER_SITES= http://dist.innolan.net/
8		8
Lines 27-34 Link Here
27	WEBFILES_DESC= Install web files	27	WEBFILES_DESC= Install web files
28	GRAPH_DESC= Graph generation (requires Cairo)	28	GRAPH_DESC= Graph generation (requires Cairo)
29		29
30	GRAPH_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/NPlot.pc:graphics/nplot	30	GRAPH_BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/NPlot.pc:graphics/nplot
31	GRAPH_RUN_DEPENDS= nplot>=0:graphics/nplot	31	GRAPH_RUN_DEPENDS+= nplot>=0:graphics/nplot
32		32
33	CONFIGURE_ARGS+= --libdir=${LOCALBASE}/libexec --bindir=${LOCALBASE}/libexec/ntpa	33	CONFIGURE_ARGS+= --libdir=${LOCALBASE}/libexec --bindir=${LOCALBASE}/libexec/ntpa
34		34

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1481972002	1	TIMESTAMP = 1482761372
2	SHA256 (ntpa-0.7.10.tar.gz) = 43784b81a98dcbf685fc9ea9b85864a4c06b74bcb148deb6ff67304020821867	2	SHA256 (ntpa-0.8.1.tar.gz) = 38954b130aaecb255961272080c800ec700db108deb2b05a18a98c575f7f5978
3	SIZE (ntpa-0.7.10.tar.gz) = 2565305	3	SIZE (ntpa-0.8.1.tar.gz) = 1426223

Line 0 Link Here

(-)files/patch-Makefile.am (+10 lines)
	1	--- Makefile.am.orig 2016-12-25 16:19:23 UTC
	2	+++ Makefile.am
	3	@@ -2,7 +2,6 @@
	4	EXTRA_DIST = \
	5	../MySql.Data \
	6	../Npgsql \
	7	- ../NPlot \
	8	../Newtonsoft.Json
	9
	10	SUBDIRS = \




--- Ntp.Analyzer/Makefile.am.orig	2016-12-25 16:19:23 UTC
+++ Ntp.Analyzer/Makefile.am
@@ -34,7 +34,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
-NPLOT_DLL_SOURCE=../packages/NPlot.0.9.10.0/lib/net20/NPlot.dll
 NTP_ANALYZER_IMPORT_DLL_SOURCE=../bin/Ntp.Analyzer.Import.dll
 NTP_ANALYZER_IMPORT_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Import.dll.mdb
 NTP_ANALYZER_IMPORT_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Import.dll.mdb
@@ -68,7 +67,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
-NPLOT_DLL_SOURCE=../packages/NPlot.0.9.10.0/lib/net20/NPlot.dll
 NTP_ANALYZER_IMPORT_DLL_SOURCE=../bin/Ntp.Analyzer.Import.dll
 NTP_ANALYZER_IMPORT_DLL_MDB=
 
@@ -91,7 +89,6 @@ PROGRAMFILES = \
 	$(NTP_DATA_PROVIDER_DLL_MDB) \
 	$(MYSQL_DATA_DLL) \
 	$(NPGSQL_DLL) \
-	$(NPLOT_DLL) \
 	$(NTP_ANALYZER_IMPORT_DLL) \
 	$(NTP_ANALYZER_IMPORT_DLL_MDB)
 
@@ -281,9 +278,10 @@ REFERENCES =  \
 	System \
 	System.Core \
 	System.Drawing \
-	System.Runtime.Serialization
+	System.Runtime.Serialization \
+	$(NPLOT_LIBS)
 
-DLL_REFERENCES = $(NPLOT_DLL)
+DLL_REFERENCES =
 
 CLEANFILES = $(PROGRAMFILES)
 
@@ -296,12 +294,10 @@ NTP_ANALYZER_DATA_DLL = $(BUILD_DIR)/Ntp
 NTP_DATA_PROVIDER_DLL = $(BUILD_DIR)/Ntp.Data.Provider.dll
 MYSQL_DATA_DLL = $(BUILD_DIR)/MySql.Data.dll
 NPGSQL_DLL = $(BUILD_DIR)/Npgsql.dll
-NPLOT_DLL = $(BUILD_DIR)/NPlot.dll
 NTP_ANALYZER_IMPORT_DLL = $(BUILD_DIR)/Ntp.Analyzer.Import.dll
 
 $(eval $(call emit-deploy-target,MYSQL_DATA_DLL))
 $(eval $(call emit-deploy-target,NPGSQL_DLL))
-$(eval $(call emit-deploy-target,NPLOT_DLL))
 
 $(eval $(call emit_resgen_targets))
 $(build_xamlg_list): %.xaml.g.cs: %.xaml




--- configure.ac.orig	2016-12-26 13:35:44 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
 	enable_release=yes
 fi
 
+dnl package checks
+PKG_CHECK_MODULES([NPLOT], [NPlot])
+
 AC_CONFIG_FILES([
 Ntp.Analyzer.Objects/Makefile
 Ntp.Common/Makefile

Lines 4-9 Link Here

(-)pkg-plist (+1 lines)
4	sbin/ntpav	4	sbin/ntpav
5	libexec/ntpa/MySql.Data.dll	5	libexec/ntpa/MySql.Data.dll
6	libexec/ntpa/Npgsql.dll	6	libexec/ntpa/Npgsql.dll
		7	libexec/ntpa/Newtonsoft.Json.dll
7	libexec/ntpa/Ntp.Analyzer.dll	8	libexec/ntpa/Ntp.Analyzer.dll
8	libexec/ntpa/Ntp.Analyzer.Cli.exe	9	libexec/ntpa/Ntp.Analyzer.Cli.exe
9	libexec/ntpa/Ntp.Analyzer.Data.dll	10	libexec/ntpa/Ntp.Analyzer.Data.dll

Return to bug 215581

Line 0 Link Here

(-)files/patch-Ntp.Analyzer_Makefile.am (+52 lines)
	1	--- Ntp.Analyzer/Makefile.am.orig 2016-12-25 16:19:23 UTC
	2	+++ Ntp.Analyzer/Makefile.am
	3	@@ -34,7 +34,6 @@ NTP_DATA_PROVIDER_DLL_MDB_SOURCE=../bin/
	4	NTP_DATA_PROVIDER_DLL_MDB=$(BUILD_DIR)/Ntp.Data.Provider.dll.mdb
	5	MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll
	6	NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll
	7	-NPLOT_DLL_SOURCE=../packages/NPlot.0.9.10.0/lib/net20/NPlot.dll
	8	NTP_ANALYZER_IMPORT_DLL_SOURCE=../bin/Ntp.Analyzer.Import.dll
	9	NTP_ANALYZER_IMPORT_DLL_MDB_SOURCE=../bin/Ntp.Analyzer.Import.dll.mdb
	10	NTP_ANALYZER_IMPORT_DLL_MDB=$(BUILD_DIR)/Ntp.Analyzer.Import.dll.mdb
	11	@@ -68,7 +67,6 @@ NTP_DATA_PROVIDER_DLL_SOURCE=../bin/Ntp.
	12	NTP_DATA_PROVIDER_DLL_MDB=
	13	MYSQL_DATA_DLL_SOURCE=../packages/MySql.Data.6.9.9/lib/net45/MySql.Data.dll
	14	NPGSQL_DLL_SOURCE=../packages/Npgsql.3.1.9/lib/net451/Npgsql.dll
	15	-NPLOT_DLL_SOURCE=../packages/NPlot.0.9.10.0/lib/net20/NPlot.dll
	16	NTP_ANALYZER_IMPORT_DLL_SOURCE=../bin/Ntp.Analyzer.Import.dll
	17	NTP_ANALYZER_IMPORT_DLL_MDB=
	18
	19	@@ -91,7 +89,6 @@ PROGRAMFILES = \
	20	$(NTP_DATA_PROVIDER_DLL_MDB) \
	21	$(MYSQL_DATA_DLL) \
	22	$(NPGSQL_DLL) \
	23	- $(NPLOT_DLL) \
	24	$(NTP_ANALYZER_IMPORT_DLL) \
	25	$(NTP_ANALYZER_IMPORT_DLL_MDB)
	26
	27	@@ -281,9 +278,10 @@ REFERENCES = \
	28	System \
	29	System.Core \
	30	System.Drawing \
	31	- System.Runtime.Serialization
	32	+ System.Runtime.Serialization \
	33	+ $(NPLOT_LIBS)
	34
	35	-DLL_REFERENCES = $(NPLOT_DLL)
	36	+DLL_REFERENCES =
	37
	38	CLEANFILES = $(PROGRAMFILES)
	39
	40	@@ -296,12 +294,10 @@ NTP_ANALYZER_DATA_DLL = $(BUILD_DIR)/Ntp
	41	NTP_DATA_PROVIDER_DLL = $(BUILD_DIR)/Ntp.Data.Provider.dll
	42	MYSQL_DATA_DLL = $(BUILD_DIR)/MySql.Data.dll
	43	NPGSQL_DLL = $(BUILD_DIR)/Npgsql.dll
	44	-NPLOT_DLL = $(BUILD_DIR)/NPlot.dll
	45	NTP_ANALYZER_IMPORT_DLL = $(BUILD_DIR)/Ntp.Analyzer.Import.dll
	46
	47	$(eval $(call emit-deploy-target,MYSQL_DATA_DLL))
	48	$(eval $(call emit-deploy-target,NPGSQL_DLL))
	49	-$(eval $(call emit-deploy-target,NPLOT_DLL))
	50
	51	$(eval $(call emit_resgen_targets))
	52	$(build_xamlg_list): %.xaml.g.cs: %.xaml

Line 0 Link Here

(-)files/patch-configure.ac (+25 lines)
	1	--- configure.ac.orig 2016-12-26 13:35:44 UTC
	2	+++ configure.ac
	3	@@ -12,6 +12,12 @@ if test "x$MCS" = "xno"; then
	4	AC_MSG_ERROR([mcs Not found])
	5	fi
	6
	7	+dnl pkg-config
	8	+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
	9	+if test "x$PKG_CONFIG" = "xno"; then
	10	+ AC_MSG_ERROR([You need to install pkg-config])
	11	+fi
	12	+
	13	AC_ARG_ENABLE(debug,
	14	AC_HELP_STRING([--enable-debug],
	15	[Use 'DEBUG' Configuration [default=NO]]),
	16	@@ -33,6 +39,9 @@ if test -z "$CONFIG_REQUESTED" ; then
	17	enable_release=yes
	18	fi
	19
	20	+dnl package checks
	21	+PKG_CHECK_MODULES([NPLOT], [NPlot])
	22	+
	23	AC_CONFIG_FILES([
	24	Ntp.Analyzer.Objects/Makefile
	25	Ntp.Common/Makefile