SF.net SVN: gar:[22804] csw/mgar/pkg/ntop/trunk/Makefile

[jonbcraig at users.sourceforge.net]

Revision: 22804
          http://sourceforge.net/p/gar/code/22804
Author:   jonbcraig
Date:     2014-01-07 21:42:51 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
Fixed up checkpkg overides and runtime dependency issue
---This line, and those below, will be ignored--

M    trunk/Makefile

Modified Paths:
--------------
    csw/mgar/pkg/ntop/trunk/Makefile

Modified: csw/mgar/pkg/ntop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ntop/trunk/Makefile	2014-01-07 11:53:59 UTC (rev 22803)
+++ csw/mgar/pkg/ntop/trunk/Makefile	2014-01-07 21:42:51 UTC (rev 22804)
@@ -44,6 +44,8 @@
 UFILES_REGEX = (\d+(?:\.\d+)*)
 
 RUNTIME_DEP_PKGS_CSWntop += CSWlibpython2-6-1-0
+CHECKPKG_OVERRIDES_CSWntop += surplus-dependency|CSWpython
+RUNTIME_DEP_PKGS_CSWntop += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWntop += CSWlibpcap1
 RUNTIME_DEP_PKGS_CSWntop += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWntop += CSWlibrrd-th4
@@ -52,6 +54,7 @@
 RUNTIME_DEP_PKGS_CSWntop += CSWlibgdbm4
 RUNTIME_DEP_PKGS_CSWntop += CSWlibz1
 
+
 ## Following package enables optional functionality
 #RUNTIME_DEP_PKGS_CSWntop += CSWgraphviz
 #CHECKPKG_OVERRIDES_CSWntop += surplus-dependency|CSWgraphviz
@@ -70,7 +73,6 @@
 CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/librrdPlugin-4.0.3.so
 CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libsflowPlugin-4.0.3.so
 
-
 CONFIGURE_SCRIPTS = $(WORKSRC)/autogen.sh
 
 sysconfdir = /etc/opt/csw
@@ -108,19 +110,19 @@
 CHECKPKG_OVERRIDES_CSWntop += shared-lib-pkgname-mismatch
 
 # Bad content files - Documentation
-CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/share/ntop/html/faq.html
-CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/share|root/opt/csw/share/ntop/html/faq.html
-CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/share/ntop/html/ntop.html
-CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/ntop.8
+#CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/share/ntop/html/faq.html
+#CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/share|root/opt/csw/share/ntop/html/faq.html
+#CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/share/ntop/html/ntop.html
+#CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/ntop.8
 
 # Bad content files - Shared libraries (Captured Build Info for Version Output)
+CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libcpacketPlugin-4.0.3.so
 CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libicmpPlugin-4.0.3.so
 CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libsflowPlugin-4.0.3.so
 CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libntop-4.0.3.so
 CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libntopreport-4.0.3.so
 CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libnetflowPlugin-4.0.3.so
 CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/librrdPlugin-4.0.3.so
-CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/libcpacketPlugin-4.0.3.so
 CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/ntop/plugins/sflowPlugin.so
 CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/ntop/plugins/cpacketPlugin.so
 CHECKPKG_OVERRIDES_CSWntop += file-with-bad-content|/usr/local|root/opt/csw/lib/ntop/plugins/rrdPlugin.so

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.