4 files changed, 10 insertions, 41 deletions

diff --git a/databases/mysql40-scripts/Makefile b/databases/mysql40-scripts/Makefile
index f2001cb3961e..af3cdc09c4bb 100644
--- a/databases/mysql40-scripts/Makefile
+++ b/databases/mysql40-scripts/Makefile
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	1
 PKGNAMESUFFIX=	-scripts
 
 COMMENT=	Multithreaded SQL database (scripts)
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index 7c97b75a86a9..e789a368a358 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	4.0.24
-PORTREVISION?=	1
+PORTVERSION=	4.0.25
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-4.0
@@ -109,11 +109,6 @@ PLIST_SUB=	VER=${PORTVERSION}
 MAN1=		isamchk.1 isamlog.1 mysqld.1 \
 		mysqld_safe.1 perror.1 replace.1
 
-.if !defined(NOPORTDOCS)
-DOCS=		manual.html manual.txt manual_toc.html
-PORTDOCS=	${DOCS} Flags
-.endif
-
 INFO=		mysql
 
 pre-fetch:
@@ -147,13 +142,6 @@ post-install:
 .if !defined(PACKAGE_BUILDING)
 	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/Flags
-.for doc in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR}
-.endfor
-	@${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags
-.endif
 
 .else
 # MySQL-Client part
diff --git a/databases/mysql40-server/distinfo b/databases/mysql40-server/distinfo
index cf7f7e7284f2..4b355003be4a 100644
--- a/databases/mysql40-server/distinfo
+++ b/databases/mysql40-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (mysql-4.0.24.tar.gz) = 408d3001ed715ddc90009c247e548638
-SIZE (mysql-4.0.24.tar.gz) = 16885399
+MD5 (mysql-4.0.25.tar.gz) = 68a47ff8c1f0c24866a792f6b3bb59d6
+SIZE (mysql-4.0.25.tar.gz) = 11159288
diff --git a/databases/mysql40-server/files/patch-Docs::Makefile.in b/databases/mysql40-server/files/patch-Docs::Makefile.in
index a9744c12e53a..941446168e24 100644
--- a/databases/mysql40-server/files/patch-Docs::Makefile.in
+++ b/databases/mysql40-server/files/patch-Docs::Makefile.in
@@ -1,29 +1,11 @@
---- Docs/Makefile.in.orig	Sun Jan  9 12:51:43 2005
-+++ Docs/Makefile.in	Sun Jan  9 12:58:11 2005
-@@ -316,7 +316,7 @@
- 
- SUBDIRS = Images
- GT = $(srcdir)/Support/generate-text-files.pl
--all: $(BUILT_SOURCES)
-+all:
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
- .SUFFIXES:
-@@ -626,7 +626,7 @@
- 	for dir in "$(DESTDIR)$(infodir)"; do \
- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
--install: $(BUILT_SOURCES)
-+install:
- 	$(MAKE) $(AM_MAKEFLAGS) install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -750,7 +750,7 @@
- 	tags tags-recursive uninstall uninstall-am uninstall-info-am
+--- Docs/Makefile.in.orig	Wed Jun 29 19:07:04 2005
++++ Docs/Makefile.in	Wed Jul 20 09:27:21 2005
+@@ -454,7 +454,7 @@
+ 	uninstall-info-am
  
  
--all:			$(targets) txt_files
+-all:			txt_files
 +all:
  
- txt_files:		../INSTALL-SOURCE ../COPYING ../EXCEPTIONS-CLIENT \
+ txt_files:		../INSTALL-SOURCE ../EXCEPTIONS-CLIENT \
  			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt