Date: Wed, 8 May 2019 20:04:26 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r501046 - in head/databases: mariadb101-client mariadb101-server Message-ID: <201905082004.x48K4QJ6056076@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Wed May 8 20:04:25 2019 New Revision: 501046 URL: https://svnweb.freebsd.org/changeset/ports/501046 Log: databases/mariadb101-server: Update to 10.1.40 - Clean up Makefiles - Reduce -client to bare minimum Modified: head/databases/mariadb101-client/Makefile head/databases/mariadb101-server/Makefile head/databases/mariadb101-server/distinfo Modified: head/databases/mariadb101-client/Makefile ============================================================================== --- head/databases/mariadb101-client/Makefile Wed May 8 20:02:01 2019 (r501045) +++ head/databases/mariadb101-client/Makefile Wed May 8 20:04:25 2019 (r501046) @@ -11,31 +11,4 @@ FILESDIR= ${.CURDIR}/files PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist -CMAKE_ARGS+= -DWITHOUT_SERVER=1 -INSTALL_TARGET= install - -USE_LDCONFIG= ${PREFIX}/lib/mysql - -CLIENT_ONLY= yes - -post-install: - ${RM} ${STAGEDIR}${PREFIX}/bin/wsrep* - ${RM} ${STAGEDIR}${PREFIX}/bin/mysqld_safe_helper - ${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4 - ${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig - ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private -. for b in mysql mysqladmin mysqlbinlog mysqlcheck mysqldump \ - mysqlimport mysqlshow mysqlslap - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${b} -. endfor - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so.18 -. for b in dialog.so mysql_clear_password.so client_ed25519.so - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/${b} -. endfor - # Fix https://mariadb.atlassian.net/browse/MDEV-9388 - @${REINPLACE_CMD} 's/-l-pthread/-lpthread/' ${STAGEDIR}${PREFIX}/bin/mysql_config - -post-install-GSSAPI_NONE: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so - .include "${MASTERDIR}/Makefile" Modified: head/databases/mariadb101-server/Makefile ============================================================================== --- head/databases/mariadb101-server/Makefile Wed May 8 20:02:01 2019 (r501045) +++ head/databases/mariadb101-server/Makefile Wed May 8 20:04:25 2019 (r501046) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.1.39 +PORTVERSION= 10.1.40 PORTREVISION= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ @@ -39,7 +39,7 @@ OPTIONS_DEFAULT= GSSAPI_BASE FASTMTX_DESC= Replace mutexes with spinlocks -.if !defined(CLIENT_ONLY) +.if ${PKGNAMESUFFIX:M*-server} # MySQL-Server options OPTIONS_DEFINE+= CONNECT_EXTRA MAXKEY DOCS OPTIONS_DEFAULT+= MAXKEY SPHINX SPIDER @@ -64,10 +64,6 @@ TOKUDB_DESC= Fractal tree index tree data structure en ZMQ_DESC= ZeroMQ support .endif -GSSAPI_BASE_USES= gssapi -GSSAPI_HEIMDAL_USES= gssapi:heimdal -GSSAPI_MIT_USES= gssapi:mit - CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ @@ -83,11 +79,11 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR= \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ - -DWITH_UNIT_TESTS=0 \ - -DWITH_LIBWRAP=1 \ -DWITH_SSL=${OPENSSLBASE} \ -DKRB5_CONFIG=${KRB5CONFIG} \ -DCOMPILATION_COMMENT="FreeBSD Ports" +CMAKE_ON+= WITH_LIBWRAP +CMAKE_OFF+= WITH_UNIT_TESTS DATADIR= ${PREFIX}/share/mysql @@ -101,27 +97,29 @@ CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]* mysqlwsrep* \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* -FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 +FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES +GSSAPI_BASE_USES= gssapi +GSSAPI_HEIMDAL_USES= gssapi:heimdal +GSSAPI_MIT_USES= gssapi:mit OPTIONS_SUB= yes -.if defined(CLIENT_ONLY) +.if ${PKGNAMESUFFIX:M*-client} # MySQL-Client part USES+= readline +USE_LDCONFIG= ${PREFIX}/lib/mysql +CMAKE_ON+= WITHOUT_SERVER GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=NO .else # MySQL-Server part BROKEN_powerpc64= Does not build: fatal error: sys/platform/ppc.h: No such file or directory -#LIB_DEPENDS= libevent.so:devel/libevent USES+= mysql:101m USE_GNOME= libxml2 USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql -CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ - -DPLUGIN_AUTH_GSSAPI_CLIENT=NO \ - -DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \ - -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 +CMAKE_ARGS+= -DPLUGIN_AUTH_GSSAPI_CLIENT=NO +CMAKE_ON+= WITH_EMBEDDED_SERVER CMAKE_SKIP_BUILD_RPATH WITHOUT_EXAMPLE_STORAGE_ENGINE .for ENGINE in ${OPTIONS_GROUP_ENGINES} ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO @@ -129,13 +127,12 @@ ${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC .endfor CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC +CONNECT_EXTRA_USES= gnome CONNECT_EXTRA_USE= gnome=libxml2 GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO -LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF -LZ4_CMAKE_ON= -DGRN_WITH_LZ4=${LOCALBASE}/lib -DWITH_INNODB_LZ4=${LOCALBASE}/lib +LZ4_CMAKE_BOOL= GRN_WITH_LZ4 WITH_INNODB_LZ4 LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 -LZO_CMAKE_OFF= -DWITH_INNODB_LZO=OFF -LZO_CMAKE_ON= -DWITH_INNODB_LZO=${LOCALBASE}/lib +LZO_CMAKE_BOOL= WITH_INNODB_LZO LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h MROONGA_LIB_DEPENDS= liblz4.so:archivers/liblz4 @@ -143,37 +140,14 @@ MROONGA_VARS= LICENSE+=LGPL20 LICENSE_COMB=multi MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy -SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF -SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=${LOCALBASE}/lib +SNAPPY_CMAKE_BOOL= WITH_INNODB_SNAPPY SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy TOKUDB_IMPLIES= SNAPPY TOKUDB_PORTDOCS= README.md TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 +.endif # ${PKGNAMESUFFIX:M*-client} -post-install: -# Remove programs to avoid conflict with mariadb101-client -# These are "client" components, so there should be a switch that -# prevents them from being installed but it's unknown right now - ${RM} ${STAGEDIR}${PREFIX}/bin/msql2mysql \ - ${STAGEDIR}${PREFIX}/bin/mysql_config \ - ${STAGEDIR}${PREFIX}/bin/mysql_find_rows \ - ${STAGEDIR}${PREFIX}/bin/mysqlaccess \ - ${STAGEDIR}${PREFIX}/lib/mysql/plugin/client_ed25519.so \ - ${STAGEDIR}${PREFIX}/share/groonga-normalizer-mysql/lgpl-2.0.txt \ - ${STAGEDIR}${PREFIX}/share/groonga/COPYING \ - ${STAGEDIR}${DATADIR}/mroonga/COPYING - ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \ - ${STAGEDIR}${PREFIX}/share/pkgconfig \ - ${STAGEDIR}${PREFIX}/mysql/mysql-test \ - ${STAGEDIR}${PREFIX}/mysql/sql-bench - -post-install-MROONGA-on: - ${MV} ${STAGEDIR}${PREFIX}/share/groonga-normalizer-mysql \ - ${STAGEDIR}${PREFIX}/share/groonga \ - ${STAGEDIR}${PREFIX}/share/mysql -.endif # defined(CLIENT_ONLY) - .include <bsd.port.options.mk> .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 @@ -200,5 +174,37 @@ post-patch: ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake .endif + + +.if ${PKGNAMESUFFIX:M*-client} +post-install: + ${RM} ${STAGEDIR}${PREFIX}/bin/wsrep* + ${RM} ${STAGEDIR}${PREFIX}/bin/mysqld_safe_helper + ${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4 + ${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig + ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private +.else +post-install: +# Remove programs to avoid conflict with mariadb101-client +# These are "client" components, so there should be a switch that +# prevents them from being installed but it's unknown right now + ${RM} ${STAGEDIR}${PREFIX}/bin/msql2mysql \ + ${STAGEDIR}${PREFIX}/bin/mysql_config \ + ${STAGEDIR}${PREFIX}/bin/mysql_find_rows \ + ${STAGEDIR}${PREFIX}/bin/mysqlaccess \ + ${STAGEDIR}${PREFIX}/lib/mysql/plugin/client_ed25519.so \ + ${STAGEDIR}${PREFIX}/share/groonga-normalizer-mysql/lgpl-2.0.txt \ + ${STAGEDIR}${PREFIX}/share/groonga/COPYING \ + ${STAGEDIR}${DATADIR}/mroonga/COPYING + ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \ + ${STAGEDIR}${PREFIX}/share/pkgconfig \ + ${STAGEDIR}${PREFIX}/mysql/mysql-test \ + ${STAGEDIR}${PREFIX}/mysql/sql-bench + +post-install-MROONGA-on: + ${MV} ${STAGEDIR}${PREFIX}/share/groonga-normalizer-mysql \ + ${STAGEDIR}${PREFIX}/share/groonga \ + ${STAGEDIR}${PREFIX}/share/mysql +.endif # ${PKGNAMESUFFIX:M*-client} .include <bsd.port.post.mk> Modified: head/databases/mariadb101-server/distinfo ============================================================================== --- head/databases/mariadb101-server/distinfo Wed May 8 20:02:01 2019 (r501045) +++ head/databases/mariadb101-server/distinfo Wed May 8 20:04:25 2019 (r501046) @@ -1,3 +1,3 @@ -TIMESTAMP = 1556892764 -SHA256 (mariadb-10.1.39.tar.gz) = 6ebaa9424707b8f45ad45eaad37df0d39e77fc965309786d298d6baf3bd93a7e -SIZE (mariadb-10.1.39.tar.gz) = 63577702 +TIMESTAMP = 1557341221 +SHA256 (mariadb-10.1.40.tar.gz) = 91757a7e52b88b8ddbf150ac55746e9dd1978b06c03303f114e57980ed2a67a4 +SIZE (mariadb-10.1.40.tar.gz) = 63573615
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905082004.x48K4QJ6056076>