23 files changed, 6 insertions, 256 deletions

diff --git a/MOVED b/MOVED
index 3230c9961685..13af7b77e7c1 100644
--- a/MOVED
+++ b/MOVED
@@ -10210,3 +10210,9 @@ devel/hs-text||2018-05-25|Removed, no longer supported
 science/hs-bio||2018-05-25|Removed, no longer supported
 textproc/hs-parsec||2018-05-25|Removed, no longer supported
 audio/calf|audio/calf-lv2|2018-05-27|Added -lv2 suffix: the port mostly provides LV2 plugins
+net/rubygem-gitaly-proto083|net/rubygem-gitaly-proto|2018-06-01|Has expired: Obsoleted by update of www/gitlab. Please use net/rubygem-gitaly-proto instead.
+net/rubygem-gitaly-proto084|net/rubygem-gitaly-proto|2018-06-01|Has expired: Obsoleted by update of www/gitlab. Please use net/rubygem-gitaly-proto instead
+textproc/rubygem-github-linguist47|textproc/rubygem-github-linguist|2018-06-01|Has expired: Obsoleted by update of www/gitlab. Please use textproc/rubygem-github-linguist instead
+textproc/rubygem-loofah20|textproc/rubygem-loofah|2018-06-01|Has expired: Obsoleted by update of www/gitlab. Please use textproc/rubygem-loofah instead.
+www/npm-node4|www/npm|2018-06-01|Has expired: Use www/npm instead
+emulators/qemu-launcher||2018-06-01|Has expired: Upstream is gone
diff --git a/emulators/Makefile b/emulators/Makefile
index 9f104ad9d54b..a822425d06c9 100644
--- a/emulators/Makefile
+++ b/emulators/Makefile
@@ -117,7 +117,6 @@
     SUBDIR += qemu
     SUBDIR += qemu-cheri
     SUBDIR += qemu-devel
-    SUBDIR += qemu-launcher
     SUBDIR += qemu-ppcnv
     SUBDIR += qemu-riscv
     SUBDIR += qemu-sbruno
diff --git a/emulators/qemu-launcher/Makefile b/emulators/qemu-launcher/Makefile
deleted file mode 100644
index 2538561a3823..000000000000
--- a/emulators/qemu-launcher/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	qemu-launcher
-PORTVERSION=	1.7.4
-PORTREVISION=	6
-CATEGORIES=	emulators
-MASTER_SITES=	http://download.gna.org/qemulaunch/1.7.x/
-DISTNAME=	${PORTNAME}_${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	GTK front-end to Qemu
-
-DEPRECATED=	Upstream is gone
-EXPIRATION_DATE=	2018-05-31
-
-RUN_DEPENDS=	p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
-		p5-Glade2>=0:x11-toolkits/p5-Glade2 \
-		p5-Locale-gettext>=0:devel/p5-Locale-gettext
-
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
-NO_BUILD=	yes
-USE_GNOME=	gtk20
-INSTALLS_ICONS=	yes
-USES=		gettext perl5
-
-post-patch:
-	@${REINPLACE_CMD} -e 's,/usr,${PREFIX},g' ${WRKSRC}/qemu-launcher.pl
-	@${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},g' ${WRKSRC}/Makefile
-
-.include <bsd.port.mk>
diff --git a/emulators/qemu-launcher/distinfo b/emulators/qemu-launcher/distinfo
deleted file mode 100644
index e7c15114f359..000000000000
--- a/emulators/qemu-launcher/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (qemu-launcher_1.7.4.tar.gz) = 6d55c6e15b1733ca5d580a8eca7505124acb0a15948429b99dc8f700bb05efe6
-SIZE (qemu-launcher_1.7.4.tar.gz) = 60011
diff --git a/emulators/qemu-launcher/files/patch-Makefile b/emulators/qemu-launcher/files/patch-Makefile
deleted file mode 100644
index b20c7e508ab6..000000000000
--- a/emulators/qemu-launcher/files/patch-Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
---- Makefile.orig	Fri Sep 29 14:04:21 2006
-+++ Makefile	Mon Nov 13 15:29:22 2006
-@@ -3,12 +3,12 @@
- 
- # Intall things to the following directories
- PREFIX = /usr/local
--MANDIR = $(PREFIX)/share/man/man1
-+MANDIR = $(PREFIX)/man/man1
- BINDIR = $(PREFIX)/bin
- SHAREDIR = $(PREFIX)/share/qemu-launcher
--PIXMAPSDIR = $(PREFIX)/share/pixmaps
--ICONSDIR = $(PREFIX)/share/icons/hicolor
--DOCSDIR = $(PREFIX)/share/doc/qemu-launcher
-+PIXMAPSDIR = $(SHAREDIR)/pixmaps
-+ICONSDIR = $(SHAREDIR)/icons/hicolor
-+DOCSDIR = $(SHAREDIR)/doc
- LOCALEDIR = $(PREFIX)/share/locale
- APPLICATIONSDIR = $(PREFIX)/share/applications
- 
-@@ -50,7 +50,7 @@
- 
- 	install -d $(DESTDIR)$(MANDIR)
- 	install -m644 $(MANPAGE) $(DESTDIR)$(MANDIR)
--	gzip --best $(DESTDIR)$(MANDIR)/$(MANPAGE)
-+	#gzip --best $(DESTDIR)$(MANDIR)/$(MANPAGE)
- 
- 	install -d $(DESTDIR)$(APPLICATIONSDIR)
- 	install -m644 $(MENUFILE) $(DESTDIR)$(APPLICATIONSDIR)
diff --git a/emulators/qemu-launcher/pkg-descr b/emulators/qemu-launcher/pkg-descr
deleted file mode 100644
index fdac652de2c6..000000000000
--- a/emulators/qemu-launcher/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Qemu Launcher is a GTK front-end for the Qemu x86 PC emulator.
-
-WWW: https://gna.org/projects/qemulaunch
diff --git a/emulators/qemu-launcher/pkg-plist b/emulators/qemu-launcher/pkg-plist
deleted file mode 100644
index e594c7c9c46b..000000000000
--- a/emulators/qemu-launcher/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-bin/qemu-launcher
-man/man1/qemu-launcher.1.gz
-%%DATADIR%%/qemulauncher.png
-%%DATADIR%%/window-icon.png
-%%DATADIR%%/qemulauncher.glade
-%%DATADIR%%/doc/README
-%%DATADIR%%/doc/TODO
-share/applications/qemu-launcher.desktop
-share/locale/lt/LC_MESSAGES/qemu-launcher.mo
-%%DATADIR%%/pixmaps/qemu-launcher-16x16.xpm
-%%DATADIR%%/pixmaps/qemu-launcher-32x32.xpm
-%%DATADIR%%/icons/hicolor/scalable/apps/qemu-launcher.svg
-%%DATADIR%%/icons/hicolor/16x16/apps/qemu-launcher.png
-%%DATADIR%%/icons/hicolor/48x48/apps/qemu-launcher.png
diff --git a/net/Makefile b/net/Makefile
index 8384a2c0b499..1db689fa401a 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1266,8 +1266,6 @@
     SUBDIR += rubygem-geoip
     SUBDIR += rubygem-gitaly
     SUBDIR += rubygem-gitaly-proto
-    SUBDIR += rubygem-gitaly-proto083
-    SUBDIR += rubygem-gitaly-proto084
     SUBDIR += rubygem-gitaly-proto088
     SUBDIR += rubygem-gitaly-proto094
     SUBDIR += rubygem-gitaly-proto095
diff --git a/net/rubygem-gitaly-proto083/Makefile b/net/rubygem-gitaly-proto083/Makefile
deleted file mode 100644
index fa6c52639a9c..000000000000
--- a/net/rubygem-gitaly-proto083/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	gitaly-proto
-PORTVERSION=	0.83.0
-CATEGORIES=	net rubygems
-MASTER_SITES=	RG
-PKGNAMESUFFIX=	083
-
-MAINTAINER=	mfechner@FreeBSD.org
-COMMENT=	Protobuf specifications and client libraries for Gitaly
-
-LICENSE=	MIT
-
-DEPRECATED=	Obsoleted by update of www/gitlab. Please use net/rubygem-gitaly-proto instead.
-EXPIRATION_DATE=	2018-05-31
-
-RUN_DEPENDS=	rubygem-google-protobuf>=3.1:devel/rubygem-google-protobuf \
-		rubygem-grpc>=1.0:net/rubygem-grpc
-
-PORTSCOUT=	limit:^0\.83\.
-
-NO_ARCH=	yes
-USES=		gem
-USE_RUBY=	yes
-
-.include <bsd.port.mk>
diff --git a/net/rubygem-gitaly-proto083/distinfo b/net/rubygem-gitaly-proto083/distinfo
deleted file mode 100644
index 1b29b90d8f0e..000000000000
--- a/net/rubygem-gitaly-proto083/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1517316506
-SHA256 (rubygem/gitaly-proto-0.83.0.gem) = 1bf399f33d784e65538815f82d51c6e869312a7b15fe84a1d666600282d76a7c
-SIZE (rubygem/gitaly-proto-0.83.0.gem) = 15360
diff --git a/net/rubygem-gitaly-proto083/pkg-descr b/net/rubygem-gitaly-proto083/pkg-descr
deleted file mode 100644
index 2886a66d5b68..000000000000
--- a/net/rubygem-gitaly-proto083/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Gitaly is part of GitLab. It is a server application that uses its own gRPC
-protocol to communicate with its clients. This repository contains the protocol
-definition and automatically generated wrapper code for Go and Ruby.
-
-The .proto files define the remote procedure calls for interacting with Gitaly.
-We keep auto-generated client libraries for Ruby and Go in their respective
-subdirectories.
-
-Use the make generate script from the root of the repository to regenerate the
-client libraries after updating .proto files.
-
-WWW: https://gitlab.com/gitlab-org/gitaly-proto
diff --git a/net/rubygem-gitaly-proto084/Makefile b/net/rubygem-gitaly-proto084/Makefile
deleted file mode 100644
index 7d654d0883a1..000000000000
--- a/net/rubygem-gitaly-proto084/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	gitaly-proto
-PORTVERSION=	0.84.0
-CATEGORIES=	net rubygems
-MASTER_SITES=	RG
-PKGNAMESUFFIX=	084
-
-MAINTAINER=	mfechner@FreeBSD.org
-COMMENT=	Protobuf specifications and client libraries for Gitaly
-
-LICENSE=	MIT
-
-DEPRECATED=	Obsoleted by update of www/gitlab. Please use net/rubygem-gitaly-proto instead
-EXPIRATION_DATE=	2018-05-31
-
-RUN_DEPENDS=	rubygem-google-protobuf>=3.1:devel/rubygem-google-protobuf \
-		rubygem-grpc>=1.0:net/rubygem-grpc
-
-CONFLICTS_INSTALL=	rubygem-gitaly-proto
-
-PORTSCOUT=	limit:^0\.84\.
-
-NO_ARCH=	yes
-USES=		gem
-USE_RUBY=	yes
-
-.include <bsd.port.mk>
diff --git a/net/rubygem-gitaly-proto084/distinfo b/net/rubygem-gitaly-proto084/distinfo
deleted file mode 100644
index 4baadbd2b2f9..000000000000
--- a/net/rubygem-gitaly-proto084/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1517673283
-SHA256 (rubygem/gitaly-proto-0.84.0.gem) = 885372a594214be5f4a8c49d739081551ce19d5d5b5ee207e81771b65e391417
-SIZE (rubygem/gitaly-proto-0.84.0.gem) = 15360
diff --git a/net/rubygem-gitaly-proto084/pkg-descr b/net/rubygem-gitaly-proto084/pkg-descr
deleted file mode 100644
index 2886a66d5b68..000000000000
--- a/net/rubygem-gitaly-proto084/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Gitaly is part of GitLab. It is a server application that uses its own gRPC
-protocol to communicate with its clients. This repository contains the protocol
-definition and automatically generated wrapper code for Go and Ruby.
-
-The .proto files define the remote procedure calls for interacting with Gitaly.
-We keep auto-generated client libraries for Ruby and Go in their respective
-subdirectories.
-
-Use the make generate script from the root of the repository to regenerate the
-client libraries after updating .proto files.
-
-WWW: https://gitlab.com/gitlab-org/gitaly-proto
diff --git a/textproc/Makefile b/textproc/Makefile
index c1f84a3ce89f..eea77b192631 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1528,7 +1528,6 @@
     SUBDIR += rubygem-gemoji
     SUBDIR += rubygem-gherkin
     SUBDIR += rubygem-github-linguist
-    SUBDIR += rubygem-github-linguist47
     SUBDIR += rubygem-github-linguist53
     SUBDIR += rubygem-github-markup
     SUBDIR += rubygem-gitlab-grit
@@ -1564,7 +1563,6 @@
     SUBDIR += rubygem-liquid-tag-parser
     SUBDIR += rubygem-loggability
     SUBDIR += rubygem-loofah
-    SUBDIR += rubygem-loofah20
     SUBDIR += rubygem-ltsv
     SUBDIR += rubygem-markaby
     SUBDIR += rubygem-multi_xml
diff --git a/textproc/rubygem-github-linguist47/Makefile b/textproc/rubygem-github-linguist47/Makefile
deleted file mode 100644
index ce661eaaec9f..000000000000
--- a/textproc/rubygem-github-linguist47/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	github-linguist
-PORTVERSION=	4.7.6
-CATEGORIES=	textproc rubygems
-MASTER_SITES=	RG
-PKGNAMESUFFIX=	47
-
-MAINTAINER=	ruby@FreeBSD.org
-COMMENT=	GitHub Language detection
-
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-DEPRECATED=	Obsoleted by update of www/gitlab. Please use textproc/rubygem-github-linguist instead
-EXPIRATION_DATE=	2018-05-31
-
-RUN_DEPENDS=	rubygem-charlock_holmes>=0.7.3:textproc/rubygem-charlock_holmes \
-		rubygem-escape_utils11>=1.1.0:textproc/rubygem-escape_utils11 \
-		rubygem-mime-types>=1.19:misc/rubygem-mime-types \
-		rubygem-rugged>=0.23.0b:devel/rubygem-rugged
-
-USES=		gem
-USE_RUBY=	yes
-
-NO_ARCH=	yes
-# bin/linguist
-CONFLICTS_INSTALL=	qtchooser rubygem-github-linguist rubygem-gitlab-linguist
-PLIST_FILES=	bin/git-linguist bin/linguist
-
-PORTSCOUT=	limit:^4\.7\.
-
-.include <bsd.port.mk>
diff --git a/textproc/rubygem-github-linguist47/distinfo b/textproc/rubygem-github-linguist47/distinfo
deleted file mode 100644
index bc900f045a71..000000000000
--- a/textproc/rubygem-github-linguist47/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (rubygem/github-linguist-4.7.6.gem) = cd45dd2f9a61063406f1cd2c0782d5f1cad0fcd3b22d54adbc473bf9bd481c31
-SIZE (rubygem/github-linguist-4.7.6.gem) = 724992
diff --git a/textproc/rubygem-github-linguist47/pkg-descr b/textproc/rubygem-github-linguist47/pkg-descr
deleted file mode 100644
index 62545c9ca504..000000000000
--- a/textproc/rubygem-github-linguist47/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-GitHub Language detection
-
-WWW: https://github.com/github/linguist
diff --git a/textproc/rubygem-loofah20/Makefile b/textproc/rubygem-loofah20/Makefile
deleted file mode 100644
index 394f634964f0..000000000000
--- a/textproc/rubygem-loofah20/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	loofah
-PORTVERSION=	2.0.3
-CATEGORIES=	textproc rubygems
-MASTER_SITES=	RG
-PKGNAMESUFFIX=	20
-
-MAINTAINER=	mfechner@FreeBSD.org
-COMMENT=	Library for manipulating HTML/XML documents and fragments
-
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/MIT-LICENSE.txt
-
-DEPRECATED=	Obsoleted by update of www/gitlab. Please use textproc/rubygem-loofah instead.
-EXPIRATION_DATE=	2018-05-31
-
-RUN_DEPENDS=	rubygem-nokogiri>=1.5.9:textproc/rubygem-nokogiri
-
-PORTSCOUT=	limit:^2\.0
-
-NO_ARCH=	yes
-USES=		gem
-USE_RUBY=	yes
-
-.include <bsd.port.mk>
diff --git a/textproc/rubygem-loofah20/distinfo b/textproc/rubygem-loofah20/distinfo
deleted file mode 100644
index d22bb89cb8cf..000000000000
--- a/textproc/rubygem-loofah20/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1518178268
-SHA256 (rubygem/loofah-2.0.3.gem) = 48c76e74f25229e0f492c2aaf770253fe44b162a0d18c2de1c59831b44d13781
-SIZE (rubygem/loofah-2.0.3.gem) = 60416
diff --git a/textproc/rubygem-loofah20/pkg-descr b/textproc/rubygem-loofah20/pkg-descr
deleted file mode 100644
index 8297b2c03435..000000000000
--- a/textproc/rubygem-loofah20/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Loofah is a general library for manipulating HTML/XML documents and fragments.
-It's built on top of Nokogiri and libxml2, so it's fast and has a nice API.
-Loofah excels at HTML sanitization (XSS prevention). It includes some nice HTML
-sanitizers, which are based on HTML5lib's whitelist.
-
-WWW: https://github.com/flavorjones/loofah
diff --git a/www/Makefile b/www/Makefile
index cb47856adca4..8a025be3ad3d 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -534,7 +534,6 @@
     SUBDIR += npapi-xine
     SUBDIR += npc
     SUBDIR += npm
-    SUBDIR += npm-node4
     SUBDIR += npm-node6
     SUBDIR += npm-node8
     SUBDIR += nspluginwrapper
diff --git a/www/npm-node4/Makefile b/www/npm-node4/Makefile
deleted file mode 100644
index 80aaee8ef175..000000000000
--- a/www/npm-node4/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-# $FreeBSD$
-
-PKGNAMESUFFIX=	-node4
-
-CONFLICTS_INSTALL=	npm npm-node6 npm-node8 npm2 npm3 npm4
-
-DEPRECATED=	Use www/npm instead
-EXPIRATION_DATE=2018-05-31
-
-OPTIONS_EXCLUDE=NODE NODE6 NODE8
-OPTIONS_SLAVE=	NODE4
-
-MASTERDIR=	${.CURDIR}/../npm
-
-.include "${MASTERDIR}/Makefile"