[Midnightbsd-cvs] mports [18223] trunk/Mk/extensions/mysql.mk: drop embedded

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Mar 18 08:38:19 EDT 2015


Revision: 18223
          http://svnweb.midnightbsd.org/mports/?rev=18223
Author:   laffer1
Date:     2015-03-18 08:38:18 -0400 (Wed, 18 Mar 2015)
Log Message:
-----------
drop embedded

Modified Paths:
--------------
    trunk/Mk/extensions/mysql.mk

Modified: trunk/Mk/extensions/mysql.mk
===================================================================
--- trunk/Mk/extensions/mysql.mk	2015-03-18 12:37:21 UTC (rev 18222)
+++ trunk/Mk/extensions/mysql.mk	2015-03-18 12:38:18 UTC (rev 18223)
@@ -37,7 +37,7 @@
 WARNING+=	"DEFAULT_MYSQL_VER is defined, consider using DEFAULT_VERSIONS=mysql=${DEFAULT_MYSQL_VER} instead"
 .endif
 
-.if defined(USE_MYSQL)
+#.if defined(USE_MYSQL)
 DEFAULT_MYSQL_VER?=	${MYSQL_DEFAULT:S/.//}
 # MySQL client version currently supported.
 MYSQL51_LIBVER=		16
@@ -47,6 +47,7 @@
 MYSQL55p_LIBVER=	18
 MYSQL56_LIBVER=		18
 MYSQL56p_LIBVER=	18
+MYSQL100m_LIBVER=	18
 
 # Setting/finding MySQL version we want.
 .if exists(${LOCALBASE}/bin/mysql) && !defined(PACKAGE_BUILDING)
@@ -101,10 +102,6 @@
 _MYSQL_SERVER=	databases/mysql${MYSQL_VER}-server
 .endif
 
-.if (${USE_MYSQL} == "embedded")
-IGNORE_WITH_MYSQL=	41
-.endif
-
 # And now we are checking if we can use it
 .if defined(MYSQL${MYSQL_VER}_LIBVER)
 .if defined(IGNORE_WITH_MYSQL)
@@ -126,6 +123,6 @@
 IGNORE=		cannot install: unknown MySQL version: ${MYSQL_VER}
 .endif # Check for correct libs
 
-.endif # USE_MYSQL
+#.endif # USE_MYSQL
 
 .endif # defined(_POSTMKINCLUDED) && !defined(Mysql_Post_Include)



More information about the Midnightbsd-cvs mailing list