Date: Sat, 7 Nov 2020 10:09:38 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554377 - in head/databases/xtrabackup8: . files Message-ID: <202011071009.0A7A9cSF041001@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Sat Nov 7 10:09:38 2020 New Revision: 554377 URL: https://svnweb.freebsd.org/changeset/ports/554377 Log: - Do not install manpages, they belong to third-party software and make the package conflict with other packages (of that software) - Register installation conflict with port that serves version 2.4 - Empty directories should be pruned with rmdir(1), not ``rm -rf'' Added: head/databases/xtrabackup8/files/patch-CMakeLists.txt (contents, props changed) Modified: head/databases/xtrabackup8/Makefile head/databases/xtrabackup8/pkg-plist Modified: head/databases/xtrabackup8/Makefile ============================================================================== --- head/databases/xtrabackup8/Makefile Sat Nov 7 10:09:30 2020 (r554376) +++ head/databases/xtrabackup8/Makefile Sat Nov 7 10:09:38 2020 (r554377) @@ -3,6 +3,7 @@ PORTNAME= xtrabackup PORTVERSION= 8.0.14 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= https://www.percona.com/downloads/Percona-XtraBackup-${PORTVERSION:R}/Percona-XtraBackup-${PORTVERSION}/source/tarball/ \ https://github.com/percona/percona-xtrabackup/archive/ @@ -29,6 +30,8 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libzstd.so:archivers/zstd RUN_DEPENDS= qpress:archivers/qpress +CONFLICTS_INSTALL= ${PORTNAME} + USES= bison cmake compiler:c++14-lang cpe pkgconfig ssl CPE_VENDOR= percona CMAKE_ARGS= -DBUILD_CONFIG:STRING=xtrabackup_release @@ -44,7 +47,7 @@ post-patch: @${MV} ${WRKSRC}/lz4 ${WRKSRC}/extra post-stage: - @${RM} -r ${STAGEDIR}${PREFIX}/docs \ - ${STAGEDIR}${PREFIX}/lib/plugin/debug + @${RM} -r ${STAGEDIR}${PREFIX}/docs + @${RMDIR} ${STAGEDIR}${PREFIX}/lib/plugin/debug .include <bsd.port.mk> Added: head/databases/xtrabackup8/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/xtrabackup8/files/patch-CMakeLists.txt Sat Nov 7 10:09:38 2020 (r554377) @@ -0,0 +1,13 @@ +--- CMakeLists.txt.orig 2020-08-28 21:02:32 UTC ++++ CMakeLists.txt +@@ -1575,10 +1575,6 @@ IF(ENABLE_GCOV) + INCLUDE(fastcov) + ENDIF() + +-IF(UNIX) +- ADD_SUBDIRECTORY(man) +-ENDIF() +- + IF(NOT WITHOUT_SERVER) + ADD_SUBDIRECTORY(packaging/rpm-common) + ADD_SUBDIRECTORY(packaging/rpm-oel) Modified: head/databases/xtrabackup8/pkg-plist ============================================================================== --- head/databases/xtrabackup8/pkg-plist Sat Nov 7 10:09:30 2020 (r554376) +++ head/databases/xtrabackup8/pkg-plist Sat Nov 7 10:09:38 2020 (r554377) @@ -6,42 +6,3 @@ bin/xtrabackup lib/libmysqlservices.a lib/plugin/keyring_file.so lib/plugin/keyring_vault.so -man/man1/comp_err.1.gz -man/man1/ibd2sdi.1.gz -man/man1/innochecksum.1.gz -man/man1/lz4_decompress.1.gz -man/man1/my_print_defaults.1.gz -man/man1/myisam_ftdump.1.gz -man/man1/myisamchk.1.gz -man/man1/myisamlog.1.gz -man/man1/myisampack.1.gz -man/man1/mysql.1.gz -man/man1/mysql.server.1.gz -man/man1/mysql_config.1.gz -man/man1/mysql_config_editor.1.gz -man/man1/mysql_secure_installation.1.gz -man/man1/mysql_ssl_rsa_setup.1.gz -man/man1/mysql_tzinfo_to_sql.1.gz -man/man1/mysql_upgrade.1.gz -man/man1/mysqladmin.1.gz -man/man1/mysqlbinlog.1.gz -man/man1/mysqlcheck.1.gz -man/man1/mysqld_multi.1.gz -man/man1/mysqld_safe.1.gz -man/man1/mysqldump.1.gz -man/man1/mysqldumpslow.1.gz -man/man1/mysqlimport.1.gz -man/man1/mysqlman.1.gz -man/man1/mysqlpump.1.gz -man/man1/mysqlrouter.1.gz -man/man1/mysqlrouter_keyring.1.gz -man/man1/mysqlrouter_passwd.1.gz -man/man1/mysqlrouter_plugin_info.1.gz -man/man1/mysqlshow.1.gz -man/man1/mysqlslap.1.gz -man/man1/perror.1.gz -man/man1/zlib_decompress.1.gz -man/man8/mysqld.8.gz -man/man8/ndb_mgmd.8.gz -man/man8/ndbd.8.gz -man/man8/ndbmtd.8.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011071009.0A7A9cSF041001>