aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordhn <dhn@FreeBSD.org>2012-04-29 18:28:37 +0800
committerdhn <dhn@FreeBSD.org>2012-04-29 18:28:37 +0800
commitc7284ac99071242914440ab07dfd5906b7969b45 (patch)
tree927d0e45a8db5b3914341fefdd7170ae6b443574
parent5a217dadcfafa6cf7f27d0e620e3e557070f070a (diff)
downloadfreebsd-ports-gnome-c7284ac99071242914440ab07dfd5906b7969b45.tar.gz
freebsd-ports-gnome-c7284ac99071242914440ab07dfd5906b7969b45.tar.zst
freebsd-ports-gnome-c7284ac99071242914440ab07dfd5906b7969b45.zip
- Update pkg-plist
PR: ports/167413 Submitted by: Geoffroy Desvernay <dgeo@centrale-marseille.fr> (maintainer)
-rw-r--r--databases/mariadb-server/Makefile4
-rw-r--r--databases/mariadb-server/files/scripts__Makefile.in15
-rw-r--r--databases/mariadb-server/pkg-plist2
3 files changed, 12 insertions, 9 deletions
diff --git a/databases/mariadb-server/Makefile b/databases/mariadb-server/Makefile
index a92e3e0c27b8..a0db4ef21159 100644
--- a/databases/mariadb-server/Makefile
+++ b/databases/mariadb-server/Makefile
@@ -21,7 +21,7 @@ MASTER_SITES= http://www.percona.com/downloads/MariaDB/${PORTNAME}-${PORTVERSION
PKGNAMESUFFIX?= -server
MAINTAINER= dgeo@centrale-marseille.fr
-COMMENT?= Database server - drop-in replacement for MySQL
+COMMENT= Database server - drop-in replacement for MySQL
LICENSE= GPLv2
@@ -175,7 +175,7 @@ PLIST_SUB+= HANDLERSOCKET=""
PLUGINS+= handlersocket
.else
CONFIGURE_ARGS+= --without-plugin-handlersocket
-PLIST_SUB+= HANDLERSOCKET="@comment "
+PLIST_SUB+= HANDLERSOCKET="@comment "
.endif
.if defined(WITH_OQGRAPH)
CONFIGURE_ARGS+= --with-plugin-oqgraph
diff --git a/databases/mariadb-server/files/scripts__Makefile.in b/databases/mariadb-server/files/scripts__Makefile.in
index 9a5f9c36ef3d..edfde43a66d6 100644
--- a/databases/mariadb-server/files/scripts__Makefile.in
+++ b/databases/mariadb-server/files/scripts__Makefile.in
@@ -1,9 +1,10 @@
---- scripts/Makefile.in.orig 2011-03-01 22:25:08.000000000 -0800
-+++ scripts/Makefile.in 2011-06-03 21:58:20.000000000 -0700
-@@ -479,14 +479,11 @@
+--- scripts/Makefile.in.orig 2012-04-08 02:31:01.000000000 +0200
++++ scripts/Makefile.in 2012-04-28 14:08:29.000000000 +0200
+@@ -496,19 +496,14 @@
+ mysql_fix_privilege_tables_sql.c
bin_SCRIPTS = @server_scripts@ \
- msql2mysql \
+- msql2mysql \
- mysql_config \
- mysql_fix_privilege_tables \
mysql_fix_extensions \
@@ -15,7 +16,11 @@
mysql_convert_table_format \
mysql_find_rows \
mysqlhotcopy \
-@@ -528,8 +525,7 @@
+- mytop \
+ mysqldumpslow \
+ mysqld_multi
+
+@@ -548,8 +543,7 @@
mysql_system_tables_fix.sql \
CMakeLists.txt
diff --git a/databases/mariadb-server/pkg-plist b/databases/mariadb-server/pkg-plist
index 1e8308fce62c..c00213307ba6 100644
--- a/databases/mariadb-server/pkg-plist
+++ b/databases/mariadb-server/pkg-plist
@@ -4,13 +4,11 @@
%%ARIADB%%bin/aria_pack
%%ARIADB%%bin/aria_read_log
%%XTRADB%%bin/innochecksum
-bin/msql2mysql
bin/my_print_defaults
bin/myisam_ftdump
bin/myisamchk
bin/myisamlog
bin/myisampack
-bin/mytop
%%HANDLERSOCKET%%bin/hsclient
bin/mysql_client_test_embedded
bin/mysql_convert_table_format