[csw-devel] SF.net SVN: gar:[15877] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile

[wahwah at users.sourceforge.net]

Revision: 15877
          http://gar.svn.sourceforge.net/gar/?rev=15877&view=rev
Author:   wahwah
Date:     2011-10-06 07:37:13 +0000 (Thu, 06 Oct 2011)
Log Message:
-----------
pkg/mysql5/branches/mysql-5.0.x: separate patch for 5.0 mysqld versioning

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

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile	2011-10-06 07:15:46 UTC (rev 15876)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile	2011-10-06 07:37:13 UTC (rev 15877)
@@ -121,7 +121,7 @@
 PATCHFILES += 0004-looking-for-ps-use-basename-0.patch
 # Perhaps using sed would be better, but we have a patch for now.
 PATCHFILES += 0006-Use-my_print_defaults-$(BASE_VERSION).patch
-PATCHFILES += 0007-versioned-mysqld-during-db-init-$(BASE_VERSION).patch
+# PATCHFILES += 0007-versioned-mysqld-during-db-init-$(BASE_VERSION).patch
 PATCHFILES += 0008-versioned-mysqld-in-mysql_install_db.patch
 PATCHFILES += 0009-versioned-datadir-in-mysql_install_db-$(BASE_VERSION).patch
 
@@ -251,6 +251,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.