Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 14 Dec 2005 16:34:21 -0700 (MST)
From:      Phil Oleson <oz@nixil.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/90411: [PATCH] Update mysql41-server to 4.1.16
Message-ID:  <200512142334.jBENYLM5009027@nixil.net>
Resent-Message-ID: <200512142340.jBENe16K003357@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         90411
>Category:       ports
>Synopsis:       [PATCH] Update mysql41-server to 4.1.16
>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 14 23:40:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Phil Oleson
>Release:        FreeBSD 4.7-RELEASE-p28 i386
>Organization:
N/A
>Environment:
System: FreeBSD nixil.net 4.7-RELEASE-p28 FreeBSD 4.7-RELEASE-p28 #42: Tue Jun 21 10:33:20 MDT 2005 root@fc2:/usr/src/sys/compile/VKERN i386

>Description:
	Upgrade mysql41-server to 4.1.16
>How-To-Repeat:
	N/A
>Fix:

	patch-man::Makefile.in was removed as it was causing problems with creating a package
	on my build box.

--- mysql41-server-patch begins here ---
diff -ruN mysql41-server.orig/Makefile mysql41-server/Makefile
--- mysql41-server.orig/Makefile	Mon Nov 14 23:48:22 2005
+++ mysql41-server/Makefile	Wed Dec 14 15:13:19 2005
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	4.1.15
+PORTVERSION=	4.1.16
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
diff -ruN mysql41-server.orig/distinfo mysql41-server/distinfo
--- mysql41-server.orig/distinfo	Sun Oct 23 08:11:42 2005
+++ mysql41-server/distinfo	Wed Dec 14 15:13:19 2005
@@ -1,2 +1,2 @@
-MD5 (mysql-4.1.15.tar.gz) = 65a0841e592641b8816f9212aaa40176
-SIZE (mysql-4.1.15.tar.gz) = 17257765
+MD5 (mysql-4.1.16.tar.gz) = 13c5fdd05e28863db3a1261635890b5f
+SIZE (mysql-4.1.16.tar.gz) = 17146702
diff -ruN mysql41-server.orig/files/patch-Docs::Makefile.in mysql41-server/files/patch-Docs::Makefile.in
--- mysql41-server.orig/files/patch-Docs::Makefile.in	Wed Jun  8 01:33:21 2005
+++ mysql41-server/files/patch-Docs::Makefile.in	Wed Dec 14 15:13:19 2005
@@ -1,11 +1,11 @@
---- Docs/Makefile.in.orig	Fri May 13 13:33:27 2005
-+++ Docs/Makefile.in	Fri Jun  3 16:54:40 2005
-@@ -481,7 +481,7 @@
- 	uninstall-info-am
+--- Docs/Makefile.in.orig	Tue Dec 13 18:22:55 2005
++++ Docs/Makefile.in	Tue Dec 13 18:23:09 2005
+@@ -488,7 +488,7 @@
+ 	uninstall uninstall-am uninstall-info-am uninstall-local
  
  
--all:			txt_files
-+all:
+-all-local:		$(TXT_FILES)
++all-local:
  
- txt_files:		../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \
- 			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
+ # make sure that "make install" installs the info page, too
+ # automake only seems to take care of this automatically,
diff -ruN mysql41-server.orig/files/patch-Makefile.in mysql41-server/files/patch-Makefile.in
--- mysql41-server.orig/files/patch-Makefile.in	Sat Jul 23 04:14:17 2005
+++ mysql41-server/files/patch-Makefile.in	Wed Dec 14 15:13:19 2005
@@ -1,9 +1,9 @@
---- Makefile.in.orig	Tue Dec 14 13:41:10 2004
-+++ Makefile.in	Sun Dec 19 11:48:00 2004
-@@ -338,12 +338,7 @@
+--- Makefile.in.orig	Wed Nov 30 13:37:05 2005
++++ Makefile.in	Tue Dec 13 18:28:01 2005
+@@ -348,12 +348,7 @@
+ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
+ 			README COPYING EXCEPTIONS-CLIENT
  
- # These are built from source in the Docs directory
- EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
 -			@readline_topdir@ sql-common \
 -			@thread_dirs@ pstack \
diff -ruN mysql41-server.orig/files/patch-man::Makefile.in mysql41-server/files/patch-man::Makefile.in
--- mysql41-server.orig/files/patch-man::Makefile.in	Mon Jan 10 01:53:10 2005
+++ mysql41-server/files/patch-man::Makefile.in	Wed Dec 31 17:00:00 1969
@@ -1,13 +0,0 @@
---- man/Makefile.in.orig	Tue Dec 14 13:41:14 2004
-+++ man/Makefile.in	Sun Dec 19 11:53:40 2004
-@@ -313,9 +313,7 @@
- vio_dir = @vio_dir@
- vio_libs = @vio_libs@
- zlib_dir = @zlib_dir@
--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 \
diff -ruN mysql41-server.orig/patch-man::Makefile.in mysql41-server/patch-man::Makefile.in
--- mysql41-server.orig/patch-man::Makefile.in	Wed Dec 14 14:19:37 2005
+++ mysql41-server/patch-man::Makefile.in	Wed Dec 31 17:00:00 1969
@@ -1,11 +0,0 @@
---- man/Makefile.in.orig	Wed Nov 30 13:37:13 2005
-+++ man/Makefile.in	Wed Dec 14 14:18:52 2005
-@@ -321,7 +321,7 @@
- vio_dir = @vio_dir@
- vio_libs = @vio_libs@
- zlib_dir = @zlib_dir@
--man1_MANS = @man1_files@
-+man1_MANS = 
- EXTRA_DIST = $(man1_MANS)
- all: all-am
- 
--- mysql41-server-patch ends here ---


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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200512142334.jBENYLM5009027>