Attachment 97508 Details for Bug 136263 – usr-ports.diff

[patch] usr-ports.diff

usr-ports.diff (text/plain), 2.08 KB, created by Alex Goncharov on 2009-07-03 04:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Goncharov

Created: 2009-07-03 04:50:00 UTC

Size: 2.08 KB

patch

obsolete

>--- Mk/bsd.database.mk.orig	2009-04-05 10:39:03.000000000 -0400
>+++ Mk/bsd.database.mk	2009-07-02 22:12:26.000000000 -0400
>@@ -111,6 +111,7 @@
> MYSQL41_LIBVER=		14
> MYSQL50_LIBVER=		15
> MYSQL51_LIBVER=		16
>+MYSQL54_LIBVER=		16
> MYSQL60_LIBVER=		16
> 
> # Setting/finding MySQL version we want.
>--- Mk/bsd.sites.mk.orig	2009-06-14 10:11:51.000000000 -0400
>+++ Mk/bsd.sites.mk	2009-07-02 22:17:20.000000000 -0400
>@@ -801,6 +801,7 @@
> 
> .if !defined(IGNORE_MASTER_SITE_MYSQL)
> MASTER_SITE_MYSQL+=	\
>+	ftp://mirror2.dataphone.se/pub/mysql/Downloads/%SUBDIR%/ \
> 	ftp://ftp.fi.muni.cz/pub/mysql/Downloads/%SUBDIR%/ \
> 	http://mysql.mirrors.cybercity.dk/Downloads/%SUBDIR%/ \
> 	ftp://ftp.fh-wolfenbuettel.de/pub/database/mysql/Downloads/%SUBDIR%/ \
>--- databases/p5-DBD-mysql51/Makefile.orig	2009-07-02 23:14:24.000000000 -0400
>+++ databases/p5-DBD-mysql51/Makefile	2009-07-02 22:59:23.000000000 -0400
>@@ -9,7 +9,7 @@
> 
> COMMENT=	MySQL 5.1 driver for the Perl5 Database Interface (DBI)
> 
>-CONFLICTS=	p5-Mysql-modules-[0-9]* p5-DBD-mysql-[0-9]* p5-DBD-mysql4[0-9]-[0-9]* p5-DBD-mysql50-[0-9]* p5-DBD-mysql6[0-9]-[0-9]*
>+CONFLICTS=	p5-Mysql-modules-[0-9]* p5-DBD-mysql-[0-9]* p5-DBD-mysql4[0-9]-[0-9]* p5-DBD-mysql50-[0-9]* p5-DBD-mysql54-[0-9]* p5-DBD-mysql6[0-9]-[0-9]*
> 
> WANT_MYSQL_VER=	51
> 
>--- databases/mysql51-server/Makefile.orig	2009-07-02 23:15:46.000000000 -0400
>+++ databases/mysql51-server/Makefile	2009-07-02 23:00:31.000000000 -0400
>@@ -91,7 +91,7 @@
> 
> LATEST_LINK=	mysql51-server
> 
>-CONFLICTS=	mysql-server-3.* mysql-server-4.* mysql-server-5.0.* mysql-server-6.*
>+CONFLICTS=	mysql-server-3.* mysql-server-4.* mysql-server-5.0.* mysql-server-5.4.* mysql-server-6.*
> 
> USE_RC_SUBR=	mysql-server.sh
> 
>--- databases/mysql50-server/Makefile.orig	2009-07-02 23:16:22.000000000 -0400
>+++ databases/mysql50-server/Makefile	2009-07-02 23:00:10.000000000 -0400
>@@ -101,7 +101,7 @@
> 
> LATEST_LINK=	mysql50-server
> 
>-CONFLICTS=	mysql-server-3.* mysql-server-4.* mysql-server-5.1.* mysql-server-6.*
>+CONFLICTS=	mysql-server-3.* mysql-server-4.* mysql-server-5.1.* mysql-server-5.4.* mysql-server-6.*
> 
> USE_RC_SUBR=	mysql-server.sh

Actions: View | Diff

Attachments on bug 136263: 97508