Commit 43b19491 authored by Matthias Fechner's avatar Matthias Fechner

Update to r536143.

parent 78bcfd9b
#
# MOVED -- A list of (recently) moved or removed ports
#
# $FreeBSD: head/MOVED 535965 2020-05-20 02:27:15Z yuri $
# $FreeBSD: head/MOVED 536142 2020-05-21 18:51:18Z linimon $
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
......@@ -7972,7 +7972,6 @@ www/cakephp21||2016-01-25|Has expired: PHP 5.4 EOL reached
www/cakephp22||2016-01-25|Has expired: PHP 5.4 EOL reached
www/cakephp23||2016-01-25|Has expired: PHP 5.4 EOL reached
www/fluxcms||2016-01-25|Has expired: PHP 5.4 EOL reached
www/fusionpbx||2016-01-25|Has expired: PHP 5.4 EOL reached
www/jawstats||2016-01-25|Has expired: PHP 5.4 EOL reached
www/ojs2||2016-01-25|Has expired: PHP 5.4 EOL reached
www/webcalendar||2016-01-25|Has expired: PHP 5.4 EOL reached
......@@ -20,7 +20,7 @@
#
# Note: all entries should terminate with a slash.
#
# $FreeBSD: head/Mk/bsd.sites.mk 526179 2020-02-14 22:01:01Z mandree $
# $FreeBSD: head/Mk/bsd.sites.mk 536006 2020-05-20 15:49:26Z mat $
#
# Where to put distfiles that don't have any other master site
......@@ -454,8 +454,10 @@ DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${DISTVERSIONFULL}-${GH_TAGNAME_SANITIZED}
. else
DISTNAME= ${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME_SANITIZED}
. endif
DISTNAME:= ${DISTNAME}_GH${_GITHUB_REV}
DISTFILES+= ${DISTNAME}${_GITHUB_EXTRACT_SUFX}
DISTNAME_DEFAULT:= ${DISTNAME}_GH${_GITHUB_REV}
DISTFILE_DEFAULT= ${DISTNAME_DEFAULT}${_GITHUB_EXTRACT_SUFX}
DISTNAME:= ${DISTNAME_DEFAULT}
DISTFILES+= ${DISTFILE_DEFAULT}
git-clone: git-clone-DEFAULT
git-clone-DEFAULT: ${_GITHUB_CLONE_DIR}
@git clone https://github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT_DEFAULT}.git ${_GITHUB_CLONE_DIR}/${GH_PROJECT_DEFAULT}
......
# Created by: Felix Palmen <felix@palmen-it.de>
# $FreeBSD: head/archivers/lib1541img/Makefile 529840 2020-03-29 21:11:13Z pkubaj $
# $FreeBSD: head/archivers/lib1541img/Makefile 536007 2020-05-20 15:49:37Z mat $
PORTNAME= lib1541img
PORTVERSION= 1.1
DISTVERSIONPREFIX= v
CATEGORIES= archivers devel emulators
MAINTAINER= felix@palmen-it.de
......@@ -13,9 +14,9 @@ LICENSE= BSD2CLAUSE
USES= compiler:c11 gmake
USE_GITHUB= yes
GH_PROJECT= ${PORTNAME} zimk:zimk
GH_PROJECT= zimk:zimk
GH_ACCOUNT= excess-c64 Zirias:zimk
GH_TAGNAME= v${PORTVERSION} 31500ca:zimk
GH_TAGNAME= 31500ca:zimk
USE_LDCONFIG= yes
MAKE_ARGS= pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \
......@@ -30,6 +31,6 @@ DOXYGEN_BUILD_DEPENDS= doxygen>0:devel/doxygen
DOXYGEN_ALL_TARGET= html
post-extract:
@${MV} ${WRKDIR}/zimk-*/* ${WRKSRC}/zimk/
@${MV} ${WRKSRC_zimk}/* ${WRKSRC}/zimk/
.include <bsd.port.mk>
TIMESTAMP = 1581093812
SHA256 (excess-c64-lib1541img-1.1-v1.1_GH0.tar.gz) = 360976364c98d64485f8f7aa5630aa7f6f4907e9128bd293c94fbcd2471c0bef
SIZE (excess-c64-lib1541img-1.1-v1.1_GH0.tar.gz) = 73253
SHA256 (excess-c64-lib1541img-v1.1_GH0.tar.gz) = 360976364c98d64485f8f7aa5630aa7f6f4907e9128bd293c94fbcd2471c0bef
SIZE (excess-c64-lib1541img-v1.1_GH0.tar.gz) = 73253
SHA256 (Zirias-zimk-31500ca_GH0.tar.gz) = e0404e600343460320a41efdec3b432fe7bce76518b08225e01264937b0958ea
SIZE (Zirias-zimk-31500ca_GH0.tar.gz) = 12137
# Created by: Radim Kolar <hsn@filez.com>
# $FreeBSD: head/archivers/snappy-java/Makefile 535224 2020-05-14 11:15:14Z pi $
# $FreeBSD: head/archivers/snappy-java/Makefile 536007 2020-05-20 15:49:37Z mat $
# Note to committers:
# With each version update, a new maven repository must be created
# and distributed so build is repeatable and cluster-safe.
......@@ -10,7 +10,7 @@ CATEGORIES= archivers java
MASTER_SITES= LOCAL/pi:repo
PKGNAMESUFFIX= java
DISTFILES+= ${PORTNAME}-${PKGNAMESUFFIX}-repository-${PORTVERSION}${EXTRACT_SUFX}:repo
EXTRACT_ONLY= xerial-${PORTNAME}-${PKGNAMESUFFIX}-${PORTVERSION}_GH0${EXTRACT_SUFX} \
EXTRACT_ONLY= ${DISTFILE_DEFAULT} \
${PORTNAME}-${PKGNAMESUFFIX}-repository-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= language.devel@gmail.com
......@@ -48,8 +48,8 @@ PLIST_FILES= ${JAVAJARDIR}/snappy-java.jar lib/libsnappyjava.so
post-extract:
@${MKDIR} ${WRKSRC}/target
@${RM} ${WRKSRC}/sbt
@${CP} ${DISTDIR}/google-snappy-${PORTVERSION:R}_GH0${EXTRACT_SUFX} ${WRKSRC}/target/snappy-${PORTVERSION:R}${EXTRACT_SUFX}
@${CP} ${DISTDIR}/kiyo-masui-bitshuffle-${BITSHUFFLE_V}_GH0${EXTRACT_SUFX} ${WRKSRC}/target/bitshuffle-${BITSHUFFLE_V}${EXTRACT_SUFX}
@${CP} ${DISTDIR}/${DISTFILE_google} ${WRKSRC}/target/snappy-${PORTVERSION:R}${EXTRACT_SUFX}
@${CP} ${DISTDIR}/${DISTFILE_masui} ${WRKSRC}/target/bitshuffle-${BITSHUFFLE_V}${EXTRACT_SUFX}
do-build:
cd ${WRKSRC} && ${SETENV} JAVA_HOME=${JAVA_HOME} ${MAKE_ENV} \
......
# Created by: Felix Palmen <felix@palmen-it.de>
# $FreeBSD: head/archivers/v1541commander/Makefile 529938 2020-03-31 01:21:31Z linimon $
# $FreeBSD: head/archivers/v1541commander/Makefile 536007 2020-05-20 15:49:37Z mat $
PORTNAME= v1541commander
PORTVERSION= 1.1
DISTVERSIONPREFIX= v
CATEGORIES= archivers emulators
MAINTAINER= felix@palmen-it.de
......@@ -22,9 +23,9 @@ USES= compiler:c++11-lang gmake pkgconfig qt:5 shared-mime-info
USE_QT= core gui network widgets buildtools_build linguisttools_build
USE_GITHUB= yes
GH_PROJECT= ${PORTNAME} zimk:zimk
GH_PROJECT= zimk:zimk
GH_ACCOUNT= excess-c64 Zirias:zimk
GH_TAGNAME= v${PORTVERSION} 31500ca:zimk
GH_TAGNAME= 31500ca:zimk
OPTIONS_DEFINE= DOCS
......@@ -33,6 +34,6 @@ MAKE_ARGS= pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \
ALL_TARGET= strip
post-extract:
@${MV} ${WRKDIR}/zimk-*/* ${WRKSRC}/zimk/
@${MV} ${WRKSRC_zimk}/* ${WRKSRC}/zimk/
.include <bsd.port.mk>
TIMESTAMP = 1581095322
SHA256 (excess-c64-v1541commander-1.1-v1.1_GH0.tar.gz) = a8cbe7136923ce186b53718a5910a008420c7762e3741a2efd46cb1d8e927db7
SIZE (excess-c64-v1541commander-1.1-v1.1_GH0.tar.gz) = 407212
SHA256 (excess-c64-v1541commander-v1.1_GH0.tar.gz) = a8cbe7136923ce186b53718a5910a008420c7762e3741a2efd46cb1d8e927db7
SIZE (excess-c64-v1541commander-v1.1_GH0.tar.gz) = 407212
SHA256 (Zirias-zimk-31500ca_GH0.tar.gz) = e0404e600343460320a41efdec3b432fe7bce76518b08225e01264937b0958ea
SIZE (Zirias-zimk-31500ca_GH0.tar.gz) = 12137
--- src/Features/Feature.h.orig 2020-05-21 10:34:19 UTC
+++ src/Features/Feature.h
@@ -10,6 +10,7 @@ class Feature;
#include <QtCore/QString>
#include <QList>
+#include <QPainterPath>
#define CAST_FEATURE(x) (dynamic_cast<Feature*>(x))
#define CAST_NODE(x) (dynamic_cast<Node*>(x))
--- src/qmapshack/gis/wpt/CGisItemWpt.cpp.orig 2020-05-21 11:11:11 UTC
+++ src/qmapshack/gis/wpt/CGisItemWpt.cpp
@@ -38,6 +38,7 @@
#include <QtWidgets>
#include <QtXml>
+#include <QPainterPath>
IGisItem::key_t CGisItemWpt::keyUserFocus;
QMap<searchProperty_e, CGisItemWpt::fSearch> CGisItemWpt::keywordLambdaMap;
--- src/qmapshack/helpers/CDraw.cpp.orig 2020-05-21 11:11:11 UTC
+++ src/qmapshack/helpers/CDraw.cpp
@@ -24,6 +24,7 @@
#include <QImage>
#include <QPointF>
#include <QtMath>
+#include <QPainterPath>
QPen CDraw::penBorderBlue(QColor(10, 10, 150, 220), 2);
QPen CDraw::penBorderGray(Qt::lightGray, 2);
--- src/qmapshack/map/CMapIMG.cpp.orig 2020-05-21 11:11:11 UTC
+++ src/qmapshack/map/CMapIMG.cpp
@@ -33,6 +33,7 @@
#include "units/IUnit.h"
#include <QtWidgets>
+#include <QPainterPath>
#undef DEBUG_SHOW_SECT_DESC
#undef DEBUG_SHOW_TRE_DATA
--- src/qmapshack/mouse/IMouseSelect.cpp.orig 2020-05-21 11:11:11 UTC
+++ src/qmapshack/mouse/IMouseSelect.cpp
@@ -23,6 +23,7 @@
#include "mouse/IScrOpt.h"
#include <QtWidgets>
+#include <QPainterPath>
IMouseSelect::IMouseSelect(CGisDraw *gis, CCanvas *canvas, CMouseAdapter *mouse)
: IMouse(gis, canvas, mouse)
--- src/qmaptool/helpers/CDraw.cpp.orig 2020-05-21 11:11:11 UTC
+++ src/qmaptool/helpers/CDraw.cpp
@@ -24,6 +24,7 @@
#include <QImage>
#include <QPointF>
#include <QtMath>
+#include <QPainterPath>
QPen CDraw::penBorderBlue(QColor(10,10,150,220),2);
QPen CDraw::penBorderGray(Qt::lightGray,2);
--- src/qmaptool/overlay/COverlayCutMap.cpp.orig 2020-05-21 11:11:11 UTC
+++ src/qmaptool/overlay/COverlayCutMap.cpp
@@ -24,6 +24,8 @@
#include <functional>
#include <QtWidgets>
+#include <QPainterPath>
+
using std::bind;
static inline qreal sqr(qreal a)
# $FreeBSD: head/audio/libaudec/Makefile 535528 2020-05-17 08:39:29Z yuri $
# $FreeBSD: head/audio/libaudec/Makefile 536016 2020-05-20 19:07:11Z yuri $
PORTNAME= libaudec
DISTVERSIONPREFIX= v
......@@ -19,6 +19,8 @@ USE_GITHUB= yes
GH_ACCOUNT= alex-tee
USE_LDCONFIG= yes
MESON_ARGS= -Dbuild-tests=false
PLIST_FILES= bin/audec \
include/audec/audec.h \
lib/libaudec.so \
......
--- meson.build.orig 2020-01-06 04:43:34 UTC
--- meson.build.orig 2020-05-16 11:50:13 UTC
+++ meson.build
@@ -160,7 +160,7 @@ config_h_dep = declare_dependency (
@@ -177,7 +177,7 @@ config_h_dep = declare_dependency (
)
audec_deps += config_h_dep
......@@ -9,3 +9,14 @@
'audec',
sources: srcs,
dependencies: [
@@ -212,7 +212,9 @@ audec_exe = executable (
install: not meson.is_subproject(),
)
-subdir('tests')
+if get_variable('build-tests', true)
+ subdir('tests')
+endif
summary = [
'',
--- plugins/Eq/EqSpectrumView.h.orig 2020-05-21 10:45:40 UTC
+++ plugins/Eq/EqSpectrumView.h
@@ -24,6 +24,7 @@
#define EQSPECTRUMVIEW_H
#include <QPainter>
+#include <QPainterPath>
#include <QWidget>
#include "fft_helpers.h"
--- src/gui/AutomationPatternView.cpp.orig 2020-05-21 10:43:44 UTC
+++ src/gui/AutomationPatternView.cpp
@@ -25,6 +25,7 @@
#include <QMouseEvent>
#include <QPainter>
+#include <QPainterPath>
#include <QMenu>
#include "AutomationEditor.h"
--- src/gui/LmmsStyle.cpp.orig 2020-05-21 10:47:28 UTC
+++ src/gui/LmmsStyle.cpp
@@ -28,6 +28,7 @@
#include <QApplication>
#include <QFrame>
#include <QPainter>
+#include <QPainterPath>
#include <QStyleFactory>
#include <QStyleOption>
--- src/gui/editors/AutomationEditor.cpp.orig 2020-05-21 10:49:08 UTC
+++ src/gui/editors/AutomationEditor.cpp
@@ -35,6 +35,7 @@
#include <QLayout>
#include <QMdiArea>
#include <QPainter>
+#include <QPainterPath>
#include <QScrollBar>
#include <QStyleOption>
#include <QToolTip>
# $FreeBSD: head/audio/polyphone/Makefile 517716 2019-11-16 04:27:09Z yuri $
# $FreeBSD: head/audio/polyphone/Makefile 536087 2020-05-21 08:14:59Z tcberner $
PORTNAME= polyphone
DISTVERSION= 2.2.0
......@@ -21,7 +21,9 @@ LIB_DEPENDS= libFLAC.so:audio/flac \
USES= compiler:c++11-lang desktop-file-utils dos2unix gl gnome pkgconfig qmake:outsource qt:5 shared-mime-info ssl xorg
USE_GITHUB= yes
GH_ACCOUNT= davy7125
DOS2UNIX_FILES= polyphone.pro
DOS2UNIX_FILES= polyphone.pro \
editor/graphics/graphiquefourier.cpp \
editor/tree/treeitemdelegate.cpp
USE_GL= gl
USE_QT= core concurrent gui network printsupport svg widgets buildtools_build qmake_build
USE_GNOME= glib20
......
--- editor/graphics/graphiquefourier.cpp.orig 2020-05-21 08:02:47 UTC
+++ editor/graphics/graphiquefourier.cpp
@@ -30,6 +30,7 @@
#include <QMenu>
#include <QFileDialog>
#include <QPainter>
+#include <QPainterPath>
GraphiqueFourier::GraphiqueFourier(QWidget * parent) : QCustomPlot(parent),
_fixedTickerX(new QCPAxisTickerFixed()),
--- editor/tree/treeitemdelegate.cpp.orig 2020-05-21 08:02:47 UTC
+++ editor/tree/treeitemdelegate.cpp
@@ -29,6 +29,7 @@
#include "basetypes.h"
#include <QToolTip>
#include <QHelpEvent>
+#include <QPainterPath>
TreeItemDelegate::Icons * TreeItemDelegate::s_icons = nullptr;
TreeItemDelegate::Colors * TreeItemDelegate::s_colors = nullptr;
--- src/Gui/Utils/Widgets/Slider.cpp.orig 2020-05-21 10:59:45 UTC
+++ src/Gui/Utils/Widgets/Slider.cpp
@@ -22,6 +22,7 @@
#include "Gui/Utils/Style.h"
#include <QPainter>
+#include <QPainterPath>
#include <QMouseEvent>
using Gui::Slider;
--- svgui/view/Overview.cpp.orig 2020-05-21 09:47:47 UTC
+++ svgui/view/Overview.cpp
@@ -20,6 +20,7 @@
#include <QPaintEvent>
#include <QPainter>
+#include <QPainterPath>
#include <iostream>
//#define DEBUG_OVERVIEW 1
# $FreeBSD: head/cad/PrusaSlicer/Makefile 534996 2020-05-12 15:47:52Z mandree $
# $FreeBSD: head/cad/PrusaSlicer/Makefile 536007 2020-05-20 15:49:37Z mat $
PORTNAME= PrusaSlicer
DISTVERSIONPREFIX= version_
DISTVERSION= 2.2.0
PORTREVISION= 2
CATEGORIES= cad
MASTER_SITES=https://github.com/CGAL/cgal/archive/releases/:cgal
DISTFILES=CGAL-5.0.2.tar.gz:cgal
MAINTAINER= teodorsigaev@gmail.com
COMMENT= Slicing application for 3D printers
......@@ -43,15 +41,16 @@ CMAKE_ARGS+= -DwxWidgets_CONFIG_EXECUTABLE=${LOCALBASE}/bin/wxgtk3u-3.1-config \
CMAKE_INSTALL_PREFIX= ${PREFIX}/${PORTNAME}
USE_GITHUB= yes
USE_GL= gl glu glew
GH_ACCOUNT= prusa3d
GH_TUPLE= CGAL:cgal:releases/CGAL-5.0.2:cgal
USE_GL= gl glu glew
post-patch:
${REINPLACE_CMD} -e 's,%%WRKSRC%%,${WRKSRC},' \
${WRKSRC}/CMakeLists.txt
pre-configure:
cd ${WRKDIR}/cgal-releases-CGAL-5.0.2 && \
cd ${WRKSRC_cgal} && \
${CMAKE_BIN} -E remove CGALConfig-installation-dirs.cmake && \
${MKDIR} build && cd build && \
${CMAKE_BIN} -DCMAKE_INSTALL_PREFIX=${WRKSRC}/CGAL \
......
TIMESTAMP = 1585766317
SHA256 (prusa3d-PrusaSlicer-version_2.2.0_GH0.tar.gz) = e6e0c83bf92e448ec058fd3063b84caca69f58b8b419e48eace6e8ce534937c0
SIZE (prusa3d-PrusaSlicer-version_2.2.0_GH0.tar.gz) = 30811929
SHA256 (CGAL-5.0.2.tar.gz) = 7d824efce318fe901fd9d6f233a1f27e2d956d787602621df035a759b587c40c
SIZE (CGAL-5.0.2.tar.gz) = 146441795
SHA256 (CGAL-cgal-releases-CGAL-5.0.2_GH0.tar.gz) = 7d824efce318fe901fd9d6f233a1f27e2d956d787602621df035a759b587c40c
SIZE (CGAL-cgal-releases-CGAL-5.0.2_GH0.tar.gz) = 146441795
--- librecad/src/lib/engine/lc_splinepoints.cpp.orig 2020-05-21 10:23:28 UTC
+++ librecad/src/lib/engine/lc_splinepoints.cpp
@@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Bos
**********************************************************************/
#include <QPolygonF>
+#include <QPainterPath>
#include "lc_splinepoints.h"
#include "rs_circle.h"
--- librecad/src/lib/gui/rs_painterqt.cpp.orig 2020-05-21 10:23:28 UTC
+++ librecad/src/lib/gui/rs_painterqt.cpp
@@ -25,6 +25,7 @@
**********************************************************************/
#include<cmath>
+#include<QPainterPath>
#include "rs_painterqt.h"
#include "rs_math.h"
#include "rs_debug.h"
--- traceplot.cpp.orig 2020-05-21 09:59:50 UTC
+++ traceplot.cpp
@@ -20,6 +20,7 @@
#include <QPixmapCache>
#include <QTextStream>
#include <QtConcurrent>
+#include <QPainterPath>
#include "samplesource.h"
#include "traceplot.h"
# $FreeBSD: head/databases/erlfdb/Makefile 533776 2020-05-03 13:12:39Z dch $
# $FreeBSD: head/databases/erlfdb/Makefile 535989 2020-05-20 10:29:27Z dch $
PORTNAME= erlfdb
DISTVERSIONPREFIX= v
DISTVERSION= 1.1.0
DISTVERSION= 1.2.1
CATEGORIES= databases
MAINTAINER= dch@FreeBSD.org
......
TIMESTAMP = 1588426054
SHA256 (apache-couchdb-erlfdb-v1.1.0_GH0.tar.gz) = b62909b46a5c95b30cc0f117e34db07c25ccc7c61ec12781f7ac888ad949eaca
SIZE (apache-couchdb-erlfdb-v1.1.0_GH0.tar.gz) = 69908
TIMESTAMP = 1589961559
SHA256 (apache-couchdb-erlfdb-v1.2.1_GH0.tar.gz) = 27f51a0b2deec83244de6e771c66fd501bbbf1b2a108a9227f73037e0da762e0
SIZE (apache-couchdb-erlfdb-v1.2.1_GH0.tar.gz) = 69973
# Created by: Bernard Spil <brnrd@FreeBSD.org>
# $FreeBSD: head/databases/mariadb104-server/Makefile 535369 2020-05-16 09:19:28Z brnrd $
# $FreeBSD: head/databases/mariadb104-server/Makefile 536143 2020-05-21 19:08:52Z brnrd $
PORTNAME?= mariadb
PORTVERSION= 10.4.13
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES= databases
MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \
http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
......@@ -150,6 +150,7 @@ MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack
OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \
libJudy.so:devel/judy
ROCKSDB_USES= python
ROCKSDB_CMAKE_ON= -DPYTHON_SHEBANG=${PYTHON_CMD}
SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=ON -DWITH_ROCKSDB_snappy=ON
SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF
SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy
......@@ -158,6 +159,10 @@ TOKUDB_PORTDOCS= README.md
TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi
WSREP_CMAKE_BOOL= WITH_WSREP
WSREP_LIB_DEPENDS= libgalera.so:databases/galera26
WSREP_RUN_DEPENDS= bash:shells/bash \
rsync:net/rsync \
#stunnel:security/stunnel
WSREP_SHEBANG_FILES= bin/wsrep_sst_rsync
ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4
ZSTD_CMAKE_ON= -DWITH_ROCKSDB_zstd=ON
ZSTD_CMAKE_OFF= -DWITH_ROCKSDB_zstd=OFF
......@@ -192,9 +197,7 @@ CMAKE_OFF+= WITH_TOKUDB
.endif
post-patch:
${REINPLACE_CMD} 's|/usr/bin/env python|${PYTHON_CMD}|' ${WRKSRC}/CMakeLists.txt
${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c
${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh \
${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake
${MV} ${WRKSRC}/storage/mroonga/version ${WRKSRC}/storage/mroonga/version_txt
.if ${OPSYS} == DragonFly
......@@ -207,20 +210,13 @@ post-configure:
-e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \
${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c
# Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072
post-configure-INNOBASE-on:
${REINPLACE_CMD} -e 's| ${PREFIX}/lib/liblz4.so\(.* ${PREFIX}/lib/liblz4.so.*\)|\1|' \
-e 's| ${PREFIX}/lib/liblzo2.so\(.* ${PREFIX}/lib/liblzo2.so.*\)|\1|' \
-e 's| ${PREFIX}/lib/libsnappy.so\(.* ${PREFIX}/lib/libsnappy.so\)|\1|' \
-e 's| -llzma\(.* -llzma\)|\1|;s| -lbz2\(.* -lbz2\)|\1|;' \
${WRKSRC}/extra/mariabackup/CMakeFiles/mbstream.dir/link.txt
.if ${PKGNAMESUFFIX:M*-client}
post-install:
${RM} -r ${STAGEDIR}${DATADIR}
${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server
${MV} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig/mariadb.pc \
${STAGEDIR}${PREFIX}/libdata/pkgconfig/mariadb.pc
${RMDIR} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
post-install-GSSAPI_NONE-off:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so
......@@ -230,6 +226,8 @@ post-install:
${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy
${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server/private
${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
${MV} ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf \
${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample
.endif # ${PKGNAMESUFFIX:M*-client}
.include <bsd.port.post.mk>
--- cmake/install_layout.cmake.orig 2020-05-09 19:27:56 UTC
+++ cmake/install_layout.cmake
@@ -128,8 +128,8 @@ SET(INSTALL_SUPPORTFILESDIR_STANDALONE "support-files
SET(INSTALL_MYSQLDATADIR_STANDALONE "data")
SET(INSTALL_UNIX_ADDRDIR_STANDALONE "/tmp/mysql.sock")
-SET(INSTALL_PAMDIR_STANDALONE "share")
-SET(INSTALL_PAMDATADIR_STANDALONE "share")
+SET(INSTALL_PAMDIR_STANDALONE "lib/mysql/plugin")
+SET(INSTALL_PAMDATADIR_STANDALONE "etc/mysql")
#
# RPM layout
#
--- scripts/wsrep_sst_rsync.sh.orig 2020-05-09 19:28:00 UTC