SF.net SVN: gar:[22789] csw/mgar/pkg/wireshark/trunk/Makefile

[lblume at users.sourceforge.net]

Revision: 22789
          http://sourceforge.net/p/gar/code/22789
Author:   lblume
Date:     2014-01-06 19:51:49 +0000 (Mon, 06 Jan 2014)
Log Message:
-----------
wireshark/trunk: Remove unused overrides, add override for ld bug

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

Modified: csw/mgar/pkg/wireshark/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wireshark/trunk/Makefile	2014-01-06 18:17:34 UTC (rev 22788)
+++ csw/mgar/pkg/wireshark/trunk/Makefile	2014-01-06 19:51:49 UTC (rev 22789)
@@ -64,27 +64,17 @@
 RUNTIME_DEP_PKGS_CSWwireshark += CSWliblua5-2
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgcc-s1
 
+###
 # For the ld bug
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibfreetype6
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibintl8
+CHECKPKG_OVERRIDES_CSWwireshark += surplus-dependency
+###
 
 # No more library splitting unless absolutely necessary
 CHECKPKG_OVERRIDES_CSWwireshark += shared-lib-package-contains-so-symlink
 CHECKPKG_OVERRIDES_CSWwireshark += shared-lib-pkgname-mismatch
 
-# example, \fI/usr/local/share/wireshark/preferences\fR) on UNIX-compatible
-CHECKPKG_OVERRIDES_CSWwireshark += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/rawshark.1
-CHECKPKG_OVERRIDES_CSWwireshark += file-with-bad-content|/usr/local|root/opt/csw/share/wireshark/rawshark.html
-
-# \&\fI/usr/local/lib/wireshark/plugins/$VERSION\fR), and then
-# example, \fI/usr/local/share/wireshark/preferences\fR) on UNIX-compatible
-CHECKPKG_OVERRIDES_CSWwireshark += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/wireshark.1
-CHECKPKG_OVERRIDES_CSWwireshark += file-with-bad-content|/usr/local|root/opt/csw/share/wireshark/wireshark.html
-
-# example, \fI/usr/local/share/wireshark/preferences\fR) on UNIX-compatible
-CHECKPKG_OVERRIDES_CSWwireshark += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/tshark.1
-CHECKPKG_OVERRIDES_CSWwireshark += file-with-bad-content|/usr/local|root/opt/csw/share/wireshark/tshark.html
-
 REINPLACEMENTS += mibs
 REINPLACE_MATCH_mibs = /usr/share/snmp/mibs
 REINPLACE_WITH_mibs = /opt/csw/share/mibs

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