Skip to content
This repository has been archived by the owner on Dec 4, 2020. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'freebsd/master' into trueos-master
Browse files Browse the repository at this point in the history
  • Loading branch information
miwi-fbsd committed Mar 11, 2019
2 parents a1f8d1c + c8ebb63 commit 925fcdd
Show file tree
Hide file tree
Showing 803 changed files with 12,215 additions and 8,031 deletions.
4 changes: 3 additions & 1 deletion MOVED
Original file line number Diff line number Diff line change
Expand Up @@ -10196,7 +10196,6 @@ comms/java-commapi-freebsd||2018-06-07|Has expired: Depends on BROKEN and expiri
comms/soundmodem||2018-06-07|Has expired: Broken for more than 6 months
comms/jsdr||2018-06-07|Has expired: Broken for more than 6 months
comms/java-commapi||2018-06-07|Has expired: Broken for more than 6 months
converters/pdf2djvu||2018-06-07|Has expired: Broken for more than 6 months
databases/rdb||2018-06-07|Has expired: Broken for more than 6 months
databases/animenfo-client||2018-06-07|Has expired: Broken for more than 6 months
databases/ruby-mysql||2018-06-07|Has expired: Broken for more than 6 months
Expand Down Expand Up @@ -11677,3 +11676,6 @@ textproc/elixir-ex_doc||2019-03-06|Has expired: Broken for more than 6 months
x11/altyo||2019-03-06|Has expired: Broken for more than 6 months
x11/pantheon-terminal||2019-03-06|Has expired: Broken for more than 6 months
x11-wm/e-module-everything-websearch||2019-03-06|Has expired: Broken for more than 6 months
net-mgmt/py-pysnmp-apps|net-mgmt/py-snmpclitools|2019-02-15|Renamed upstream
math/mumps|math/mumps4|2019-03-10|MUMPS 4 is the legacy version
math/mumps-edf|math/mumps|2019-03-10|Use mumps-edf as MUMPS 5
5 changes: 4 additions & 1 deletion Mk/Scripts/check_leftovers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@ fi
if [ -z "${CCACHE_DIR}" ]; then
CCACHE_DIR=$(make -C ${portdir} -VCCACHE_DIR)
fi
homedirs=$(awk -F: -v users="$(make -C ${portdir} -V USERS|sed -e 's, ,|,g;/^$/d;s,^,^(,;s,$,)$,')" 'users && $1 ~ users {print $9}' ${PORTSDIR}/UIDs|sort -u|sed -e "s|/usr/local|${PREFIX}|"|tr "\n" " ")
if [ -z "${UID_FILES}" ]; then
UID_FILES=$(make -C ${portdir} -VUID_FILES)
fi
homedirs=$(awk -F: -v users="$(make -C ${portdir} -V USERS|sed -e 's, ,|,g;/^$/d;s,^,^(,;s,$,)$,')" 'users && $1 ~ users {print $9}' ${UID_FILES}|sort -u|sed -e "s|/usr/local|${PREFIX}|"|tr "\n" " ")
plistsub_sed=$(mktemp -t plistsub_sed)
trap "rm -f ${plistsub_sed}" EXIT 1
make -C ${portdir} -VPLIST_SUB_SED | /bin/sh ${PORTSDIR}/Mk/Scripts/plist_sub_sed_sort.sh ${plistsub_sed}
Expand Down
5 changes: 4 additions & 1 deletion Mk/Uses/qt.mk
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,12 @@ _QT_MK_POST_INCLUDED= qt.mk
_USE_QT_ALL= assistant dbus declarative designer doc gui help \
imageformats l10n linguist linguisttools multimedia \
network opengl pixeltool qdbusviewer qmake script \
scripttools sql sql-ibase sql-mysql sql-odbc sql-pgsql \
scripttools sql sql-mysql sql-odbc sql-pgsql \
sql-sqlite2 sql-sqlite3 svg testlib webkit \
xml xmlpatterns
.if ${ARCH} == amd64 || ${ARCH} == i386
_USE_QT_ALL+= sql-ibase
.endif

_USE_QT4_ONLY= accessible assistant-adp assistantclient clucene codecs-cn codecs-jp \
codecs-kr codecs-tw corelib demo graphicssystems-opengl \
Expand Down
2 changes: 1 addition & 1 deletion accessibility/rubygem-atk/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= atk
PORTVERSION= 3.3.2
PORTVERSION= 3.3.3
CATEGORIES= accessibility rubygems
MASTER_SITES= RG

Expand Down
6 changes: 3 additions & 3 deletions accessibility/rubygem-atk/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1550388827
SHA256 (rubygem/atk-3.3.2.gem) = 001cd0c39a4f1a66a3a9e607b6fbdca052a3dc99f98a1ee55ad484e7798f859d
SIZE (rubygem/atk-3.3.2.gem) = 15872
TIMESTAMP = 1552209293
SHA256 (rubygem/atk-3.3.3.gem) = aad395ea1491b2b65e748fa239253c75891a33a11835438b2000f50c3c445ea9
SIZE (rubygem/atk-3.3.3.gem) = 15872
13 changes: 9 additions & 4 deletions archivers/ark/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

PORTNAME= ark
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
PORTREVISION= 3
CATEGORIES= archivers kde kde-applications

MAINTAINER= [email protected]
Expand All @@ -11,7 +12,7 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING

USES= cmake compiler:c++11-lang gettext libarchive kde:5 \
qt:5 tar:xz
qt:5 shared-mime-info tar:xz
USE_KDE= archive auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons doctools ecm i18n iconthemes \
itemmodels itemviews jobwidgets khtml kio parts pty service \
Expand All @@ -22,13 +23,17 @@ USE_QT= concurrent core dbus gui network widgets xml \
USE_LDCONFIG= yes

OPTIONS_DEFINE= 7ZIP RAR ZIP DOCS
OPTIONS_DEFAULT= ${OPTIONS_DEFINE}
OPTIONS_DEFAULT= 7ZIP ZIP DOCS
OPTIONS_DEFAULT_i386= RAR
OPTIONS_DEFAULT_amd64= RAR
OPTIONS_SUB= YES

7ZIP_DESC= Support for 7-Zip archives
# The 7ZIP and RAR options only need runtime dependencies;
# the port builds identically with or without them.
7ZIP_DESC= Support for 7-Zip archives (runtime)
7ZIP_RUN_DEPENDS= 7z:archivers/p7zip

RAR_DESC= Support for RAR archives
RAR_DESC= Support for RAR archives (runtime)
RAR_RUN_DEPENDS= unrar:archivers/unrar \
rar:archivers/rar

Expand Down
26 changes: 26 additions & 0 deletions archivers/ark/files/patch-git_a3bcf9bec
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
commit a3bcf9becddd5725725089add15fbae39c79757e
Author: Elvis Angelaccio <[email protected]>
Date: Sat Mar 9 13:05:35 2019 +0100

Fix creation of tar archives

Usage of QString::compare() breaks the creation of tar archives, because
`zst` is "bigger" than `tar` which means ark would use the `zstd` filter
even when creating a simple tar archive.

BUG: 405136
FIXED-IN: 19.03.80

diff --git a/plugins/libarchive/readwritelibarchiveplugin.cpp b/plugins/libarchive/readwritelibarchiveplugin.cpp
index 38f62881..e83d0087 100644
--- plugins/libarchive/readwritelibarchiveplugin.cpp
+++ plugins/libarchive/readwritelibarchiveplugin.cpp
@@ -352,7 +352,7 @@ bool ReadWriteLibarchivePlugin::initializeNewFileWriterFilters(const Compression
qCDebug(ARK) << "Detected lz4 compression for new file";
ret = archive_write_add_filter_lz4(m_archiveWriter.data());
#ifdef HAVE_ZSTD_SUPPORT
- } else if (filename().rightRef(3).compare(QLatin1String("zst"), Qt::CaseInsensitive)) {
+ } else if (filename().right(3).toUpper() == QLatin1String("ZST")) {
qCDebug(ARK) << "Detected zstd compression for new file";
ret = archive_write_add_filter_zstd(m_archiveWriter.data());
#endif
11 changes: 0 additions & 11 deletions archivers/ark/files/patch-kerfuffle_pluginmanager.cpp

This file was deleted.

7 changes: 3 additions & 4 deletions archivers/ark/pkg-descr
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ environment.
Archives can be viewed, extracted, created and modified from within
Ark. The program can handle various formats such as tar, gzip, bzip2,
zip, rar and lha (if appropriate command-line programs are
installed). Ark can work closely with Konqueror in the KDE
environment to handle archives, if you install the Konqueror
Integration plugin available in the kdeaddons package.
installed). Ark can work closely with Konqueror and Dolphin in
a KDE Plasma environment to handle archives.

WWW: https://utils.kde.org/
WWW: https://utils.kde.org/projects/ark/
4 changes: 4 additions & 0 deletions archivers/ark/pkg-message
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Support for 7zip and rar archives requires the appropriate executables.
If ark has been packaged without options 7ZIP or RAR, you can install
archivers/p7zip (for 7ZIP) or archivers/unrar and archivers/rar (for RAR)
to allow ark to handle those archives.
2 changes: 1 addition & 1 deletion astro/kstars/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= kstars
DISTVERSION= 3.1.0
DISTVERSION= 3.1.1
PORTEPOCH= 1
CATEGORIES= astro kde
MASTER_SITES= KDE/stable/${PORTNAME}
Expand Down
6 changes: 3 additions & 3 deletions astro/kstars/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1551382525
SHA256 (kstars-3.1.0.tar.xz) = 6116decc689c2594029e79a7fcd7e6e75c5d68cd6a8b25bac4e7b90c2717f828
SIZE (kstars-3.1.0.tar.xz) = 67769080
TIMESTAMP = 1552209020
SHA256 (kstars-3.1.1.tar.xz) = 60867ce1488e2a47757666d86765abed4950360c33e8ba28acd7aa6137cab491
SIZE (kstars-3.1.1.tar.xz) = 70308140
32 changes: 32 additions & 0 deletions astro/kstars/pkg-plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@ bin/kstars
lib/libhtmesh.a
share/applications/org.kde.kstars.desktop
share/config.kcfg/kstars.kcfg
share/doc/HTML/ca/kstars/Another_way4.png
share/doc/HTML/ca/kstars/Another_way5.png
share/doc/HTML/ca/kstars/Another_way6.png
share/doc/HTML/ca/kstars/Another_way_to_add_part3.png
share/doc/HTML/ca/kstars/add-circle.png
share/doc/HTML/ca/kstars/advanced_tab.png
share/doc/HTML/ca/kstars/ai-contents.docbook
share/doc/HTML/ca/kstars/alpha.png
share/doc/HTML/ca/kstars/altvstime.docbook
Expand All @@ -24,6 +30,7 @@ share/doc/HTML/ca/kstars/calc-equinox.png
share/doc/HTML/ca/kstars/calc-geodetic.docbook
share/doc/HTML/ca/kstars/calc-geodetic.png
share/doc/HTML/ca/kstars/calc-horizontal.docbook
share/doc/HTML/ca/kstars/calc-horizontal.png
share/doc/HTML/ca/kstars/calc-julian.png
share/doc/HTML/ca/kstars/calc-julianday.docbook
share/doc/HTML/ca/kstars/calc-planetcoords.docbook
Expand All @@ -34,6 +41,7 @@ share/doc/HTML/ca/kstars/calculator.docbook
share/doc/HTML/ca/kstars/cequator.docbook
share/doc/HTML/ca/kstars/color_indices.png
share/doc/HTML/ca/kstars/colorandtemp.docbook
share/doc/HTML/ca/kstars/colors_tab.png
share/doc/HTML/ca/kstars/commands.docbook
share/doc/HTML/ca/kstars/config.docbook
share/doc/HTML/ca/kstars/cosmicdist.docbook
Expand All @@ -43,6 +51,9 @@ share/doc/HTML/ca/kstars/csphere.docbook
share/doc/HTML/ca/kstars/darkmatter.docbook
share/doc/HTML/ca/kstars/detaildialog.png
share/doc/HTML/ca/kstars/details.docbook
share/doc/HTML/ca/kstars/dialog-ok-apply.png
share/doc/HTML/ca/kstars/document-edit.png
share/doc/HTML/ca/kstars/document-open.png
share/doc/HTML/ca/kstars/dumpmode.docbook
share/doc/HTML/ca/kstars/ecliptic.docbook
share/doc/HTML/ca/kstars/ekos-align.docbook
Expand All @@ -57,6 +68,7 @@ share/doc/HTML/ca/kstars/ekos-setup.docbook
share/doc/HTML/ca/kstars/ekos-tutorials.docbook
share/doc/HTML/ca/kstars/ekos-user-interface.docbook
share/doc/HTML/ca/kstars/ekos.docbook
share/doc/HTML/ca/kstars/ekos_tab.png
share/doc/HTML/ca/kstars/ellipticalgalaxies.docbook
share/doc/HTML/ca/kstars/epoch.docbook
share/doc/HTML/ca/kstars/equinox.docbook
Expand All @@ -69,12 +81,14 @@ share/doc/HTML/ca/kstars/flux1.png
share/doc/HTML/ca/kstars/flux2.png
share/doc/HTML/ca/kstars/geocoords.docbook
share/doc/HTML/ca/kstars/greatcircle.docbook
share/doc/HTML/ca/kstars/guides_tab.png
share/doc/HTML/ca/kstars/hips.docbook
share/doc/HTML/ca/kstars/horizon.docbook
share/doc/HTML/ca/kstars/hourangle.docbook
share/doc/HTML/ca/kstars/index.cache.bz2
share/doc/HTML/ca/kstars/index.docbook
share/doc/HTML/ca/kstars/indi.docbook
share/doc/HTML/ca/kstars/indi_tab.png
share/doc/HTML/ca/kstars/indicapture.png
share/doc/HTML/ca/kstars/install.docbook
share/doc/HTML/ca/kstars/jmoons.docbook
Expand All @@ -86,29 +100,47 @@ share/doc/HTML/ca/kstars/lambda_max.png
share/doc/HTML/ca/kstars/leapyear.docbook
share/doc/HTML/ca/kstars/lightcurve.png
share/doc/HTML/ca/kstars/lightcurves.docbook
share/doc/HTML/ca/kstars/list-add.png
share/doc/HTML/ca/kstars/luminosity.docbook
share/doc/HTML/ca/kstars/luminosity.png
share/doc/HTML/ca/kstars/luminosity_ex.png
share/doc/HTML/ca/kstars/magnitude.docbook
share/doc/HTML/ca/kstars/media-playback-pause.png
share/doc/HTML/ca/kstars/media-playback-start.png
share/doc/HTML/ca/kstars/meridian.docbook
share/doc/HTML/ca/kstars/obsplanner.docbook
share/doc/HTML/ca/kstars/open_dialog_ldn.png
share/doc/HTML/ca/kstars/parallax.docbook
share/doc/HTML/ca/kstars/precession.docbook
share/doc/HTML/ca/kstars/profile_wizard_done.png
share/doc/HTML/ca/kstars/profile_wizard_remote.png
share/doc/HTML/ca/kstars/profile_wizard_select.png
share/doc/HTML/ca/kstars/profile_wizard_welcome.png
share/doc/HTML/ca/kstars/quicktour.docbook
share/doc/HTML/ca/kstars/retrograde.docbook
share/doc/HTML/ca/kstars/satellites_tab.png
share/doc/HTML/ca/kstars/scriptbuilder.docbook
share/doc/HTML/ca/kstars/security-high.png
share/doc/HTML/ca/kstars/security-low.png
share/doc/HTML/ca/kstars/security-medium.png
share/doc/HTML/ca/kstars/sidereal.docbook
share/doc/HTML/ca/kstars/skycoords.docbook
share/doc/HTML/ca/kstars/solarsys.docbook
share/doc/HTML/ca/kstars/solarsystem.png
share/doc/HTML/ca/kstars/solarsystem_tab.png
share/doc/HTML/ca/kstars/spiralgalaxies.docbook
share/doc/HTML/ca/kstars/star_colors.png
share/doc/HTML/ca/kstars/stars.docbook
share/doc/HTML/ca/kstars/telescopes.docbook
share/doc/HTML/ca/kstars/timezones.docbook
share/doc/HTML/ca/kstars/tools.docbook
share/doc/HTML/ca/kstars/utime.docbook
share/doc/HTML/ca/kstars/view-filter.png
share/doc/HTML/ca/kstars/view-fullscreen.png
share/doc/HTML/ca/kstars/view-refresh.png
share/doc/HTML/ca/kstars/viewops.png
share/doc/HTML/ca/kstars/wut.docbook
share/doc/HTML/ca/kstars/wut.png
share/doc/HTML/ca/kstars/zenith.docbook
share/doc/HTML/de/kstars/aavso.png
share/doc/HTML/de/kstars/ai-contents.docbook
Expand Down
15 changes: 10 additions & 5 deletions audio/audacity/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
# $FreeBSD$

PORTNAME= audacity
PORTVERSION= 2.3.0
PORTVERSION= 2.3.1
DISTVERSIONPREFIX= Audacity-
PORTREVISION= 5
CATEGORIES= audio

MAINTAINER= [email protected]
Expand All @@ -25,7 +24,9 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \
libsoxr.so:audio/libsoxr \
libsndfile.so:audio/libsndfile

USES= autoreconf compiler:c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix localbase
USES= autoreconf compiler:c++11-lib cpe desktop-file-utils dos2unix \
gettext-tools gmake gnome iconv libtool localbase pkgconfig \
shared-mime-info shebangfix
GNU_CONFIGURE= yes
NLS_USES= gettext-runtime
NLS_CONFIGURE_ENABLE= nls
Expand All @@ -39,8 +40,9 @@ DOS2UNIX_GLOB= Makefile.* *.c* *.h
SHEBANG_FILES= lib-src/lv2/build
USE_GITHUB= yes

OPTIONS_DEFINE= NLS DEBUG DOCS DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \
MAD MOD_SCRIPT_PIPE MOD_NYQ_BENCH SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
OPTIONS_DEFINE= DEBUG DOCS DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 MAD \
MOD_NYQ_BENCH MOD_SCRIPT_PIPE NLS SBSMS SOUNDTOUCH STATIC_WX \
TWOLAME VAMP VORBIS VST
OPTIONS_DEFAULT= FLAC ID3TAG LADSPA MAD \
SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST

Expand All @@ -57,6 +59,7 @@ MOD_SCRIPT_PIPE_DESC= mod-script-pipe scripting support
MOD_NYQ_BENCH_DESC= Enable Nyquist Workbench
SBSMS_DESC= Use libsbsms for pitch and tempo changing
SOUNDTOUCH_DESC= Use libSoundTouch for pitch and tempo changing
STATIC_WX_DESC= Link wx statically
TAGLIB_DESC= Use TagLib for metadata support
TWOLAME_DESC= Use libtwolame for MP2 export support
VAMP_DESC= Vamp plug-in support
Expand Down Expand Up @@ -128,6 +131,8 @@ SOUNDTOUCH_LIB_DEPENDS= libSoundTouch.so:audio/soundtouch

SSE_CONFIGURE_ENABLE= sse

STATIC_WX_ENABLE= static-wx

TWOLAME_CONFIGURE_WITH= libtwolame=system
TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame

Expand Down
6 changes: 3 additions & 3 deletions audio/audacity/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1538360236
SHA256 (audacity-audacity-Audacity-2.3.0_GH0.tar.gz) = 37127f68dceeb5da08d008ec9373a65e2d5d0a9b937c808a5d7c3b88aa9e275e
SIZE (audacity-audacity-Audacity-2.3.0_GH0.tar.gz) = 27479664
TIMESTAMP = 1552123965
SHA256 (audacity-audacity-Audacity-2.3.1_GH0.tar.gz) = 2ef1c06f9cdc2ee3d315b8e575dc2bea5b372f4f415f3dc6570c3cfca0f93321
SIZE (audacity-audacity-Audacity-2.3.1_GH0.tar.gz) = 27618480
19 changes: 17 additions & 2 deletions audio/audacity/files/patch-configure.ac
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
--- configure.ac.orig 2018-09-20 14:35:07 UTC
--- configure.ac.orig 2019-02-24 08:28:05 UTC
+++ configure.ac
@@ -235,20 +235,7 @@ dnl check if alloca.h exists. If it does, we need to i
@@ -204,14 +204,6 @@ if test x$enable_universal_binary = xyes; then
esac
fi

-dnl Check if $CXX is clang by evaluating the version string because
-dnl $ax_cv_cxx_compiler_vendor seems not to work (it is either "gnu" or just empty).
-dnl If $CXX is clang (string is found), grep returns 0 and the if is executed.
-dnl Use /dev/null to suppress grep output to shell.
-if ($CXX --version | grep 'clang version' > /dev/null); then
- LDFLAGS="${LDFLAGS} -latomic"
-fi
-
if test x$enable_sse = xyes; then

if test "${ax_cv_cxx_compiler_vendor}" = "gnu"; then
@@ -243,20 +235,7 @@ dnl check if alloca.h exists. If it does, we need to i
dnl Solaris builds, by defining HAVE_ALLOCA_H
AC_CHECK_HEADERS_ONCE(alloca.h)

Expand Down
12 changes: 2 additions & 10 deletions audio/audacity/files/patch-src_MemoryX.h
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
--- src/MemoryX.h.orig 2018-10-01 14:07:33 UTC
--- src/MemoryX.h.orig 2019-03-09 11:55:09 UTC
+++ src/MemoryX.h
@@ -1,6 +1,7 @@
#ifndef __AUDACITY_MEMORY_X_H__
#define __AUDACITY_MEMORY_X_H__

+#include <stdlib.h>
// C++ standard header <memory> with a few extensions
#include <memory>
#include <cstdlib> // Needed for free.
@@ -706,7 +707,7 @@ make_value_transform_iterator(const Iterator &iterator
@@ -628,7 +628,7 @@ make_iterator_range( const Container &container )
// For using std::unordered_map on wxString
namespace std
{
Expand Down
Loading

0 comments on commit 925fcdd

Please sign in to comment.