ports/75598: Update port: databases/mysql40-server change to 4.0.23a

Marcus Grando marcus at corp.grupos.com.br
Wed Dec 29 04:20:24 UTC 2004 

>Number:         75598
>Category:       ports
>Synopsis:       Update port: databases/mysql40-server change to 4.0.23a
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 29 04:20:23 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Marcus Grando
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
Grupos Internet S/A
>Environment:
System: FreeBSD corp.grupos.com.br 4.11-STABLE FreeBSD 4.11-STABLE #36: Sun Dec 26 16:00:38 BRST 2004 root at corp.grupos.com.br:/usr/obj/usr/src/sys/CORP i386


	
>Description:
Update port: databases/mysql40-server change to 4.0.23a

- change to 4.0.23a
   + add DISTNAME because of "a" (4.0.23a)
   + change MYSQL_VERSION because of "a" (4.0.23a)
   + rediff all files/patch*
   + add files/patch-Docs::Makefile.in for compile with make of freebsd

Tested all ports mysql40-* on 5.3-STABLE

	
>How-To-Repeat:
	
>Fix:

	

--- mysql40-server.patch begins here ---
diff -ruN mysql40-server.old/Makefile mysql40-server/Makefile
--- mysql40-server.old/Makefile	Wed Dec 15 08:04:32 2004
+++ mysql40-server/Makefile	Wed Dec 29 00:35:29 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	4.0.22
+PORTVERSION=	4.0.23
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
@@ -21,6 +21,7 @@
 		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 at FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
@@ -109,7 +110,7 @@
 CONFLICTS=	mysql-server-3.* mysql-server-4.[1-9].* mysql-server-5.*
 
 PLIST_SUB=	DB_DIR=${DB_DIR} \
-		MYSQL_VERSION=${PORTVERSION}
+		MYSQL_VERSION=${PORTVERSION}a
 
 MAN1=		isamchk.1 isamlog.1 mysqld.1 \
 		mysqld_safe.1 perror.1 replace.1
diff -ruN mysql40-server.old/distinfo mysql40-server/distinfo
--- mysql40-server.old/distinfo	Sun Oct 31 07:43:07 2004
+++ mysql40-server/distinfo	Wed Dec 29 00:35:40 2004
@@ -1,2 +1,2 @@
-MD5 (mysql-4.0.22.tar.gz) = fab53259c3ba9f729a319bf271fc8587
-SIZE (mysql-4.0.22.tar.gz) = 14395535
+MD5 (mysql-4.0.23a.tar.gz) = ea85758104faf3bb2704af08dd6b3b7d
+SIZE (mysql-4.0.23a.tar.gz) = 16735725
diff -ruN mysql40-server.old/files/patch-Docs::Makefile.in mysql40-server/files/patch-Docs::Makefile.in
--- mysql40-server.old/files/patch-Docs::Makefile.in	Wed Dec 31 21:00:00 1969
+++ mysql40-server/files/patch-Docs::Makefile.in	Wed Dec 29 01:42:48 2004
@@ -0,0 +1,155 @@
+--- 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
diff -ruN mysql40-server.old/files/patch-Makefile.in mysql40-server/files/patch-Makefile.in
--- mysql40-server.old/files/patch-Makefile.in	Sun Oct 31 07:43:07 2004
+++ mysql40-server/files/patch-Makefile.in	Wed Dec 29 00:38:45 2004
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Thu Oct 28 02:48:54 2004
-+++ Makefile.in	Sun Oct 31 09:37:50 2004
-@@ -280,11 +280,7 @@
+--- Makefile.in.orig	Mon Dec 27 13:29:50 2004
++++ Makefile.in	Wed Dec 29 00:38:25 2004
+@@ -316,11 +316,7 @@
  
  # These are built from source in the Docs directory
  EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
diff -ruN mysql40-server.old/files/patch-configure mysql40-server/files/patch-configure
--- mysql40-server.old/files/patch-configure	Tue Sep 21 18:09:31 2004
+++ mysql40-server/files/patch-configure	Wed Dec 29 00:42:30 2004
@@ -1,6 +1,6 @@
---- configure.orig	Tue Sep  7 00:30:08 2004
-+++ configure	Wed Sep 15 15:18:33 2004
-@@ -18793,8 +18793,6 @@
+--- 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"
  
@@ -9,7 +9,7 @@
  
  # Prevent multiple expansion
  
-@@ -19972,43 +19970,8 @@
+@@ -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
@@ -18,7 +18,7 @@
 -then
 -  FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null"
 -# Solaris
--elif $PS -p $$ 2> /dev/null | grep $0 > /dev/null
+-elif $PS -fp $$ 2> /dev/null | grep $0 > /dev/null
 -then
 -  FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null"
  # BSD style
@@ -53,7 +53,7 @@
  
  echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
  echo "${ECHO_T}\"$FIND_PROC\"" >&6
-@@ -23615,8 +23578,8 @@
+@@ -24753,8 +24716,8 @@
  # Some system specific hacks
  #
  
@@ -64,7 +64,7 @@
  
  # workaround for Sun Forte/x86 see BUG#4681
  case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_c_compiler_gnu in
-@@ -33651,7 +33614,7 @@
+@@ -35738,7 +35701,7 @@
  	/* ) rel_srcdir="$srcdir" ;;
  	* )  rel_srcdir="../$srcdir" ;;
      esac
diff -ruN mysql40-server.old/files/patch-man::Makefile.in mysql40-server/files/patch-man::Makefile.in
--- mysql40-server.old/files/patch-man::Makefile.in	Mon Feb 23 12:30:07 2004
+++ mysql40-server/files/patch-man::Makefile.in	Wed Dec 29 00:43:47 2004
@@ -1,13 +1,13 @@
---- man/Makefile.in.orig	Mon Feb 23 14:54:10 2004
-+++ man/Makefile.in	Mon Feb 23 14:54:34 2004
-@@ -272,9 +272,7 @@
+--- 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 =
- 
++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 \
diff -ruN mysql40-server.old/files/patch-scripts::Makefile.in mysql40-server/files/patch-scripts::Makefile.in
--- mysql40-server.old/files/patch-scripts::Makefile.in	Tue May 18 07:59:11 2004
+++ mysql40-server/files/patch-scripts::Makefile.in	Wed Dec 29 00:44:41 2004
@@ -1,9 +1,9 @@
---- scripts/Makefile.in.orig	Fri May 14 02:54:11 2004
-+++ scripts/Makefile.in	Tue May 18 10:22:57 2004
-@@ -271,25 +271,7 @@
+--- 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 \
@@ -23,11 +23,11 @@
 -			mysqld_multi \
 -			make_win_src_distribution \
 -			make_win_binary_distribution
-+bin_SCRIPTS =
- 
++bin_SCRIPTS = 
  
  EXTRA_SCRIPTS = make_binary_distribution.sh \
-@@ -465,7 +447,7 @@
+ 			make_sharedlib_distribution.sh \
+@@ -489,7 +471,7 @@
  uninstall: uninstall-am
  
  install-am: all-am
diff -ruN mysql40-server.old/files/patch-sql::Makefile.in mysql40-server/files/patch-sql::Makefile.in
--- mysql40-server.old/files/patch-sql::Makefile.in	Tue Sep 21 18:09:31 2004
+++ mysql40-server/files/patch-sql::Makefile.in	Wed Dec 29 00:47:14 2004
@@ -1,25 +1,15 @@
---- sql/Makefile.in.orig	Tue Sep  7 00:30:06 2004
-+++ sql/Makefile.in	Mon Sep 20 08:34:53 2004
-@@ -348,7 +348,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)
-@@ -399,7 +400,7 @@
+--- 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_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 = ../myisam/libmyisam.a ../myisammrg/libmyisammrg.a \
- 	../heap/libheap.a ../vio/libvio.a ../mysys/libmysys.a \
-@@ -452,7 +453,8 @@
+ 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 \
@@ -28,12 +18,22 @@
 + at AMDEP_TRUE@	./$(DEPDIR)/mylibwrap.Po
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-@@ -629,6 +631,7 @@
+ 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 at ./$(DEPDIR)/time.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/uniques.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/unireg.Po at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mylibwrap.Po at am__quote@
  
- distclean-depend:
- 	-rm -rf ./$(DEPDIR)
+ .c.o:
+ @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
--- mysql40-server.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list