SF.net SVN: gar:[23979] csw/mgar/pkg/log4shib/trunk/Makefile

[claudio_sf at users.sourceforge.net]

Revision: 23979
          http://sourceforge.net/p/gar/code/23979
Author:   claudio_sf
Date:     2014-08-13 13:03:46 +0000 (Wed, 13 Aug 2014)
Log Message:
-----------
log4shib/trunk: overrides

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

Modified: csw/mgar/pkg/log4shib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/log4shib/trunk/Makefile	2014-08-13 12:37:04 UTC (rev 23978)
+++ csw/mgar/pkg/log4shib/trunk/Makefile	2014-08-13 13:03:46 UTC (rev 23979)
@@ -11,23 +11,9 @@
 DISTFILES += $(DISTNAME).tar.gz
 
 # separate packages
-PACKAGES += CSWliblog4shib1
-CATALOGNAME_CSWliblog4shib1 = liblog4shib1
-PKGFILES_CSWliblog4shib1 += $(call baseisadirs,$(libdir),liblog4shib\.so\.1\.0\.8)
-PKGFILES_CSWliblog4shib1 += $(call baseisadirs,$(libdir),liblog4shib\.so\.1(\.\d+)*)
-SPKG_DESC_CSWliblog4shib1 += $(DESCRIPTION), liblog4shib.so.1
-RUNTIME_DEP_PKGS_CSWlog4shib += CSWliblog4shib1
-RUNTIME_DEP_PKGS_CSWlog4shib-dev += CSWliblog4shib1
 RUNTIME_DEP_PKGS_CSWliblog4shib1 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWliblog4shib1 += CSWlibstdc++6
 
-# The end of CSWliblog4shib1 definition
-# (If CSWlog4shib-dev doesn't exist yet)
-PACKAGES += CSWlog4shib-dev
-CATALOGNAME_CSWlog4shib-dev = log4shib_dev
-SPKG_DESC_CSWlog4shib-dev += $(DESCRIPTION), development files
-PKGFILES_CSWlog4shib-dev += /opt/csw/lib/liblog4shib.so
-
 GARCOMPILER = GCC4
 #BUILD64 = 1
 #ISAEXEC = 1
@@ -35,6 +21,11 @@
 # We want 64 bit binaries
 #MERGE_DIRS_isa-extra = $(bindir) $(sbindir) $(libdir) $(libexecdir)
 
+#OVERRIDES
+CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/liblog4shib.so
+CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblog4shib.so.1.0.8|soname=liblog4shib.so.1|pkgname=CSWlog4shib|expected=CSWliblog4shib1
+CHECKPKG_OVERRIDES_CSWlog4shib += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/liblog4shib.so
+
 #CONFIGURE_ARGS = $(DIRPATHS)
 RUNTIME_DEP_PKGS_CSWlog4shib += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlog4shib += CSWlibstdc++6

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