Revision: 26892
http://sourceforge.net/p/gar/code/26892
Author: idogan23
Date: 2022-02-20 18:46:19 +0000 (Sun, 20 Feb 2022)
Log Message:
-----------
clamav: Fix splitup into multiple packages
Modified Paths:
--------------
csw/mgar/pkg/clamav/trunk/Makefile
Modified: csw/mgar/pkg/clamav/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clamav/trunk/Makefile 2022-02-20 16:46:09 UTC (rev 26891)
+++ csw/mgar/pkg/clamav/trunk/Makefile 2022-02-20 18:46:19 UTC (rev 26892)
@@ -40,29 +40,27 @@
RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibssl1-0-0
RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibpcre2-8-0
RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibcurl4
-RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibpcre2-8-0
RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibclammspack0
-RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibclamav9 += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWlibfreshclam2 += CSWlibcurl4
-RUNTIME_DEP_PKGS_CSWlibfreshclam2 += CSWlibgcc-s1
INCOMPATIBLE_PKGS_CSWlibclamav9 += CSWlibclamav CSWlibclam6 CSWlibclam7
-OBSOLETED_BY_CSWlibclam9 = CSWlibclam7
+OBSOLETED_BY_CSWlibclam9 += CSWlibclam7
-PACKAGES += CSWlibclammspack0
-CATALOGNAME_CSWlibclammspack0 = libclammspack0
-PKGFILES_CSWlibclammspack0 += $(call
baseisadirs,$(libdir),libclammspack\.so\.0\.1\.0)
-PKGFILES_CSWlibclammspack0 += $(call
baseisadirs,$(libdir),libclammspack\.so\.0(\.\d+)*)
-SPKG_DESC_CSWlibclammspack0 += $(DESCRIPTION), libclammspack.so.0
-RUNTIME_DEP_PKGS_CSWlibclam9 += CSWlibclammspack0
-RUNTIME_DEP_PKGS_CSWlibclammspack0 += CSWlibgcc-s1
+PACKAGES += CSWlibclammspack0
+CATALOGNAME_CSWlibclammspack0 = libclammspack0
+PKGFILES_CSWlibclammspack0 += $(call
baseisadirs,$(libdir),libclammspack\.so\.0\.1\.0)
+PKGFILES_CSWlibclammspack0 += $(call
baseisadirs,$(libdir),libclammspack\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibclammspack0 += $(DESCRIPTION), libclammspack.so.0
+RUNTIME_DEP_PKGS_CSWlibclam9 += CSWlibclammspack0
+RUNTIME_DEP_PKGS_CSWlibclammspack0 += CSWlibgcc-s1
+INCOMPATIBLE_PKGS_CSWlibclammspack0 += CSWlibclam7
-CATALOGNAME_CSWlibclamunrar9 = libclamunrar9
-PKGFILES_CSWlibclamunrar9 += $(call
baseisadirs,$(libdir),libclamunrar\.so\.9\.0\.5)
-PKGFILES_CSWlibclamunrar9 += $(call
baseisadirs,$(libdir),libclamunrar\.so\.9(\.\d+)*)
-SPKG_DESC_CSWlibclamunrar9 += $(DESCRIPTION), libclamunrar.so.9
-RUNTIME_DEP_PKGS_CSWlibclam9 += CSWlibclamunrar9
+PACKAGES += CSWlibclamunrar9
+CATALOGNAME_CSWlibclamunrar9 = libclamunrar9
+PKGFILES_CSWlibclamunrar9 += $(call
baseisadirs,$(libdir),libclamunrar\.so\.9\.0\.5)
+PKGFILES_CSWlibclamunrar9 += $(call
baseisadirs,$(libdir),libclamunrar\.so\.9(\.\d+)*)
+SPKG_DESC_CSWlibclamunrar9 += $(DESCRIPTION), libclamunrar.so.9
+RUNTIME_DEP_PKGS_CSWlibclam9 += CSWlibclamunrar9
+RUNTIME_DEP_PKGS_CSWlibclamunrar9 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibclamunrar9 += CSWlibstdc++6
PACKAGES += CSWlibclamunrar-iface9
CATALOGNAME_CSWlibclamunrar-iface9 = libclamunrar_iface9
@@ -72,6 +70,7 @@
RUNTIME_DEP_PKGS_CSWlibclam9 += CSWlibclamunrar-iface9
RUNTIME_DEP_PKGS_CSWlibclamunrar-iface9 += CSWlibgcc-s1
RUNTIME_DEP_PKGS_CSWlibclamunrar-iface9 += CSWclamav
+RUNTIME_DEP_PKGS_CSWlibclamunrar-iface9 += CSWlibclamunrar9
PACKAGES += CSWlibfreshclam2
CATALOGNAME_CSWlibfreshclam2 = libfreshclam2
@@ -83,6 +82,10 @@
RUNTIME_DEP_PKGS_CSWlibfreshclam2 += CSWlibiconv
RUNTIME_DEP_PKGS_CSWlibfreshclam2 += CSWlibssl1-0-0
RUNTIME_DEP_PKGS_CSWlibfreshclam2 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibfreshclam2 += CSWlibclamav9
+RUNTIME_DEP_PKGS_CSWlibfreshclam2 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibfreshclam2 += CSWlibcurl4
+RUNTIME_DEP_PKGS_CSWlibfreshclam2 += CSWlibgcc-s1
PACKAGES += CSWlibclam9-dev
CATALOGNAME_CSWlibclam9-dev = libclam9_dev
@@ -93,7 +96,9 @@
RUNTIME_DEP_PKGS_CSWlibclam9-dev += CSWlibclammspack0
RUNTIME_DEP_PKGS_CSWlibclam9-dev += CSWlibclamunrar-iface9
RUNTIME_DEP_PKGS_CSWlibclam9-dev += CSWlibfreshclam2
-INCOMPATIBLE_PKGS_CSWlibclam9-dev += CSWlibclamav-devel CSWlibclamav6-devel
CSWlibclam6-dev
+RUNTIME_DEP_PKGS_CSWlibclam9-dev += CSWlibclamunrar9
+#INCOMPATIBLE_PKGS_CSWlibclam9-dev += CSWlibclamav-devel CSWlibclamav6-devel
CSWlibclam6-dev
+OBSOLETED_BY_CSWlibclam9-dev = CSWlibclam7 CSWlibclam6-dev
CSWlibclamav6-devel CSWlibclamav-devel
PATCHFILES += 0001-config.patch
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
