Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 10 Jun 2017 15:22:15 +0000 (UTC)
From:      Bernard Spil <brnrd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r443100 - in head/databases/mariadb102-client: . files
Message-ID:  <201706101522.v5AFMF6L035516@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brnrd
Date: Sat Jun 10 15:22:15 2017
New Revision: 443100
URL: https://svnweb.freebsd.org/changeset/ports/443100

Log:
  databases/mariadb102-client: Fix dependencies checking MYSQL_VERSION_ID
  
   - Add upstream patch
  
  PR:		219788
  Reported by:	Alexey <fbsd98816551@avksrv.org>

Added:
  head/databases/mariadb102-client/files/patch-libmariadb_include_mariadb__version.h.in   (contents, props changed)
Modified:
  head/databases/mariadb102-client/Makefile

Modified: head/databases/mariadb102-client/Makefile
==============================================================================
--- head/databases/mariadb102-client/Makefile	Sat Jun 10 15:13:34 2017	(r443099)
+++ head/databases/mariadb102-client/Makefile	Sat Jun 10 15:22:15 2017	(r443100)
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	mariadb
+PORTREVISION=	2
 PKGNAMESUFFIX=	102-client
 
 COMMENT=	Multithreaded SQL database (client)

Added: head/databases/mariadb102-client/files/patch-libmariadb_include_mariadb__version.h.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mariadb102-client/files/patch-libmariadb_include_mariadb__version.h.in	Sat Jun 10 15:22:15 2017	(r443100)
@@ -0,0 +1,21 @@
+From 422d0f786e5e6eb103000a75738322c8baa9aa12 Mon Sep 17 00:00:00 2001
+From: Georg Richter <georg@mariadb.com>
+Date: Wed, 7 Jun 2017 10:35:35 +0200
+Subject: [PATCH] Added MYSQL_VERSION_ID (beside MARIADB_VERSION_ID)
+
+---
+ include/mariadb_version.h.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/mariadb_version.h.in b/include/mariadb_version.h.in
+index c401d04..a82102f 100644
+--- libmariadb/include/mariadb_version.h.in.orig	2017-05-14 23:13:15 UTC
++++ libmariadb/include/mariadb_version.h.in
+@@ -12,6 +12,7 @@
+ #define PROTOCOL_VERSION		@PROTOCOL_VERSION@
+ #define MARIADB_CLIENT_VERSION_STR	"@MARIADB_CLIENT_VERSION@"
+ #define MARIADB_VERSION_ID		@MARIADB_VERSION_ID@
++#define MYSQL_VERSION_ID		@MARIADB_VERSION_ID@
+ #define MARIADB_PORT	        	@MARIADB_PORT@
+ #define MARIADB_UNIX_ADDR               "@MARIADB_UNIX_ADDR@"
+ #define MYSQL_CONFIG_NAME		"my"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706101522.v5AFMF6L035516>