Merge remote-tracking branch 'upstream/master'

15 files changed, 104 insertions, 43 deletions

diff --git a/net-p2p/bitflu/files/pkg-message.in b/net-p2p/bitflu/files/pkg-message.in
index c1161c0a8e66..45ad9e636f5e 100644
--- a/net-p2p/bitflu/files/pkg-message.in
+++ b/net-p2p/bitflu/files/pkg-message.in
@@ -1,8 +1,11 @@
-*************************************************************************
+[
+{ type: install
+  message: <<EOM
  To use Bitflu with the plugins installed by this package, configure
  your ~/.bitflu.config to search for plugins here (instead of the
  default ./plugins):
 
    %%DATADIR%%/plugins
-
-*************************************************************************
+EOM
+}
+]
diff --git a/net-p2p/bnbt/files/pkg-message.in b/net-p2p/bnbt/files/pkg-message.in
index e4d52c7a32a3..2a6f81e282dd 100644
--- a/net-p2p/bnbt/files/pkg-message.in
+++ b/net-p2p/bnbt/files/pkg-message.in
@@ -1,6 +1,6 @@
-************************************************************
-BNBT has been successfully installed.
-
+[
+{ type: install
+  message: <<EOM
 For more information on how to configure BNBT:
 
 http://wiki.depthstrike.com/index.php/BNBT:Documentation:Configuration
@@ -10,4 +10,6 @@ In order to run bnbt, add the following lines to /etc/rc.conf:
 
 Then start the server with %%PREFIX%%/etc/rc.d/bnbt.sh start
 or reboot.
-************************************************************
+EOM
+}
+]
diff --git a/net-p2p/ctorrent/pkg-message b/net-p2p/ctorrent/pkg-message
index 234a37a1dcd9..5a4cf0edd091 100644
--- a/net-p2p/ctorrent/pkg-message
+++ b/net-p2p/ctorrent/pkg-message
@@ -1,6 +1,8 @@
--------------------------------------------------------------------------
-Ctorrent was installed.
-
+[
+{ type: install
+  message: <<EOM
 You might be interested in installing net-p2p/ctcs to control ctorrent
 remotely.
--------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile
index 363e16e5cf03..8285e0925a56 100644
--- a/net-p2p/gtk-gnutella/Makefile
+++ b/net-p2p/gtk-gnutella/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	gtk-gnutella
-PORTVERSION=	1.1.14
+PORTVERSION=	1.1.15
+DISTVERSIONPREFIX=v
 CATEGORIES=	net-p2p ipv6
-MASTER_SITES=	SF
 
 MAINTAINER=	woodsb02@FreeBSD.org
 COMMENT=	GTK based Gnutella client
@@ -15,6 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 ONLY_FOR_ARCHS=	amd64 i386
 
 USES=		gnome iconv localbase:ldflags pkgconfig tar:xz
+USE_GITHUB=	yes
 USE_GNOME=	glib20 libxml2
 
 HAS_CONFIGURE=	yes
diff --git a/net-p2p/gtk-gnutella/distinfo b/net-p2p/gtk-gnutella/distinfo
index b3b4bce653f3..48a151a6e2e6 100644
--- a/net-p2p/gtk-gnutella/distinfo
+++ b/net-p2p/gtk-gnutella/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1548644742
-SHA256 (gtk-gnutella-1.1.14.tar.xz) = 31eeaf02ae989aa81791af9f6b4aa3c26c39adc58605dc430edf59451494926a
-SIZE (gtk-gnutella-1.1.14.tar.xz) = 19372716
+TIMESTAMP = 1565005144
+SHA256 (gtk-gnutella-gtk-gnutella-v1.1.15_GH0.tar.gz) = a72fd0b57bbc458c8fe5556bd171cd3cae940fa131c5783ab4114f29d85d9122
+SIZE (gtk-gnutella-gtk-gnutella-v1.1.15_GH0.tar.gz) = 22899323
diff --git a/net-p2p/ktorrent/files/patch-gentoo-kf5-5.61-headers b/net-p2p/ktorrent/files/patch-gentoo-kf5-5.61-headers
new file mode 100644
index 000000000000..d9b8348e4469
--- /dev/null
+++ b/net-p2p/ktorrent/files/patch-gentoo-kf5-5.61-headers
@@ -0,0 +1,24 @@
+From 909215cc912d89fbc8573f2f98e3b433472d8eae Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 9 Aug 2019 20:54:52 +0200
+Subject: [PATCH] Add missing QVector
+
+---
+ libktcore/plugin/pluginmanager.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libktcore/plugin/pluginmanager.h b/libktcore/plugin/pluginmanager.h
+index 50eaa768..3a04a729 100644
+--- libktcore/plugin/pluginmanager.h
++++ libktcore/plugin/pluginmanager.h
+@@ -23,6 +23,7 @@
+ 
+ #include <QList>
+ #include <QStringList>
++#include <QVector>
+ 
+ #include <KPluginInfo>
+ #include <KPluginMetaData>
+-- 
+2.22.0
+
diff --git a/net-p2p/libswift/pkg-message b/net-p2p/libswift/pkg-message
index e2926d29d5b6..3c06a1d864d4 100644
--- a/net-p2p/libswift/pkg-message
+++ b/net-p2p/libswift/pkg-message
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 To run a server, copy any files you wish to share into /var/db/libswift,
 ensure that it is read and writable by the appropriate user, and
 start the libswift daemon:
@@ -10,3 +13,6 @@ $ libswift --tracker  127.0.0.1:7777 --hash ....
 
 To view the root hashes, use `grep root *.mbinmap` in the share dir once
 hashing is complete. For large files this may take some time.
+EOM
+}
+]
diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile
index d1d7d5804f99..2832644f41cb 100644
--- a/net-p2p/mldonkey/Makefile
+++ b/net-p2p/mldonkey/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/Copying.txt
 
 CONFLICTS=	mldonkey{-{core,gui},}-devel-[0-9]*
 
-USES=		gmake iconv pkgconfig tar:bzip2
+USES=		compiler:c++11-lang gmake iconv pkgconfig tar:bzip2
 USE_OCAML=	yes
 USE_OCAML_CAMLP4=yes
 GNU_CONFIGURE=	yes
diff --git a/net-p2p/mldonkey/files/pkg-message.in b/net-p2p/mldonkey/files/pkg-message.in
index 790e4df2f7cb..0e98a720c38f 100644
--- a/net-p2p/mldonkey/files/pkg-message.in
+++ b/net-p2p/mldonkey/files/pkg-message.in
@@ -1,5 +1,6 @@
-	ATTENTION:
-
+[
+{ type: install
+  message: <<EOM
 - If you want to know how to use mldonkey, read "INSTALL" or
   "FAQ.html" in the port docs (%%DOCSDIR%%)
 
@@ -20,8 +21,13 @@
 - You have to enable the different protocols on the client
   console. Go to the (mldonkey-) console, and try the commands
   'set enable_<protocol> true' (try 'voo' for reference).
-
-+------------------------------------------------------------+
-|- For upgraders: The names of the binaries have changed.    |
-|  Core and GUI are called "mlnet" and "mlgui", respectively.|
-+------------------------------------------------------------+
+EOM
+}
+{ type: upgrade
+  maximum_version: 2.5.3
+  message: <<EOM
+- For upgraders: The names of the binaries have changed.
+  Core and GUI are called "mlnet" and "mlgui", respectively.
+EOM
+}
+]
diff --git a/net-p2p/py-tremc/pkg-message b/net-p2p/py-tremc/pkg-message
index 9013b8996cd0..886db90b78a5 100644
--- a/net-p2p/py-tremc/pkg-message
+++ b/net-p2p/py-tremc/pkg-message
@@ -1,5 +1,6 @@
-##########################################################################
-
+[
+{ type: install
+  message: <<EOM
 Authentication and host/port can be set via command line with one of these
 patterns:
 
@@ -20,5 +21,6 @@ $ tremc -c johndoe:secretbirthday@homeserver:1234 --create-config
 No configuration file is created automatically. You must create it.
 
 $ tremc --create-config
-
-##########################################################################
+EOM
+}
+]
diff --git a/net-p2p/rslsync/files/pkg-message.in b/net-p2p/rslsync/files/pkg-message.in
index ea5383906b8c..00d3e558dac5 100644
--- a/net-p2p/rslsync/files/pkg-message.in
+++ b/net-p2p/rslsync/files/pkg-message.in
@@ -1,5 +1,6 @@
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
+[
+{ type: install
+  message: <<EOM
 net-p2p/rslsync includes an RC script:
 %%PREFIX%%/etc/rc.d/rslsync
 
@@ -11,5 +12,6 @@ START MANUALLY:
 
 Once started, visit the following to configure:
 http://localhost:8888/
-
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+EOM
+}
+]
diff --git a/net-p2p/transmission-daemon/pkg-message b/net-p2p/transmission-daemon/pkg-message
index d5deda16112f..86a4903cbced 100644
--- a/net-p2p/transmission-daemon/pkg-message
+++ b/net-p2p/transmission-daemon/pkg-message
@@ -1,4 +1,6 @@
-------------------------------------------------------------------------
+[
+{ type: install
+  message: <<EOM
 To allow clients to connect to the transmission daemon using DNS with
 any hostname other than localhost, do one of the following:
   - Enable password authentication, then any hostname is allowed.
@@ -15,4 +17,6 @@ any hostname other than localhost, do one of the following:
     in settings.json (must be done whilst the transmission service is
     stopped). Note that this value is NOT a list of allowed CLIENTS,
     but instead a list of allowed SERVER hostnames.
-------------------------------------------------------------------------
+EOM
+}
+]
diff --git a/net-p2p/transmission-remote-gui/files/pkg-message.in b/net-p2p/transmission-remote-gui/files/pkg-message.in
index b074673c9834..fb12307150d6 100644
--- a/net-p2p/transmission-remote-gui/files/pkg-message.in
+++ b/net-p2p/transmission-remote-gui/files/pkg-message.in
@@ -1,7 +1,6 @@
-###############################################################################
-
-The Transmisson Remote GUI was installed
-
+[
+{ type: install
+  message: <<EOM
 1) You can run it using:
 
    # transgui
@@ -12,5 +11,6 @@ The Transmisson Remote GUI was installed
 3) Run "transmission-daemon --help" for more configuration options
 
 4) Enjoy it ;)
-
-###############################################################################
+EOM
+}
+]
diff --git a/net-p2p/xmrig/files/pkg-message.in b/net-p2p/xmrig/files/pkg-message.in
index d770d46fed0a..b09538560d4c 100644
--- a/net-p2p/xmrig/files/pkg-message.in
+++ b/net-p2p/xmrig/files/pkg-message.in
@@ -1,3 +1,6 @@
+[
+{ type: install
+  message: <<EOM
 XMRig configuration file available at:
 %%ETCDIR%%/config.json
 
@@ -6,3 +9,6 @@ To automatically start XMRig at boot time:
 
 To then manually start XMRig without rebooting:
 # service xmrig start
+EOM
+}
+]
diff --git a/net-p2p/zetacoin/files/pkg-message.in b/net-p2p/zetacoin/files/pkg-message.in
index 3bbec6991a70..f8590d45f713 100644
--- a/net-p2p/zetacoin/files/pkg-message.in
+++ b/net-p2p/zetacoin/files/pkg-message.in
@@ -1,4 +1,6 @@
-*******************************************************************
+[
+{ type: install
+  message: <<EOM
 To configure the Zetacoin server please edit:
 %%PREFIX%%/etc/%%PORTNAME%%.conf
 
@@ -8,5 +10,6 @@ To run the %%PORTNAME%%d server at startup, add the following
 settings to your /etc/rc.conf
 
 %%PORTNAME%%_enable="YES"
-
-*******************************************************************
+EOM
+}
+]