Attachment 38038 Details for Bug 60321 – mysql40-server.diff

[patch] mysql40-server.diff

mysql40-server.diff (text/plain), 8.21 KB, created by Alex Dupre on 2003-12-17 09:00:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Dupre

Created: 2003-12-17 09:00:33 UTC

Size: 8.21 KB

patch

obsolete

>diff -ruN mysql40-server.orig/Makefile mysql40-server/Makefile
>--- mysql40-server.orig/Makefile	Wed Dec 17 09:02:08 2003
>+++ mysql40-server/Makefile	Wed Dec 17 09:24:18 2003
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME?=	mysql
>-PORTVERSION=	4.0.16
>+PORTVERSION=	4.0.17
> PORTREVISION?=	0
> CATEGORIES=	databases
> MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.0/ \
>@@ -73,10 +73,10 @@
> CFLAGS+=	-D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE
> CFLAGS+=	-I${LOCALBASE}/include/pthread/linuxthreads
> .if ${OSVERSION} > 500000
>-LIB_DEPENDS+=   lthread.3:${PORTSDIR}/devel/linuxthreads
>+LIB_DEPENDS+=	lthread.3:${PORTSDIR}/devel/linuxthreads
> CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r -llstdc++ -llsupc++'
> .else
>-LIB_DEPENDS+=   lthread.2:${PORTSDIR}/devel/linuxthreads
>+LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
> CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r'
> .endif
> .endif
>@@ -108,6 +108,8 @@
> 
> DOCS=		manual.html manual.txt manual_toc.html
> 
>+INFO=		mysql
>+
> pre-fetch:
> 	@${ECHO} ""
> 	@${ECHO} "You may use the following build options:"
>@@ -162,9 +164,9 @@
> 	@${INSTALL_DATA} ${WRKSRC}/Docs/${doc} ${DOCSDIR}
> .endfor
> 	@${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags
>+.endif
> 	@${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
> 	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
>-.endif
> 
> # MySQL-Client part
> .else
>diff -ruN mysql40-server.orig/distinfo mysql40-server/distinfo
>--- mysql40-server.orig/distinfo	Wed Dec 17 09:02:08 2003
>+++ mysql40-server/distinfo	Wed Dec 17 09:25:04 2003
>@@ -1 +1 @@
>-MD5 (mysql-4.0.16.tar.gz) = ddc959b9cdc2f5e30dc6a4d3650d3db5
>+MD5 (mysql-4.0.17.tar.gz) = 141511e1b7cab3a886fb68bbb507a1ab
>diff -ruN mysql40-server.orig/files/patch-Makefile.in mysql40-server/files/patch-Makefile.in
>--- mysql40-server.orig/files/patch-Makefile.in	Wed Dec 17 09:02:08 2003
>+++ mysql40-server/files/patch-Makefile.in	Wed Dec 17 09:09:49 2003
>@@ -1,16 +1,15 @@
>---- Makefile.in.orig	Thu Feb 20 20:58:01 2003
>-+++ Makefile.in	Thu Feb 27 12:27:18 2003
>-@@ -212,12 +212,7 @@
>- EXTRA_DIST = INSTALL-SOURCE README \
>- 			COPYING COPYING.LIB
>+--- Makefile.in.orig	Sun Dec 14 22:24:01 2003
>++++ Makefile.in	Wed Dec 17 09:09:31 2003
>+@@ -210,11 +210,7 @@
>  
>+ # These are built from source in the Docs directory
>+ EXTRA_DIST = INSTALL-SOURCE README COPYING 
> -SUBDIRS = . include @docs_dirs@ @readline_dir@ \
> -			@thread_dirs@ pstack @sql_client_dirs@ \
> -			@sql_server_dirs@ scripts man tests \
> -			BUILD @netware_dir@ os2 @libmysqld_dirs@ \
> -			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
>--
> +SUBDIRS =
>  
>+ 
>  # Relink after clean
>- linked_sources = linked_client_sources linked_server_sources \
>diff -ruN mysql40-server.orig/pkg-plist mysql40-server/pkg-plist
>--- mysql40-server.orig/pkg-plist	Wed Dec 17 09:02:08 2003
>+++ mysql40-server/pkg-plist	Wed Dec 17 09:23:35 2003
>@@ -32,9 +32,6 @@
> bin/resolve_stack_dump
> bin/resolveip
> etc/rc.d/mysql-server.sh
>-%%PORTDOCS%%@unexec install-info --delete %D/info/mysql.info %D/info/dir
>-%%PORTDOCS%%info/mysql.info
>-%%PORTDOCS%%@exec install-info %D/info/mysql.info %D/info/dir
> lib/mysql/libdbug.a
> lib/mysql/libheap.a
> lib/mysql/libmerge.a
>@@ -45,58 +42,58 @@
> lib/mysql/libnisam.a
> lib/mysql/libvio.a
> libexec/mysqld
>-%%PORTDOCS%%share/doc/mysql/Flags/argentina.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/armenia.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/australia.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/austria.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/belgium.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/brazil.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/bulgaria.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/canada.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/chile.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/china.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/costa-rica.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/croatia.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/czech-republic.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/denmark.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/estonia.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/finland.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/france.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/germany.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/great-britain.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/greece.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/hungary.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/iceland.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/indonesia.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/ireland.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/israel.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/italy.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/japan.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/latvia.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/mexico.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/netherlands.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/new-zealand.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/norway.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/philippines.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/poland.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/portugal.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/romania.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/russia.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/singapore.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/slovenia.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/south-africa.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/south-korea.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/spain.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/sweden.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/switzerland.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/taiwan.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/turkey.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/ukraine.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/usa.gif
>-%%PORTDOCS%%share/doc/mysql/Flags/yugoslavia.gif
>-%%PORTDOCS%%share/doc/mysql/manual.html
>-%%PORTDOCS%%share/doc/mysql/manual.txt
>-%%PORTDOCS%%share/doc/mysql/manual_toc.html
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/argentina.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/armenia.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/australia.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/austria.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/belgium.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/brazil.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/bulgaria.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/canada.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/chile.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/china.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/costa-rica.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/croatia.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/czech-republic.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/denmark.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/estonia.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/finland.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/france.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/germany.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/great-britain.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/greece.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/hungary.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/iceland.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/indonesia.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/ireland.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/israel.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/italy.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/japan.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/latvia.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/mexico.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/netherlands.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/new-zealand.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/norway.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/philippines.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/poland.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/portugal.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/romania.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/russia.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/singapore.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/slovenia.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/south-africa.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/south-korea.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/spain.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/sweden.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/switzerland.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/taiwan.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/turkey.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/ukraine.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/usa.gif
>+%%PORTDOCS%%%%DOCSDIR%%/Flags/yugoslavia.gif
>+%%PORTDOCS%%%%DOCSDIR%%/manual.html
>+%%PORTDOCS%%%%DOCSDIR%%/manual.txt
>+%%PORTDOCS%%%%DOCSDIR%%/manual_toc.html
> share/mysql/Description.plist
> share/mysql/Info.plist
> share/mysql/MySQL-shared-compat.spec
>@@ -183,8 +180,8 @@
> share/mysql/swedish/errmsg.txt
> share/mysql/ukrainian/errmsg.sys
> share/mysql/ukrainian/errmsg.txt
>-%%PORTDOCS%%@dirrm share/doc/mysql/Flags
>-%%PORTDOCS%%@dirrm share/doc/mysql
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Flags
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%
> @dirrm share/mysql/charsets
> @dirrm share/mysql/czech
> @dirrm share/mysql/danish

Actions: View | Diff

Attachments on bug 60321: 38038