summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2011-02-08 12:50:45 +0000
committerAlex Dupre <ale@FreeBSD.org>2011-02-08 12:50:45 +0000
commitd0741b37c15e72071d6d91a54b827c98d5f3bb2d (patch)
tree8c8fb201d93c7d42536f5cd75c001d08667eb597
parentUpdate to 5.0.92: (diff)
Update to 5.1.55 release.
Feature safe: yes
Notes
Notes: svn path=/head/; revision=268789
-rw-r--r--databases/mysql51-server/Makefile10
-rw-r--r--databases/mysql51-server/distinfo4
2 files changed, 7 insertions, 7 deletions
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index d6d063cf056e..56bd5792d77e 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME?= mysql
-PORTVERSION= 5.1.54
-PORTREVISION?= 1
+PORTVERSION= 5.1.55
+PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= MySQL-5.1
@@ -96,7 +96,7 @@ WANT_MYSQL_VER= 51
LATEST_LINK= mysql51-server
-CONFLICTS= mysql-server-[34].* mysql-server-5.[02-9].*
+CONFLICTS_INSTALL= mysql-server-[34].* mysql-server-5.[02-9].*
USE_RC_SUBR= mysql-server.sh
@@ -172,7 +172,7 @@ post-install:
.if defined(CLIENT_ONLY)
LATEST_LINK= mysql51-client
-CONFLICTS= mysql-client-[34].* mysql-client-5.[02-9].*
+CONFLICTS_INSTALL= mysql-client-[34].* mysql-client-5.[02-9].*
MAN1= mysql_config.1 mysql_upgrade.1 mysql.1 mysqladmin.1 \
mysqlbinlog.1 mysqlbug.1 mysqlcheck.1 \
@@ -205,7 +205,7 @@ RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
LATEST_LINK= mysql51-scripts
-CONFLICTS= mysql-scripts-[34].* mysql-scripts-5.[02-9].*
+CONFLICTS_INSTALL= mysql-scripts-[34].* mysql-scripts-5.[02-9].*
MAN1= msql2mysql.1 mysql_convert_table_format.1 mysql_find_rows.1 \
mysql_fix_extensions.1 mysql_secure_installation.1 \
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index 53b322b850b6..5a9341839fd4 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mysql-5.1.54.tar.gz) = 84370fffc4fe277645fb3a5040d153ff567576b664f0663452be077826b7ab1f
-SIZE (mysql-5.1.54.tar.gz) = 23672236
+SHA256 (mysql-5.1.55.tar.gz) = b9b62e78fc1ceef6b10acc9464b7a816e364820179b810d14056afec49b08616
+SIZE (mysql-5.1.55.tar.gz) = 23769743