Commit c28b6bd2 authored by Matthias Fechner's avatar Matthias Fechner

Update to r535886.

parent b732741a
#
# MOVED -- A list of (recently) moved or removed ports
#
# $FreeBSD: head/MOVED 535560 2020-05-17 16:28:58Z rene $
# $FreeBSD: head/MOVED 535843 2020-05-19 08:21:37Z yuri $
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
......@@ -6795,7 +6795,6 @@ www/harvest||2014-09-01|Not staged
www/htmlobject||2014-09-01|Not staged
www/lusca-head||2014-09-01|Not staged
www/mod_auth_form||2014-09-01|Not staged
www/mod_auth_mellon||2014-09-01|Not staged
www/mod_ftp||2014-09-01|Not staged
www/mod_log_dbd||2014-09-01|Not staged
www/moodle24||2014-09-01|Not staged
......@@ -14819,7 +14818,6 @@ print/pmw||2020-05-05|Has expired: Broken for more than 6 months
print/rprint||2020-05-05|Has expired: Broken for more than 6 months
russian/p5-cyrillic||2020-05-05|Has expired: Broken for more than 6 months
russian/tidyup-mail||2020-05-05|Has expired: Broken for more than 6 months
science/abinit||2020-05-05|Has expired: Broken for more than 6 months
science/atom||2020-05-05|Has expired: Broken for more than 6 months
science/cp2k||2020-05-05|Has expired: Broken for more than 6 months
science/esys-particle||2020-05-05|Has expired: Broken for more than 6 months
......@@ -15014,3 +15012,4 @@ print/frescobaldi|print/py-frescobaldi|2020-05-16|Renamed to comply with Python
sysutils/rdiff-backup|sysutils/py-rdiff-backup@py37|2020-05-16|Renamed comply with Python Ports Policy and flavored
www/py-django-happenings|www/py-django-happenings-update|2020-05-17|Has expired: Doesn't work with Django 2.2+, please use www/py-django-happenings-update instead
devel/py-django-tastypie-mongoengine||2020-05-17|Has expired: Not necessary anymore, and project unmaintained
sysutils/py-cpuinfo|sysutils/py-py-cpuinfo|2020-05-18|Rename to match PyPI name
......@@ -5,6 +5,16 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20200518:
AFFECTS: users of converers/libiconv
AUTHOR: zeising@FreeBSD.org
Support for the Japanese specific patches have been discontinued.
These were previously added in a nondefault ports options, for people who
needed them.
If you still need them, it might be possible to create a port of libiconv 1.14
which includes those patches.
20200517:
AFFECTS: users of x11/sddm
AUTHOR: arrowd@FreeBSD.org
......@@ -18234,4 +18244,4 @@ or
'nobody' by default. Make sure any existing configuration files are
readable by that user.
$FreeBSD: head/UPDATING 535524 2020-05-17 08:21:04Z arrowd $
$FreeBSD: head/UPDATING 535769 2020-05-18 18:31:59Z zeising $
--- c++/widgets/pixmapdial.cpp.orig 2020-05-18 18:12:49 UTC
+++ c++/widgets/pixmapdial.cpp
@@ -22,6 +22,7 @@
#include <QtCore/QTimer>
#include <QtGui/QPainter>
#include <QtGui/QPaintEvent>
+#include <QtGui/QPainterPath>
PixmapDial::PixmapDial(QWidget* parent)
: QDial(parent),
--- src/widgets/freespacebar.cpp.orig 2020-05-19 17:40:21 UTC
+++ src/widgets/freespacebar.cpp
@@ -20,6 +20,7 @@
#include <QLinearGradient>
#include <QPainter>
+#include <QPainterPath>
const int FreeSpaceBar::kBarHeight = 20;
const int FreeSpaceBar::kBarBorderRadius = 8;
--- src/widgets/osdpretty.cpp.orig 2020-05-19 17:43:09 UTC
+++ src/widgets/osdpretty.cpp
@@ -26,6 +26,7 @@
#include <QLayout>
#include <QMouseEvent>
#include <QPainter>
+#include <QPainterPath>
#include <QSettings>
#include <QTimer>
#include <QTimeLine>
--- src/widgets/sliderwidget.cpp.orig 2020-05-19 17:48:49 UTC
+++ src/widgets/sliderwidget.cpp
@@ -24,6 +24,7 @@
#include <QBrush>
#include <QImage>
#include <QPainter>
+#include <QPainterPath>
#include <QSize>
#include <QTimer>
#include <QStyle>
--- awl/knob.h.orig 2020-05-18 18:30:06 UTC
+++ awl/knob.h
@@ -24,6 +24,7 @@
#define __AWLKNOB_H__
#include "aslider.h"
+#include <QPainterPath>
// #include <QtDesigner/QDesignerExportWidget>
namespace Awl {
--- awl/slider.cpp.orig 2020-05-18 18:33:16 UTC
+++ awl/slider.cpp
@@ -24,6 +24,7 @@
#include <QMouseEvent>
#include <QPainter>
+#include <QPainterPath>
namespace Awl {
--- muse/components/slider.cpp.orig 2020-05-18 18:45:56 UTC
+++ muse/components/slider.cpp
@@ -26,6 +26,7 @@
#include "mmath.h"
#include <QPainter>
+#include <QPainterPath>
#include <QResizeEvent>
#include "utils.h"
--- muse/components/utils.cpp.orig 2020-05-18 18:48:15 UTC
+++ muse/components/utils.cpp
@@ -34,6 +34,7 @@
#include <QLinearGradient>
#include <QMimeData>
#include <QPainter>
+#include <QPainterPath>
#include <QPointF>
#include <QFileInfo>
#include <QFont>
--- muse/midiedit/scoreedit.cpp.orig 2020-05-18 18:50:27 UTC
+++ muse/midiedit/scoreedit.cpp
@@ -45,6 +45,7 @@
#include <QImage>
#include <QInputDialog>
#include <QMessageBox>
+#include <QPainterPath>
#include <stdio.h>
#include "muse_math.h"
--- muse/mixer/routedialog.cpp.orig 2020-05-18 18:52:24 UTC
+++ muse/mixer/routedialog.cpp
@@ -27,6 +27,7 @@
#include <QVector>
#include <QList>
#include <QPainter>
+#include <QPainterPath>
#include <QPalette>
#include <Qt>
#include <QMouseEvent>
--- muse/widgets/meter.cpp.orig 2020-05-18 18:35:31 UTC
+++ muse/widgets/meter.cpp
@@ -28,6 +28,7 @@
#include <QMouseEvent>
#include <QPainter>
+#include <QPainterPath>
#include <QResizeEvent>
#include <QVector>
#include <QLocale>
--- src/gui/general/ThornStyle.cpp.orig 2020-05-18 16:28:59 UTC
+++ src/gui/general/ThornStyle.cpp
@@ -34,6 +34,7 @@
#include <QLabel>
#include <QLayout>
#include <QPainter>
+#include <QPainterPath>
#include <QRadioButton>
#include <QStyleFactory>
#include <QStyleOption>
--- src/gui/widgets/Panner.cpp.orig 2020-05-18 16:29:03 UTC
+++ src/gui/widgets/Panner.cpp
@@ -26,6 +26,7 @@
#include <QPolygon>
#include <QMouseEvent>
+#include <QPainterPath>
#include <iostream>
--- src/corelibs/U2Designer/src/WorkflowGUIUtils.cpp.orig 2020-05-18 19:09:47 UTC
+++ src/corelibs/U2Designer/src/WorkflowGUIUtils.cpp
@@ -24,6 +24,7 @@
#include <U2Lang/Descriptor.h>
#include <QPainter>
+#include <QPainterPath>
#include <QPalette>
#include <QTextDocument>
#include <QAbstractTextDocumentLayout>
--- src/corelibs/U2Gui/src/util/GUIUtils.cpp.orig 2020-05-18 18:51:22 UTC
+++ src/corelibs/U2Gui/src/util/GUIUtils.cpp
@@ -25,6 +25,7 @@
#include <QFile>
#include <QMessageBox>
#include <QPainter>
+#include <QPainterPath>
#include <QProcess>
#include <QUrl>
--- src/corelibs/U2View/src/ov_sequence/Overview.cpp.orig 2020-05-18 18:59:02 UTC
+++ src/corelibs/U2View/src/ov_sequence/Overview.cpp
@@ -38,6 +38,7 @@
#include <QVBoxLayout>
#include <QToolTip>
+#include <QPainterPath>
namespace U2 {
--- src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.cpp.orig 2020-05-18 19:03:19 UTC
+++ src/corelibs/U2View/src/ov_sequence/view_rendering/SequenceViewAnnotatedRenderer.cpp
@@ -31,6 +31,7 @@
#include <U2View/ADVSequenceObjectContext.h>
#include <U2View/SequenceObjectContext.h>
+#include <QPainterPath>
namespace U2 {
--- ctrlcharacterspopup.cpp.orig 2020-05-19 17:54:37 UTC
+++ ctrlcharacterspopup.cpp
@@ -23,6 +23,7 @@
#include <QApplication>
#include <QKeyEvent>
#include <QPainter>
+#include <QPainterPath>
#include <QPoint>
#include <QPushButton>
#include <QSignalMapper>
# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
# $FreeBSD: head/converters/libiconv/Makefile 450634 2017-09-25 20:55:27Z tijl $
# $FreeBSD: head/converters/libiconv/Makefile 535769 2020-05-18 18:31:59Z zeising $
PORTNAME= libiconv
PORTVERSION= 1.14
PORTREVISION= 11
PORTVERSION= 1.16
CATEGORIES= converters devel
MASTER_SITES= GNU
......@@ -13,6 +12,10 @@ COMMENT= Character set conversion library
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
USES= libtool
USE_CSTD= gnu89
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-static \
--disable-nls \
......@@ -20,25 +23,16 @@ CONFIGURE_ARGS= --enable-static \
am_cv_func_iconv=no
INSTALL_TARGET= install-strip
MAKE_JOBS_UNSAFE= yes
USES= libtool
USE_CSTD= gnu89
USE_LDCONFIG= yes
OPTIONS_DEFINE= DOCS ENCODINGS PATCHES
OPTIONS_DEFINE= DOCS ENCODINGS
OPTIONS_DEFAULT=ENCODINGS
ENCODINGS_DESC= Include extra character sets
PATCHES_DESC= Apply patches to fix CP932, add EUCJP-MS
ENCODINGS_CONFIGURE_ENABLE= extra-encodings
PATCHES_PATCH_SITES= http://apolloron.org/software/libiconv-1.14-ja/ \
LOCAL/kwm
PATCHES_PATCHFILES= ${DISTNAME}-ja-1.patch.gz:-p1
post-patch:
@${REINPLACE_CMD} -e 's:ei_ksc5601:ei_euc_kr:g' ${WRKSRC}/lib/aliases.h
@${REINPLACE_CMD} -e 's:gawk:awk:g' ${WRKSRC}/configure \
${WRKSRC}/libcharset/configure \
${WRKSRC}/preload/configure
${WRKSRC}/libcharset/configure
.include <bsd.port.mk>
SHA256 (libiconv-1.14.tar.gz) = 72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613
SIZE (libiconv-1.14.tar.gz) = 4984397
SHA256 (libiconv-1.14-ja-1.patch.gz) = c9474ee420b971029073dabf5e599b049945fbb040f353dce4db32191401bfee
SIZE (libiconv-1.14-ja-1.patch.gz) = 291963
TIMESTAMP = 1569891121
SHA256 (libiconv-1.16.tar.gz) = e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04
SIZE (libiconv-1.16.tar.gz) = 5166734
--- include/iconv.h.in.orig 2011-08-07 17:48:03 UTC
--- include/iconv.h.in.orig 2019-04-26 18:48:39 UTC
+++ include/iconv.h.in
@@ -21,8 +21,10 @@
@@ -20,8 +20,10 @@
#ifndef _LIBICONV_H
#define _LIBICONV_H
+#ifndef LIBICONV_PLUG
#define _LIBICONV_VERSION 0x010E /* version number: (major<<8) + minor */
#define _LIBICONV_VERSION 0x0110 /* version number: (major<<8) + minor */
extern @DLL_VARIABLE@ int _libiconv_version; /* Likewise */
+#endif
/* We would like to #include any system header file which could define
iconv_t, 1. in order to eliminate the risk that the user gets compilation
@@ -94,7 +96,6 @@ extern int iconv_close (iconv_t cd);
@@ -93,7 +95,6 @@ extern int iconv_close (iconv_t cd);
#endif
......@@ -19,7 +19,7 @@
/* Nonstandard extensions. */
@@ -127,12 +128,16 @@ typedef struct {
@@ -126,12 +127,16 @@ typedef struct {
/* Allocates descriptor for code conversion from encoding ‘fromcode’ to
encoding ‘tocode’ into preallocated memory. Returns an error indicator
(0 or -1 with errno set). */
......@@ -36,7 +36,7 @@
extern int iconvctl (iconv_t cd, int request, void* argument);
/* Hook performed after every successful conversion of a Unicode character. */
@@ -210,9 +215,15 @@ struct iconv_fallbacks {
@@ -209,9 +214,15 @@ struct iconv_fallbacks {
#define ICONV_SET_DISCARD_ILSEQ 4 /* const int *argument */
#define ICONV_SET_HOOKS 5 /* const struct iconv_hooks *argument */
#define ICONV_SET_FALLBACKS 6 /* const struct iconv_fallbacks *argument */
......@@ -52,7 +52,7 @@
extern void iconvlist (int (*do_one) (unsigned int namescount,
const char * const * names,
void* data),
@@ -224,6 +235,7 @@ extern const char * iconv_canonicalize (const char * n
@@ -223,6 +234,7 @@ extern const char * iconv_canonicalize (
/* Support for relocatable packages. */
......@@ -60,7 +60,7 @@
/* Sets the original and the current installation prefix of the package.
Relocation simply replaces a pathname starting with the original prefix
by the corresponding pathname with the current prefix instead. Both
@@ -231,12 +243,12 @@ extern const char * iconv_canonicalize (const char * n
@@ -230,12 +242,12 @@ extern const char * iconv_canonicalize (
instead of "/"). */
extern void libiconv_set_relocation_prefix (const char *orig_prefix,
const char *curr_prefix);
......
--- libcharset/lib/config.charset.orig 2010-04-05 02:25:38.000000000 +0200
+++ libcharset/lib/config.charset 2011-10-23 22:05:50.000000000 +0200
@@ -348,7 +348,7 @@ case "$os" in
#echo "sun_eu_greek ?" # what is this?
echo "UTF-8 UTF-8"
;;
- freebsd* | os2*)
+ freebsd4.[0-5]* | os2*)
# FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
# localcharset.c falls back to using the full locale name
# from the environment variables.
@@ -385,6 +385,31 @@ case "$os" in
echo "ja_JP.Shift_JIS SHIFT_JIS"
echo "ko_KR.EUC EUC-KR"
;;
+ freebsd*)
+ echo "US-ASCII ASCII"
+ echo "ISO8859-1 ISO-8859-1"
+ echo "ISO_8859-1 ISO-8859-1"
+ echo "ISO8859-2 ISO-8859-2"
+ echo "ISO_8859-2 ISO-8859-2"
+ echo "ISO8859-4 ISO-8859-4"
+ echo "ISO_8859-4 ISO-8859-4"
+ echo "ISO8859-5 ISO-8859-5"
+ echo "ISO_8859-5 ISO-8859-5"
+ echo "ISO8859-7 ISO-8859-7"
+ echo "ISO_8859-7 ISO-8859-7"
+ echo "ISO8859-9 ISO-8859-9"
+ echo "ISO_8859-9 ISO-8859-9"
+ echo "ISO8859-13 ISO-8859-13"
+ echo "ISO_8859-13 ISO-8859-13"
+ echo "ISO8859-15 ISO-8859-15"
+ echo "ISO_8859-15 ISO-8859-15"
+ echo "eucCN GB2312"
+ echo "eucJP EUC-JP"
+ echo "eucKR EUC-KR"
+ echo "Big5 BIG5"
+ echo "Big5HKSCS BIG5-HKSCS"
+ echo "SJIS SHIFT_JIS"
+ ;;
netbsd*)
echo "646 ASCII"
echo "ISO8859-1 ISO-8859-1"
--- libcharset/lib/localcharset.c.orig 2020-05-09 08:59:22 UTC
+++ libcharset/lib/localcharset.c
@@ -92,6 +92,7 @@ static const struct table_entry alias_table[] =
# if defined __FreeBSD__ /* FreeBSD */
/*{ "ARMSCII-8", "ARMSCII-8" },*/
{ "Big5", "BIG5" },
+ { "Big5HKSCS", "BIG5-HKSCS" },
{ "C", "ASCII" },
/*{ "CP1131", "CP1131" },*/
/*{ "CP1251", "CP1251" },*/
@@ -104,6 +105,7 @@ static const struct table_entry alias_table[] =
{ "ISO8859-13", "ISO-8859-13" },
{ "ISO8859-15", "ISO-8859-15" },
{ "ISO8859-2", "ISO-8859-2" },
+ { "ISO8859-4", "ISO-8859-4" },
{ "ISO8859-5", "ISO-8859-5" },
{ "ISO8859-7", "ISO-8859-7" },
{ "ISO8859-9", "ISO-8859-9" },
--- src/Makefile.in.orig 2011-06-04 19:05:58.000000000 +0200
+++ src/Makefile.in 2013-07-06 18:49:54.000000000 +0200
@@ -71,7 +71,6 @@
--- src/Makefile.in.orig 2019-01-27 22:07:13 UTC
+++ src/Makefile.in
@@ -71,7 +71,6 @@ OBJECTS_RES_no =
# without internationalization and not linked with libintl.
all : iconv_no_i18n$(EXEEXT) iconv.@OBJEXT@ $(OBJECTS_RES_@WOE32@)
......@@ -8,7 +8,7 @@
# This is the temporary iconv executable, without internationalization.
iconv_no_i18n$(EXEEXT) : iconv_no_i18n.@OBJEXT@ ../lib/libiconv.la $(OBJECTS_RES_@WOE32@)
@@ -113,7 +112,7 @@
@@ -113,7 +112,7 @@ install : all force
if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
case "@host_os@" in \
hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \
......
......@@ -2,7 +2,6 @@ bin/iconv
include/iconv.h
include/libcharset.h
include/localcharset.h
lib/charset.alias
lib/libcharset.a
lib/libcharset.so
lib/libcharset.so.1
......@@ -10,7 +9,7 @@ lib/libcharset.so.1.0.0
lib/libiconv.a
lib/libiconv.so
lib/libiconv.so.2
lib/libiconv.so.2.5.1
lib/libiconv.so.2.6.1
man/man1/iconv.1.gz
man/man3/iconv.3.gz
man/man3/iconv_open.3.gz
......
# $FreeBSD: head/databases/foundationdb-devel/Makefile 532104 2020-04-19 12:05:11Z dch $
# $FreeBSD: head/databases/foundationdb-devel/Makefile 535790 2020-05-18 21:48:23Z dch $
PORTNAME= foundationdb-devel
DISTVERSION= 7.0.0.a.20200408
DISTVERSION= 7.0.0.a.20200515
CATEGORIES= databases
MAINTAINER= dch@FreeBSD.org
......@@ -19,17 +19,16 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \
USES= compiler:c++17-lang cmake mono:build python:build shebangfix ssl
USE_GITHUB= yes
GH_ACCOUNT= skunkwerks
GH_PROJECT= fdb
GH_TAGNAME= 7608cb9
GH_ACCOUNT= apple
GH_PROJECT= foundationdb
GH_TAGNAME= c1fc784
USE_LDCONFIG= yes
USE_RC_SUBR= foundationdb
SHEBANG_FILES= bindings/c/generate_asm.py
CMAKE_ARGS= DLibreSSL_ROOT=${OPENSSLLIB}
CMAKE_OFF= USE_DTRACE
CMAKE_ON= DISABLE_TLS
CMAKE_ARGS= -DOPENSSL_ROOT_DIR=${OPENSSLLIB}
CMAKE_OFF= USE_DTRACE DISABLE_TLS
USERS= foundationdb
GROUPS= foundationdb
......@@ -44,19 +43,24 @@ SUB_FILES+= foundationdb.conf
SUB_LIST+= ${SUB_FDB}
PLIST_SUB+= ${SUB_FDB}
post-patch:
${REINPLACE_CMD} 's/OPENSSL_USE_STATIC_LIBS TRUE/OPENSSL_USE_STATIC_LIBS FALSE/' \
${WRKSRC}/cmake/FDBComponents.cmake
do-install:
# commands on first line, dev tools on next two
.for f in fdbbackup fdbcli fdbmonitor fdbserver \
actor_flamegraph fdb_c_performance_test fdb_c_ryw_benchmark \
fdb_c_txn_size_test fdb_flow_tester mako
fdb_c_txn_size_test fdb_flow_tester fdbconvert fdbdecode mako tutorial
${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/${f} ${STAGEDIR}${PREFIX}/bin/
.endfor
# confirm with upstream if these are actually needed
.for s in backup_agent dr_agent fdbr fdbrestore
.for s in backup_agent dr_agent fastrestore_agent fdbr fdbrestore
${RLN} ${STAGEDIR}${PREFIX}/bin/fdbbackup ${STAGEDIR}${PREFIX}/bin/${s}
.endfor
# exposed libraries - confirm with upstream
.for l in libfdb_c.so libfdb_flow.a libfdb_sqlite.a libfdbclient.a libfdbrpc.a libflow.a libthirdparty.a
.for l in libfdb_c.so libfdb_flow.a libfdb_sqlite.a libfdbclient.a \
libfdbrpc.a libflow.a libthirdparty.a
${STRIP_CMD} ${WRKDIR}/.build/lib/${l}
${INSTALL_DATA} ${WRKDIR}/.build/lib/${l} ${STAGEDIR}/${PREFIX}/lib/
.endfor
......