Update to 4.1.12 release.

PR:		ports/81690
Submitted by:	Marcus Grando <marcus@corp.grupos.com.br>

4 files changed, 17 insertions, 51 deletions

diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index f3be1a14418d..ec4e83882f8f 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	4.1.11
-PORTREVISION?=	1
+PORTVERSION=	4.1.12
+PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-4.1
@@ -88,6 +88,9 @@ CFLAGS+=	${PTHREAD_CFLAGS}
 .endif
 
 .if ${OSVERSION} < 500000
+LIB_DEPENDS+=	readline.5:${PORTSDIR}/devel/readline
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CXX=		${CC}
 .endif
 .if defined(BUILD_OPTIMIZED)
@@ -120,10 +123,6 @@ PLIST_SUB+=	NDB="@comment "
 MAN1=		isamchk.1 isamlog.1 mysqld.1 \
 		mysqld_safe.1 perror.1 replace.1
 
-.if !defined(NOPORTDOCS)
-PORTDOCS=	manual.html manual.txt manual_toc.html
-.endif
-
 INFO=		mysql
 
 pre-fetch:
@@ -161,12 +160,6 @@ post-install:
 .if !defined(PACKAGE_BUILDING)
 	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for doc in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR}
-.endfor
-.endif
 
 .else
 # MySQL-Client part
diff --git a/databases/mysql41-server/distinfo b/databases/mysql41-server/distinfo
index 3af8a6299ee2..8596a4f0956f 100644
--- a/databases/mysql41-server/distinfo
+++ b/databases/mysql41-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (mysql-4.1.11.tar.gz) = 0b99001b07cad53f161ec629a6bb24ea
-SIZE (mysql-4.1.11.tar.gz) = 22880239
+MD5 (mysql-4.1.12.tar.gz) = 56a6f5cacd97ae290e07bbe19f279af1
+SIZE (mysql-4.1.12.tar.gz) = 17069350
diff --git a/databases/mysql41-server/files/patch-Docs::Makefile.in b/databases/mysql41-server/files/patch-Docs::Makefile.in
index a9744c12e53a..916286b637a9 100644
--- a/databases/mysql41-server/files/patch-Docs::Makefile.in
+++ b/databases/mysql41-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	Fri May 13 13:33:27 2005
++++ Docs/Makefile.in	Fri Jun  3 16:54:40 2005
+@@ -481,7 +481,7 @@
+ 	uninstall-info-am
  
  
--all:			$(targets) txt_files
+-all:			txt_files
 +all:
  
- txt_files:		../INSTALL-SOURCE ../COPYING ../EXCEPTIONS-CLIENT \
+ txt_files:		../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \
  			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
diff --git a/databases/mysql41-server/files/patch-scripts::Makefile.in b/databases/mysql41-server/files/patch-scripts::Makefile.in
index 3ee7b0e5ad7b..65770d41316c 100644
--- a/databases/mysql41-server/files/patch-scripts::Makefile.in
+++ b/databases/mysql41-server/files/patch-scripts::Makefile.in
@@ -1,6 +1,6 @@
---- scripts/Makefile.in.orig	Tue Dec 14 13:41:31 2004
-+++ scripts/Makefile.in	Sun Dec 19 11:52:42 2004
-@@ -316,26 +316,7 @@
+--- scripts/Makefile.in.orig	Fri May 13 13:33:57 2005
++++ scripts/Makefile.in	Fri Jun  3 16:58:01 2005
+@@ -320,26 +320,7 @@
  vio_dir = @vio_dir@
  vio_libs = @vio_libs@
  zlib_dir = @zlib_dir@
@@ -28,7 +28,7 @@
  
  EXTRA_SCRIPTS = make_binary_distribution.sh \
  			make_sharedlib_distribution.sh \
-@@ -366,7 +347,7 @@
+@@ -369,7 +350,7 @@
  			mysqlaccess.conf \
  			mysqlbug
  
@@ -37,12 +37,3 @@
  
  # mysqlbug should be distributed built so that people can report build
  # failures with it.
-@@ -652,8 +633,6 @@
- 
- all: fill_help_tables.sql make_win_src_distribution make_binary_distribution make_sharedlib_distribution
- 
--fill_help_tables.sql: fill_help_tables ../Docs/manual.texi
--		./fill_help_tables < ../Docs/manual.texi > fill_help_tables.sql
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT: