Page MenuHomeFreeBSD
Files F167847654

D4099.id10010.diff
No OneTemporary
Actions

D4099.id10010.diff
View Options

Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -7927,3 +7927,6 @@
graphics/cal3d-devel|graphics/cal3d|2015-11-02|Development ceased in 2006 so set last devel version as stable
www/joomla31|www/joomla3|2015-11-03|Renamed to match upstream only supporting the latest 3.x release at a time
devel/py-parsing|devel/py-pyparsing|2015-11-04|Renamed to match upstream naming
+databases/mariadb-client|databases/mariadb53-client|2015-10-20|Align naming with other MySQL/MariaDB ports
+databases/mariadb-server|databases/mariadb53-server|2015-10-20|Align naming with other MySQL/MariaDB ports
+databases/mariadb-scripts|databases/mariadb53-scripts|2015-10-20|Align naming with other MySQL/MariaDB ports
Index: Mk/bsd.database.mk
===================================================================
--- Mk/bsd.database.mk
+++ Mk/bsd.database.mk
@@ -145,26 +145,17 @@
.endif
.endif
-.if (${MYSQL_VER} == "53m")
-_MYSQL_CLIENT= databases/mariadb-client
-_MYSQL_SERVER= databases/mariadb-server
-.elif (${MYSQL_VER} == "55m")
-_MYSQL_CLIENT= databases/mariadb55-client
-_MYSQL_SERVER= databases/mariadb55-server
-.elif (${MYSQL_VER} == "100m")
-_MYSQL_CLIENT= databases/mariadb100-client
-_MYSQL_SERVER= databases/mariadb100-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
+.if (${MYSQL_VER:C/[0-9]*//} == "m")
+_MYSQL_FLAVOUR= mariadb
+.elif (${MYSQL_VER:C/[0-9]*//} == "p")
+_MYSQL_FLAVOUR= percona
.else
-_MYSQL_CLIENT= databases/mysql${MYSQL_VER}-client
-_MYSQL_SERVER= databases/mysql${MYSQL_VER}-server
+_MYSQL_FLAVOUR= mysql
.endif
+_MYSQL_CLIENT= databases/${_MYSQL_FLAVOUR}${MYSQL_VER:C/[mp]//}-client
+_MYSQL_SERVER= databases/${_MYSQL_FLAVOUR}${MYSQL_VER:C/[mp]//}-server
+
# And now we are checking if we can use it
.if defined(MYSQL${MYSQL_VER}_LIBVER)
.if defined(IGNORE_WITH_MYSQL)
Index: databases/Makefile
===================================================================
--- databases/Makefile
+++ databases/Makefile
@@ -180,11 +180,11 @@
SUBDIR += luasql-postgres
SUBDIR += luasql-sqlite3
SUBDIR += mantis
- SUBDIR += mariadb-client
- SUBDIR += mariadb-scripts
- SUBDIR += mariadb-server
SUBDIR += mariadb100-client
SUBDIR += mariadb100-server
+ SUBDIR += mariadb53-client
+ SUBDIR += mariadb53-scripts
+ SUBDIR += mariadb53-server
SUBDIR += mariadb55-client
SUBDIR += mariadb55-server
SUBDIR += mdbtools
Index: databases/mariadb53-client/Makefile
===================================================================
--- databases/mariadb53-client/Makefile
+++ databases/mariadb53-client/Makefile
@@ -6,7 +6,7 @@
COMMENT= Database client - drop-in replacement for MySQL
-MASTERDIR= ${.CURDIR}/../mariadb-server
+MASTERDIR= ${.CURDIR}/../mariadb53-server
MARIADB_CLIENT_SLAVE= yes
USES+= readline
@@ -17,7 +17,7 @@
THREADSAFE_DESC= Build thread-safe client
CONFLICTS= mariadb5[4-9]-client-* \
- mariadb1[0-9][0-9]-client-* \
+ mariadb1*-client-* \
mysql*-client-* \
percona*-client-*
Index: databases/mariadb53-scripts/Makefile
===================================================================
--- databases/mariadb53-scripts/Makefile
+++ databases/mariadb53-scripts/Makefile
@@ -9,7 +9,7 @@
USES= perl5
-MASTERDIR= ${.CURDIR}/../mariadb-server
+MASTERDIR= ${.CURDIR}/../mariadb53-server
MARIADB_SCRIPTS_SLAVE= yes
CONFLICTS= mysql[0-9][0-9]-scripts-* \
Index: databases/mariadb53-server/Makefile
===================================================================
--- databases/mariadb53-server/Makefile
+++ databases/mariadb53-server/Makefile
@@ -21,7 +21,7 @@
LICENSE= GPLv2
CONFLICTS?= mariadb5[4-9]-server-* \
- mariadb1[0-9][0-9]-server-* \
+ mariadb1*-server-* \
mysql*-server-* \
percona*-server-*

File Metadata

Mime Type
text/plain
Expires
Tue, Aug 25, 11:41 PM (15 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37256427
Default Alt Text
D4099.id10010.diff (3 KB)

Event Timeline