5 files changed, 48 insertions, 11 deletions

diff --git a/news/nzbget/Makefile b/news/nzbget/Makefile
index 85bab1c53d4d..4c7c208e2399 100644
--- a/news/nzbget/Makefile
+++ b/news/nzbget/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	nzbget
-PORTVERSION=	19.1
-PORTREVISION=	2
+PORTVERSION=	20.0
+PORTREVISION=	0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	news
 
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
-USES=		compiler:c++14-lang ncurses pkgconfig shebangfix ssl
+USES=		autoreconf compiler:c++14-lang gmake localbase ncurses pkgconfig shebangfix ssl
 USE_RC_SUBR=	nzbget
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libcurses-includes=${NCURSESINC} \
@@ -23,10 +23,6 @@ CONFIGURE_ARGS=	--with-libcurses-includes=${NCURSESINC} \
 		--with-openssl-includes=${OPENSSLINC} \
 		--with-openssl-libraries=${OPENSSLLIB}
 
-CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}"
-MAKE_JOBS_UNSAFE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-lpthread
 BINMODE=	0755
 
 SHEBANG_FILES=	scripts/*.py
@@ -34,14 +30,17 @@ SUB_FILES=	pkg-message
 
 USE_GITHUB=	yes
 
-OPTIONS_DEFINE=	7Z PYTHON RAR DOCS
+OPTIONS_DEFINE=	7Z OPTIMIZED_FLAGS PYTHON RAR
 OPTIONS_DEFAULT=	PAR PYTHON RAR 7Z
 7Z_DESC=	Support extraction of 7z archives
+OPTIMIZED_FLAGS_DESC=	Enable optimized CPU instructions (SSE2/SSE3/NEON/etc)
 PYTHON_DESC=	Support for python post-processing scripts
 RAR_DESC=	Support extraction of rar archives
 
 7Z_RUN_DEPENDS=		7z:archivers/p7zip
 
+OPTIMIZED_FLAGS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-disable-optimized-flags.patch
+
 PYTHON_USES=		python:run
 
 RAR_RUN_DEPENDS=	unrar:archivers/unrar
diff --git a/news/nzbget/distinfo b/news/nzbget/distinfo
index 7bbb1e871e4c..4a7a3ce612cf 100644
--- a/news/nzbget/distinfo
+++ b/news/nzbget/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502370865
-SHA256 (nzbget-nzbget-v19.1_GH0.tar.gz) = 392c5aab41438faa3ad37a8497b5ff75f60cca3c9ba20c1764c592f6ce1be178
-SIZE (nzbget-nzbget-v19.1_GH0.tar.gz) = 1834888
+TIMESTAMP = 1528390488
+SHA256 (nzbget-nzbget-v20.0_GH0.tar.gz) = c04c4fca1ea226b767d922de041b3604bd9a53226878ab532e96b1ef31562361
+SIZE (nzbget-nzbget-v20.0_GH0.tar.gz) = 1952219
diff --git a/news/nzbget/files/extra-disable-optimized-flags.patch b/news/nzbget/files/extra-disable-optimized-flags.patch
new file mode 100644
index 000000000000..e138ea5bfbcd
--- /dev/null
+++ b/news/nzbget/files/extra-disable-optimized-flags.patch
@@ -0,0 +1,16 @@
+--- configure.ac.orig	2018-06-06 19:34:34 UTC
++++ configure.ac
+@@ -569,12 +569,8 @@ case $host_cpu in
+ 		USE_SIMD=yes
+ 		;;
+ esac
++USE_SIMD=no
+ AC_MSG_RESULT($USE_SIMD)
+-AC_SUBST([SSE2_CXXFLAGS])
+-AC_SUBST([SSSE3_CXXFLAGS])
+-AC_SUBST([PCLMUL_CXXFLAGS])
+-AC_SUBST([NEON_CXXFLAGS])
+-AC_SUBST([ACLECRC_CXXFLAGS])
+ 
+ 
+ dnl 
diff --git a/news/nzbget/files/patch-configure.ac b/news/nzbget/files/patch-configure.ac
new file mode 100644
index 000000000000..727d6b320cfa
--- /dev/null
+++ b/news/nzbget/files/patch-configure.ac
@@ -0,0 +1,20 @@
+--- configure.ac.orig	2018-06-06 19:34:34 UTC
++++ configure.ac
+@@ -37,7 +37,7 @@ dnl Check for programs.
+ dnl
+ AC_PROG_CXX
+ AC_PATH_PROG(TAR, tar, $FALSE)
+-AC_PATH_PROG(MAKE, make, $FALSE)
++AC_PATH_PROG(MAKE, gmake, $FALSE)
+ AC_PROG_INSTALL
+ 
+ 
+@@ -553,7 +553,7 @@ dnl
+ AC_MSG_CHECKING(whether to use SIMD-optimized routines)
+ USE_SIMD=no
+ case $host_cpu in
+-	i?86|x86_64)
++	i?86|x86_64|amd64)
+ 		SSE2_CXXFLAGS="-msse2"
+ 		SSSE3_CXXFLAGS="-mssse3"
+ 		PCLMUL_CXXFLAGS="-msse4.1 -mpclmul"
diff --git a/news/nzbget/pkg-plist b/news/nzbget/pkg-plist
index 092db15acdb5..3055dcc33746 100644
--- a/news/nzbget/pkg-plist
+++ b/news/nzbget/pkg-plist
@@ -15,6 +15,8 @@ bin/nzbget
 %%DATADIR%%/webui/history.js
 %%DATADIR%%/webui/img/download-anim-green-2x.png
 %%DATADIR%%/webui/img/download-anim-orange-2x.png
+%%DATADIR%%/webui/img/favicon-256x256-opaque.png
+%%DATADIR%%/webui/img/favicon-256x256.png
 %%DATADIR%%/webui/img/favicon.ico
 %%DATADIR%%/webui/img/icons-2x.png
 %%DATADIR%%/webui/img/icons.png