2 files changed, 25 insertions, 19 deletions

diff --git a/databases/xtrabackup/Makefile b/databases/xtrabackup/Makefile
index 30940dce9e1b..712c67e27a89 100644
--- a/databases/xtrabackup/Makefile
+++ b/databases/xtrabackup/Makefile
@@ -6,19 +6,20 @@
 #
 
 PORTNAME=	xtrabackup
-PORTVERSION=	1.6.6
+PORTVERSION=	2.0.1
 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 \
-		http://www.percona.com/downloads/%SUBDIR%/:xtrabackup,libtar,percsrc51,percsrc55 \
-		http://samm.kiev.ua/percona/:percsrc51,percsrc55 \
-		ftp://ftp.feep.net/pub/software/libtar/:libtar
+		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 \
-		xtrabackup-${PORTVERSION}.tar.gz:xtrabackup libtar-1.2.11.tar.gz:libtar \
+		mysql-${MYSQL55PERCONA_SRCVER}.tar.gz:mysql55 \
+		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
-EXTRACT_ONLY=	xtrabackup-${PORTVERSION}.tar.gz
+EXTRACT_ONLY=	percona-xtrabackup-${PORTVERSION}.tar.gz
 
 MAINTAINER=	aleksandr.kuzminsky@percona.com
 COMMENT=	OpenSource version of InnoDB backup with support of Percona extensions
@@ -37,34 +38,39 @@ USE_AUTOTOOLS=	automake autoheader autoconf libtool aclocal
 
 # 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 community/:libtar \
+MASTER_SITE_SUBDIR=	MySQL-5.1/:mysql51 \
 	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
 
 # port needs MySQL sources to build
-MYSQL51_SRCVER=5.1.59
-MYSQL55_SRCVER=5.5.16
+MYSQL51_SRCVER=		5.1.59
+MYSQL55_SRCVER=		5.5.17
+MYSQL55PERCONA_SRCVER=	5.5.16
 
-PLIST_FILES=	bin/xtrabackup bin/xtrabackup_51 bin/xtrabackup_55 bin/tar4ibd bin/innobackupex
+PLIST_FILES=	bin/xtrabackup bin/xtrabackup_51 bin/xtrabackup_55 bin/xbstream bin/innobackupex
 
 pre-build:
-	${CP} ${DISTDIR}/xtrabackup-${PORTVERSION}.tar.gz ${DISTDIR}/libtar-1.2.11.tar.gz \
+	${CP} ${DISTDIR}/percona-xtrabackup-${PORTVERSION}.tar.gz \
 	${DISTDIR}/mysql-${MYSQL51_SRCVER}.tar.gz ${DISTDIR}/mysql-${MYSQL55_SRCVER}.tar.gz \
+	${DISTDIR}/mysql-${MYSQL55PERCONA_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}
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/Percona-Server/storage/innodb_plugin/xtrabackup/xtrabackup ${PREFIX}/bin
-	@${INSTALL_PROGRAM} ${WRKSRC}/Percona-Server-5.5/storage/innobase/xtrabackup/xtrabackup_55 ${PREFIX}/bin
-	@${INSTALL_PROGRAM} ${WRKSRC}/mysql-5.1/storage/innobase/xtrabackup/xtrabackup_51 ${PREFIX}/bin
+	@${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}/libtar-1.2.11/libtar/tar4ibd ${PREFIX}/bin
 
 # autoconf is running by build.sh
 do-configure:
diff --git a/databases/xtrabackup/distinfo b/databases/xtrabackup/distinfo
index 348f4c70de40..ece9a105dad2 100644
--- a/databases/xtrabackup/distinfo
+++ b/databases/xtrabackup/distinfo
@@ -1,11 +1,11 @@
 SHA256 (mysql-5.1.59.tar.gz) = f87b99b73c0d936ed892326ebd4c90b1d5c7d5d2ac8832fc62f538db99fb04f7
 SIZE (mysql-5.1.59.tar.gz) = 24325443
+SHA256 (mysql-5.5.17.tar.gz) = 8b3c66d7ddb2c5b5fcda28964c1fcd83128d1d48efd7fb2b23338819a50911f1
+SIZE (mysql-5.5.17.tar.gz) = 24213337
 SHA256 (mysql-5.5.16.tar.gz) = 38a88d5f3a4e0ab1c6722662a2c858c63fd98f0925691400282cb23f1ea29b70
 SIZE (mysql-5.5.16.tar.gz) = 23816508
-SHA256 (xtrabackup-1.6.6.tar.gz) = 66760a9e7332ff59d903229e2bb34555a2474cc0dd4e3bd844f6a344296d8d69
-SIZE (xtrabackup-1.6.6.tar.gz) = 1236531
-SHA256 (libtar-1.2.11.tar.gz) = 4a2eefb6b7088f41de57356e5059cbf1f917509b4a810f7c614625a378e87bb8
-SIZE (libtar-1.2.11.tar.gz) = 145354
+SHA256 (percona-xtrabackup-2.0.1.tar.gz) = 975e18d5e9f8e28cc64e65971f813cd4ac9bd871a9b9329905b0c9ad7311222f
+SIZE (percona-xtrabackup-2.0.1.tar.gz) = 11168048
 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