diff options
author | Alex Dupre <ale@FreeBSD.org> | 2006-06-19 09:08:56 +0000 |
---|---|---|
committer | Alex Dupre <ale@FreeBSD.org> | 2006-06-19 09:08:56 +0000 |
commit | 20dac73485d2c71863feeed77a352444dfd7e98a (patch) | |
tree | 849016066d9ce1b5583b9390a01ed828819d2d7e /databases/mysql60-server/files | |
parent | 2e279978a3c86c552b0285db5eeff0f66c380a77 (diff) | |
download | ports-20dac73485d2c71863feeed77a352444dfd7e98a.tar.gz ports-20dac73485d2c71863feeed77a352444dfd7e98a.zip |
Notes
Diffstat (limited to 'databases/mysql60-server/files')
5 files changed, 42 insertions, 22 deletions
diff --git a/databases/mysql60-server/files/patch-Docs::Makefile.in b/databases/mysql60-server/files/patch-Docs::Makefile.in index fdb104a450c0..677da903d045 100644 --- a/databases/mysql60-server/files/patch-Docs::Makefile.in +++ b/databases/mysql60-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/mysql60-server/files/patch-Makefile.in b/databases/mysql60-server/files/patch-Makefile.in index b38df39ca0ab..3c773a4974af 100644 --- a/databases/mysql60-server/files/patch-Makefile.in +++ b/databases/mysql60-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/mysql60-server/files/patch-extra_yassl_Makefile.in b/databases/mysql60-server/files/patch-extra_yassl_Makefile.in new file mode 100644 index 000000000000..efb79a7902c4 --- /dev/null +++ b/databases/mysql60-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/mysql60-server/files/patch-extra_yassl_taocrypt_Makefile.in b/databases/mysql60-server/files/patch-extra_yassl_taocrypt_Makefile.in new file mode 100644 index 000000000000..d4727bd80632 --- /dev/null +++ b/databases/mysql60-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/mysql60-server/files/patch-scripts::Makefile.in b/databases/mysql60-server/files/patch-scripts::Makefile.in index 6548d492fc3c..827bddd734ad 100644 --- a/databases/mysql60-server/files/patch-scripts::Makefile.in +++ b/databases/mysql60-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 |