Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Jul 2013 17:57:17 +0000 (UTC)
From:      William Grzybowski <wg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r322283 - in head/databases/xtrabackup: . files
Message-ID:  <201307041757.r64HvILU087549@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: wg
Date: Thu Jul  4 17:57:17 2013
New Revision: 322283
URL: http://svnweb.freebsd.org/changeset/ports/322283

Log:
  databases/xtrabackup: update to 2.1.3
  
  - Update to 2.1.3 [1]
  - USES cmake
  - Unmute install commands
  
  Changelog: https://launchpad.net/percona-xtrabackup/+milestone/2.1.3
  
  PR:		ports/180224 [1]
  Submitted by:	Alex Samorukov <samm@os2.kiev.ua>
  Approved by:	maintainer

Modified:
  head/databases/xtrabackup/Makefile
  head/databases/xtrabackup/distinfo
  head/databases/xtrabackup/files/patch-build.sh
  head/databases/xtrabackup/pkg-descr

Modified: head/databases/xtrabackup/Makefile
==============================================================================
--- head/databases/xtrabackup/Makefile	Thu Jul  4 16:57:39 2013	(r322282)
+++ head/databases/xtrabackup/Makefile	Thu Jul  4 17:57:17 2013	(r322283)
@@ -2,15 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	xtrabackup
-PORTVERSION=	2.0.3
+PORTVERSION=	2.1.3
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_MYSQL_GRP} \
-		http://downloads.skysql.com/archives/mysql-5.5/:mysql55 \
-		http://downloads.mysql.com/archives/mysql-5.5/:mysql55 \
+MASTER_SITES=	http://downloads.skysql.com/archives/%SUBDIR%/:mysql51,mysql55,mysql56 \
+		http://downloads.mysql.com/archives/%SUBDIR%/:mysql51,mysql55,mysql56 \
 		http://www.percona.com/downloads/%SUBDIR%/:xtrabackup,percsrc51,percsrc55 \
 		http://samm.kiev.ua/percona/:percsrc51,percsrc55
 DISTNAME=	percona-${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 DISTFILES=	mysql-${MYSQL51_SRCVER}.tar.gz:mysql51 mysql-${MYSQL55_SRCVER}.tar.gz:mysql55 \
+		mysql-${MYSQL56_SRCVER}.tar.gz:mysql56 \
 		percona-xtrabackup-${PORTVERSION}.tar.gz:xtrabackup \
 		Percona-Server-5.1.59-13.0-patches.tar.gz:percsrc51 \
 		Percona-Server-5.5.16-22.0-patches.tar.gz:percsrc55
@@ -21,19 +21,22 @@ COMMENT=	OpenSource version of InnoDB ba
 
 LICENSE=	GPLv2
 
-# MySQL 5.5 using CMAKE, quilt is requiered by build.sh
-BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash quilt:${PORTSDIR}/devel/quilt \
-		cmake:${PORTSDIR}/devel/cmake bison:${PORTSDIR}/devel/bison
+# quilt is requiered by build.sh
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
+		quilt:${PORTSDIR}/devel/quilt \
+		bison:${PORTSDIR}/devel/bison
+LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt \
+		gpg-error:${PORTSDIR}/security/libgpg-error
 
 # autotool is in use for 5.1 builds
 MAKE_JOBS_SAFE=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_AUTOTOOLS=	automake autoheader autoconf libtool aclocal
+# MySQL 5.5 using CMAKE
+USES=		cmake iconv gettext
 
-# use MASTER_SITE_MYSQL for the MySQL 5.1
-MASTER_SITE_MYSQL_GRP=	${MASTER_SITE_MYSQL:S@%SUBDIR%/@%SUBDIR%/:mysql51@g}
-MASTER_SITE_SUBDIR=	MySQL-5.1/:mysql51 \
+MASTER_SITE_SUBDIR=	mysql-5.1/:mysql51 mysql-5.5/:mysql55 mysql-5.6/:mysql56 \
 	XtraBackup/XtraBackup-${PORTVERSION}/source/:xtrabackup \
 	Percona-Server-5.1/Percona-Server-5.1.59-13.0/source/:percsrc51 \
 	Percona-Server-5.5/Percona-Server-5.5.16-22.0/source/:percsrc55
@@ -41,29 +44,33 @@ MASTER_SITE_SUBDIR=	MySQL-5.1/:mysql51 \
 # port needs MySQL sources to build
 MYSQL51_SRCVER=		5.1.59
 MYSQL55_SRCVER=		5.5.16
+MYSQL56_SRCVER=		5.6.10
 
-PLIST_FILES=	bin/xtrabackup bin/xtrabackup_51 bin/xtrabackup_55 bin/xbstream bin/innobackupex
+PLIST_FILES=	bin/xtrabackup bin/xtrabackup_55 bin/xtrabackup_56 bin/xbstream \
+	bin/innobackupex bin/xbcrypt
 
 pre-build:
 	${CP} ${DISTDIR}/percona-xtrabackup-${PORTVERSION}.tar.gz \
 	${DISTDIR}/mysql-${MYSQL51_SRCVER}.tar.gz ${DISTDIR}/mysql-${MYSQL55_SRCVER}.tar.gz \
+	${DISTDIR}/mysql-${MYSQL56_SRCVER}.tar.gz \
 	${DISTDIR}/Percona-Server-5.1.59-13.0-patches.tar.gz \
 	${DISTDIR}/Percona-Server-5.5.16-22.0-patches.tar.gz ${WRKSRC}
 
 do-build:
-	cd ${WRKSRC} && ./utils/build.sh 5.1
-	${CP} ${WRKSRC}/src/xtrabackup_51 ${WRKSRC}/src/xbstream ${WRKSRC}
-	cd ${WRKSRC} && ./utils/build.sh xtradb
-	${CP} ${WRKSRC}/src/xtrabackup ${WRKSRC}
 	cd ${WRKSRC} && ./utils/build.sh xtradb55
 	${CP} ${WRKSRC}/src/xtrabackup_55 ${WRKSRC}
+	cd ${WRKSRC} && ./utils/build.sh innodb56
+	${CP} ${WRKSRC}/src/xtrabackup_56 ${WRKSRC}
+	cd ${WRKSRC} && ./utils/build.sh xtradb
+	${CP} ${WRKSRC}/src/xtrabackup ${WRKSRC}
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/xtrabackup ${PREFIX}/bin
-	@${INSTALL_PROGRAM} ${WRKSRC}/xtrabackup_55 ${PREFIX}/bin
-	@${INSTALL_PROGRAM} ${WRKSRC}/xtrabackup_51 ${PREFIX}/bin
-	@${INSTALL_PROGRAM} ${WRKSRC}/xbstream ${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/innobackupex ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/xtrabackup ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/xtrabackup_55 ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/xtrabackup_56 ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/xbstream ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/xbcrypt ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/innobackupex ${PREFIX}/bin
 
 # autoconf is running by build.sh
 do-configure:

Modified: head/databases/xtrabackup/distinfo
==============================================================================
--- head/databases/xtrabackup/distinfo	Thu Jul  4 16:57:39 2013	(r322282)
+++ head/databases/xtrabackup/distinfo	Thu Jul  4 17:57:17 2013	(r322283)
@@ -2,8 +2,10 @@ SHA256 (mysql-5.1.59.tar.gz) = f87b99b73
 SIZE (mysql-5.1.59.tar.gz) = 24325443
 SHA256 (mysql-5.5.16.tar.gz) = 38a88d5f3a4e0ab1c6722662a2c858c63fd98f0925691400282cb23f1ea29b70
 SIZE (mysql-5.5.16.tar.gz) = 23816508
-SHA256 (percona-xtrabackup-2.0.3.tar.gz) = a53798f73bf517b4b262d006e90aebcfa4a0690742461722c1e77d7c86eda970
-SIZE (percona-xtrabackup-2.0.3.tar.gz) = 11179598
+SHA256 (mysql-5.6.10.tar.gz) = 156c43a7bde1ada8552938c6b8f46162b568bca8ddb76998a645308d93fb70b6
+SIZE (mysql-5.6.10.tar.gz) = 35174149
+SHA256 (percona-xtrabackup-2.1.3.tar.gz) = 10c089ac0ad90ac9fc868a36577ba02c6f6b4a488dac716fc4ecb81c107a21d8
+SIZE (percona-xtrabackup-2.1.3.tar.gz) = 11267387
 SHA256 (Percona-Server-5.1.59-13.0-patches.tar.gz) = 76f9398d1637c9cfc1b64e35cd272b70ddc71cfb6f00abd2fe6e62918fa920b5
 SIZE (Percona-Server-5.1.59-13.0-patches.tar.gz) = 1203994
 SHA256 (Percona-Server-5.5.16-22.0-patches.tar.gz) = 30d14443027cbcef4266385adfeb385af62cf5551ca044ae83539673497be4be

Modified: head/databases/xtrabackup/files/patch-build.sh
==============================================================================
--- head/databases/xtrabackup/files/patch-build.sh	Thu Jul  4 16:57:39 2013	(r322282)
+++ head/databases/xtrabackup/files/patch-build.sh	Thu Jul  4 17:57:17 2013	(r322283)
@@ -1,6 +1,14 @@
---- utils/build.sh	2012-02-10 15:54:51.000000000 +0100
-+++ utils/build.sh	2012-03-16 20:53:58.366366222 +0100
-@@ -225,9 +225,14 @@
+--- utils/build.sh	2013-05-22 19:00:32.000000000 +0200
++++ utils/build.sh	2013-07-02 21:36:25.534672963 +0200
+@@ -281,6 +281,7 @@
+                 -DWITH_EXTRA_CHARSETS=all \
+                 -DWITH_EMBEDDED_SERVER=1 \
+                 -DENABLE_DTRACE=OFF $extra_config_55plus"
++        export LIBS=-lcrypt
+         build_all $type
+         ;;
+ 
+@@ -316,9 +317,14 @@
  	    bzr revert
  	    bzr pull --overwrite
  	else
@@ -17,7 +25,7 @@
  	fi
  
  	$MAKE_CMD main
-@@ -283,9 +288,15 @@
+@@ -370,9 +376,15 @@
  	    bzr revert
  	    bzr pull --overwrite
  	else

Modified: head/databases/xtrabackup/pkg-descr
==============================================================================
--- head/databases/xtrabackup/pkg-descr	Thu Jul  4 16:57:39 2013	(r322282)
+++ head/databases/xtrabackup/pkg-descr	Thu Jul  4 17:57:17 2013	(r322283)
@@ -1,6 +1,6 @@
 Percona XtraBackup is OpenSource online (non-blockable) backup solution for
 InnoDB and XtraDB engines. It can back up data from InnoDB, XtraDB, and MyISAM
-tables on unmodified MySQL 5.0, 5.1 and 5.5 servers, as well as Percona Server
+tables on unmodified MySQL 5.1, 5.5 and 5.6 servers, as well as Percona Server
 with XtraDB.
 
 WWW: http://www.percona.com/doc/percona-xtrabackup/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307041757.r64HvILU087549>