[csw-devel] SF.net SVN: gar:[14779] csw/mgar/pkg/clamav/trunk/Makefile

[bonivart at users.sourceforge.net]

Revision: 14779
          http://gar.svn.sourceforge.net/gar/?rev=14779&view=rev
Author:   bonivart
Date:     2011-06-10 12:29:39 +0000 (Fri, 10 Jun 2011)

Log Message:
-----------
clamav/trunk: fix dep on ncurses5 and overrides

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

Modified: csw/mgar/pkg/clamav/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clamav/trunk/Makefile	2011-06-10 12:23:45 UTC (rev 14778)
+++ csw/mgar/pkg/clamav/trunk/Makefile	2011-06-10 12:29:39 UTC (rev 14779)
@@ -23,7 +23,7 @@
 PACKAGES += CSWclamav
 CATALOGNAME_CSWclamav = clamav
 SPKG_DESC_CSWclamav = $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWclamav = CSWlibclam6 CSWzlib CSWbzip2 CSWiconv CSWncurses
+RUNTIME_DEP_PKGS_CSWclamav = CSWlibclam6 CSWzlib CSWbzip2 CSWiconv CSWlibncurses5
 RUNTIME_DEP_PKGS_CSWclamav += CSWlibltdl7
 
 PACKAGES += CSWlibclam6
@@ -95,6 +95,7 @@
 #SKIPTEST = 1
 TEST_TARGET = check
 
+# These are harmless examples
 CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/etc/opt/csw/clamd.conf.CSW
 CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamav/README
 CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamav/INSTALL.clamav-milter.CSW
@@ -104,18 +105,11 @@
 CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamav/html/node24.html
 CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamav/html/node15.html
 
+# We don't split to three separate packages
 CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamav.so.6.1.10|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6
 CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.10|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6
 CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.10|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6
 
-# Should only be necessary during transition of devel -> dev
-CHECKPKG_OVERRIDES_CSWlibclam6-dev += file-collision|/opt/csw/lib/libclamunrar.so|CSWlibclam6-dev|CSWlibclam6-devel
-CHECKPKG_OVERRIDES_CSWlibclam6-dev += file-collision|/opt/csw/bin/clamav-config|CSWlibclam6-dev|CSWlibclam6-devel
-CHECKPKG_OVERRIDES_CSWlibclam6-dev += file-collision|/opt/csw/lib/libclamunrar_iface.so|CSWlibclam6-dev|CSWlibclam6-devel
-CHECKPKG_OVERRIDES_CSWlibclam6-dev += file-collision|/opt/csw/include/clamav.h|CSWlibclam6-dev|CSWlibclam6-devel
-CHECKPKG_OVERRIDES_CSWlibclam6-dev += file-collision|/opt/csw/lib/pkgconfig/libclamav.pc|CSWlibclam6-dev|CSWlibclam6-devel
-CHECKPKG_OVERRIDES_CSWlibclam6-dev += file-collision|/opt/csw/lib/libclamav.so|CSWlibclam6-dev|CSWlibclam6-devel
-
 include gar/category.mk
 
 DOCS  = AUTHORS BUGS ChangeLog


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