View | Details | Raw Unified | Return to bug 75556
Collapse All | Expand All

(-)mysql41-server/Makefile Mon Dec 27 21:58:27 2004 (-1 / +1 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME?=     mysql
8
PORTNAME?=     mysql
9
PORTVERSION=   4.1.7
9
PORTVERSION=   4.1.8
10
PORTREVISION?= 0
10
PORTREVISION?= 0
11
CATEGORIES=    databases
11
CATEGORIES=    databases
12
MASTER_SITES=  ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \
12
MASTER_SITES=  ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \
(-)mysql41-server/distinfo Mon Dec 27 15:56:45 2004 (-2 / +2 lines)
Lines 1-2 Link Here
1
MD5 (mysql-4.1.7.tar.gz) = 04c08d2a5cc39050d9fa4727f8f197e8
1
MD5 (mysql-4.1.8.tar.gz) = d1b3e84d1d49366e2692f453e7bf8879
2
SIZE (mysql-4.1.7.tar.gz) = 19849046
2
SIZE (mysql-4.1.8.tar.gz) = 22288304
(-)mysql41-server/files/patch-Docs::Makefile.in Mon Dec 27 16:02:19 2004 (-2 / +2 lines)
Lines 1-6 Link Here
1
--- Docs/Makefile.in.orig      Fri Mar  5 15:59:43 2004
1
--- Docs/Makefile.in.orig      Fri Mar  5 15:59:43 2004
2
+++ Docs/Makefile.in   Fri Mar  5 16:00:00 2004
2
+++ Docs/Makefile.in   Fri Mar  5 16:00:00 2004
3
@@ -446,7 +446,7 @@
3
@@ -776,7 +776,7 @@
4
 
4
 
5
 all:                  $(targets) txt_files
5
 all:                  $(targets) txt_files
6
 
6
 
Lines 9-15 Link Here
9
                       INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
9
                       INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
10
 
10
 
11
 CLEAN_FILES:          $(BUILD_SOURCES)
11
 CLEAN_FILES:          $(BUILD_SOURCES)
12
@@ -609,9 +609,6 @@
12
@@ -936,9 +936,6 @@
13
 
13
 
14
 ../INSTALL-SOURCE:    mysql.info $(GT)
14
 ../INSTALL-SOURCE:    mysql.info $(GT)
15
       perl -w $(GT) mysql.info "Installing" "Tutorial" > $@
15
       perl -w $(GT) mysql.info "Installing" "Tutorial" > $@
(-)mysql41-server/files/patch-Makefile.in Mon Dec 27 16:07:58 2004 (-6 / +6 lines)
Lines 1-16 Link Here
1
--- Makefile.in.orig   Thu Aug 26 23:47:06 2004
1
--- Makefile.in.orig   Tue Dec 14 14:41:10 2004
2
+++ Makefile.in        Thu Sep  2 12:49:11 2004
2
+++ Makefile.in        Mon Dec 27 16:07:33 2004
3
@@ -297,12 +297,7 @@
3
@@ -338,12 +338,7 @@
4
 
4
 
5
 # These are built from source in the Docs directory
5
 # These are built from source in the Docs directory
6
 EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
6
 EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
7
-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
7
-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
8
-                      @readline_topdir@ sql-common \
8
-                      @readline_topdir@ sql-common \
9
-                      @thread_dirs@ pstack @sql_client_dirs@ \
9
-                      @thread_dirs@ pstack \
10
-                      @sql_server_dirs@ scripts man tests \
10
-                      @sql_server_dirs@ @sql_client_dirs@ scripts man tests \
11
-                      netware @libmysqld_dirs@ \
11
-                      netware @libmysqld_dirs@ \
12
-                      @bench_dirs@ support-files @fs_dirs@ @tools_dirs@
12
-                      @bench_dirs@ support-files @fs_dirs@ @tools_dirs@
13
+SUBDIRS =
13
+SUBDIRS =
14
 
14
 
15
 
16
 DIST_SUBDIRS = . include @docs_dirs@ zlib \
15
 DIST_SUBDIRS = . include @docs_dirs@ zlib \
16
                       @readline_topdir@ sql-common \
(-)mysql41-server/files/patch-configure Mon Dec 27 23:46:44 2004 (-7 / +19 lines)
Lines 1-15 Link Here
1
--- configure.orig     Fri Jul  2 11:24:14 2004
1
--- configure.orig     Tue Dec 14 14:41:36 2004
2
+++ configure  Fri Jul  2 11:24:37 2004
2
+++ configure  Mon Dec 27 23:36:14 2004
3
@@ -18829,8 +18829,6 @@
3
@@ -19662,10 +19662,8 @@
4
 
5
 
4
 # This can be used to rebuild libtool when needed
6
 # This can be used to rebuild libtool when needed
5
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
7
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
8
+LIBTOOL_DEPS="--disable-ltlibs /usr/local/share/libtool15/ltmain.sh"
6
 
9
 
7
-# Always use our own libtool.
10
-# Always use our own libtool.
8
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
11
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
9
 
12
 
10
 # Prevent multiple expansion
13
 # Prevent multiple expansion
11
 
14
 
12
@@ -23783,8 +23781,8 @@
15
@@ -25065,8 +25063,8 @@
13
 # Some system specific hacks
16
 # Some system specific hacks
14
 #
17
 #
15
 
18
 
Lines 18-22 Link Here
18
+MAX_C_OPTIMIZE=""
21
+MAX_C_OPTIMIZE=""
19
+MAX_CXX_OPTIMIZE=""
22
+MAX_CXX_OPTIMIZE=""
20
 
23
 
21
 case $SYSTEM_TYPE in
24
 case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_c_compiler_gnu in
22
   *solaris2.7*)
25
 # workaround for Sun Forte/x86 see BUG#4681
26
@@ -38915,7 +38913,7 @@
27
 server_scripts=
28
 thread_dirs=
29
 
30
-sql_client_dirs="libmysql client"
31
+sql_client_dirs="libmysql strings regex client"
32
 linked_client_targets="linked_libmysql_sources"
33
 CLIENT_LIBS=$NON_THREADED_CLIENT_LIBS
34
 if test "$THREAD_SAFE_CLIENT" != "no"
(-)mysql41-server/files/patch-man::Makefile.in Mon Dec 27 16:49:18 2004 (-6 / +6 lines)
Lines 1-13 Link Here
1
--- man/Makefile.in.orig       Mon Feb 23 14:54:10 2004
1
--- man/Makefile.in.orig       Tue Dec 14 14:41:14 2004
2
+++ man/Makefile.in    Mon Feb 23 14:54:34 2004
2
+++ man/Makefile.in    Mon Dec 27 16:48:15 2004
3
@@ -272,9 +272,7 @@
3
@@ -313,9 +313,7 @@
4
 vio_dir = @vio_dir@
4
 vio_dir = @vio_dir@
5
 vio_libs = @vio_libs@
5
 vio_libs = @vio_libs@
6
 
6
 zlib_dir = @zlib_dir@
7
-man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \
7
-man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \
8
-              mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
8
-              mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
9
-              perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1
9
-              perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1
10
+man_MANS =
10
+man_MANS = 
11
 
12
 
11
 
13
 EXTRA_DIST = mysql.1.in isamchk.1.in isamlog.1.in mysql_zap.1.in \
12
 EXTRA_DIST = mysql.1.in isamchk.1.in isamlog.1.in mysql_zap.1.in \
13
               mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \
(-)mysql41-server/files/patch-scripts::Makefile.in Mon Dec 27 16:54:45 2004 (-8 / +8 lines)
Lines 1-9 Link Here
1
--- scripts/Makefile.in.orig   Fri May 28 21:38:37 2004
1
--- scripts/Makefile.in.orig   Tue Dec 14 14:41:31 2004
2
+++ scripts/Makefile.in        Mon May 31 15:14:31 2004
2
+++ scripts/Makefile.in        Mon Dec 27 16:53:52 2004
3
@@ -276,26 +276,7 @@
3
@@ -316,26 +316,7 @@
4
 vio_dir = @vio_dir@
4
 vio_dir = @vio_dir@
5
 vio_libs = @vio_libs@
5
 vio_libs = @vio_libs@
6
 
6
 zlib_dir = @zlib_dir@
7
-bin_SCRIPTS = @server_scripts@ \
7
-bin_SCRIPTS = @server_scripts@ \
8
-                      msql2mysql \
8
-                      msql2mysql \
9
-                      mysql_config \
9
-                      mysql_config \
Lines 26-43 Link Here
26
-                      mysql_create_system_tables
26
-                      mysql_create_system_tables
27
+bin_SCRIPTS =
27
+bin_SCRIPTS =
28
 
28
 
29
 
30
 EXTRA_SCRIPTS = make_binary_distribution.sh \
29
 EXTRA_SCRIPTS = make_binary_distribution.sh \
31
@@ -329,7 +310,7 @@
30
                       make_sharedlib_distribution.sh \
31
@@ -366,7 +347,7 @@
32
                       mysqlaccess.conf \
32
                       mysqlbug
33
                       mysqlbug
33
 
34
 
34
 
35
-dist_pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql
35
-dist_pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql
36
+dist_pkgdata_DATA =
36
+dist_pkgdata_DATA =
37
 
37
 
38
 # mysqlbug should be distributed built so that people can report build
38
 # mysqlbug should be distributed built so that people can report build
39
 # failures with it.
39
 # failures with it.
40
@@ -605,8 +586,6 @@
40
@@ -652,8 +633,6 @@
41
 
41
 
42
 all: fill_help_tables.sql make_win_src_distribution make_binary_distribution make_sharedlib_distribution
42
 all: fill_help_tables.sql make_win_src_distribution make_binary_distribution make_sharedlib_distribution
43
 
43
 
(-)mysql41-server/files/patch-sql::Makefile.in Mon Dec 27 17:00:07 2004 (-19 / +19 lines)
Lines 1-15 Link Here
1
--- sql/Makefile.in.orig       Thu Aug 26 22:47:18 2004
1
--- sql/Makefile.in.orig       Tue Dec 14 14:41:32 2004
2
+++ sql/Makefile.in            Sun Sep 19 15:03:56 2004
2
+++ sql/Makefile.in    Mon Dec 27 16:59:38 2004
3
@@ -378,7 +378,7 @@
3
@@ -126,7 +126,8 @@
4
                       gstream.cc spatial.cc sql_help.cc protocol_cursor.cc \
5
                       tztime.cc my_time.c \
6
                       examples/ha_example.cc examples/ha_archive.cc \
7
-                      examples/ha_tina.cc
8
+                      examples/ha_tina.cc mylibwrap.c
9
 
10
 
11
 gen_lex_hash_SOURCES = gen_lex_hash.cc
12
@@ -450,7 +450,8 @@
13
       pack.$(OBJEXT) stacktrace.$(OBJEXT) repl_failsafe.$(OBJEXT) \
4
       pack.$(OBJEXT) stacktrace.$(OBJEXT) repl_failsafe.$(OBJEXT) \
14
       gstream.$(OBJEXT) spatial.$(OBJEXT) sql_help.$(OBJEXT) \
5
       gstream.$(OBJEXT) spatial.$(OBJEXT) sql_help.$(OBJEXT) \
15
       protocol_cursor.$(OBJEXT) tztime.$(OBJEXT) my_time.$(OBJEXT) \
6
       protocol_cursor.$(OBJEXT) tztime.$(OBJEXT) my_time.$(OBJEXT) \
Lines 17-25 Link Here
17
+      ha_example.$(OBJEXT) ha_archive.$(OBJEXT) ha_tina.$(OBJEXT) \
8
+      ha_example.$(OBJEXT) ha_archive.$(OBJEXT) ha_tina.$(OBJEXT) \
18
+      mylibwrap.$(OBJEXT)
9
+      mylibwrap.$(OBJEXT)
19
 mysqld_OBJECTS = $(am_mysqld_OBJECTS)
10
 mysqld_OBJECTS = $(am_mysqld_OBJECTS)
20
 mysqld_DEPENDENCIES = $(top_builddir)/myisam/libmyisam.a \
11
 mysqld_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
21
       $(top_builddir)/myisammrg/libmyisammrg.a \
12
       $(am__DEPENDENCIES_2)
22
@@ -518,7 +519,8 @@
13
@@ -194,7 +195,8 @@
23
 @AMDEP_TRUE@  ./$(DEPDIR)/stacktrace.Po ./$(DEPDIR)/strfunc.Po \
14
 @AMDEP_TRUE@  ./$(DEPDIR)/stacktrace.Po ./$(DEPDIR)/strfunc.Po \
24
 @AMDEP_TRUE@  ./$(DEPDIR)/table.Po ./$(DEPDIR)/thr_malloc.Po \
15
 @AMDEP_TRUE@  ./$(DEPDIR)/table.Po ./$(DEPDIR)/thr_malloc.Po \
25
 @AMDEP_TRUE@  ./$(DEPDIR)/time.Po ./$(DEPDIR)/tztime.Po \
16
 @AMDEP_TRUE@  ./$(DEPDIR)/time.Po ./$(DEPDIR)/tztime.Po \
Lines 28-39 Link Here
28
+@AMDEP_TRUE@  ./$(DEPDIR)/mylibwrap.Po
19
+@AMDEP_TRUE@  ./$(DEPDIR)/mylibwrap.Po
29
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
20
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
30
       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
21
       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
31
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
22
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
32
@@ -748,6 +750,7 @@
23
@@ -552,7 +554,7 @@
24
                       gstream.cc spatial.cc sql_help.cc protocol_cursor.cc \
25
                       tztime.cc my_time.c \
26
                       examples/ha_example.cc examples/ha_archive.cc \
27
-                      examples/ha_tina.cc
28
+                      examples/ha_tina.cc mylibwrap.c
29
 
30
 gen_lex_hash_SOURCES = gen_lex_hash.cc
31
 gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS)
32
@@ -776,6 +778,7 @@
33
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tztime.Po@am__quote@
33
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tztime.Po@am__quote@
34
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uniques.Po@am__quote@
34
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uniques.Po@am__quote@
35
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unireg.Po@am__quote@
35
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unireg.Po@am__quote@
36
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mylibwrap.Po@am__quote@
36
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mylibwrap.Po@am__quote@
37
 
37
 
38
 distclean-depend:
38
 .c.o:
39
       -rm -rf ./$(DEPDIR)
39
 @am__fastdepCC_TRUE@  if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
(-)mysql41-server/pkg-plist Mon Dec 27 22:40:17 2004 (+3 lines)
Lines 20-25 Link Here
20
bin/ndb_select_all
20
bin/ndb_select_all
21
bin/ndb_select_count
21
bin/ndb_select_count
22
bin/ndb_show_tables
22
bin/ndb_show_tables
23
bin/ndb_test_platform
23
bin/ndb_waiter
24
bin/ndb_waiter
24
bin/pack_isam
25
bin/pack_isam
25
bin/perror
26
bin/perror
Lines 29-34 Link Here
29
etc/rc.d/mysql-server.sh
30
etc/rc.d/mysql-server.sh
30
include/mysql/ndb/mgmapi/mgmapi.h
31
include/mysql/ndb/mgmapi/mgmapi.h
31
include/mysql/ndb/mgmapi/mgmapi_debug.h
32
include/mysql/ndb/mgmapi/mgmapi_debug.h
33
include/mysql/ndb/mgmapi/mgmapi_config_parameters.h
34
include/mysql/ndb/mgmapi/mgmapi_config_parameters_debug.h
32
include/mysql/ndb/ndb_types.h
35
include/mysql/ndb/ndb_types.h
33
include/mysql/ndb/ndb_version.h
36
include/mysql/ndb/ndb_version.h
34
include/mysql/ndb/ndbapi/Ndb.hpp
37
include/mysql/ndb/ndbapi/Ndb.hpp
(-)mysql41-server/pkg-plist.client Tue Dec 28 00:12:51 2004 (+1 lines)
Lines 48-53 Link Here
48
lib/mysql/libmysqlclient_r.a
48
lib/mysql/libmysqlclient_r.a
49
lib/mysql/libmysqlclient_r.so
49
lib/mysql/libmysqlclient_r.so
50
lib/mysql/libmysqlclient_r.so.14
50
lib/mysql/libmysqlclient_r.so.14
51
lib/mysql/libmystrings.a
51
%%DATADIR%%/mysql_fix_privilege_tables.sql
52
%%DATADIR%%/mysql_fix_privilege_tables.sql
52
@dirrm include/mysql
53
@dirrm include/mysql
53
@dirrm lib/mysql
54
@dirrm lib/mysql

Return to bug 75556