databases/xtrabackup: update to 2.1.4

- Update to 2.1.4
- Remove MySQL references (everything is now inside tarball)
- Add qpress as run dependency for --decompress option

PR:		ports/181255
Submitted by:	Alex Samorukov <samm os2.kiev.ua> (maintainer)

3 files changed, 13 insertions, 80 deletions

diff --git a/databases/xtrabackup/Makefile b/databases/xtrabackup/Makefile
index ba96a17ab6e6..1f8f1d45968a 100644
--- a/databases/xtrabackup/Makefile
+++ b/databases/xtrabackup/Makefile
@@ -2,19 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	xtrabackup
-PORTVERSION=	2.1.3
-PORTREVISION=	1
+PORTVERSION=	2.1.4
 CATEGORIES=	databases
-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
+MASTER_SITES=	http://www.percona.com/downloads/%SUBDIR%/
 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
+DISTFILES=	percona-xtrabackup-${PORTVERSION}.tar.gz
 EXTRACT_ONLY=	percona-xtrabackup-${PORTVERSION}.tar.gz
 
 MAINTAINER=	aleksandr.kuzminsky@percona.com
@@ -28,35 +20,21 @@ BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		bison:${PORTSDIR}/devel/bison
 LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt \
 		gpg-error:${PORTSDIR}/security/libgpg-error
-RUN_DEPENDS=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \
+		qpress:${PORTSDIR}/archivers/qpress
 
 # 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
+USES=		cmake iconv gettext gmake perl5
 
-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
-
-# port needs MySQL sources to build
-MYSQL51_SRCVER=		5.1.59
-MYSQL55_SRCVER=		5.5.16
-MYSQL56_SRCVER=		5.6.10
+MASTER_SITE_SUBDIR=	XtraBackup/XtraBackup-${PORTVERSION}/source/
 
 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}
+	${CP} ${DISTDIR}/percona-xtrabackup-${PORTVERSION}.tar.gz ${WRKSRC}
 
 do-build:
 	cd ${WRKSRC} && ./utils/build.sh xtradb55
diff --git a/databases/xtrabackup/distinfo b/databases/xtrabackup/distinfo
index 0ec60808f7f6..125bb9f1ba5e 100644
--- a/databases/xtrabackup/distinfo
+++ b/databases/xtrabackup/distinfo
@@ -1,12 +1,2 @@
-SHA256 (mysql-5.1.59.tar.gz) = f87b99b73c0d936ed892326ebd4c90b1d5c7d5d2ac8832fc62f538db99fb04f7
-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 (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
-SIZE (Percona-Server-5.5.16-22.0-patches.tar.gz) = 1141266
+SHA256 (percona-xtrabackup-2.1.4.tar.gz) = bb0d99915458635d4f852f89412417edb7928755f76ec5a9219e67af8eadada7
+SIZE (percona-xtrabackup-2.1.4.tar.gz) = 137107631
diff --git a/databases/xtrabackup/files/patch-build.sh b/databases/xtrabackup/files/patch-build.sh
index 7b890e129d8f..9548be0c357a 100644
--- a/databases/xtrabackup/files/patch-build.sh
+++ b/databases/xtrabackup/files/patch-build.sh
@@ -1,6 +1,6 @@
---- 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 @@
+--- utils/build.sh	2013-08-01 15:26:37.000000000 +0200
++++ utils/build.sh	2013-08-13 08:52:57.520334456 +0200
+@@ -289,6 +289,7 @@
                  -DWITH_EXTRA_CHARSETS=all \
                  -DWITH_EMBEDDED_SERVER=1 \
                  -DENABLE_DTRACE=OFF $extra_config_55plus"
@@ -8,38 +8,3 @@
          build_all $type
          ;;
  
-@@ -316,9 +317,14 @@
- 	    bzr revert
- 	    bzr pull --overwrite
- 	else
--	    bzr branch -r tag:Percona-Server-$PS_51_VERSION \
--		lp:percona-server/5.1 $branch_dir
-+	    #bzr branch -r tag:Percona-Server-$PS_51_VERSION \
-+	#	lp:percona-server/5.1 $branch_dir
-+	    tar -xvzf Percona-Server-${PS_51_VERSION}-patches.tar.gz
-+	    ln -sf Percona-Server-${PS_51_VERSION}-patches $branch_dir
-+	    ln  mysql-${MYSQL_51_VERSION}.tar.gz $branch_dir
- 	    cd $branch_dir
-+	    #fix for cmake, from https://bugs.launchpad.net/percona-xtradb/+bug/666223
-+	    sed -i .orig 's/inline void _increment_page_get_statistics/void _increment_page_get_statistics/' patches/innodb_extend_slow.patch
- 	fi
- 
- 	$MAKE_CMD main
-@@ -370,9 +376,15 @@
- 	    bzr revert
- 	    bzr pull --overwrite
- 	else
--	    bzr branch -r tag:Percona-Server-$PS_55_VERSION \
--		lp:percona-server $branch_dir
-+#	    bzr branch -r tag:Percona-Server-$PS_55_VERSION \
-+#		lp:percona-server $branch_dir
-+	    tar -xvzf Percona-Server-${PS_55_VERSION}-patches.tar.gz
-+	    ln -sf Percona-Server-${PS_55_VERSION}-patches $branch_dir
-+	    ln mysql-5.5.16.tar.gz $branch_dir
- 	    cd $branch_dir
-+	    #fix for cmake, from https://bugs.launchpad.net/percona-xtradb/+bug/666223
-+	    sed -i .orig 's/inline void _increment_page_get_statistics/void _increment_page_get_statistics/' patches/innodb_extend_slow.patch
-+
- 	fi
- 
- 	$MAKE_CMD PERCONA_SERVER=Percona-Server-5.5 main