SF.net SVN: gar:[23963] csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile

[lblume at users.sourceforge.net]

Revision: 23963
          http://sourceforge.net/p/gar/code/23963
Author:   lblume
Date:     2014-08-10 18:35:22 +0000 (Sun, 10 Aug 2014)
Log Message:
-----------
mysql5/branches/mysql-5.6.x: Fix more dependencies

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile	2014-08-10 18:08:50 UTC (rev 23962)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile	2014-08-10 18:35:22 UTC (rev 23963)
@@ -88,6 +88,8 @@
 PKGFILES_CSW$(NAME)-dev  += $(mandir)/man1/mysql_config.*
 PKGFILES_CSW$(NAME)-dev  += $(prefix)/include.*
 INCOMPATIBLE_PKGS_CSW$(NAME)-dev = CSWmysql-dev
+CHECKPKG_OVERRIDES_CSW$(NAME)-dev += file-collision
+CHECKPKG_OVERRIDES_CSW$(NAME)-dev += surplus-dependency|CSWlibmysqlclient-$(MYSQL_LIB_VER)
 
 PACKAGES += CSWlibmysqlclient$(MYSQL_LIB_VER)
 PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*)
@@ -99,7 +101,7 @@
 PACKAGES += CSWlibmysqlclient-r$(MYSQL_LIB_VER)
 PKGFILES_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient_r\.so\.$(MYSQL_LIB_VER)(\.\d+)*)
 SPKG_DESC_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient_r.so.$(MYSQL_LIB_VER)
-RUNTIME_DEP_PKGS_CSWlibmysqlclient-r18 += CSWlibmysqlclient18
+RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWlibmysqlclient$(MYSQL_LIB_VER)
 
 # Defining the client programs, which are going to pick up the 32- and 64-bit
 # binaries, symbolic links, isaexec stuff and man pages.

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