aboutsummaryrefslogtreecommitdiff
path: root/databases/percona55-server
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2006-06-19 09:08:56 +0000
committerAlex Dupre <ale@FreeBSD.org>2006-06-19 09:08:56 +0000
commit20dac73485d2c71863feeed77a352444dfd7e98a (patch)
tree849016066d9ce1b5583b9390a01ed828819d2d7e /databases/percona55-server
parent2e279978a3c86c552b0285db5eeff0f66c380a77 (diff)
downloadports-20dac73485d2c71863feeed77a352444dfd7e98a.tar.gz
ports-20dac73485d2c71863feeed77a352444dfd7e98a.zip
Notes
Diffstat (limited to 'databases/percona55-server')
-rw-r--r--databases/percona55-server/Makefile36
-rw-r--r--databases/percona55-server/distinfo6
-rw-r--r--databases/percona55-server/files/patch-Docs::Makefile.in10
-rw-r--r--databases/percona55-server/files/patch-Makefile.in21
-rw-r--r--databases/percona55-server/files/patch-extra_yassl_Makefile.in11
-rw-r--r--databases/percona55-server/files/patch-extra_yassl_taocrypt_Makefile.in11
-rw-r--r--databases/percona55-server/files/patch-scripts::Makefile.in11
-rw-r--r--databases/percona55-server/pkg-plist2
-rw-r--r--databases/percona55-server/pkg-plist.client3
9 files changed, 54 insertions, 57 deletions
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 29112459dbf8..343d073cdfba 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME?= mysql
-PORTVERSION= 5.1.9
+PORTVERSION= 5.1.11
PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL}
@@ -25,8 +25,6 @@ CONFIGURE_ARGS= --localstatedir=/var/db/mysql \
--without-debug \
--without-readline \
--without-libedit \
- --without-bench \
- --without-extra-tools \
--with-libwrap \
--with-mysqlfs \
--with-low-memory \
@@ -44,26 +42,15 @@ CONFIGURE_ARGS+=--with-charset=${WITH_CHARSET}
CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
.endif
.if defined(WITH_OPENSSL)
-USE_OPENSSL= yes
-CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
+CONFIGURE_ARGS+=--with-ssl=bundled
.endif
.if defined(BUILD_STATIC)
CONFIGURE_ARGS+=--with-mysqld-ldflags=-all-static
.endif
-.if !defined(WITHOUT_INNODB)
-CONFIGURE_ARGS+=--with-innodb
-.endif
-.if defined(WITH_ARCHIVE)
-CONFIGURE_ARGS+=--with-archive-storage-engine
-.endif
-.if defined(WITH_FEDERATED)
-CONFIGURE_ARGS+=--with-federated-storage-engine
-.endif
-.if defined(WITH_PARTITION)
-CONFIGURE_ARGS+=--with-partition
-.endif
.if defined(WITH_NDB)
-CONFIGURE_ARGS+=--with-ndbcluster
+CONFIGURE_ARGS+=--with-plugins=max
+.else
+CONFIGURE_ARGS+=--with-plugins=max-no-ndb
.endif
.if defined(WITH_COLLATION) && ${WITH_COLLATION} != ""
CONFIGURE_ARGS+=--with-collation=${WITH_COLLATION}
@@ -72,7 +59,7 @@ CONFIGURE_ARGS+=--with-collation=${WITH_COLLATION}
.include <bsd.port.pre.mk>
.if ${ARCH} == "i386"
-CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
+CONFIGURE_ARGS+=--enable-assembler
.endif
.if defined(WITH_LINUXTHREADS)
CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R
@@ -146,17 +133,13 @@ pre-fetch:
@${ECHO} " (use it if you need speed)."
@${ECHO} " BUILD_STATIC=yes Build a static version of mysqld."
@${ECHO} " (use it if you need even more speed)."
- @${ECHO} " WITHOUT_INNODB=yes Disable support for InnoDB table handler."
- @${ECHO} " WITH_ARCHIVE=yes Enable support for Archive Storage Engine."
- @${ECHO} " WITH_FEDERATED=yes Enable support for Federated Storage Engine."
- @${ECHO} " WITH_PARTITION=yes Enable support for Partition Storage Engine."
@${ECHO} " WITH_NDB=yes Enable support for NDB Cluster."
@${ECHO} ""
post-patch:
- @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @zlib_dir@ @sql_server_dirs@ @mysql_se_dirs@ @sql_server@ scripts @man_dirs@ support-files|g" ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @zlib_dir@ @sql_server_dirs@ storage @sql_server@ scripts @man_dirs@ support-files|g" ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_upgrade mysql_create_system_tables|g" ${WRKSRC}/scripts/Makefile.in
+ @${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_create_system_tables|g" ${WRKSRC}/scripts/Makefile.in
@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql|g" ${WRKSRC}/scripts/Makefile.in
@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
@${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/extra/Makefile.in
@@ -182,10 +165,7 @@ CONFLICTS= mysql-client-3.* mysql-client-4.* mysql-client-5.0.*
MAN1= mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \
mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1
-INSTALLS_SHLIB= yes
-LDCONFIG_DIRS= %%PREFIX%%/lib/mysql
USE_LDCONFIG= ${PREFIX}/lib/mysql
-.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk"
CONFIGURE_ARGS+=--without-server
diff --git a/databases/percona55-server/distinfo b/databases/percona55-server/distinfo
index c8e5a4e515e1..ba45006afcff 100644
--- a/databases/percona55-server/distinfo
+++ b/databases/percona55-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (mysql-5.1.9-beta.tar.gz) = 542f4cf6191a00596f190033d053c468
-SHA256 (mysql-5.1.9-beta.tar.gz) = 78ea4069ed278e040bf3b688c8904e4bc668051544349819ee7bfea78a922723
-SIZE (mysql-5.1.9-beta.tar.gz) = 21289244
+MD5 (mysql-5.1.11-beta.tar.gz) = f5e807425247f7b726faefa232367fbd
+SHA256 (mysql-5.1.11-beta.tar.gz) = 688ae9848b575c3d0b7d30df60881b2502279f5578e55e7856de1315ebc1e534
+SIZE (mysql-5.1.11-beta.tar.gz) = 21291745
diff --git a/databases/percona55-server/files/patch-Docs::Makefile.in b/databases/percona55-server/files/patch-Docs::Makefile.in
index fdb104a450c0..677da903d045 100644
--- a/databases/percona55-server/files/patch-Docs::Makefile.in
+++ b/databases/percona55-server/files/patch-Docs::Makefile.in
@@ -1,15 +1,15 @@
---- Docs/Makefile.in.orig Thu Dec 15 00:34:47 2005
-+++ Docs/Makefile.in Thu Dec 22 15:34:13 2005
-@@ -346,7 +346,7 @@
+--- Docs/Makefile.in.orig Fri Jun 2 20:02:56 2006
++++ Docs/Makefile.in Thu Jun 15 07:18:41 2006
+@@ -370,7 +370,7 @@
# generated files explicitly in DISTCLEANFILES.
DISTCLEANFILES = $(TXT_FILES)
- GT = $(srcdir)/Support/generate-text-files.pl
+ GT = $(srcdir)/generate-text-files.pl
-all: all-am
+all:
.SUFFIXES:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-@@ -432,7 +432,7 @@
+@@ -458,7 +458,7 @@
install-data: install-data-am
uninstall: uninstall-am
diff --git a/databases/percona55-server/files/patch-Makefile.in b/databases/percona55-server/files/patch-Makefile.in
index b38df39ca0ab..3c773a4974af 100644
--- a/databases/percona55-server/files/patch-Makefile.in
+++ b/databases/percona55-server/files/patch-Makefile.in
@@ -1,19 +1,18 @@
---- Makefile.in.orig Fri Apr 14 02:34:33 2006
-+++ Makefile.in Wed May 10 17:25:32 2006
-@@ -365,15 +365,7 @@
+--- Makefile.in.orig Thu Jun 15 07:53:42 2006
++++ Makefile.in Thu Jun 15 07:53:56 2006
+@@ -389,14 +389,7 @@
EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
- README COPYING EXCEPTIONS-CLIENT cmakelists.txt
+ README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
--SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
+-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
- @readline_topdir@ sql-common \
- @thread_dirs@ pstack \
-- @sql_union_dirs@ @mysql_se_dirs@ \
+- @sql_union_dirs@ storage plugin \
- @sql_server@ scripts @man_dirs@ tests \
-- @mysql_se_plugins@ \
- netware @libmysqld_dirs@ \
-- @bench_dirs@ support-files @tools_dirs@ \
-- plugin win
+- mysql-test support-files @tools_dirs@ \
+- unittest win
+SUBDIRS =
- DIST_SUBDIRS = . include @docs_dirs@ zlib \
- @readline_topdir@ sql-common \
+ DIST_SUBDIRS = $(SUBDIRS) BUILD
+
diff --git a/databases/percona55-server/files/patch-extra_yassl_Makefile.in b/databases/percona55-server/files/patch-extra_yassl_Makefile.in
new file mode 100644
index 000000000000..efb79a7902c4
--- /dev/null
+++ b/databases/percona55-server/files/patch-extra_yassl_Makefile.in
@@ -0,0 +1,11 @@
+--- extra/yassl/Makefile.in.orig Mon Jun 19 10:46:01 2006
++++ extra/yassl/Makefile.in Mon Jun 19 10:46:16 2006
+@@ -351,7 +351,7 @@
+ yassl_libs = @yassl_libs@
+ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
+ zlib_dir = @zlib_dir@
+-SUBDIRS = taocrypt src testsuite
++SUBDIRS = taocrypt src
+ EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj $(wildcard mySTL/*.hpp) \
+ CMakeLists.txt
+
diff --git a/databases/percona55-server/files/patch-extra_yassl_taocrypt_Makefile.in b/databases/percona55-server/files/patch-extra_yassl_taocrypt_Makefile.in
new file mode 100644
index 000000000000..d4727bd80632
--- /dev/null
+++ b/databases/percona55-server/files/patch-extra_yassl_taocrypt_Makefile.in
@@ -0,0 +1,11 @@
+--- extra/yassl/taocrypt/Makefile.in.orig Mon Jun 19 10:52:14 2006
++++ extra/yassl/taocrypt/Makefile.in Mon Jun 19 10:52:30 2006
+@@ -350,7 +350,7 @@
+ yassl_libs = @yassl_libs@
+ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
+ zlib_dir = @zlib_dir@
+-SUBDIRS = src test benchmark
++SUBDIRS = src
+ EXTRA_DIST = taocrypt.dsw taocrypt.dsp taocrypt.vcproj CMakeLists.txt
+ all: all-recursive
+
diff --git a/databases/percona55-server/files/patch-scripts::Makefile.in b/databases/percona55-server/files/patch-scripts::Makefile.in
index 6548d492fc3c..827bddd734ad 100644
--- a/databases/percona55-server/files/patch-scripts::Makefile.in
+++ b/databases/percona55-server/files/patch-scripts::Makefile.in
@@ -1,7 +1,7 @@
---- scripts/Makefile.in.orig Mon Feb 27 22:26:54 2006
-+++ scripts/Makefile.in Thu Mar 16 08:04:00 2006
-@@ -342,24 +342,7 @@
- yassl_libs_with_path = @yassl_libs_with_path@
+--- scripts/Makefile.in.orig Fri Jun 2 20:03:10 2006
++++ scripts/Makefile.in Thu Jun 15 07:56:56 2006
+@@ -371,23 +371,7 @@
+ yassl_libs = @yassl_libs@
yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
zlib_dir = @zlib_dir@
-bin_SCRIPTS = @server_scripts@ \
@@ -19,14 +19,13 @@
- mysqlhotcopy \
- mysqldumpslow \
- mysql_explain_log \
-- mysql_upgrade \
- mysqld_multi \
- mysql_create_system_tables
+bin_SCRIPTS =
noinst_SCRIPTS = make_binary_distribution \
make_sharedlib_distribution \
-@@ -392,7 +375,7 @@
+@@ -419,7 +403,7 @@
mysqlaccess.conf \
mysqlbug
diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist
index f01b3a1538b0..19c853b954c1 100644
--- a/databases/percona55-server/pkg-plist
+++ b/databases/percona55-server/pkg-plist
@@ -9,7 +9,6 @@ bin/myisampack
bin/mysql_create_system_tables
bin/mysql_install_db
bin/mysql_tzinfo_to_sql
-bin/mysql_upgrade
bin/mysql_waitpid
bin/mysqld_safe
%%NDB%%bin/ndb_config
@@ -63,7 +62,6 @@ bin/resolveip
%%NDB%%include/mysql/storage/ndb/ndbapi/ndb_cluster_connection.hpp
%%NDB%%include/mysql/storage/ndb/ndbapi/ndb_opt_defaults.h
%%NDB%%include/mysql/storage/ndb/ndbapi/ndberror.h
-lib/mysql/libcsv.a
lib/mysql/libdbug.a
lib/mysql/libheap.a
lib/mysql/libmyisam.a
diff --git a/databases/percona55-server/pkg-plist.client b/databases/percona55-server/pkg-plist.client
index ff727c3c5bc6..857870c78dba 100644
--- a/databases/percona55-server/pkg-plist.client
+++ b/databases/percona55-server/pkg-plist.client
@@ -1,6 +1,7 @@
bin/mysql
bin/mysql_config
bin/mysql_fix_privilege_tables
+bin/mysql_upgrade
bin/mysqladmin
bin/mysqlbinlog
bin/mysqlbug
@@ -10,8 +11,6 @@ bin/mysqlimport
bin/mysqlshow
bin/mysqlslap
bin/mysqltest
-bin/mysqltestmanager-pwgen
-bin/mysqltestmanagerc
include/mysql/errmsg.h
include/mysql/keycache.h
include/mysql/m_ctype.h