Attachment 149048 Details for Bug 194824 – Patch for mariab-server, -client and -scripts

[patch] Patch for mariab-server, -client and -scripts

patch-mariadb_Makefiles (text/plain), 2.38 KB, created by Bernard Spil on 2014-11-04 20:25:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2014-11-04 20:25:55 UTC

Size: 2.38 KB

patch

obsolete

>--- mariadb-server/Makefile.orig	2014-09-04 21:26:24.000000000 +0200
>+++ mariadb-server/Makefile	2014-11-04 15:18:18.497663258 +0100
>@@ -22,7 +22,10 @@
> 
> UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
> 
>-CONFLICTS?=	mysql[0-9][0-9]-server-* percona[0-9][0-9]-server-* mariadb5.[0-24-9]-server-* mariadb[0-46-9][0-9]-server-*
>+CONFLICTS?=	mariadb5[4-9]-server-* \
>+		mariadb1[0-9][0-9]-server-* \
>+		mysql*-server-* \
>+		percona*-server-*
> 
> GNU_CONFIGURE=	yes
> USES+=		libtool
>--- mariadb-client/Makefile.orig	2014-11-04 15:10:42.303693157 +0100
>+++ mariadb-client/Makefile	2014-11-04 15:19:20.985666753 +0100
>@@ -1,4 +1,4 @@
>-# $FreeBSD$
>+# $FreeBSD: head/databases/mariadb-client/Makefile 359981 2014-07-01 12:22:05Z bapt $
> 
> PORTNAME=	mariadb
> PKGNAMESUFFIX=	53-client
>@@ -17,7 +17,10 @@
> OPTIONS_DEFAULT=	THREADSAFE
> THREADSAFE_DESC=	Build thread-safe client
> 
>-CONFLICTS=	mysql[0-9][0-9]-client-* mariadb5.[0-24-9]-client-* mariadb[0-46-9][0-9]-client-* percona[0-9][0-9]-client-*
>+CONFLICTS=	mariadb5[4-9]-client-* \
>+		mariadb1[0-9][0-9]-client-* \
>+		mysql*-client-* \
>+		percona*-client-* 
> 
> PATCHDIR=	${.CURDIR}/files
> PLIST=		${.CURDIR}/pkg-plist
>--- mariadb-scripts/Makefile.orig	1970-01-01 01:00:00.000000000 +0100
>+++ mariadb-scripts/Makefile	2014-03-05 18:38:35.000000000 +0100
>@@ -0,0 +1,35 @@
>+# $FreeBSD: head/databases/mariadb-scripts/Makefile 347127 2014-03-05 17:38:35Z bapt $
>+
>+PORTNAME=	mariadb
>+PKGNAMESUFFIX=	53-scripts
>+
>+COMMENT=	Scripts for mariadb - drop-in replacement for MySQL
>+
>+LICENSE=	GPLv2
>+
>+UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
>+USES=		perl5
>+
>+MASTERDIR=	${.CURDIR}/../mariadb-server
>+MARIADB_SCRIPTS_SLAVE=	yes
>+
>+CONFLICTS=	mysql[0-9][0-9]-scripts-* \
>+		mytop-[0-9]*
>+
>+PATCHDIR=	${.CURDIR}/files
>+PLIST=		${.CURDIR}/pkg-plist
>+
>+MANS=		msql2mysql.1 mysql_convert_table_format.1 mysql_find_rows.1 \
>+		mysql_fix_extensions.1 mysql_secure_installation.1 \
>+		mysql_setpermission.1 mysql_zap.1 mysqlaccess.1 \
>+		mysqldumpslow.1 mysqlhotcopy.1 mysqld_multi.1
>+
>+EXTRA_PATCHES=	${MASTERDIR}/files/patch-Makefile.in ${MASTERDIR}/files/patch-man__Makefile.in
>+MDB_SCRIPTS_SUBDIRS=	scripts @man_dirs@
>+
>+post-patch:
>+	@${REINPLACE_CMD} -e "s|%%SUBDIRS%%|${MDB_SCRIPTS_SUBDIRS}|" ${WRKSRC}/Makefile.in
>+	@${REINPLACE_CMD} -e "s|%%MANS%%|${MANS}|" ${WRKSRC}/man/Makefile.in
>+	@${REINPLACE_CMD} -e "s|^$install-man: install-man1$.*|\1|" ${WRKSRC}/man/Makefile.in
>+
>+.include "${MASTERDIR}/Makefile"

Actions: View | Diff

Attachments on bug 194824: 149048