[csw-devel] SF.net SVN: gar:[18331] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Mon Jun 11 18:15:40 CEST 2012
Revision: 18331
http://gar.svn.sourceforge.net/gar/?rev=18331&view=rev
Author: wahwah
Date: 2012-06-11 16:15:40 +0000 (Mon, 11 Jun 2012)
Log Message:
-----------
dependency updates
Modified Paths:
--------------
csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile
csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql51.postinstall
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2012-06-11 14:48:51 UTC (rev 18330)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2012-06-11 16:15:40 UTC (rev 18331)
@@ -1,4 +1,4 @@
-# Copyright 2009 OpenCSW
+# Copyright 2009-2012 OpenCSW
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -43,7 +43,7 @@
PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(mandir)/man1/$(bin_name)\.1-$(BASE_VERSION))
PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/bin/$(bin_name)-$(BASE_VERSION))
PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/sbin/$(bin_name)-$(BASE_VERSION))
-PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config.*
+PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config\.1
PKGFILES_CSWmysql-dev += $(prefix)/include.*
PKGFILES_CSWmysql-dev += /opt/csw/include/mysql
OBSOLETED_BY_CSWmysql-dev = CSWmysql5devel
@@ -59,14 +59,14 @@
PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*)
SPKG_DESC_CSWlibmysqlclient$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient.so.$(MYSQL_LIB_VER)
RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWosslrt
+RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibssl1-0-0
OBSOLETED_BY_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSW$(NAME)rt
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-r$(MYSQL_LIB_VER) += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWosslrt
+RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWlibssl1-0-0
OBSOLETED_BY_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSW$(NAME)rt
# Defining the client programs, which are going to pick up the 32- and 64-bit
@@ -99,7 +99,7 @@
RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient-r$(MYSQL_LIB_VER)
RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibncursesw5
RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1
-RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWosslrt
+RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibssl1-0-0
CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry
PACKAGES += CSW$(NAME)
@@ -109,7 +109,7 @@
RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)client
RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1
RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1
-RUNTIME_DEP_PKGS_CSW$(NAME) += CSWosslrt
+RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibssl1-0-0
CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry
CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content
@@ -129,6 +129,14 @@
# Enable 64 bits build
BUILD64 = 1
+# EXTRA_CFLAGS = $(EXTRA_CFLAGS_$(GARCH))
+# EXTRA_CFLAGS_sparc = -xO4 -xstrconst $(COMMON_CFLAGS)
+# EXTRA_CFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_CFLAGS)
+# EXTRA_CXXFLAGS = $(EXTRA_CXXFLAGS_$(GARCH))
+# EXTRA_CXXFLAGS_sparc = -xO4 $(COMMON_CFLAGS)
+# EXTRA_CXXFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_CFLAGS)
+# COMMON_CFLAGS = -mt -fsimple=1 -ftrap=%none -xbuiltin=%all -xlibmil -xlibmopt
+#
EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql51.postinstall
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql51.postinstall 2012-06-11 14:48:51 UTC (rev 18330)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql51.postinstall 2012-06-11 16:15:40 UTC (rev 18331)
@@ -8,13 +8,17 @@
# This script creates a default database with the small-memory footprint.
# Input may be provided for DATADIR and DEFAULTS_FILE
#
-BASEDIR=/opt/csw
-MYSQL_VAR=/var/opt/csw/mysql51
-DEFAULTS_FILE=$BASEDIR/etc/my.cnf
-SAVE_DEFAULTS_FILE=$MYSQL_VAR/my.cnf
-MYSQLD_USER=mysql
+prefix="/opt/csw"
+BASEDIR="${prefix}"
+MYSQL_HOME="/var${prefix}/mysql51"
+sysconfdir="/etc${prefix}"
+# https://www.opencsw.org/mantis/view.php?id=4646
+# MYSQL_VAR="${MYSQL_HOME}"
+DEFAULTS_FILE="${sysconfdir}/my.cnf"
+# SAVE_DEFAULTS_FILE=$MYSQL_VAR/my.cnf
+MYSQLD_USER="mysql"
# Provide the default data directory
-MYSQLD_DATADIR=$MYSQL_VAR
+MYSQLD_DATADIR="${MYSQL_HOME}"
# http://bugs.mysql.com/bug.php?id=31164
# ERROR: 1004 Can't create file '/var/tmp//installRJaiQ3/#sql6fee_1_0.frm' (errno: 13)
@@ -53,7 +57,7 @@
echo "Creating MySQL core database in $MYSQLD_DATADIR"
echo
echo "### The following messages are from mysql_install_db."
-$BASEDIR/bin/mysql_install_db \
+"$BASEDIR/bin/mysql_install_db-5.1" \
--defaults-extra-file="$DEFAULTS_FILE" \
--user="$MYSQLD_USER" \
--basedir="$BASEDIR" \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list