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

[wahwah at users.sourceforge.net]

Revision: 15875
          http://gar.svn.sourceforge.net/gar/?rev=15875&view=rev
Author:   wahwah
Date:     2011-10-06 07:14:11 +0000 (Thu, 06 Oct 2011)
Log Message:
-----------
pkg/mysql5/branches/mysql-5.0.x: No need for the test and bench packages

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-05 22:37:18 UTC (rev 15874)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile	2011-10-06 07:14:11 UTC (rev 15875)
@@ -30,7 +30,7 @@
 INITSMF = $(sysconfdir)/init\.d/csw$(NAME)
 
 # Existing databases are in this location
-localstatedir = /var/opt/csw/mysql5
+localstatedir = /var$(BUILD_PREFIX)/$(NAME)
 # To avoid file conflicts
 datadir = $(prefix)/share/mysql/$(BASE_VERSION)
 
@@ -111,21 +111,9 @@
 CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry
 CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content
 
-PACKAGES += CSW$(NAME)bench
-SPKG_DESC_CSW$(NAME)bench  = MySQL $(BASE_VERSION) benchmarking
-ARCHALL_CSW$(NAME)bench = 1
-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
+EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/mysql-test.*
+EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/sql-bench.*
 
-PACKAGES += CSW$(NAME)test
-SPKG_DESC_CSW$(NAME)test   = MySQL $(BASE_VERSION) testing files
-ARCHALL_CSW$(NAME)test  = 1
-PKGFILES_CSW$(NAME)test    = $(prefix)/mysql-test.*
-RUNTIME_DEP_PKGS_CSW$(NAME)test        = CSW$(NAME)
-RUNTIME_DEP_PKGS_CSW$(NAME)test       += CSWperl
-
 PATCHFILES  = 0001-Use-libc-not-libcrypt.patch
 PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch
 # PATCHFILES += 0003-OpenCSW-perl-for-tests.patch

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