svn commit: r305778 - in head/databases: mysql55-client/files mysql55-server

[Alex Dupre]

Author: ale
Date: Fri Oct 12 13:44:59 2012
New Revision: 305778
URL: http://svn.freebsd.org/changeset/ports/305778

Log:
  Update to 5.5.28 release and switch to OptionsNG.
  
  Feature safe:	yes

Modified:
  head/databases/mysql55-client/files/patch-CMakeLists.txt
  head/databases/mysql55-server/Makefile
  head/databases/mysql55-server/distinfo

Modified: head/databases/mysql55-client/files/patch-CMakeLists.txt
==============================================================================
--- head/databases/mysql55-client/files/patch-CMakeLists.txt	Fri Oct 12 13:22:20 2012	(r305777)
+++ head/databases/mysql55-client/files/patch-CMakeLists.txt	Fri Oct 12 13:44:59 2012	(r305778)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2010-12-03 18:58:24.000000000 +0100
-+++ CMakeLists.txt	2010-12-23 17:01:52.000000000 +0100
-@@ -292,27 +292,11 @@
+--- CMakeLists.txt.orig	2012-08-29 10:50:46.000000000 +0200
++++ CMakeLists.txt	2012-10-12 15:29:18.000000000 +0200
+@@ -304,30 +304,11 @@
  ENDIF()
  
  ADD_SUBDIRECTORY(extra)
@@ -24,6 +24,9 @@
 -  IF(UNIX)
 -    ADD_SUBDIRECTORY(man)
 -  ENDIF()
+-  IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
+-    ADD_SUBDIRECTORY(internal)
+-  ENDIF()
 -ENDIF()
 +ADD_SUBDIRECTORY(client)
 +ADD_SUBDIRECTORY(libservices)
@@ -33,7 +36,7 @@
  
  INCLUDE(cmake/abi_check.cmake)
  INCLUDE(cmake/tags.cmake)
-@@ -338,11 +322,11 @@
+@@ -371,11 +352,11 @@
  
  INCLUDE(CPack)
  IF(UNIX)
@@ -46,7 +49,7 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES COPYING LICENSE.mysql 
    DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -367,3 +351,4 @@
+@@ -401,3 +382,4 @@
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
  ENDIF()

Modified: head/databases/mysql55-server/Makefile
==============================================================================
--- head/databases/mysql55-server/Makefile	Fri Oct 12 13:22:20 2012	(r305777)
+++ head/databases/mysql55-server/Makefile	Fri Oct 12 13:44:59 2012	(r305778)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	MySQL-server
-# Date created:				28 Jan 2006
-# Whom:					Alex Dupre <ale at FreeBSD.org>
-#
+# Created by: Alex Dupre <ale at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME?=	mysql
-PORTVERSION=	5.5.27
+PORTVERSION=	5.5.28
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -19,9 +15,12 @@ COMMENT?=	Multithreaded SQL database (se
 SLAVEDIRS=	databases/mysql55-client
 USE_CMAKE=	yes
 MAKE_JOBS_SAFE=	yes
+NO_OPTIONS_SORT=yes
 
-OPTIONS=	OPENSSL "Enable SSL support" on \
-		FASTMTX "Replace mutexes with spinlocks" off
+OPTIONS_DEFINE=	SSL FASTMTX
+OPTIONS_DEFAULT=SSL
+
+FASTMTX_DESC=	Replace mutexes with spinlocks
 
 CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
@@ -47,10 +46,10 @@ CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_OPENSSL)
+.if ${PORT_OPTIONS:MSSL}
 CMAKE_ARGS+=	-DWITH_SSL=bundled
 .endif
-.if defined(WITH_FASTMTX)
+.if ${PORT_OPTIONS:MFASTMTX}
 CMAKE_ARGS+=	-DWITH_FAST_MUTEXES=1
 .endif
 

Modified: head/databases/mysql55-server/distinfo
==============================================================================
--- head/databases/mysql55-server/distinfo	Fri Oct 12 13:22:20 2012	(r305777)
+++ head/databases/mysql55-server/distinfo	Fri Oct 12 13:44:59 2012	(r305778)
@@ -1,2 +1,2 @@
-SHA256 (mysql-5.5.27.tar.gz) = 51ffafbd82039f8afbe5b3c26f15cc338ed6cd4f67e56d7dd33efaa28c9d99e4
-SIZE (mysql-5.5.27.tar.gz) = 24667156
+SHA256 (mysql-5.5.28.tar.gz) = f9b2491f1ddd99842a8e75c21958368bebe59c47e84bec778baa915e255cc78f
+SIZE (mysql-5.5.28.tar.gz) = 24739429