Attachment #49510 for bug #75598

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




#

PORTNAME?=	mysql
PORTVERSION=	4.0.23
PORTREVISION?=	0
CATEGORIES=	databases
MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \

		http://mysql.proserve.nl/Downloads/MySQL-4.0/ \
		ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.0/
PKGNAMESUFFIX?=	-server
DISTNAME=	${PORTNAME}-${PORTVERSION}a

MAINTAINER=	ale@FreeBSD.org
COMMENT?=	Multithreaded SQL database (server)

CONFLICTS=	mysql-server-3.* mysql-server-4.[1-9].* mysql-server-5.*

PLIST_SUB=	DB_DIR=${DB_DIR} \
		MYSQL_VERSION=${PORTVERSION}a

MAN1=		isamchk.1 isamlog.1 mysqld.1 \
		mysqld_safe.1 perror.1 replace.1

Lines 1-2 Link Here

(-)mysql40-server/distinfo (-2 / +2 lines)
1	MD5 (mysql-4.0.22.tar.gz) = fab53259c3ba9f729a319bf271fc8587	1	MD5 (mysql-4.0.23a.tar.gz) = ea85758104faf3bb2704af08dd6b3b7d
2	SIZE (mysql-4.0.22.tar.gz) = 14395535	2	SIZE (mysql-4.0.23a.tar.gz) = 16735725




--- Docs/Makefile.in.orig	Wed Dec 29 01:41:44 2004
+++ Docs/Makefile.in	Wed Dec 29 01:42:19 2004
@@ -373,7 +373,7 @@
 	done; \
 	cd "$$am__cwd"; \
 	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-	 -o $@ $<; \
+	 -o $@ $?; \
 	then \
 	  rc=0; \
 	  cd $(srcdir); \
@@ -388,16 +388,16 @@
 .texi.dvi:
 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2DVI) $<
+	$(TEXI2DVI) $?
 
 .texi.pdf:
 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2PDF) $<
+	$(TEXI2PDF) $?
 
 .texi.html:
 	$(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-	 -o $@ $<
+	 -o $@ $?
 	if test ! -d $@ && test -d $(@:.html=); then \
 	  mv $(@:.html=) $@; else :; fi
 $(srcdir)/mysql.info: manual.texi 
@@ -405,7 +405,7 @@
 mysql.pdf: manual.texi 
 mysql.html: manual.texi 
 .dvi.ps:
-	$(DVIPS) -o $@ $<
+	$(DVIPS) -o $@ $?
 
 uninstall-info-am:
 	$(PRE_UNINSTALL)
@@ -780,21 +780,21 @@
 
 # GNU Info
 mysql.info:	manual.texi include.texi
-	cd $(srcdir) && $(MAKEINFO) --no-split -I $(srcdir) $<
+	cd $(srcdir) && $(MAKEINFO) --no-split -I $(srcdir) $?
 
 # Plain Text
 manual.txt:	manual.texi include.texi
 	cd $(srcdir) && \
-	$(MAKEINFO) -I $(srcdir) --no-headers --no-split --output $@ $<
+	$(MAKEINFO) -I $(srcdir) --no-headers --no-split --output $@ $?
 
 # HTML, all in one file
 manual.html:	manual.texi include.texi $(srcdir)/Support/texi2html
-	cd $(srcdir) && @PERL@ $(srcdir)/Support/texi2html $(TEXI2HTML_FLAGS) $<
+	cd $(srcdir) && @PERL@ $(srcdir)/Support/texi2html $(TEXI2HTML_FLAGS) $?
 manual_toc.html: manual.html
 
 # PDF, Portable Document Format
 manual.pdf: manual.texi
-	sed -e 's|@image{[^}]*} *||g' <$< >manual-tmp.texi
+	sed -e 's|@image{[^}]*} *||g' <$? >manual-tmp.texi
 	pdftex --interaction=nonstopmode manual-tmp.texi
 	texindex manual-tmp.??
 	pdftex --interaction=nonstopmode manual-tmp.texi
@@ -806,7 +806,7 @@
 
 # XML, DocBook 4.0
 mysql.xml: manual.texi include.texi
-	$(MAKEINFO) --force --no-ifinfo --docbook $<
+	$(MAKEINFO) --force --no-ifinfo --docbook $?
 	mv $@ mysql-tmp.xml
 	Support/docbook-fixup.pl <mysql-tmp.xml >$@
 	rm -f mysql-tmp.xml
@@ -815,7 +815,7 @@
 manual_a4.ps:	manual.texi include.texi
 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' \
-	    $(TEXI2DVI) --batch --texinfo --quiet '@afourpaper' $<
+	    $(TEXI2DVI) --batch --texinfo --quiet '@afourpaper' $?
 	$(DVIPS) -t a4 manual.dvi -o $@
 	touch $@
 
@@ -823,7 +823,7 @@
 manual_letter.ps:	manual.texi include.texi
 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' \
-	    $(TEXI2DVI) --batch $<
+	    $(TEXI2DVI) --batch $?
 	$(DVIPS) -t letter manual.dvi -o $@
 	touch $@
 
@@ -833,21 +833,21 @@
 
 # GNU Info
 mysql.de.info:	manual.de.texi include.texi
-	cd $(srcdir) && $(MAKEINFO) --no-split -I $(srcdir) $<
+	cd $(srcdir) && $(MAKEINFO) --no-split -I $(srcdir) $?
 
 # Plain Text
 manual.de.txt:	manual.de.texi include.texi
 	cd $(srcdir) && \
-	$(MAKEINFO) -I $(srcdir) --no-headers --no-split --output $@ $<
+	$(MAKEINFO) -I $(srcdir) --no-headers --no-split --output $@ $?
 
 # HTML, all in one file
 manual.de.html:	manual.de.texi include.texi $(srcdir)/Support/texi2html
-	cd $(srcdir) && @PERL@ $(srcdir)/Support/texi2html $(TEXI2HTML_FLAGS) $<
+	cd $(srcdir) && @PERL@ $(srcdir)/Support/texi2html $(TEXI2HTML_FLAGS) $?
 manual_toc.de.html: manual.html
 
 # PDF, Portable Document Format
 manual.de.pdf: manual.de.texi
-	sed -e 's|@image{[^}]*} *||g' <$< >manual-tmp.texi
+	sed -e 's|@image{[^}]*} *||g' <$? >manual-tmp.texi
 	pdftex --interaction=nonstopmode manual-tmp.texi
 	texindex manual-tmp.??
 	pdftex --interaction=nonstopmode manual-tmp.texi
@@ -859,7 +859,7 @@
 
 # XML, DocBook 4.0
 mysql.de.xml: manual.de.texi include.texi
-	$(MAKEINFO) --force --no-ifinfo --docbook $<
+	$(MAKEINFO) --force --no-ifinfo --docbook $?
 	mv $@ mysql-tmp.xml
 	Support/docbook-fixup.pl <mysql-tmp.xml >$@
 	rm -f mysql-tmp.xml
@@ -868,7 +868,7 @@
 manual_a4.de.ps:	manual.de.texi include.texi
 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' \
-	    $(TEXI2DVI) --batch --texinfo --quiet '@afourpaper' $<
+	    $(TEXI2DVI) --batch --texinfo --quiet '@afourpaper' $?
 	$(DVIPS) -t a4 manual.de.dvi -o $@
 	touch $@
 
@@ -876,7 +876,7 @@
 manual_letter.de.ps:	manual.de.texi include.texi
 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' \
-	    $(TEXI2DVI) --batch $<
+	    $(TEXI2DVI) --batch $?
 	$(DVIPS) -t letter manual.de.dvi -o $@
 	touch $@
 
@@ -890,7 +890,7 @@
 	    -e 's/@end example/@end smallexample/g' \
 	    -e 's/@c ifnusphere //g' \
 	    -e 's|@image{[^}]*} *||g' \
-	<$< >manual-tmp.texi
+	<$? >manual-tmp.texi
 	pdftex --interaction=nonstopmode manual-tmp.texi
 	texindex manual-tmp.??
 	pdftex --interaction=nonstopmode manual-tmp.texi

Lines 1-6 Link Here

(-)mysql40-server/files/patch-Makefile.in (-3 / +3 lines)
1	--- Makefile.in.orig Thu Oct 28 02:48:54 2004	1	--- Makefile.in.orig Mon Dec 27 13:29:50 2004
2	+++ Makefile.in Sun Oct 31 09:37:50 2004	2	+++ Makefile.in Wed Dec 29 00:38:25 2004
3	@@ -280,11 +280,7 @@	3	@@ -316,11 +316,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




--- configure.orig	Mon Dec 27 13:30:01 2004
+++ configure	Wed Dec 29 00:42:14 2004
@@ -19609,8 +19609,6 @@
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 

 
 # Prevent multiple expansion
 
@@ -20786,43 +20784,8 @@
 echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5
 echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6
 PS=$ac_cv_path_PS

-then
-  FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null"
-# Solaris
-elif $PS -fp $$ 2> /dev/null | grep $0 > /dev/null
-then
-  FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null"
 # BSD style

 
 echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
 echo "${ECHO_T}\"$FIND_PROC\"" >&6
@@ -24753,8 +24716,8 @@
 # Some system specific hacks
 #
 

 
 # workaround for Sun Forte/x86 see BUG#4681
 case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_c_compiler_gnu in
@@ -35738,7 +35701,7 @@
 	/* ) rel_srcdir="$srcdir" ;;
 	* )  rel_srcdir="../$srcdir" ;;
     esac




--- man/Makefile.in.orig	Mon Dec 27 13:29:53 2004
+++ man/Makefile.in	Wed Dec 29 00:43:17 2004
@@ -290,9 +290,7 @@
 uname_prog = @uname_prog@
 vio_dir = @vio_dir@
 vio_libs = @vio_libs@
 
-man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \
-		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
-		perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1
+man_MANS = 
 
 
 EXTRA_DIST = mysql.1.in isamchk.1.in isamlog.1.in mysql_zap.1.in \
 		mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \




--- scripts/Makefile.in.orig	Mon Dec 27 13:29:57 2004
+++ scripts/Makefile.in	Wed Dec 29 00:44:19 2004
@@ -292,25 +292,7 @@
 uname_prog = @uname_prog@
 vio_dir = @vio_dir@
 vio_libs = @vio_libs@
 
-bin_SCRIPTS = @server_scripts@ \
-			msql2mysql \
-			mysql_config \

-			mysqld_multi \
-			make_win_src_distribution \
-			make_win_binary_distribution
+bin_SCRIPTS = 
 
 
 EXTRA_SCRIPTS = make_binary_distribution.sh \
 			make_sharedlib_distribution.sh \
@@ -489,7 +471,7 @@
 uninstall: uninstall-am
 
 install-am: all-am




--- sql/Makefile.in.orig	Mon Dec 27 13:29:57 2004
+++ sql/Makefile.in	Wed Dec 29 00:46:53 2004
@@ -111,7 +111,7 @@
 			sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \
 			slave.cc sql_repl.cc sql_union.cc \
 			mini_client.cc mini_client_errors.c \
-			stacktrace.c repl_failsafe.h repl_failsafe.cc
+			stacktrace.c repl_failsafe.h repl_failsafe.cc \
+			mylibwrap.c
 
 gen_lex_hash_SOURCES = gen_lex_hash.cc
 gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS)
@@ -399,7 +400,7 @@
 	sql_analyse.$(OBJEXT) sql_cache.$(OBJEXT) slave.$(OBJEXT) \
 	sql_repl.$(OBJEXT) sql_union.$(OBJEXT) mini_client.$(OBJEXT) \
 	mini_client_errors.$(OBJEXT) stacktrace.$(OBJEXT) \
-	repl_failsafe.$(OBJEXT)
+	repl_failsafe.$(OBJEXT) mylibwrap.$(OBJEXT)
 mysqld_OBJECTS = $(am_mysqld_OBJECTS)
 mysqld_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
 	$(am__DEPENDENCIES_2)
@@ -163,7 +163,8 @@
 @AMDEP_TRUE@	./$(DEPDIR)/sql_update.Po ./$(DEPDIR)/sql_yacc.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/stacktrace.Po ./$(DEPDIR)/table.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/thr_malloc.Po ./$(DEPDIR)/time.Po \

+@AMDEP_TRUE@	./$(DEPDIR)/mylibwrap.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
@@ -485,7 +486,8 @@
 			sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \
 			slave.cc sql_repl.cc sql_union.cc \
 			mini_client.cc mini_client_errors.c \
-			stacktrace.c repl_failsafe.h repl_failsafe.cc
+			stacktrace.c repl_failsafe.h repl_failsafe.cc \
+			mylibwrap.c
 
 gen_lex_hash_SOURCES = gen_lex_hash.cc
 gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS)
@@ -656,6 +658,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uniques.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unireg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mylibwrap.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \

Return to bug 75598

Lines 6-12 Link Here

(-)mysql40-server/Makefile (-2 / +3 lines)
6	#	6	#
7		7
8	PORTNAME?= mysql	8	PORTNAME?= mysql
9	PORTVERSION= 4.0.22	9	PORTVERSION= 4.0.23
10	PORTREVISION?= 0	10	PORTREVISION?= 0
11	CATEGORIES= databases	11	CATEGORIES= databases
12	MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \	12	MASTER_SITES= ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
Lines 21-26 Link Here
21	http://mysql.proserve.nl/Downloads/MySQL-4.0/ \	21	http://mysql.proserve.nl/Downloads/MySQL-4.0/ \
22	ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.0/	22	ftp://ftp.free.fr/pub/MySQL/Downloads/MySQL-4.0/
23	PKGNAMESUFFIX?= -server	23	PKGNAMESUFFIX?= -server
		24	DISTNAME= ${PORTNAME}-${PORTVERSION}a
24		25
25	MAINTAINER= ale@FreeBSD.org	26	MAINTAINER= ale@FreeBSD.org
26	COMMENT?= Multithreaded SQL database (server)	27	COMMENT?= Multithreaded SQL database (server)
Lines 109-115 Link Here
109	CONFLICTS= mysql-server-3.* mysql-server-4.[1-9].* mysql-server-5.*	110	CONFLICTS= mysql-server-3.* mysql-server-4.[1-9].* mysql-server-5.*
110		111
111	PLIST_SUB= DB_DIR=${DB_DIR} \	112	PLIST_SUB= DB_DIR=${DB_DIR} \
112	MYSQL_VERSION=${PORTVERSION}	113	MYSQL_VERSION=${PORTVERSION}a
113		114
114	MAN1= isamchk.1 isamlog.1 mysqld.1 \	115	MAN1= isamchk.1 isamlog.1 mysqld.1 \
115	mysqld_safe.1 perror.1 replace.1	116	mysqld_safe.1 perror.1 replace.1

Line 0 Link Here

(-)mysql40-server/files/patch-Docs::Makefile.in (+155 lines)
		1	--- Docs/Makefile.in.orig Wed Dec 29 01:41:44 2004
		2	+++ Docs/Makefile.in Wed Dec 29 01:42:19 2004
		3	@@ -373,7 +373,7 @@
		4	done; \
		5	cd "$$am__cwd"; \
		6	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
		7	- -o $@ $<; \
		8	+ -o $@ $?; \
		9	then \
		10	rc=0; \
		11	cd $(srcdir); \
		12	@@ -388,16 +388,16 @@
		13	.texi.dvi:
		14	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
		15	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
		16	- $(TEXI2DVI) $<
		17	+ $(TEXI2DVI) $?
		18
		19	.texi.pdf:
		20	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
		21	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
		22	- $(TEXI2PDF) $<
		23	+ $(TEXI2PDF) $?
		24
		25	.texi.html:
		26	$(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
		27	- -o $@ $<
		28	+ -o $@ $?
		29	if test ! -d $@ && test -d $(@:.html=); then \
		30	mv $(@:.html=) $@; else :; fi
		31	$(srcdir)/mysql.info: manual.texi
		32	@@ -405,7 +405,7 @@
		33	mysql.pdf: manual.texi
		34	mysql.html: manual.texi
		35	.dvi.ps:
		36	- $(DVIPS) -o $@ $<
		37	+ $(DVIPS) -o $@ $?
		38
		39	uninstall-info-am:
		40	$(PRE_UNINSTALL)
		41	@@ -780,21 +780,21 @@
		42
		43	# GNU Info
		44	mysql.info: manual.texi include.texi
		45	- cd $(srcdir) && $(MAKEINFO) --no-split -I $(srcdir) $<
		46	+ cd $(srcdir) && $(MAKEINFO) --no-split -I $(srcdir) $?
		47
		48	# Plain Text
		49	manual.txt: manual.texi include.texi
		50	cd $(srcdir) && \
		51	- $(MAKEINFO) -I $(srcdir) --no-headers --no-split --output $@ $<
		52	+ $(MAKEINFO) -I $(srcdir) --no-headers --no-split --output $@ $?
		53
		54	# HTML, all in one file
		55	manual.html: manual.texi include.texi $(srcdir)/Support/texi2html
		56	- cd $(srcdir) && @PERL@ $(srcdir)/Support/texi2html $(TEXI2HTML_FLAGS) $<
		57	+ cd $(srcdir) && @PERL@ $(srcdir)/Support/texi2html $(TEXI2HTML_FLAGS) $?
		58	manual_toc.html: manual.html
		59
		60	# PDF, Portable Document Format
		61	manual.pdf: manual.texi
		62	- sed -e 's\|@image{[^}]} \|\|g' <$< >manual-tmp.texi
		63	+ sed -e 's\|@image{[^}]} \|\|g' <$? >manual-tmp.texi
		64	pdftex --interaction=nonstopmode manual-tmp.texi
65	texindex manual-tmp.??
66	pdftex --interaction=nonstopmode manual-tmp.texi
67	@@ -806,7 +806,7 @@
68
69	# XML, DocBook 4.0
70	mysql.xml: manual.texi include.texi
71	- $(MAKEINFO) --force --no-ifinfo --docbook $<
72	+ $(MAKEINFO) --force --no-ifinfo --docbook $?
73	mv $@ mysql-tmp.xml
74	Support/docbook-fixup.pl <mysql-tmp.xml >$@
75	rm -f mysql-tmp.xml
76	@@ -815,7 +815,7 @@
77	manual_a4.ps: manual.texi include.texi
78	TEXINPUTS=$(srcdir):$$TEXINPUTS \
79	MAKEINFO='$(MAKEINFO) -I $(srcdir)' \
80	- $(TEXI2DVI) --batch --texinfo --quiet '@afourpaper' $<
81	+ $(TEXI2DVI) --batch --texinfo --quiet '@afourpaper' $?
82	$(DVIPS) -t a4 manual.dvi -o $@
83	touch $@
84
85	@@ -823,7 +823,7 @@
86	manual_letter.ps: manual.texi include.texi
87	TEXINPUTS=$(srcdir):$$TEXINPUTS \
88	MAKEINFO='$(MAKEINFO) -I $(srcdir)' \
89	- $(TEXI2DVI) --batch $<
90	+ $(TEXI2DVI) --batch $?
91	$(DVIPS) -t letter manual.dvi -o $@
92	touch $@
93
94	@@ -833,21 +833,21 @@
95
96	# GNU Info
97	mysql.de.info: manual.de.texi include.texi
98	- cd $(srcdir) && $(MAKEINFO) --no-split -I $(srcdir) $<
99	+ cd $(srcdir) && $(MAKEINFO) --no-split -I $(srcdir) $?
100
101	# Plain Text
102	manual.de.txt: manual.de.texi include.texi
103	cd $(srcdir) && \
104	- $(MAKEINFO) -I $(srcdir) --no-headers --no-split --output $@ $<
105	+ $(MAKEINFO) -I $(srcdir) --no-headers --no-split --output $@ $?
106
107	# HTML, all in one file
108	manual.de.html: manual.de.texi include.texi $(srcdir)/Support/texi2html
109	- cd $(srcdir) && @PERL@ $(srcdir)/Support/texi2html $(TEXI2HTML_FLAGS) $<
110	+ cd $(srcdir) && @PERL@ $(srcdir)/Support/texi2html $(TEXI2HTML_FLAGS) $?
111	manual_toc.de.html: manual.html
112
113	# PDF, Portable Document Format
114	manual.de.pdf: manual.de.texi
115	- sed -e 's\|@image{[^}]} \|\|g' <$< >manual-tmp.texi
116	+ sed -e 's\|@image{[^}]} \|\|g' <$? >manual-tmp.texi
117	pdftex --interaction=nonstopmode manual-tmp.texi
118	texindex manual-tmp.??
119	pdftex --interaction=nonstopmode manual-tmp.texi
120	@@ -859,7 +859,7 @@
121
122	# XML, DocBook 4.0
123	mysql.de.xml: manual.de.texi include.texi
124	- $(MAKEINFO) --force --no-ifinfo --docbook $<
125	+ $(MAKEINFO) --force --no-ifinfo --docbook $?
126	mv $@ mysql-tmp.xml
127	Support/docbook-fixup.pl <mysql-tmp.xml >$@
128	rm -f mysql-tmp.xml
129	@@ -868,7 +868,7 @@
130	manual_a4.de.ps: manual.de.texi include.texi
131	TEXINPUTS=$(srcdir):$$TEXINPUTS \
132	MAKEINFO='$(MAKEINFO) -I $(srcdir)' \
133	- $(TEXI2DVI) --batch --texinfo --quiet '@afourpaper' $<
134	+ $(TEXI2DVI) --batch --texinfo --quiet '@afourpaper' $?
135	$(DVIPS) -t a4 manual.de.dvi -o $@
136	touch $@
137
138	@@ -876,7 +876,7 @@
139	manual_letter.de.ps: manual.de.texi include.texi
140	TEXINPUTS=$(srcdir):$$TEXINPUTS \
141	MAKEINFO='$(MAKEINFO) -I $(srcdir)' \
142	- $(TEXI2DVI) --batch $<
143	+ $(TEXI2DVI) --batch $?
144	$(DVIPS) -t letter manual.de.dvi -o $@
145	touch $@
146
147	@@ -890,7 +890,7 @@
148	-e 's/@end example/@end smallexample/g' \
149	-e 's/@c ifnusphere //g' \
150	-e 's\|@image{[^}]} \|\|g' \
151	- <$< >manual-tmp.texi
152	+ <$? >manual-tmp.texi
153	pdftex --interaction=nonstopmode manual-tmp.texi
154	texindex manual-tmp.??
155	pdftex --interaction=nonstopmode manual-tmp.texi

Lines 1-6 Link Here

(-)mysql40-server/files/patch-configure (-7 / +7 lines)
1	--- configure.orig Tue Sep 7 00:30:08 2004	1	--- configure.orig Mon Dec 27 13:30:01 2004
2	+++ configure Wed Sep 15 15:18:33 2004	2	+++ configure Wed Dec 29 00:42:14 2004
3	@@ -18793,8 +18793,6 @@	3	@@ -19609,8 +19609,6 @@
4	# This can be used to rebuild libtool when needed	4	# This can be used to rebuild libtool when needed
5	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"	5	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
6		6
Lines 9-15 Link Here
9		9
10	# Prevent multiple expansion	10	# Prevent multiple expansion
11		11
12	@@ -19972,43 +19970,8 @@	12	@@ -20786,43 +20784,8 @@
13	echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5	13	echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5
14	echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6	14	echo $ECHO_N "checking \"how to check if pid exists\"... $ECHO_C" >&6
15	PS=$ac_cv_path_PS	15	PS=$ac_cv_path_PS
Lines 18-24 Link Here
18	-then	18	-then
19	- FIND_PROC="$PS p \$\$PID \| grep mysqld > /dev/null"	19	- FIND_PROC="$PS p \$\$PID \| grep mysqld > /dev/null"
20	-# Solaris	20	-# Solaris
21	-elif $PS -p $$ 2> /dev/null \| grep $0 > /dev/null	21	-elif $PS -fp $$ 2> /dev/null \| grep $0 > /dev/null
22	-then	22	-then
23	- FIND_PROC="$PS -p \$\$PID \| grep mysqld > /dev/null"	23	- FIND_PROC="$PS -p \$\$PID \| grep mysqld > /dev/null"
24	# BSD style	24	# BSD style
Lines 53-59 Link Here
53		53
54	echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5	54	echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
55	echo "${ECHO_T}\"$FIND_PROC\"" >&6	55	echo "${ECHO_T}\"$FIND_PROC\"" >&6
56	@@ -23615,8 +23578,8 @@	56	@@ -24753,8 +24716,8 @@
57	# Some system specific hacks	57	# Some system specific hacks
58	#	58	#
59		59
Lines 64-70 Link Here
64		64
65	# workaround for Sun Forte/x86 see BUG#4681	65	# workaround for Sun Forte/x86 see BUG#4681
66	case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_c_compiler_gnu in	66	case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_c_compiler_gnu in
67	@@ -33651,7 +33614,7 @@	67	@@ -35738,7 +35701,7 @@
68	/* ) rel_srcdir="$srcdir" ;;	68	/* ) rel_srcdir="$srcdir" ;;
69	* ) rel_srcdir="../$srcdir" ;;	69	* ) rel_srcdir="../$srcdir" ;;
70	esac	70	esac

Lines 1-13 Link Here

(-)mysql40-server/files/patch-man::Makefile.in (-6 / +6 lines)
1	--- man/Makefile.in.orig Mon Feb 23 14:54:10 2004	1	--- man/Makefile.in.orig Mon Dec 27 13:29:53 2004
2	+++ man/Makefile.in Mon Feb 23 14:54:34 2004	2	+++ man/Makefile.in Wed Dec 29 00:43:17 2004
3	@@ -272,9 +272,7 @@	3	@@ -290,9 +290,7 @@
		4	uname_prog = @uname_prog@
4	vio_dir = @vio_dir@	5	vio_dir = @vio_dir@
5	vio_libs = @vio_libs@	6	vio_libs = @vio_libs@
6
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 \

Lines 1-9 Link Here

(-)mysql40-server/files/patch-scripts::Makefile.in (-7 / +7 lines)
1	--- scripts/Makefile.in.orig Fri May 14 02:54:11 2004	1	--- scripts/Makefile.in.orig Mon Dec 27 13:29:57 2004
2	+++ scripts/Makefile.in Tue May 18 10:22:57 2004	2	+++ scripts/Makefile.in Wed Dec 29 00:44:19 2004
3	@@ -271,25 +271,7 @@	3	@@ -292,25 +292,7 @@
		4	uname_prog = @uname_prog@
4	vio_dir = @vio_dir@	5	vio_dir = @vio_dir@
5	vio_libs = @vio_libs@	6	vio_libs = @vio_libs@
6
7	-bin_SCRIPTS = @server_scripts@ \	7	-bin_SCRIPTS = @server_scripts@ \
8	- msql2mysql \	8	- msql2mysql \
9	- mysql_config \	9	- mysql_config \
Lines 23-33 Link Here
23	- mysqld_multi \	23	- mysqld_multi \
24	- make_win_src_distribution \	24	- make_win_src_distribution \
25	- make_win_binary_distribution	25	- make_win_binary_distribution
26	+bin_SCRIPTS =	26	+bin_SCRIPTS =
27
28		27
29	EXTRA_SCRIPTS = make_binary_distribution.sh \	28	EXTRA_SCRIPTS = make_binary_distribution.sh \
30	@@ -465,7 +447,7 @@	29	make_sharedlib_distribution.sh \
		30	@@ -489,7 +471,7 @@
31	uninstall: uninstall-am	31	uninstall: uninstall-am
32		32
33	install-am: all-am	33	install-am: all-am

Lines 1-25 Link Here

(-)mysql40-server/files/patch-sql::Makefile.in (-20 / +20 lines)
1	--- sql/Makefile.in.orig Tue Sep 7 00:30:06 2004	1	--- sql/Makefile.in.orig Mon Dec 27 13:29:57 2004
2	+++ sql/Makefile.in Mon Sep 20 08:34:53 2004	2	+++ sql/Makefile.in Wed Dec 29 00:46:53 2004
3	@@ -348,7 +348,8 @@	3	@@ -111,7 +111,7 @@
4	sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \
5	slave.cc sql_repl.cc sql_union.cc \
6	mini_client.cc mini_client_errors.c \
7	- stacktrace.c repl_failsafe.h repl_failsafe.cc
8	+ stacktrace.c repl_failsafe.h repl_failsafe.cc \
9	+ mylibwrap.c
10
11	gen_lex_hash_SOURCES = gen_lex_hash.cc
12	gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS)
13	@@ -399,7 +400,7 @@
14	sql_analyse.$(OBJEXT) sql_cache.$(OBJEXT) slave.$(OBJEXT) \	4	sql_analyse.$(OBJEXT) sql_cache.$(OBJEXT) slave.$(OBJEXT) \
15	sql_repl.$(OBJEXT) sql_union.$(OBJEXT) mini_client.$(OBJEXT) \	5	sql_repl.$(OBJEXT) sql_union.$(OBJEXT) mini_client.$(OBJEXT) \
16	mini_client_errors.$(OBJEXT) stacktrace.$(OBJEXT) \	6	mini_client_errors.$(OBJEXT) stacktrace.$(OBJEXT) \
17	- repl_failsafe.$(OBJEXT)	7	- repl_failsafe.$(OBJEXT)
18	+ repl_failsafe.$(OBJEXT) mylibwrap.$(OBJEXT)	8	+ repl_failsafe.$(OBJEXT) mylibwrap.$(OBJEXT)
19	mysqld_OBJECTS = $(am_mysqld_OBJECTS)	9	mysqld_OBJECTS = $(am_mysqld_OBJECTS)
20	mysqld_DEPENDENCIES = ../myisam/libmyisam.a ../myisammrg/libmyisammrg.a \	10	mysqld_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
21	../heap/libheap.a ../vio/libvio.a ../mysys/libmysys.a \	11	$(am__DEPENDENCIES_2)
22	@@ -452,7 +453,8 @@	12	@@ -163,7 +163,8 @@
23	@AMDEP_TRUE@ ./$(DEPDIR)/sql_update.Po ./$(DEPDIR)/sql_yacc.Po \	13	@AMDEP_TRUE@ ./$(DEPDIR)/sql_update.Po ./$(DEPDIR)/sql_yacc.Po \
24	@AMDEP_TRUE@ ./$(DEPDIR)/stacktrace.Po ./$(DEPDIR)/table.Po \	14	@AMDEP_TRUE@ ./$(DEPDIR)/stacktrace.Po ./$(DEPDIR)/table.Po \
25	@AMDEP_TRUE@ ./$(DEPDIR)/thr_malloc.Po ./$(DEPDIR)/time.Po \	15	@AMDEP_TRUE@ ./$(DEPDIR)/thr_malloc.Po ./$(DEPDIR)/time.Po \
Lines 28-39 Link Here
28	+@AMDEP_TRUE@ ./$(DEPDIR)/mylibwrap.Po	18	+@AMDEP_TRUE@ ./$(DEPDIR)/mylibwrap.Po
29	COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \	19	COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
30	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)	20	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
31	LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \	21	LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
32	@@ -629,6 +631,7 @@	22	@@ -485,7 +486,8 @@
		23	sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \
		24	slave.cc sql_repl.cc sql_union.cc \
		25	mini_client.cc mini_client_errors.c \
		26	- stacktrace.c repl_failsafe.h repl_failsafe.cc
		27	+ stacktrace.c repl_failsafe.h repl_failsafe.cc \
		28	+ mylibwrap.c
		29
		30	gen_lex_hash_SOURCES = gen_lex_hash.cc
		31	gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS)
		32	@@ -656,6 +658,7 @@
33	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time.Po@am__quote@	33	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time.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 $@ $<; \