From 1f186ef2f2c2d4cf96ab374ff9667c827d3877ad Mon Sep 17 00:00:00 2001
From: Tobias Kortkamp <tobik@FreeBSD.org>
Date: Tue, 11 Aug 2020 17:05:56 +0000
Subject: [PATCH] Clean up some things

Reported by:	portscan (some of it)
---
 devel/libgudev/Makefile       | 3 +--
 java/icedtea-web/Makefile     | 8 +++++---
 java/icedtea-web/distinfo     | 4 ++--
 www/Makefile                  | 1 +
 www/rt42/Makefile             | 2 +-
 x11-fonts/libertinus/Makefile | 2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/devel/libgudev/Makefile b/devel/libgudev/Makefile
index ed17b410e97d..deec4fa703c4 100644
--- a/devel/libgudev/Makefile
+++ b/devel/libgudev/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	libgudev
 PORTVERSION=	233
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=sources/libgudev/${PORTVERSION}
+MASTER_SITES=	GNOME
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	GObject bindings for libudev
diff --git a/java/icedtea-web/Makefile b/java/icedtea-web/Makefile
index 6254ccfc4c85..c8ff82549f43 100644
--- a/java/icedtea-web/Makefile
+++ b/java/icedtea-web/Makefile
@@ -2,11 +2,10 @@
 
 PORTNAME=	icedtea-web
 PORTVERSION=	1.8.4
+DISTVERSIONPREFIX=	icedtea-web-
 PORTREVISION=	3
 CATEGORIES=	java www
-MASTER_SITES=	https://github.com/AdoptOpenJDK/IcedTea-Web/archive/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-WRKSRC=		${WRKDIR}/IcedTea-Web-icedtea-web-1.8.4
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Free Java plug-in and Java Web Start for OpenJDK
@@ -14,7 +13,7 @@ COMMENT=	Free Java plug-in and Java Web Start for OpenJDK
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	zip:archivers/zip \
-		rustc:lang/rust \
+		rustc:lang/${RUST_DEFAULT} \
 		bash:shells/bash \
 		gsed:textproc/gsed \
 		${HAMCREST_JAR}:java/hamcrest \
@@ -31,6 +30,9 @@ JAVA_VENDOR=	openjdk
 USE_PERL5=	build
 USE_XORG=	x11
 USES=		autoreconf desktop-file-utils gmake perl5 pkgconfig shebangfix xorg
+USE_GITHUB=	yes
+GH_ACCOUNT=	AdoptOpenJDK
+GH_PROJECT=	IcedTea-Web
 SHEBANG_FILES=	jrunscript.in shell-launcher/launchers.sh.in
 
 CONFIGURE_ARGS=		--with-hamcrest="${HAMCREST_JAR}"
diff --git a/java/icedtea-web/distinfo b/java/icedtea-web/distinfo
index a1f84044cb23..bc9bc6e702fa 100644
--- a/java/icedtea-web/distinfo
+++ b/java/icedtea-web/distinfo
@@ -1,5 +1,5 @@
 TIMESTAMP = 1529752635
-SHA256 (icedtea-web-1.8.4.tar.gz) = a0c12cd2d7793f05428a02e49159c7f3f70694f48e23787ffdb6588b0db7c862
-SIZE (icedtea-web-1.8.4.tar.gz) = 2358591
+SHA256 (AdoptOpenJDK-IcedTea-Web-icedtea-web-1.8.4_GH0.tar.gz) = a0c12cd2d7793f05428a02e49159c7f3f70694f48e23787ffdb6588b0db7c862
+SIZE (AdoptOpenJDK-IcedTea-Web-icedtea-web-1.8.4_GH0.tar.gz) = 2358591
 SHA256 (libxul-npapi-headers-45.9.0.tar.gz) = 625d86955aef95c7a0a4c192bb51a1e7833d30c2d53e390d07f97abd835744f8
 SIZE (libxul-npapi-headers-45.9.0.tar.gz) = 15637
diff --git a/www/Makefile b/www/Makefile
index 9094c34b6c77..9ec71c8234db 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -375,6 +375,7 @@
     SUBDIR += mod_fileiri
     SUBDIR += mod_gnutls
     SUBDIR += mod_h264_streaming
+    SUBDIR += mod_http2
     SUBDIR += mod_jk
     SUBDIR += mod_limitipconn2
     SUBDIR += mod_line_edit
diff --git a/www/rt42/Makefile b/www/rt42/Makefile
index f9c6845bd3fd..faaf49238c20 100644
--- a/www/rt42/Makefile
+++ b/www/rt42/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Industrial-grade ticketing system written in Perl
 LICENSE=	GPLv2
 
 DEPRECATED=	Upstream support is ending; please migrate to RT-5.0 (www/rt50)
-EXPIRY_DATE=	2021-02-01
+EXPIRATION_DATE=	2021-02-01
 
 CONFLICTS_INSTALL=	rt44-4.4* brlcad-[0-9]*
 
diff --git a/x11-fonts/libertinus/Makefile b/x11-fonts/libertinus/Makefile
index 84c5d02f87fb..b76df24bea79 100644
--- a/x11-fonts/libertinus/Makefile
+++ b/x11-fonts/libertinus/Makefile
@@ -15,7 +15,7 @@ USES=		fonts
 USE_GITHUB=	yes
 GH_ACCOUNT=	alerque
 
-MO_ARCH=	yes
+NO_ARCH=	yes
 NO_BUILD=	yes
 
 do-install: