Bug 175180 - Un-break databases/mariadb-* after ports/174660
Summary: Un-break databases/mariadb-* after ports/174660
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Florian Smeets
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-01-10 14:10 UTC by geoffroy desvernay
Modified: 2013-01-10 23:50 UTC (History)
0 users

See Also:

Attachments
file.diff (1.21 KB, patch)
2013-01-10 14:10 UTC, geoffroy desvernay 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description geoffroy desvernay 2013-01-10 14:10:00 UTC 
changes in bsd.database.mk from ports/174660 made databases/mariadb-* break.

This patch to bsd.database.mk and databases/mariadb-server should let it work again

Fix: patch attached (thanks to Jeff Wheelhouse)

Patch attached with submission follows:
How-To-Repeat: try to compile anything dependent on mariadb-client
Comment 1 Florian Smeets freebsd_committer freebsd_triage 2013-01-10 16:52:43 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->flo

Totally my fault. I'll take it.
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-01-10 23:43:07 UTC 
Author: flo
Date: Thu Jan 10 23:42:53 2013
New Revision: 310210
URL: http://svnweb.freebsd.org/changeset/ports/310210

Log:
  - fix databases/mariadb-{server,client} by adding MYSQL_VER 53m. This was
    broken by r309955. [1]
  - remove MYSQL_VER 53, database/mariadb-* where the only ports to use it.
  - sort
  
  PR:		ports/175180
  Submitted by:	Geoffroy Desvernay <dgeo@centrale-marseille.fr>
  		Jeff Wheelhouse

Modified:
  head/Mk/bsd.database.mk
  head/databases/mariadb-server/Makefile   (contents, props changed)

Modified: head/Mk/bsd.database.mk
==============================================================================
--- head/Mk/bsd.database.mk	Thu Jan 10 23:24:54 2013	(r310209)
+++ head/Mk/bsd.database.mk	Thu Jan 10 23:42:53 2013	(r310210)
@@ -108,10 +108,10 @@ DEFAULT_MYSQL_VER?=	55
 MYSQL41_LIBVER=		14
 MYSQL50_LIBVER=		15
 MYSQL51_LIBVER=		16
-MYSQL53_LIBVER=		16
+MYSQL53m_LIBVER=	16
 MYSQL55_LIBVER=		18
-MYSQL55p_LIBVER=	18
 MYSQL55m_LIBVER=	18
+MYSQL55p_LIBVER=	18
 MYSQL56p_LIBVER=	18
 
 # Setting/finding MySQL version we want.
@@ -150,15 +150,15 @@ IGNORE=		cannot install: MySQL versions 
 .endif
 .endif
 
-.if (${MYSQL_VER} == "53")
+.if (${MYSQL_VER} == "53m")
 _MYSQL_CLIENT=	databases/mariadb-client
 _MYSQL_SERVER=	databases/mariadb-server
-.elif (${MYSQL_VER} == "55p")
-_MYSQL_CLIENT=	databases/percona55-client
-_MYSQL_SERVER=	databases/percona55-server
 .elif (${MYSQL_VER} == "55m")
 _MYSQL_CLIENT=	databases/mariadb55-client
 _MYSQL_SERVER=	databases/mariadb55-server
+.elif (${MYSQL_VER} == "55p")
+_MYSQL_CLIENT=	databases/percona55-client
+_MYSQL_SERVER=	databases/percona55-server
 .elif (${MYSQL_VER} == "56p")
 _MYSQL_CLIENT=	databases/percona56-client
 _MYSQL_SERVER=	databases/percona56-server

Modified: head/databases/mariadb-server/Makefile
==============================================================================
--- head/databases/mariadb-server/Makefile	Thu Jan 10 23:24:54 2013	(r310209)
+++ head/databases/mariadb-server/Makefile	Thu Jan 10 23:42:53 2013	(r310210)
@@ -28,7 +28,7 @@ GNU_CONFIGURE=	yes
 
 .if !defined(MARIADB_CLIENT_SLAVE)
 USE_MYSQL=	yes
-WANT_MYSQL_VER=	53
+WANT_MYSQL_VER=	53m
 .endif
 
 .if !defined(MARIADB_SCRIPTS_SLAVE)
@@ -42,7 +42,7 @@ GROUPS=		mysql
 
 OPTIONS_DEFINE+=	STATIC SSL OPENSSL
 OPTIONS_DEFAULT+=	SSL
-STATIC_DESC=	Build statically linked executables (not on 9.x)
+STATIC_DESC=	Statically link executables (not on 9.x)
 SSL_DESC=	Activate SSL support
 OPENSSL_DESC=	Use OpenSSL instead of bundled yassl
 
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Florian Smeets freebsd_committer freebsd_triage 2013-01-10 23:50:58 UTC 
State Changed
From-To: open->closed

Committed. Thanks!