Merge branch 'master' into gnome-3.28gnome-3.28

19 files changed, 96 insertions, 114 deletions

diff --git a/irc/Makefile b/irc/Makefile
index 4e7c45f0a837..572d5b283125 100644
--- a/irc/Makefile
+++ b/irc/Makefile
@@ -67,7 +67,6 @@
     SUBDIR += minbif
     SUBDIR += muh
     SUBDIR += nethirc
-    SUBDIR += netwalker-ircc
     SUBDIR += ngircd
     SUBDIR += ninja
     SUBDIR += onis
@@ -126,5 +125,6 @@
     SUBDIR += weechat-otr
     SUBDIR += xaric
     SUBDIR += znc
+    SUBDIR += znc-push
 
 .include <bsd.port.subdir.mk>
diff --git a/irc/bip/Makefile b/irc/bip/Makefile
index f5be486e6732..a87d1b02d8ba 100644
--- a/irc/bip/Makefile
+++ b/irc/bip/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple IRC proxy with SSL support
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_SSL=	openssl-devel
+BROKEN_SSL=	openssl111
 
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib -L${OPENSSLLIB}
diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile
index 984e5ac6bf85..f939be32ee33 100644
--- a/irc/bitchx/Makefile
+++ b/irc/bitchx/Makefile
@@ -31,21 +31,19 @@ DATADIR=	${PREFIX}/share/bx
 
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_DEFINE=	DOCS HEBREW IPV6 LATIN PLUGINS SSL TOGGLES
+OPTIONS_DEFINE=	DOCS LANG_HE IPV6 LATIN PLUGINS SSL TOGGLES
+OPTIONS_DEFAULT=	PLUGINS SSL
 
 LATIN_DESC=	Recommended for ISO-8859-1 display
 PLUGINS_DESC=	Build a handful of BitchX plugins
-HEBREW_DESC=	Add support for hebrew language
 TOGGLES_DESC=	Disable annoyance toggles
-OPTIONS_DEFAULT=	PLUGINS SSL
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 SSL_CONFIGURE_WITH=	ssl
 SSL_USES=		ssl
-SSL_VARS=		BROKEN_SSL=openssl-devel
 
-PLUGINS_CONFIGURE_WITH=		plugins="${PLUGIN_LIST:C/\$$/,/g}"
+PLUGINS_CONFIGURE_WITH=	plugins="${PLUGIN_LIST:C/\$$/,/g}"
 
 PLUGIN_LIST=	abot acro arcfour autocycle blowfish cavlink cdrom encrypt \
 		europa fserv hint nap nicklist pkga possum qbx qmail wavplay
@@ -62,7 +60,7 @@ post-patch-LATIN-on:
 	${REINPLACE_CMD} -e 's|#undef LATIN1|#define LATIN1|' \
 		${WRKSRC}/include/config.h
 
-post-patch-HEBREW-on:
+post-patch-LANG_HE-on:
 	${REINPLACE_CMD} -e 's|#undef WANT_HEBREW|#define WANT_HEBREW|' \
 		${WRKSRC}/include/config.h
 
diff --git a/irc/ezbounce/Makefile b/irc/ezbounce/Makefile
index 2c44e07479e8..6b837d44d81f 100644
--- a/irc/ezbounce/Makefile
+++ b/irc/ezbounce/Makefile
@@ -10,8 +10,6 @@ MASTER_SITES=	http://BSDforge.com/projects/source/irc/ezbounce/
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Highly configurable IRC Proxy
 
-BROKEN_powerpc64=	fails to configure: checking for boostlib >= 1.33... not found
-
 OPTIONS_DEFINE=	DOCS SSL COMPRESS
 OPTIONS_DEFAULT=SSL COMPRESS
 OPTIONS_SUB=	yes
@@ -23,7 +21,7 @@ COMPRESS_CONFIGURE_WITH=boost
 COMPRESS_DESC=		Chat log compression (requires boost)
 
 GNU_CONFIGURE=	yes
-USES=		gmake
+USES=		compiler:c++0x gmake
 USE_GCC=	any
 
 # ezbounce 1.99.15 isn't compatible with C++11 and later, which some compilers
diff --git a/irc/ircII/Makefile b/irc/ircII/Makefile
index ee99f1ad7946..1591af861966 100644
--- a/irc/ircII/Makefile
+++ b/irc/ircII/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ircii
-PORTVERSION=	20151120
-PORTREVISION=	3
+PORTVERSION=	20170704
 CATEGORIES=	irc ipv6
 MASTER_SITES=	http://ircii.warped.com/
 
diff --git a/irc/ircII/distinfo b/irc/ircII/distinfo
index 8ec49c1b528b..88c45d493e27 100644
--- a/irc/ircII/distinfo
+++ b/irc/ircII/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ircii-20151120.tar.bz2) = 5dfd3fd364a96960e1f57ade4d755474556858653e4ce64265599520378c5f65
-SIZE (ircii-20151120.tar.bz2) = 597566
+TIMESTAMP = 1541878948
+SHA256 (ircii-20170704.tar.bz2) = 4e5a70fc4577de06fd5855ab7ca0a501fd16e02d5fd34e434a2b5abac80a2eda
+SIZE (ircii-20170704.tar.bz2) = 596535
diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index d6e186b98eb1..e3da32cf784b 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -20,9 +20,6 @@ USE_GNOME=	glib20
 OPTIONS_DEFINE=	PERL PROXY SOCKS BOT DOCS TRUECOLOR CAPSICUM
 OPTIONS_DEFAULT=	PERL CAPSICUM
 
-# If we're on FreeBSD 10 don't offer the Capsicum option.
-OPTIONS_EXCLUDE_FreeBSD_10=	CAPSICUM
-
 OPTIONS_SUB=	yes
 SOCKS_DESC=	Socks proxy support
 SOCKS_CONFIGURE_WITH=	socks
diff --git a/irc/miau/Makefile b/irc/miau/Makefile
index 4633a9a941d3..2f7e170d3296 100644
--- a/irc/miau/Makefile
+++ b/irc/miau/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	miau
 PORTVERSION=	0.6.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	irc ipv6
 MASTER_SITES=	SF
 
diff --git a/irc/netwalker-ircc/Makefile b/irc/netwalker-ircc/Makefile
deleted file mode 100644
index 99eb7c70b65b..000000000000
--- a/irc/netwalker-ircc/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# Created by: Emanuel Haupt <ehaupt@critical.ch>
-# $FreeBSD$
-
-PORTNAME=	netwalker-ircc
-PORTVERSION=	0.5.0
-PORTREVISION=	2
-CATEGORIES=	irc
-MASTER_SITES=	LOCAL/ehaupt
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Lightweight curses-based IRC client
-
-LICENSE=	GPLv2
-
-# Also see PR 226177.
-DEPRECATED=	Upstream gone, very old code base, use modern irc client instead
-EXPIRATION_DATE=	2018-11-03
-
-USES=		ncurses tar:tgz
-
-LDFLAGS+=	-lncurses -lpthread
-
-.include <bsd.port.pre.mk>
-
-# Does not compile with clang 6.0.0; PR 226177.
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200056
-USE_GCC=	6
-.endif
-
-post-patch:
-	@${SED} -e "s|%%PREFIX%%|${PREFIX}|g" \
-	${WRKSRC}/config.h > ${WRKSRC}/config.h.freebsd
-	${MV} ${WRKSRC}/config.h.freebsd ${WRKSRC}/config.h
-
-do-build:
-.for file in main functions screen server user messages signals parameter userdb
-	${CXX} ${CFLAGS} -c ${WRKSRC}/${file}.cc -o ${WRKSRC}/${file}.o
-.endfor
-	${CXX} ${LDFLAGS} -L${WRKSRC}/ ${WRKSRC}/*.o -o ${WRKSRC}/netwalker
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/netwalker ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/netwalker.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/help/* ${STAGEDIR}${PREFIX}/share/netwalker-ircc
-
-.include <bsd.port.post.mk>
diff --git a/irc/netwalker-ircc/distinfo b/irc/netwalker-ircc/distinfo
deleted file mode 100644
index 2e56fe8804eb..000000000000
--- a/irc/netwalker-ircc/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (netwalker-ircc-0.5.0.tgz) = e3b62aaf80bff94527a71bb52dec58689dbc66a3bc465ae91f948d0f20902256
-SIZE (netwalker-ircc-0.5.0.tgz) = 54768
diff --git a/irc/netwalker-ircc/files/patch-config.h b/irc/netwalker-ircc/files/patch-config.h
deleted file mode 100644
index 94883a0b40dd..000000000000
--- a/irc/netwalker-ircc/files/patch-config.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- config.h.orig	Sat Dec  4 17:43:47 2004
-+++ config.h	Sat Dec  4 17:44:04 2004
-@@ -47,9 +47,9 @@
- #define PART_QUIT_MSG_LEN 256
- #define CTCP_VERSION_REPLY "Netwalker IRC-Client"
- 
--#define FILES_HELP_DIRECTORY       "/usr/share/netwalker-ircc/"
-+#define FILES_HELP_DIRECTORY       "%%PREFIX%%/share/netwalker-ircc/"
- #define FILES_HELP_INDEX_FILE      "/helpindex.asc"
--#define FILES_CONFIG_FILE          "/.netwalkerircc.conf"
-+#define FILES_CONFIG_FILE          "/.netwalkerircc"
- 
- /* some default values */
- #define DEFAULT_NICKNAME           "ABC"
diff --git a/irc/netwalker-ircc/files/patch-netwalker.1 b/irc/netwalker-ircc/files/patch-netwalker.1
deleted file mode 100644
index d35ab0499447..000000000000
--- a/irc/netwalker-ircc/files/patch-netwalker.1
+++ /dev/null
@@ -1,11 +0,0 @@
---- netwalker.1.orig	Sat Dec  4 17:44:31 2004
-+++ netwalker.1	Sat Dec  4 17:44:58 2004
-@@ -33,7 +33,7 @@
- .SH CONFIGURATION FILE
- after you used the command 'netwalker -c' there will be a
- .br
--default configuration-file (atm called: '.netwalkerircc.conf') in your home directory.
-+default configuration-file (atm called: '.netwalkerircc') in your home directory.
- .br
- Available config-file options:
- .br
diff --git a/irc/netwalker-ircc/pkg-descr b/irc/netwalker-ircc/pkg-descr
deleted file mode 100644
index 063230b4c46f..000000000000
--- a/irc/netwalker-ircc/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Netwalker is a tiny curses-based IRC client. The current version is written in
-c/cpp. Future releases are planed to be written in plain cpp. Netwalker aims to
-be a slim IRC client.
diff --git a/irc/netwalker-ircc/pkg-plist b/irc/netwalker-ircc/pkg-plist
deleted file mode 100644
index 9f5653fd4100..000000000000
--- a/irc/netwalker-ircc/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-bin/netwalker
-man/man1/netwalker.1.gz
-%%DATADIR%%/help_connect.asc
-%%DATADIR%%/help_ctcp.asc
-%%DATADIR%%/help_disconnect.asc
-%%DATADIR%%/help_help.asc
-%%DATADIR%%/help_join.asc
-%%DATADIR%%/help_me.asc
-%%DATADIR%%/help_msg.asc
-%%DATADIR%%/help_nick.asc
-%%DATADIR%%/help_part.asc
-%%DATADIR%%/help_quit.asc
-%%DATADIR%%/help_reconnect.asc
-%%DATADIR%%/help_screen.asc
-%%DATADIR%%/help_topic.asc
-%%DATADIR%%/help_who.asc
-%%DATADIR%%/helpindex.asc
diff --git a/irc/riece/Makefile b/irc/riece/Makefile
index 678fe907d93d..c8240e64258d 100644
--- a/irc/riece/Makefile
+++ b/irc/riece/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	riece
 PORTVERSION=	9.0.0
-PORTREVISION=	8
+PORTREVISION=	9
 PORTEPOCH=	1
 CATEGORIES=	irc elisp
 MASTER_SITES=	SAVANNAH
diff --git a/irc/znc-push/Makefile b/irc/znc-push/Makefile
new file mode 100644
index 000000000000..66b14a4504e1
--- /dev/null
+++ b/irc/znc-push/Makefile
@@ -0,0 +1,48 @@
+# $FreeBSD$
+
+PORTNAME=	znc-push
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.0.0-167
+DISTVERSIONSUFFIX=	-g5f95488
+CATEGORIES=	irc
+
+MAINTAINER=	dor.bsd@xm0.uk
+COMMENT=	Push notification service module for ZNC
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	znc:irc/znc
+LIB_DEPENDS=	libicudata.so:devel/icu
+RUN_DEPENDS=	znc:irc/znc
+
+USES=	gmake ssl
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	jreese
+
+# v2.0.0-{rc,dev} are ancient release candidates from 2014 for the seemingly
+# abandoned Python branch.
+PORTSCOUT=	skipv:v2.0.0-rc,v2.0.0-dev
+
+MAKE_ENV=	version=${PORTVERSION}
+
+PLIST_FILES=	lib/znc/push.so
+PORTDOCS=	*.md
+
+OPTIONS_DEFINE=	CURL DOCS
+
+CURL_DESC=	Use curl for HTTP requests
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
+CURL_MAKE_ENV=	curl=yes
+
+do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/znc
+	${INSTALL_PROGRAM} ${WRKSRC}/push.so ${STAGEDIR}${PREFIX}/lib/znc/push.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/znc/push.so
+
+do-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/README.md ${WRKSRC}/doc/*.md ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/irc/znc-push/distinfo b/irc/znc-push/distinfo
new file mode 100644
index 000000000000..7daa7e4671b8
--- /dev/null
+++ b/irc/znc-push/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1541598450
+SHA256 (jreese-znc-push-v1.0.0-167-g5f95488_GH0.tar.gz) = 0c7de33894212c455cbc6a06738f340ecc77007da13475ec1bc0575c85e4f5a9
+SIZE (jreese-znc-push-v1.0.0-167-g5f95488_GH0.tar.gz) = 497928
diff --git a/irc/znc-push/files/patch-Makefile b/irc/znc-push/files/patch-Makefile
new file mode 100644
index 000000000000..8c7a79616187
--- /dev/null
+++ b/irc/znc-push/files/patch-Makefile
@@ -0,0 +1,9 @@
+--- Makefile.orig	2018-08-27 02:38:08 UTC
++++ Makefile
+@@ -1,5 +1,4 @@
+-version = $(shell git describe --dirty || echo dev)
+-curl=no
++curl?=no
+ 
+ ifneq ($(curl),no)
+ 	flags=-DUSE_CURL -lcurl
diff --git a/irc/znc-push/pkg-descr b/irc/znc-push/pkg-descr
new file mode 100644
index 000000000000..4c16fdd8ad3a
--- /dev/null
+++ b/irc/znc-push/pkg-descr
@@ -0,0 +1,23 @@
+ZNC Push is a module for ZNC that will send notifications to multiple push
+notification services, or SMS for any private message or channel highlight that
+matches a configurable set of conditions. ZNC Push current supports the
+following services:
+
+  Boxcar
+  Boxcar 2
+  Discord
+  Faast
+  Nexmo
+  Notify My Android (NMA)
+  Prowl
+  Pushalot
+  PushBullet
+  Pushjet
+  Pushover
+  Pushsafer
+  Slack
+  Supertoasty
+  Telegram
+  Custom URL GET requests
+
+WWW: https://github.com/jreese/znc-push