[csw-devel] SF.net SVN: gar:[15869] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/ Makefile

[wahwah at users.sourceforge.net]

Revision: 15869
          http://gar.svn.sourceforge.net/gar/?rev=15869&view=rev
Author:   wahwah
Date:     2011-10-05 14:42:32 +0000 (Wed, 05 Oct 2011)
Log Message:
-----------
pkg/mysql5/branches/mysql-5.1.x-optcsw: updated overrides.

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

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile	2011-10-05 14:21:12 UTC (rev 15868)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile	2011-10-05 14:42:32 UTC (rev 15869)
@@ -119,7 +119,7 @@
 PKGFILES_CSW$(NAME)bench   = $(prefix)/sql-bench.*
 RUNTIME_DEP_PKGS_CSW$(NAME)bench       = CSW$(NAME)
 RUNTIME_DEP_PKGS_CSW$(NAME)bench      += CSWperl
-CHECKPKG_OVERRIDES_CSWmysql5bench += surplus-dependency|CSWperl
+CHECKPKG_OVERRIDES_CSW$(NAME)bench += surplus-dependency|CSWperl
 
 PACKAGES += CSW$(NAME)test
 SPKG_DESC_CSW$(NAME)test   = MySQL $(BASE_VERSION) testing files
@@ -128,6 +128,7 @@
 PKGFILES_CSW$(NAME)test    = $(prefix)/mysql-test.*
 RUNTIME_DEP_PKGS_CSW$(NAME)test        = CSW$(NAME)
 RUNTIME_DEP_PKGS_CSW$(NAME)test       += CSWperl
+CHECKPKG_OVERRIDES_CSWmysql51test += bad-rpath-entry
 
 PATCHFILES  = 0001-Use-libc-not-libcrypt.patch
 PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch
@@ -263,6 +264,12 @@
 ALTERNATIVE_mysql$(BASE_VERSION)_client += $(foreach C,$(wordlist 2,$(words $(client_programs)),$(client_programs)),\
 	$(mandir)/man1/$(C).1 $C $(mandir)/man1/$(C)-$(BASE_VERSION).1)
 
+# These are harmless, although it would be nice to clean them up eventually.
+# Help appreciated?
+CHECKPKG_OVERRIDES_CSWmysql51 += file-collision|/opt/csw/share/doc/mysql5devel_stub/README.CSW|CSWmysql5|CSWmysql51
+CHECKPKG_OVERRIDES_CSWmysql51 += file-collision|/opt/csw/share/doc/mysql_dev/README.CSW|CSWmysql5|CSWmysql51
+CHECKPKG_OVERRIDES_CSWmysql51 += file-collision|/opt/csw/share/info/mysql.info|CSWmysql5|CSWmysql51
+
 include gar/category.mk
 
 CFLAGS := $(filter-out -I%,$(CFLAGS))

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