cleanup: Remove expired ports:

2021-10-31 devel/sdl_sge: Upstream no longer maintained
2021-12-31 net/appkonference: Outdated, depends on unsupported version of net/asterisk
2021-12-31 dns/bind911: End of life, please migrate to a newer version of BIND9
2021-12-31 net/zebra: Abandoned upstream, last release in 2005. Consider migrating to net/frr7 or net/bird2
2021-12-31 audio/osalp: Abandoned upstream, listed as beta and no new release since 2008
2021-12-31 games/stransball2: Depends on expired devel/sdl_sge
2021-12-31 devel/rubygem-ruby-sdl-ffi: Depends on expired devel/sdl_sge
2021-12-31 devel/rubygem-rubygame: Depends on expired devel/sdl_sge
2021-12-31 devel/ruby-sdl: Depends on expired devel/sdl_sge
2021-12-31 games/magicmaze: Depends on expired devel/sdl_sge
2021-12-31 games/trophy: Depends on expired devel/clanlib1
2021-12-31 devel/clanlib1: Older than expired and removed devel/clanlib
2021-12-31 www/py-django31: Upgrade to Django 3.2+. Mainstream support ended (April 6, 2021). Extended support ends December 2021. See https://www.djangoproject.com/download/
2021-12-31 www/py-dj31-django-prometheus: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
2021-12-31 databases/postgis24: Deprecated in favour of databases/postgis3x
2021-12-31 net-im/ekiga: Last release in 2013, not actively maintained
2021-12-31 sysutils/sample: abandoned upstream, incompatible with newer kernels
2021-12-31 www/mediawiki131: Upstream EOL
2021-12-31 www/py-dj31-django-mptt: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
2021-12-31 net/py-flask-xml-rpc: No longer maintained upstream
2021-12-31 audio/libaacplus: Abandoned upstream, no new release since 2011
2021-12-31 security/obfsclient: https://github.com/Yawning/obfsclient/issues/37
2021-12-31 devel/eric6: Uses EOL Python 2.7 via www/py-qt5-webengine
2021-12-31 www/grafana: No longer maintained upstream, use www/grafana8
2021-12-31 www/py-dj31-django-auth-ldap: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
2021-12-31 www/py-dj31-django-filter: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
2021-12-31 www/py-dj31-drf-yasg: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
2021-12-31 www/py-dj31-django-js-asset: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
2021-12-31 www/py-dj31-django-timezone-field: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
2021-12-31 www/py-dj31-django-tables2: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
2021-12-31 www/py-dj31-django-taggit: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
2021-12-31 graphics/librasterlite: Deprecated in favour of graphics/librasterlite2
2021-12-31 www/py-dj31-django-cacheops: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
2021-12-31 net-mgmt/p0f2: newer version available in net-mgmt/p0f
2021-12-31 devel/libhash: Abandoned upstream
2021-12-31 www/py-dj31-django-debug-toolbar: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
2021-12-31 www/py-dj31-django-cors-headers: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
2021-12-31 audio/flake: Abandoned upstream, no new release since 2007
2021-12-31 audio/ifp-line: Abandoned upstream, no new release since 2005
2021-12-31 audio/libnjb: Abandoned upstream, no new release since 2011
2021-12-31 audio/lpac: Abandoned upstream in 2003
2021-12-31 multimedia/mmsclient: Abandoned upstream, Microsoft deprecated MMS in 2003
2021-12-31 www/plugger: Uses incompatible plugin interface NPAPI
2021-12-31 audio/mpiosh: Abandoned upstream, no new release since 2004
2021-12-31 audio/rplay: Abandoned upstream, no new releases since 1999
2021-12-31 audio/celt: Deprecated and considered obsolete by upstream in 2016 in favour of (lib)opus
2021-12-31 security/nacl: Unmaintained by upstream, use libsodium instead
2021-12-31 net-mgmt/unifi-poller: Now called unpoller by upstream
2021-12-31 lang/nml: Abandoned upstream, last release 2004-04-19
2021-12-31 audio/mp32ogg: Abandoned upstream and unfetchable from upstream
2021-12-31 net/libstorj: Deprecated in favour of net/storj due to v3 rearchitecture
2021-12-31 devel/yasm-devel: No need to keep the -devel version due to upstream inactivity
2021-12-31 www/py-dj31-django-redis: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
2021-12-31 devel/py-dj31-django-rq: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
2021-12-31 graphics/libreatlas: Abandoned upstream, no new release since 2012
2021-12-31 www/py-dj31-djangorestframework: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/

323 files changed, 56 insertions, 13422 deletions

diff --git a/MOVED b/MOVED
index 17fcac93cb5a..ec5969f1789c 100644
--- a/MOVED
+++ b/MOVED
@@ -16702,3 +16702,59 @@ x11-toolkits/rubygem-vte|x11-toolkits/rubygem-vte3|2021-12-21|Remove obsoleted p
 sysutils/asmon||2021-12-27|Has expired: Fails to build on modern FreeBSD
 java/intellij-rubymine|devel/rubymine|2021-12-31|Use better name and category
 lang/python36||2021-12-31|Has expired: Upgrade to a newer Python version. 3.6 is in maintenance status and gets security fixes only. End-of-Life: 2021-12-23. See https://devguide.python.org/
+devel/sdl_sge||2021-12-31|Has expired: Upstream no longer maintained
+net/appkonference||2021-12-31|Has expired: Outdated, depends on unsupported version of net/asterisk
+dns/bind911|dns/bind916|2021-12-31|Has expired: End of life, please migrate to a newer version of BIND9
+net/zebra||2021-12-31|Has expired: Abandoned upstream, last release in 2005. Consider migrating to net/frr7 or net/bird2
+audio/osalp||2021-12-31|Has expired: Abandoned upstream, listed as beta and no new release since 2008
+games/stransball2||2021-12-31|Has expired: Depends on expired devel/sdl_sge
+devel/rubygem-ruby-sdl-ffi||2021-12-31|Has expired: Depends on expired devel/sdl_sge
+devel/rubygem-rubygame||2021-12-31|Has expired: Depends on expired devel/sdl_sge
+devel/ruby-sdl||2021-12-31|Has expired: Depends on expired devel/sdl_sge
+games/magicmaze||2021-12-31|Has expired: Depends on expired devel/sdl_sge
+games/trophy||2021-12-31|Has expired: Depends on expired devel/clanlib1
+devel/clanlib1||2021-12-31|Has expired: Older than expired and removed devel/clanlib
+www/py-django31||2021-12-31|Has expired: Upgrade to Django 3.2+. Mainstream support ended (April 6, 2021). Extended support ends December 2021. See https://www.djangoproject.com/download/
+www/py-dj31-django-prometheus||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
+databases/postgis24||2021-12-31|Has expired: Deprecated in favour of databases/postgis3x
+net-im/ekiga||2021-12-31|Has expired: Last release in 2013, not actively maintained
+sysutils/sample||2021-12-31|Has expired: abandoned upstream, incompatible with newer kernels
+www/mediawiki131||2021-12-31|Has expired: Upstream EOL
+www/py-dj31-django-mptt||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
+net/py-flask-xml-rpc||2021-12-31|Has expired: No longer maintained upstream
+audio/libaacplus||2021-12-31|Has expired: Abandoned upstream, no new release since 2011
+security/obfsclient||2021-12-31|Has expired: https://github.com/Yawning/obfsclient/issues/37
+devel/eric6||2021-12-31|Has expired: Uses EOL Python 2.7 via www/py-qt5-webengine
+www/grafana||2021-12-31|Has expired: No longer maintained upstream, use www/grafana8
+www/py-dj31-django-auth-ldap||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
+www/py-dj31-django-filter||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
+www/py-dj31-drf-yasg||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
+www/py-dj31-django-js-asset||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
+www/py-dj31-django-timezone-field||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
+www/py-dj31-django-tables2||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
+www/py-dj31-django-taggit||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
+graphics/librasterlite|graphics/librasterlite2|2021-12-31|Has expired: Deprecated in favour of graphics/librasterlite2
+www/py-dj31-django-cacheops||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
+net-mgmt/p0f2|net-mgmt/p0f|2021-12-31|Has expired: newer version available in net-mgmt/p0f
+devel/libhash||2021-12-31|Has expired: Abandoned upstream
+www/py-dj31-django-debug-toolbar||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
+www/py-dj31-django-cors-headers||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
+audio/flake||2021-12-31|Has expired: Abandoned upstream, no new release since 2007
+audio/ifp-line||2021-12-31|Has expired: Abandoned upstream, no new release since 2005
+audio/libnjb||2021-12-31|Has expired: Abandoned upstream, no new release since 2011
+audio/lpac||2021-12-31|Has expired: Abandoned upstream in 2003
+multimedia/mmsclient||2021-12-31|Has expired: Abandoned upstream, Microsoft deprecated MMS in 2003
+www/plugger||2021-12-31|Has expired: Uses incompatible plugin interface NPAPI
+audio/mpiosh||2021-12-31|Has expired: Abandoned upstream, no new release since 2004
+audio/rplay||2021-12-31|Has expired: Abandoned upstream, no new releases since 1999
+audio/celt||2021-12-31|Has expired: Deprecated and considered obsolete by upstream in 2016 in favour of (lib)opus
+security/nacl|security/libsodium|2021-12-31|Has expired: Unmaintained by upstream, use libsodium instead
+net-mgmt/unifi-poller||2021-12-31|Has expired: Now called unpoller by upstream
+lang/nml||2021-12-31|Has expired: Abandoned upstream, last release 2004-04-19
+audio/mp32ogg||2021-12-31|Has expired: Abandoned upstream and unfetchable from upstream
+net/libstorj|net/storj|2021-12-31|Has expired: Deprecated in favour of net/storj due to v3 rearchitecture
+devel/yasm-devel|devel/yasm|2021-12-31|Has expired: No need to keep the -devel version due to upstream inactivity
+www/py-dj31-django-redis||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
+devel/py-dj31-django-rq||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
+graphics/libreatlas||2021-12-31|Has expired: Abandoned upstream, no new release since 2012
+www/py-dj31-djangorestframework||2021-12-31|Has expired: Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
diff --git a/audio/Makefile b/audio/Makefile
index 09bf06dab283..07fb59bb0ef2 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -80,7 +80,6 @@
     SUBDIR += cd2mp3
     SUBDIR += cddb-bundle
     SUBDIR += cdparanoia
-    SUBDIR += celt
     SUBDIR += checkmate
     SUBDIR += cheesecutter
     SUBDIR += chordpack
@@ -187,7 +186,6 @@
     SUBDIR += flac
     SUBDIR += flac123
     SUBDIR += flacon
-    SUBDIR += flake
     SUBDIR += flite
     SUBDIR += fluid-soundfont
     SUBDIR += fluida-lv2
@@ -318,7 +316,6 @@
     SUBDIR += id3ren
     SUBDIR += id3tool
     SUBDIR += id3v2
-    SUBDIR += ifp-line
     SUBDIR += infamous-plugins-lv2
     SUBDIR += inscore
     SUBDIR += intersect-lv2
@@ -353,7 +350,6 @@
     SUBDIR += lenticular-lv2
     SUBDIR += lewton
     SUBDIR += liba52
-    SUBDIR += libaacplus
     SUBDIR += libadplug
     SUBDIR += libaiff
     SUBDIR += libamrnb
@@ -402,7 +398,6 @@
     SUBDIR += libmusicbrainz5
     SUBDIR += libmusicxml
     SUBDIR += libmysofa
-    SUBDIR += libnjb
     SUBDIR += libnoise
     SUBDIR += libogg
     SUBDIR += liboggz
@@ -454,7 +449,6 @@
     SUBDIR += logitechmediaserver-sqlplaylist
     SUBDIR += logitechmediaserver-trackstat
     SUBDIR += lollypop
-    SUBDIR += lpac
     SUBDIR += lsp-plugins-lv2
     SUBDIR += lua-mpd
     SUBDIR += luppp
@@ -497,7 +491,6 @@
     SUBDIR += mous
     SUBDIR += mp-player
     SUBDIR += mp3-archive-tools
-    SUBDIR += mp32ogg
     SUBDIR += mp3_check
     SUBDIR += mp3asm
     SUBDIR += mp3blaster
@@ -525,7 +518,6 @@
     SUBDIR += mpg123
     SUBDIR += mpg123.el
     SUBDIR += mpg321
-    SUBDIR += mpiosh
     SUBDIR += mps
     SUBDIR += mpz
     SUBDIR += mumble
@@ -564,7 +556,6 @@
     SUBDIR += opusfile
     SUBDIR += opustags
     SUBDIR += orbit-lv2
-    SUBDIR += osalp
     SUBDIR += osd-lyrics
     SUBDIR += osdmixer
     SUBDIR += oss
@@ -704,7 +695,6 @@
     SUBDIR += rnnoise
     SUBDIR += rnnoise-nu
     SUBDIR += rosegarden
-    SUBDIR += rplay
     SUBDIR += rsynth
     SUBDIR += rtaudio
     SUBDIR += rtmidi
diff --git a/audio/celt/Makefile b/audio/celt/Makefile
deleted file mode 100644
index 9fd641a8d576..000000000000
--- a/audio/celt/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# Created by: Edward Tomasz Napierala <trasz@FreeBSD.org>
-
-PORTNAME=	celt
-PORTVERSION=	0.11.3
-PORTREVISION=	3
-CATEGORIES=	audio
-MASTER_SITES=	http://downloads.us.xiph.org/releases/celt/
-
-MAINTAINER=	multimedia@FreeBSD.org
-COMMENT=	The CELT ultra-low delay audio codec
-
-LICENSE=	BSD2CLAUSE
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-DEPRECATED=	Deprecated and considered obsolete by upstream in 2016 in favour of (lib)opus
-EXPIRATION_DATE=2021-12-31
-
-LIB_DEPENDS=	libogg.so:audio/libogg
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-ogg=${LOCALBASE}
-USE_LDCONFIG=	yes
-USES=		gmake libtool:keepla pathfix
-INSTALL_TARGET=	install-strip
-
-.include <bsd.port.mk>
diff --git a/audio/celt/distinfo b/audio/celt/distinfo
deleted file mode 100644
index f3fd554a25a8..000000000000
--- a/audio/celt/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (celt-0.11.3.tar.gz) = 7e64815d4a8a009d0280ecd235ebd917da3abdcfd8f7d0812218c085f9480836
-SIZE (celt-0.11.3.tar.gz) = 465020
diff --git a/audio/celt/pkg-descr b/audio/celt/pkg-descr
deleted file mode 100644
index 38218cbe2118..000000000000
--- a/audio/celt/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-The CELT codec is an experimental audio codec for use in low-delay
-speech and audio communication.  It's meant to close the gap between
-Vorbis and Speex for applications where both high quality audio
-and low delay are desired.
-
-WWW: http://www.celt-codec.org/
diff --git a/audio/celt/pkg-plist b/audio/celt/pkg-plist
deleted file mode 100644
index 80b84f0a03ee..000000000000
--- a/audio/celt/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-bin/celtenc
-bin/celtdec
-include/celt/celt.h
-include/celt/celt_types.h
-include/celt/celt_header.h
-lib/libcelt0.so.2.0.0
-lib/libcelt0.so.2
-lib/libcelt0.so
-lib/libcelt0.la
-lib/libcelt0.a
-libdata/pkgconfig/celt.pc
diff --git a/audio/flake/Makefile b/audio/flake/Makefile
deleted file mode 100644
index 0bb0d047e600..000000000000
--- a/audio/flake/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Created by: David Naylor <dbn@FreeBSD.org>
-
-PORTNAME=	flake
-PORTVERSION=	0.11
-CATEGORIES=	audio
-MASTER_SITES=	SF/${PORTNAME:tl}-enc/${PORTNAME:tl}/${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	FLAC audio encoder
-
-LICENSE=	LGPL21
-
-DEPRECATED=	Abandoned upstream, no new release since 2007
-EXPIRATION_DATE=2021-12-31
-
-CONFIGURE_ARGS+=	--cc="${CC}"
-HAS_CONFIGURE=	yes
-USES=		gmake tar:bzip2
-MAKE_JOBS_UNSAFE=	yes
-
-PLIST_FILES=	bin/flake include/flake.h lib/libflake.a
-
-.include <bsd.port.mk>
diff --git a/audio/flake/distinfo b/audio/flake/distinfo
deleted file mode 100644
index 276a23ec04e2..000000000000
--- a/audio/flake/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (flake-0.11.tar.bz2) = 8dd249888005c2949cb4564f02b6badb34b2a0f408a7ec7ab01e11ceca1b7f19
-SIZE (flake-0.11.tar.bz2) = 43319
diff --git a/audio/flake/pkg-descr b/audio/flake/pkg-descr
deleted file mode 100644
index add5d85b5f4b..000000000000
--- a/audio/flake/pkg-descr
+++ /dev/null
@@ -1,20 +0,0 @@
-The Flake encoder project was started as a way for the author to learn more
-about lossless audio encoding. The author chose the FLAC format because it is
-open and well-documented. Although the FLAC reference encoder is also free and
-open-source, the author's goal was to implement the standard from scratch as an
-independent project. Flake is licensed under the GNU LGPL.
-
-Once Flake progressed to a usable state, the author submitted the encoder to be
-included as part of FFmpeg. It was included and improved upon by other FFmpeg
-developers. Since then, Ithe author has added more features to Flake and
-improved the encoding speed. The author plan to add some of these features into
-FFmpeg as the encoder progresses.
-
-There are both benefits and drawbacks to using Flake as a FLAC encoder
-alternative. In its current state, Flake gives, on average, slightly better
-compression than the FLAC reference encoder and is about twice as fast.
-However, it does not currently implement all the advanced features such as
-tagging, cuesheets, 24-bit audio, embedded pictures, and ogg encapsulation.
-The author hopes to add these to Flake in future releases.
-
-WWW: http://flake-enc.sourceforge.net
diff --git a/audio/ifp-line/Makefile b/audio/ifp-line/Makefile
deleted file mode 100644
index f74e3162ce70..000000000000
--- a/audio/ifp-line/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# Created by: riggs
-
-PORTNAME=	ifp-line
-PORTVERSION=	0.3
-PORTREVISION=	1
-CATEGORIES=	audio
-MASTER_SITES=	SF/ifp-driver/${PORTNAME}/${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Command line interface to iRiver music players
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-DEPRECATED=	Abandoned upstream, no new release since 2005
-EXPIRATION_DATE=2021-12-31
-
-USES=		iconv
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	LIBUSB_LIBS=-lusb
-MAKE_JOBS_UNSAFE=	yes
-
-PLIST_FILES=	bin/ifp man/man1/ifp.1.gz
-PORTDOCS=	NEWS README TIPS nonroot.sh
-
-OPTIONS_DEFINE=	DOCS
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ifp ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/ifp.1 ${STAGEDIR}${MANPREFIX}/man/man1
-
-do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
-
-.include <bsd.port.mk>
diff --git a/audio/ifp-line/distinfo b/audio/ifp-line/distinfo
deleted file mode 100644
index 309fd6e31824..000000000000
--- a/audio/ifp-line/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ifp-line-0.3.tar.gz) = 2d44807abbd5d2202d253b550b867dfa3776a71bf6d3f202b0f1254e66325257
-SIZE (ifp-line-0.3.tar.gz) = 138272
diff --git a/audio/ifp-line/files/patch-configure b/audio/ifp-line/files/patch-configure
deleted file mode 100644
index ebf42c96bba4..000000000000
--- a/audio/ifp-line/files/patch-configure
+++ /dev/null
@@ -1,284 +0,0 @@
---- configure.orig	2005-12-10 07:27:54 UTC
-+++ configure
-@@ -3860,281 +3860,6 @@ _ACEOF
- 
- 
- 
--# Check whether --with-libusb-prefix or --without-libusb-prefix was given.
--if test "${with_libusb_prefix+set}" = set; then
--  withval="$with_libusb_prefix"
--  libusb_prefix="$withval"
--else
--  libusb_prefix=""
--fi;
--
--# Check whether --with-libusb-exec-prefix or --without-libusb-exec-prefix was given.
--if test "${with_libusb_exec_prefix+set}" = set; then
--  withval="$with_libusb_exec_prefix"
--  libusb_exec_prefix="$withval"
--else
--  libusb_exec_prefix=""
--fi;
--
--    if test x$libusb_exec_prefix != x ; then
--	libusb_config_args="$libusb_config_args --exec-prefix=$libusb_exec_prefix"
--	if test x${LIBUSB_CONFIG+set} != xset ; then
--	    LIBUSB_CONFIG=$libusb_exec_prefix/bin/libusb-config
--	fi
--    fi
--    if test x$libusb_prefix != x ; then
--	libusb_config_args="$libusb_config_args --prefix=$libusb_prefix"
--	if test x${LIBUSB_CONFIG+set} != xset ; then
--	    LIBUSB_CONFIG=$libusb_prefix/bin/libusb-config
--	fi
--    fi
--
--    # Extract the first word of "libusb-config", so it can be a program name with args.
--set dummy libusb-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_path_LIBUSB_CONFIG+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  case $LIBUSB_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_LIBUSB_CONFIG="$LIBUSB_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_path_LIBUSB_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
--  test -z "$ac_cv_path_LIBUSB_CONFIG" && ac_cv_path_LIBUSB_CONFIG="no"
--  ;;
--esac
--fi
--LIBUSB_CONFIG=$ac_cv_path_LIBUSB_CONFIG
--
--if test -n "$LIBUSB_CONFIG"; then
--  echo "$as_me:$LINENO: result: $LIBUSB_CONFIG" >&5
--echo "${ECHO_T}$LIBUSB_CONFIG" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--    min_libusb_version=0.1.7
--    echo "$as_me:$LINENO: checking for libusb - version >= $min_libusb_version" >&5
--echo $ECHO_N "checking for libusb - version >= $min_libusb_version... $ECHO_C" >&6
--    no_libusb=""
--    if test "$LIBUSB_CONFIG" = "no" ; then
--	no_libusb="yes"
--    else
--	LIBUSB_CFLAGS=`$LIBUSB_CONFIG $libusb_config_args --cflags`
--	LIBUSB_LIBS=`$LIBUSB_CONFIG $libusb_config_args --libs`
--
--	libusb_major_version=`$LIBUSB_CONFIG $libusb_args --version | \
--		sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
--	libusb_minor_version=`$LIBUSB_CONFIG $libusb_args --version | \
--		sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
--	libusb_micro_version=`$LIBUSB_CONFIG $libusb_args --version | \
--		sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
--	if test "x$enable_libusbtext" = "xyes" ; then
--	    ac_save_CFLAGS="$CFLAGS"
--	    ac_save_LIBS="$LIBS"
--	    CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
--	    LIBS="$LIBS $LIBUSB_LIBS"
--      rm -f conf.libusbtest
--      if test "$cross_compiling" = yes; then
--  echo $ac_n "cross compiling; assumed OK... $ac_c"
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
--#include <usb.h>
--
--char*
--my_strdup (char *str)
--{
--  char *new_str;
--
--  if (str)
--    {
--      new_str = malloc ((strlen (str) + 1) * sizeof(char));
--      strcpy (new_str, str);
--    }
--  else
--    new_str = NULL;
--
--  return new_str;
--}
--
--int main ()
--{
--  int major, minor, micro;
--  char *tmp_version;
--
--  system ("touch conf.libusbtest");
--
--  /* HP/UX 9 (%@#!) writes to sscanf strings */
--  tmp_version = my_strdup("$min_libusb_version");
--  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
--     printf("%s, bad version string\n", "$min_libusb_version");
--     exit(1);
--   }
--
--    if (($libusb_major_version > major) ||
--        (($libusb_major_version == major) && ($libusb_minor_version > minor)) ||
--	(($libusb_major_version == major) && ($libusb_minor_version == minor) &&
--	($libusb_micro_version >= micro)))
--    {
--      return 0;
--    }
--  else
--    {
--      printf("\n*** 'libusb-config --version' returned %d.%d, but the minimum version\n", $libusb_major_version, $libusb_minor_version);
--      printf("*** of libusb required is %d.%d. If libusb-config is correct, then it is\n", major, minor);
--      printf("*** best to upgrade to the required version.\n");
--      printf("*** If libusb-config was wrong, set the environment variable LIBUSB_CONFIG\n");
--      printf("*** to point to the correct copy of libusb-config, and remove the file\n");
--      printf("*** config.cache before re-running configure\n");
--      return 1;
--    }
--}
--
--
--_ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  :
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--no_libusb=yes
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--       CFLAGS="$ac_save_CFLAGS"
--       LIBS="$ac_save_LIBS"
--     fi
--  fi
--  if test "x$no_libusb" = x ; then
--     echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--     :
--  else
--     echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--     if test "$LIBUSB_CONFIG" = "no" ; then
--       echo "*** The libusb-config script installed by libusb could not be found"
--       echo "*** If libusb was installed in PREFIX, make sure PREFIX/bin is in"
--       echo "*** your path, or set the LIBUSB_CONFIG environment variable to the"
--       echo "*** full path to libusb-config."
--     else
--       if test -f conf.libusbtest ; then
--        :
--       else
--          echo "*** Could not run libusb test program, checking why..."
--          CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
--          LIBS="$LIBS $LIBUSB_LIBS"
--          cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#include <stdio.h>
--#include <usb.h>
--
--int
--main ()
--{
-- return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--   echo "*** The test program compiled, but did not run. This usually means"
--          echo "*** that the run-time linker is not finding libusb or finding the wrong"
--          echo "*** version of libusb. If it is not finding libusb, you'll need to set your"
--          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
--          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
--          echo "*** is required on your system"
--	  echo "***"
--          echo "*** If you have an old version installed, it is best to remove it, although"
--          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- echo "*** The test program failed to compile or link. See the file config.log for the"
--          echo "*** exact error that occured. This usually means libusb was incorrectly installed"
--          echo "*** or that you have moved libusb since it was installed. In the latter case, you"
--          echo "*** may want to edit the libusb-config script: $LIBUSB_CONFIG"
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--          CFLAGS="$ac_save_CFLAGS"
--          LIBS="$ac_save_LIBS"
--       fi
--     fi
--     LIBUSB_CFLAGS=""
--     LIBUSB_LIBS=""
--     { { echo "$as_me:$LINENO: error: libusb is required." >&5
--echo "$as_me: error: libusb is required." >&2;}
--   { (exit 1); exit 1; }; }
--  fi
--
--
--  rm -f conf.libusbtest
- 
- 
- # Checks for header files.
diff --git a/audio/ifp-line/pkg-descr b/audio/ifp-line/pkg-descr
deleted file mode 100644
index 91c663af0bb3..000000000000
--- a/audio/ifp-line/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-ifp-line is a simple command-line tool to provide basic
-functionality to manage files on iRiver music players
-which are using the "manager firmware".
-Using this tool, you can
-o add/remove files on the player
-o view information about the player, e.g. battery status
-o flash your firmware using an .hex file
-
-WWW: http://ifp-driver.sourceforge.net/
diff --git a/audio/ifp-line/pkg-message b/audio/ifp-line/pkg-message
deleted file mode 100644
index 2f54d4449f2b..000000000000
--- a/audio/ifp-line/pkg-message
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-ifp directly accesses the usb/ugen devices via libusb. So
-if you want to use this application as a non-root user, you
-have to make sure that the corresponding device nodes
-/dev/usb<somenumber> and /dev/ugen<somenumber> where
-<somenumber> is dependent on your personal usb environment
-are readable and writable by the user intended to use the
-tool.
-EOM
-}
-]
diff --git a/audio/libaacplus/Makefile b/audio/libaacplus/Makefile
deleted file mode 100644
index 8843def33ebe..000000000000
--- a/audio/libaacplus/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-PORTNAME=	libaacplus
-PORTVERSION=	2.0.2
-PORTREVISION=	9
-CATEGORIES=	audio
-MASTER_SITES=	http://tipok.org.ua/downloads/media/aacplus/libaacplus/ \
-		ftp://ftp.3gpp.org/Specs/archive/26_series/26.410/:site2 \
-		https://www.3gpp.org/ftp/Specs/archive/26_series/26.410/:site2
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${SRC26410}.zip:site2
-
-MAINTAINER=	takefu@airport.fm
-COMMENT=	HE-AAC+ Codec as Shared Library
-
-LICENSE=	libaacplus
-LICENSE_NAME=	3GPP
-LICENSE_TEXT=	unclear legal status, probably need licenses from 3GPP, Via Licensing and Coding Technologies
-LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
-
-DEPRECATED=	Abandoned upstream, no new release since 2011
-EXPIRATION_DATE=2021-12-31
-
-USES=		autoreconf cpe pathfix pkgconfig libtool
-
-USE_CSTD=	gnu89
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-MAKE_JOBS_UNSAFE=	yes
-INSTALL_TARGET=	install-strip
-CPE_VENDOR=	libaacplus_project
-
-CONFLICTS=	aacplusenc-0*
-
-OPTIONS_DEFINE=	FFTW3
-OPTIONS_DEFAULT=FFTW3
-
-FFTW3_DESC=	Use FFTW3 library for performance
-
-FFTW3_LIB_DEPENDS=	libfftw3.so:math/fftw3 \
-			libfftw3f.so:math/fftw3-float
-FFTW3_CONFIGURE_ON=	--with-fftw3=yes --with-fftw3-prefix=${LOCALBASE}
-FFTW3_CONFIGURE_OFF=	--with-fftw3=no
-
-LICENSE_DISTFILES_3GPP=	${SRC26410}.zip
-SRC26410=	26410-g00
-
-pre-configure:
-	@${CP} ${DISTDIR}/${SRC26410}.zip ${WRKSRC}/src
-	@${REINPLACE_CMD} -e 's,@includedir@\/aacplus,@prefix@\/include,' \
-		${WRKSRC}/aacplus.pc.in
-	@${REINPLACE_CMD} -e 's,\/aacplus\.h,\/libaacplus\/aacplus\.h,' \
-		${WRKSRC}/aacplus.spec.in
-	@${REINPLACE_CMD} -e 's,INCLUDES,AM_CPPFLAGS,'\
-		${WRKSRC}/frontend/Makefile.am ${WRKSRC}/src/Makefile.am
-	@${REINPLACE_CMD} -e 's,%%SRC26410%%,${SRC26410},g' \
-		${WRKSRC}/src/Makefile.am
-
-.include <bsd.port.mk>
diff --git a/audio/libaacplus/distinfo b/audio/libaacplus/distinfo
deleted file mode 100644
index 3f37847ca576..000000000000
--- a/audio/libaacplus/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1630653095
-SHA256 (libaacplus-2.0.2.tar.gz) = 60dceb64d4ecf0be8d21661d5af2f214710f9d5b6ab389a5bdebf746baa7e1d7
-SIZE (libaacplus-2.0.2.tar.gz) = 42155
-SHA256 (26410-g00.zip) = 2a180b4a71160bdf37f49c47be6e67e0674f560b7d329088b2f13d232ed82db2
-SIZE (26410-g00.zip) = 1215311
diff --git a/audio/libaacplus/files/patch-configure.ac b/audio/libaacplus/files/patch-configure.ac
deleted file mode 100644
index 2ae5b88a4d76..000000000000
--- a/audio/libaacplus/files/patch-configure.ac
+++ /dev/null
@@ -1,35 +0,0 @@
---- configure.ac.orig	2010-11-10 21:27:45 UTC
-+++ configure.ac
-@@ -8,7 +8,7 @@ AM_INIT_AUTOMAKE
- AM_CONFIG_HEADER(config.h)
- AC_CONFIG_MACRO_DIR([m4])
- # Checks for programs.
--AC_PROG_CC
-+AC_PROG_CC(clang gcc cc)
- AM_PROG_CC_C_O
- AC_PROG_CPP
- AC_PROG_INSTALL
-@@ -16,10 +16,10 @@ AC_PROG_LN_S
- AC_PROG_MAKE_SET
- AC_LIBTOOL_WIN32_DLL
- AM_PROG_LIBTOOL
--AC_PATH_PROG([UNZIP],[unzip])
--if test x"$UNZIP" = x -a ! -f "aacenc.c" ; then
--    AC_MSG_ERROR([You need unzip utility to prepare sources.])
--fi
-+dnl AC_PATH_PROG([UNZIP],[unzip])
-+dnl if test x"$UNZIP" = x -a ! -f "aacenc.c" ; then
-+dnl    AC_MSG_ERROR([You need unzip utility to prepare sources.])
-+dnl fi
- AC_PATH_PROG([PATCH],[patch])
- if test x"$PATCH" = x -a ! -f "aacenc.c" ; then
-     AC_MSG_ERROR([You need patch utility to prepare sources.])
-@@ -123,7 +123,7 @@ AM_CONDITIONAL([HAVE_PKGCONFIG], [test "
- 	    
- AACPLUS_VERSION="$VERSION"
- AACPLUS_CPPFLAGS="-I$aacplus_includedir $FFTW3_CPPFLAGS"
--AACPLUS_CFLAGS+="$FFTW3_CFLAGS"
-+AACPLUS_CFLAGS="$AACPLUS_CFLAGS $FFTW3_CFLAGS"
- AACPLUS_LIBS="-laacplus -lm ${FFTW3_LIB}"
- 
- AC_SUBST(AACPLUS_LIBS)
diff --git a/audio/libaacplus/files/patch-include_aacplus.h b/audio/libaacplus/files/patch-include_aacplus.h
deleted file mode 100644
index f4164577ee7a..000000000000
--- a/audio/libaacplus/files/patch-include_aacplus.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/aacplus.h.orig	2010-11-10 21:27:38 UTC
-+++ include/aacplus.h
-@@ -12,7 +12,7 @@ typedef void *aacplusEncHandle;
- 
- typedef enum {
- 	AACPLUS_INPUT_16BIT = 0,
--	AACPLUS_INPUT_FLOAT,
-+	AACPLUS_INPUT_FLOAT
- } aacplusInFormat;
- 
- 
diff --git a/audio/libaacplus/files/patch-src_Makefile.am b/audio/libaacplus/files/patch-src_Makefile.am
deleted file mode 100644
index 48ac0542ee44..000000000000
--- a/audio/libaacplus/files/patch-src_Makefile.am
+++ /dev/null
@@ -1,53 +0,0 @@
---- src/Makefile.am.orig	2010-11-10 21:27:41 UTC
-+++ src/Makefile.am
-@@ -1,5 +1,5 @@
- 
--DISTCLEANFILES = 26410-800.zip $(top_srcdir)/26410-800.doc 26410-800-ANSI-C_source_code.zip $(library_sources_used) $(library_headers_used)
-+DISTCLEANFILES = %%SRC26410%%.zip $(top_srcdir)/%%SRC26410%%.doc %%SRC26410%%-ANSI-C_source_code.zip $(library_sources_used) $(library_headers_used)
- EXTRA_DIST = libaacplus.sym
- INCLUDES = @FFTW3_INCFLAGS@ -I$(top_srcdir)/include
- LDADD = @FFTW3_LDFLAGS@
-@@ -191,9 +191,9 @@ remove_debugging_symbols:
- unpack_3gp_sources:
- 	if ! [ -e $(srcdir)/aacenc.c ]; \
- 	then \
--	$(MAKE) $(srcdir)/26410-800-ANSI-C_source_code.zip; \
-+	$(MAKE) $(srcdir)/%%SRC26410%%-ANSI-C_source_code.zip; \
- 	$(MAKE) $(srcdir)/FloatFR_aacPlusenc; \
--	rm -f $(srcdir)/26410-800-ANSI-C_source_code.zip; \
-+	rm -f $(srcdir)/%%SRC26410%%-ANSI-C_source_code.zip; \
- 	$(MAKE) sources_delete; \
- 	$(MAKE) sources_copy; \
- 	rm -rf $(srcdir)/FloatFR_aacPlusenc; \
-@@ -206,22 +206,22 @@ $(library_sources_used):
- 	$(MAKE) unpack_3gp_sources
- 
- $(srcdir)/FloatFR_aacPlusenc:
--	cd $(srcdir) && $(UNZIP) 26410-800-ANSI-C_source_code.zip
-+	cd $(srcdir) && /rescue/tar xf  %%SRC26410%%-ANSI-C_source_code.zip
- 	mv -f $(srcdir)/3GPP_enhanced_aacPlus_src_*/FloatFR_aacPlusenc $(srcdir)
- 	rm -rf $(srcdir)/3GPP_enhanced_aacPlus_src_*
- 
- 
--$(srcdir)/26410-800-ANSI-C_source_code.zip: $(srcdir)/26410-800.zip
--	rm -f $(srcdir)/26410-800-ANSI-C_source_code.zip $(srcdir)/26410-800.doc
--	cd $(srcdir) && $(UNZIP) 26410-800.zip
--	mv $(srcdir)/26410-800.doc $(top_srcdir)/26410-800.doc
--	chmod og-w $(top_srcdir)/26410-800.doc
-+$(srcdir)/%%SRC26410%%-ANSI-C_source_code.zip: $(srcdir)/%%SRC26410%%.zip
-+	rm -f $(srcdir)/%%SRC26410%%-ANSI-C_source_code.zip $(srcdir)/%%SRC26410%%.doc
-+	cd $(srcdir) && /rescue/tar xf %%SRC26410%%.zip
-+	mv $(srcdir)/%%SRC26410%%.doc $(top_srcdir)/%%SRC26410%%.doc
-+	chmod og-w $(top_srcdir)/%%SRC26410%%.doc
- 
--$(srcdir)/26410-800.zip:
--	cd $(srcdir) && $(DOWNLOADER_PROG) http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/26410-800.zip
-+$(srcdir)/%%SRC26410%%.zip:
-+	cd $(srcdir) && $(DOWNLOADER_PROG) http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/%%SRC26410%%.zip
- 
- extraclean:
--	rm -f $(distdir)/($(library_sources_used)) $(distdir)/($(library_headers_used)) $(distdir)/26410-800.zip $(distdir)/../26410-800.doc $(distdir)/26410-800_ANSI-C_source_code.zip
-+	rm -f $(distdir)/($(library_sources_used)) $(distdir)/($(library_headers_used)) $(distdir)/%%SRC26410%%.zip $(distdir)/../%%SRC26410%%.doc $(distdir)/%%SRC26410%%_ANSI-C_source_code.zip
- 
- # WARNING: These commands use internal automake command and may fail in future version.
- extradist-gzip: distdir extraclean
diff --git a/audio/libaacplus/pkg-descr b/audio/libaacplus/pkg-descr
deleted file mode 100644
index fcacfc4b2c05..000000000000
--- a/audio/libaacplus/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-HE-AAC+ Codec as Shared Library
-
-WWW: https://tipok.org.ua/node/17/
diff --git a/audio/libaacplus/pkg-plist b/audio/libaacplus/pkg-plist
deleted file mode 100644
index df76e42ea5b4..000000000000
--- a/audio/libaacplus/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/aacplusenc
-include/aacplus.h
-lib/libaacplus.a
-lib/libaacplus.so
-lib/libaacplus.so.2
-lib/libaacplus.so.2.0.2
-libdata/pkgconfig/aacplus.pc
-man/man1/aacplusenc.1.gz
diff --git a/audio/libnjb/Makefile b/audio/libnjb/Makefile
deleted file mode 100644
index 2789c4fabd1e..000000000000
--- a/audio/libnjb/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# Created by: adrianm
-
-PORTNAME=	libnjb
-PORTVERSION=	2.2.7
-PORTREVISION=	4
-CATEGORIES=	audio
-MASTER_SITES=	SF
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	C library, API for communicating with Creative and Dell audio players
-
-LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-DEPRECATED=	Abandoned upstream, no new release since 2011
-EXPIRATION_DATE=2021-12-31
-
-USES=		pathfix ncurses libtool
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-PORTDOCS=	*
-
-OPTIONS_DEFINE=	DOXYGEN DOCS
-
-DOXYGEN_IMPLIES=	DOCS
-DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
-DOXYGEN_CONFIGURE_ENV_OFF=	ac_cv_prog_HAVE_DOXYGEN=no
-
-post-patch:
-	@${REINPLACE_CMD} -e \
-		'/^SHOW_DIRECTORIES/d' ${WRKSRC}/doc/Doxyfile.in
-	@${REINPLACE_CMD} -e \
-		'/pkgdocdir/s|-$$(VERSION)||g' ${WRKSRC}/doc/Makefile.in
-	@${REINPLACE_CMD} -e 's|-lcurses|-lncurses|' ${WRKSRC}/configure \
-		${WRKSRC}/sample/Makefile.am ${WRKSRC}/sample/Makefile.in
-
-.include <bsd.port.mk>
diff --git a/audio/libnjb/distinfo b/audio/libnjb/distinfo
deleted file mode 100644
index 08b3261bfa28..000000000000
--- a/audio/libnjb/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (libnjb-2.2.7.tar.gz) = ccbcfc870bdc10ad7a144f81a340b61bad74a6f00f77cf08db5866332668d2b6
-SIZE (libnjb-2.2.7.tar.gz) = 497862
diff --git a/audio/libnjb/pkg-descr b/audio/libnjb/pkg-descr
deleted file mode 100644
index 62c0b8686a93..000000000000
--- a/audio/libnjb/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-libnjb is a C library and API for communicating with the Creative Nomad
-JukeBox and Dell DJ digital audio players under BSD, Linux, Mac OS X and
-Windows.
-
-WWW: http://libnjb.sourceforge.net/
diff --git a/audio/libnjb/pkg-plist b/audio/libnjb/pkg-plist
deleted file mode 100644
index 8520f1c0335b..000000000000
--- a/audio/libnjb/pkg-plist
+++ /dev/null
@@ -1,28 +0,0 @@
-bin/njb-cursesplay
-bin/njb-delfile
-bin/njb-deltr
-bin/njb-dumpeax
-bin/njb-dumptime
-bin/njb-files
-bin/njb-fwupgrade
-bin/njb-getfile
-bin/njb-getowner
-bin/njb-gettr
-bin/njb-getusage
-bin/njb-handshake
-bin/njb-pl
-bin/njb-play
-bin/njb-playlists
-bin/njb-sendfile
-bin/njb-sendtr
-bin/njb-setowner
-bin/njb-setpbm
-bin/njb-settime
-bin/njb-tagtr
-bin/njb-tracks
-include/libnjb.h
-lib/libnjb.a
-lib/libnjb.so
-lib/libnjb.so.5
-lib/libnjb.so.5.1.1
-libdata/pkgconfig/libnjb.pc
diff --git a/audio/lpac/Makefile b/audio/lpac/Makefile
deleted file mode 100644
index e8149f36be26..000000000000
--- a/audio/lpac/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
-
-PORTNAME=	lpac
-PORTVERSION=	1.40
-CATEGORIES=	audio linux
-MASTER_SITES=	ftp://chernabog.cc.vt.edu/pub2/freebsd/ports/distfiles/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Lossless audio codec
-
-ONLY_FOR_ARCHS=	amd64 i386
-
-# Converted from NO_CDROM
-LICENSE=	LPAC
-LICENSE_NAME=	lpac
-LICENSE_TEXT=	No commercial use
-LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
-
-BROKEN=		Unfetchable
-DEPRECATED=	Abandoned upstream in 2003
-EXPIRATION_DATE=2021-12-31
-
-NO_BUILD=	yes
-USES=		linux
-PLIST_FILES=	bin/lpac
-
-do-install:
-	${BRANDELF} -t Linux ${WRKDIR}/lpac
-	${INSTALL_PROGRAM} ${WRKDIR}/lpac ${STAGEDIR}${PREFIX}/bin
-
-.include <bsd.port.mk>
diff --git a/audio/lpac/distinfo b/audio/lpac/distinfo
deleted file mode 100644
index 1ab93b044114..000000000000
--- a/audio/lpac/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (lpac-1.40.tar.gz) = ef6a8ca55adfcf288addc8276bee72f0f7853db76a9e1a5b52328323472de56b
-SIZE (lpac-1.40.tar.gz) = 25551
diff --git a/audio/lpac/pkg-descr b/audio/lpac/pkg-descr
deleted file mode 100644
index f0ba54298eb3..000000000000
--- a/audio/lpac/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-LPAC is a codec (coder / decoder) for  lossless compression of digital audio
-files. "Lossless" means that any compressed file can be decompressed in a way
-it will be bit-wise identical with the original. This is the main advantage
-of LPAC compared to lossy formats like MP3, WMA or RealAudio. On the other
-hand, lossy codecs can achieve higher compression ratios. For example, MP3 at
-128 kbit/s achieves a (fixed) compression ratio of 11, whereas LPAC's
-compression ratios range from 1.5 to 4, strongly depending on the audio
-material. Typically they are around 2 for pop music and 2.5 for classical
-music. This may not seem much, but remember you will get back every single
-bit, no matter how often you subsequently compress and decompress a file. It
-is true that general archivers (Zip, LZH, gzip) are lossless, too, but they
-often achieve nearly no compression on audio files.
diff --git a/audio/mp32ogg/Makefile b/audio/mp32ogg/Makefile
deleted file mode 100644
index 36f0066c086c..000000000000
--- a/audio/mp32ogg/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Created by: ijliao
-
-PORTNAME=	mp32ogg
-PORTVERSION=	0.11
-PORTREVISION=	2
-CATEGORIES=	audio perl5
-MASTER_SITES=	ftp://ftp.faceprint.com/pub/software/scripts/ \
-		LOCAL/uqs
-EXTRACT_SUFX=	# empty
-
-MAINTAINER=	uqs@FreeBSD.org
-COMMENT=	Convert MP3 files to Ogg Vorbis files
-
-DEPRECATED=	Abandoned upstream and unfetchable from upstream
-EXPIRATION_DATE=2021-12-31
-
-RUN_DEPENDS=	mpg123:audio/mpg123 \
-		oggenc:audio/vorbis-tools \
-		p5-MP3-Info>=0:audio/p5-MP3-Info \
-		p5-String-ShellQuote>=0:textproc/p5-String-ShellQuote
-
-USES=		shebangfix perl5
-SHEBANG_FILES=	mp32ogg
-NO_WRKSUBDIR=	yes
-NO_BUILD=	yes
-EXTRACT_CMD=	${CP}
-EXTRACT_BEFORE_ARGS=	#
-EXTRACT_AFTER_ARGS=	${WRKSRC}/${PORTNAME}
-PLIST_FILES=	bin/mp32ogg
-
-post-patch:
-	@${REINPLACE_CMD} -i '' -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/mp32ogg
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/mp32ogg ${STAGEDIR}${PREFIX}/bin
-
-.include <bsd.port.mk>
diff --git a/audio/mp32ogg/distinfo b/audio/mp32ogg/distinfo
deleted file mode 100644
index 57776cb390b3..000000000000
--- a/audio/mp32ogg/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (mp32ogg-0.11) = 66d6276944e54e1ba15a4fc29b098baa9d1e5fcd29c57f1d77cd16c87ca302ce
-SIZE (mp32ogg-0.11) = 9216
diff --git a/audio/mp32ogg/files/patch-mp32ogg b/audio/mp32ogg/files/patch-mp32ogg
deleted file mode 100644
index 0d404b2a8014..000000000000
--- a/audio/mp32ogg/files/patch-mp32ogg
+++ /dev/null
@@ -1,15 +0,0 @@
---- mp32ogg.orig	2016-07-26 15:20:33 UTC
-+++ mp32ogg
-@@ -89,9 +89,9 @@ use String::ShellQuote;
- 
- use_winamp_genres();
- 
--$oggenc  = "/usr/bin/oggenc";
--$ogginfo = "/usr/bin/ogginfo";
--$mpg123  = "/usr/bin/mpg123";
-+$oggenc  = "%%LOCALBASE%%/bin/oggenc";
-+$ogginfo = "%%LOCALBASE%%/bin/ogginfo";
-+$mpg123  = "%%LOCALBASE%%/bin/mpg123";
- 
- print "mp32ogg $version\n";
- print "(c) 2000-2002 Nathan Walp\n";
diff --git a/audio/mp32ogg/pkg-descr b/audio/mp32ogg/pkg-descr
deleted file mode 100644
index 0edb9cb80d20..000000000000
--- a/audio/mp32ogg/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-A perl script to convert MP3 files to Ogg Vorbis files, retaining ID3
-information, bitrate, and optionally renaming the output files, as well
-as deleting the originals.
-
-THIS DEGRADES THE QUALITY, because it goes from one lossy format to
-another.
-
-WWW: http://faceprint.com/software.phtml
diff --git a/audio/mpiosh/Makefile b/audio/mpiosh/Makefile
deleted file mode 100644
index 48e6bfefcbd6..000000000000
--- a/audio/mpiosh/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# Created by: Sergey Akifyev <asa@gascom.ru>
-
-PORTNAME=	mpiosh
-PORTVERSION=	0.7.1.p2
-PORTREVISION=	6
-CATEGORIES=	audio
-MASTER_SITES=	SF/mpio/mpio%20pre-release/0.7.1-pre2
-DISTNAME=	mpio-${PORTVERSION:S|.p|_pre|}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Digit@lway MPIO MP3 player tool
-
-DEPRECATED=	Abandoned upstream, no new release since 2004
-EXPIRATION_DATE=2021-12-31
-
-USES=		autoreconf iconv libtool readline
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
-
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
-
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-configure.in
-
-post-patch:
-	@${REINPLACE_CMD} -e 's/%%ICONV_LIB%%/${ICONV_LIB}/' ${WRKSRC}/mpiosh/Makefile.am
-
-.include <bsd.port.mk>
diff --git a/audio/mpiosh/distinfo b/audio/mpiosh/distinfo
deleted file mode 100644
index 899919935e71..000000000000
--- a/audio/mpiosh/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (mpio-0.7.1_pre2.tar.gz) = ef28b2d16e2759f7eda04096b4eeb056d176c2b62fb8a15851db43c66d4e4f93
-SIZE (mpio-0.7.1_pre2.tar.gz) = 404509
diff --git a/audio/mpiosh/files/extra-patch-configure.in b/audio/mpiosh/files/extra-patch-configure.in
deleted file mode 100644
index 280374f08f68..000000000000
--- a/audio/mpiosh/files/extra-patch-configure.in
+++ /dev/null
@@ -1,30 +0,0 @@
---- configure.in.orig	2009-04-08 01:50:59.000000000 +0400
-+++ configure.in	2009-04-08 01:52:14.000000000 +0400
-@@ -60,23 +60,17 @@
- dnl -- check for libusb
- dnl -- this is stolen from libgphoto2
- 
--AC_PATH_PROG(LIBUSB_CONFIG,libusb-config)
--if test -n "${LIBUSB_CONFIG}"; then
--    CPPFLAGS_save="$CPPFLAGS"
--    CPPFLAGS="$CPPFLAGS `$LIBUSB_CONFIG --cflags`"
--    AC_CHECK_HEADER(usb.h,[
-+AC_CHECK_HEADER(usb.h,[
- 	    LDFLAGS_orig="$LDFLAGS"
--	    LDFLAGS="`$LIBUSB_CONFIG --libs`"
-+	    LDFLAGS="-lusb"
- 	    AC_CHECK_LIB(usb,usb_busses,[
- 		    usb_msg="yes"
- 		    IOLIB_SUBDIRS="$IOLIB_SUBDIRS usb"
--		    USB_LIBS="`$LIBUSB_CONFIG --libs`"
--		    USB_CFLAGS="`$LIBUSB_CONFIG --cflags`"
--		    LIBUSB_VER="`$LIBUSB_CONFIG --version`"],[
-+		    USB_LIBS="-lusb"
-+		    USB_CFLAGS=""],[
- 		    usb_msg="no (available version too old)"])
- 	    LDFLAGS="$LDFLAGS_orig"])
-     CPPFLAGS="$CPPFLAGS_save"
--fi
- 
-         # This 'test' call uses non-standard syntax and will fail on most
-         # systems, but it's just informational so any warning can be ignored.
diff --git a/audio/mpiosh/files/patch-Makefile.am b/audio/mpiosh/files/patch-Makefile.am
deleted file mode 100644
index f2bb3ba254bc..000000000000
--- a/audio/mpiosh/files/patch-Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
---- Makefile.am.orig	2004-04-19 12:19:19 UTC
-+++ Makefile.am
-@@ -1,3 +1,3 @@
--SUBDIRS=@MPIO_KERNEL@ libmpio mpiosh etc tools hotplug
-+SUBDIRS=@MPIO_KERNEL@ libmpio mpiosh etc tools
- 
- EXTRA_DIST=mpio.spec
diff --git a/audio/mpiosh/files/patch-configure.in b/audio/mpiosh/files/patch-configure.in
deleted file mode 100644
index d1290540c6f1..000000000000
--- a/audio/mpiosh/files/patch-configure.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.in.orig	2016-07-26 15:22:25 UTC
-+++ configure.in
-@@ -74,14 +74,6 @@ AC_CHECK_HEADER(usb.h,[
- 
-         # This 'test' call uses non-standard syntax and will fail on most
-         # systems, but it's just informational so any warning can be ignored.
--if test "$LIBUSB_VER" \< "0.1.7"; then
--    AC_MSG_WARN([
--*** You need at least version 0.1.7 of the libusb library for USB support
--*** http://sourceforge.net/projects/libusb/
--*** If you cannot find the appropriate version, try CVS
--	    ])
--    exit 1
--fi
- 
- case "$usb_msg" in
-     yes*) AC_DEFINE(HAVE_USB,1,[Whether you have USB support enabled]);;
diff --git a/audio/mpiosh/files/patch-libmpio_Makefile.am b/audio/mpiosh/files/patch-libmpio_Makefile.am
deleted file mode 100644
index 3537fd031fdf..000000000000
--- a/audio/mpiosh/files/patch-libmpio_Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- libmpio/Makefile.am.orig	2003-10-19 21:06:34 UTC
-+++ libmpio/Makefile.am
-@@ -1,6 +1,6 @@
- INCLUDES=@MPLIB_INCLUDE@ 
- AM_CFLAGS=@MPLIB_CFLAGS@ @USB_CFLAGS@
--AM_LDFLAGS=-version-info 1:0:0 @USB_LIBS@
-+AM_LDFLAGS=-version-info 1 @USB_LIBS@
- 
- lib_LTLIBRARIES=libmpio.la 
- 
diff --git a/audio/mpiosh/files/patch-libmpio_debug.h b/audio/mpiosh/files/patch-libmpio_debug.h
deleted file mode 100644
index 28c645f8c374..000000000000
--- a/audio/mpiosh/files/patch-libmpio_debug.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmpio/debug.h.orig	2003-04-27 12:08:20 UTC
-+++ libmpio/debug.h
-@@ -41,7 +41,7 @@
- #ifdef sun
- #include <sys/int_types.h>
- #else
--#include <stdint.h>
-+#include <sys/types.h>
- #endif
- 
- #ifdef __cplusplus
diff --git a/audio/mpiosh/files/patch-mpiosh_Makefile.am b/audio/mpiosh/files/patch-mpiosh_Makefile.am
deleted file mode 100644
index f9c56d516d5a..000000000000
--- a/audio/mpiosh/files/patch-mpiosh_Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
---- mpiosh/Makefile.am.orig	2002-10-29 20:03:34 UTC
-+++ mpiosh/Makefile.am
-@@ -12,7 +12,7 @@ mpiosh_SOURCES = mpiosh.c \
- 
- AM_CFLAGS=-DSYSCONFDIR=\"@sysconfdir@\"
- 
--mpiosh_LDADD=../libmpio/libmpio.la -lreadline -lncurses
-+mpiosh_LDADD=../libmpio/libmpio.la -lreadline -lncurses %%ICONV_LIB%%
- 
- noinst_HEADERS = mpiosh.h \
- 		callback.h \
-@@ -20,4 +20,4 @@ noinst_HEADERS = mpiosh.h \
- 		command.h \
- 		global.h \
- 		cfgio.h \
--		config.h
-\ No newline at end of file
-+		config.h
diff --git a/audio/mpiosh/files/patch-mpiosh_callback.c b/audio/mpiosh/files/patch-mpiosh_callback.c
deleted file mode 100644
index 9acc206ac543..000000000000
--- a/audio/mpiosh/files/patch-mpiosh_callback.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- mpiosh/callback.c.orig	2004-04-23 19:21:08 UTC
-+++ mpiosh/callback.c
-@@ -31,12 +31,15 @@
- #include <sys/stat.h>
- #include <time.h>
- #include <unistd.h>
-+#include <limits.h>
- 
- #include "mpiosh.h"
- #include "command.h"
- 
- #include "libmpio/debug.h"
- 
-+#define NAME_MAX      PATH_MAX
-+
- /* helper */
- BYTE
- mpiosh_ftype2ascii(BYTE ftype) {
diff --git a/audio/mpiosh/files/patch-mpiosh_mpiosh.c b/audio/mpiosh/files/patch-mpiosh_mpiosh.c
deleted file mode 100644
index bd308b7dd67c..000000000000
--- a/audio/mpiosh/files/patch-mpiosh_mpiosh.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- mpiosh/mpiosh.c.orig	2003-08-25 19:38:57 UTC
-+++ mpiosh/mpiosh.c
-@@ -39,6 +39,8 @@
- #include "readline.h"
- #include "mpiosh.h"
- 
-+#define SA_NOMASK     0
-+
- /* mpiosh core functions */
- void
- mpiosh_init(void)
-@@ -121,7 +123,9 @@ main(int argc, char *argv[]) {
- 
-   while ((line = readline(mpiosh.prompt))) {
-     if ((*line == '\0') || mpiosh_cancel) {
-+#if 0
-       rl_clear_pending_input ();
-+#endif
-       mpiosh_cancel = 0;
-       mpiosh_cancel_ack = 0;
-       continue;
diff --git a/audio/mpiosh/files/patch-mpiosh_readline.c b/audio/mpiosh/files/patch-mpiosh_readline.c
deleted file mode 100644
index 7a87ac6bd54d..000000000000
--- a/audio/mpiosh/files/patch-mpiosh_readline.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- mpiosh/readline.c.orig	2003-04-23 08:34:16 UTC
-+++ mpiosh/readline.c
-@@ -26,6 +26,8 @@
- #include "command.h"
- #include "mpiosh.h"
- 
-+#define rl_completion_matches completion_matches
-+
- /* readline extensions */
- void
- mpiosh_readline_init(void)
diff --git a/audio/mpiosh/pkg-descr b/audio/mpiosh/pkg-descr
deleted file mode 100644
index 5e4cc002b32b..000000000000
--- a/audio/mpiosh/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Digit@lway MPIO MP3 player tools
-
-This is a project for using Digitalway/Adtec
-digital audio player MPIO (DMG, DMK, DME, ...)
-under FreeBSD. It provides a userspace library
-and at the moment one tool to access the MPIO
-player.
-
-WWW: http://mpio.sourceforge.net/
diff --git a/audio/mpiosh/pkg-plist b/audio/mpiosh/pkg-plist
deleted file mode 100644
index bd2c3df7eadc..000000000000
--- a/audio/mpiosh/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-bin/mpiologo
-bin/mpiosh
-etc/mpio/mpioshrc
-include/mpio/defs.h
-include/mpio/mpio.h
-lib/libmpio.a
-lib/libmpio.so
-lib/libmpio.so.1
-lib/libmpio.so.1.0.0
diff --git a/audio/osalp/Makefile b/audio/osalp/Makefile
deleted file mode 100644
index 69d7d1c8ddbd..000000000000
--- a/audio/osalp/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Created by: ijliao
-
-PORTNAME=	osalp
-PORTVERSION=	0.7.5
-PORTREVISION=	7
-CATEGORIES=	audio
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-beta
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Open Source Audio Library Project
-
-DEPRECATED=	Abandoned upstream, listed as beta and no new release since 2008
-EXPIRATION_DATE=2021-12-31
-
-RUN_DEPENDS=	mpg123:audio/mpg123
-LIB_DEPENDS=	libmp3lame.so:audio/lame \
-		libvorbis.so:audio/libvorbis
-
-USES=		libtool localbase:ldflags
-USE_CXXSTD=	c++98
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-all
-
-CFLAGS+=	-fPIC -DPIC
-
-USE_LDCONFIG=	yes
-
-PLIST_SUB=	VERSION=${PORTVERSION}
-
-CONFLICTS=	libaudiofile
-
-post-patch:
-	@${FIND} ${WRKSRC} -name "*.cc" | ${XARGS} ${REINPLACE_CMD} -E \
-	    's|iostream.h|iostream|; \
-	     s|[[:space:]]cout| std::cout|g; \
-	     s|[[:space:]]endl| std::endl|g; \
-	     s|[[:space:]]cerr| std::cerr|g;'
-
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaflib-${PORTVERSION}.so \
-	    ${STAGEDIR}${PREFIX}/lib/aflib/lib*-${PORTVERSION}.so
-
-.include <bsd.port.mk>
diff --git a/audio/osalp/distinfo b/audio/osalp/distinfo
deleted file mode 100644
index 5b13843f7d5d..000000000000
--- a/audio/osalp/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (osalp-0.7.5.tar.gz) = 96f585ac72fe84305fb6675ae316c60ce3f9d8bfd419efe072b9bb91fcbb4e88
-SIZE (osalp-0.7.5.tar.gz) = 1484288
diff --git a/audio/osalp/files/patch-aflib_aflibConfig.h b/audio/osalp/files/patch-aflib_aflibConfig.h
deleted file mode 100644
index 633931b6aa9d..000000000000
--- a/audio/osalp/files/patch-aflib_aflibConfig.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- aflib/aflibConfig.h.orig	2007-01-16 19:26:39 UTC
-+++ aflib/aflibConfig.h
-@@ -31,6 +31,9 @@
- // Note that g++ does not really need this. If -O with compile func in .h will be inline
- #define INLINE inline
- 
-+#include <cstdlib>
-+#include <cstring>
-+
- #include "aflib.h"
- 
- 
diff --git a/audio/osalp/files/patch-aflib_aflibConverter.cc b/audio/osalp/files/patch-aflib_aflibConverter.cc
deleted file mode 100644
index 3deebeaacfb7..000000000000
--- a/audio/osalp/files/patch-aflib_aflibConverter.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- aflib/aflibConverter.cc.orig	2007-01-16 19:26:39 UTC
-+++ aflib/aflibConverter.cc
-@@ -226,7 +226,7 @@ aflibConverter::resample(       /* numbe
- 
- 
- int
--aflibConverter::err_ret(char *s)
-+aflibConverter::err_ret(const char *s)
- {
-     aflib_debug("resample: %s \n\n",s); /* Display error message  */
-     return -1;
diff --git a/audio/osalp/files/patch-aflib_aflibConverter.h b/audio/osalp/files/patch-aflib_aflibConverter.h
deleted file mode 100644
index 70589a53bda3..000000000000
--- a/audio/osalp/files/patch-aflib_aflibConverter.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- aflib/aflibConverter.h.orig	2007-01-16 19:26:39 UTC
-+++ aflib/aflibConverter.h
-@@ -110,7 +110,7 @@ private:
-    operator=(const aflibConverter& op);
- 
-    int
--   err_ret(char *s);
-+   err_ret(const char *s);
- 
-    void
-    deleteMemory();
diff --git a/audio/osalp/files/patch-aflib_aflibDateTime.h b/audio/osalp/files/patch-aflib_aflibDateTime.h
deleted file mode 100644
index 43c9ea31fa90..000000000000
--- a/audio/osalp/files/patch-aflib_aflibDateTime.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- aflib/aflibDateTime.h.orig	2001-10-29 03:55:30 UTC
-+++ aflib/aflibDateTime.h
-@@ -28,6 +28,7 @@
- #endif
- 
- #include <iostream>
-+#include <cstdlib>
- 
- #include <string>
- using std::string;
diff --git a/audio/osalp/files/patch-aflib_aflibEnvFile.h b/audio/osalp/files/patch-aflib_aflibEnvFile.h
deleted file mode 100644
index f72a891a33d7..000000000000
--- a/audio/osalp/files/patch-aflib_aflibEnvFile.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- aflib/aflibEnvFile.h.orig	2001-10-29 03:55:30 UTC
-+++ aflib/aflibEnvFile.h
-@@ -47,6 +47,7 @@
- 
- 
- #include <string>
-+#include <cstring>
- 
- using std::string;
- 
diff --git a/audio/osalp/files/patch-aflib_aflibMemCache.cc b/audio/osalp/files/patch-aflib_aflibMemCache.cc
deleted file mode 100644
index e104d342f91b..000000000000
--- a/audio/osalp/files/patch-aflib_aflibMemCache.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- aflib/aflibMemCache.cc.orig	2007-01-16 19:26:39 UTC
-+++ aflib/aflibMemCache.cc
-@@ -24,6 +24,7 @@
- #include <config.h>
- #endif
- 
-+#include <cstdlib> // getenv
- 
- #include "aflibMemCache.h"
- #include "aflibMemNode.h"
diff --git a/audio/osalp/files/patch-formatlib_audiofile-0.2.0_libaudiofile_aiffwrite.c b/audio/osalp/files/patch-formatlib_audiofile-0.2.0_libaudiofile_aiffwrite.c
deleted file mode 100644
index a87d115a9c35..000000000000
--- a/audio/osalp/files/patch-formatlib_audiofile-0.2.0_libaudiofile_aiffwrite.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- formatlib/audiofile-0.2.0/libaudiofile/aiffwrite.c.orig	2001-02-20 19:37:23 UTC
-+++ formatlib/audiofile-0.2.0/libaudiofile/aiffwrite.c
-@@ -28,6 +28,7 @@
- 
- #include <assert.h>
- #include <sys/types.h>
-+#include <string.h>
- #include <stdlib.h>
- 
- #include "extended.h"
diff --git a/audio/osalp/files/patch-formatlib_ogg_aflibBufferUtils.h b/audio/osalp/files/patch-formatlib_ogg_aflibBufferUtils.h
deleted file mode 100644
index 3a805c1ac2ee..000000000000
--- a/audio/osalp/files/patch-formatlib_ogg_aflibBufferUtils.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- formatlib/ogg/aflibBufferUtils.h.orig	2007-01-16 19:26:39 UTC
-+++ formatlib/ogg/aflibBufferUtils.h
-@@ -38,6 +38,7 @@ this buffer.
- #include <config.h>
- #endif
- 
-+#include <cstring>
- 
- class aflibBufferUtils {
- 
diff --git a/audio/osalp/pkg-descr b/audio/osalp/pkg-descr
deleted file mode 100644
index c29ea3b88d28..000000000000
--- a/audio/osalp/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-This is the home page for the Open Source Audio Library Project. This is a
-project designed to implement a world class set of classes in C++ that will
-handle all of the audio functions one would like. It is designed to be multi-
-platform with UNIX based platforms as the base. This project is still in the
-beta code phase and a beta version that will illustrate the power and
-flexibility is now available. This version supports the Linux (OSS) audio
-device, Solaris Sparc audio device, FreeBSD (OSS) audio device, wav, au, aiff,
-aifc, mp3, and numerous other formats. It is important to note that this is
-not an application but a C++ library that others can use to create an audio
-application or to easily add audio capabilities to an existing application.
-
-WWW: http://osalp.sourceforge.net/
diff --git a/audio/osalp/pkg-plist b/audio/osalp/pkg-plist
deleted file mode 100644
index 826899ab07ea..000000000000
--- a/audio/osalp/pkg-plist
+++ /dev/null
@@ -1,53 +0,0 @@
-bin/audiofile-config
-include/af_vfs.h
-include/audiofile.h
-include/aupvlist.h
-include/aflib/aflib.h
-include/aflib/aflibAudio.h
-include/aflib/aflibAudioBWFilter.h
-include/aflib/aflibAudioConstantSrc.h
-include/aflib/aflibAudioEdit.h
-include/aflib/aflibAudioFile.h
-include/aflib/aflibAudioMemoryInput.h
-include/aflib/aflibAudioMixer.h
-include/aflib/aflibAudioPitch.h
-include/aflib/aflibAudioRecorder.h
-include/aflib/aflibAudioSampleRateCvt.h
-include/aflib/aflibAudioSpectrum.h
-include/aflib/aflibAudioStereoToMono.h
-include/aflib/aflibChain.h
-include/aflib/aflibChainNode.h
-include/aflib/aflibConfig.h
-include/aflib/aflibConverter.h
-include/aflib/aflibConverterLargeFilter.h
-include/aflib/aflibConverterSmallFilter.h
-include/aflib/aflibData.h
-include/aflib/aflibDateTime.h
-include/aflib/aflibDebug.h
-include/aflib/aflibEditClip.h
-include/aflib/aflibEnvFile.h
-include/aflib/aflibFFT.h
-include/aflib/aflibFile.h
-include/aflib/aflibFileItem.h
-include/aflib/aflibMemCache.h
-include/aflib/aflibMemNode.h
-include/aflib/aflibMixerItem.h
-include/aflib/aflibRecorderItem.h
-include/aflib/aflibSampleData.h
-lib/aflib/libaflibAifcFile-%%VERSION%%.so
-lib/aflib/libaflibAifcFile.so
-lib/aflib/libaflibAiffFile-%%VERSION%%.so
-lib/aflib/libaflibAiffFile.so
-lib/aflib/libaflibAuFile-%%VERSION%%.so
-lib/aflib/libaflibAuFile.so
-lib/aflib/libaflibDevFile-%%VERSION%%.so
-lib/aflib/libaflibDevFile.so
-lib/aflib/libaflibMpgFile-%%VERSION%%.so
-lib/aflib/libaflibMpgFile.so
-lib/aflib/libaflibOggFile-%%VERSION%%.so
-lib/aflib/libaflibOggFile.so
-lib/aflib/libaflibWavFile-%%VERSION%%.so
-lib/aflib/libaflibWavFile.so
-lib/libaflib-%%VERSION%%.so
-lib/libaflib.so
-share/aclocal/audiofile.m4
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
deleted file mode 100644
index f481a5ea3eea..000000000000
--- a/audio/rplay/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# Created by: rmallory@csusb.edu
-
-PORTNAME=	rplay
-PORTVERSION=	3.3.2
-PORTREVISION=	3
-CATEGORIES=	audio
-MASTER_SITES=	http://ponce.cc/slackware/sources/repo/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Network audio player
-
-LICENSE=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-DEPRECATED=	Abandoned upstream, no new releases since 1999
-EXPIRATION_DATE=2021-12-31
-
-LIB_DEPENDS=	libgsm.so:audio/gsm
-
-USES=		makeinfo
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
-
-INFO=		RPLAY RPTP librplay rplayd
-MAKE_ARGS=	infodir=${PREFIX}/${INFO_PATH}
-
-.include <bsd.port.pre.mk>
-
-USE_RC_SUBR=	rplayd
-
-.if ${ARCH} == "amd64"
-# pr ports/166658 mentions a problem with amd64. if it happens on i386, you can delete this conditional
-# and rename to patch-ao
-#EXTRA_PATCHES=	${FILESDIR}/extra-patch-ao
-.endif
-
-post-extract:
-	@${CP} ${WRKSRC}/doc/rplay.texi ${WRKSRC}/doc/rplayd.texi
-
-post-patch:
-	@${REINPLACE_CMD} -E \
-		's,(bin|include|info|lib|man|sbin)dir),DESTDIR)$$(&,g' \
-		${WRKSRC}/include/Makefile.in \
-		${WRKSRC}/librplay/Makefile.in \
-		${WRKSRC}/rplayd/Makefile.in \
-		${WRKSRC}/rplay/Makefile.in \
-		${WRKSRC}/rptp/Makefile.in \
-		${WRKSRC}/doc/Makefile.in
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librplay.so
-.for file in rplay.conf rplay.helpers rplay.servers rplay.hosts
-	${CP} ${WRKSRC}/etc/${file} ${STAGEDIR}${PREFIX}/etc/${file}.sample
-.endfor
-	@${ECHO_CMD} localhost > ${STAGEDIR}${PREFIX}/etc/rplay.hosts.sample
-
-.include <bsd.port.post.mk>
diff --git a/audio/rplay/distinfo b/audio/rplay/distinfo
deleted file mode 100644
index 614711d4cb38..000000000000
--- a/audio/rplay/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (rplay-3.3.2.tar.gz) = 74265153457a44e1e2f0fa38c59c9b12ea5b684db2c83eb055184f86db81fdd8
-SIZE (rplay-3.3.2.tar.gz) = 480015
diff --git a/audio/rplay/files/extra-patch-ao b/audio/rplay/files/extra-patch-ao
deleted file mode 100644
index 5e80ed2068c1..000000000000
--- a/audio/rplay/files/extra-patch-ao
+++ /dev/null
@@ -1,245 +0,0 @@
---- lib/Makefile.in.orig	1998-07-14 22:35:23 UTC
-+++ lib/Makefile.in
-@@ -13,8 +13,8 @@ CPPFLAGS=	$(CC_OPTIONS) -I. -I../include
- 		$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
- 
- TARGET=		librp.a
--SRCS=		getopt.c getopt1.c hash.c strdup.c tilde.c xmalloc.c
--OBJS=		getopt.o getopt1.o hash.o strdup.o tilde.o xmalloc.o
-+SRCS=		hash.c tilde.c xmalloc.c
-+OBJS=		hash.o tilde.o xmalloc.o
- 
- all:		$(TARGET)
- 
---- rplayd/helper.c.orig	1999-03-10 07:58:03 UTC
-+++ rplayd/helper.c
-@@ -110,7 +110,7 @@ helper_read(filename)
- 	    done(1);
- 	}
- 	//memset ((char *) &hp->pattern, 0, sizeof (hp->pattern));
--	error = regncomp(&hp->pattern, pat, strlen(pat), REG_ICASE | REG_NOSUB);
-+	error = regcomp(&hp->pattern, pat, REG_EXTENDED | REG_ICASE | REG_NOSUB);
- 	if (error)
- 	{
- 	    report(REPORT_ERROR, "helper_read: %d line %d\n", error, line);
-@@ -188,7 +188,7 @@ helper_lookup(sound)
- 
-     for (hp = helpers; hp; hp = hp->next)
-     {
--	if (regnexec(&hp->pattern, sound, strlen(sound), 0, 0, 0) == 0)
-+	if (regexec(&hp->pattern, sound, 0, 0, 0) == 0)
- 	{
- 	    return hp;
- 	}
---- rplayd/host.c.orig	1999-06-09 06:27:44 UTC
-+++ rplayd/host.c
-@@ -95,10 +95,10 @@ host_read(filename)
-     //memset ((char *) &access_write, 0, sizeof (access_write));
-     //memset ((char *) &access_execute, 0, sizeof (access_execute));
- 
--    strcpy(expr_read, "^\\(");
--    strcpy(expr_write, "^\\(");
--    strcpy(expr_execute, "^\\(");
--    strcpy(expr_monitor, "^\\(");
-+    strcpy(expr_read, "^(");
-+    strcpy(expr_write, "^(");
-+    strcpy(expr_execute, "^(");
-+    strcpy(expr_monitor, "^(");
- 
-     do
-     {
-@@ -162,7 +162,7 @@ host_read(filename)
- 
-     if (strlen(expr_read) == 3)
-     {
--	strcat(expr_read, "\\)");
-+	strcat(expr_read, ")");
-     }
-     else
-     {
-@@ -171,7 +171,7 @@ host_read(filename)
-     strcat(expr_read, "$");
-     if (strlen(expr_write) == 3)
-     {
--	strcat(expr_write, "\\)");
-+	strcat(expr_write, ")");
-     }
-     else
-     {
-@@ -180,7 +180,7 @@ host_read(filename)
-     strcat(expr_write, "$");
-     if (strlen(expr_execute) == 3)
-     {
--	strcat(expr_execute, "\\)");
-+	strcat(expr_execute, ")");
-     }
-     else
-     {
-@@ -189,7 +189,7 @@ host_read(filename)
-     strcat(expr_execute, "$");
-     if (strlen(expr_monitor) == 3)
-     {
--	strcat(expr_monitor, "\\)");
-+	strcat(expr_monitor, ")");
-     }
-     else
-     {
-@@ -197,35 +197,35 @@ host_read(filename)
-     }
-     strcat(expr_monitor, "$");
- 
--    error = regncomp(&access_read, expr_read, strlen(expr_read),
--		     REG_ICASE | REG_NOSUB);
-+    error = regcomp(&access_read, expr_read,
-+		     REG_EXTENDED | REG_ICASE | REG_NOSUB);
-     if (error)
-     {
--	report(REPORT_ERROR, "host_read: regncomp: %d\n", error);
-+	report(REPORT_ERROR, "host_read: regcomp: %d\n", error);
- 	done(1);
-     }
- 
--    error = regncomp(&access_write, expr_write, strlen(expr_write),
--		     REG_ICASE | REG_NOSUB);
-+    error = regcomp(&access_write, expr_write,
-+		     REG_EXTENDED | REG_ICASE | REG_NOSUB);
-     if (error)
-     {
--	report(REPORT_ERROR, "host_read: regncomp: %d\n", error);
-+	report(REPORT_ERROR, "host_read: regcomp: %d\n", error);
- 	done(1);
-     }
- 
--    error = regncomp(&access_execute, expr_execute, strlen(expr_execute),
--		     REG_ICASE | REG_NOSUB);
-+    error = regcomp(&access_execute, expr_execute,
-+		     REG_EXTENDED | REG_ICASE | REG_NOSUB);
-     if (error)
-     {
--	report(REPORT_ERROR, "host_read: regncomp: %d\n", error);
-+	report(REPORT_ERROR, "host_read: regcomp: %d\n", error);
- 	done(1);
-     }
- 
--    error = regncomp(&access_monitor, expr_monitor, strlen(expr_monitor),
--		     REG_ICASE | REG_NOSUB);
-+    error = regcomp(&access_monitor, expr_monitor,
-+		     REG_EXTENDED | REG_ICASE | REG_NOSUB);
-     if (error)
-     {
--	report(REPORT_ERROR, "host_read: regncomp: %d\n", error);
-+	report(REPORT_ERROR, "host_read: regcomp: %d\n", error);
- 	done(1);
-     }
- }
-@@ -354,22 +354,22 @@ host_insert(expr_read, expr_write, expr_
- 	{
- 	case HOST_READ:
- 	    strcat(expr_read, re_name);
--	    strcat(expr_read, "\\|");
-+	    strcat(expr_read, "|");
- 	    break;
- 
- 	case HOST_WRITE:
- 	    strcat(expr_write, re_name);
--	    strcat(expr_write, "\\|");
-+	    strcat(expr_write, "|");
- 	    break;
- 
- 	case HOST_EXECUTE:
- 	    strcat(expr_execute, re_name);
--	    strcat(expr_execute, "\\|");
-+	    strcat(expr_execute, "|");
- 	    break;
- 
- 	case HOST_MONITOR:
- 	    strcat(expr_monitor, re_name);
--	    strcat(expr_monitor, "\\|");
-+	    strcat(expr_monitor, "|");
- 	    break;
- 
- 	default:
-@@ -432,7 +432,7 @@ host_access(sin, access_mode)
- 	done(1);
-     }
- 
--    n = regnexec(re, p, strlen(p), 0, 0, 0);
-+    n = regexec(re, p, 0, 0, 0);
- 
-     return !n;
- }
---- rplayd/native.c.orig	1999-03-10 07:58:03 UTC
-+++ rplayd/native.c
-@@ -32,6 +32,7 @@
- #include "rplayd.h"
- #include "native.h"
- #include "ulaw.h"
-+#include <string.h>
- 
- /* Native means 16-bit signed. */
- 
---- rplayd/sound.c.orig	1999-06-09 06:27:44 UTC
-+++ rplayd/sound.c
-@@ -96,14 +96,14 @@ bad_dirs_init()
- 
-     dirs = strdup(BAD_DIRS);	/* XXX */
- 
--    length = strlen("^\\(") + strlen("\\)") + strlen(dirs) + 1;
-+    length = strlen("^(") + strlen(")") + strlen(dirs) + 1;
- 
-     //length += strlen ("^");
-     for (p = dirs; *p; p++)
-     {
- 	if (*p == ':')
- 	{
--	    length += strlen("\\|") - strlen(":");
-+	    length += strlen("|") - strlen(":");
- 	}
-     }
- 
-@@ -119,7 +119,7 @@ bad_dirs_init()
-     }
- 
-     first = 1;
--    strcpy(buf, "^\\(");
-+    strcpy(buf, "^(");
-     while (p = (char *) strtok(first ? dirs : 0, ":"))
-     {
- 	if (first)
-@@ -129,12 +129,12 @@ bad_dirs_init()
- 	}
- 	else
- 	{
--	    //strcat (buf, "\\|^");
--	    strcat(buf, "\\|");
-+	    //strcat (buf, "|^");
-+	    strcat(buf, "|");
- 	}
- 	strcat(buf, p);
-     }
--    strcat(buf, "\\)");
-+    strcat(buf, ")");
- 
- #if 0
-     report(REPORT_DEBUG, "bad_dirs=%s, strlen=%d, length=%d\n",
-@@ -143,9 +143,9 @@ bad_dirs_init()
- 
-     //memset ((char *) &bad_dirs, 0, sizeof (bad_dirs));
- 
--    if (regncomp(&bad_dirs, buf, strlen(buf), REG_ICASE | REG_NOSUB))
-+    if (regcomp(&bad_dirs, buf, REG_EXTENDED | REG_ICASE | REG_NOSUB))
-     {
--	report(REPORT_ERROR, "bad_dirs: regncomp failed\n");
-+	report(REPORT_ERROR, "bad_dirs: regcomp failed\n");
- 	done(1);
-     }
- 
-@@ -162,7 +162,7 @@ bad_dir(dir)
- #endif
- {
-     /* return 1 if bad */
--    return regnexec(&bad_dirs, dir, strlen(dir), 0, 0, 0) ? 0 : 1;
-+    return regexec(&bad_dirs, dir, 0, 0, 0) ? 0 : 1;
- }
- 
- #endif /* BAD_DIRS */
diff --git a/audio/rplay/files/patch-Makefile.config.in b/audio/rplay/files/patch-Makefile.config.in
deleted file mode 100644
index 7874153b780d..000000000000
--- a/audio/rplay/files/patch-Makefile.config.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.config.in.orig	1998-08-13 06:12:59 UTC
-+++ Makefile.config.in
-@@ -43,6 +43,7 @@ CFLAGS=		@CFLAGS@
- #CC_OPTIONS=	-O -cckr			# SGI 
- #CC_OPTIONS=	-O				# generic
- #CC_OPTIONS=	-g				# debug 
-+CC_OPTIONS=	@CPPFLAGS@
- 
- ##
- ## Extra linker options.
diff --git a/audio/rplay/files/patch-doc_Makefile.in b/audio/rplay/files/patch-doc_Makefile.in
deleted file mode 100644
index a7ce9719d631..000000000000
--- a/audio/rplay/files/patch-doc_Makefile.in
+++ /dev/null
@@ -1,41 +0,0 @@
---- doc/Makefile.in.orig	1998-07-14 22:35:23 UTC
-+++ doc/Makefile.in
-@@ -23,15 +23,15 @@ MKINSTALLDIRS= @srcdir@/../mkinstalldirs
- .texi.html:
- 	$(TEXI2HTML) $(TEXI2HTML_FLAGS) $<
- 
--all:
-+all: info
- 
--info: RPLAY.info RPTP.info librplay.info rplay.info
-+info: RPLAY.info RPTP.info librplay.info rplayd.info
- 
--dvi: RPLAY.dvi RPTP.dvi librplay.dvi rplay.dvi
-+dvi: RPLAY.dvi RPTP.dvi librplay.dvi rplayd.dvi
- 
--ps: RPLAY.ps RPTP.ps librplay.ps rplay.ps
-+ps: RPLAY.ps RPTP.ps librplay.ps rplayd.ps
- 
--html: RPLAY.html RPTP.html librplay.html rplay.html
-+html: RPLAY.html RPTP.html librplay.html rplayd.html
- 
- man:
- 	./genman rplay.1.in
-@@ -50,7 +50,7 @@ install: all
- 	-$(INSTALL_DATA) RPLAY.info $(infodir)/RPLAY.info
- 	-$(INSTALL_DATA) RPTP.info $(infodir)/RPTP.info
- 	-$(INSTALL_DATA) librplay.info $(infodir)/librplay.info
--	-$(INSTALL_DATA) rplay.info $(infodir)/rplay.info
-+	-$(INSTALL_DATA) rplayd.info $(infodir)/rplayd.info
- 
- uninstall:
- 	-$(RM) $(mandir)/man1/rplay.1
-@@ -63,7 +63,7 @@ uninstall:
- 	-$(RM) $(infodir)/RPLAY.info
- 	-$(RM) $(infodir)/RPTP.info
- 	-$(RM) $(infodir)/librplay.info
--	-$(RM) $(infodir)/rplay.info
-+	-$(RM) $(infodir)/rplayd.info
- 
- clean:
- 	$(RM) *~ *.bak *.orig
diff --git a/audio/rplay/files/patch-doc_RPLAY.texi b/audio/rplay/files/patch-doc_RPLAY.texi
deleted file mode 100644
index bb98b88d39b9..000000000000
--- a/audio/rplay/files/patch-doc_RPLAY.texi
+++ /dev/null
@@ -1,13 +0,0 @@
---- doc/RPLAY.texi.orig	1998-07-14 22:35:23 UTC
-+++ doc/RPLAY.texi
-@@ -2,6 +2,10 @@
- @c %**start of header
- @setfilename RPLAY.info
- @settitle The RPLAY Protocol
-+@dircategory Network Audio Systems
-+@direntry
-+* RPLAY Protocol: (RPLAY)	The RPLAY Protocol
-+@end direntry
- @iftex
- @finalout
- @end iftex
diff --git a/audio/rplay/files/patch-doc_RPTP.texi b/audio/rplay/files/patch-doc_RPTP.texi
deleted file mode 100644
index 85630ee7d9b4..000000000000
--- a/audio/rplay/files/patch-doc_RPTP.texi
+++ /dev/null
@@ -1,13 +0,0 @@
---- doc/RPTP.texi.orig	1998-07-14 22:35:23 UTC
-+++ doc/RPTP.texi
-@@ -2,6 +2,10 @@
- @c %**start of header
- @setfilename RPTP.info
- @settitle The RPTP Protocol
-+@dircategory Network Audio Systems
-+@direntry
-+* RPTP: (RPTP)			RPTP Protocol
-+@end direntry
- @defindex ev
- @iftex
- @finalout
diff --git a/audio/rplay/files/patch-doc_librplay.texi b/audio/rplay/files/patch-doc_librplay.texi
deleted file mode 100644
index f472f3b378c8..000000000000
--- a/audio/rplay/files/patch-doc_librplay.texi
+++ /dev/null
@@ -1,13 +0,0 @@
---- doc/librplay.texi.orig	1998-07-14 22:35:23 UTC
-+++ doc/librplay.texi
-@@ -2,6 +2,10 @@
- @c %**start of header
- @setfilename librplay.info
- @settitle The rplay Programmer's Manual
-+@dircategory Network Audio Systems
-+@direntry
-+* librplay: (librplay)		The rplay Programmer's Manual
-+@end direntry
- @iftex
- @finalout
- @end iftex
diff --git a/audio/rplay/files/patch-doc_rplayd.8 b/audio/rplay/files/patch-doc_rplayd.8
deleted file mode 100644
index 24aab7da14aa..000000000000
--- a/audio/rplay/files/patch-doc_rplayd.8
+++ /dev/null
@@ -1,33 +0,0 @@
---- doc/rplayd.8.orig	1998-07-14 22:35:23 UTC
-+++ doc/rplayd.8
-@@ -125,7 +125,7 @@ mapping is cdrom[0-3] -> /vol/dev/aliase
- Linux uses cdrom[0-3] -> /dev/cdrom[0-3].
- .TP
- .I "\-C FILE, \-\-conf=FILE"
--Use FILE for rplay.conf (/etc/rplay/rplay.conf).
-+Use FILE for rplay.conf.
- .TP
- .I "\-T N, \-\-connection\-timeout=N"
- Close idle RPTP connections after N seconds, disabled with 0 (300).
-@@ -146,10 +146,10 @@ Run with GROUP privs. (audio)
- Display helpful information.
- .TP
- .I "\-\-helpers=FILE"
--Use FILE for rplay.helpers (/etc/rplay/rplay.helpers).
-+Use FILE for rplay.helpers.
- .TP
- .I "\-H FILE, \-\-hosts=FILE"
--Use FILE for rplay.hosts (/etc/rplay/rplay.hosts).
-+Use FILE for rplay.hosts.
- .TP
- .I "\-\-inetd"
- Enable inetd mode. (disabled)
-@@ -191,7 +191,7 @@ Use PORT as the RPTP/TCP port. (5556)
- (--other-rptp-port may also be available)
- .TP
- .I "\-S FILE, \-\-servers=FILE"
--Use FILE for rplay.servers (/etc/rplay/rplay.servers).
-+Use FILE for rplay.servers.
- .TP
- .I "\-t N, \-\-timeout=N"
- Exit after N idle seconds, disabled with 0 (0).
diff --git a/audio/rplay/files/patch-doc_rplayd.texi b/audio/rplay/files/patch-doc_rplayd.texi
deleted file mode 100644
index 054b83e731ae..000000000000
--- a/audio/rplay/files/patch-doc_rplayd.texi
+++ /dev/null
@@ -1,50 +0,0 @@
---- doc/rplayd.texi.orig	2016-07-26 15:48:49 UTC
-+++ doc/rplayd.texi
-@@ -1,7 +1,11 @@
- \input texinfo   @c -*-texinfo-*-
- @c %**start of header
--@setfilename rplay.info
-+@setfilename rplayd.info
- @settitle rplay
-+@dircategory Network Audio Systems
-+@direntry
-+* rplayd: (rplayd)		RPlay
-+@end direntry
- @iftex
- @finalout
- @end iftex
-@@ -71,7 +75,6 @@ This file documents the rplay Network Au
- * rplayd::                      The rplay audio server.
- * rplay::                       A sample RPLAY client.
- * rptp::                        A sample RPTP client.
--* xrplay::                      A X Windows rplay audio control panel.
- @end menu
- 
- @node Overview, rplayd, Top, Top
-@@ -162,25 +165,12 @@ sounds can be sent over the network usin
- attempt to determine whether or not the server has the sound before
- using the network.
- 
--@node rptp, xrplay, rplay, Top
-+@node rptp,  , rplay, Top
- @chapter rptp
- rptp is a simple RPTP client that communicates with rplayd using the
- RPTP protocol.  Several commands can be issued to control rplayd and
- report its status.  See the output of the rptp help command for a list
- of available commands.
- 
--@node xrplay,  , rptp, Top
--@chapter xrplay
--rplay control panel which includes CD player-like buttons, volume
--control, a simple vu meter, and a sound progess bar.  Sounds can be
--played, paused, continued, and stopped using the appropriate buttons.
--
--xrplay is also useful as a sound file player and can be used with web
--browsers and other applications that use external programs to play
--sounds.
--
--xrplay communicates with the local (or remote) rplayd using the RPTP
--protocol.
--
- @bye
- 
diff --git a/audio/rplay/files/patch-librplay_Makefile.in b/audio/rplay/files/patch-librplay_Makefile.in
deleted file mode 100644
index db1eb40d5813..000000000000
--- a/audio/rplay/files/patch-librplay_Makefile.in
+++ /dev/null
@@ -1,38 +0,0 @@
---- librplay/Makefile.in.orig	1999-03-23 02:38:38 UTC
-+++ librplay/Makefile.in
-@@ -19,11 +19,12 @@ LDFLAGS=	$(LD_OPTIONS) -shared @LDFLAGS@
- 		$(CC) -c -fPIC $(CPPFLAGS) $(CFLAGS) -o $@ $<
- 
- TARGET=		$(LIBRPLAY_NAME)
-+SOVER=		1
- SRCS=		rplay.c rptp.c async.c
- OBJS=		rplay.o rptp.o async.o
- SHAREDOBJS=	rplay.lo rptp.lo async.lo
- 
--all:		$(TARGET) librplay.so
-+all:		$(TARGET) librplay.so.$(SOVER)
- 
- #
- # Use the following for SunOS 4.1.x, Solaris 2.x, Linux, NetBSD
-@@ -32,8 +33,9 @@ $(TARGET):	$(OBJS)
- 		$(AR) rcv $@ $?
- 		$(RANLIB) $@
- 
--librplay.so:	$(SHAREDOBJS)
--		$(CC) -o $@ $(SHAREDOBJS) $(LDFLAGS)
-+librplay.so.$(SOVER):	$(SHAREDOBJS)
-+		$(CC) -o $@ -Wl,-soname,$@ $(SHAREDOBJS) $(LDFLAGS)
-+		ln -sf $@ librplay.so
- 
- #
- # For HP-UX comment above and uncomment below.
-@@ -50,7 +52,8 @@ librplay.so:	$(SHAREDOBJS)
- install:	all
- 		$(MKINSTALLDIRS) $(libdir)
- 		$(INSTALL_DATA) $(TARGET) $(libdir)
--		$(INSTALL_DATA) librplay.so $(libdir)
-+		$(INSTALL_DATA) librplay.so.$(SOVER) $(libdir)
-+		ln -sf librplay.so.$(SOVER) $(libdir)/librplay.so
- 
- uninstall:
- 		$(RM) $(libdir)/$(TARGET)
diff --git a/audio/rplay/files/patch-rplayd_Makefile.in b/audio/rplay/files/patch-rplayd_Makefile.in
deleted file mode 100644
index 4e2e34c54b11..000000000000
--- a/audio/rplay/files/patch-rplayd_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- rplayd/Makefile.in.orig	1999-06-09 06:27:43 UTC
-+++ rplayd/Makefile.in
-@@ -54,7 +54,6 @@ $(TARGET):	$(OBJS) ../librplay/$(LIBRPLA
- install:	all
- 		$(MKINSTALLDIRS) $(sbindir)
- 		$(INSTALL_PROGRAM) $(TARGET) $(sbindir)/$(TARGET)
--		@test -x $(bindir)/$(TARGET) && echo "" && echo "    Note: Consider removing $(bindir)/$(TARGET)" && echo ""
- 
- uninstall:
- 		$(RM) $(bindir)/$(TARGET)
diff --git a/audio/rplay/files/patch-rplayd__audio__audio_FreeBSD.c b/audio/rplay/files/patch-rplayd__audio__audio_FreeBSD.c
deleted file mode 100644
index 3ae57a8b3607..000000000000
--- a/audio/rplay/files/patch-rplayd__audio__audio_FreeBSD.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- rplayd/audio/audio_FreeBSD.c.orig	1999-03-10 07:58:10 UTC
-+++ rplayd/audio/audio_FreeBSD.c
-@@ -35,7 +35,7 @@
- #include <sys/ioctl.h>
- #include <sys/errno.h>
- #include <errno.h>
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- 
- /*
-  * for the poor folks who don't have a sound card, but use the pc speaker
-@@ -353,7 +353,7 @@ rplay_audio_get_volume(void)
- 	return (-1);
-     }
- 
--    if (!(mxdevmask & SOUND_MIXER_PCM))
-+    if (!(mxdevmask & SOUND_MASK_PCM))
-     {
- 	report(REPORT_ERROR, "rplay_audio_get_volume: pcm mixer device not installed\n");
- 	close(mx);
-@@ -417,7 +417,7 @@ rplay_audio_set_volume(int volume)
- 	return (-1);
-     }
- 
--    if (!(mxdevmask & SOUND_MIXER_PCM))
-+    if (!(mxdevmask & SOUND_MASK_PCM))
-     {
- 	report(REPORT_ERROR, "rplay_audio_set_volume: pcm mixer device not installed\n");
- 	close(mx);
diff --git a/audio/rplay/files/patch-rplayd__rplayd.c b/audio/rplay/files/patch-rplayd__rplayd.c
deleted file mode 100644
index d53a34cc11b3..000000000000
--- a/audio/rplay/files/patch-rplayd__rplayd.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- rplayd/rplayd.c.orig	1999-03-10 07:58:04 UTC
-+++ rplayd/rplayd.c
-@@ -421,10 +421,9 @@ main(argc, argv)
-     /* Fork */
-     if (do_fork)
-     {
--	int pid = fork();
--	if (pid != 0)
--	{
--	    exit(0);
-+	if (daemon(1, 1) < 0) {
-+	    report(REPORT_ERROR, "daemon: %s\n", sys_err_str(errno));
-+	    done(1);
- 	}
-     }
- 
diff --git a/audio/rplay/files/patch-rplayd_rplayd.h b/audio/rplay/files/patch-rplayd_rplayd.h
deleted file mode 100644
index 18359e742ca1..000000000000
--- a/audio/rplay/files/patch-rplayd_rplayd.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- rplayd/rplayd.h.orig	1999-03-10 07:58:04 UTC
-+++ rplayd/rplayd.h
-@@ -73,7 +73,6 @@ extern RPLAY_AUDIO_TABLE *rplay_audio_ta
- extern fd_set read_mask;
- extern fd_set write_mask;
- extern int debug;
--extern int inetd;
- extern int rptp_timeout;
- extern char hostname[];
- extern char *hostaddr;
diff --git a/audio/rplay/files/patch-rplayd_sound.h b/audio/rplay/files/patch-rplayd_sound.h
deleted file mode 100644
index c5ad69322425..000000000000
--- a/audio/rplay/files/patch-rplayd_sound.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- rplayd/sound.h.orig	1999-06-09 06:27:44 UTC
-+++ rplayd/sound.h
-@@ -170,9 +170,9 @@ typedef struct _sindex
-     int gsm_bit_frame_bytes;	/* Number of bytes in gsm_bit_frame */
-     int gsm_fixed_buffer_size;
- #endif /* HAVE_GSM */
--#ifdef HAVE_CDROM
-+#if defined(HAVE_CDROM) || defined(HAVE_HELPERS)
-     int pid;
--#endif /* HAVE_CDROM */
-+#endif /* HAVE_CDROM || HAVE_HELPERS */
- }
- SINDEX;
- 
diff --git a/audio/rplay/files/patch-rplayd_spool.c b/audio/rplay/files/patch-rplayd_spool.c
deleted file mode 100644
index 57a3e19589c3..000000000000
--- a/audio/rplay/files/patch-rplayd_spool.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- rplayd/spool.c.orig	1999-03-10 21:14:38 UTC
-+++ rplayd/spool.c
-@@ -1127,8 +1127,8 @@ spool_update()
- 				spool_flow_pause(sp);
- 			    }
- 			}
--#endif /* HAVE_CDROM */
- 		    }
-+#endif /* HAVE_CDROM */
- 		}
- 		else
- 		{
diff --git a/audio/rplay/files/patch-rx_Makefile.in b/audio/rplay/files/patch-rx_Makefile.in
deleted file mode 100644
index fa7ed2cc4dd5..000000000000
--- a/audio/rplay/files/patch-rx_Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- rx/Makefile.in.orig	1998-07-14 22:35:25 UTC
-+++ rx/Makefile.in
-@@ -64,11 +64,11 @@ gen_c_files=rgx.x
- all: librx.a
- 
- install: all
--	test -d $(libdir) || mkdir $(libdir)
--	test -d $(includedir) || mkdir $(includedir)
--	$(INSTALL) librx.a $(libdir)/librx.a
--	$(RANLIB) $(libdir)/librx.a
--	$(INSTALL) $(srcdir)/inst-rxposix.h $(includedir)/rxposix.h
-+#	test -d $(libdir) || mkdir $(libdir)
-+#	test -d $(includedir) || mkdir $(includedir)
-+#	$(INSTALL) librx.a $(libdir)/librx.a
-+#	$(RANLIB) $(libdir)/librx.a
-+#	$(INSTALL) $(srcdir)/inst-rxposix.h $(includedir)/rxposix.h
- 
- 
- uninstall:
diff --git a/audio/rplay/files/rplayd.in b/audio/rplay/files/rplayd.in
deleted file mode 100644
index 77300e904862..000000000000
--- a/audio/rplay/files/rplayd.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: rplayd
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable rplayd
-#
-#rplayd_enable="YES"
-#
-
-. /etc/rc.subr
-
-name=rplayd
-rcvar=rplayd_enable
-
-load_rc_config $name
-
-# set defaults:
-: ${rplayd_enable:="NO"}
-
-command=%%PREFIX%%/sbin/${name}
-
-run_rc_command "$1"
diff --git a/audio/rplay/pkg-descr b/audio/rplay/pkg-descr
deleted file mode 100644
index 532de6186f66..000000000000
--- a/audio/rplay/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-rplay is a flexible network audio system that allows sounds to be played to
-and from local and remote systems.  The rplay audio server currently
-supports SunOS 4.1.X, Solaris 2.X, Linux, SGI IRIX 4 & 5, HP9000/705,
-HP9000/710 and now FreeBSD.  The rplay clients and client library should
-work on any system that supports Berkeley sockets.  The X Window
-System is not required.
-
-WWW: https://web.archive.org/web/20171109100411/http://rplay.doit.org/
diff --git a/audio/rplay/pkg-plist b/audio/rplay/pkg-plist
deleted file mode 100644
index 57a59e7cb7bb..000000000000
--- a/audio/rplay/pkg-plist
+++ /dev/null
@@ -1,18 +0,0 @@
-@sample etc/rplay.hosts.sample
-@sample etc/rplay.conf.sample
-@sample etc/rplay.helpers.sample
-@sample etc/rplay.servers.sample
-bin/rplay
-bin/rptp
-sbin/rplayd
-include/rplay.h
-lib/librplay.a
-lib/librplay.so
-lib/librplay.so.1
-man/man1/rplay.1.gz
-man/man1/rptp.1.gz
-man/man5/rplay.conf.5.gz
-man/man5/rplay.helpers.5.gz
-man/man5/rplay.hosts.5.gz
-man/man5/rplay.servers.5.gz
-man/man8/rplayd.8.gz
diff --git a/databases/Makefile b/databases/Makefile
index d36d4dea764e..2952b5e2e088 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -668,7 +668,6 @@
     SUBDIR += plpgsql_check
     SUBDIR += pointcloud
     SUBDIR += postgis-jdbc
-    SUBDIR += postgis24
     SUBDIR += postgis25
     SUBDIR += postgis30
     SUBDIR += postgis31
diff --git a/databases/postgis24/Makefile b/databases/postgis24/Makefile
deleted file mode 100644
index 2897a85d62ea..000000000000
--- a/databases/postgis24/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-# Created by: Loïc BARTOLETTI <lbartoletti@FreeBSD.org>
-
-PORTNAME=	postgis
-PORTVERSION=	2.4.9
-PORTREVISION=	6
-CATEGORIES=	databases geography
-MASTER_SITES=	https://download.osgeo.org/postgis/source/
-PKGNAMESUFFIX=	24
-
-MAINTAINER=	lbartoletti@FreeBSD.org
-COMMENT=	Geographic objects support for PostgreSQL databases
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-DEPRECATED=	Deprecated in favour of databases/postgis3x
-EXPIRATION_DATE=2021-12-31
-
-LIB_DEPENDS=	libproj.so:graphics/proj \
-		libgeos.so:graphics/geos \
-		libjson-c.so:devel/json-c \
-		libgdal.so:graphics/gdal
-
-USES=		alias cpe gettext gmake gnome iconv:wchar_t libtool:keepla \
-		localbase perl5 pkgconfig pgsql:9.5-12 shebangfix
-USE_GNOME=	libxml2
-USE_LDCONFIG=	yes
-USE_PERL5=	build
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE} NUMERICFLAGS=${PORTVERSION}
-SHEBANG_FILES=	extensions/address_standardizer/*.pl raster/test/regress/*.pl \
-		raster/test/regress/loader/*.pl regress/run_test.pl \
-		utils/postgis_restore.pl.in utils/*.pl
-WANT_PGSQL=	server
-
-OPTIONS_DEFINE=	ADDRSTD LOADERGUI SFCGAL TOPOLOGY
-OPTIONS_DEFAULT=ADDRSTD SFCGAL TOPOLOGY
-OPTIONS_SUB=	yes
-
-LOADERGUI_DESC=	Enable shp2pgsql-gui
-TOPOLOGY_DESC=	Topology support
-SFCGAL_DESC=	Enable sfcgal
-ADDRSTD_DESC=	Enable address standardizer
-
-CONFLICTS_INSTALL=	postgis20 postgis21 postgis22 postgis23 postgis25 postgis30 postgis31 postgis32
-
-LOADERGUI_CONFIGURE_WITH=	gui
-LOADERGUI_USE=			GNOME=gtk20
-TOPOLOGY_CONFIGURE_WITH=	topology
-SFCGAL_LIB_DEPENDS=		libSFCGAL.so:databases/sfcgal
-SFCGAL_CONFIGURE_WITH=		sfcgal=${LOCALBASE}/bin/sfcgal-config
-ADDRSTD_CONFIGURE_WITH=		address-standardizer
-ADDRSTD_LIB_DEPENDS=		libpcre.so:devel/pcre
-ADDRSTD_VARS=			WANT_PGSQL+=contrib
-
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblwgeom-2.4.so.0.0.0
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/*.so
-	${MKDIR} ${STAGEDIR}${DATADIR}/tiger_geocoder
-	(cd ${WRKSRC}/extras/tiger_geocoder && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/tiger_geocoder/ "! ( -name *\.orig -o -name *\.bak )" )
-	${MKDIR} ${STAGEDIR}${DATADIR}/utils
-	(cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/utils/ "! ( -name *\.orig -o -name *\.bak -o -name Makefile -o -name *\.in -o -name uninstall_script )" )
-
-.include <bsd.port.mk>
diff --git a/databases/postgis24/distinfo b/databases/postgis24/distinfo
deleted file mode 100644
index 40ee51fc118f..000000000000
--- a/databases/postgis24/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1598853355
-SHA256 (postgis-2.4.9.tar.gz) = 47125fdc7a7e8d3506e164aa4893d9f848b0d0e1c8eb007ac1e950ad4c31bb7e
-SIZE (postgis-2.4.9.tar.gz) = 12846316
diff --git a/databases/postgis24/pkg-descr b/databases/postgis24/pkg-descr
deleted file mode 100644
index 31c8f2a8dcd8..000000000000
--- a/databases/postgis24/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-PostGIS adds support for geographic objects to the PostgreSQL
-object-relational database. In effect, PostGIS "spatially enables"
-the PostgreSQL server, allowing it to be used as a backend spatial
-database for geographic information systems (GIS), much like ESRI's
-SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
-"Simple Features Specification for SQL" and has been certified as
-compliant with the "Types and Functions" profile.
-
-PostGIS development was started by Refractions Research as a project
-in open source spatial database technology. PostGIS is released
-under the GNU General Public License. PostGIS continues to be
-developed by a group of contributors led by a Project Steering
-Committee and new features continue to be added.
-
-WWW: https://postgis.net/
diff --git a/databases/postgis24/pkg-plist b/databases/postgis24/pkg-plist
deleted file mode 100644
index bf998fa92b4a..000000000000
--- a/databases/postgis24/pkg-plist
+++ /dev/null
@@ -1,403 +0,0 @@
-bin/pgsql2shp
-bin/raster2pgsql
-bin/shp2pgsql
-%%LOADERGUI%%bin/shp2pgsql-gui
-include/liblwgeom.h
-include/liblwgeom_topo.h
-lib/liblwgeom-2.4.so.0
-lib/liblwgeom-2.4.so.0.0.0
-lib/liblwgeom.a
-lib/liblwgeom.la
-lib/liblwgeom.so
-%%ADDRSTD%%lib/postgresql/address_standardizer.so
-lib/postgresql/postgis-2.4.so
-%%TOPOLOGY%%lib/postgresql/postgis_topology-2.4.so
-lib/postgresql/rtpostgis-2.4.so
-%%ADDRSTD%%share/doc/postgresql/extension/README.address_standardizer
-%%DATADIR%%/tiger_geocoder/README
-%%DATADIR%%/tiger_geocoder/create_geocode.bat
-%%DATADIR%%/tiger_geocoder/create_geocode.sh
-%%DATADIR%%/tiger_geocoder/create_geocode.sql
-%%DATADIR%%/tiger_geocoder/geocode/census_tracts_functions.sql
-%%DATADIR%%/tiger_geocoder/geocode/geocode.sql
-%%DATADIR%%/tiger_geocoder/geocode/geocode_address.sql
-%%DATADIR%%/tiger_geocoder/geocode/geocode_intersection.sql
-%%DATADIR%%/tiger_geocoder/geocode/geocode_location.sql
-%%DATADIR%%/tiger_geocoder/geocode/includes_address.sql
-%%DATADIR%%/tiger_geocoder/geocode/interpolate_from_address.sql
-%%DATADIR%%/tiger_geocoder/geocode/other_helper_functions.sql
-%%DATADIR%%/tiger_geocoder/geocode/rate_attributes.sql
-%%DATADIR%%/tiger_geocoder/geocode/reverse_geocode.sql
-%%DATADIR%%/tiger_geocoder/geocode_settings.sql
-%%DATADIR%%/tiger_geocoder/legacy_import/tiger2008/import_tiger_shps.sh
-%%DATADIR%%/tiger_geocoder/normalize/count_words.sql
-%%DATADIR%%/tiger_geocoder/normalize/end_soundex.sql
-%%DATADIR%%/tiger_geocoder/normalize/get_last_words.sql
-%%DATADIR%%/tiger_geocoder/normalize/location_extract.sql
-%%DATADIR%%/tiger_geocoder/normalize/location_extract_countysub_exact.sql
-%%DATADIR%%/tiger_geocoder/normalize/location_extract_countysub_fuzzy.sql
-%%DATADIR%%/tiger_geocoder/normalize/location_extract_place_exact.sql
-%%DATADIR%%/tiger_geocoder/normalize/location_extract_place_fuzzy.sql
-%%DATADIR%%/tiger_geocoder/normalize/normalize_address.sql
-%%DATADIR%%/tiger_geocoder/normalize/pprint_addy.sql
-%%DATADIR%%/tiger_geocoder/normalize/state_extract.sql
-%%DATADIR%%/tiger_geocoder/pagc_normalize/pagc_normalize_address.sql
-%%DATADIR%%/tiger_geocoder/pagc_normalize/pagc_tables.sql
-%%DATADIR%%/tiger_geocoder/regress/geocode_regress
-%%DATADIR%%/tiger_geocoder/regress/geocode_regress.sql
-%%DATADIR%%/tiger_geocoder/regress/normalize_address_desired_regress
-%%DATADIR%%/tiger_geocoder/regress/normalize_address_regress
-%%DATADIR%%/tiger_geocoder/regress/normalize_address_regress.sql
-%%DATADIR%%/tiger_geocoder/regress/pagc_normalize_address_desired_regress
-%%DATADIR%%/tiger_geocoder/regress/pagc_normalize_address_regress
-%%DATADIR%%/tiger_geocoder/regress/pagc_normalize_address_regress.sql
-%%DATADIR%%/tiger_geocoder/regress/regress.sql
-%%DATADIR%%/tiger_geocoder/regress/reverse_geocode_regress
-%%DATADIR%%/tiger_geocoder/regress/reverse_geocode_regress.sql
-%%DATADIR%%/tiger_geocoder/tables/lookup_tables_2011.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2011.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2012.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2013.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2014.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2015.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2016.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2017.sql
-%%DATADIR%%/tiger_geocoder/topology/README
-%%DATADIR%%/tiger_geocoder/topology/tiger_topology_loader.sql
-%%DATADIR%%/tiger_geocoder/upgrade_geocode.sql
-%%DATADIR%%/tiger_geocoder/upgrade_geocoder.bat
-%%DATADIR%%/tiger_geocoder/upgrade_geocoder.sh
-%%DATADIR%%/tiger_geocoder/utility/cull_null.sql
-%%DATADIR%%/tiger_geocoder/utility/levenshtein_ignore_case.sql
-%%DATADIR%%/tiger_geocoder/utility/nullable_levenshtein.sql
-%%DATADIR%%/tiger_geocoder/utility/set_search_path.sql
-%%DATADIR%%/tiger_geocoder/utility/standardize_tiger_data.sql
-%%DATADIR%%/tiger_geocoder/utility/utmzone.sql
-%%DATADIR%%/utils/README
-%%DATADIR%%/utils/check_all_upgrades.sh
-%%DATADIR%%/utils/create_spatial_ref_sys_config_dump.pl
-%%DATADIR%%/utils/create_undef.pl
-%%DATADIR%%/utils/create_unpackaged.pl
-%%DATADIR%%/utils/postgis_proc_set_search_path.pl
-%%DATADIR%%/utils/postgis_proc_upgrade.pl
-%%DATADIR%%/utils/postgis_restore.pl
-%%DATADIR%%/utils/profile_intersects.pl
-%%DATADIR%%/utils/read_scripts_version.pl
-%%DATADIR%%/utils/svn_repo_revision.pl
-%%DATADIR%%/utils/test_estimation.pl
-%%DATADIR%%/utils/test_geography_estimation.pl
-%%DATADIR%%/utils/test_geography_joinestimation.pl
-%%DATADIR%%/utils/test_joinestimation.pl
-%%LOADERGUI%%share/postgresql/applications/shp2pgsql-gui.desktop
-share/postgresql/contrib/postgis-2.4/legacy.sql
-share/postgresql/contrib/postgis-2.4/legacy_gist.sql
-share/postgresql/contrib/postgis-2.4/legacy_minimal.sql
-share/postgresql/contrib/postgis-2.4/postgis.sql
-share/postgresql/contrib/postgis-2.4/postgis_comments.sql
-share/postgresql/contrib/postgis-2.4/postgis_for_extension.sql
-share/postgresql/contrib/postgis-2.4/postgis_proc_set_search_path.sql
-share/postgresql/contrib/postgis-2.4/postgis_restore.pl
-share/postgresql/contrib/postgis-2.4/postgis_upgrade.sql
-share/postgresql/contrib/postgis-2.4/postgis_upgrade_for_extension.sql
-share/postgresql/contrib/postgis-2.4/raster_comments.sql
-share/postgresql/contrib/postgis-2.4/rtpostgis.sql
-share/postgresql/contrib/postgis-2.4/rtpostgis_for_extension.sql
-share/postgresql/contrib/postgis-2.4/rtpostgis_legacy.sql
-share/postgresql/contrib/postgis-2.4/rtpostgis_proc_set_search_path.sql
-share/postgresql/contrib/postgis-2.4/rtpostgis_upgrade.sql
-share/postgresql/contrib/postgis-2.4/rtpostgis_upgrade_for_extension.sql
-%%SFCGAL%%share/postgresql/contrib/postgis-2.4/sfcgal.sql
-%%SFCGAL%%share/postgresql/contrib/postgis-2.4/sfcgal_comments.sql
-%%SFCGAL%%share/postgresql/contrib/postgis-2.4/sfcgal_upgrade.sql
-share/postgresql/contrib/postgis-2.4/spatial_ref_sys.sql
-%%TOPOLOGY%%share/postgresql/contrib/postgis-2.4/topology.sql
-%%TOPOLOGY%%share/postgresql/contrib/postgis-2.4/topology_comments.sql
-%%TOPOLOGY%%share/postgresql/contrib/postgis-2.4/topology_upgrade.sql
-share/postgresql/contrib/postgis-2.4/uninstall_legacy.sql
-share/postgresql/contrib/postgis-2.4/uninstall_postgis.sql
-share/postgresql/contrib/postgis-2.4/uninstall_rtpostgis.sql
-%%SFCGAL%%share/postgresql/contrib/postgis-2.4/uninstall_sfcgal.sql
-%%TOPOLOGY%%share/postgresql/contrib/postgis-2.4/uninstall_topology.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--1.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.1--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.2--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.3--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.4--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.5--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.6--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.7--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.1--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.2--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.3--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.4--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.5--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.6--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.7--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.8--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.9--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.1--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.2--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.3--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.4--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.5--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.6--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.7--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.8--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.1--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.10--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.11--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.2--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.3--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.4--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.5--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.6--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.7--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.8--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.9--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.1--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.2--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.3--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.4--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.5--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.6--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.7--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.8--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--ANY--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer.control
-%%ADDRSTD%%share/postgresql/extension/address_standardizer.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us.control
-%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us.sql
-share/postgresql/extension/postgis--2.0.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.9--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.9--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.10--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.11--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-share/postgresql/extension/postgis--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--unpackaged--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis.control
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.0--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.1--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.2--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.3--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.4--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.5--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.6--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.7--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.0--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.1--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.2--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.3--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.4--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.5--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.6--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.7--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.8--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.9--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.0--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.1--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.2--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.3--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.4--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.5--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.6--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.7--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.8--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.0--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.1--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.2--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.3--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.4--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.5--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.6--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.7--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.8--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.9--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.10--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.11--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.0--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.1--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.2--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.3--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.4--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.5--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.6--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.7--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.8--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--unpackaged--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal.control
-share/postgresql/extension/postgis_tiger_geocoder--2.0.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.9--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.9--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.10--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.11--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--unpackaged--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder.control
-share/postgresql/extension/postgis_tiger_geocoder.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.0--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.1--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.2--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.3--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.4--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.5--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.6--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.7--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.0--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.1--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.2--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.3--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.4--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.5--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.6--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.7--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.8--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.9--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.0--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.1--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.2--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.3--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.4--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.5--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.6--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.7--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.8--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.0--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.1--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.2--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.3--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.4--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.5--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.6--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.7--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.8--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.9--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.10--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.11--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.0--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.1--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.2--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.3--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.4--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.5--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.6--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.7--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.8--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--unpackaged--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology.control
-%%LOADERGUI%%share/postgresql/icons/hicolor/8x8/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/16x16/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/22x22/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/24x24/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/32x32/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/36x36/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/40x40/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/42x42/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/48x48/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/64x64/apps/shp2pgsql-gui.png
diff --git a/devel/Makefile b/devel/Makefile
index a0224019b0f7..66cd982abec1 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -358,7 +358,6 @@
     SUBDIR += cl-trivial-features-sbcl
     SUBDIR += cl-trivial-gray-streams
     SUBDIR += cl-trivial-gray-streams-sbcl
-    SUBDIR += clanlib1
     SUBDIR += clazy
     SUBDIR += cld2
     SUBDIR += clewn
@@ -614,7 +613,6 @@
     SUBDIR += envsubst
     SUBDIR += epl.el
     SUBDIR += epm
-    SUBDIR += eric6
     SUBDIR += eris
     SUBDIR += erlang-backoff
     SUBDIR += erlang-bbmustache
@@ -1265,7 +1263,6 @@
     SUBDIR += libgudev
     SUBDIR += libgusb
     SUBDIR += libgutenfetch
-    SUBDIR += libhash
     SUBDIR += libhoard
     SUBDIR += libhtp
     SUBDIR += libhyve-remote
@@ -4469,7 +4466,6 @@
     SUBDIR += py-dirspec
     SUBDIR += py-distlib
     SUBDIR += py-distributed
-    SUBDIR += py-dj31-django-rq
     SUBDIR += py-dj32-django-rq
     SUBDIR += py-dj32-graphene-django
     SUBDIR += py-django-rq
@@ -5627,7 +5623,6 @@
     SUBDIR += ruby-build
     SUBDIR += ruby-gems
     SUBDIR += ruby-rbprof
-    SUBDIR += ruby-sdl
     SUBDIR += ruby-setup.rb
     SUBDIR += ruby-subversion
     SUBDIR += rubygem-CFPropertyList
@@ -6734,13 +6729,11 @@
     SUBDIR += rubygem-ruby-ole
     SUBDIR += rubygem-ruby-prof
     SUBDIR += rubygem-ruby-progressbar
-    SUBDIR += rubygem-ruby-sdl-ffi
     SUBDIR += rubygem-ruby-statistics
     SUBDIR += rubygem-ruby2_keywords
     SUBDIR += rubygem-ruby2ruby
     SUBDIR += rubygem-ruby_dep
     SUBDIR += rubygem-ruby_parser
-    SUBDIR += rubygem-rubygame
     SUBDIR += rubygem-rubygems-mirror
     SUBDIR += rubygem-rubygems-tasks
     SUBDIR += rubygem-rubygems-test
@@ -6982,7 +6975,6 @@
     SUBDIR += sdl2pp
     SUBDIR += sdl_console
     SUBDIR += sdl_gnat
-    SUBDIR += sdl_sge
     SUBDIR += sdlmm
     SUBDIR += sdlskk
     SUBDIR += sdts++
@@ -7231,7 +7223,6 @@
     SUBDIR += yaml-cpp03
     SUBDIR += yaml2argdata
     SUBDIR += yasm
-    SUBDIR += yasm-devel
     SUBDIR += yder
     SUBDIR += youcompleteme
     SUBDIR += yuck
diff --git a/devel/clanlib1/Makefile b/devel/clanlib1/Makefile
deleted file mode 100644
index 8ba539db4081..000000000000
--- a/devel/clanlib1/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
-
-PORTNAME=	clanlib
-PORTVERSION=	1.0.0
-PORTREVISION=	10
-CATEGORIES=	devel
-MASTER_SITES=	http://www.clanlib.org/download/releases-1.0/
-PKGNAMESUFFIX=	1
-DISTNAME=	ClanLib-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Cross-platform game SDK
-
-LICENSE=	ZLIB
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-DEPRECATED=	Older than expired and removed devel/clanlib
-EXPIRATION_DATE=2021-12-31
-
-LIB_DEPENDS=	libpng.so:graphics/png \
-		libmikmod.so:audio/libmikmod \
-		libvorbis.so:audio/libvorbis \
-		libogg.so:audio/libogg
-
-USES=		alias cpe gl gmake jpeg libtool localbase:ldflags pathfix pkgconfig \
-		sdl tar:tgz xorg
-USE_CXXSTD=	c++98
-USE_XORG=	x11 xi xxf86vm
-USE_LDCONFIG=	yes
-USE_SDL=	gfx
-USE_GL=		gl glu
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-docs \
-		--enable-clanDisplay \
-		--enable-clanGL \
-		--enable-clanSDL \
-		--enable-clanSound \
-		--enable-clanNetwork \
-		--enable-clanGUI \
-		--enable-clanMikMod \
-		--enable-clanVorbis \
-		--enable-getaddr
-INSTALL_TARGET=	install-strip
-
-PLIST_SUB+=	VER=${PORTVERSION:R}
-
-post-patch:
-	@${GREP} -lR "SDL/SDL" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
-		's|SDL/SDL|SDL|g'
-	@${REINPLACE_CMD} -e 's|@perl_exec@|${PERL}|g' \
-		${WRKSRC}/Documentation/Utilities/webbuilder.pl.in
-
-.include <bsd.port.mk>
diff --git a/devel/clanlib1/distinfo b/devel/clanlib1/distinfo
deleted file mode 100644
index 6dbac5862aaf..000000000000
--- a/devel/clanlib1/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ClanLib-1.0.0.tgz) = 2a296c30be30b42866666a2d43815c78345c7d78ef2126e2dc1694405dfd67f9
-SIZE (ClanLib-1.0.0.tgz) = 7535910
diff --git a/devel/clanlib1/files/patch-Sources_Core_IOData_Generic_datafile__inputprovider.h b/devel/clanlib1/files/patch-Sources_Core_IOData_Generic_datafile__inputprovider.h
deleted file mode 100644
index d1365fdd18b6..000000000000
--- a/devel/clanlib1/files/patch-Sources_Core_IOData_Generic_datafile__inputprovider.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- Sources/Core/IOData/Generic/datafile_inputprovider.h.orig	2006-10-27 01:55:01 UTC
-+++ Sources/Core/IOData/Generic/datafile_inputprovider.h
-@@ -144,7 +144,7 @@ protected:
- 			cache.insert(
--				std::make_pair<std::string const, std::pair<int, int> >(
-+				std::make_pair(
- 				resource_id,
--				std::make_pair<int,int>(data_pos, data_size)));
-+				std::make_pair(data_pos, data_size)));
- 		}
- 
- 	private:
diff --git a/devel/clanlib1/files/patch-Sources_GUI_inputbox__generic.cpp b/devel/clanlib1/files/patch-Sources_GUI_inputbox__generic.cpp
deleted file mode 100644
index 889dcddc50c4..000000000000
--- a/devel/clanlib1/files/patch-Sources_GUI_inputbox__generic.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- Sources/GUI/inputbox_generic.cpp.orig	2008-04-18 11:16:05 UTC
-+++ Sources/GUI/inputbox_generic.cpp
-@@ -84,7 +84,7 @@ int CL_InputUndo::doUndo( std::string & 
- 
- int CL_InputUndo::doRedo( std::string & text )
- {
--	if (!canRedo()) return NULL;
-+	if (!canRedo()) return 0;
- 
- 	OneUndo const & u = undo_array[cur_pos];
- 
diff --git a/devel/clanlib1/files/patch-Sources__Core__System__Unix__init_linux.cpp b/devel/clanlib1/files/patch-Sources__Core__System__Unix__init_linux.cpp
deleted file mode 100644
index 708cbae0c3f4..000000000000
--- a/devel/clanlib1/files/patch-Sources__Core__System__Unix__init_linux.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- Sources/Core/System/Unix/init_linux.cpp.orig	2009-03-23 00:40:42 UTC
-+++ Sources/Core/System/Unix/init_linux.cpp
-@@ -131,7 +131,7 @@ std::string CL_System::get_exe_path()
- 
- #else
- #ifndef PROC_EXE_PATH
--#define PROC_EXE_PATH "/proc/self/exe"
-+#define PROC_EXE_PATH "/proc/curproc/file"
- #endif
- 	int size;
- 	struct stat sb;
diff --git a/devel/clanlib1/files/patch-Sources__Display__Providers__png_provider_generic.cpp b/devel/clanlib1/files/patch-Sources__Display__Providers__png_provider_generic.cpp
deleted file mode 100644
index 20cc7eabd581..000000000000
--- a/devel/clanlib1/files/patch-Sources__Display__Providers__png_provider_generic.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- Sources/Display/Providers/png_provider_generic.cpp.orig	2006-10-27 01:55:01 UTC
-+++ Sources/Display/Providers/png_provider_generic.cpp
-@@ -107,7 +107,7 @@ void CL_PNGProvider_Generic::init()
- 		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
- 		cl_assert(false);
- 	}   
--	if (setjmp(png_ptr->jmpbuf))
-+	if (setjmp(png_jmpbuf(png_ptr)))
- 	{
- 		png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
- 		cl_assert(false);
diff --git a/devel/clanlib1/files/patch-libc++ b/devel/clanlib1/files/patch-libc++
deleted file mode 100644
index 0ff47908cca1..000000000000
--- a/devel/clanlib1/files/patch-libc++
+++ /dev/null
@@ -1,20 +0,0 @@
---- Sources/GL/canvas_opengl.cpp.orig	2007-10-21 00:14:01 UTC
-+++ Sources/GL/canvas_opengl.cpp
-@@ -27,6 +27,7 @@
- **    (if your name is missing here, please add it)
- */
- 
-+#include <stdlib.h>
- #include "Display/display_precomp.h"
- #include "canvas_opengl.h"
- #include "API/Core/System/error.h"
---- Sources/Network/Socket/ip_address_getaddr.cpp.orig	2007-10-21 00:14:01 UTC
-+++ Sources/Network/Socket/ip_address_getaddr.cpp
-@@ -29,6 +29,7 @@
- 
- #ifdef USE_GETADDR
- 
-+#include <stdlib.h>
- #include "ip_address_getaddr.h"
- #include "API/Core/System/error.h"
- #include "API/Core/System/mutex.h"
diff --git a/devel/clanlib1/pkg-descr b/devel/clanlib1/pkg-descr
deleted file mode 100644
index 5f200f6f30f6..000000000000
--- a/devel/clanlib1/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-ClanLib delivers a platform independent interface to write games with. If a
-game is written with ClanLib, it should be possible to compile the game under
-any platform (supported by ClanLib, that is) without changes in the application
-source code.
-
-But ClanLib is not just a wrapper library, providing an common interface to
-low level libraries such as DirectX, Svgalib, X11, GGI, etc. While platform
-independency is ClanLib's primary goal, it also tries to be a service-minded
-game SDK. In other words, authors have put great effort in to designing the API,
-to ensure ClanLib's easy of use - while maintaining it's power.
-
-WWW: http://www.clanlib.org/
diff --git a/devel/clanlib1/pkg-plist b/devel/clanlib1/pkg-plist
deleted file mode 100644
index b98e0d0e6611..000000000000
--- a/devel/clanlib1/pkg-plist
+++ /dev/null
@@ -1,350 +0,0 @@
-include/ClanLib-%%VER%%/ClanLib/Application/clanapp.h
-include/ClanLib-%%VER%%/ClanLib/Core/IOData/cl_endian.h
-include/ClanLib-%%VER%%/ClanLib/Core/IOData/datatypes.h
-include/ClanLib-%%VER%%/ClanLib/Core/IOData/directory.h
-include/ClanLib-%%VER%%/ClanLib/Core/IOData/directory_scanner.h
-include/ClanLib-%%VER%%/ClanLib/Core/IOData/inputsource.h
-include/ClanLib-%%VER%%/ClanLib/Core/IOData/inputsource_file.h
-include/ClanLib-%%VER%%/ClanLib/Core/IOData/inputsource_memory.h
-include/ClanLib-%%VER%%/ClanLib/Core/IOData/inputsource_provider.h
-include/ClanLib-%%VER%%/ClanLib/Core/IOData/inputsource_provider_file.h
-include/ClanLib-%%VER%%/ClanLib/Core/IOData/inputsource_zipped.h
-include/ClanLib-%%VER%%/ClanLib/Core/IOData/outputsource.h
-include/ClanLib-%%VER%%/ClanLib/Core/IOData/outputsource_file.h
-include/ClanLib-%%VER%%/ClanLib/Core/IOData/outputsource_memory.h
-include/ClanLib-%%VER%%/ClanLib/Core/IOData/outputsource_provider.h
-include/ClanLib-%%VER%%/ClanLib/Core/IOData/outputsource_zipped.h
-include/ClanLib-%%VER%%/ClanLib/Core/IOData/zip_archive.h
-include/ClanLib-%%VER%%/ClanLib/Core/IOData/zip_file_entry.h
-include/ClanLib-%%VER%%/ClanLib/Core/Math/circle.h
-include/ClanLib-%%VER%%/ClanLib/Core/Math/cl_vector.h
-include/ClanLib-%%VER%%/ClanLib/Core/Math/delauney_triangulator.h
-include/ClanLib-%%VER%%/ClanLib/Core/Math/line_math.h
-include/ClanLib-%%VER%%/ClanLib/Core/Math/math.h
-include/ClanLib-%%VER%%/ClanLib/Core/Math/matrix4x4.h
-include/ClanLib-%%VER%%/ClanLib/Core/Math/number_pool.h
-include/ClanLib-%%VER%%/ClanLib/Core/Math/origin.h
-include/ClanLib-%%VER%%/ClanLib/Core/Math/outline_triangulator.h
-include/ClanLib-%%VER%%/ClanLib/Core/Math/point.h
-include/ClanLib-%%VER%%/ClanLib/Core/Math/pointset_math.h
-include/ClanLib-%%VER%%/ClanLib/Core/Math/quad.h
-include/ClanLib-%%VER%%/ClanLib/Core/Math/rect.h
-include/ClanLib-%%VER%%/ClanLib/Core/Math/size.h
-include/ClanLib-%%VER%%/ClanLib/Core/Math/triangle_math.h
-include/ClanLib-%%VER%%/ClanLib/Core/Math/vector2.h
-include/ClanLib-%%VER%%/ClanLib/Core/Math/vector2.inl
-include/ClanLib-%%VER%%/ClanLib/Core/Resources/resource.h
-include/ClanLib-%%VER%%/ClanLib/Core/Resources/resource_manager.h
-include/ClanLib-%%VER%%/ClanLib/Core/Resources/resourcedata.h
-include/ClanLib-%%VER%%/ClanLib/Core/Resources/resourcetype_boolean.h
-include/ClanLib-%%VER%%/ClanLib/Core/Resources/resourcetype_float.h
-include/ClanLib-%%VER%%/ClanLib/Core/Resources/resourcetype_integer.h
-include/ClanLib-%%VER%%/ClanLib/Core/Resources/resourcetype_raw.h
-include/ClanLib-%%VER%%/ClanLib/Core/Resources/resourcetype_string.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/call_stack.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/cl_assert.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/cl_library.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/clanstring.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/clipboard.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/clonable.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/command_line.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/console_window.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/crash_reporter.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/error.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/event_listener.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/event_trigger.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/keep_alive.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/lazycopyptr.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/log.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/mutex.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/mutexsharedptr.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/mutexweakptr.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/owningptr.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/setupcore.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/sharedptr.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/system.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/thread.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/threadfunc_v0.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/threadfunc_v1.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/threadfunc_v2.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/timer.h
-include/ClanLib-%%VER%%/ClanLib/Core/System/weakptr.h
-include/ClanLib-%%VER%%/ClanLib/Core/XML/dom_attr.h
-include/ClanLib-%%VER%%/ClanLib/Core/XML/dom_cdata_section.h
-include/ClanLib-%%VER%%/ClanLib/Core/XML/dom_character_data.h
-include/ClanLib-%%VER%%/ClanLib/Core/XML/dom_comment.h
-include/ClanLib-%%VER%%/ClanLib/Core/XML/dom_document.h
-include/ClanLib-%%VER%%/ClanLib/Core/XML/dom_document_fragment.h
-include/ClanLib-%%VER%%/ClanLib/Core/XML/dom_document_type.h
-include/ClanLib-%%VER%%/ClanLib/Core/XML/dom_element.h
-include/ClanLib-%%VER%%/ClanLib/Core/XML/dom_entity.h
-include/ClanLib-%%VER%%/ClanLib/Core/XML/dom_entity_reference.h
-include/ClanLib-%%VER%%/ClanLib/Core/XML/dom_exception.h
-include/ClanLib-%%VER%%/ClanLib/Core/XML/dom_implementation.h
-include/ClanLib-%%VER%%/ClanLib/Core/XML/dom_named_node_map.h
-include/ClanLib-%%VER%%/ClanLib/Core/XML/dom_node.h
-include/ClanLib-%%VER%%/ClanLib/Core/XML/dom_node_list.h
-include/ClanLib-%%VER%%/ClanLib/Core/XML/dom_notation.h
-include/ClanLib-%%VER%%/ClanLib/Core/XML/dom_processing_instruction.h
-include/ClanLib-%%VER%%/ClanLib/Core/XML/dom_text.h
-include/ClanLib-%%VER%%/ClanLib/Core/XML/xml_token.h
-include/ClanLib-%%VER%%/ClanLib/Core/XML/xml_tokenizer.h
-include/ClanLib-%%VER%%/ClanLib/Core/XML/xml_writer.h
-include/ClanLib-%%VER%%/ClanLib/Core/core_iostream.h
-include/ClanLib-%%VER%%/ClanLib/Display/Collision/collision_outline.h
-include/ClanLib-%%VER%%/ClanLib/Display/Collision/contour.h
-include/ClanLib-%%VER%%/ClanLib/Display/Collision/outline_accuracy.h
-include/ClanLib-%%VER%%/ClanLib/Display/Collision/outline_circle.h
-include/ClanLib-%%VER%%/ClanLib/Display/Collision/outline_math.h
-include/ClanLib-%%VER%%/ClanLib/Display/Collision/outline_provider.h
-include/ClanLib-%%VER%%/ClanLib/Display/Collision/outline_provider_bitmap.h
-include/ClanLib-%%VER%%/ClanLib/Display/Collision/outline_provider_file.h
-include/ClanLib-%%VER%%/ClanLib/Display/Providers/bmp_provider.h
-include/ClanLib-%%VER%%/ClanLib/Display/Providers/dc_buffer.h
-include/ClanLib-%%VER%%/ClanLib/Display/Providers/jpeg_provider.h
-include/ClanLib-%%VER%%/ClanLib/Display/Providers/pcx_provider.h
-include/ClanLib-%%VER%%/ClanLib/Display/Providers/png_provider.h
-include/ClanLib-%%VER%%/ClanLib/Display/Providers/provider_factory.h
-include/ClanLib-%%VER%%/ClanLib/Display/Providers/provider_type.h
-include/ClanLib-%%VER%%/ClanLib/Display/Providers/provider_type_register.h
-include/ClanLib-%%VER%%/ClanLib/Display/Providers/targa_provider.h
-include/ClanLib-%%VER%%/ClanLib/Display/blend_func.h
-include/ClanLib-%%VER%%/ClanLib/Display/canvas.h
-include/ClanLib-%%VER%%/ClanLib/Display/color.h
-include/ClanLib-%%VER%%/ClanLib/Display/display.h
-include/ClanLib-%%VER%%/ClanLib/Display/display_iostream.h
-include/ClanLib-%%VER%%/ClanLib/Display/display_mode.h
-include/ClanLib-%%VER%%/ClanLib/Display/display_window.h
-include/ClanLib-%%VER%%/ClanLib/Display/display_window_description.h
-include/ClanLib-%%VER%%/ClanLib/Display/font.h
-include/ClanLib-%%VER%%/ClanLib/Display/frameratecounter.h
-include/ClanLib-%%VER%%/ClanLib/Display/glyph_buffer.h
-include/ClanLib-%%VER%%/ClanLib/Display/gradient.h
-include/ClanLib-%%VER%%/ClanLib/Display/graphic_context.h
-include/ClanLib-%%VER%%/ClanLib/Display/input_buffer.h
-include/ClanLib-%%VER%%/ClanLib/Display/input_button.h
-include/ClanLib-%%VER%%/ClanLib/Display/input_context.h
-include/ClanLib-%%VER%%/ClanLib/Display/input_device.h
-include/ClanLib-%%VER%%/ClanLib/Display/input_event.h
-include/ClanLib-%%VER%%/ClanLib/Display/joystick.h
-include/ClanLib-%%VER%%/ClanLib/Display/key_binding.h
-include/ClanLib-%%VER%%/ClanLib/Display/keyboard.h
-include/ClanLib-%%VER%%/ClanLib/Display/keys.h
-include/ClanLib-%%VER%%/ClanLib/Display/mouse.h
-include/ClanLib-%%VER%%/ClanLib/Display/palette.h
-include/ClanLib-%%VER%%/ClanLib/Display/pixel_buffer.h
-include/ClanLib-%%VER%%/ClanLib/Display/pixel_format.h
-include/ClanLib-%%VER%%/ClanLib/Display/pixel_format_type.h
-include/ClanLib-%%VER%%/ClanLib/Display/rle_surface.h
-include/ClanLib-%%VER%%/ClanLib/Display/setupdisplay.h
-include/ClanLib-%%VER%%/ClanLib/Display/sprite.h
-include/ClanLib-%%VER%%/ClanLib/Display/sprite_description.h
-include/ClanLib-%%VER%%/ClanLib/Display/sprite_packer.h
-include/ClanLib-%%VER%%/ClanLib/Display/stencil_func.h
-include/ClanLib-%%VER%%/ClanLib/Display/surface.h
-include/ClanLib-%%VER%%/ClanLib/Display/text_styler.h
-include/ClanLib-%%VER%%/ClanLib/GL/light_source.h
-include/ClanLib-%%VER%%/ClanLib/GL/opengl.h
-include/ClanLib-%%VER%%/ClanLib/GL/opengl_state.h
-include/ClanLib-%%VER%%/ClanLib/GL/opengl_state_data.h
-include/ClanLib-%%VER%%/ClanLib/GL/opengl_surface.h
-include/ClanLib-%%VER%%/ClanLib/GL/opengl_window.h
-include/ClanLib-%%VER%%/ClanLib/GL/opengl_window_description.h
-include/ClanLib-%%VER%%/ClanLib/GL/opengl_wrap.h
-include/ClanLib-%%VER%%/ClanLib/GL/program_attribute.h
-include/ClanLib-%%VER%%/ClanLib/GL/program_object.h
-include/ClanLib-%%VER%%/ClanLib/GL/program_uniform.h
-include/ClanLib-%%VER%%/ClanLib/GL/setupgl.h
-include/ClanLib-%%VER%%/ClanLib/GL/shader_object.h
-include/ClanLib-%%VER%%/ClanLib/GL/texture.h
-include/ClanLib-%%VER%%/ClanLib/GL/viewpoint.h
-include/ClanLib-%%VER%%/ClanLib/GUI/button.h
-include/ClanLib-%%VER%%/ClanLib/GUI/checkbox.h
-include/ClanLib-%%VER%%/ClanLib/GUI/component.h
-include/ClanLib-%%VER%%/ClanLib/GUI/component_manager.h
-include/ClanLib-%%VER%%/ClanLib/GUI/component_move_handler.h
-include/ClanLib-%%VER%%/ClanLib/GUI/component_resize_handler.h
-include/ClanLib-%%VER%%/ClanLib/GUI/component_style.h
-include/ClanLib-%%VER%%/ClanLib/GUI/component_type.h
-include/ClanLib-%%VER%%/ClanLib/GUI/deck.h
-include/ClanLib-%%VER%%/ClanLib/GUI/filedialog.h
-include/ClanLib-%%VER%%/ClanLib/GUI/frame.h
-include/ClanLib-%%VER%%/ClanLib/GUI/gui_manager.h
-include/ClanLib-%%VER%%/ClanLib/GUI/image.h
-include/ClanLib-%%VER%%/ClanLib/GUI/inputbox.h
-include/ClanLib-%%VER%%/ClanLib/GUI/inputbox_stylebase.h
-include/ClanLib-%%VER%%/ClanLib/GUI/inputdialog.h
-include/ClanLib-%%VER%%/ClanLib/GUI/label.h
-include/ClanLib-%%VER%%/ClanLib/GUI/layout.h
-include/ClanLib-%%VER%%/ClanLib/GUI/listbox.h
-include/ClanLib-%%VER%%/ClanLib/GUI/listitem.h
-include/ClanLib-%%VER%%/ClanLib/GUI/menu.h
-include/ClanLib-%%VER%%/ClanLib/GUI/menu_item.h
-include/ClanLib-%%VER%%/ClanLib/GUI/menu_node.h
-include/ClanLib-%%VER%%/ClanLib/GUI/messagebox.h
-include/ClanLib-%%VER%%/ClanLib/GUI/progressbar.h
-include/ClanLib-%%VER%%/ClanLib/GUI/radiobutton.h
-include/ClanLib-%%VER%%/ClanLib/GUI/radiogroup.h
-include/ClanLib-%%VER%%/ClanLib/GUI/richedit.h
-include/ClanLib-%%VER%%/ClanLib/GUI/richedit_paragraph.h
-include/ClanLib-%%VER%%/ClanLib/GUI/scrollbar.h
-include/ClanLib-%%VER%%/ClanLib/GUI/setupgui.h
-include/ClanLib-%%VER%%/ClanLib/GUI/stylemanager.h
-include/ClanLib-%%VER%%/ClanLib/GUI/treeitem.h
-include/ClanLib-%%VER%%/ClanLib/GUI/treenode.h
-include/ClanLib-%%VER%%/ClanLib/GUI/treeview.h
-include/ClanLib-%%VER%%/ClanLib/GUI/window.h
-include/ClanLib-%%VER%%/ClanLib/GUIStyleSilver/button_silver.h
-include/ClanLib-%%VER%%/ClanLib/GUIStyleSilver/checkbox_silver.h
-include/ClanLib-%%VER%%/ClanLib/GUIStyleSilver/frame_silver.h
-include/ClanLib-%%VER%%/ClanLib/GUIStyleSilver/image_silver.h
-include/ClanLib-%%VER%%/ClanLib/GUIStyleSilver/inputbox_silver.h
-include/ClanLib-%%VER%%/ClanLib/GUIStyleSilver/label_silver.h
-include/ClanLib-%%VER%%/ClanLib/GUIStyleSilver/listbox_silver.h
-include/ClanLib-%%VER%%/ClanLib/GUIStyleSilver/menu_item_silver.h
-include/ClanLib-%%VER%%/ClanLib/GUIStyleSilver/menu_node_silver.h
-include/ClanLib-%%VER%%/ClanLib/GUIStyleSilver/menu_silver.h
-include/ClanLib-%%VER%%/ClanLib/GUIStyleSilver/progressbar_silver.h
-include/ClanLib-%%VER%%/ClanLib/GUIStyleSilver/radiobutton_silver.h
-include/ClanLib-%%VER%%/ClanLib/GUIStyleSilver/richedit_silver.h
-include/ClanLib-%%VER%%/ClanLib/GUIStyleSilver/scrollbar_silver.h
-include/ClanLib-%%VER%%/ClanLib/GUIStyleSilver/stylemanager_silver.h
-include/ClanLib-%%VER%%/ClanLib/GUIStyleSilver/treeitem_silver.h
-include/ClanLib-%%VER%%/ClanLib/GUIStyleSilver/treeview_silver.h
-include/ClanLib-%%VER%%/ClanLib/GUIStyleSilver/window_silver.h
-include/ClanLib-%%VER%%/ClanLib/MikMod/setupmikmod.h
-include/ClanLib-%%VER%%/ClanLib/MikMod/soundprovider_mikmod.h
-include/ClanLib-%%VER%%/ClanLib/Network/IRC/dcc_download.h
-include/ClanLib-%%VER%%/ClanLib/Network/IRC/irc_connection.h
-include/ClanLib-%%VER%%/ClanLib/Network/IRC/irc_numerics.h
-include/ClanLib-%%VER%%/ClanLib/Network/NetObjects/netobject_client.h
-include/ClanLib-%%VER%%/ClanLib/Network/NetObjects/netobject_controller.h
-include/ClanLib-%%VER%%/ClanLib/Network/NetObjects/netobject_server.h
-include/ClanLib-%%VER%%/ClanLib/Network/NetSession/inputsource_netpacket.h
-include/ClanLib-%%VER%%/ClanLib/Network/NetSession/inputsource_netstream.h
-include/ClanLib-%%VER%%/ClanLib/Network/NetSession/netcomputer.h
-include/ClanLib-%%VER%%/ClanLib/Network/NetSession/netgroup.h
-include/ClanLib-%%VER%%/ClanLib/Network/NetSession/netpacket.h
-include/ClanLib-%%VER%%/ClanLib/Network/NetSession/netsession.h
-include/ClanLib-%%VER%%/ClanLib/Network/NetSession/netstream.h
-include/ClanLib-%%VER%%/ClanLib/Network/NetSession/outputsource_netpacket.h
-include/ClanLib-%%VER%%/ClanLib/Network/NetSession/outputsource_netstream.h
-include/ClanLib-%%VER%%/ClanLib/Network/NetVariables/netvariables.h
-include/ClanLib-%%VER%%/ClanLib/Network/Socket/inputsource_socket.h
-include/ClanLib-%%VER%%/ClanLib/Network/Socket/ip_address.h
-include/ClanLib-%%VER%%/ClanLib/Network/Socket/outputsource_socket.h
-include/ClanLib-%%VER%%/ClanLib/Network/Socket/socket.h
-include/ClanLib-%%VER%%/ClanLib/Network/setupnetwork.h
-include/ClanLib-%%VER%%/ClanLib/SDL/setupsdl.h
-include/ClanLib-%%VER%%/ClanLib/Signals/signal.h
-include/ClanLib-%%VER%%/ClanLib/Signals/signal_v0.h
-include/ClanLib-%%VER%%/ClanLib/Signals/signal_v1.h
-include/ClanLib-%%VER%%/ClanLib/Signals/signal_v2.h
-include/ClanLib-%%VER%%/ClanLib/Signals/signal_v3.h
-include/ClanLib-%%VER%%/ClanLib/Signals/signal_v4.h
-include/ClanLib-%%VER%%/ClanLib/Signals/signal_v5.h
-include/ClanLib-%%VER%%/ClanLib/Signals/slot.h
-include/ClanLib-%%VER%%/ClanLib/Signals/slot_container.h
-include/ClanLib-%%VER%%/ClanLib/Signals/slot_generic.h
-include/ClanLib-%%VER%%/ClanLib/Signals/slot_v0.h
-include/ClanLib-%%VER%%/ClanLib/Signals/slot_v1.h
-include/ClanLib-%%VER%%/ClanLib/Signals/slot_v2.h
-include/ClanLib-%%VER%%/ClanLib/Signals/slot_v3.h
-include/ClanLib-%%VER%%/ClanLib/Signals/slot_v4.h
-include/ClanLib-%%VER%%/ClanLib/Signals/slot_v5.h
-include/ClanLib-%%VER%%/ClanLib/Signals/slotbuffer_v0.h
-include/ClanLib-%%VER%%/ClanLib/Signals/slotbuffer_v1.h
-include/ClanLib-%%VER%%/ClanLib/Sound/SoundFilters/echofilter.h
-include/ClanLib-%%VER%%/ClanLib/Sound/SoundFilters/fadefilter.h
-include/ClanLib-%%VER%%/ClanLib/Sound/SoundFilters/inverse_echofilter.h
-include/ClanLib-%%VER%%/ClanLib/Sound/SoundProviders/soundprovider_factory.h
-include/ClanLib-%%VER%%/ClanLib/Sound/SoundProviders/soundprovider_raw.h
-include/ClanLib-%%VER%%/ClanLib/Sound/SoundProviders/soundprovider_recorder.h
-include/ClanLib-%%VER%%/ClanLib/Sound/SoundProviders/soundprovider_type.h
-include/ClanLib-%%VER%%/ClanLib/Sound/SoundProviders/soundprovider_type_register.h
-include/ClanLib-%%VER%%/ClanLib/Sound/SoundProviders/soundprovider_wave.h
-include/ClanLib-%%VER%%/ClanLib/Sound/cd_drive.h
-include/ClanLib-%%VER%%/ClanLib/Sound/setupsound.h
-include/ClanLib-%%VER%%/ClanLib/Sound/sound.h
-include/ClanLib-%%VER%%/ClanLib/Sound/soundbuffer.h
-include/ClanLib-%%VER%%/ClanLib/Sound/soundbuffer_session.h
-include/ClanLib-%%VER%%/ClanLib/Sound/soundfilter.h
-include/ClanLib-%%VER%%/ClanLib/Sound/soundformat.h
-include/ClanLib-%%VER%%/ClanLib/Sound/soundoutput.h
-include/ClanLib-%%VER%%/ClanLib/Sound/soundoutput_description.h
-include/ClanLib-%%VER%%/ClanLib/Sound/soundprovider.h
-include/ClanLib-%%VER%%/ClanLib/Sound/soundprovider_session.h
-include/ClanLib-%%VER%%/ClanLib/Vorbis/setupvorbis.h
-include/ClanLib-%%VER%%/ClanLib/Vorbis/soundprovider_vorbis.h
-include/ClanLib-%%VER%%/ClanLib/application.h
-include/ClanLib-%%VER%%/ClanLib/core.h
-include/ClanLib-%%VER%%/ClanLib/display.h
-include/ClanLib-%%VER%%/ClanLib/gl.h
-include/ClanLib-%%VER%%/ClanLib/gui.h
-include/ClanLib-%%VER%%/ClanLib/guistylesilver.h
-include/ClanLib-%%VER%%/ClanLib/mikmod.h
-include/ClanLib-%%VER%%/ClanLib/network.h
-include/ClanLib-%%VER%%/ClanLib/sdl.h
-include/ClanLib-%%VER%%/ClanLib/signals.h
-include/ClanLib-%%VER%%/ClanLib/sound.h
-include/ClanLib-%%VER%%/ClanLib/vorbis.h
-lib/libclanApp.a
-lib/libclanApp.so
-lib/libclanApp.so.1
-lib/libclanApp.so.1.0.0
-lib/libclanCore.a
-lib/libclanCore.so
-lib/libclanCore.so.1
-lib/libclanCore.so.1.0.0
-lib/libclanDisplay.a
-lib/libclanDisplay.so
-lib/libclanDisplay.so.1
-lib/libclanDisplay.so.1.0.0
-lib/libclanGL.a
-lib/libclanGL.so
-lib/libclanGL.so.1
-lib/libclanGL.so.1.0.0
-lib/libclanGUI.a
-lib/libclanGUI.so
-lib/libclanGUI.so.1
-lib/libclanGUI.so.1.0.0
-lib/libclanGUIStyleSilver.a
-lib/libclanGUIStyleSilver.so
-lib/libclanGUIStyleSilver.so.1
-lib/libclanGUIStyleSilver.so.1.0.0
-lib/libclanMikMod.a
-lib/libclanMikMod.so
-lib/libclanMikMod.so.1
-lib/libclanMikMod.so.1.0.0
-lib/libclanNetwork.a
-lib/libclanNetwork.so
-lib/libclanNetwork.so.1
-lib/libclanNetwork.so.1.0.0
-lib/libclanSDL.a
-lib/libclanSDL.so
-lib/libclanSDL.so.1
-lib/libclanSDL.so.1.0.0
-lib/libclanSignals.a
-lib/libclanSignals.so
-lib/libclanSignals.so.1
-lib/libclanSignals.so.1.0.0
-lib/libclanSound.a
-lib/libclanSound.so
-lib/libclanSound.so.1
-lib/libclanSound.so.1.0.0
-lib/libclanVorbis.a
-lib/libclanVorbis.so
-lib/libclanVorbis.so.1
-lib/libclanVorbis.so.1.0.0
-libdata/pkgconfig/clanApp-%%VER%%.pc
-libdata/pkgconfig/clanCore-%%VER%%.pc
-libdata/pkgconfig/clanDisplay-%%VER%%.pc
-libdata/pkgconfig/clanGL-%%VER%%.pc
-libdata/pkgconfig/clanGUI-%%VER%%.pc
-libdata/pkgconfig/clanGUIStyleSilver-%%VER%%.pc
-libdata/pkgconfig/clanMikMod-%%VER%%.pc
-libdata/pkgconfig/clanNetwork-%%VER%%.pc
-libdata/pkgconfig/clanSDL-%%VER%%.pc
-libdata/pkgconfig/clanSignals-%%VER%%.pc
-libdata/pkgconfig/clanSound-%%VER%%.pc
-libdata/pkgconfig/clanVorbis-%%VER%%.pc
diff --git a/devel/eric6/Makefile b/devel/eric6/Makefile
deleted file mode 100644
index 7f975775b5c1..000000000000
--- a/devel/eric6/Makefile
+++ /dev/null
@@ -1,80 +0,0 @@
-# Created by: Boris Samorodov <bsam@FreeBSD.org>
-
-.include "${.CURDIR}/../../devel/eric6/bsd.eric6.mk"
-
-PKGNAMESUFFIX=	-qt5-${FLAVOR:U:S/_/-/}
-DISTNAME=	${PORTNAME}-nolang-${DISTVERSION}
-PORTREVISION=	0
-CATEGORIES=	devel python
-
-DEPRECATED=	Uses EOL Python 2.7 via www/py-qt5-webengine
-EXPIRATION_DATE=2021-12-31
-
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}virtualenv>=15.2:devel/py-virtualenv@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}docutils>=0.14:textproc/py-docutils@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}editorconfig>=0.12.0:editors/py-editorconfig@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}send2trash>=1.5:deskutils/py-send2trash@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}asttokens>=1.1:devel/py-asttokens@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}markdown>=2.3.1:textproc/py-markdown@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
-
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}virtualenv>=15.2:devel/py-virtualenv@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}docutils>=0.14:textproc/py-docutils@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}editorconfig>=0.12.0:editors/py-editorconfig@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}send2trash>=1.5:deskutils/py-send2trash@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}asttokens>=1.1:devel/py-asttokens@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}markdown>=2.3.1:textproc/py-markdown@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
-
-CONFLICTS_INSTALL=	${FLAVORS:N${FLAVOR}:C/^/${PORTNAME}-qt5-/}
-
-USES+=		desktop-file-utils python:3.5+ pyqt:5 shebangfix
-USE_PYTHON=	flavors
-USE_PYQT=	chart core gui qscintilla2 webengine \
-		help_run network_run svg_run sql_run
-INSTALL_PY=	install.py -c -f eric6config.freebsd -i ${STAGEDIR}
-SHEBANG_FILES=	*.py eric/eric6/*.py eric/scripts/*.py
-SUB_FILES=	eric6.desktop
-MASTERPORT=	yes
-
-PORTDATA=	*
-PORTDOCS=	*
-PORTEXAMPLES=	*
-
-OPTIONS_DEFINE=	DOCS EXAMPLES
-
-.include <bsd.port.options.mk>
-
-post-patch:
-	${RM} ${WRKSRC}/eric/i18n/*.qm ${WRKSRC}/eric/i18n/*.ts
-
-do-configure:
-	${SED}  -e 's,PYTHON_SITELIBDIR,${PYTHON_SITELIBDIR},' \
-		-e 's,PREFIX,${PREFIX},' \
-		-e 's,DATADIR,${DATADIR},' \
-		-e 's,LOCALBASE,${LOCALBASE},' \
-		-e 's,DOCSDIR,${DOCSDIR},' \
-		-e 's,EXAMPLESDIR,${EXAMPLESDIR},' \
-		< ${FILESDIR}/config > ${WRKSRC}/eric6config.freebsd
-
-do-install:
-	@(cd ${WRKSRC}; \
-	${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_PY})
-
-post-install:
-	${INSTALL_DATA} ${WRKDIR}/eric6.desktop ${STAGEDIR}${PREFIX}/share/applications/
-	${LN} -sf ${DATADIR:C|${PREFIX}(/share(/pixmaps)?)?||:C|/[^/]+|../|g}eric6/icons/default/eric.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps/eric6.png
-	@${MKDIR} ${STAGEDIR}${DATADIR}/i18n
-	${REINPLACE_CMD} -e 's|${STAGEDIR}|${DATADIR}|g' \
-			 -e 's|${WRKSRC}|${DATADIR}|g' \
-			${STAGEDIR}/${DATADIR}/eric6install.json
-	@${RM}	${STAGEDIR}/${DATADIR}/eric6install.json.bak
-
-.include <bsd.port.mk>
diff --git a/devel/eric6/Makefile.inc b/devel/eric6/Makefile.inc
deleted file mode 100644
index 3c6ab023316d..000000000000
--- a/devel/eric6/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-# Created by: Boris Samorodov <bsam@FreeBSD.org>
-#
-# This is a set of Makefile macros which allow to build the
-# localized language packages for devel/eric6:
-# german/eric6, russian/eric6, devel/es-eric6
-
-.include "${.CURDIR}/../../devel/eric6/bsd.eric6.mk"
-
-PKGNAMEPREFIX=	${I18N_LANG}-
-DISTNAME=	${PORTNAME}-i18n-${I18N_LANG}-${PORTVERSION}
-
-COMMENT=	${I18N_LANG} i18n package for Eric6 IDE
-
-NO_ARCH=	yes
-NO_BUILD=	yes
-PLIST_FILES=	${DATADIR}/i18n/${PORTNAME}_${I18N_LANG}.qm
-
-do-install:
-	${MKDIR} ${STAGEDIR}${DATADIR}/i18n
-	${INSTALL_DATA} ${WRKSRC}/eric/eric6/i18n/${PORTNAME}_${I18N_LANG}.qm ${STAGEDIR}${DATADIR}/i18n/
-
-.include <bsd.port.mk>
diff --git a/devel/eric6/bsd.eric6.mk b/devel/eric6/bsd.eric6.mk
deleted file mode 100644
index 6f6afc6b8257..000000000000
--- a/devel/eric6/bsd.eric6.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# Created by: Boris Samorodov <bsam@FreeBSD.org>
-#
-# This is a set of Makefile macros that are common between devel/eric6 and
-# localized language packages for devel/eric6:
-# german/eric6, russian/eric6, devel/es-eric6
-
-PORTNAME=	eric6
-PORTVERSION=	21.11
-PORTREVISION?=	0
-MASTER_SITES=	SF/eric-ide/${PORTNAME}/stable/${PORTVERSION}
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-MAINTAINER=	fluffy@FreeBSD.org
-COMMENT=	Full featured Python and Ruby editor and IDE based on Qt
-
-LICENSE=	GPLv3
-
-DESCR=		${.CURDIR}/../../devel/eric6/pkg-descr
-MAKE_ENV+=	"HOME=${WRKDIR}"
-
-NO_ARCH=	yes
-NO_BUILD=	yes
diff --git a/devel/eric6/distinfo b/devel/eric6/distinfo
deleted file mode 100644
index 68d4504b0814..000000000000
--- a/devel/eric6/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1636374251
-SHA256 (eric6-nolang-21.11.tar.gz) = 769e85fbf06650069e41b7587b13ae5c07c68ef49ea1cf9d38f19ea8655bb0e1
-SIZE (eric6-nolang-21.11.tar.gz) = 12945495
diff --git a/devel/eric6/files/config b/devel/eric6/files/config
deleted file mode 100644
index e93b28228f01..000000000000
--- a/devel/eric6/files/config
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# This module contains the configuration of the individual eric6 installation
-#
-
-cfg = {
-    'ericDir'              : 'DATADIR',
-    'ericPixDir'           : 'DATADIR/pixmaps',
-    'ericIconDir'          : 'DATADIR/icons',
-    'ericDTDDir'           : 'DATADIR/DTDs',
-    'ericCSSDir'           : 'DATADIR/CSSs',
-    'ericStylesDir'        : 'DATADIR/Styles',
-    'ericDocDir'           : 'DOCSDIR',
-    'ericExamplesDir'      : 'EXAMPLESDIR',
-    'ericTranslationsDir'  : 'DATADIR/i18n',
-    'ericTemplatesDir'     : 'DATADIR/DesignerTemplates',
-    'ericCodeTemplatesDir' : 'DATADIR/CodeTemplates',
-    'ericOthersDir'        : 'DATADIR/Others',
-    'bindir'               : 'PREFIX/bin',
-    'mdir'                 : 'PYTHON_SITELIBDIR',
-    'apidir'               : 'LOCALBASE/share/qt5/qsci/api',
-}
diff --git a/devel/eric6/files/eric6.desktop.in b/devel/eric6/files/eric6.desktop.in
deleted file mode 100644
index bdcfcabfaea2..000000000000
--- a/devel/eric6/files/eric6.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Eric IDE
-GenericName=Python and Ruby IDE
-Comment=Full featured Python and Ruby editor and IDE based on Qt4
-Type=Application
-Exec=eric6
-Icon=eric6
-MimeType=application/x-python;application/x-eric;
-Categories=Development;TextEditor;Qt;Application;
-Terminal=false
diff --git a/devel/eric6/pkg-descr b/devel/eric6/pkg-descr
deleted file mode 100644
index f5830555dd10..000000000000
--- a/devel/eric6/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-Eric is a full featured Python and Ruby editor and IDE, written in python.
-
-It is based on the cross platform Qt gui toolkit, integrating the highly
-flexible Scintilla editor control. It is designed to be usable as everyday's
-quick and dirty editor as well as being usable as a professional project
-management tool integrating many advanced features Python offers
-the professional coder.
-
-This is a port of eric6 (based on Qt5).
-
-WWW: https://eric-ide.python-projects.org/index.html
diff --git a/devel/eric6/pkg-message b/devel/eric6/pkg-message
deleted file mode 100644
index 9cf10be76e1d..000000000000
--- a/devel/eric6/pkg-message
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-eric6 has the following localized language packages:
-    de-eric6
-    es-eric6
-    ru-eric6
-EOM
-}
-]
diff --git a/devel/eric6/pkg-plist b/devel/eric6/pkg-plist
deleted file mode 100644
index 13b42758fe2e..000000000000
--- a/devel/eric6/pkg-plist
+++ /dev/null
@@ -1,44 +0,0 @@
-bin/eric6
-bin/eric6_api
-bin/eric6_browser
-bin/eric6_compare
-bin/eric6_configure
-bin/eric6_diff
-bin/eric6_doc
-bin/eric6_editor
-bin/eric6_hexeditor
-bin/eric6_iconeditor
-bin/eric6_plugininstall
-bin/eric6_pluginrepository
-bin/eric6_pluginuninstall
-bin/eric6_qregularexpression
-bin/eric6_re
-bin/eric6_shell
-bin/eric6_snap
-bin/eric6_sqlbrowser
-bin/eric6_tray
-bin/eric6_trpreviewer
-bin/eric6_uipreviewer
-bin/eric6_unittest
-%%PYTHON_SITELIBDIR%%/eric6config.py
-%%PYTHON_SITELIBDIR%%/eric6plugins/__init__.py
-share/applications/eric6.desktop
-share/pixmaps/eric6.png
-share/qt5/qsci/api/python/eric6.api
-share/qt5/qsci/api/python/eric6.bas
-share/qt5/qsci/api/python/zope-2.10.7.api
-share/qt5/qsci/api/python/zope-2.11.2.api
-share/qt5/qsci/api/python/zope-3.3.1.api
-share/qt5/qsci/api/qss/qss.api
-share/qt5/qsci/api/ruby/Ruby-1.8.7.api
-share/qt5/qsci/api/ruby/Ruby-1.8.7.bas
-share/qt5/qsci/api/ruby/Ruby-1.9.1.api
-share/qt5/qsci/api/ruby/Ruby-1.9.1.bas
-share/qt5/qsci/api/python/calliope.api
-share/qt5/qsci/api/python/circuitpython.api
-share/qt5/qsci/api/python/microbit.api
-share/qt5/qsci/api/python/micropython.api
-share/qt5/qsci/api/python/micropython.bas
-@dir %%DATADIR%%/DTDs
-@dir %%DATADIR%%/i18n
-%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%
diff --git a/devel/libhash/Makefile b/devel/libhash/Makefile
deleted file mode 100644
index ea30753603ff..000000000000
--- a/devel/libhash/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Created by: Andrew <andrew@ugh.net.au>
-
-PORTNAME=	libhash
-PORTVERSION=	1.0.3
-CATEGORIES=	devel
-MASTER_SITES=	GENTOO
-
-MAINTAINER=	rodrigo@FreeBSD.org
-COMMENT=	Library for manipulating hash tables
-
-DEPRECATED=	Abandoned upstream
-EXPIRATION_DATE=	2021-12-31
-
-WRKSRC=		${WRKDIR}/libhash
-
-USES=		uidfix
-USE_LDCONFIG=	yes
-
-.if defined(NO_PROFILE)
-PLIST_SUB+=	PROFILE="@comment "
-.else
-PLIST_SUB+=	PROFILE=""
-.endif
-
-.include <bsd.port.mk>
diff --git a/devel/libhash/distinfo b/devel/libhash/distinfo
deleted file mode 100644
index fab6ae985909..000000000000
--- a/devel/libhash/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (libhash-1.0.3.tar.gz) = 13d57b35537d98aaf39115d0bb253fe54009f773d239b235267c34769bd1ef9d
-SIZE (libhash-1.0.3.tar.gz) = 8918
diff --git a/devel/libhash/pkg-descr b/devel/libhash/pkg-descr
deleted file mode 100644
index c309f7364679..000000000000
--- a/devel/libhash/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This C library provides functions for manipulating in memory hash tables (aka
-associative arrays). Data is stored as void *'s so any data structure can be
-stored.
diff --git a/devel/libhash/pkg-plist b/devel/libhash/pkg-plist
deleted file mode 100644
index 73d3896fba8d..000000000000
--- a/devel/libhash/pkg-plist
+++ /dev/null
@@ -1,21 +0,0 @@
-include/hash.h
-lib/libhash.so.1
-lib/libhash.so
-lib/libhash.a
-%%PROFILE%%lib/libhash_p.a
-man/man3/hash_compare_int.3.gz
-man/man3/hash_compare_string.3.gz
-man/man3/hash_copy_int.3.gz
-man/man3/hash_copy_string.3.gz
-man/man3/hash_deinitialise.3.gz
-man/man3/hash_delete.3.gz
-man/man3/hash_fetch_next.3.gz
-man/man3/hash_hash_int.3.gz
-man/man3/hash_hash_string.3.gz
-man/man3/hash_initialise.3.gz
-man/man3/hash_insert.3.gz
-man/man3/hash_iterator_deinitialise.3.gz
-man/man3/hash_iterator_initialise.3.gz
-man/man3/hash_retrieve.3.gz
-man/man3/libhash.3.gz
-man/man3/libhash_convenience.3.gz
diff --git a/devel/py-dj31-django-rq/Makefile b/devel/py-dj31-django-rq/Makefile
deleted file mode 100644
index a5b22ab1a027..000000000000
--- a/devel/py-dj31-django-rq/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# Created by: René Ladan <rene@freebsd.org>
-
-PORTNAME=	django-rq
-PORTVERSION=	2.5.1
-CATEGORIES=	devel python
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj31-
-MASTER_SITES=	CHEESESHOP
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Provides Django integration for RQ (Redis Queue)
-
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
-
-DEPRECATED=	Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
-EXPIRATION_DATE=	2021-12-31
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django31>=2.0:www/py-django31@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}redis>=3:databases/py-redis@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}rq>=1.2:devel/py-rq@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}docutils>=0,1:textproc/py-docutils@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
-		redis-server:databases/redis
-
-USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
-
-NO_ARCH=	yes
-
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django-rq \
-			${PYTHON_PKGNAMEPREFIX}dj32-django-rq
-
-# https://github.com/rq/django-rq/blob/master/Makefile
-do-test:
-	cd ${WRKSRC} && coverage-${PYTHON_VER} run ${LOCALBASE}/bin/django-admin.py test django_rq --settings=django_rq.tests.settings --pythonpath=.
-	cd ${WRKSRC} && ${PYTHON_CMD} setup.py check --metadata --restructuredtext --strict
-
-.include <bsd.port.mk>
diff --git a/devel/py-dj31-django-rq/distinfo b/devel/py-dj31-django-rq/distinfo
deleted file mode 100644
index 07364c032411..000000000000
--- a/devel/py-dj31-django-rq/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1638556554
-SHA256 (django-rq-2.5.1.tar.gz) = f08486602664d73a6e335872c868d79663e380247e6307496d01b8fa770fefd8
-SIZE (django-rq-2.5.1.tar.gz) = 43704
diff --git a/devel/py-dj31-django-rq/pkg-descr b/devel/py-dj31-django-rq/pkg-descr
deleted file mode 100644
index 5273572bf046..000000000000
--- a/devel/py-dj31-django-rq/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Django integration with RQ, a Redis based Python queuing library. Django-RQ is a
-simple app that allows you to configure your queues in django's settings.py and
-easily use them in your project.
-
-WWW: https://github.com/rq/django-rq
diff --git a/devel/ruby-sdl/Makefile b/devel/ruby-sdl/Makefile
deleted file mode 100644
index 2665c9364bb4..000000000000
--- a/devel/ruby-sdl/Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
-# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
-
-PORTNAME=	sdl
-PORTVERSION=	2.2.0
-CATEGORIES=	devel graphics audio ruby
-MASTER_SITES=	https://ohai.github.io/rubysdl/archives/
-PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	ruby${PORTNAME}-${PORTVERSION}
-DIST_SUBDIR=	ruby
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Ruby extension library to use SDL library
-
-LICENSE=	LGPL21
-
-DEPRECATED=	Depends on expired devel/sdl_sge
-EXPIRATION_DATE=2021-12-31
-
-LIB_DEPENDS=	libSGE.so:devel/sdl_sge \
-		libSDLSKK.so:devel/sdlskk \
-		libsmpeg.so:multimedia/smpeg
-RUN_DEPENDS=	rubygem-opengl>=0:graphics/rubygem-opengl
-
-USES=		sdl
-USE_SDL=	mixer image ttf sdl
-USE_RUBY=	yes
-USE_RUBY_EXTCONF=	yes
-
-CONFIGURE_ARGS=	--with-sdl-config="sdl-config" \
-		--enable-opengl --linkoglmodule \
-		--with-x11-dir="${LOCALBASE}" \
-		--disable-pthreads
-INSTALL_TARGET=	site-install
-
-PORTDOCS=	*
-PORTEXAMPLES=	*
-
-DOCSDIR=	${RUBY_MODDOCDIR}
-EXAMPLESDIR=	${RUBY_MODEXAMPLESDIR}
-
-DOCSRCDIR1=	${WRKSRC}
-DOC_FILES_WRKSRC_JA=	NEWS.ja README.ja
-DOC_FILES_WRKSRC_EN=	NEWS.en README.en
-
-DOCSRCDIRJA=	${WRKSRC}/doc
-DOCSDIRJA=	${RUBY_MODDOCDIR}/doc
-DOC_FILESJA=	*.rsd *.rb *ref.html
-
-DOCSRCDIREN=	${WRKSRC}/doc-en
-DOCSDIREN=	${RUBY_MODDOCDIR}/doc-en
-DOC_FILESEN=	*.rsd *ref.en.html
-
-OPTIONS_DEFINE=	DOCS EXAMPLES
-OPTIONS_SUB=	yes
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|LOCAL_LIBS|LDFLAGS|g' ${WRKSRC}/extconf.rb
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ruby/site_ruby/${RUBY_VER}/*/sdl_ext.so
-	@${REINPLACE_CMD} -e 's|ruby|${LOCALBASE}/bin/ruby|g' ${WRKSRC}/doc/rsd.rb
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/ja
-	${INSTALL_DATA} ${DOC_FILES_WRKSRC_JA:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}/ja/
-	${INSTALL_DATA} ${DOC_FILES_WRKSRC_EN:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
-
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/doc/ja
-	${INSTALL_DATA} ${DOC_FILESJA:S|^|${DOCSRCDIRJA}/|} ${STAGEDIR}${DOCSDIR}/doc/ja/
-	${INSTALL_DATA} ${DOC_FILESEN:S|^|${DOCSRCDIREN}/|} ${STAGEDIR}${DOCSDIR}/doc/
-
-post-install-EXAMPLES-on:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/sample/* ${STAGEDIR}${EXAMPLESDIR}
-
-.include <bsd.port.mk>
diff --git a/devel/ruby-sdl/distinfo b/devel/ruby-sdl/distinfo
deleted file mode 100644
index 3b02e602abfe..000000000000
--- a/devel/ruby-sdl/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1532165196
-SHA256 (ruby/rubysdl-2.2.0.tar.gz) = 2f4787b57faef7722bca2d7030ee72ee6ce6d03a2124ee48682d7613b21239a7
-SIZE (ruby/rubysdl-2.2.0.tar.gz) = 799369
diff --git a/devel/ruby-sdl/pkg-descr b/devel/ruby-sdl/pkg-descr
deleted file mode 100644
index a5fe3f4830b0..000000000000
--- a/devel/ruby-sdl/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-Ruby/SDL is a Ruby extension library to use SDL library.
-
-Ruby/SDL has following functions.
-
-    Fast 2D graphics drawing.
-    Input from keyboard, mouse, joystick.
-    CD playback.
-    Sound Playback with SDL_mixer
-    TTF (TrueType Font) drawing with SDL_TTF
-    Load image files, supporting BMP, PNM, XPM, LBM, PCX, GIF, JPEG, PNG,
-     TGA formats with SDL_image
-    mpeg playback with SMPGE
-    Japanese string input with SDLSKK
-    3D graphics drawing with OpenGL Interface
-    bdf font drawing with SDL_kanji
-
-WWW: https://ohai.github.io/rubysdl/
diff --git a/devel/ruby-sdl/pkg-plist b/devel/ruby-sdl/pkg-plist
deleted file mode 100644
index 294b2360014e..000000000000
--- a/devel/ruby-sdl/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-%%RUBY_SITEARCHLIBDIR%%/sdl_ext.so
-%%RUBY_SITELIBDIR%%/rubysdl_aliases.rb
-%%RUBY_SITELIBDIR%%/rubysdl_compatible_ver1.rb
-%%RUBY_SITELIBDIR%%/sdl.rb
-%%RUBY_SITELIBDIR%%/sdl1_compatible.rb
diff --git a/devel/rubygem-ruby-sdl-ffi/Makefile b/devel/rubygem-ruby-sdl-ffi/Makefile
deleted file mode 100644
index bb341f29e2c7..000000000000
--- a/devel/rubygem-ruby-sdl-ffi/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Created by: Christoph Kick
-
-PORTNAME=	ruby-sdl-ffi
-PORTVERSION=	0.4
-CATEGORIES=	devel rubygems
-MASTER_SITES=	RG
-
-MAINTAINER=	ruby@FreeBSD.org
-COMMENT=	Low-level binding to SDL and related libraries using Ruby-FFI
-
-LICENSE=	MIT
-
-DEPRECATED=	Depends on expired devel/sdl_sge
-EXPIRATION_DATE=2021-12-31
-
-RUN_DEPENDS=	rubygem-nice-ffi>=0.2:devel/rubygem-nice-ffi
-
-NO_ARCH=	yes
-
-USE_RUBY=	yes
-USES=		gem
-
-.include <bsd.port.mk>
diff --git a/devel/rubygem-ruby-sdl-ffi/distinfo b/devel/rubygem-ruby-sdl-ffi/distinfo
deleted file mode 100644
index 9055af21b7f6..000000000000
--- a/devel/rubygem-ruby-sdl-ffi/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (rubygem/ruby-sdl-ffi-0.4.gem) = ecb098158c60543d387dd17d270354a6309bfc1d7f89c87a010c6653de3a3b7a
-SIZE (rubygem/ruby-sdl-ffi-0.4.gem) = 34816
diff --git a/devel/rubygem-ruby-sdl-ffi/pkg-descr b/devel/rubygem-ruby-sdl-ffi/pkg-descr
deleted file mode 100644
index bdf36a888eca..000000000000
--- a/devel/rubygem-ruby-sdl-ffi/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Ruby-SDL-FFI is a low-level binding to SDL and related libraries using
-Ruby-FFI. It provides very basic access to SDL from Ruby without the
-need for a compiled C wrapper. It aims to be platform and Ruby
-implementation independent.
-
-WWW: https://github.com/jacius/ruby-sdl-ffi
diff --git a/devel/rubygem-rubygame/Makefile b/devel/rubygem-rubygame/Makefile
deleted file mode 100644
index c91d24bdd2b6..000000000000
--- a/devel/rubygem-rubygame/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Created by: ws	Christoph Kick
-
-PORTNAME=	rubygame
-PORTVERSION=	2.6.4
-PORTREVISION=	9
-CATEGORIES=	devel rubygems
-MASTER_SITES=	RG
-
-MAINTAINER=	ruby@FreeBSD.org
-COMMENT=	Game-development extension and library for the ruby language
-
-LICENSE=	LGPL21
-
-DEPRECATED=	Depends on expired devel/sdl_sge
-EXPIRATION_DATE=2021-12-31
-
-RUN_DEPENDS=	rubygem-rake>=0.7.0:devel/rubygem-rake \
-		rubygem-ruby-sdl-ffi>=0.1.0:devel/rubygem-ruby-sdl-ffi
-
-NO_ARCH=	yes
-USE_RUBY=	yes
-USE_SDL=	gfx image mixer ttf
-USES=		gem sdl
-
-.include <bsd.port.mk>
diff --git a/devel/rubygem-rubygame/distinfo b/devel/rubygem-rubygame/distinfo
deleted file mode 100644
index a8bda5e8393d..000000000000
--- a/devel/rubygem-rubygame/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (rubygem/rubygame-2.6.4.gem) = e6f44e2f579d17e69c2e2894c50b23e491722736827857bc3a50684cc3ae20e9
-SIZE (rubygem/rubygame-2.6.4.gem) = 590336
diff --git a/devel/rubygem-rubygame/pkg-descr b/devel/rubygem-rubygame/pkg-descr
deleted file mode 100644
index 08b81577dbeb..000000000000
--- a/devel/rubygem-rubygame/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Rubygame is a game-development extension and library for the ruby
-language, with similarities to pygame. The purpose of rubygame is
-make the creation of games in the ruby language simple, easy, and
-fun, without limiting flexibility.
-
-WWW: http://rubygame.org/
diff --git a/devel/sdl_sge/Makefile b/devel/sdl_sge/Makefile
deleted file mode 100644
index b569cb8d07f5..000000000000
--- a/devel/sdl_sge/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# Created by: Jona Joachim <walkingshadow@grummel.net>
-
-PORTNAME=	sdl_sge
-PORTVERSION=	0.030809
-PORTREVISION=	15
-CATEGORIES=	devel graphics
-MASTER_SITES=	http://ports-space.haiku-files.org/source/
-DISTNAME=	sge030809
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Graphic library for the Simple DirectMedia Layer (SDL)
-
-LICENSE=	LGPL20+ # LICENSE is LGPL21
-
-USES=		gmake sdl
-USE_SDL=	sdl
-USE_LDCONFIG=	yes
-
-PORTDOCS=	*
-PORTEXAMPLES=	*
-
-DEPRECATED=	Upstream no longer maintained
-EXPIRATION_DATE=	2021-10-31
-
-OPTIONS_DEFINE=	SDL FREETYPE DOCS EXAMPLES
-OPTIONS_DEFAULT=SDL FREETYPE
-
-FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
-FREETYPE_USES=		pkgconfig
-FREETYPE_MAKE_ARGS=	USE_FT=y
-FREETYPE_MAKE_ARGS_OFF=	USE_FT=n
-
-SDL_DESC=	Enable support for SDL_image
-SDL_USE=	SDL=image
-SDL_MAKE_ARGS=	USE_IMG=y
-SDL_MAKE_ARGS_OFF=	USE_IMG=n
-
-post-patch:
-	@${REINPLACE_CMD} -e \
-		's|PREFIX =PREFIX|PREFIX =${STAGEDIR}${PREFIX}|g ; \
-		 s|PREFIX_H =PREFIX_H|PREFIX_H =${STAGEDIR}${PREFIX}/include/SDL|g ; \
-		 s|sdl-config|${SDL_CONFIG}|g' ${WRKSRC}/Makefile.conf
-
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libSGE.so
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
-
-post-install-EXAMPLES-on:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
-
-.include <bsd.port.mk>
diff --git a/devel/sdl_sge/distinfo b/devel/sdl_sge/distinfo
deleted file mode 100644
index 4a319900b843..000000000000
--- a/devel/sdl_sge/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (sge030809.tar.gz) = 25cfbe59ab99647254e69d25984707045492c2a5d1b15f27d999d0284a7110fc
-SIZE (sge030809.tar.gz) = 251698
diff --git a/devel/sdl_sge/files/patch-Makefile b/devel/sdl_sge/files/patch-Makefile
deleted file mode 100644
index 9089803403f0..000000000000
--- a/devel/sdl_sge/files/patch-Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
---- work/sge030809/Makefile	Tue Aug 12 00:40:41 2003
-+++ Makefile	Fri Aug  4 15:28:10 2006
-@@ -12,16 +12,11 @@
- 
- all:	config $(OBJECTS) 
- 	@ar rsc libSGE.a $(OBJECTS)
-+	$(CXX) $(CFLAGS) -Wl,-soname,libSGE.so.$(API_VER) -fpic -fPIC -shared -o libSGE.so $(OBJECTS) $(LIBS)
- 
- $(OBJECTS):	%.o:%.cpp %.h   #Each object depends on thier .cpp and .h file
- 	$(CXX) $(CFLAGS) -c $<
- 
--shared: all
--	$(CXX) $(CFLAGS) -Wl,-soname,libSGE.so.$(API_VER) -fpic -fPIC -shared -o libSGE.so $(OBJECTS) $(LIBS)
--
--shared-strip:	shared
--	@strip libSGE.so
--
- # Building a dll... I have no idea how to do this, but it should be something like below.
- dll:	config $(OBJECTS)
- 	dlltool --output-def SGE.def $(OBJECTS)
-@@ -70,7 +65,7 @@
- 	@echo ""	
- endif
- 
--install:	shared
-+install:
- 	@mkdir -p $(PREFIX_H)
- 	install -c -m 644 sge*.h $(PREFIX_H)
- 	@mkdir -p $(PREFIX)/lib
diff --git a/devel/sdl_sge/files/patch-Makefile.conf b/devel/sdl_sge/files/patch-Makefile.conf
deleted file mode 100644
index 7e638957ad24..000000000000
--- a/devel/sdl_sge/files/patch-Makefile.conf
+++ /dev/null
@@ -1,66 +0,0 @@
---- Makefile.conf.orig	2003-08-11 22:43:35 UTC
-+++ Makefile.conf
-@@ -7,11 +7,6 @@ C_COMP = y
- #USE_IMG = n
- #QUIET = y
- 
--
--# Compilers (C and C++)
--CC=gcc
--CXX=g++
--
- # Make sure sdl-config is available
- HAVE_SDL =$(shell if (sdl-config --version) < /dev/null > /dev/null 2>&1; then echo "y"; else echo "n"; fi;)
- ifeq ($(HAVE_SDL),n)
-@@ -19,45 +14,24 @@ ifeq ($(HAVE_SDL),n)
- endif
- 
- # Where should SGE be installed?
--PREFIX =$(shell sdl-config --prefix)
-+PREFIX =PREFIX
- 
- # Where should the headerfiles be installed?
--PREFIX_H =$(shell sdl-config --prefix)/include/SDL
-+PREFIX_H =PREFIX_H
- 
- # Flags passed to the compiler
--CFLAGS =-Wall -O3 -ffast-math
-+#CFLAGS =-Wall -O3 -ffast-math
- SGE_CFLAGS =$(shell sdl-config --cflags)
--# Uncomment to make some more optimizations
--#CFLAGS =-Wall -O9 -ffast-math -march=i686
- 
--
- # Libs config
--SGE_LIBS =$(shell sdl-config --libs) -lstdc++
-+SGE_LIBS =$(shell sdl-config --libs)
- 
--
--# Is freetype-config available?
--HAVE_FT =$(shell if (freetype-config --version) < /dev/null > /dev/null 2>&1; then echo "y"; else echo "n"; fi;)
--ifeq ($(HAVE_FT),n)
--  USE_FT = n
--endif
--
- ifneq ($(USE_FT),n)
-   USE_FT = y
--  SGE_LIBS +=$(shell freetype-config --libs)
--  FT_CFLAGS =$(shell freetype-config --cflags)
-+  SGE_LIBS +=$(shell pkg-config freetype2 --libs)
-+  FT_CFLAGS =$(shell pkg-config freetype2 --cflags)
- endif
- 
--
--# Is SDL_image available?
--HAVE_IMG =$(shell if test -e "`sdl-config --prefix`/include/SDL/SDL_image.h" >/dev/null 2>&1; then echo "y"; else echo "n"; fi;)
--
--ifneq ($(USE_IMG),y)
--  ifneq ($(USE_IMG),n)
--    USE_IMG =$(HAVE_IMG)
--  endif
--endif
--
- ifeq ($(USE_IMG),y)
-   SGE_LIBS +=-lSDL_image
- endif
--
diff --git a/devel/sdl_sge/files/patch-sge030809-sge_tt_text.cpp b/devel/sdl_sge/files/patch-sge030809-sge_tt_text.cpp
deleted file mode 100644
index 83cff497cf45..000000000000
--- a/devel/sdl_sge/files/patch-sge030809-sge_tt_text.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
---- sge_tt_text.cpp.orig	Fri Aug  8 08:48:08 2003
-+++ sge_tt_text.cpp	Wed Oct  4 11:43:47 2006
-@@ -36,10 +36,10 @@
- #include "sge_textpp.h"
- 
- #ifndef _SGE_NOTTF
--#include <freetype/freetype.h>
--#include <freetype/ftoutln.h>
--#include <freetype/ttnameid.h>
--#include <freetype/internal/ftobjs.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
-+#include FT_OUTLINE_H
-+#include FT_TRUETYPE_IDS_H
- 
- /* The structure used to hold glyph information (cached) */
- struct glyph {
-@@ -294,7 +294,7 @@
- 	}
- 	memset(stream, 0, sizeof(*stream));
- 
--	stream->memory = _sge_library->memory;
-+	stream->memory = NULL;
- 	stream->read = RWread;
- 	stream->descriptor.pointer = src;
- 	stream->pos = (unsigned long)position;
diff --git a/devel/sdl_sge/pkg-descr b/devel/sdl_sge/pkg-descr
deleted file mode 100644
index b38bbf0a0e1c..000000000000
--- a/devel/sdl_sge/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-SGE is a graphic library for the Simple DirectMedia Layer (SDL) library.
-Some of SGE:s features are:
- -Pixel operations
- -Clipping
- -Lines, circles and other figures (with antialiasing and alpha blending)
- -Rotation and scaling of surfaces
- -Palette functions
- -TrueType/Bitmap/SFont font functions
- -Basic 2D collision detection
- -Sprite classes
- -Basic texture mapping
- -Filled and gourand shaded polygons (with antialiasing or alpha blending)
diff --git a/devel/sdl_sge/pkg-plist b/devel/sdl_sge/pkg-plist
deleted file mode 100644
index 3b09ef04ab05..000000000000
--- a/devel/sdl_sge/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-include/SDL/sge.h
-include/SDL/sge_blib.h
-include/SDL/sge_bm_text.h
-include/SDL/sge_collision.h
-include/SDL/sge_config.h
-include/SDL/sge_internal.h
-include/SDL/sge_misc.h
-include/SDL/sge_primitives.h
-include/SDL/sge_rotation.h
-include/SDL/sge_shape.h
-include/SDL/sge_surface.h
-include/SDL/sge_textpp.h
-include/SDL/sge_tt_text.h
-lib/libSGE.a
-lib/libSGE.so
-lib/libSGE.so.0
-lib/libSGE.so.0.030809
diff --git a/devel/yasm-devel/Makefile b/devel/yasm-devel/Makefile
deleted file mode 100644
index 17669ce78c25..000000000000
--- a/devel/yasm-devel/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# Created by: ijliao
-
-PORTNAME=		yasm
-PORTVERSION=		1.2.0.29
-DISTVERSIONSUFFIX=	.g87c0
-PORTREVISION=		1
-CATEGORIES=		devel lang
-MASTER_SITES=		http://www.tortall.net/projects/yasm/snapshots/v${DISTVERSION}${DISTVERSIONSUFFIX}/
-PKGNAMESUFFIX=		-devel
-
-MAINTAINER=	koobs@FreeBSD.org
-COMMENT=	Complete rewrite of the NASM assembler (Development Snapshot)
-
-LICENSE=	ART10 BSD2CLAUSE BSD3CLAUSE
-LICENSE_COMB=	multi
-
-DEPRECATED=	No need to keep the -devel version due to upstream inactivity
-EXPIRATION_DATE=	2021-12-31
-
-OPTIONS_DEFINE=	DEBUG NLS
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-python --disable-python-bindings
-TEST_TARGET=		check
-
-NLS_USES=		gettext iconv
-NLS_CONFIGURE_ENABLE=	nls
-NLS_CONFIGURE_ON=	--with-libiconv-prefix=${LOCALBASE} \
-			--with-libintl-prefix=${LOCALBASE}
-NLS_CONFIGURE_OFF=	--without-libiconv-prefix \
-			--without-libintl-prefix
-
-CONFLICTS_INSTALL=	yasm
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDEBUG} || defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug
-.endif
-
-.include <bsd.port.mk>
diff --git a/devel/yasm-devel/distinfo b/devel/yasm-devel/distinfo
deleted file mode 100644
index faafe666284a..000000000000
--- a/devel/yasm-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (yasm-1.2.0.29.g87c0.tar.gz) = 1d73e87cfc58ef89fd2bb63c680bdb32c6b99f07159744722f5e9dd00b9b876f
-SIZE (yasm-1.2.0.29.g87c0.tar.gz) = 1428812
diff --git a/devel/yasm-devel/pkg-descr b/devel/yasm-devel/pkg-descr
deleted file mode 100644
index c37a780ded0b..000000000000
--- a/devel/yasm-devel/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-YASM is a complete rewrite of the NASM assembler under the "new" BSD License.
-
-Yasm currently supports the x86 and AMD64 instruction sets, accepts
-NASM and GAS assembler syntaxes, outputs binary, ELF32, ELF64, COFF, Mach-O
-(32 and 64), RDOFF2, Win32, and Win64 object formats, and generates source
-debugging information in STABS, DWARF 2, and CodeView 8 formats.
-
-WWW: http://www.tortall.net/projects/yasm/
diff --git a/devel/yasm-devel/pkg-plist b/devel/yasm-devel/pkg-plist
deleted file mode 100644
index 1193eba5253d..000000000000
--- a/devel/yasm-devel/pkg-plist
+++ /dev/null
@@ -1,38 +0,0 @@
-bin/yasm
-bin/ytasm
-bin/vsyasm
-include/libyasm.h
-include/libyasm-stdint.h
-include/libyasm/arch.h
-include/libyasm/assocdat.h
-include/libyasm/bitvect.h
-include/libyasm/bytecode.h
-include/libyasm/compat-queue.h
-include/libyasm/coretype.h
-include/libyasm/dbgfmt.h
-include/libyasm/errwarn.h
-include/libyasm/expr.h
-include/libyasm/file.h
-include/libyasm/floatnum.h
-include/libyasm/hamt.h
-include/libyasm/insn.h
-include/libyasm/intnum.h
-include/libyasm/inttree.h
-include/libyasm/linemap.h
-include/libyasm/listfmt.h
-include/libyasm/md5.h
-include/libyasm/module.h
-include/libyasm/objfmt.h
-include/libyasm/parser.h
-include/libyasm/phash.h
-include/libyasm/preproc.h
-include/libyasm/section.h
-include/libyasm/symrec.h
-include/libyasm/valparam.h
-include/libyasm/value.h
-lib/libyasm.a
-man/man1/yasm.1.gz
-man/man7/yasm_arch.7.gz
-man/man7/yasm_dbgfmts.7.gz
-man/man7/yasm_objfmts.7.gz
-man/man7/yasm_parsers.7.gz
diff --git a/dns/Makefile b/dns/Makefile
index 4e25a4727b03..69875fe86ee9 100644
--- a/dns/Makefile
+++ b/dns/Makefile
@@ -7,7 +7,6 @@
     SUBDIR += axfr2acl
     SUBDIR += bind-tools
     SUBDIR += bind9-devel
-    SUBDIR += bind911
     SUBDIR += bind916
     SUBDIR += bindgraph
     SUBDIR += blocky
diff --git a/dns/bind911/Makefile b/dns/bind911/Makefile
deleted file mode 100644
index 52c3483588ba..000000000000
--- a/dns/bind911/Makefile
+++ /dev/null
@@ -1,259 +0,0 @@
-# pkg-help formatted with fmt 59 63
-
-PORTNAME=	bind
-PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
-PORTREVISION=	0
-CATEGORIES=	dns net
-MASTER_SITES=	ISC/bind9/${ISCVERSION}
-PKGNAMESUFFIX=	911
-DISTNAME=	${PORTNAME}-${ISCVERSION}
-
-MAINTAINER=	mat@FreeBSD.org
-COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
-
-LICENSE=	MPL20
-LICENSE_FILE=	${WRKSRC}/COPYRIGHT
-
-DEPRECATED=	End of life, please migrate to a newer version of BIND9
-EXPIRATION_DATE=	2021-12-31
-
-LIB_DEPENDS=	libxml2.so:textproc/libxml2
-RUN_DEPENDS=	bind-tools>0:dns/bind-tools
-
-USES=	cpe libedit pkgconfig
-
-# ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.11.36
-
-CPE_VENDOR=	isc
-CPE_VERSION=	${ISCVERSION:C/-.*//}
-.if ${ISCVERSION:M*-*}
-CPE_UPDATE=	${ISCVERSION:C/.*-//:tl}
-.endif
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
-		--with-randomdev=/dev/random \
-		--with-libxml2=${LOCALBASE} \
-		--with-readline="-L${LOCALBASE}/lib -ledit" \
-		--with-dlopen=yes \
-		--with-gost=no \
-		--without-python \
-		--sysconfdir=${ETCDIR}
-ETCDIR=		${PREFIX}/etc/namedb
-
-CONFLICTS=	bind912 bind913 bind914 bind916 bind9-devel
-
-SUB_FILES=	pkg-message named.conf
-USE_RC_SUBR=	named
-
-MAKE_JOBS_UNSAFE=	yes
-
-PORTDOCS=	*
-
-OPTIONS_DEFAULT=	SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON \
-			DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP TCP_FASTOPEN \
-			FILTER_AAAA DNSTAP
-OPTIONS_DEFINE=		ACCFDNS IDN LARGE_FILE JSON GEOIP \
-			FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA \
-			RPZ_NSIP RPZ_NSDNAME DOCS \
-			MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \
-			START_LATE TUNING_LARGE TCP_FASTOPEN
-
-OPTIONS_RADIO=	CRYPTO
-OPTIONS_RADIO_CRYPTO=	SSL NATIVE_PKCS11
-
-OPTIONS_GROUP=		DLZ
-OPTIONS_GROUP_DLZ=	DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \
-			DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB
-OPTIONS_SINGLE=		GSSAPI
-OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
-
-OPTIONS_SUB=	yes
-
-ACCFDNS_DESC=		Prefer DNS accept filter over generic one
-CRYPTO_DESC=		Choose which crypto engine to use
-DLZ_BDB_DESC=		DLZ BDB driver
-DLZ_DESC=		Dynamically Loadable Zones
-DLZ_FILESYSTEM_DESC=	DLZ filesystem driver
-DLZ_LDAP_DESC=		DLZ LDAP driver
-DLZ_MYSQL_DESC=		DLZ MySQL driver (no threading)
-DLZ_POSTGRESQL_DESC=	DLZ Postgres driver
-DLZ_STUB_DESC=		DLZ stub driver
-DNSTAP_DESC=		Provides fast passive logging of DNS messages
-FILTER_AAAA_DESC=	Enable filtering of AAAA records
-FIXED_RRSET_DESC=	Enable fixed rrset ordering
-GSSAPI_BASE_DESC=	Using Heimdal in base
-GSSAPI_HEIMDAL_DESC=	Using security/heimdal
-GSSAPI_MIT_DESC=	Using security/krb5
-GSSAPI_NONE_DESC=	Disable
-LARGE_FILE_DESC=	64-bit file support
-LMDB_DESC=		Use LMDB for zone management
-MINCACHE_DESC=		Use the mincachettl patch
-NATIVE_PKCS11_DESC=	Use PKCS\#11 native API (**READ HELP**)
-PORTREVISION_DESC=	Show PORTREVISION in the version string
-QUERYTRACE_DESC=	Enable the very verbose query tracelogging
-RPZ_NSDNAME_DESC=	Enable RPZ NSDNAME policy records
-RPZ_NSIP_DESC=		Enable RPZ NSIP trigger rules
-SIGCHASE_DESC=		dig/host/nslookup will do DNSSEC validation
-SSL_DESC=		Build with OpenSSL (Required for DNSSEC)
-START_LATE_DESC=	Start BIND late in the boot process (see help)
-TCP_FASTOPEN_DESC=	RFC 7413 support
-TUNING_LARGE_DESC=	Tune named for large systems (**READ HELP**)
-
-ACCFDNS_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-interfacemgr.c
-	
-DLZ_BDB_CONFIGURE_ON=	--with-dlz-bdb=yes
-DLZ_BDB_USES=		bdb
-
-DLZ_FILESYSTEM_CONFIGURE_ON=	--with-dlz-filesystem=yes
-
-DLZ_LDAP_CONFIGURE_ON=	--with-dlz-ldap=yes
-DLZ_LDAP_USE=		openldap=yes
-
-DLZ_MYSQL_CONFIGURE_ON=	--with-dlz-mysql=yes
-DLZ_MYSQL_PREVENTS=	THREADS
-DLZ_MYSQL_USES=		mysql
-
-DLZ_POSTGRESQL_CONFIGURE_ON=	--with-dlz-postgres=yes
-DLZ_POSTGRESQL_USES=		pgsql
-
-DLZ_STUB_CONFIGURE_ON=	--with-dlz-stub=yes
-
-DNSTAP_CONFIGURE_ENABLE=	dnstap
-DNSTAP_IMPLIES=		THREADS
-DNSTAP_LIB_DEPENDS=	libfstrm.so:devel/fstrm \
-			libprotobuf-c.so:devel/protobuf-c
-
-FILTER_AAAA_CONFIGURE_ENABLE=	filter-aaaa
-
-FIXED_RRSET_CONFIGURE_ENABLE=	fixed-rrset
-
-GEOIP_CONFIGURE_WITH=	geoip2
-GEOIP_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
-GEOIP_IMPLIES=		THREADS
-
-GSSAPI_BASE_CONFIGURE_ON=\
-	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
-GSSAPI_BASE_USES=	gssapi
-
-GSSAPI_HEIMDAL_CONFIGURE_ON=\
-	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
-GSSAPI_HEIMDAL_USES=	gssapi:heimdal
-
-GSSAPI_MIT_CONFIGURE_ON=\
-	--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
-GSSAPI_MIT_USES=	gssapi:mit
-
-GSSAPI_NONE_CONFIGURE_ON=	--without-gssapi
-
-IDN_CONFIGURE_OFF=	--without-libidn2
-IDN_CONFIGURE_ON=	--with-libidn2=${LOCALBASE} ${ICONV_CONFIGURE_BASE}
-IDN_LIB_DEPENDS=	libidn2.so:dns/libidn2
-IDN_USES=		iconv
-
-IPV6_CONFIGURE_ENABLE=	ipv6
-
-JSON_CONFIGURE_WITH=	libjson=${LOCALBASE}
-JSON_LIB_DEPENDS=	libjson-c.so:devel/json-c
-
-LARGE_FILE_CONFIGURE_ENABLE=	largefile
-
-LMDB_CONFIGURE_WITH=	lmdb=${LOCALBASE}
-LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
-
-MINCACHE_EXTRA_PATCHES=	${FILESDIR}/extrapatch-bind-min-override-ttl
-
-NATIVE_PKCS11_CONFIGURE_ENABLE=	native-pkcs11
-NATIVE_PKCS11_IMPLIES=	THREADS
-
-QUERYTRACE_CONFIGURE_ENABLE=	querytrace
-
-RPZ_NSDNAME_CONFIGURE_ENABLE=	rpz-nsdname
-
-RPZ_NSIP_CONFIGURE_ENABLE=	rpz-nsip
-
-SIGCHASE_CONFIGURE_ON=	STD_CDEFINES="-DDIG_SIGCHASE=1"
-
-SSL_CONFIGURE_OFF=	--disable-openssl-version-check --without-openssl
-SSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
-SSL_USES=		ssl
-
-START_LATE_SUB_LIST=	NAMED_REQUIRE="SERVERS cleanvar" \
-			NAMED_BEFORE="LOGIN"
-START_LATE_SUB_LIST_OFF=NAMED_REQUIRE="NETWORKING ldconfig syslogd" \
-			NAMED_BEFORE="SERVERS"
-
-THREADS_CONFIGURE_ENABLE=	threads
-
-TUNING_LARGE_IMPLIES=	THREADS
-TUNING_LARGE_CONFIGURE_ON=	--with-tuning=large
-TUNING_LARGE_CONFIGURE_OFF=	--with-tuning=default
-
-.include <bsd.port.options.mk>
-
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--enable-symtable \
-			--enable-developer
-USES+=	perl5
-USE_PERL5=	build
-BUILD_DEPENDS+=	cmocka>0:sysutils/cmocka
-# Developer mode needs ssl, always
-.if !${PORT_OPTIONS:MSSL}
-CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
-USES+=		ssl
-.endif
-.else
-CONFIGURE_ARGS+=	--disable-symtable
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${SSL_DEFAULT} == base
-SUB_LIST+=	ENGINES=/usr/lib/engines
-.else
-SUB_LIST+=	ENGINES=${LOCALBASE}/lib/engines
-.endif
-
-post-patch:
-.for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \
-	rndc/rndc.8
-	@${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \
-		-e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \
-		-e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \
-		${WRKSRC}/bin/${FILE}
-.endfor
-
-.if ${PORTREVISION:N0}
-post-patch-PORTREVISION-on:
-	@${REINPLACE_CMD} -e '/EXTENSIONS/s#=$$#=_${PORTREVISION}#' \
-		${WRKSRC}/version
-.endif
-
-post-patch-TCP_FASTOPEN-off:
-	@${REINPLACE_CMD} -e 's/#define ISC_PLATFORM_HAVETFO 1/#undef ISC_PLATFORM_HAVETFO/' ${WRKSRC}/configure
-
-post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree
-	${MKDIR} ${STAGEDIR}${ETCDIR}
-.for i in dynamic master slave working
-	@${MKDIR} ${STAGEDIR}${ETCDIR}/$i
-.endfor
-	${INSTALL_DATA} ${WRKDIR}/named.conf ${STAGEDIR}${ETCDIR}/named.conf.sample
-	${INSTALL_DATA} ${FILESDIR}/named.root ${STAGEDIR}${ETCDIR}
-	${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/master
-	${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/master
-	${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/master
-	${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.dist.sample
-	${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.local.dist.sample
-	${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \
-		${STAGEDIR}${ETCDIR}/rndc.conf.sample
-
-post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/arm
-	${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm
-	${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/CHANGES \
-		${WRKSRC}/HISTORY* ${WRKSRC}/README* ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.post.mk>
diff --git a/dns/bind911/distinfo b/dns/bind911/distinfo
deleted file mode 100644
index 5af44adcefb6..000000000000
--- a/dns/bind911/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1635400901
-SHA256 (bind-9.11.36.tar.gz) = c953fcb6703b395aaa53e65ff8b2869b69a5303dd60507cba2201305e1811681
-SIZE (bind-9.11.36.tar.gz) = 8313276
diff --git a/dns/bind911/files/BIND.chroot.dist b/dns/bind911/files/BIND.chroot.dist
deleted file mode 100644
index 5616dd712f6b..000000000000
--- a/dns/bind911/files/BIND.chroot.dist
+++ /dev/null
@@ -1,24 +0,0 @@
-# mtree -deU -f files/BIND.chroot.dist -p tmp
-# mtree -cjnb -k uname,gname,mode -p tmp
-
-/set type=file uname=root gname=wheel mode=0755
-.               type=dir
-    dev             type=dir mode=0555
-    ..
-    etc             type=dir
-    ..
-    tmp             type=dir mode=01777
-    ..
-/set type=file uname=bind gname=bind mode=0755
-    var             type=dir uname=root gname=wheel
-        dump            type=dir
-        ..
-        log             type=dir
-        ..
-        run             type=dir
-            named           type=dir
-            ..
-        ..
-        stats           type=dir
-        ..
-    ..
diff --git a/dns/bind911/files/BIND.chroot.local.dist b/dns/bind911/files/BIND.chroot.local.dist
deleted file mode 100644
index 81fca3df322c..000000000000
--- a/dns/bind911/files/BIND.chroot.local.dist
+++ /dev/null
@@ -1,18 +0,0 @@
-# mtree -deU -f files/BIND.etc.dist -p tmp
-# mtree -cjnb -k uname,gname,mode -p tmp
-
-/set type=file uname=root gname=wheel mode=0755
-.               type=dir
-    etc             type=dir
-/set type=file uname=bind gname=wheel mode=0755
-        namedb          type=dir uname=root
-            dynamic         type=dir
-            ..
-            master          type=dir uname=root
-            ..
-            slave           type=dir
-            ..
-            working         type=dir
-            ..
-        ..
-    ..
diff --git a/dns/bind911/files/empty.db b/dns/bind911/files/empty.db
deleted file mode 100644
index 30870e74342f..000000000000
--- a/dns/bind911/files/empty.db
+++ /dev/null
@@ -1,8 +0,0 @@
-$TTL 3h
-@ SOA @ nobody.localhost. 42 1d 12h 1w 3h
-	; Serial, Refresh, Retry, Expire, Neg. cache TTL
-
-@	NS	@
-
-; Silence a BIND warning
-@	A	127.0.0.1
diff --git a/dns/bind911/files/extrapatch-bind-min-override-ttl b/dns/bind911/files/extrapatch-bind-min-override-ttl
deleted file mode 100644
index 1776bb0c6724..000000000000
--- a/dns/bind911/files/extrapatch-bind-min-override-ttl
+++ /dev/null
@@ -1,76 +0,0 @@
-- Add the min-cache-ttl config knob.
-- Add the override-cache-ttl config knob.
-
---- bin/named/config.c.orig	2021-05-12 10:45:51 UTC
-+++ bin/named/config.c
-@@ -182,6 +182,8 @@ options {\n\
- "	max-acache-size 16M;\n\
- 	max-cache-size 90%;\n\
- 	max-cache-ttl 604800; /* 1 week */\n\
-+	min-cache-ttl 0; /* no minimal, zero is allowed */\n\
-+	override-cache-ttl 0; /* do not override */\n\
- 	max-clients-per-query 100;\n\
- 	max-ncache-ttl 10800; /* 3 hours */\n\
- 	max-recursion-depth 7;\n\
---- bin/named/server.c.orig	2021-05-12 10:45:51 UTC
-+++ bin/named/server.c
-@@ -3721,6 +3721,16 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
- 	}
- 
- 	obj = NULL;
-+	result = ns_config_get(maps, "override-cache-ttl", &obj);
-+	INSIST(result == ISC_R_SUCCESS);
-+	view->overridecachettl = cfg_obj_asuint32(obj);
-+
-+	obj = NULL;
-+	result = ns_config_get(maps, "min-cache-ttl", &obj);
-+	INSIST(result == ISC_R_SUCCESS);
-+	view->mincachettl = cfg_obj_asuint32(obj);
-+
-+	obj = NULL;
- 	result = ns_config_get(maps, "max-cache-ttl", &obj);
- 	INSIST(result == ISC_R_SUCCESS);
- 	view->maxcachettl = cfg_obj_asuint32(obj);
---- lib/dns/include/dns/view.h.orig	2021-05-12 10:45:51 UTC
-+++ lib/dns/include/dns/view.h
-@@ -152,6 +152,8 @@ struct dns_view {
- 	bool			requestnsid;
- 	bool			sendcookie;
- 	dns_ttl_t			maxcachettl;
-+	dns_ttl_t			mincachettl;
-+	dns_ttl_t			overridecachettl;
- 	dns_ttl_t			maxncachettl;
- 	uint32_t			nta_lifetime;
- 	uint32_t			nta_recheck;
---- lib/dns/resolver.c.orig	2021-05-12 10:45:51 UTC
-+++ lib/dns/resolver.c
-@@ -5579,6 +5579,18 @@ cache_name(fetchctx_t *fctx, dns_message_t *rmessage,
- 		}
- 
- 		/*
-+		 * Enforce the configure cache TTL override.
-+		 */
-+                if (res->view->overridecachettl)
-+                        rdataset->ttl = res->view->overridecachettl;
-+
-+		/*
-+		 * Enforce the configure minimum cache TTL.
-+		 */
-+                if (rdataset->ttl < res->view->mincachettl)
-+                        rdataset->ttl = res->view->mincachettl;
-+
-+		/*
- 		 * Enforce the configure maximum cache TTL.
- 		 */
- 		if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig	2021-05-12 10:45:51 UTC
-+++ lib/isccfg/namedconf.c
-@@ -1773,6 +1773,8 @@ view_clauses[] = {
- #endif
- 	{ "max-acache-size", &cfg_type_sizenodefault, 0 },
- 	{ "max-cache-size", &cfg_type_sizeorpercent, 0 },
-+	{ "override-cache-ttl", &cfg_type_uint32, 0 },
-+	{ "min-cache-ttl", &cfg_type_uint32, 0 },
- 	{ "max-cache-ttl", &cfg_type_uint32, 0 },
- 	{ "max-clients-per-query", &cfg_type_uint32, 0 },
- 	{ "max-ncache-ttl", &cfg_type_uint32, 0 },
diff --git a/dns/bind911/files/extrapatch-interfacemgr.c b/dns/bind911/files/extrapatch-interfacemgr.c
deleted file mode 100644
index d579771f6828..000000000000
--- a/dns/bind911/files/extrapatch-interfacemgr.c
+++ /dev/null
@@ -1,14 +0,0 @@
-Use accf_dns's kernel module if available.
-
---- bin/named/interfacemgr.c.orig	2020-08-06 10:05:20 UTC
-+++ bin/named/interfacemgr.c
-@@ -521,7 +521,8 @@ ns_interface_accepttcp(ns_interface_t *ifp) {
- 	 * If/when there a multiple filters listen to the
- 	 * result.
- 	 */
--	(void)isc_socket_filter(ifp->tcpsocket, "dataready");
-+	if (isc_socket_filter(ifp->tcpsocket, "dnsready") != ISC_R_SUCCESS)
-+		(void)isc_socket_filter(ifp->tcpsocket, "dataready");
- 
- 	result = ns_clientmgr_createclients(ifp->clientmgr, 1, ifp, true);
- 	if (result != ISC_R_SUCCESS) {
diff --git a/dns/bind911/files/localhost-forward.db b/dns/bind911/files/localhost-forward.db
deleted file mode 100644
index fdd2e9ce4bee..000000000000
--- a/dns/bind911/files/localhost-forward.db
+++ /dev/null
@@ -1,8 +0,0 @@
-$TTL 3h
-localhost. SOA localhost. nobody.localhost. 42 1d 12h 1w 3h
-	; Serial, Refresh, Retry, Expire, Neg. cache TTL
-
-	NS	localhost.
-
-	A	127.0.0.1
-	AAAA	::1
diff --git a/dns/bind911/files/localhost-reverse.db b/dns/bind911/files/localhost-reverse.db
deleted file mode 100644
index 376e94fa94a8..000000000000
--- a/dns/bind911/files/localhost-reverse.db
+++ /dev/null
@@ -1,10 +0,0 @@
-$TTL 3h
-@ SOA localhost. nobody.localhost. 42 1d 12h 1w 3h
-	; Serial, Refresh, Retry, Expire, Neg. cache TTL
-
-	NS	localhost.
-
-1.0.0	PTR	localhost.
-
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 PTR localhost.
-
diff --git a/dns/bind911/files/named.conf.in b/dns/bind911/files/named.conf.in
deleted file mode 100644
index c3a367fd23ee..000000000000
--- a/dns/bind911/files/named.conf.in
+++ /dev/null
@@ -1,378 +0,0 @@
-// Refer to the named.conf(5) and named(8) man pages, and the documentation
-// in /usr/local/share/doc/bind for more details.
-//
-// If you are going to set up an authoritative server, make sure you
-// understand the hairy details of how DNS works.  Even with
-// simple mistakes, you can break connectivity for affected parties,
-// or cause huge amounts of useless Internet traffic.
-
-options {
-	// All file and path names are relative to the chroot directory,
-	// if any, and should be fully qualified.
-	directory	"%%ETCDIR%%/working";
-	pid-file	"/var/run/named/pid";
-	dump-file	"/var/dump/named_dump.db";
-	statistics-file	"/var/stats/named.stats";
-
-// If named is being used only as a local resolver, this is a safe default.
-// For named to be accessible to the network, comment this option, specify
-// the proper IP address, or delete this option.
-	listen-on	{ 127.0.0.1; };
-
-// If you have IPv6 enabled on this system, uncomment this option for
-// use as a local resolver.  To give access to the network, specify
-// an IPv6 address, or the keyword "any".
-//	listen-on-v6	{ ::1; };
-
-// These zones are already covered by the empty zones listed below.
-// If you remove the related empty zones below, comment these lines out.
-	disable-empty-zone "255.255.255.255.IN-ADDR.ARPA";
-	disable-empty-zone "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA";
-	disable-empty-zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA";
-
-// If you've got a DNS server around at your upstream provider, enter
-// its IP address here, and enable the line below.  This will make you
-// benefit from its cache, thus reduce overall DNS traffic in the Internet.
-/*
-	forwarders {
-		127.0.0.1;
-	};
-*/
-
-// If the 'forwarders' clause is not empty the default is to 'forward first'
-// which will fall back to sending a query from your local server if the name
-// servers in 'forwarders' do not have the answer.  Alternatively you can
-// force your name server to never initiate queries of its own by enabling the
-// following line:
-//	forward only;
-
-// If you wish to have forwarding configured automatically based on
-// the entries in /etc/resolv.conf, uncomment the following line and
-// set named_auto_forward=yes in /etc/rc.conf.  You can also enable
-// named_auto_forward_only (the effect of which is described above).
-//	include "%%ETCDIR%%/auto_forward.conf";
-
-	/*
-	   Modern versions of BIND use a random UDP port for each outgoing
-	   query by default in order to dramatically reduce the possibility
-	   of cache poisoning.  All users are strongly encouraged to utilize
-	   this feature, and to configure their firewalls to accommodate it.
-
-	   AS A LAST RESORT in order to get around a restrictive firewall
-	   policy you can try enabling the option below.  Use of this option
-	   will significantly reduce your ability to withstand cache poisoning
-	   attacks, and should be avoided if at all possible.
-
-	   Replace NNNNN in the example with a number between 49160 and 65530.
-	*/
-	// query-source address * port NNNNN;
-};
-
-// If you enable a local name server, don't forget to enter 127.0.0.1
-// first in your /etc/resolv.conf so this server will be queried.
-// Also, make sure to enable it in /etc/rc.conf.
-
-// The traditional root hints mechanism. Use this, OR the slave zones below.
-zone "." { type hint; file "%%ETCDIR%%/named.root"; };
-
-/*	Slaving the following zones from the root name servers has some
-	significant advantages:
-	1. Faster local resolution for your users
-	2. No spurious traffic will be sent from your network to the roots
-	3. Greater resilience to any potential root server failure/DDoS
-
-	On the other hand, this method requires more monitoring than the
-	hints file to be sure that an unexpected failure mode has not
-	incapacitated your server.  Name servers that are serving a lot
-	of clients will benefit more from this approach than individual
-	hosts.  Use with caution.
-
-	To use this mechanism, uncomment the entries below, and comment
-	the hint zone above.
-
-	As documented at http://dns.icann.org/services/axfr/ these zones:
-	"." (the root), ARPA, IN-ADDR.ARPA, IP6.ARPA, and a few others
-	are available for AXFR from these servers on IPv4 and IPv6:
-	xfr.lax.dns.icann.org, xfr.cjr.dns.icann.org
-*/
-/*
-zone "." {
-	type slave;
-	file "%%ETCDIR%%/slave/root.slave";
-	masters {
-		192.0.32.132;           // lax.xfr.dns.icann.org
-		2620:0:2d0:202::132;    // lax.xfr.dns.icann.org
-		192.0.47.132;           // iad.xfr.dns.icann.org
-		2620:0:2830:202::132;   // iad.xfr.dns.icann.org
-	};
-	notify no;
-};
-zone "arpa" {
-	type slave;
-	file "%%ETCDIR%%/slave/arpa.slave";
-	masters {
-		192.0.32.132;           // lax.xfr.dns.icann.org
-		2620:0:2d0:202::132;    // lax.xfr.dns.icann.org
-		192.0.47.132;           // iad.xfr.dns.icann.org
-		2620:0:2830:202::132;   // iad.xfr.dns.icann.org
-	};
-	notify no;
-};
-zone "in-addr.arpa" {
-	type slave;
-	file "%%ETCDIR%%/slave/in-addr.arpa.slave";
-	masters {
-		192.0.32.132;           // lax.xfr.dns.icann.org
-		2620:0:2d0:202::132;    // lax.xfr.dns.icann.org
-		192.0.47.132;           // iad.xfr.dns.icann.org
-		2620:0:2830:202::132;   // iad.xfr.dns.icann.org
-	};
-	notify no;
-};
-zone "ip6.arpa" {
-	type slave;
-	file "%%ETCDIR%%/slave/ip6.arpa.slave";
-	masters {
-		192.0.32.132;           // lax.xfr.dns.icann.org
-		2620:0:2d0:202::132;    // lax.xfr.dns.icann.org
-		192.0.47.132;           // iad.xfr.dns.icann.org
-		2620:0:2830:202::132;   // iad.xfr.dns.icann.org
-	};
-	notify no;
-};
-*/
-
-/*	Serving the following zones locally will prevent any queries
-	for these zones leaving your network and going to the root
-	name servers.  This has two significant advantages:
-	1. Faster local resolution for your users
-	2. No spurious traffic will be sent from your network to the roots
-*/
-// RFCs 1912, 5735 and 6303 (and BCP 32 for localhost)
-zone "localhost"	{ type master; file "%%ETCDIR%%/master/localhost-forward.db"; };
-zone "127.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/localhost-reverse.db"; };
-zone "255.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-
-// RFC 1912-style zone for IPv6 localhost address (RFC 6303)
-zone "0.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/localhost-reverse.db"; };
-
-// "This" Network (RFCs 1912, 5735 and 6303)
-zone "0.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-
-// Private Use Networks (RFCs 1918, 5735 and 6303)
-zone "10.in-addr.arpa"	   { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "16.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "17.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "18.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "19.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "20.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "21.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "22.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "23.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "24.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "25.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "26.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "27.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "28.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "29.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "30.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "31.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "168.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-
-// Shared Address Space (RFC 6598)
-zone "64.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "65.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "66.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "67.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "68.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "69.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "70.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "71.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "72.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "73.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "74.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "75.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "76.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "77.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "78.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "79.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "80.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "81.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "82.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "83.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "84.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "85.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "86.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "87.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "88.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "89.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "90.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "91.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "92.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "93.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "94.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "95.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "96.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "97.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "98.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "99.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "100.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "101.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "102.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "103.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "104.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "105.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "106.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "107.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "108.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "109.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "110.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "111.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "112.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "113.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "114.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "115.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "116.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "117.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "118.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "119.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "120.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "121.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "122.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "123.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "124.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "125.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "126.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "127.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-
-// Link-local/APIPA (RFCs 3927, 5735 and 6303)
-zone "254.169.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-
-// IETF protocol assignments (RFCs 5735 and 5736)
-zone "0.0.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-
-// TEST-NET-[1-3] for Documentation (RFCs 5735, 5737 and 6303)
-zone "2.0.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "100.51.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "113.0.203.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-
-// IPv6 Example Range for Documentation (RFCs 3849 and 6303)
-zone "8.b.d.0.1.0.0.2.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-
-// Router Benchmark Testing (RFCs 2544 and 5735)
-zone "18.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "19.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
-
-// IANA Reserved - Old Class E Space (RFC 5735)
-zone "240.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "241.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "242.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "243.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "244.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "245.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "246.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "247.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "248.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "249.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "250.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "251.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "252.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "253.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "254.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-
-// IPv6 Unassigned Addresses (RFC 4291)
-zone "1.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "3.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "4.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "5.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "6.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "7.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "8.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "9.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "a.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "b.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "c.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "d.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "e.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "0.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "1.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "2.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "3.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "4.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "5.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "6.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "7.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "8.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "9.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "a.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "b.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "0.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "1.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "2.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "3.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "4.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "5.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "6.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "7.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-
-// IPv6 ULA (RFCs 4193 and 6303)
-zone "c.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "d.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-
-// IPv6 Link Local (RFCs 4291 and 6303)
-zone "8.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "9.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "a.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "b.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-
-// IPv6 Deprecated Site-Local Addresses (RFCs 3879 and 6303)
-zone "c.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "d.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "e.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "f.e.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-
-// IP6.INT is Deprecated (RFC 4159)
-zone "ip6.int"		{ type master; file "%%ETCDIR%%/master/empty.db"; };
-
-// NB: Do not use the IP addresses below, they are faked, and only
-// serve demonstration/documentation purposes!
-//
-// Example slave zone config entries.  It can be convenient to become
-// a slave at least for the zone your own domain is in.  Ask
-// your network administrator for the IP address of the responsible
-// master name server.
-//
-// Do not forget to include the reverse lookup zone!
-// This is named after the first bytes of the IP address, in reverse
-// order, with ".IN-ADDR.ARPA" appended, or ".IP6.ARPA" for IPv6.
-//
-// Before starting to set up a master zone, make sure you fully
-// understand how DNS and BIND work.  There are sometimes
-// non-obvious pitfalls.  Setting up a slave zone is usually simpler.
-//
-// NB: Don't blindly enable the examples below. :-)  Use actual names
-// and addresses instead.
-
-/* An example dynamic zone
-key "exampleorgkey" {
-	algorithm hmac-md5;
-	secret "sf87HJqjkqh8ac87a02lla==";
-};
-zone "example.org" {
-	type master;
-	allow-update {
-		key "exampleorgkey";
-	};
-	file "%%ETCDIR%%/dynamic/example.org";
-};
-*/
-
-/* Example of a slave reverse zone
-zone "1.168.192.in-addr.arpa" {
-	type slave;
-	file "%%ETCDIR%%/slave/1.168.192.in-addr.arpa";
-	masters {
-		192.168.1.1;
-	};
-};
-*/
diff --git a/dns/bind911/files/named.in b/dns/bind911/files/named.in
deleted file mode 100644
index 95f11da12d74..000000000000
--- a/dns/bind911/files/named.in
+++ /dev/null
@@ -1,448 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: named
-# REQUIRE: %%NAMED_REQUIRE%%
-# BEFORE: %%NAMED_BEFORE%%
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable BIND:
-# named_enable (bool):		    Run named, the DNS server (or NO).
-# named_program (str):		    Path to named, if you want a different one.
-# named_conf (str):		    Path to the configuration file
-# named_flags (str):		    Use this for flags OTHER than -u and -c
-# named_uid (str):		    User to run named as
-# named_chrootdir (str):	    Chroot directory (or "" not to auto-chroot it)
-#				    Historically, was /var/named
-# named_chroot_autoupdate (bool):   Automatically install/update chrooted
-# 				    components of named.
-# named_symlink_enable (bool):	    Symlink the chrooted pid file
-# named_wait (bool):		    Wait for working name service before exiting
-# named_wait_host (str):	    Hostname to check if named_wait is enabled
-# named_auto_forward (str):	    Set up forwarders from /etc/resolv.conf
-# named_auto_forward_only (str):    Do "forward only" instead of "forward first"
-%%NATIVE_PKCS11%%# named_pkcs11_engine (str):	    Path to the PKCS#11 library to use.
-#
-
-. /etc/rc.subr
-
-name=named
-desc="named BIND startup script"
-rcvar=named_enable
-
-load_rc_config ${name}
-
-extra_commands=reload
-
-start_precmd=named_prestart
-start_postcmd=named_poststart
-reload_cmd=named_reload
-stop_cmd=named_stop
-stop_postcmd=named_poststop
-
-named_enable=${named_enable:-"NO"}
-named_program=${named_program:-"%%PREFIX%%/sbin/named"}
-named_conf=${named_conf:-"%%ETCDIR%%/named.conf"}
-named_flags=${named_flags:-""}
-named_uid=${named_uid:-"bind"}
-named_chrootdir=${named_chrootdir:-""}
-named_chroot_autoupdate=${named_chroot_autoupdate:-"YES"}
-named_symlink_enable=${named_symlink_enable:-"YES"}
-named_wait=${named_wait:-"NO"}
-named_wait_host=${named_wait_host:-"localhost"}
-named_auto_forward=${named_auto_forward:-"NO"}
-named_auto_forward_only=${named_auto_forward_only:-"NO"}
-%%NATIVE_PKCS11%%named_pkcs11_engine=${named_pkcs11_engine:-""}
-
-# Not configuration variables but having them here keeps rclint happy
-required_dirs="${named_chrootdir}"
-_named_confdirroot="${named_conf%/*}"
-_named_confdir="${named_chrootdir}${_named_confdirroot}"
-_named_program_root="${named_program%/sbin/named}"
-_openssl_engines="%%ENGINES%%"
-
-# Needed if named.conf and rndc.conf are moved or if rndc.conf is used
-rndc_conf=${rndc_conf:-"$_named_confdir/rndc.conf"}
-rndc_key=${rndc_key:-"$_named_confdir/rndc.key"}
-
-# If running in a chroot cage, ensure that the appropriate files
-# exist inside the cage, as well as helper symlinks into the cage
-# from outside.
-#
-# As this is called after the is_running and required_dir checks
-# are made in run_rc_command(), we can safely assume ${named_chrootdir}
-# exists and named isn't running at this point (unless forcestart
-# is used).
-#
-chroot_autoupdate()
-{
-	local file
-
-	# If it's the first time around, fiddle with things and move the
-	# current configuration to the chroot.
-	if [ -d ${_named_confdirroot} -a ! -d ${_named_confdir} ]; then
-		warn "named chroot: Moving current configuration in the chroot!"
-		install -d ${_named_confdir%/*}
-		mv ${_named_confdirroot} ${_named_confdir}
-	fi
-
-	# Create (or update) the chroot directory structure
-	#
-	if [ -r %%PREFIX%%/etc/mtree/BIND.chroot.dist ]; then
-		mtree -deU -f %%PREFIX%%/etc/mtree/BIND.chroot.dist \
-		    -p ${named_chrootdir}
-	else
-		warn "%%PREFIX%%/etc/mtree/BIND.chroot.dist missing,"
-		warn "${named_chrootdir} directory structure not updated"
-	fi
-	if [ -r %%PREFIX%%/etc/mtree/BIND.chroot.local.dist ]; then
-		mkdir -p ${named_chrootdir}%%PREFIX%%
-		mtree -deU -f %%PREFIX%%/etc/mtree/BIND.chroot.local.dist \
-		    -p ${named_chrootdir}%%PREFIX%%
-	else
-		warn "%%PREFIX%%/etc/mtree/BIND.chroot.local.dist missing,"
-		warn "${named_chrootdir}%%PREFIX%% directory structure not updated"
-	fi
-
-	# Create (or update) the configuration directory symlink
-	#
-	if [ ! -L "${_named_confdirroot}" ]; then
-		if [ -d "${_named_confdirroot}" ]; then
-			warn "named chroot: ${_named_confdirroot} is a directory!"
-		elif [ -e "${_named_confdirroot}" ]; then
-			warn "named chroot: ${_named_confdirroot} exists!"
-		else
-			ln -s ${_named_confdir} ${_named_confdirroot}
-		fi
-	else
-		# Make sure it points to the right place.
-		ln -shf ${_named_confdir} ${_named_confdirroot}
-	fi
-
-	# Mount a devfs in the chroot directory if needed
-	#
-	if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then
-		umount ${named_chrootdir}/dev 2>/dev/null
-		devfs_domount ${named_chrootdir}/dev devfsrules_hide_all
-		devfs -m ${named_chrootdir}/dev rule apply path null unhide
-		devfs -m ${named_chrootdir}/dev rule apply path random unhide
-	else
-		if [ -c ${named_chrootdir}/dev/null -a \
-		    -c ${named_chrootdir}/dev/random ]; then
-			info "named chroot: using pre-mounted devfs."
-		else
-			err 1 "named chroot: devfs cannot be mounted from " \
-				"within a jail. Thus a chrooted named cannot " \
-				"be run from within a jail.  Either mount the " \
-				"devfs with null and random from the host, or " \
-				"run named without chrooting it, set " \
-				"named_chrootdir=\"\" in /etc/rc.conf."
-		fi
-	fi
-
-	# The OpenSSL engines should be present in the chroot, named loads them
-	# after chrooting.
-	if [ -d ${_openssl_engines} ]; then
-		mkdir -p ${named_chrootdir}${_openssl_engines}
-		if can_mount nullfs ; then
-			mount -t nullfs ${_openssl_engines} ${named_chrootdir}${_openssl_engines}
-		else
-			warn "named chroot: cannot nullfs mount OpenSSL" \
-				"engines into the chroot, will copy the shared" \
-				"libraries instead."
-			cp -f ${_openssl_engines}/*.so ${named_chrootdir}${_openssl_engines}
-		fi
-	fi
-
-	# Copy and/or update key files to the chroot /etc
-	#
-	for file in localtime protocols services; do
-		if [ -r /etc/${file} ] && \
-			! cmp -s /etc/${file} "${named_chrootdir}/etc/${file}"; then
-			cp -p /etc/${file} "${named_chrootdir}/etc/${file}"
-		fi
-	done
-}
-
-# Make symlinks to the correct pid file
-#
-make_symlinks()
-{
-	checkyesno named_symlink_enable &&
-	    ln -fs "${named_chrootdir}${pidfile}" ${pidfile} &&
-	    ln -fs "${named_chrootdir}${sessionkeyfile}" ${sessionkeyfile}
-}
-
-named_poststart()
-{
-	make_symlinks
-
-	if checkyesno named_wait; then
-		until ${_named_program_root}/bin/host ${named_wait_host} >/dev/null 2>&1; do
-			echo "	Waiting for nameserver to resolve ${named_wait_host}"
-			sleep 1
-		done
-	fi
-}
-
-named_reload()
-{
-	# This is a one line function, but ${named_program} is not defined early
-	# enough to be there when the reload_cmd variable is defined up there.
-	rndc reload
-}
-
-find_pidfile()
-{
-	if get_pidfile_from_conf pid-file ${named_conf}; then
-		pidfile="${_pidfile_from_conf}"
-	else
-		pidfile="/var/run/named/pid"
-	fi
-}
-
-find_sessionkeyfile()
-{
-	if get_pidfile_from_conf session-keyfile ${named_conf}; then
-		sessionkeyfile="${_pidfile_from_conf}"
-	else
-		sessionkeyfile="/var/run/named/session.key"
-	fi
-}
-
-named_stop()
-{
-	find_pidfile
-
-	# This duplicates an undesirably large amount of code from the stop
-	# routine in rc.subr in order to use rndc to shut down the process,
-	# and to give it a second chance in case rndc fails.
-	rc_pid=$(check_pidfile ${pidfile} ${command})
-	if [ -z "${rc_pid}" ]; then
-		[ -n "${rc_fast}" ] && return 0
-		_run_rc_notrunning
-		return 1
-	fi
-	echo 'Stopping named.'
-	if rndc stop; then
-		wait_for_pids ${rc_pid}
-	else
-		echo -n 'rndc failed, trying kill: '
-		kill -TERM ${rc_pid}
-		wait_for_pids ${rc_pid}
-	fi
-}
-
-named_poststop()
-{
-	if [ -n "${named_chrootdir}" ]; then
-		# if using OpenSSL from ports, unmount OpenSSL engines, if they
-		# were not mounted but only copied, do nothing.
-		if [ -d ${_openssl_engines} ]; then
-			if can_mount nullfs; then
-				umount ${named_chrootdir}${_openssl_engines}
-			fi
-		fi
-		if [ -c ${named_chrootdir}/dev/null ]; then
-			# unmount /dev
-			if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then
-				umount ${named_chrootdir}/dev 2>/dev/null || true
-			else
-				warn "named chroot:" \
-					"cannot unmount devfs from inside jail!"
-			fi
-		fi
-	fi
-}
-
-can_mount()
-{
-	local kld
-	kld=$1
-	if ! load_kld $kld; then
-		return 1
-	fi
-	if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ] ||
-		[ `${SYSCTL_N} security.jail.mount_allowed` -eq 1 ] ||
-		[ `${SYSCTL_N} security.jail.mount_${kld}_allowed` -eq 1 ] ; then
-		return 0
-	fi
-	return 1
-}
-
-create_file()
-{
-	if [ -e "$1" ]; then
-		unlink $1
-	fi
-	install -o root -g wheel -m 0644 /dev/null $1
-}
-
-rndc()
-{
-	if [ -z "${rndc_flags}" ]; then
-		if [ -s "${rndc_conf}" ] ; then
-			rndc_flags="-c ${rndc_conf}"
-		elif [ -s "${rndc_key}" ] ; then
-			rndc_flags="-k ${rndc_key}"
-		else
-			rndc_flags=""
-		fi
-	fi
-
-	${_named_program_root}/sbin/rndc ${rndc_flags} "$@"
-}
-
-named_prestart()
-{
-	find_pidfile
-	find_sessionkeyfile
-
-	if [ -n "${named_pidfile}" ]; then
-		warn 'named_pidfile: now determined from the conf file'
-	fi
-
-	if [ -n "${named_sessionkeyfile}" ]; then
-		warn 'named_sessionkeyfile: now determined from the conf file'
-	fi
-
-	piddir=`/usr/bin/dirname ${pidfile}`
-	if [ ! -d ${piddir} ]; then
-		install -d -o ${named_uid} -g ${named_uid} ${piddir}
-	fi
-
-	sessionkeydir=`/usr/bin/dirname ${sessionkeyfile}`
-	if [ ! -d ${sessionkeydir} ]; then
-		install -d -o ${named_uid} -g ${named_uid} ${sessionkeydir}
-	fi
-
-	command_args="-u ${named_uid:=root} -c ${named_conf} ${command_args}"
-
-%%NATIVE_PKCS11%%	if [ -z "${named_pkcs11_engine}"]; then
-%%NATIVE_PKCS11%%		err 3 "named_pkcs11_engine has to be set to the PKCS#11 engine's library you want to use"
-%%NATIVE_PKCS11%%	elif [ ! -f ${named_pkcs11_engine} ]; then
-%%NATIVE_PKCS11%%		err 3 "named_pkcs11_engine the PKCS#11 engine's library you want to use doesn't exist"
-%%NATIVE_PKCS11%%	else
-%%NATIVE_PKCS11%%		mkdir -p ${named_chrootdir}${named_pkcs11_engine%/*}
-%%NATIVE_PKCS11%%		cp -p ${named_pkcs11_engine} ${named_chrootdir}${named_pkcs11_engine}
-%%NATIVE_PKCS11%%		command_args="-E ${named_pkcs11_engine} ${command_args}"
-%%NATIVE_PKCS11%%	fi
-
-	local line nsip firstns
-
-	# Is the user using a sandbox?
-	#
-	if [ -n "${named_chrootdir}" ]; then
-		rc_flags="${rc_flags} -t ${named_chrootdir}"
-		checkyesno named_chroot_autoupdate && chroot_autoupdate
-
-		case "${altlog_proglist}" in
-		  *named*)
-		    ;;
-		  *)
-		    warn 'Using chroot without setting altlog_proglist, logging may not'
-		    warn 'work correctly.  Run sysrc altlog_proglist+=named'
-		    ;;
-		esac
-	else
-		named_symlink_enable=NO
-	fi
-
-	# Create an rndc.key file for the user if none exists
-	#
-	confgen_command="${_named_program_root}/sbin/rndc-confgen -a -b256 -u ${named_uid} \
-	    -c ${_named_confdir}/rndc.key"
-	if [ -s "${_named_confdir}/rndc.conf" ]; then
-		unset confgen_command
-	fi
-	if [ -s "${_named_confdir}/rndc.key" ]; then
-		case `stat -f%Su ${_named_confdir}/rndc.key` in
-		root|${named_uid}) ;;
-		*) ${confgen_command} ;;
-		esac
-	else
-		${confgen_command}
-	fi
-
-	local checkconf
-
-	checkconf="${_named_program_root}/sbin/named-checkconf"
-	if ! checkyesno named_chroot_autoupdate && [ -n "${named_chrootdir}" ]; then
-		checkconf="${checkconf} -t ${named_chrootdir}"
-	fi
-
-	# Create a forwarder configuration based on /etc/resolv.conf
-	if checkyesno named_auto_forward; then
-		if [ ! -s /etc/resolv.conf ]; then
-			warn "named_auto_forward enabled, but no /etc/resolv.conf"
-
-			# Empty the file in case it is included in named.conf
-			[ -s "${_named_confdir}/auto_forward.conf" ] &&
-			    create_file ${_named_confdir}/auto_forward.conf
-
-			${checkconf} ${named_conf} ||
-			    err 3 'named-checkconf for ${named_conf} failed'
-			return
-		fi
-
-		create_file /var/run/naf-resolv.conf
-		create_file /var/run/auto_forward.conf
-
-		echo '	forwarders {' > /var/run/auto_forward.conf
-
-		while read line; do
-			case "${line}" in
-			'nameserver '*|'nameserver	'*)
-				nsip=${line##nameserver[         ]}
-
-				if [ -z "${firstns}" ]; then
-					if [ ! "${nsip}" = '127.0.0.1' ]; then
-						echo 'nameserver 127.0.0.1'
-						echo "		${nsip};" >> /var/run/auto_forward.conf
-					fi
-
-					firstns=1
-				else
-					[ "${nsip}" = '127.0.0.1' ] && continue
-					echo "		${nsip};" >> /var/run/auto_forward.conf
-				fi
-				;;
-			esac
-
-			echo ${line}
-		done < /etc/resolv.conf > /var/run/naf-resolv.conf
-
-		echo '	};' >> /var/run/auto_forward.conf
-		echo '' >> /var/run/auto_forward.conf
-		if checkyesno named_auto_forward_only; then
-			echo "	forward only;" >> /var/run/auto_forward.conf
-		else
-			echo "	forward first;" >> /var/run/auto_forward.conf
-		fi
-
-		if cmp -s /etc/resolv.conf /var/run/naf-resolv.conf; then
-			unlink /var/run/naf-resolv.conf
-		else
-			[ -e /etc/resolv.conf ] && unlink /etc/resolv.conf
-			mv /var/run/naf-resolv.conf /etc/resolv.conf
-		fi
-
-		if cmp -s ${_named_confdir}/auto_forward.conf \
-		    /var/run/auto_forward.conf; then
-			unlink /var/run/auto_forward.conf
-		else
-			[ -e "${_named_confdir}/auto_forward.conf" ] &&
-			    unlink ${_named_confdir}/auto_forward.conf
-			mv /var/run/auto_forward.conf \
-			    ${_named_confdir}/auto_forward.conf
-		fi
-	else
-		# Empty the file in case it is included in named.conf
-		[ -s "${_named_confdir}/auto_forward.conf" ] &&
-		    create_file ${_named_confdir}/auto_forward.conf
-	fi
-
-	${checkconf} ${named_conf} || err 3 "named-checkconf for ${named_conf} failed"
-}
-
-run_rc_command "$1"
diff --git a/dns/bind911/files/named.root b/dns/bind911/files/named.root
deleted file mode 100644
index 6f15474277e1..000000000000
--- a/dns/bind911/files/named.root
+++ /dev/null
@@ -1,92 +0,0 @@
-;       This file holds the information on root name servers needed to 
-;       initialize cache of Internet domain name servers
-;       (e.g. reference this file in the "cache  .  <file>"
-;       configuration file of BIND domain name servers). 
-; 
-;       This file is made available by InterNIC 
-;       under anonymous FTP as
-;           file                /domain/named.cache 
-;           on server           FTP.INTERNIC.NET
-;       -OR-                    RS.INTERNIC.NET
-; 
-;       last update:     November 16, 2017 
-;       related version of root zone:     2017111601
-; 
-; FORMERLY NS.INTERNIC.NET 
-;
-.                        3600000      NS    A.ROOT-SERVERS.NET.
-A.ROOT-SERVERS.NET.      3600000      A     198.41.0.4
-A.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:ba3e::2:30
-; 
-; FORMERLY NS1.ISI.EDU 
-;
-.                        3600000      NS    B.ROOT-SERVERS.NET.
-B.ROOT-SERVERS.NET.      3600000      A     199.9.14.201
-B.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:200::b
-; 
-; FORMERLY C.PSI.NET 
-;
-.                        3600000      NS    C.ROOT-SERVERS.NET.
-C.ROOT-SERVERS.NET.      3600000      A     192.33.4.12
-C.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2::c
-; 
-; FORMERLY TERP.UMD.EDU 
-;
-.                        3600000      NS    D.ROOT-SERVERS.NET.
-D.ROOT-SERVERS.NET.      3600000      A     199.7.91.13
-D.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2d::d
-; 
-; FORMERLY NS.NASA.GOV
-;
-.                        3600000      NS    E.ROOT-SERVERS.NET.
-E.ROOT-SERVERS.NET.      3600000      A     192.203.230.10
-E.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:a8::e
-; 
-; FORMERLY NS.ISC.ORG
-;
-.                        3600000      NS    F.ROOT-SERVERS.NET.
-F.ROOT-SERVERS.NET.      3600000      A     192.5.5.241
-F.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2f::f
-; 
-; FORMERLY NS.NIC.DDN.MIL
-;
-.                        3600000      NS    G.ROOT-SERVERS.NET.
-G.ROOT-SERVERS.NET.      3600000      A     192.112.36.4
-G.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:12::d0d
-; 
-; FORMERLY AOS.ARL.ARMY.MIL
-;
-.                        3600000      NS    H.ROOT-SERVERS.NET.
-H.ROOT-SERVERS.NET.      3600000      A     198.97.190.53
-H.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:1::53
-; 
-; FORMERLY NIC.NORDU.NET
-;
-.                        3600000      NS    I.ROOT-SERVERS.NET.
-I.ROOT-SERVERS.NET.      3600000      A     192.36.148.17
-I.ROOT-SERVERS.NET.      3600000      AAAA  2001:7fe::53
-; 
-; OPERATED BY VERISIGN, INC.
-;
-.                        3600000      NS    J.ROOT-SERVERS.NET.
-J.ROOT-SERVERS.NET.      3600000      A     192.58.128.30
-J.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:c27::2:30
-; 
-; OPERATED BY RIPE NCC
-;
-.                        3600000      NS    K.ROOT-SERVERS.NET.
-K.ROOT-SERVERS.NET.      3600000      A     193.0.14.129
-K.ROOT-SERVERS.NET.      3600000      AAAA  2001:7fd::1
-; 
-; OPERATED BY ICANN
-;
-.                        3600000      NS    L.ROOT-SERVERS.NET.
-L.ROOT-SERVERS.NET.      3600000      A     199.7.83.42
-L.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:9f::42
-; 
-; OPERATED BY WIDE
-;
-.                        3600000      NS    M.ROOT-SERVERS.NET.
-M.ROOT-SERVERS.NET.      3600000      A     202.12.27.33
-M.ROOT-SERVERS.NET.      3600000      AAAA  2001:dc3::35
-; End of file
diff --git a/dns/bind911/files/patch-bin_named_include_named_globals.h b/dns/bind911/files/patch-bin_named_include_named_globals.h
deleted file mode 100644
index bcd09ee23fa0..000000000000
--- a/dns/bind911/files/patch-bin_named_include_named_globals.h
+++ /dev/null
@@ -1,13 +0,0 @@
-We reference the pid file as being run/named/pid everywere else.
-
---- bin/named/include/named/globals.h.orig	2019-02-05 00:06:43 UTC
-+++ bin/named/include/named/globals.h
-@@ -139,7 +139,7 @@ EXTERN bool		ns_g_forcelock		INIT(false);
- #if NS_RUN_PID_DIR
- EXTERN const char *		ns_g_defaultpidfile 	INIT(NS_LOCALSTATEDIR
- 							     "/run/named/"
--							     "named.pid");
-+							     "pid");
- EXTERN const char *		lwresd_g_defaultpidfile INIT(NS_LOCALSTATEDIR
- 							     "/run/lwresd/"
- 							     "lwresd.pid");
diff --git a/dns/bind911/files/patch-bin_tests_system_dlzexternal_Makefile.in b/dns/bind911/files/patch-bin_tests_system_dlzexternal_Makefile.in
deleted file mode 100644
index 5a9b0160f9e4..000000000000
--- a/dns/bind911/files/patch-bin_tests_system_dlzexternal_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-BIND9 seems to be abusing LDFLAGS here, and it breaks our linker.
-
---- bin/tests/system/dlzexternal/Makefile.in.orig	2018-06-10 06:06:33 UTC
-+++ bin/tests/system/dlzexternal/Makefile.in
-@@ -34,7 +34,7 @@ OBJS =
- @BIND9_MAKE_RULES@
- 
- CFLAGS =	@CFLAGS@ @SO_CFLAGS@
--SO_LDFLAGS =	@LDFLAGS@ @SO_LDFLAGS@
-+SO_LDFLAGS =	@SO_LDFLAGS@
- 
- driver.@SO@: ${SO_OBJS}
- 	${LIBTOOL_MODE_LINK} @SO_LD@ ${SO_LDFLAGS} -o $@ driver.@O@
diff --git a/dns/bind911/files/patch-configure b/dns/bind911/files/patch-configure
deleted file mode 100644
index 4c0a1ea036fd..000000000000
--- a/dns/bind911/files/patch-configure
+++ /dev/null
@@ -1,135 +0,0 @@
-- Axe the kerberos/gssapi discovery code to make sure it uses the correct
-  libraries.
-- Make sure only json-c is detected.
-- Cleanup the BDB discovery code to find more recent versions.
-
---- configure.orig	2021-10-11 19:35:49 UTC
-+++ configure
-@@ -15691,27 +15691,9 @@ done
- 		# problems start to show up.
- 		saved_libs="$LIBS"
- 		for TRY_LIBS in \
--		    "-lgssapi_krb5" \
--		    "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" \
--		    "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv" \
--		    "-lgssapi" \
--		    "-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \
--		    "-lgssapi -lkrb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \
--		    "-lgssapi -lkrb5 -lgssapi_krb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \
--		    "-lgssapi -lkrb5 -lhx509 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \
--		    "-lgss -lkrb5"
-+		    "$($KRB5CONFIG gssapi --libs)"; \
- 		do
--		    # Note that this does not include $saved_libs, because
--		    # on FreeBSD machines this configure script has added
--		    # -L/usr/local/lib to LIBS, which can make the
--		    # -lgssapi_krb5 test succeed with shared libraries even
--		    # when you are trying to build with KTH in /usr/lib.
--		    if test "/usr" = "$use_gssapi"
--		    then
--			    LIBS="$TRY_LIBS"
--		    else
--			    LIBS="-L$use_gssapi/lib $TRY_LIBS"
--		    fi
-+		    LIBS="$TRY_LIBS"
- 		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5
- $as_echo_n "checking linking as $TRY_LIBS... " >&6; }
- 		    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -15754,47 +15736,7 @@ $as_echo "no" >&6; } ;;
- 		no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
- 		esac
- 
--		#
--		# XXXDCL Major kludge.  Tries to cope with KTH in /usr/lib
--		# but MIT in /usr/local/lib and trying to build with KTH.
--		# /usr/local/lib can end up earlier on the link lines.
--		# Like most kludges, this one is not only inelegant it
--		# is also likely to be the wrong thing to do at least as
--		# many times as it is the right thing.  Something better
--		# needs to be done.
--		#
--		if test "/usr" = "$use_gssapi" -a \
--			-f /usr/local/lib/libkrb5.a; then
--		    FIX_KTH_VS_MIT=yes
--		fi
--
--		case "$FIX_KTH_VS_MIT" in
--		yes)
--		    case "$enable_static_linking" in
--		    yes) gssapi_lib_suffix=".a"  ;;
--		    *)   gssapi_lib_suffix=".so" ;;
--		    esac
--
--		    for lib in $LIBS; do
--			case $lib in
--			-L*)
--			    ;;
--			-l*)
--			    new_lib=`echo $lib |
--				     sed -e s%^-l%$use_gssapi/lib/lib% \
--					 -e s%$%$gssapi_lib_suffix%`
--			    NEW_LIBS="$NEW_LIBS $new_lib"
--			    ;;
--			*)
--			   as_fn_error $? "KTH vs MIT Kerberos confusion!" "$LINENO" 5
--			    ;;
--			esac
--		    done
--		    LIBS="$NEW_LIBS"
--		    ;;
--		esac
--
--		DST_GSSAPI_INC="-I$use_gssapi/include"
-+		DST_GSSAPI_INC="$($KRB5CONFIG gssapi --cflags)"
- 		DNS_GSSAPI_LIBS="$LIBS"
- 
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -18669,7 +18611,7 @@ case "$use_libjson" in
- 	auto|yes)
- 		for d in /usr /usr/local /opt/local
- 		do
--			if test -f "${d}/include/json/json.h"
-+			if test -f "${d}/include/json-c/json.h"
- 			then
- 				if test ${d} != /usr
- 				then
-@@ -18677,29 +18619,16 @@ case "$use_libjson" in
- 					LIBS="$LIBS -L${d}/lib"
- 				fi
- 				have_libjson="yes"
--			elif test -f "${d}/include/json-c/json.h"
--			then
--				if test ${d} != /usr
--				then
--					libjson_cflags="-I ${d}/include"
--					LIBS="$LIBS -L${d}/lib"
--				fi
--				have_libjson="yes"
- 				have_libjson_c="yes"
- 			fi
- 		done
- 		;;
- 	*)
--		if test -f "${use_libjson}/include/json/json.h"
-+		if test -f "${use_libjson}/include/json-c/json.h"
- 		then
- 			libjson_cflags="-I${use_libjson}/include"
- 			LIBS="$LIBS -L${use_libjson}/lib"
- 			have_libjson="yes"
--		elif test -f "${use_libjson}/include/json-c/json.h"
--		then
--			libjson_cflags="-I${use_libjson}/include"
--			LIBS="$LIBS -L${use_libjson}/lib"
--			have_libjson="yes"
- 			have_libjson_c="yes"
- 		else
- 			as_fn_error $? "$use_libjson/include/json{,-c}/json.h not found." "$LINENO" 5
-@@ -24966,7 +24895,7 @@ $as_echo "" >&6; }
- 			# Check other locations for includes.
- 			# Order is important (sigh).
- 
--			bdb_incdirs="/db53 /db51 /db48 /db47 /db46 /db45 /db44 /db43 /db42 /db41 /db4 /db"
-+			bdb_incdirs="/db6 /db5 /db48"
- 			# include a blank element first
- 			for d in "" $bdb_incdirs
- 			do
diff --git a/dns/bind911/files/patch-no-bind-tools b/dns/bind911/files/patch-no-bind-tools
deleted file mode 100644
index 226cc6a4b555..000000000000
--- a/dns/bind911/files/patch-no-bind-tools
+++ /dev/null
@@ -1,55 +0,0 @@
-Exclude the "tools" from building and installing.
-
---- bin/Makefile.in.orig	2019-07-09 12:22:41 UTC
-+++ bin/Makefile.in
-@@ -11,7 +11,7 @@ srcdir =	@srcdir@
- VPATH =		@srcdir@
- top_srcdir =	@top_srcdir@
- 
--SUBDIRS =	named rndc dig delv dnssec tools nsupdate check confgen \
-+SUBDIRS =	named rndc tools check confgen \
- 		@NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ tests
- TARGETS =
- 
---- bin/tools/Makefile.in.orig	2019-07-09 12:22:41 UTC
-+++ bin/tools/Makefile.in
-@@ -43,10 +43,7 @@ SUBDIRS =
- 
- DNSTAPTARGETS =	dnstap-read@EXEEXT@
- NZDTARGETS =	named-nzd2nzf@EXEEXT@
--TARGETS =	arpaname@EXEEXT@ named-journalprint@EXEEXT@ \
--		named-rrchecker@EXEEXT@  nsec3hash@EXEEXT@ \
--		genrandom@EXEEXT@ isc-hmac-fixup@EXEEXT@ mdig@EXEEXT@ \
--		@DNSTAPTARGETS@ @NZDTARGETS@
-+TARGETS =	@DNSTAPTARGETS@ @NZDTARGETS@
- 
- DNSTAPSRCS  =	dnstap-read.c
- NZDSRCS  =	named-nzd2nzf.c
-@@ -131,27 +128,6 @@ dnstap:
- 	${INSTALL_DATA} ${srcdir}/dnstap-read.1 ${DESTDIR}${mandir}/man1
- 
- install:: ${TARGETS} installdirs @DNSTAP@ @NZD_TOOLS@
--	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} arpaname@EXEEXT@ \
--		${DESTDIR}${bindir}
--	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-journalprint@EXEEXT@ \
--		${DESTDIR}${sbindir}
--	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named-rrchecker@EXEEXT@ \
--		${DESTDIR}${bindir}
--	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} nsec3hash@EXEEXT@ \
--		${DESTDIR}${sbindir}
--	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} genrandom@EXEEXT@ \
--		${DESTDIR}${sbindir}
--	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} isc-hmac-fixup@EXEEXT@ \
--		${DESTDIR}${sbindir}
--	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} mdig@EXEEXT@ \
--		${DESTDIR}${bindir}
--	${INSTALL_DATA} ${srcdir}/arpaname.1 ${DESTDIR}${mandir}/man1
--	${INSTALL_DATA} ${srcdir}/isc-hmac-fixup.8 ${DESTDIR}${mandir}/man8
--	${INSTALL_DATA} ${srcdir}/named-journalprint.8 ${DESTDIR}${mandir}/man8
--	${INSTALL_DATA} ${srcdir}/named-rrchecker.1 ${DESTDIR}${mandir}/man1
--	${INSTALL_DATA} ${srcdir}/nsec3hash.8 ${DESTDIR}${mandir}/man8
--	${INSTALL_DATA} ${srcdir}/genrandom.8 ${DESTDIR}${mandir}/man8
--	${INSTALL_DATA} ${srcdir}/mdig.1 ${DESTDIR}${mandir}/man1
- 
- uninstall::
- 	rm -f ${DESTDIR}${mandir}/man1/mdig.1
diff --git a/dns/bind911/files/pkg-message.in b/dns/bind911/files/pkg-message.in
deleted file mode 100644
index 1150a96522ff..000000000000
--- a/dns/bind911/files/pkg-message.in
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-{
-# %!fmt 59 63
-  message: <<EOT
-BIND requires configuration of rndc, including a "secret"
-key.  The easiest, and most secure way to configure rndc is
-to run 'rndc-confgen -a' to generate the proper conf file,
-with a new random key, and appropriate file permissions.
-
-The %%PREFIX%%/etc/rc.d/named script will do that for you.
-
-If using syslog to log the BIND9 activity, and using a
-chroot'ed installation, you will need to tell syslog to install
-a log socket in the BIND9 chroot by running:
-
-  # sysrc altlog_proglist+=named
-
-And then restarting syslogd with: service syslogd restart
-EOT
-  type: install
-}
-]
diff --git a/dns/bind911/pkg-descr b/dns/bind911/pkg-descr
deleted file mode 100644
index ed414272a5ac..000000000000
--- a/dns/bind911/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-BIND version 9 is a major rewrite of nearly all aspects of the underlying BIND
-architecture.  Some of the important features of BIND 9 are:
-
-DNS Security: DNSSEC (signed zones), TSIG (signed DNS requests)
-IP version 6: Answers DNS queries on IPv6 sockets, IPv6 resource records (AAAA)
-     Experimental IPv6 Resolver Library
-DNS Protocol Enhancements: IXFR, DDNS, Notify, EDNS0
-     Improved standards conformance
-Views: One server process can provide multiple "views" of the DNS namespace,
-     e.g. an "inside" view to certain clients, and an "outside" view to others.
-Multiprocessor Support
-
-See the CHANGES file for more information on new features.
-
-WWW: https://www.isc.org/bind/
diff --git a/dns/bind911/pkg-help b/dns/bind911/pkg-help
deleted file mode 100644
index 5539e5745c0e..000000000000
--- a/dns/bind911/pkg-help
+++ /dev/null
@@ -1,28 +0,0 @@
-                       NATIVE_PKCS11
-When using the NATIVE_PKCS11 option, BIND will use the PKCS#11
-engine specified by the named_pkcss11_engine variable in
-/etc/rc.conf for *all* crypto operations.
-
-This is primarily intended to be used in an authoritative
-case.
-
-If BIND is also operating as a validating resolver,
-NATIVE_PKCS11 should not be used, because the HSM will be
-used for all crypto, including DNSSEC validations, and the
-HSM is likely to be slower than the CPU for this purpose.
-Additionally, the HSM might not support all of the PKCS#11
-API functions needed for signature verification.
-
-
-                         START_LATE
-Most of the time, BIND needs to start early in the boot
-process.  Enable this if BIND starts too early for you and
-you need it to start later.
-
-
-                        TUNING_LARGE
-           https://kb.isc.org/article/AA-01314/0
-Tunes certain compiled-in constants and default settings to
-values better suited to large servers with 12/16GB+ of memory.
-This can improve performance on such servers, but will consume
-more memory and may degrade performance on smaller systems.
diff --git a/dns/bind911/pkg-plist b/dns/bind911/pkg-plist
deleted file mode 100644
index 86422256566d..000000000000
--- a/dns/bind911/pkg-plist
+++ /dev/null
@@ -1,402 +0,0 @@
-bin/bind9-config
-%%DNSTAP%%bin/dnstap-read
-bin/isc-config.sh
-@sample etc/mtree/BIND.chroot.dist.sample
-@sample etc/mtree/BIND.chroot.local.dist.sample
-%%ETCDIR%%/bind.keys
-%%ETCDIR%%/master/empty.db
-%%ETCDIR%%/master/localhost-forward.db
-%%ETCDIR%%/master/localhost-reverse.db
-@sample %%ETCDIR%%/named.conf.sample
-%%ETCDIR%%/named.root
-%%ETCDIR%%/rndc.conf.sample
-include/bind9/check.h
-include/bind9/getaddresses.h
-include/bind9/version.h
-include/dns/acache.h
-include/dns/acl.h
-include/dns/adb.h
-include/dns/badcache.h
-include/dns/bit.h
-include/dns/byaddr.h
-include/dns/cache.h
-include/dns/callbacks.h
-include/dns/catz.h
-include/dns/cert.h
-include/dns/client.h
-include/dns/clientinfo.h
-include/dns/compress.h
-include/dns/db.h
-include/dns/dbiterator.h
-include/dns/dbtable.h
-include/dns/diff.h
-include/dns/dispatch.h
-include/dns/dlz.h
-include/dns/dlz_dlopen.h
-include/dns/dns64.h
-include/dns/dnssec.h
-include/dns/dnstap.h
-include/dns/ds.h
-include/dns/dsdigest.h
-include/dns/dyndb.h
-include/dns/ecdb.h
-include/dns/edns.h
-include/dns/enumclass.h
-include/dns/enumtype.h
-include/dns/events.h
-include/dns/fixedname.h
-include/dns/forward.h
-include/dns/geoip.h
-include/dns/ipkeylist.h
-include/dns/iptable.h
-include/dns/journal.h
-include/dns/keydata.h
-include/dns/keyflags.h
-include/dns/keytable.h
-include/dns/keyvalues.h
-include/dns/lib.h
-include/dns/log.h
-include/dns/lookup.h
-include/dns/master.h
-include/dns/masterdump.h
-include/dns/message.h
-include/dns/name.h
-include/dns/ncache.h
-include/dns/nsec.h
-include/dns/nsec3.h
-include/dns/nta.h
-include/dns/opcode.h
-include/dns/order.h
-include/dns/peer.h
-include/dns/portlist.h
-include/dns/private.h
-include/dns/rbt.h
-include/dns/rcode.h
-include/dns/rdata.h
-include/dns/rdataclass.h
-include/dns/rdatalist.h
-include/dns/rdataset.h
-include/dns/rdatasetiter.h
-include/dns/rdataslab.h
-include/dns/rdatastruct.h
-include/dns/rdatatype.h
-include/dns/request.h
-include/dns/resolver.h
-include/dns/result.h
-include/dns/rootns.h
-include/dns/rpz.h
-include/dns/rriterator.h
-include/dns/rrl.h
-include/dns/sdb.h
-include/dns/sdlz.h
-include/dns/secalg.h
-include/dns/secproto.h
-include/dns/soa.h
-include/dns/ssu.h
-include/dns/stats.h
-include/dns/tcpmsg.h
-include/dns/time.h
-include/dns/timer.h
-include/dns/tkey.h
-include/dns/tsec.h
-include/dns/tsig.h
-include/dns/ttl.h
-include/dns/types.h
-include/dns/update.h
-include/dns/validator.h
-include/dns/version.h
-include/dns/view.h
-include/dns/xfrin.h
-include/dns/zone.h
-include/dns/zonekey.h
-include/dns/zt.h
-include/dst/dst.h
-include/dst/gssapi.h
-include/dst/lib.h
-include/dst/result.h
-include/irs/context.h
-include/irs/dnsconf.h
-include/irs/netdb.h
-include/irs/platform.h
-include/irs/resconf.h
-include/irs/types.h
-include/irs/version.h
-include/isc/aes.h
-include/isc/app.h
-include/isc/assertions.h
-include/isc/atomic.h
-include/isc/backtrace.h
-include/isc/base32.h
-include/isc/base64.h
-include/isc/bind9.h
-include/isc/boolean.h
-include/isc/buffer.h
-include/isc/bufferlist.h
-include/isc/cmocka.h
-include/isc/commandline.h
-include/isc/condition.h
-include/isc/counter.h
-include/isc/crc64.h
-include/isc/deprecated.h
-include/isc/dir.h
-include/isc/endian.h
-include/isc/entropy.h
-include/isc/errno.h
-include/isc/error.h
-include/isc/event.h
-include/isc/eventclass.h
-include/isc/file.h
-include/isc/formatcheck.h
-include/isc/fsaccess.h
-include/isc/hash.h
-include/isc/heap.h
-include/isc/hex.h
-include/isc/hmacmd5.h
-include/isc/hmacsha.h
-include/isc/ht.h
-include/isc/httpd.h
-include/isc/int.h
-include/isc/interfaceiter.h
-include/isc/iterated_hash.h
-include/isc/json.h
-include/isc/keyboard.h
-include/isc/lang.h
-include/isc/lex.h
-include/isc/lfsr.h
-include/isc/lib.h
-include/isc/likely.h
-include/isc/list.h
-include/isc/log.h
-include/isc/magic.h
-include/isc/md5.h
-include/isc/mem.h
-include/isc/meminfo.h
-include/isc/msgcat.h
-include/isc/msgs.h
-include/isc/mutex.h
-include/isc/mutexblock.h
-include/isc/net.h
-include/isc/netaddr.h
-include/isc/netdb.h
-include/isc/netscope.h
-include/isc/offset.h
-include/isc/once.h
-include/isc/ondestroy.h
-include/isc/os.h
-include/isc/parseint.h
-include/isc/platform.h
-include/isc/pool.h
-include/isc/portset.h
-include/isc/print.h
-include/isc/queue.h
-include/isc/quota.h
-include/isc/radix.h
-include/isc/random.h
-include/isc/ratelimiter.h
-include/isc/refcount.h
-include/isc/regex.h
-include/isc/region.h
-include/isc/resource.h
-include/isc/result.h
-include/isc/resultclass.h
-include/isc/rwlock.h
-include/isc/safe.h
-include/isc/serial.h
-include/isc/sha1.h
-include/isc/sha2.h
-include/isc/siphash.h
-include/isc/sockaddr.h
-include/isc/socket.h
-include/isc/stat.h
-include/isc/stats.h
-include/isc/stdatomic.h
-include/isc/stdio.h
-include/isc/stdlib.h
-include/isc/stdtime.h
-include/isc/strerror.h
-include/isc/string.h
-include/isc/symtab.h
-include/isc/syslog.h
-include/isc/task.h
-include/isc/taskpool.h
-include/isc/thread.h
-include/isc/time.h
-include/isc/timer.h
-include/isc/tm.h
-include/isc/types.h
-include/isc/utf8.h
-include/isc/util.h
-include/isc/version.h
-include/isc/xml.h
-include/isccc/alist.h
-include/isccc/base64.h
-include/isccc/cc.h
-include/isccc/ccmsg.h
-include/isccc/events.h
-include/isccc/lib.h
-include/isccc/result.h
-include/isccc/sexpr.h
-include/isccc/symtab.h
-include/isccc/symtype.h
-include/isccc/types.h
-include/isccc/util.h
-include/isccc/version.h
-include/isccfg/aclconf.h
-include/isccfg/cfg.h
-include/isccfg/dnsconf.h
-include/isccfg/grammar.h
-include/isccfg/log.h
-include/isccfg/namedconf.h
-include/isccfg/version.h
-include/lwres/context.h
-include/lwres/int.h
-include/lwres/ipv6.h
-include/lwres/lang.h
-include/lwres/list.h
-include/lwres/lwbuffer.h
-include/lwres/lwpacket.h
-include/lwres/lwres.h
-include/lwres/net.h
-include/lwres/netdb.h
-include/lwres/platform.h
-include/lwres/result.h
-include/lwres/stdlib.h
-include/lwres/string.h
-include/lwres/version.h
-include/pk11/constants.h
-include/pk11/internal.h
-include/pk11/pk11.h
-include/pk11/result.h
-include/pk11/site.h
-include/pkcs11/cryptoki.h
-include/pkcs11/eddsa.h
-include/pkcs11/pkcs11.h
-lib/libbind9.a
-lib/libdns.a
-lib/libirs.a
-lib/libisc.a
-lib/libisccc.a
-lib/libisccfg.a
-lib/liblwres.a
-man/man1/bind9-config.1.gz
-%%DNSTAP%%man/man1/dnstap-read.1.gz
-man/man1/isc-config.sh.1.gz
-man/man3/lwres.3.gz
-man/man3/lwres_addr_parse.3.gz
-man/man3/lwres_buffer.3.gz
-man/man3/lwres_buffer_add.3.gz
-man/man3/lwres_buffer_back.3.gz
-man/man3/lwres_buffer_clear.3.gz
-man/man3/lwres_buffer_first.3.gz
-man/man3/lwres_buffer_forward.3.gz
-man/man3/lwres_buffer_getmem.3.gz
-man/man3/lwres_buffer_getuint16.3.gz
-man/man3/lwres_buffer_getuint32.3.gz
-man/man3/lwres_buffer_getuint8.3.gz
-man/man3/lwres_buffer_init.3.gz
-man/man3/lwres_buffer_invalidate.3.gz
-man/man3/lwres_buffer_putmem.3.gz
-man/man3/lwres_buffer_putuint16.3.gz
-man/man3/lwres_buffer_putuint32.3.gz
-man/man3/lwres_buffer_putuint8.3.gz
-man/man3/lwres_buffer_subtract.3.gz
-man/man3/lwres_conf_clear.3.gz
-man/man3/lwres_conf_get.3.gz
-man/man3/lwres_conf_init.3.gz
-man/man3/lwres_conf_parse.3.gz
-man/man3/lwres_conf_print.3.gz
-man/man3/lwres_config.3.gz
-man/man3/lwres_context.3.gz
-man/man3/lwres_context_allocmem.3.gz
-man/man3/lwres_context_create.3.gz
-man/man3/lwres_context_destroy.3.gz
-man/man3/lwres_context_freemem.3.gz
-man/man3/lwres_context_initserial.3.gz
-man/man3/lwres_context_nextserial.3.gz
-man/man3/lwres_context_sendrecv.3.gz
-man/man3/lwres_endhostent.3.gz
-man/man3/lwres_endhostent_r.3.gz
-man/man3/lwres_freeaddrinfo.3.gz
-man/man3/lwres_freehostent.3.gz
-man/man3/lwres_gabn.3.gz
-man/man3/lwres_gabnrequest_free.3.gz
-man/man3/lwres_gabnrequest_parse.3.gz
-man/man3/lwres_gabnrequest_render.3.gz
-man/man3/lwres_gabnresponse_free.3.gz
-man/man3/lwres_gabnresponse_parse.3.gz
-man/man3/lwres_gabnresponse_render.3.gz
-man/man3/lwres_gai_strerror.3.gz
-man/man3/lwres_getaddrinfo.3.gz
-man/man3/lwres_getaddrsbyname.3.gz
-man/man3/lwres_gethostbyaddr.3.gz
-man/man3/lwres_gethostbyaddr_r.3.gz
-man/man3/lwres_gethostbyname.3.gz
-man/man3/lwres_gethostbyname2.3.gz
-man/man3/lwres_gethostbyname_r.3.gz
-man/man3/lwres_gethostent.3.gz
-man/man3/lwres_gethostent_r.3.gz
-man/man3/lwres_getipnode.3.gz
-man/man3/lwres_getipnodebyaddr.3.gz
-man/man3/lwres_getipnodebyname.3.gz
-man/man3/lwres_getnamebyaddr.3.gz
-man/man3/lwres_getnameinfo.3.gz
-man/man3/lwres_getrrsetbyname.3.gz
-man/man3/lwres_gnba.3.gz
-man/man3/lwres_gnbarequest_free.3.gz
-man/man3/lwres_gnbarequest_parse.3.gz
-man/man3/lwres_gnbarequest_render.3.gz
-man/man3/lwres_gnbaresponse_free.3.gz
-man/man3/lwres_gnbaresponse_parse.3.gz
-man/man3/lwres_gnbaresponse_render.3.gz
-man/man3/lwres_herror.3.gz
-man/man3/lwres_hstrerror.3.gz
-man/man3/lwres_inetntop.3.gz
-man/man3/lwres_lwpacket_parseheader.3.gz
-man/man3/lwres_lwpacket_renderheader.3.gz
-man/man3/lwres_net_ntop.3.gz
-man/man3/lwres_noop.3.gz
-man/man3/lwres_nooprequest_free.3.gz
-man/man3/lwres_nooprequest_parse.3.gz
-man/man3/lwres_nooprequest_render.3.gz
-man/man3/lwres_noopresponse_free.3.gz
-man/man3/lwres_noopresponse_parse.3.gz
-man/man3/lwres_noopresponse_render.3.gz
-man/man3/lwres_packet.3.gz
-man/man3/lwres_resutil.3.gz
-man/man3/lwres_sethostent.3.gz
-man/man3/lwres_sethostent_r.3.gz
-man/man3/lwres_string_parse.3.gz
-man/man5/named.conf.5.gz
-man/man5/rndc.conf.5.gz
-man/man8/ddns-confgen.8.gz
-man/man8/lwresd.8.gz
-man/man8/named-checkconf.8.gz
-man/man8/named-checkzone.8.gz
-man/man8/named-compilezone.8.gz
-%%LMDB%%man/man8/named-nzd2nzf.8.gz
-man/man8/named.8.gz
-%%NATIVE_PKCS11%%man/man8/pkcs11-destroy.8.gz
-%%NATIVE_PKCS11%%man/man8/pkcs11-keygen.8.gz
-%%NATIVE_PKCS11%%man/man8/pkcs11-list.8.gz
-%%NATIVE_PKCS11%%man/man8/pkcs11-tokens.8.gz
-man/man8/rndc-confgen.8.gz
-man/man8/rndc.8.gz
-man/man8/tsig-keygen.8.gz
-sbin/ddns-confgen
-sbin/lwresd
-sbin/named
-sbin/named-checkconf
-sbin/named-checkzone
-sbin/named-compilezone
-%%LMDB%%sbin/named-nzd2nzf
-%%NATIVE_PKCS11%%sbin/pkcs11-destroy
-%%NATIVE_PKCS11%%sbin/pkcs11-keygen
-%%NATIVE_PKCS11%%sbin/pkcs11-list
-%%NATIVE_PKCS11%%sbin/pkcs11-tokens
-sbin/rndc
-sbin/rndc-confgen
-sbin/tsig-keygen
-@dir(bind,bind,) %%ETCDIR%%/dynamic
-@dir %%ETCDIR%%/master
-@dir(bind,bind,) %%ETCDIR%%/slave
-@dir(bind,bind,) %%ETCDIR%%/working
diff --git a/games/Makefile b/games/Makefile
index bdea9f43bafd..8b5761a81d8c 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -590,7 +590,6 @@
     SUBDIR += madbomber
     SUBDIR += maelstrom
     SUBDIR += magiccube4d
-    SUBDIR += magicmaze
     SUBDIR += mahjong
     SUBDIR += maitretarot
     SUBDIR += manaplus
@@ -925,7 +924,6 @@
     SUBDIR += stockfish
     SUBDIR += stonesoup
     SUBDIR += stormbaancoureur
-    SUBDIR += stransball2
     SUBDIR += stratagus
     SUBDIR += stuntrally
     SUBDIR += sudsol
@@ -974,7 +972,6 @@
     SUBDIR += trimines
     SUBDIR += triplane
     SUBDIR += trojka
-    SUBDIR += trophy
     SUBDIR += tsito
     SUBDIR += tt
     SUBDIR += ttt
diff --git a/games/magicmaze/Makefile b/games/magicmaze/Makefile
deleted file mode 100644
index 72858de5d159..000000000000
--- a/games/magicmaze/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# Created by: Rusmir Dusko <nemysis@FreeBSD.org>
-
-PORTNAME=	magicmaze
-DISTVERSION=	1_4_3_6
-PORTREVISION=	4
-CATEGORIES=	games ruby
-MASTER_SITES=	SF/nemysisfreebsdp/${CATEGORIES}/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Simple and low-tech monster-bashing maze game
-
-LICENSE=	GPLv2+ RUBY
-LICENSE_COMB=	dual
-LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING_GPL.txt
-
-DEPRECATED=	Depends on expired devel/sdl_sge
-EXPIRATION_DATE=2021-12-31
-
-RUN_DEPENDS=	ruby${RUBY_SUFFIX}-sdl>=0:devel/ruby-sdl
-
-USES=		sdl shebangfix
-SHEBANG_FILES=	mm.rb testmm.rb
-USE_SDL=	sdl image mixer
-USE_RUBY=	yes
-NO_BUILD=	yes
-NO_ARCH=	yes
-
-SUB_FILES=	${PORTNAME}
-SUB_LIST=	RUBY=${RUBY}
-
-PORTDOCS=	*
-
-DESKTOP_ENTRIES="Magic Maze" "" "${PORTNAME}" \
-		"${PORTNAME}" "Game;ArcadeGame;" ""
-
-OPTIONS_DEFINE=	DOCS
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "data magicmaze" ${STAGEDIR}${DATADIR})
-	${INSTALL_SCRIPT} ${WRKSRC}/*.rb ${STAGEDIR}${DATADIR}
-	${LN} -sf ../../${DATADIR_REL}/data/gfx/icon.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
-
-do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.TXT ${WRKSRC}/doc/BUGS.TXT \
-		${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/games/magicmaze/distinfo b/games/magicmaze/distinfo
deleted file mode 100644
index e21f1589ad15..000000000000
--- a/games/magicmaze/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (magicmaze-1_4_3_6.tar.gz) = a8689e5f4210314ee1b3dc7b2a19e7b7c95bf94eb06f29418b98dfe383130624
-SIZE (magicmaze-1_4_3_6.tar.gz) = 130065
diff --git a/games/magicmaze/files/magicmaze.in b/games/magicmaze/files/magicmaze.in
deleted file mode 100644
index 46041ebf609a..000000000000
--- a/games/magicmaze/files/magicmaze.in
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd "%%DATADIR%%"
-exec %%RUBY%% mm.rb "${@}"
diff --git a/games/magicmaze/pkg-descr b/games/magicmaze/pkg-descr
deleted file mode 100644
index bd1a6e654852..000000000000
--- a/games/magicmaze/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Magic Maze is a simple and low-tech monster-bashing maze game.
-
-It was originally inspired by playing Gauntlet II on the Atari ST.
-
-WWW: https://web.archive.org/web/20130902083902/http://magicmaze.rubyforge.org/
diff --git a/games/magicmaze/pkg-plist b/games/magicmaze/pkg-plist
deleted file mode 100644
index 9ddd452233ca..000000000000
--- a/games/magicmaze/pkg-plist
+++ /dev/null
@@ -1,53 +0,0 @@
-bin/magicmaze
-%%DATADIR%%/data/gfx/background.pcx
-%%DATADIR%%/data/gfx/end.pcx
-%%DATADIR%%/data/gfx/fraktmod.ttf
-%%DATADIR%%/data/gfx/fraktmod.txt
-%%DATADIR%%/data/gfx/icon.png
-%%DATADIR%%/data/gfx/sprites.dat
-%%DATADIR%%/data/gfx/sprites.pcx
-%%DATADIR%%/data/gfx/title.pcx
-%%DATADIR%%/data/maps/mm_map.001
-%%DATADIR%%/data/maps/mm_map.002
-%%DATADIR%%/data/maps/mm_map.003
-%%DATADIR%%/data/maps/mm_map.004
-%%DATADIR%%/data/maps/mm_map.005
-%%DATADIR%%/data/maps/mm_map.006
-%%DATADIR%%/data/maps/mm_map.007
-%%DATADIR%%/data/maps/mm_map.008
-%%DATADIR%%/data/maps/mm_map.009
-%%DATADIR%%/data/maps/mm_map.010
-%%DATADIR%%/data/sound/sound1.wav
-%%DATADIR%%/data/sound/sound2.wav
-%%DATADIR%%/data/sound/sound3.wav
-%%DATADIR%%/data/sound/sound4.wav
-%%DATADIR%%/magicmaze/entity.rb
-%%DATADIR%%/magicmaze/filemap.rb
-%%DATADIR%%/magicmaze/game.rb
-%%DATADIR%%/magicmaze/gameloop.rb
-%%DATADIR%%/magicmaze/graphics.rb
-%%DATADIR%%/magicmaze/images.rb
-%%DATADIR%%/magicmaze/input.rb
-%%DATADIR%%/magicmaze/inventory.rb
-%%DATADIR%%/magicmaze/magicmaze.rb
-%%DATADIR%%/magicmaze/map.rb
-%%DATADIR%%/magicmaze/mapeditor.rb
-%%DATADIR%%/magicmaze/movement.rb
-%%DATADIR%%/magicmaze/player.rb
-%%DATADIR%%/magicmaze/sound.rb
-%%DATADIR%%/magicmaze/spellbook.rb
-%%DATADIR%%/magicmaze/spelltile.rb
-%%DATADIR%%/magicmaze/test_filemap.rb
-%%DATADIR%%/magicmaze/test_game.rb
-%%DATADIR%%/magicmaze/test_graphics.rb
-%%DATADIR%%/magicmaze/test_images.rb
-%%DATADIR%%/magicmaze/test_magicmaze.rb
-%%DATADIR%%/magicmaze/test_map.rb
-%%DATADIR%%/magicmaze/test_movement.rb
-%%DATADIR%%/magicmaze/test_player.rb
-%%DATADIR%%/magicmaze/test_sound.rb
-%%DATADIR%%/magicmaze/test_tile.rb
-%%DATADIR%%/magicmaze/tile.rb
-%%DATADIR%%/mm.rb
-%%DATADIR%%/testmm.rb
-share/pixmaps/magicmaze.png
diff --git a/games/stransball2/Makefile b/games/stransball2/Makefile
deleted file mode 100644
index a5033d5782a7..000000000000
--- a/games/stransball2/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-PORTNAME=	stransball2
-PORTVERSION=	1.5
-PORTREVISION=	10
-CATEGORIES=	games
-MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/ \
-		http://braingames.bugreport.nl/stransball2/
-DISTNAME=	${PORTNAME}-v${PORTVERSION:C/\.//}-linux
-
-MAINTAINER=	amdmi3@FreeBSD.org
-COMMENT=	Sequel to Transball and Transball 2 THRUST-type games
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${BUILD_WRKSRC}/LICENSE
-
-DEPRECATED=	Depends on expired devel/sdl_sge
-EXPIRATION_DATE=2021-12-31
-
-LIB_DEPENDS=	libSGE.so:devel/sdl_sge
-
-USES=		dos2unix gmake sdl zip
-DOS2UNIX_FILES=	sources/main.cpp sources/auxiliar.cpp
-USE_SDL=	sdl image mixer sound
-
-BUILD_WRKSRC=	${WRKSRC}/sources
-
-PLIST_FILES=	bin/${PORTNAME}
-PORTDATA=	*
-PORTDOCS=	*
-
-OPTIONS_DEFINE=	DOCS
-
-post-extract:
-	@${RM} ${WRKSRC}/sound/WS_FTP.LOG
-
-post-patch:
-	@${FIND} ${BUILD_WRKSRC} -name '*.cpp' | ${XARGS} ${REINPLACE_CMD} \
-		-e 's|demos/|${DATADIR}/&|g; s|graphics/|${DATADIR}/&|g; \
-		s|maps/|${DATADIR}/&|g; s|sound/|${DATADIR}/&|g; \
-		s|"maps"|"${DATADIR}/maps"|g'
-
-do-install:
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} 'graphics sound maps demos' ${STAGEDIR}${DATADIR}/
-
-do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}/
-
-.include <bsd.port.mk>
diff --git a/games/stransball2/distinfo b/games/stransball2/distinfo
deleted file mode 100644
index 439bb7fc3fc9..000000000000
--- a/games/stransball2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (stransball2-v15-linux.zip) = 2552a18b4b59c1d39d7a1312e7efbebf5ac89bddc30f5e188693e841516276bc
-SIZE (stransball2-v15-linux.zip) = 302212
diff --git a/games/stransball2/files/patch-sources-Makefile b/games/stransball2/files/patch-sources-Makefile
deleted file mode 100644
index e31bbf573f47..000000000000
--- a/games/stransball2/files/patch-sources-Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
---- sources/Makefile.orig	2005-04-16 21:16:54.000000000 +0400
-+++ sources/Makefile	2008-04-07 01:10:16.000000000 +0400
-@@ -12,12 +12,11 @@
- all: stransball2
- 
- %.o: %.cpp
--	c++ -c -g3 -O3 $< -o $@ `sdl-config --cflags` -I/usr/local/include/SDL
-+	${CXX} ${CXXFLAGS} -c $< -o $@ `${SDL_CONFIG} --cflags`
- 
- # dynamically linked binary:
- stransball2: $(OBJS)
--	c++ $^ -o $@ `sdl-config --libs` -lSDL_image -lSDL_mixer -lSDL_sound -lSDL_sound -lSGE -I/usr/local/include/SDL
--	mv ./stransball2 ..
-+	${CXX} $^ -o $@ `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lSDL_sound -lSGE
- 
- clean:
- 	rm -f stransball2
diff --git a/games/stransball2/files/patch-sources-main.cpp b/games/stransball2/files/patch-sources-main.cpp
deleted file mode 100644
index 858d4995eaaf..000000000000
--- a/games/stransball2/files/patch-sources-main.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
---- sources/main.cpp.orig	2005-04-16 21:16:54.000000000 +0400
-+++ sources/main.cpp	2008-04-07 01:37:52.000000000 +0400
-@@ -6,6 +6,9 @@
- #include <time.h>
- #endif
- 
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include "SDL/SDL.h"
-@@ -126,6 +128,19 @@
- 	setupTickCount();
- #endif
- 
-+	if (chdir(getenv("HOME")) != 0)
-+		return 0;
-+
-+	struct stat sb;
-+	if (stat(".stransball2", &sb) != 0 &&
-+			(mkdir(".stransball2", 0755) != 0 ||
-+			 mkdir(".stransball2/high", 0755) != 0 ||
-+			 mkdir(".stransball2/replays", 0755) != 0))
-+		return 0;
-+
-+	if (chdir(".stransball2") != 0)
-+		return 0;
-+
- 	int time,act_time;
- 	SDL_Event event;
-     bool quit = false;
diff --git a/games/stransball2/files/patch-sources_auxiliar.cpp b/games/stransball2/files/patch-sources_auxiliar.cpp
deleted file mode 100644
index 02c8cdd7ca92..000000000000
--- a/games/stransball2/files/patch-sources_auxiliar.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- sources/auxiliar.cpp.orig	2018-05-14 19:20:42 UTC
-+++ sources/auxiliar.cpp
-@@ -48,7 +48,7 @@ SDL_Surface *load_maskedimage(char *imag
- 	mask=IMG_Load(name);
- 
-     if (tmp==0 ||
--		mask==0) return false;
-+		mask==0) return NULL;
- 
- 	res=SDL_DisplayFormatAlpha(tmp);
- 
diff --git a/games/stransball2/pkg-descr b/games/stransball2/pkg-descr
deleted file mode 100644
index 412032467c3d..000000000000
--- a/games/stransball2/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-"Super Transball 2" is the sequel of "Transball" and "Transball 2",
-Inspired in THRUST type of games (and concretely in ZARA THRUSTA
-for the Amiga 500). In each level of Transball, the goal is to find
-the SPHERE, capture it and carry it to the upper part of the level.
-The main obstacle is the gravity, that impulses you towards the
-ground. But many other obstacles, canons, tanks, doors, etc. will
-try to make difficult your journey...
-
-WWW: http://www.braingames.getput.com/stransball2/default.asp
diff --git a/games/trophy/Makefile b/games/trophy/Makefile
deleted file mode 100644
index 8aaacbe636bf..000000000000
--- a/games/trophy/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# Created by: Jean-Yves Lefort <jylefort@brutele.be>
-
-PORTNAME=	trophy
-PORTVERSION=	2.0.4
-CATEGORIES=	games
-MASTER_SITES=	SF
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Single player racing game
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-DEPRECATED=	Depends on expired devel/clanlib1
-EXPIRATION_DATE=2021-12-31
-
-LIB_DEPENDS=	libclanCore.so:devel/clanlib1
-
-USES=		pkgconfig localbase
-GNU_CONFIGURE=	yes
-
-PORTDOCS=	AUTHORS ChangeLog README TODO
-
-OPTIONS_DEFINE=	DOCS
-
-post-patch:
-	@${REINPLACE_CMD} -e "/^icondir =/s,icons,pixmaps," \
-		${WRKSRC}/resources/Makefile.in
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/games/trophy/distinfo b/games/trophy/distinfo
deleted file mode 100644
index 38fa4e25f28f..000000000000
--- a/games/trophy/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1577800902
-SHA256 (trophy-2.0.4.tar.gz) = e3f6c76bdbb19e4d08f2310b3a0039de575aebfb9c9855e6138c88a0edd476be
-SIZE (trophy-2.0.4.tar.gz) = 14797140
diff --git a/games/trophy/pkg-descr b/games/trophy/pkg-descr
deleted file mode 100644
index 430c2a53a2b1..000000000000
--- a/games/trophy/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Trophy is a single-player racing game. Even though the goal is
-basically to finish the laps as the first, Trophy is an action game
-which offers much more than just a race. Lots of extras enable
-"unusual" features for races such as shooting, putting mines and many
-others.
-
-WWW: http://trophy.sourceforge.net/
diff --git a/games/trophy/pkg-plist b/games/trophy/pkg-plist
deleted file mode 100644
index b4342ce6e9d0..000000000000
--- a/games/trophy/pkg-plist
+++ /dev/null
@@ -1,136 +0,0 @@
-bin/trophy
-man/man6/trophy.6.gz
-share/applications/trophy.desktop
-share/pixmaps/trophy.png
-%%DATADIR%%/cars/dust.tga
-%%DATADIR%%/cars/flash2/surface.tga
-%%DATADIR%%/cars/flash2/surface3d.tga
-%%DATADIR%%/cars/jeep/surface.tga
-%%DATADIR%%/cars/jeep/surface3d.tga
-%%DATADIR%%/cars/vw/surface.tga
-%%DATADIR%%/cars/vw/surface3d.tga
-%%DATADIR%%/cars/z3/surface.tga
-%%DATADIR%%/cars/z3/surface3d.tga
-%%DATADIR%%/fonts/lcd_13_green.tga
-%%DATADIR%%/fonts/normal_11_white.tga
-%%DATADIR%%/fonts/normal_14_white.tga
-%%DATADIR%%/fonts/normal_22_gray.tga
-%%DATADIR%%/fonts/normal_22_white.tga
-%%DATADIR%%/fonts/normal_8_white.tga
-%%DATADIR%%/goody/bullets.tga
-%%DATADIR%%/goody/fogbomb.tga
-%%DATADIR%%/goody/life.tga
-%%DATADIR%%/goody/money.tga
-%%DATADIR%%/goody/turbo.tga
-%%DATADIR%%/gui/arrow_b.tga
-%%DATADIR%%/gui/arrow_l.tga
-%%DATADIR%%/gui/arrow_r.tga
-%%DATADIR%%/gui/arrow_t.tga
-%%DATADIR%%/gui/border1.tga
-%%DATADIR%%/gui/border2.tga
-%%DATADIR%%/gui/border3.tga
-%%DATADIR%%/gui/border4.tga
-%%DATADIR%%/gui/button.tga
-%%DATADIR%%/gui/edge1.tga
-%%DATADIR%%/gui/edge2.tga
-%%DATADIR%%/gui/edge3.tga
-%%DATADIR%%/gui/edge4.tga
-%%DATADIR%%/gui/loading.tga
-%%DATADIR%%/gui/progressbar.tga
-%%DATADIR%%/menu/bar.tga
-%%DATADIR%%/menu/bg.tga
-%%DATADIR%%/menu/cursorani.tga
-%%DATADIR%%/misc/carfire.tga
-%%DATADIR%%/misc/caution.tga
-%%DATADIR%%/misc/checkflag.tga
-%%DATADIR%%/misc/cross.tga
-%%DATADIR%%/misc/dust.tga
-%%DATADIR%%/misc/flag.tga
-%%DATADIR%%/misc/fog.tga
-%%DATADIR%%/misc/gunfire.tga
-%%DATADIR%%/misc/hitpoint.tga
-%%DATADIR%%/misc/info.tga
-%%DATADIR%%/misc/light.tga
-%%DATADIR%%/misc/verticalbar.tga
-%%DATADIR%%/panel/bullets.tga
-%%DATADIR%%/panel/button.tga
-%%DATADIR%%/panel/death.tga
-%%DATADIR%%/panel/infoview.tga
-%%DATADIR%%/panel/label.tga
-%%DATADIR%%/panel/life.tga
-%%DATADIR%%/panel/speed.tga
-%%DATADIR%%/panel/turbo.tga
-%%DATADIR%%/panel/turbolabel.tga
-%%DATADIR%%/resources.xml
-%%DATADIR%%/sounds/background01.wav
-%%DATADIR%%/sounds/carhorn.wav
-%%DATADIR%%/sounds/crash.wav
-%%DATADIR%%/sounds/dog.wav
-%%DATADIR%%/sounds/engine.wav
-%%DATADIR%%/sounds/fire.wav
-%%DATADIR%%/sounds/fogbomb.wav
-%%DATADIR%%/sounds/goody.wav
-%%DATADIR%%/sounds/goody_bullets.wav
-%%DATADIR%%/sounds/goody_fogbomb.wav
-%%DATADIR%%/sounds/goody_life.wav
-%%DATADIR%%/sounds/goody_money.wav
-%%DATADIR%%/sounds/goody_turbo.wav
-%%DATADIR%%/sounds/light.wav
-%%DATADIR%%/sounds/menu.wav
-%%DATADIR%%/sounds/selector.wav
-%%DATADIR%%/sounds/shoot.wav
-%%DATADIR%%/sounds/shot.wav
-%%DATADIR%%/sounds/slide.wav
-%%DATADIR%%/tracks/Downtown/bridge.tga
-%%DATADIR%%/tracks/Downtown/config.tck
-%%DATADIR%%/tracks/Downtown/fmap.tga
-%%DATADIR%%/tracks/Downtown/thumb.tga
-%%DATADIR%%/tracks/Downtown/vmap.tga
-%%DATADIR%%/tracks/Industrial/bridge.tga
-%%DATADIR%%/tracks/Industrial/config.tck
-%%DATADIR%%/tracks/Industrial/fmap.tga
-%%DATADIR%%/tracks/Industrial/thumb.tga
-%%DATADIR%%/tracks/Industrial/vmap.tga
-%%DATADIR%%/tracks/Loops/bridge.tga
-%%DATADIR%%/tracks/Loops/config.tck
-%%DATADIR%%/tracks/Loops/fmap.tga
-%%DATADIR%%/tracks/Loops/thumb.tga
-%%DATADIR%%/tracks/Loops/vmap.tga
-%%DATADIR%%/tracks/Moon/bridge.tga
-%%DATADIR%%/tracks/Moon/config.tck
-%%DATADIR%%/tracks/Moon/fmap.tga
-%%DATADIR%%/tracks/Moon/thumb.tga
-%%DATADIR%%/tracks/Moon/vmap.tga
-%%DATADIR%%/tracks/Rally/config.tck
-%%DATADIR%%/tracks/Rally/fmap.tga
-%%DATADIR%%/tracks/Rally/thumb.tga
-%%DATADIR%%/tracks/Rally/vmap.tga
-%%DATADIR%%/tracks/Snake/bridge.tga
-%%DATADIR%%/tracks/Snake/config.tck
-%%DATADIR%%/tracks/Snake/fmap.tga
-%%DATADIR%%/tracks/Snake/thumb.tga
-%%DATADIR%%/tracks/Snake/vmap.tga
-%%DATADIR%%/tracks/Zigzag/bridge.tga
-%%DATADIR%%/tracks/Zigzag/config.tck
-%%DATADIR%%/tracks/Zigzag/fmap.tga
-%%DATADIR%%/tracks/Zigzag/thumb.tga
-%%DATADIR%%/tracks/Zigzag/vmap.tga
-%%DATADIR%%/tracks/Zurich/config.tck
-%%DATADIR%%/tracks/Zurich/fmap.tga
-%%DATADIR%%/tracks/Zurich/thumb.tga
-%%DATADIR%%/tracks/Zurich/vmap.tga
-%%DATADIR%%/upgrades/armors/armor_1.tga
-%%DATADIR%%/upgrades/armors/armor_2.tga
-%%DATADIR%%/upgrades/armors/armor_3.tga
-%%DATADIR%%/upgrades/armors/armor_4.tga
-%%DATADIR%%/upgrades/armors/armor_5.tga
-%%DATADIR%%/upgrades/motors/motor_1.tga
-%%DATADIR%%/upgrades/motors/motor_2.tga
-%%DATADIR%%/upgrades/motors/motor_3.tga
-%%DATADIR%%/upgrades/motors/motor_4.tga
-%%DATADIR%%/upgrades/motors/motor_5.tga
-%%DATADIR%%/upgrades/tires/tires_1.tga
-%%DATADIR%%/upgrades/tires/tires_2.tga
-%%DATADIR%%/upgrades/tires/tires_3.tga
-%%DATADIR%%/upgrades/tires/tires_4.tga
-%%DATADIR%%/upgrades/tires/tires_5.tga
diff --git a/graphics/Makefile b/graphics/Makefile
index e2261026810d..269eaef1d600 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -490,10 +490,8 @@
     SUBDIR += libprojectm
     SUBDIR += libpuzzle
     SUBDIR += libqrencode
-    SUBDIR += librasterlite
     SUBDIR += librasterlite2
     SUBDIR += libraw
-    SUBDIR += libreatlas
     SUBDIR += librsvg2
     SUBDIR += librsvg2-rust
     SUBDIR += librtprocess
diff --git a/graphics/librasterlite/Makefile b/graphics/librasterlite/Makefile
deleted file mode 100644
index 009588732707..000000000000
--- a/graphics/librasterlite/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Created by: lbartoletti <lbartoletti@FreeBSD.org>
-
-PORTNAME=	librasterlite
-PORTVERSION=	1.1g
-PORTREVISION=	14
-CATEGORIES=	graphics geography
-MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/librasterlite-sources/
-
-MAINTAINER=	lbartoletti@FreeBSD.org
-COMMENT=	Library that stores and retrieves raster coverages using a SpatiaLite
-
-LICENSE=	MPL11 GPLv2 LGPL21
-LICENSE_COMB=	dual
-
-DEPRECATED=	Deprecated in favour of graphics/librasterlite2
-EXPIRATION_DATE=2021-12-31
-
-LIB_DEPENDS=	libspatialite.so:databases/spatialite \
-		libgeotiff.so:graphics/libgeotiff \
-		libjbig.so:graphics/jbigkit \
-		libpng.so:graphics/png \
-		libgeos.so:graphics/geos \
-		libproj.so:graphics/proj \
-		libtiff.so:graphics/tiff \
-		libfreexl.so:textproc/freexl
-
-GNU_CONFIGURE=	yes
-USES=		gmake iconv jpeg libtool pathfix pkgconfig sqlite
-USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib -lsqlite3 -lm
-
-.include <bsd.port.mk>
diff --git a/graphics/librasterlite/distinfo b/graphics/librasterlite/distinfo
deleted file mode 100644
index c7cb4f68b92a..000000000000
--- a/graphics/librasterlite/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (librasterlite-1.1g.tar.gz) = 0a8dceb75f8dec2b7bd678266e0ffd5210d7c33e3d01b247e9e92fa730eebcb3
-SIZE (librasterlite-1.1g.tar.gz) = 629592
diff --git a/graphics/librasterlite/pkg-descr b/graphics/librasterlite/pkg-descr
deleted file mode 100644
index 3798a88d3eed..000000000000
--- a/graphics/librasterlite/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-librasterlite is an open source library that stores and retrieves huge raster
-coverages using a SpatiaLite DBMS.
-
-WWW: https://www.gaia-gis.it/fossil/librasterlite/index
diff --git a/graphics/librasterlite/pkg-plist b/graphics/librasterlite/pkg-plist
deleted file mode 100644
index c0d25be5cec3..000000000000
--- a/graphics/librasterlite/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-bin/rasterlite_grid
-bin/rasterlite_load
-bin/rasterlite_pyramid
-bin/rasterlite_tool
-bin/rasterlite_topmost
-include/rasterlite.h
-lib/librasterlite.a
-lib/librasterlite.so
-lib/librasterlite.so.2
-lib/librasterlite.so.2.0.0
-libdata/pkgconfig/rasterlite.pc
diff --git a/graphics/libreatlas/Makefile b/graphics/libreatlas/Makefile
deleted file mode 100644
index bf6d4ea05134..000000000000
--- a/graphics/libreatlas/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# Created by: lbartoletti <lbartoletti@FreeBSD.org>
-
-PORTNAME=	libreatlas
-PORTVERSION=	1.0.0a
-PORTREVISION=	27
-CATEGORIES=	graphics education geography
-MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/
-
-MAINTAINER=	lbartoletti@FreeBSD.org
-COMMENT=	Open Source Geography Education application
-
-LICENSE=	GPLv3
-
-DEPRECATED=	Abandoned upstream, no new release since 2012
-EXPIRATION_DATE=2021-12-31
-
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs
-LIB_DEPENDS=	libmspack.so:archivers/libmspack \
-		libspatialite.so:databases/spatialite \
-		libpcre.so:devel/pcre \
-		libcairo.so:graphics/cairo \
-		libgeos.so:graphics/geos \
-		libjbig.so:graphics/jbigkit \
-		libgeotiff.so:graphics/libgeotiff \
-		librasterlite.so:graphics/librasterlite \
-		libpng.so:graphics/png \
-		libproj.so:graphics/proj \
-		libtiff.so:graphics/tiff \
-		libfreetype.so:print/freetype2 \
-		libexpat.so:textproc/expat2 \
-		libfreexl.so:textproc/freexl \
-		libfontconfig.so:x11-fonts/fontconfig
-
-GNU_CONFIGURE=	yes
-USES=		compiler:c++11-lang gettext gmake gnome iconv jpeg pathfix \
-	pkgconfig sqlite xorg
-USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
-		xfixes xi xinerama xrandr xrender xxf86vm
-USE_GNOME=	atk gdkpixbuf2 glib20 gtk20 pango
-USE_WX=		2.8
-
-CPPFLAGS+=	-I${LOCALBASE}/include -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1
-LDFLAGS+=	-L${LOCALBASE}/lib
-LIBS+=		-lgeos_c -lsqlite3
-
-PLIST_FILES=	bin/LibreAtlas
-
-DESKTOP_ENTRIES="LibreAtlas" "${COMMENT}" "" "LibreAtlas" \
-		"Graphics;Viewer;" true
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|wx-config|$${WX_CONFIG}|' ${WRKSRC}/configure
-
-.include <bsd.port.mk>
diff --git a/graphics/libreatlas/distinfo b/graphics/libreatlas/distinfo
deleted file mode 100644
index 462dd75f5c57..000000000000
--- a/graphics/libreatlas/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1561510989
-SHA256 (libreatlas-1.0.0a.tar.gz) = f8de0433455d2f033de7cec253f28aa7d2cf26e075234467a607feb1e68a417c
-SIZE (libreatlas-1.0.0a.tar.gz) = 814624
diff --git a/graphics/libreatlas/pkg-descr b/graphics/libreatlas/pkg-descr
deleted file mode 100644
index 39477ac0adcd..000000000000
--- a/graphics/libreatlas/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-LibreAtlas is an open source Geography Education application built on top of
-SpatiaLite and RasterLite. It uses LibreAtlas databases which are a digital
-alternative to a paper atlas.
-
-WWW: https://www.gaia-gis.it/fossil/libreatlas/index
diff --git a/lang/Makefile b/lang/Makefile
index f0ed41a1d47b..3a8415003ba0 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -204,7 +204,6 @@
     SUBDIR += nhc98
     SUBDIR += nickle
     SUBDIR += nim
-    SUBDIR += nml
     SUBDIR += nqc
     SUBDIR += nwcc
     SUBDIR += nx
diff --git a/lang/nml/Makefile b/lang/nml/Makefile
deleted file mode 100644
index c81ac8eb63dc..000000000000
--- a/lang/nml/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# Created by: Jaeho Shin <netj@sparcs.kaist.ac.kr>
-
-PORTNAME=	nml
-PORTVERSION=	0.92b
-CATEGORIES=	lang
-MASTER_SITES=	http://ropas.snu.ac.kr/n/ \
-		http://sparcs.kaist.ac.kr/~netj/n/ \
-		http://ropas.kaist.ac.kr/n/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Dialect/harmony of Standard ML of New Jersey and Objective Caml
-
-BROKEN=		Doesn't compile - PR 234720
-DEPRECATED=	Abandoned upstream, last release 2004-04-19
-EXPIRATION_DATE=2021-12-31
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-0.92
-
-ONLY_FOR_ARCHS=	i386
-MAKE_JOBS_UNSAFE=	yes
-.if ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld
-BROKEN=		ld: error: relocation R_386_PC32 cannot be used against symbol BnnAdd
-.endif
-
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=--prefix ${PREFIX}
-
-USES=		gmake
-ALL_TARGET=	all opt opt.opt
-INSTALL_TARGET=	install installopt
-
-OPTIONS_DEFINE=	DOCS
-
-post-patch:
-	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} \
-		${REINPLACE_CMD} -e 's|gcc|${CC}|'
-	@${REINPLACE_CMD} -e '/freebsd/s/3-9/0-9/; \
-		/aspp=/s|gcc|${CC}|; /mksharedlib=/s|gcc|${CC}|' \
-		${WRKSRC}/configure
-
-do-install:
-	${DO_MAKE_BUILD} -C ${WRKSRC} PREFIX="${STAGEDIR}${PREFIX}" ${INSTALL_TARGET}
-	@${REINPLACE_CMD} -i '' -e 's|${STAGEDIR}||' ${STAGEDIR}${PREFIX}/lib/nml/ld.conf
-	@${MKDIR} ${STAGEDIR}${DATADIR}/contrib/emacs
-	@${MKDIR} ${STAGEDIR}${DATADIR}/contrib/vim
-	${INSTALL_DATA} ${WRKSRC}/contrib/emacs/* ${STAGEDIR}${DATADIR}/contrib/emacs
-	${INSTALL_DATA} ${WRKSRC}/contrib/vim/* ${STAGEDIR}${DATADIR}/contrib/vim
-.for i in ncamlrun nmlc nlex nmakegen nyacc nmlo
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/$i
-.endfor
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Changes ${WRKSRC}/LICENSE ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/lang/nml/distinfo b/lang/nml/distinfo
deleted file mode 100644
index 427ec6edb79b..000000000000
--- a/lang/nml/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (nml-0.92b.tar.gz) = 03b91b1753e81d496bf5268fba5b12c3a54d5ccc1d2ead65334b6653258b1205
-SIZE (nml-0.92b.tar.gz) = 1628806
diff --git a/lang/nml/files/patch-ocaml__byterun__sys.c b/lang/nml/files/patch-ocaml__byterun__sys.c
deleted file mode 100644
index 01b315091350..000000000000
--- a/lang/nml/files/patch-ocaml__byterun__sys.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./ocaml/byterun/sys.c.orig	2014-08-02 13:18:24.000000000 -0400
-+++ ./ocaml/byterun/sys.c	2014-08-02 13:18:48.000000000 -0400
-@@ -71,8 +71,8 @@
- 
- #else
- 
--extern int sys_nerr;
--extern char * sys_errlist [];
-+extern const int sys_nerr;
-+extern const char * const sys_errlist [];
- 
- char * error_message(void)
- {
diff --git a/lang/nml/pkg-descr b/lang/nml/pkg-descr
deleted file mode 100644
index 6cec7f8bbd35..000000000000
--- a/lang/nml/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-- nML is a dialect/harmony of Standard ML of New Jersey and Objective Caml.
-- nML is a higher-order and typed programming language.
-- nML does not stand against the C programming convention.
-
-- nML compiler is a compiler of the nML language
-  using the Objective Caml compiler:
-    nML parser + nML type-checker +
-        nML-to-OCaml translator + the OCaml compiler.
-
-WWW: http://ropas.snu.ac.kr/n
diff --git a/lang/nml/pkg-plist b/lang/nml/pkg-plist
deleted file mode 100644
index 74036b12d06f..000000000000
--- a/lang/nml/pkg-plist
+++ /dev/null
@@ -1,343 +0,0 @@
-bin/ncamlrun
-bin/nlex
-bin/nmakegen
-bin/nml
-bin/nmlc
-bin/nmlo
-bin/ntopgen
-bin/nyacc
-lib/nml/arg.cmi
-lib/nml/arg.cmx
-lib/nml/arg.ml
-lib/nml/arg.mli
-lib/nml/arg.p.cmx
-lib/nml/arith_flags.cmx
-lib/nml/arith_status.cmi
-lib/nml/arith_status.cmx
-lib/nml/arith_status.mli
-lib/nml/array.cmi
-lib/nml/array.cmx
-lib/nml/array.ml
-lib/nml/array.mli
-lib/nml/array.p.cmx
-lib/nml/arrayLabels.cmi
-lib/nml/arrayLabels.cmx
-lib/nml/arrayLabels.ml
-lib/nml/arrayLabels.mli
-lib/nml/arrayLabels.p.cmx
-lib/nml/big_int.cmi
-lib/nml/big_int.cmx
-lib/nml/big_int.mli
-lib/nml/bigarray.a
-lib/nml/bigarray.cma
-lib/nml/bigarray.cmi
-lib/nml/bigarray.cmx
-lib/nml/bigarray.cmxa
-lib/nml/bigarray.mli
-lib/nml/buffer.cmi
-lib/nml/buffer.cmx
-lib/nml/buffer.ml
-lib/nml/buffer.mli
-lib/nml/buffer.p.cmx
-lib/nml/callback.cmi
-lib/nml/callback.cmx
-lib/nml/callback.ml
-lib/nml/callback.mli
-lib/nml/callback.p.cmx
-lib/nml/caml/alloc.h
-lib/nml/caml/bigarray.h
-lib/nml/caml/callback.h
-lib/nml/caml/config.h
-lib/nml/caml/custom.h
-lib/nml/caml/fail.h
-lib/nml/caml/intext.h
-lib/nml/caml/memory.h
-lib/nml/caml/misc.h
-lib/nml/caml/mlvalues.h
-lib/nml/camlheader
-lib/nml/camlheader_ur
-lib/nml/char.cmi
-lib/nml/char.cmx
-lib/nml/char.ml
-lib/nml/char.mli
-lib/nml/char.p.cmx
-lib/nml/condition.mli
-lib/nml/dbm.a
-lib/nml/dbm.cma
-lib/nml/dbm.cmi
-lib/nml/dbm.cmx
-lib/nml/dbm.cmxa
-lib/nml/dbm.mli
-lib/nml/digest.cmi
-lib/nml/digest.cmx
-lib/nml/digest.ml
-lib/nml/digest.mli
-lib/nml/digest.p.cmx
-lib/nml/dllbigarray.so
-lib/nml/dllmldbm.so
-lib/nml/dllnums.so
-lib/nml/dllstr.so
-lib/nml/dllthreads.so
-lib/nml/dllunix.so
-lib/nml/dynlink.cma
-lib/nml/dynlink.cmi
-lib/nml/dynlink.mli
-lib/nml/event.mli
-lib/nml/expunge
-lib/nml/extract_crc
-lib/nml/filename.cmi
-lib/nml/filename.cmx
-lib/nml/filename.ml
-lib/nml/filename.mli
-lib/nml/filename.p.cmx
-lib/nml/format.cmi
-lib/nml/format.cmx
-lib/nml/format.ml
-lib/nml/format.mli
-lib/nml/format.p.cmx
-lib/nml/gc.cmi
-lib/nml/gc.cmx
-lib/nml/gc.ml
-lib/nml/gc.mli
-lib/nml/gc.p.cmx
-lib/nml/genlex.cmi
-lib/nml/genlex.cmx
-lib/nml/genlex.ml
-lib/nml/genlex.mli
-lib/nml/genlex.p.cmx
-lib/nml/hashtbl.cmi
-lib/nml/hashtbl.cmx
-lib/nml/hashtbl.ml
-lib/nml/hashtbl.mli
-lib/nml/hashtbl.p.cmx
-lib/nml/int32.cmi
-lib/nml/int32.cmx
-lib/nml/int32.ml
-lib/nml/int32.mli
-lib/nml/int32.p.cmx
-lib/nml/int64.cmi
-lib/nml/int64.cmx
-lib/nml/int64.ml
-lib/nml/int64.mli
-lib/nml/int64.p.cmx
-lib/nml/int_misc.cmx
-lib/nml/interop.cmi
-lib/nml/interop.cmx
-lib/nml/interop.ml
-lib/nml/interop.p.cmx
-lib/nml/labelled.cmx
-lib/nml/labelled.p.cmx
-lib/nml/lazy.cmi
-lib/nml/lazy.cmx
-lib/nml/lazy.ml
-lib/nml/lazy.mli
-lib/nml/lazy.p.cmx
-lib/nml/ld.conf
-lib/nml/lexing.cmi
-lib/nml/lexing.cmx
-lib/nml/lexing.ml
-lib/nml/lexing.mli
-lib/nml/lexing.p.cmx
-lib/nml/libasmrun.a
-lib/nml/libasmrunp.a
-lib/nml/libbigarray.a
-lib/nml/libcamlrun.a
-lib/nml/libmldbm.a
-lib/nml/libnums.a
-lib/nml/libstr.a
-lib/nml/libthreads.a
-lib/nml/libunix.a
-lib/nml/list.cmi
-lib/nml/list.cmx
-lib/nml/list.ml
-lib/nml/list.mli
-lib/nml/list.p.cmx
-lib/nml/listLabels.cmi
-lib/nml/listLabels.cmx
-lib/nml/listLabels.ml
-lib/nml/listLabels.mli
-lib/nml/listLabels.p.cmx
-lib/nml/map.cmi
-lib/nml/map.cmx
-lib/nml/map.ml
-lib/nml/map.mli
-lib/nml/map.p.cmx
-lib/nml/marshal.cmi
-lib/nml/marshal.cmx
-lib/nml/marshal.ml
-lib/nml/marshal.mli
-lib/nml/marshal.p.cmx
-lib/nml/moreLabels.cmi
-lib/nml/moreLabels.cmx
-lib/nml/moreLabels.ml
-lib/nml/moreLabels.mli
-lib/nml/moreLabels.p.cmx
-lib/nml/mutex.mli
-lib/nml/nat.cmi
-lib/nml/nat.cmx
-lib/nml/nat.mli
-lib/nml/nativeint.cmi
-lib/nml/nativeint.cmx
-lib/nml/nativeint.ml
-lib/nml/nativeint.mli
-lib/nml/nativeint.p.cmx
-lib/nml/nml_setmaphash_.cmi
-lib/nml/nml_setmaphash_.cmx
-lib/nml/nml_setmaphash_.ml
-lib/nml/nml_setmaphash_.p.cmx
-lib/nml/nml_typing_.cmi
-lib/nml/nml_typing_.cmx
-lib/nml/nml_typing_.ml
-lib/nml/nml_typing_.p.cmx
-lib/nml/ntopmain.cmo
-lib/nml/num.cmi
-lib/nml/num.cmx
-lib/nml/num.mli
-lib/nml/nums.a
-lib/nml/nums.cma
-lib/nml/nums.cmxa
-lib/nml/obj.cmi
-lib/nml/obj.cmx
-lib/nml/obj.ml
-lib/nml/obj.mli
-lib/nml/obj.p.cmx
-lib/nml/oo.cmi
-lib/nml/oo.cmx
-lib/nml/oo.ml
-lib/nml/oo.mli
-lib/nml/oo.p.cmx
-lib/nml/otherlibs.nty
-lib/nml/outcometree.cmi
-lib/nml/outcometree.mli
-lib/nml/parsing.cmi
-lib/nml/parsing.cmx
-lib/nml/parsing.ml
-lib/nml/parsing.mli
-lib/nml/parsing.p.cmx
-lib/nml/pervasives.cmi
-lib/nml/pervasives.cmx
-lib/nml/pervasives.ml
-lib/nml/pervasives.mli
-lib/nml/pervasives.nty
-lib/nml/pervasives.p.cmx
-lib/nml/printexc.cmi
-lib/nml/printexc.cmx
-lib/nml/printexc.ml
-lib/nml/printexc.mli
-lib/nml/printexc.p.cmx
-lib/nml/printf.cmi
-lib/nml/printf.cmx
-lib/nml/printf.ml
-lib/nml/printf.mli
-lib/nml/printf.p.cmx
-lib/nml/queue.cmi
-lib/nml/queue.cmx
-lib/nml/queue.ml
-lib/nml/queue.mli
-lib/nml/queue.p.cmx
-lib/nml/random.cmi
-lib/nml/random.cmx
-lib/nml/random.ml
-lib/nml/random.mli
-lib/nml/random.p.cmx
-lib/nml/ratio.cmi
-lib/nml/ratio.cmx
-lib/nml/ratio.mli
-lib/nml/set.cmi
-lib/nml/set.cmx
-lib/nml/set.ml
-lib/nml/set.mli
-lib/nml/set.p.cmx
-lib/nml/sort.cmi
-lib/nml/sort.cmx
-lib/nml/sort.ml
-lib/nml/sort.mli
-lib/nml/sort.p.cmx
-lib/nml/stack.cmi
-lib/nml/stack.cmx
-lib/nml/stack.ml
-lib/nml/stack.mli
-lib/nml/stack.p.cmx
-lib/nml/stdLabels.cmi
-lib/nml/stdLabels.cmx
-lib/nml/stdLabels.ml
-lib/nml/stdLabels.mli
-lib/nml/stdLabels.p.cmx
-lib/nml/std_exit.cmi
-lib/nml/std_exit.cmo
-lib/nml/std_exit.cmx
-lib/nml/std_exit.ml
-lib/nml/std_exit.o
-lib/nml/std_exit.p.cmx
-lib/nml/std_exit.p.o
-lib/nml/stdlib.a
-lib/nml/stdlib.cma
-lib/nml/stdlib.cmxa
-lib/nml/stdlib.nty
-lib/nml/stdlib.p.a
-lib/nml/stdlib.p.cmxa
-lib/nml/str.a
-lib/nml/str.cma
-lib/nml/str.cmi
-lib/nml/str.cmx
-lib/nml/str.cmxa
-lib/nml/str.mli
-lib/nml/stream.cmi
-lib/nml/stream.cmx
-lib/nml/stream.ml
-lib/nml/stream.mli
-lib/nml/stream.p.cmx
-lib/nml/string.cmi
-lib/nml/string.cmx
-lib/nml/string.ml
-lib/nml/string.mli
-lib/nml/string.p.cmx
-lib/nml/stringLabels.cmi
-lib/nml/stringLabels.cmx
-lib/nml/stringLabels.ml
-lib/nml/stringLabels.mli
-lib/nml/stringLabels.p.cmx
-lib/nml/string_misc.cmx
-lib/nml/sys.cmi
-lib/nml/sys.cmx
-lib/nml/sys.ml
-lib/nml/sys.mli
-lib/nml/sys.p.cmx
-lib/nml/thread.mli
-lib/nml/threadUnix.mli
-lib/nml/threads/condition.cmi
-lib/nml/threads/event.cmi
-lib/nml/threads/mutex.cmi
-lib/nml/threads/stdlib.cma
-lib/nml/threads/thread.cmi
-lib/nml/threads/threadUnix.cmi
-lib/nml/threads/threads.cma
-lib/nml/threads/unix.cma
-lib/nml/topdirs.cmi
-lib/nml/toplevellib.cma
-lib/nml/toploop.cmi
-lib/nml/unix.a
-lib/nml/unix.cma
-lib/nml/unix.cmi
-lib/nml/unix.cmx
-lib/nml/unix.cmxa
-lib/nml/unix.mli
-lib/nml/unix.nty
-lib/nml/unixLabels.cmi
-lib/nml/unixLabels.cmx
-lib/nml/unixLabels.mli
-lib/nml/weak.cmi
-lib/nml/weak.cmx
-lib/nml/weak.ml
-lib/nml/weak.mli
-lib/nml/weak.p.cmx
-%%PORTDOCS%%%%DOCSDIR%%/Changes
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%DATADIR%%/contrib/emacs/Makefile
-%%DATADIR%%/contrib/emacs/README
-%%DATADIR%%/contrib/emacs/inf-n.el
-%%DATADIR%%/contrib/emacs/n-compat.el
-%%DATADIR%%/contrib/emacs/n-font.el
-%%DATADIR%%/contrib/emacs/n.el
-%%DATADIR%%/contrib/vim/nml.vim
diff --git a/multimedia/Makefile b/multimedia/Makefile
index b8614440d747..5ddb430761c2 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -242,7 +242,6 @@
     SUBDIR += mlt6-qt5
     SUBDIR += mlt7
     SUBDIR += mlt7-qt5
-    SUBDIR += mmsclient
     SUBDIR += mmsrip
     SUBDIR += motion
     SUBDIR += mp3cd
diff --git a/multimedia/mmsclient/Makefile b/multimedia/mmsclient/Makefile
deleted file mode 100644
index afdf7c64e7c6..000000000000
--- a/multimedia/mmsclient/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Created by: Alexey Dokuchaev <danfe@regency.nsu.ru>
-
-PORTNAME=	mmsclient
-PORTVERSION=	0.0.3
-CATEGORIES=	multimedia audio net
-MASTER_SITES=	http://ole.tange.dk/projekter/kontroversielt/www.geocities.com/majormms/ \
-		http://freebsd.nsu.ru/distfiles/
-DISTNAME=	mms_client-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Tool to download Microsoft Media streams
-
-LICENSE=	GPLv2
-
-DEPRECATED=	Abandoned upstream, Microsoft deprecated MMS in 2003
-EXPIRATION_DATE=2021-12-31
-
-GNU_CONFIGURE=	yes
-PLIST_FILES=	bin/mmsclient man/man1/mmsclient.1.gz
-
-post-install:
-	${INSTALL_MAN} ${FILESDIR}/mmsclient.1 ${STAGEDIR}${MANPREFIX}/man/man1
-
-.include <bsd.port.mk>
diff --git a/multimedia/mmsclient/distinfo b/multimedia/mmsclient/distinfo
deleted file mode 100644
index 8e0f2e6ee43a..000000000000
--- a/multimedia/mmsclient/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (mms_client-0.0.3.tar.gz) = 072f3a0380a11095cb2a0c3856f81f829a4e3b968ed69676e0066faa6275a49a
-SIZE (mms_client-0.0.3.tar.gz) = 117424
diff --git a/multimedia/mmsclient/files/mmsclient.1 b/multimedia/mmsclient/files/mmsclient.1
deleted file mode 100644
index 4c12ba8e98f2..000000000000
--- a/multimedia/mmsclient/files/mmsclient.1
+++ /dev/null
@@ -1,48 +0,0 @@
-.\"
-.\"man-page for mmsclient
-.\"
-.\"Derived from the man-page for axel download manager, which was originally
-.\"based on example in the wonderful book called Beginning Linux Programming,
-.\"written by Richard Stone and Neil Matthew.
-.\"
-.TH MMSCLIENT 1
-
-.SH NAME
-\fBmmsclient\fP \- download Microsoft Media streams
-
-.SH SYNOPSIS
-.B mmsclient
-\fIurl1\fP
-
-.SH DESCRIPTION
-mmsclient is a simple utility that allows you to download Internet streams
-using Microsoft's MMS protocol, e.g. CNN video and similar.  Downloaded
-stream can be watched/listened with any software that understands Microsoft
-Media format, like xine with mms-plugin.
-
-.SH OPTIONS
-.PP
-Only one argument is required, the URL to the stream you want to download.
-Don't let to confuse yourself by verbose output, once it's finished, you'll
-find the stream .asf file in the current directory.
-
-.SH CREDITS
-This software would never have been possible without the help from
-http://get.to/sdp.
-
-.SH EXAMPLES
-.nf
-mmsclient mms://netshow.msn.com/msnbc8
-.fi
-
-This will attempt to download Microsoft Media stream and save it as
-`msnbc8' file in the current directory.
-
-.SH BUGS
-.PP
-Lacks some useful command line options, not to mention probable bugs.
-
-.SH AUTHORS
-mmsclient was written by "Major MMS"
-
-The manual page was written by Alexey Dokuchaev (danfe@regency.nsu.ru).
diff --git a/multimedia/mmsclient/files/patch-client.c b/multimedia/mmsclient/files/patch-client.c
deleted file mode 100644
index 68904d616083..000000000000
--- a/multimedia/mmsclient/files/patch-client.c
+++ /dev/null
@@ -1,41 +0,0 @@
---- client.c.orig	Sat Dec 29 09:40:48 2001
-+++ client.c	Mon Mar  4 21:42:05 2002
-@@ -277,12 +277,12 @@
-       int packet_len, command;
-       char data[BUF_SIZE];
- 
--      if (!get_data (s, &packet_len, 4)) {
-+      if (!get_data (s, (char *)&packet_len, 4)) {
- 	printf ("packet_len read failed\n");
- 	return 0;
-       }
-       
--      packet_len = get_32 (&packet_len, 0) + 4;
-+      packet_len = get_32 ((unsigned char *)&packet_len, 0) + 4;
-       
-       printf ("command packet detected, len=%d\n",
- 	      packet_len);
-@@ -308,7 +308,7 @@
- int interp_header (uint8_t *header, int header_len) {
- 
-   int i;
--  int packet_length;
-+  int packet_length = 0;
- 
-   /*
-    * parse header
-@@ -416,12 +416,12 @@
- 
-     int packet_len, command;
- 
--    if (!get_data (s, &packet_len, 4)) {
-+    if (!get_data (s, (char *)&packet_len, 4)) {
-       printf ("packet_len read failed\n");
-       return 0;
-     }
- 
--    packet_len = get_32 (&packet_len, 0) + 4;
-+    packet_len = get_32 ((unsigned char *)&packet_len, 0) + 4;
- 
-     printf ("command packet detected, len=%d\n",
- 	    packet_len);
diff --git a/multimedia/mmsclient/files/patch-configure b/multimedia/mmsclient/files/patch-configure
deleted file mode 100644
index 9cd2ccf36857..000000000000
--- a/multimedia/mmsclient/files/patch-configure
+++ /dev/null
@@ -1,9 +0,0 @@
---- configure.orig	Mon Mar  4 21:23:59 2002
-+++ configure	Mon Mar  4 21:24:40 2002
-@@ -1649,7 +1649,6 @@
-    fi
- 
- 
--dbl
- 
- CFLAGS="$CFLAGS -Wall" 
diff --git a/multimedia/mmsclient/pkg-descr b/multimedia/mmsclient/pkg-descr
deleted file mode 100644
index c22ba6eee113..000000000000
--- a/multimedia/mmsclient/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-mmsclient allows you to download Internet streams through Microsoft's MMS
-protocol, e.g. CNN video and similar.  Downloaded stream can be watched and
-listened with any software that understands Microsoft Media format, like
-Xine with mms-plugin.
-
-WWW: http://ole.tange.dk/projekter/kontroversielt/www.geocities.com/majormms/
diff --git a/net-im/Makefile b/net-im/Makefile
index a518385e4f6e..f34fb168afdd 100644
--- a/net-im/Makefile
+++ b/net-im/Makefile
@@ -17,7 +17,6 @@
     SUBDIR += dino
     SUBDIR += echat
     SUBDIR += ejabberd
-    SUBDIR += ekiga
     SUBDIR += farstream
     SUBDIR += finch
     SUBDIR += folks
diff --git a/net-im/ekiga/Makefile b/net-im/ekiga/Makefile
deleted file mode 100644
index 19655431f80d..000000000000
--- a/net-im/ekiga/Makefile
+++ /dev/null
@@ -1,137 +0,0 @@
-# Created by: Charlie & <root@ws.ipfw.ru>
-#    $MCom: ports/trunk/net-im/ekiga/Makefile 19954 2014-10-15 10:03:57Z kwm $
-
-PORTNAME=	ekiga
-PORTVERSION=	4.0.1
-PORTREVISION=	31
-CATEGORIES=	net-im
-MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome3
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	VoIP and video conferencing application
-
-LICENSE=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-DEPRECATED=	Last release in 2013, not actively maintained
-EXPIRATION_DATE=	2021-12-31
-
-BUILD_DEPENDS=	boost-libs>=1.53:devel/boost-libs \
-		v4l_compat>=0:multimedia/v4l_compat \
-		gnome-icon-theme>=3.0.0:misc/gnome-icon-theme
-LIB_DEPENDS=	libopal.so:net/opal \
-		libv4l2.so:multimedia/libv4l
-RUN_DEPENDS=	gnome-icon-theme>=3.0.0:misc/gnome-icon-theme
-
-GNU_CONFIGURE=	yes
-USES=		compiler:c++11-lang cpe gettext gmake gnome libtool localbase \
-		pathfix pkgconfig tar:xz xorg
-USE_XORG=	xv
-USE_GNOME=	gtk20 intlhack libxml2
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-I${LOCALBASE}/lib
-INSTALL_TARGET=	install-strip
-
-OPTIONS_DEFINE=	LDAP NOTIFY EVOLUTION DBUS AVAHI GNOMEHELP
-OPTIONS_DEFAULT=NOTIFY DBUS AVAHI
-
-EVOLUTION_DESC=	Evolution data server support
-GNOMEHELP_DESC=	Build Ekiga help files
-
-#OPTIONS_GROUP=	EXP
-#OPTIONS_GROUP_EXP=	XCAP LOUDMOUTH
-EXP_DESC=	Experimental features
-XCAP_DESC=	Remote contact storage via HTTP in xml format
-LOUDMOUTH_DESC=	XMPP (jabber) support
-
-# Note that h.323 support is enabled when opal is build with it.
-
-.include <bsd.port.options.mk>
-
-PLIST_SUB+=	VERSION=${PORTVERSION}
-
-CONFIGURE_ARGS+=--disable-kde --disable-kab --disable-gstreamer \
-		--disable-gconf
-
-.if ${PORT_OPTIONS:MXCAP}
-CONFIGURE_ARGS+=--enable-xcap
-LIB_DEPENDS+=	libsoup-2.4.so:devel/libsoup
-.else
-CONFIGURE_ARGS+=--disable-xcap
-.endif
-
-.if ${PORT_OPTIONS:MLOUDMOUTH}
-CONFIGURE_ARGS+=--enable-loudmouth
-LIB_DEPENDS+=	libloudmouth-1.so:net-im/loudmouth
-.else
-CONFIGURE_ARGS+=--disable-loudmouth
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-USE_OPENLDAP=	yes
-LIB_DEPENDS+=	libsasl2.so:security/cyrus-sasl2
-CONFIGURE_ARGS+=--enable-ldap --with-ldap-dir="${LOCALBASE}" --with-libsasl2-dir="${LOCALBASE}"
-PLIST_SUB+=	LDAP=""
-WITH_PLUGINS=	1
-.else
-CONFIGURE_ARGS+=--disable-ldap
-PLIST_SUB+=	LDAP="@comment "
-.endif
-
-.if defined(WITH_PLUGINS)
-PLIST_SUB+=	PLUGINS=""
-.else
-PLIST_SUB+=	PLUGINS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNOTIFY}
-LIB_DEPENDS+=	libnotify.so:devel/libnotify
-CONFIGURE_ARGS+=--enable-notify
-PLIST_SUB+=	NOTIFY=""
-WITH_PLUGINS=	1
-.else
-CONFIGURE_ARGS+=--disable-notify
-PLIST_SUB+=	NOTIFY="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=	libdbus-1.so:devel/dbus
-CONFIGURE_ARGS+=--enable-dbus --enable-dbus-service
-PLIST_SUB+=	DBUS=""
-.else
-CONFIGURE_ARGS+=--disable-dbus --disable-dbus-service
-PLIST_SUB+=	DBUS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MEVOLUTION}
-USE_GNOME+=	evolutiondataserver3
-LIB_DEPENDS+=	libgcr-base-3.so:security/gcr
-CONFIGURE_ARGS+=--enable-eds
-PLIST_SUB+=	EVOLUTION=""
-WITH_PLUGINS=	1
-.else
-CONFIGURE_ARGS+=--disable-eds
-PLIST_SUB+=	EVOLUTION="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MAVAHI}
-CONFIGURE_ARGS+=--enable-avahi
-LIB_DEPENDS+=	libavahi-client.so:net/avahi-app
-PLIST_SUB+=	AVAHI=""
-WITH_PLUGINS=	1
-.else
-CONFIGURE_ARGS+=--disable-avahi
-PLIST_SUB+=	AVAHI="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGNOMEHELP}
-INSTALLS_OMF=	yes
-PLIST_SUB+=	GNOMEHELP=""
-USE_GNOME+=	gnomedocutils
-.else
-CONFIGURE_ARGS+=--disable-gdu
-PLIST_SUB+=	GNOMEHELP="@comment "
-.endif
-
-.include <bsd.port.mk>
diff --git a/net-im/ekiga/distinfo b/net-im/ekiga/distinfo
deleted file mode 100644
index 69e138e1085a..000000000000
--- a/net-im/ekiga/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1612639201
-SHA256 (gnome3/ekiga-4.0.1.tar.xz) = 5f4f491c9496cf65ba057a9345d6bb0278f4eca07bcda5baeecf50bfcd9a4a3b
-SIZE (gnome3/ekiga-4.0.1.tar.xz) = 8339364
diff --git a/net-im/ekiga/files/patch-boost-1.69 b/net-im/ekiga/files/patch-boost-1.69
deleted file mode 100644
index 58e25ffc07d5..000000000000
--- a/net-im/ekiga/files/patch-boost-1.69
+++ /dev/null
@@ -1,2879 +0,0 @@
-https://gitlab.gnome.org/GNOME/ekiga/commit/12641b735a98
-https://gitlab.gnome.org/GNOME/ekiga/commit/44ef7c66d055
-
---- Makefile.in.orig	2013-02-20 21:44:17 UTC
-+++ Makefile.in
-@@ -64,7 +64,6 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/D
- 	depcomp install-sh ltmain.sh missing mkinstalldirs
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
--	$(top_srcdir)/m4/ax_boost_signals.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
- 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-@@ -189,8 +188,6 @@ AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
- BOOST_LDFLAGS = @BOOST_LDFLAGS@
--BOOST_LIBS = @BOOST_LIBS@
--BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@
- CATALOGS = @CATALOGS@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
---- aclocal.m4.orig	2013-02-20 21:44:14 UTC
-+++ aclocal.m4
-@@ -1783,7 +1783,6 @@ fi[]dnl
- ])# PKG_CHECK_MODULES
- 
- m4_include([m4/ax_boost_base.m4])
--m4_include([m4/ax_boost_signals.m4])
- m4_include([m4/gnome-doc-utils.m4])
- m4_include([m4/intltool.m4])
- m4_include([m4/libtool.m4])
---- config.h.in.orig	2013-02-20 21:44:15 UTC
-+++ config.h.in
-@@ -27,9 +27,6 @@
- /* define if the Boost library is available */
- #undef HAVE_BOOST
- 
--/* define if the Boost::Signals library is available */
--#undef HAVE_BOOST_SIGNALS
--
- /* DBUS support */
- #undef HAVE_DBUS
- 
---- configure.orig	2013-02-20 21:44:15 UTC
-+++ configure
-@@ -745,8 +745,6 @@ GCONF_LIBS
- GCONF_CFLAGS
- XML_LIBS
- XML_CFLAGS
--BOOST_LIBS
--BOOST_SIGNALS_LIB
- BOOST_LDFLAGS
- BOOST_CPPFLAGS
- GLIB_LIBS
-@@ -938,7 +936,6 @@ enable_nls
- enable_gtk_debug
- with_boost
- with_boost_libdir
--with_boost_signals
- enable_gconf
- with_gconf_source
- with_gconf_schema_file_dir
-@@ -1704,10 +1701,6 @@ Optional Packages:
-                           this parameter only if default library detection
-                           fails and you know exactly where your boost
-                           libraries are located.
--  --with-boost-signals[=special-lib]
--                          use the Signals library from boost - it is possible
--                          to specify a certain library for the linker e.g.
--                          --with-boost-signals=boost_signals-gcc-mt-d
-   --with-gconf-source=sourceaddress
-                           Config database for installing schema files.
-   --with-gconf-schema-file-dir=dir
-@@ -17785,7 +17778,7 @@ fi
- 
- 
- if test "x$want_boost" = "xyes"; then
--    boost_lib_version_req=1.34
-+    boost_lib_version_req=1.53
-     boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([0-9]*\.[0-9]*\)'`
-     boost_lib_version_req_major=`expr $boost_lib_version_req : '\([0-9]*\)'`
-     boost_lib_version_req_minor=`expr $boost_lib_version_req : '[0-9]*\.\([0-9]*\)'`
-@@ -18013,241 +18006,21 @@ fi
- 
- 
- 
--# Check whether --with-boost-signals was given.
--if test "${with_boost_signals+set}" = set; then :
--  withval=$with_boost_signals;
--        if test "$withval" = "no"; then
--			want_boost="no"
--        elif test "$withval" = "yes"; then
--            want_boost="yes"
--            ax_boost_user_signals_lib=""
--        else
--		    want_boost="yes"
--		ax_boost_user_signals_lib="$withval"
--		fi
--
-+CPPFLAGS_save="$CPPFLAGS"
-+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-+ac_fn_cxx_check_header_mongrel "$LINENO" "boost/signals2.hpp" "ac_cv_header_boost_signals2_hpp" "$ac_includes_default"
-+if test "x$ac_cv_header_boost_signals2_hpp" = xyes; then :
-+ 
- else
--  want_boost="yes"
--
-+  found_signals2=no
- fi
- 
- 
--	if test "x$want_boost" = "xyes"; then
-+CPPFLAGS="$CPPFLAGS_save"
- 
--		CPPFLAGS_SAVED="$CPPFLAGS"
--		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
--		export CPPFLAGS
--
--		LDFLAGS_SAVED="$LDFLAGS"
--		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
--		export LDFLAGS
--
--        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Signals library is available" >&5
--$as_echo_n "checking whether the Boost::Signals library is available... " >&6; }
--if ${ax_cv_boost_signals+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  ac_ext=cpp
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--		 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <boost/signal.hpp>
--
--int
--main ()
--{
--boost::signal<void ()> sig;
--                                    return 0;
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_cxx_try_compile "$LINENO"; then :
--  ax_cv_boost_signals=yes
--else
--  ax_cv_boost_signals=no
-+if test "x$found_signals2" = "xno"; then
-+   as_fn_error $? "Could not find BOOST signals2 headers" "$LINENO" 5
- fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--         ac_ext=cpp
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_signals" >&5
--$as_echo "$ax_cv_boost_signals" >&6; }
--		if test "x$ax_cv_boost_signals" = "xyes"; then
--
--$as_echo "#define HAVE_BOOST_SIGNALS /**/" >>confdefs.h
--
--            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'`
--            if test "x$ax_boost_user_signals_lib" = "x"; then
--                for libextension in `ls $BOOSTLIBDIR/libboost_signals*.so* $BOOSTLIBDIR/libboost_signals*.dylib* $BOOSTLIBDIR/libboost_signals*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_signals.*\)\.so.*$;\1;' -e 's;^lib\(boost_signals.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_signals.*\)\.a.*$;\1;'` ; do
--                     ax_lib=${libextension}
--				    as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
--$as_echo_n "checking for exit in -l$ax_lib... " >&6; }
--if eval \${$as_ac_Lib+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-l$ax_lib  $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char exit ();
--int
--main ()
--{
--return exit ();
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_cxx_try_link "$LINENO"; then :
--  eval "$as_ac_Lib=yes"
--else
--  eval "$as_ac_Lib=no"
--fi
--rm -f core conftest.err conftest.$ac_objext \
--    conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--eval ac_res=\$$as_ac_Lib
--	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
--  BOOST_SIGNALS_LIB="-l$ax_lib";  link_signals="yes"; break
--else
--  link_signals="no"
--fi
--
--				done
--                if test "x$link_signals" != "xyes"; then
--                for libextension in `ls $BOOSTLIBDIR/boost_signals*.dll* $BOOSTLIBDIR/boost_signals*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_signals.*\)\.dll.*$;\1;' -e 's;^\(boost_signals.*\)\.a*$;\1;'` ; do
--                     ax_lib=${libextension}
--				    as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
--$as_echo_n "checking for exit in -l$ax_lib... " >&6; }
--if eval \${$as_ac_Lib+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-l$ax_lib  $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char exit ();
--int
--main ()
--{
--return exit ();
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_cxx_try_link "$LINENO"; then :
--  eval "$as_ac_Lib=yes"
--else
--  eval "$as_ac_Lib=no"
--fi
--rm -f core conftest.err conftest.$ac_objext \
--    conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--eval ac_res=\$$as_ac_Lib
--	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
--  BOOST_SIGNALS_LIB="-l$ax_lib";  link_signals="yes"; break
--else
--  link_signals="no"
--fi
--
--				done
--                fi
--
--            else
--               for ax_lib in $ax_boost_user_signals_lib boost_signals-$ax_boost_user_signals_lib; do
--				      as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_main" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_lib" >&5
--$as_echo_n "checking for main in -l$ax_lib... " >&6; }
--if eval \${$as_ac_Lib+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-l$ax_lib  $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--
--int
--main ()
--{
--return main ();
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_cxx_try_link "$LINENO"; then :
--  eval "$as_ac_Lib=yes"
--else
--  eval "$as_ac_Lib=no"
--fi
--rm -f core conftest.err conftest.$ac_objext \
--    conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--eval ac_res=\$$as_ac_Lib
--	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
--  BOOST_SIGNALS_LIB="-l$ax_lib";  link_signals="yes"; break
--else
--  link_signals="no"
--fi
--
--                  done
--
--            fi
--            if test "x$ax_lib" = "x"; then
--                as_fn_error $? "Could not find a version of the library!" "$LINENO" 5
--            fi
--			if test "x$link_signals" != "xyes"; then
--				as_fn_error $? "Could not link against $ax_lib !" "$LINENO" 5
--			fi
--		fi
--
--		CPPFLAGS="$CPPFLAGS_SAVED"
--	LDFLAGS="$LDFLAGS_SAVED"
--	fi
--
--
--if test "x${ax_cv_boost_signals}" == "xno"; then
--   as_fn_error $? "You need the boost signals library to compile Ekiga" "$LINENO" 5
--fi
--
--BOOST_LIBS="${BOOST_SIGNALS_LIB}"
--
- 
- 
- 
---- help/Makefile.in.orig	2013-02-20 21:44:16 UTC
-+++ help/Makefile.in
-@@ -80,7 +80,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile
- subdir = help
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
--	$(top_srcdir)/m4/ax_boost_signals.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
- 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-@@ -119,8 +118,6 @@ AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
- BOOST_LDFLAGS = @BOOST_LDFLAGS@
--BOOST_LIBS = @BOOST_LIBS@
--BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@
- CATALOGS = @CATALOGS@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
---- lib/Makefile.in.orig	2013-02-20 21:44:16 UTC
-+++ lib/Makefile.in
-@@ -136,7 +136,6 @@ subdir = lib
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
--	$(top_srcdir)/m4/ax_boost_signals.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
- 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-@@ -650,8 +649,6 @@ AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
- BOOST_LDFLAGS = @BOOST_LDFLAGS@
--BOOST_LIBS = @BOOST_LIBS@
--BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@
- CATALOGS = @CATALOGS@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
-@@ -1206,7 +1203,7 @@ libekiga_la_SOURCES = $(top_srcdir)/lib/toolbox.h \
- 	$(components_dir)/common-videooutput/videooutput-manager-common.cpp \
- 	$(components_dir)/common-videooutput/videooutput-manager-common.h \
- 	$(am__append_23) $(am__append_24)
--libekiga_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(BOOST_LIBS) $(GLIB_LIBS) \
-+libekiga_la_LDFLAGS = $(STACKLIB_LDFLAGS) $(GLIB_LIBS) \
- 	$(XML_LIBS) $(GTK_LIBS) $(am__append_1) $(am__append_8) \
- 	$(am__append_12) $(PTLIB_LIBS) $(OPAL_LIBS) $(am__append_18) \
- 	$(am__append_22) $(am__append_25)
-@@ -1251,7 +1248,7 @@ AM_CPPFLAGS = \
- 	$(DBUS_CFLAGS) $(PTLIB_CFLAGS) $(OPAL_CFLAGS)
- 
- AM_LIBS = \
--	$(BOOST_LIBS) $(GLIB_LIBS) $(XML_LIBS) $(GTK_LIBS)
-+	$(GLIB_LIBS) $(XML_LIBS) $(GTK_LIBS)
- 
- engine_dir = $(top_srcdir)/lib/engine
- components_dir = $(top_srcdir)/lib/engine/components
---- lib/engine/account/account-core.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/account/account-core.h
-@@ -106,26 +106,26 @@ namespace Ekiga
- 
-     /** This signal is emitted when a bank has been added to the core
-      */
--    boost::signal1<void, BankPtr> bank_added;
-+    boost::signals2::signal<void(BankPtr)> bank_added;
- 
-     /** This signal is emitted when a bank has been removed from the core
-      */
--    boost::signal1<void, BankPtr> bank_removed;
-+    boost::signals2::signal<void(BankPtr)> bank_removed;
- 
-     /** This signal is emitted when a account has been added to one of
-      * the banks
-      */
--    boost::signal2<void, BankPtr, AccountPtr> account_added;
-+    boost::signals2::signal<void(BankPtr, AccountPtr)> account_added;
- 
-     /** This signal is emitted when a account has been removed from one of
-      * the banks
-      */
--    boost::signal2<void, BankPtr, AccountPtr> account_removed;
-+    boost::signals2::signal<void(BankPtr, AccountPtr)> account_removed;
- 
-     /** This signal is emitted when a account has been updated in one of
-      * the banks
-      */
--    boost::signal2<void, BankPtr, AccountPtr> account_updated;
-+    boost::signals2::signal<void(BankPtr, AccountPtr)> account_updated;
- 
-   private:
- 
-@@ -147,7 +147,7 @@ namespace Ekiga
-     /** This signal is emitted when the AccountCore Service has been
-      * updated.
-      */
--    boost::signal0<void> updated;
-+    boost::signals2::signal<void(void)> updated;
- 
- 
-     /** This chain allows the AccountCore to present forms to the user
---- lib/engine/account/bank-impl.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/account/bank-impl.h
-@@ -74,7 +74,7 @@ namespace Ekiga
-   template<class AccountType = Account>
-   class BankImpl:
-     public Bank,
--    public boost::signals::trackable,
-+    public boost::signals2::trackable,
-     protected RefLister<AccountType>
-   {
- 
---- lib/engine/account/bank.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/account/bank.h
-@@ -74,15 +74,15 @@ namespace Ekiga
- 
-     /** This signal is emitted when a account has been added.
-      */
--    boost::signal1<void, AccountPtr> account_added;
-+    boost::signals2::signal<void(AccountPtr)> account_added;
- 
-     /** This signal is emitted when a account has been removed.
-      */
--    boost::signal1<void, AccountPtr> account_removed;
-+    boost::signals2::signal<void(AccountPtr)> account_removed;
- 
-     /** This signal is emitted when a account has been updated.
-      */
--    boost::signal1<void, AccountPtr> account_updated;
-+    boost::signals2::signal<void(AccountPtr)> account_updated;
- 
-     /** This chain allows the BankImpl to present forms to the user
-      */
---- lib/engine/addressbook/book.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/addressbook/book.h
-@@ -92,17 +92,17 @@ namespace Ekiga {
- 
-     /** This signal is emitted when a Contact has been added to the Book.
-      */
--    boost::signal1<void, ContactPtr > contact_added;
-+    boost::signals2::signal<void(ContactPtr)> contact_added;
- 
- 
-     /** This signal is emitted when a Contact has been removed from the Book.
-      */
--    boost::signal1<void, ContactPtr > contact_removed;
-+    boost::signals2::signal<void(ContactPtr)> contact_removed;
- 
- 
-     /** This signal is emitted when a Contact has been updated in the Book.
-      */
--    boost::signal1<void, ContactPtr > contact_updated;
-+    boost::signals2::signal<void(ContactPtr)> contact_updated;
-   };
- 
-   typedef boost::shared_ptr<Book> BookPtr;
---- lib/engine/addressbook/contact-core.cpp.orig	2013-02-18 21:36:51 UTC
-+++ lib/engine/addressbook/contact-core.cpp
-@@ -50,7 +50,7 @@ on_search ()
- 
- Ekiga::ContactCore::~ContactCore ()
- {
--  for (std::list<boost::signals::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter)
-+  for (std::list<boost::signals2::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter)
-     iter->disconnect ();
- }
- 
---- lib/engine/addressbook/contact-core.h.orig	2013-02-18 21:36:51 UTC
-+++ lib/engine/addressbook/contact-core.h
-@@ -118,37 +118,37 @@ namespace Ekiga
-     /** This signal is emitted when a Ekiga::Source has been
-      * added to the ContactCore Service.
-      */
--    boost::signal1<void, SourcePtr > source_added;
-+    boost::signals2::signal<void(SourcePtr)> source_added;
- 
-     /** This signal is emitted when a book has been added to one of
-      * the sources
-      */
--    boost::signal2<void, SourcePtr, BookPtr > book_added;
-+    boost::signals2::signal<void(SourcePtr, BookPtr )> book_added;
- 
-     /** This signal is emitted when a book has been removed from one of
-      * the sources
-      */
--    boost::signal2<void, SourcePtr, BookPtr > book_removed;
-+    boost::signals2::signal<void(SourcePtr, BookPtr )> book_removed;
- 
-     /** This signal is emitted when a book has been updated in one of
-      * the sources
-      */
--    boost::signal2<void, SourcePtr, BookPtr > book_updated;
-+    boost::signals2::signal<void(SourcePtr, BookPtr )> book_updated;
- 
-     /** This signal is emitted when a contact has been added to one of
-      * the book of one of the sources
-      */
--    boost::signal3<void, SourcePtr, BookPtr, ContactPtr > contact_added;
-+    boost::signals2::signal<void(SourcePtr, BookPtr, ContactPtr )> contact_added;
- 
-     /** This signal is emitted when a contact has been removed from one of
-      * the book of one of the sources
-      */
--    boost::signal3<void, SourcePtr, BookPtr, ContactPtr > contact_removed;
-+    boost::signals2::signal<void(SourcePtr, BookPtr, ContactPtr )> contact_removed;
- 
-     /** This signal is emitted when a contact has been updated in one of
-      * the book of one of the sources
-      */
--    boost::signal3<void, SourcePtr, BookPtr, ContactPtr > contact_updated;
-+    boost::signals2::signal<void(SourcePtr, BookPtr, ContactPtr )> contact_updated;
- 
-   private:
- 
-@@ -174,7 +174,7 @@ namespace Ekiga
-     std::list<boost::shared_ptr<ContactDecorator> > contact_decorators;
- 
-     /*** Misc stuff ***/
--    std::list<boost::signals::connection> conns;
-+    std::list<boost::signals2::connection> conns;
-   };
- 
- /**
---- lib/engine/addressbook/source.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/addressbook/source.h
-@@ -63,32 +63,32 @@ namespace Ekiga {
- 
-     /** This signal is emitted when a Book has been added to the Source.
-      */
--    boost::signal1<void, BookPtr > book_added;
-+    boost::signals2::signal<void(BookPtr)> book_added;
-     
-     
-     /** This signal is emitted when a Book has been updated in the Source.
-      */
--    boost::signal1<void, BookPtr > book_updated;
-+    boost::signals2::signal<void(BookPtr)> book_updated;
-     
-     
-     /** This signal is emitted when a Book has been removed in the Source.
-      */
--    boost::signal1<void, BookPtr > book_removed;
-+    boost::signals2::signal<void(BookPtr)> book_removed;
- 
-     /** This signal is emitted when a Contact has been added to a book in
-      *  this source.
-      */
--    boost::signal2<void, BookPtr, ContactPtr > contact_added;
-+    boost::signals2::signal<void(BookPtr, ContactPtr )> contact_added;
- 
-     /** This signal is emitted when a Contact has been removed from a book in
-      *  this source.
-      */
--    boost::signal2<void, BookPtr, ContactPtr > contact_removed;
-+    boost::signals2::signal<void(BookPtr, ContactPtr )> contact_removed;
- 
-     /** This signal is emitted when a Contact has been updated in a book in
-      *  this source
-      */
--    boost::signal2<void, BookPtr, ContactPtr > contact_updated;
-+    boost::signals2::signal<void(BookPtr, ContactPtr )> contact_updated;
-   };
- 
-   typedef boost::shared_ptr<Source> SourcePtr;
---- lib/engine/audioinput/audioinput-core.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/audioinput/audioinput-core.h
-@@ -136,7 +136,7 @@ namespace Ekiga
-       /** This signal is emitted when a Ekiga::AudioInputManager has been
-        * added to the AudioInputCore Service.
-        */
--      boost::signal1<void, AudioInputManager &> manager_added;
-+      boost::signals2::signal<void(AudioInputManager &)> manager_added;
- 
- 
-       /*** AudioInput Device Management ***/
-@@ -254,23 +254,23 @@ namespace Ekiga
- 
-       /** See audioinput-manager.h for the API
-        */
--      boost::signal3<void, AudioInputManager &, AudioInputDevice &, AudioInputSettings&> device_opened;
--      boost::signal2<void, AudioInputManager &, AudioInputDevice &> device_closed;
--      boost::signal3<void, AudioInputManager &, AudioInputDevice &, AudioInputErrorCodes> device_error;
-+      boost::signals2::signal<void(AudioInputManager &, AudioInputDevice &, AudioInputSettings&)> device_opened;
-+      boost::signals2::signal<void(AudioInputManager &, AudioInputDevice &)> device_closed;
-+      boost::signals2::signal<void(AudioInputManager &, AudioInputDevice &, AudioInputErrorCodes)> device_error;
- 
-       /** This signal is emitted when an audio device input has been added to the system.
-        * This signal will be emitted if add_device was called with a device name and
-        * a manager claimed support for this device.
-        * @param device the audio input device that was added.
-        */
--      boost::signal2<void, AudioInputDevice, bool> device_added;
-+      boost::signals2::signal<void(AudioInputDevice, bool)> device_added;
- 
-       /** This signal is emitted when an audio input device has been removed from the system.
-        * This signal will be emitted if remove_device was called with a device name and
-        * a manager claimed support for this device.
-        * @param device the audio input device that was removed.
-        */
--      boost::signal2<void, AudioInputDevice, bool> device_removed;
-+      boost::signals2::signal<void(AudioInputDevice, bool)> device_removed;
- 
-   private:
-       void on_set_device (const AudioInputDevice & device);
---- lib/engine/audioinput/audioinput-manager.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/audioinput/audioinput-manager.h
-@@ -39,7 +39,7 @@
- #define __AUDIOINPUT_MANAGER_H__
- 
- #include <vector>
--#include <boost/signals.hpp>
-+#include <boost/signals2.hpp>
- #include <boost/bind.hpp>
- 
- #include "audioinput-info.h"
-@@ -148,18 +148,18 @@ namespace Ekiga
-        * @param device the audio input device that was opened.
-        * @param config the current audio input device configuration (current volume, etc.).
-        */
--      boost::signal2<void, AudioInputDevice, AudioInputSettings> device_opened;
-+      boost::signals2::signal<void(AudioInputDevice, AudioInputSettings)> device_opened;
- 
-       /** This signal is emitted when an audio input device is closed.
-        * @param device the audio input device that was closed.
-        */
--      boost::signal1<void, AudioInputDevice> device_closed;
-+      boost::signals2::signal<void(AudioInputDevice)> device_closed;
- 
-       /** This signal is emitted when an error occurs when opening a audio input device.
-        * @param device the audio input device that caused the error.
-        * @param error_code the audio input device error code.
-        */
--      boost::signal2<void, AudioInputDevice, AudioInputErrorCodes> device_error;
-+      boost::signals2::signal<void(AudioInputDevice, AudioInputErrorCodes)> device_error;
- 
- 
-   protected:  
---- lib/engine/audiooutput/audiooutput-core.h.orig	2013-02-18 21:37:04 UTC
-+++ lib/engine/audiooutput/audiooutput-core.h
-@@ -128,7 +128,7 @@ namespace Ekiga
-       /** This signal is emitted when a Ekiga::AudioOutputManager has been
-        * added to the AudioOutputCore Service.
-        */
--      boost::signal1<void, AudioOutputManager &> manager_added;
-+      boost::signals2::signal<void(AudioOutputManager &)> manager_added;
- 
- 
-       /** Get a list of all devices supported by all managers registered to the core.
-@@ -299,23 +299,23 @@ namespace Ekiga
- 
-       /** See audiooutput-manager.h for the API
-        */
--      boost::signal4<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputSettings&> device_opened;
--      boost::signal3<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&> device_closed;
--      boost::signal4<void, AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputErrorCodes> device_error;
-+      boost::signals2::signal<void(AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputSettings&)> device_opened;
-+      boost::signals2::signal<void(AudioOutputManager &, AudioOutputPS, AudioOutputDevice&)> device_closed;
-+      boost::signals2::signal<void(AudioOutputManager &, AudioOutputPS, AudioOutputDevice&, AudioOutputErrorCodes)> device_error;
- 
-       /** This signal is emitted when an audio output device has been added to the system.
-        * This signal will be emitted if add_device was called with a device name and
-        * a manager claimed support for this device.
-        * @param device the audio output device that was added.
-        */
--      boost::signal2<void, AudioOutputDevice, bool> device_added;
-+      boost::signals2::signal<void(AudioOutputDevice, bool)> device_added;
- 
-       /** This signal is emitted when an audio output device has been removed from the system.
-        * This signal will be emitted if remove_device was called with a device name and
-        * a manager claimed support for this device.
-        * @param device the audio output device that was removed.
-        */
--      boost::signal2<void, AudioOutputDevice, bool> device_removed;
-+      boost::signals2::signal<void(AudioOutputDevice, bool)> device_removed;
- 
-   private:
-       void on_set_device (const AudioOutputDevice & device);
---- lib/engine/audiooutput/audiooutput-manager.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/audiooutput/audiooutput-manager.h
-@@ -39,7 +39,7 @@
- #define __AUDIOOUTPUT_MANAGER_H__
- 
- #include <vector>
--#include <boost/signals.hpp>
-+#include <boost/signals2.hpp>
- #include <boost/bind.hpp>
- 
- #include "audiooutput-info.h"
-@@ -152,20 +152,20 @@ namespace Ekiga
-        * @param device the audio output device that was opened.
-        * @param config the current audio output device configuration (current volume, etc.).
-        */
--      boost::signal3<void, AudioOutputPS, AudioOutputDevice, AudioOutputSettings> device_opened;
-+      boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice, AudioOutputSettings)> device_opened;
- 
-       /** This signal is emitted when an audio output device is closed.
-        * @param prim whether the primary or secondary audio output device was closed.
-        * @param device the audio output device that was closed.
-        */
--      boost::signal2<void, AudioOutputPS, AudioOutputDevice> device_closed;
-+      boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice)> device_closed;
- 
-       /** This signal is emitted when an error occurs when opening an audio output device.
-        * @param prim whether the primary or secondary audio output device caused the error.
-        * @param device the audio output device that caused the error.
-        * @param error_code the audio output device error code.
-        */
--      boost::signal3<void, AudioOutputPS, AudioOutputDevice, AudioOutputErrorCodes> device_error;
-+      boost::signals2::signal<void(AudioOutputPS, AudioOutputDevice, AudioOutputErrorCodes)> device_error;
- 
-   protected:  
-       typedef struct ManagerState {
---- lib/engine/chat/chat-core.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/chat/chat-core.h
-@@ -100,7 +100,7 @@ namespace Ekiga
-     /** This signal is emitted when an Ekiga::Dialect has been added to
-      * the ChatCore service.
-      */
--    boost::signal1<void, DialectPtr > dialect_added;
-+    boost::signals2::signal<void(DialectPtr)> dialect_added;
- 
-   private:
- 
-@@ -116,7 +116,7 @@ namespace Ekiga
- 
-     /** This signal is emitted when the ChatCore service has been updated.
-      */
--    boost::signal0<void> updated;
-+    boost::signals2::signal<void(void)> updated;
- 
-     /** This chain allows the ChatCore to present forms to the user
-      */
---- lib/engine/chat/chat.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/chat/chat.h
-@@ -37,7 +37,7 @@
- #define __CHAT_H__
- 
- #include <string>
--#include <boost/signals.hpp>
-+#include <boost/signals2.hpp>
- #include <boost/bind.hpp>
- 
- #include <boost/smart_ptr.hpp>
-@@ -113,15 +113,15 @@ namespace Ekiga
- 
-     /** This signal is emitted when the Chat has been updated.
-      */
--    boost::signal0<void> updated;
-+    boost::signals2::signal<void(void)> updated;
- 
-     /** This signal is emitted when the user requested to see this Chat
-      */
--    boost::signal0<void> user_requested;
-+    boost::signals2::signal<void(void)> user_requested;
- 
-     /** This signal is emitted when the Chat has been removed.
-      */
--    boost::signal0<void> removed;
-+    boost::signals2::signal<void(void)> removed;
- 
-     /** Feed possible actions on this Chat to the given MenuBuilder
-      * @param A MenuBuilder object to populate.
---- lib/engine/chat/dialect-impl.h.orig	2013-02-18 21:36:51 UTC
-+++ lib/engine/chat/dialect-impl.h
-@@ -47,7 +47,7 @@ namespace Ekiga
- 	   typename MultipleChatType = MultipleChat>
-   class DialectImpl:
-     public Dialect,
--    public boost::signals::trackable
-+    public boost::signals2::trackable
-   {
-   public:
- 
-@@ -75,10 +75,10 @@ namespace Ekiga
- 
-     /* More STL-like ways to access the chats within this Ekiga::DialectImpl
-      */
--    typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > > simple_iterator;
--    typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > > simple_const_iterator;
--    typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > > multiple_iterator;
--    typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > > multiple_const_iterator;
-+    typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals2::connection> > > simple_iterator;
-+    typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals2::connection> > > simple_const_iterator;
-+    typedef typename Ekiga::map_key_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals2::connection> > > multiple_iterator;
-+    typedef typename Ekiga::map_key_const_iterator<std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals2::connection> > > multiple_const_iterator;
- 
-     simple_iterator simple_begin ();
-     simple_iterator simple_end ();
-@@ -116,8 +116,8 @@ namespace Ekiga
- 
-   private:
- 
--    std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals::connection> > simple_chats;
--    std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals::connection> > multiple_chats;
-+    std::map<boost::shared_ptr<SimpleChatType>, std::list<boost::signals2::connection> > simple_chats;
-+    std::map<boost::shared_ptr<MultipleChatType>, std::list<boost::signals2::connection> > multiple_chats;
- 
-     void on_simple_chat_removed (boost::shared_ptr<SimpleChatType> chat);
- 
-@@ -133,22 +133,22 @@ Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::
- template<typename SimpleChatType, typename MultipleChatType>
- Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::~DialectImpl ()
- {
--  for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals::connection> >::iterator iter = simple_chats.begin ();
-+  for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals2::connection> >::iterator iter = simple_chats.begin ();
-        iter != simple_chats.end ();
-        iter++) {
- 
--    for (std::list<boost::signals::connection>::iterator conn_iter = iter->second.begin ();
-+    for (std::list<boost::signals2::connection>::iterator conn_iter = iter->second.begin ();
- 	 conn_iter != iter->second.end ();
- 	 ++conn_iter) {
- 
-       conn_iter->disconnect ();
-     }
-   }
--  for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals::connection> >::iterator iter = multiple_chats.begin ();
-+  for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals2::connection> >::iterator iter = multiple_chats.begin ();
-        iter != multiple_chats.end ();
-        iter++) {
- 
--    for (std::list<boost::signals::connection>::iterator conn_iter = iter->second.begin ();
-+    for (std::list<boost::signals2::connection>::iterator conn_iter = iter->second.begin ();
- 	 conn_iter != iter->second.end ();
- 	 ++conn_iter) {
- 
-@@ -163,7 +163,7 @@ Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::
- {
-   bool go_on = true;
- 
--  for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals::connection> >::const_iterator iter = simple_chats.begin ();
-+  for (typename std::map<boost::shared_ptr<SimpleChatType>,std::list<boost::signals2::connection> >::const_iterator iter = simple_chats.begin ();
-        go_on && iter != simple_chats.end ();
-        iter++) {
- 
-@@ -177,7 +177,7 @@ Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::
- {
-   bool go_on = true;
- 
--  for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals::connection> >::const_iterator iter = multiple_chats.begin ();
-+  for (typename std::map<boost::shared_ptr<MultipleChatType>,std::list<boost::signals2::connection> >::const_iterator iter = multiple_chats.begin ();
-        go_on && iter != multiple_chats.end ();
-        iter++) {
- 
-@@ -275,7 +275,7 @@ template<typename SimpleChatType, typename MultipleCha
- void
- Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::on_simple_chat_removed (boost::shared_ptr<SimpleChatType> chat)
- {
--  for (typename std::list<boost::signals::connection>::iterator iter = simple_chats[chat].begin ();
-+  for (typename std::list<boost::signals2::connection>::iterator iter = simple_chats[chat].begin ();
-        iter != simple_chats[chat].end ();
-        ++iter) {
- 
-@@ -288,7 +288,7 @@ template<typename SimpleChatType, typename MultipleCha
- void
- Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::on_multiple_chat_removed (boost::shared_ptr<MultipleChatType> chat)
- {
--  for (typename std::list<boost::signals::connection>::iterator iter = multiple_chats[chat].begin ();
-+  for (typename std::list<boost::signals2::connection>::iterator iter = multiple_chats[chat].begin ();
-        iter != multiple_chats[chat].end ();
-        ++iter) {
- 
---- lib/engine/chat/dialect.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/chat/dialect.h
-@@ -72,12 +72,12 @@ namespace Ekiga
-     /** This signal is emitted when an Ekiga::SimpleChat has been added to
-      * the dialect.
-      */
--    boost::signal1<void, SimpleChatPtr> simple_chat_added;
-+    boost::signals2::signal<void(SimpleChatPtr)> simple_chat_added;
- 
-     /** This signal is emitted when an Ekiga::MultipleChat has been added to
-      * the dialect.
-      */
--    boost::signal1<void, MultipleChatPtr> multiple_chat_added;
-+    boost::signals2::signal<void(MultipleChatPtr)> multiple_chat_added;
- 
-     /** This chain allows the Dialect to present forms to the user.
-      */
---- lib/engine/components/call-history/history-book.h.orig	2013-02-18 21:36:51 UTC
-+++ lib/engine/components/call-history/history-book.h
-@@ -53,7 +53,7 @@ namespace History
- 
-   class Book:
-     public Ekiga::Book,
--    public boost::signals::trackable
-+    public boost::signals2::trackable
-   {
-   public:
- 
-@@ -86,7 +86,7 @@ namespace History
- 
-     void clear ();
- 
--    boost::signal0<void> cleared;
-+    boost::signals2::signal<void(void)> cleared;
- 
-   private:
- 
---- lib/engine/components/call-history/history-contact.h.orig	2013-02-18 21:36:51 UTC
-+++ lib/engine/components/call-history/history-contact.h
-@@ -61,7 +61,7 @@ namespace History
- 
-   class Contact:
-     public Ekiga::Contact,
--    public boost::signals::trackable
-+    public boost::signals2::trackable
-   {
-   public:
- 
---- lib/engine/components/local-roster/local-cluster.h.orig	2013-02-18 21:36:51 UTC
-+++ lib/engine/components/local-roster/local-cluster.h
-@@ -51,7 +51,7 @@ namespace Local
-   class Cluster :
-     public Ekiga::ClusterImpl<Heap>,
-     public Ekiga::Trigger,
--    public boost::signals::trackable
-+    public boost::signals2::trackable
-   {
-   public:
- 
---- lib/engine/components/local-roster/local-presentity.h.orig	2013-02-18 21:36:51 UTC
-+++ lib/engine/components/local-roster/local-presentity.h
-@@ -162,7 +162,7 @@ namespace Local
-      * This signal makes the Local::Heap know that the XML tree changed
-      * and hence should be saved
-      */
--    boost::signal0<void> trigger_saving;
-+    boost::signals2::signal<void(void)> trigger_saving;
- 
- 
-   private:
---- lib/engine/components/opal/opal-account.h.orig	2013-02-18 21:37:04 UTC
-+++ lib/engine/components/opal/opal-account.h
-@@ -153,7 +153,7 @@ namespace Opal (public)
- 
-     const std::string as_string () const;
- 
--    boost::signal0<void> trigger_saving;
-+    boost::signals2::signal<void(void)> trigger_saving;
- 
-     /*
-      * This is because an opal account is an Ekiga::PresencePublisher
---- lib/engine/components/opal/opal-call.h.orig	2013-02-18 21:37:04 UTC
-+++ lib/engine/components/opal/opal-call.h
-@@ -55,7 +55,7 @@ namespace Opal {
-   class Call
-     : public OpalCall,
-       public Ekiga::Call,
--      public boost::signals::trackable
-+      public boost::signals2::trackable
-   {
- 
- public:
---- lib/engine/components/opal/opal-gmconf-bridge.cpp.orig	2013-02-18 21:36:51 UTC
-+++ lib/engine/components/opal/opal-gmconf-bridge.cpp
-@@ -35,7 +35,7 @@
-  */
- 
- #include <iostream>
--#include <boost/signals.hpp>
-+#include <boost/signals2.hpp>
- #include <boost/bind.hpp>
- 
- #include "config.h"
---- lib/engine/framework/chain-of-responsibility.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/framework/chain-of-responsibility.h
-@@ -36,7 +36,7 @@
- #ifndef __CHAIN_OF_RESPONSIBILITY_H__
- #define __CHAIN_OF_RESPONSIBILITY_H__
- 
--#include <boost/signals.hpp>
-+#include <boost/signals2.hpp>
- #include <boost/bind.hpp>
- 
- /* This code uses boost signals to implement the "chain of responsibility"
-@@ -117,9 +117,8 @@ namespace Ekiga
- 
-   template<typename T_request>
-   struct ChainOfResponsibility:
--    public boost::signal1<bool,
--			 T_request,
--			 responsibility_accumulator>
-+    public boost::signals2::signal<bool(T_request),
-+			           responsibility_accumulator>
-   {
-   };
- };
---- lib/engine/framework/form-request-simple.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/framework/form-request-simple.h
-@@ -36,7 +36,7 @@
- #ifndef __FORM_REQUEST_SIMPLE_H__
- #define __FORM_REQUEST_SIMPLE_H__
- 
--#include <boost/signals.hpp>
-+#include <boost/signals2.hpp>
- #include <boost/bind.hpp>
- 
- #include "form-builder.h"
---- lib/engine/framework/gmconf-bridge.h.orig	2013-02-18 21:36:51 UTC
-+++ lib/engine/framework/gmconf-bridge.h
-@@ -38,7 +38,7 @@
- #define __GMCONF_BRIDGE_H__
- 
- #include <vector>
--#include <boost/signals.hpp>
-+#include <boost/signals2.hpp>
- #include <boost/bind.hpp>
- 
- #include "gmconf.h"
-@@ -94,7 +94,7 @@ namespace Ekiga
-        * @param key is the GmConf key whose value changed
-        * @param entry is the new GmConf entry
-        */
--      boost::signal2<void, std::string /*key*/, GmConfEntry * /*entry*/> property_changed;
-+      boost::signals2::signal<void(std::string /*key*/, GmConfEntry * /*entry*/)> property_changed;
- 
-   protected :
-       Ekiga::Service & service;
---- lib/engine/framework/live-object.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/framework/live-object.h
-@@ -62,12 +62,12 @@ namespace Ekiga
- 
-     /** This signal is emitted when the object has been updated.
-      */
--    boost::signal0<void> updated;
-+    boost::signals2::signal<void(void)> updated;
- 
- 
-     /** This signal is emitted when the object has been removed.
-      */
--    boost::signal0<void> removed;
-+    boost::signals2::signal<void(void)> removed;
- 
-     /** This chain allows the object to present forms to the user
-      */
---- lib/engine/framework/menu-builder.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/framework/menu-builder.h
-@@ -37,7 +37,7 @@
- #define __MENU_BUILDER_H__
- 
- #include <string>
--#include <boost/signals.hpp>
-+#include <boost/signals2.hpp>
- #include <boost/bind.hpp>
- 
- 
---- lib/engine/framework/personal-details.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/framework/personal-details.h
-@@ -37,7 +37,7 @@
- #define __PERSONAL_DETAILS_H__
- 
- #include <string>
--#include <boost/signals.hpp>
-+#include <boost/signals2.hpp>
- #include <boost/bind.hpp>
- 
- #include "services.h"
-@@ -66,7 +66,7 @@ namespace Ekiga
-     virtual void set_presence_info (const std::string presence,
-                                     const std::string status) = 0;
- 
--    boost::signal0<void> updated;
-+    boost::signals2::signal<void(void)> updated;
-   };
- };
- 
---- lib/engine/framework/reflister.h.orig	2013-02-18 21:36:51 UTC
-+++ lib/engine/framework/reflister.h
-@@ -37,7 +37,7 @@
- #ifndef __REFLISTER_H__
- #define __REFLISTER_H__
- 
--#include <boost/signals.hpp>
-+#include <boost/signals2.hpp>
- #include <boost/bind.hpp>
- #include <list>
- 
-@@ -55,7 +55,7 @@ namespace Ekiga
-   {
-   protected:
- 
--    typedef std::map<boost::shared_ptr<ObjectType>,std::list<boost::signals::connection> > container_type;
-+    typedef std::map<boost::shared_ptr<ObjectType>,std::list<boost::signals2::connection> > container_type;
-     typedef Ekiga::map_key_iterator<container_type> iterator;
-     typedef Ekiga::map_key_const_iterator<container_type> const_iterator;
- 
-@@ -66,7 +66,7 @@ namespace Ekiga
-     void add_object (boost::shared_ptr<ObjectType> obj);
- 
-     void add_connection (boost::shared_ptr<ObjectType> obj,
--			 boost::signals::connection connection);
-+			 boost::signals2::connection connection);
- 
-     void remove_object (boost::shared_ptr<ObjectType> obj);
- 
-@@ -78,9 +78,9 @@ namespace Ekiga
-     const_iterator begin () const;
-     const_iterator end () const;
- 
--    boost::signal1<void, boost::shared_ptr<ObjectType> > object_added;
--    boost::signal1<void, boost::shared_ptr<ObjectType> > object_removed;
--    boost::signal1<void, boost::shared_ptr<ObjectType> > object_updated;
-+    boost::signals2::signal<void(boost::shared_ptr<ObjectType>)> object_added;
-+    boost::signals2::signal<void(boost::shared_ptr<ObjectType>)> object_removed;
-+    boost::signals2::signal<void(boost::shared_ptr<ObjectType>)> object_updated;
- 
-   private:
-     container_type objects;
-@@ -95,7 +95,7 @@ Ekiga::RefLister<ObjectType>::~RefLister ()
-        iter != objects.end ();
-        ++iter) {
- 
--    for (std::list<boost::signals::connection>::iterator conn_iter = iter->second.begin ();
-+    for (std::list<boost::signals2::connection>::iterator conn_iter = iter->second.begin ();
- 	 conn_iter != iter->second.end ();
- 	 ++conn_iter) {
- 
-@@ -130,7 +130,7 @@ Ekiga::RefLister<ObjectType>::add_object (boost::share
- template<typename ObjectType>
- void
- Ekiga::RefLister<ObjectType>::add_connection (boost::shared_ptr<ObjectType> obj,
--					      boost::signals::connection connection)
-+					      boost::signals2::connection connection)
- {
-   objects[obj].push_back (connection);
- }
-@@ -139,8 +139,8 @@ template<typename ObjectType>
- void
- Ekiga::RefLister<ObjectType>::remove_object (boost::shared_ptr<ObjectType> obj)
- {
--  std::list<boost::signals::connection> connections = objects[obj];
--  for (std::list<boost::signals::connection>::iterator iter = connections.begin ();
-+  std::list<boost::signals2::connection> connections = objects[obj];
-+  for (std::list<boost::signals2::connection>::iterator iter = connections.begin ();
-        iter != connections.end ();
-        ++iter)
-     iter->disconnect ();
---- lib/engine/framework/runtime.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/framework/runtime.h
-@@ -34,7 +34,7 @@
-  *
-  */
- 
--#include <boost/signals.hpp>
-+#include <boost/signals2.hpp>
- #include <boost/bind.hpp>
- 
- #ifndef __RUNTIME_H__
---- lib/engine/framework/services.h.orig	2013-02-18 21:36:51 UTC
-+++ lib/engine/framework/services.h
-@@ -45,7 +45,7 @@
- 
- #include <list>
- #include <string>
--#include <boost/signals.hpp>
-+#include <boost/signals2.hpp>
- #include <boost/bind.hpp>
- 
- namespace Ekiga
-@@ -101,7 +101,7 @@ namespace Ekiga
- 
-     void dump (std::ostream &stream) const;
- 
--    boost::signal1<void, ServicePtr> service_added;
-+    boost::signals2::signal<void(ServicePtr)> service_added;
- 
-   private:
- 
---- lib/engine/gui/gtk-core/codecsbox.cpp.orig	2013-02-18 21:37:04 UTC
-+++ lib/engine/gui/gtk-core/codecsbox.cpp
-@@ -38,6 +38,8 @@
- #include "config.h"
- #include "codecsbox.h"
- 
-+#include <sstream>
-+
- #include "gmconf.h"
- #include "codec-description.h"
- 
---- lib/engine/gui/gtk-frontend/accounts-window.cpp.orig	2013-02-18 21:36:51 UTC
-+++ lib/engine/gui/gtk-frontend/accounts-window.cpp
-@@ -62,7 +62,7 @@ struct _AccountsWindowPrivate
-   GtkAccelGroup *accel;
- 
-   Ekiga::ServiceCore &core;
--  std::vector<boost::signals::connection> connections;
-+  std::vector<boost::signals2::connection> connections;
- 
-   std::string presence;
- 
-@@ -502,7 +502,7 @@ accounts_window_finalize (GObject *obj)
- {
-   AccountsWindow *self = ACCOUNTS_WINDOW (obj);
- 
--  for (std::vector<boost::signals::connection>::iterator iter
-+  for (std::vector<boost::signals2::connection>::iterator iter
- 	 = self->priv->connections.begin ();
-        iter != self->priv->connections.end ();
-        iter++)
-@@ -535,7 +535,7 @@ accounts_window_new (Ekiga::ServiceCore &core)
- {
-   AccountsWindow *self = NULL;
- 
--  boost::signals::connection conn;
-+  boost::signals2::connection conn;
- 
-   GtkWidget *vbox = NULL;
-   GtkWidget *menu_bar = NULL;
---- lib/engine/gui/gtk-frontend/addressbook-window.cpp.orig	2013-02-18 21:36:51 UTC
-+++ lib/engine/gui/gtk-frontend/addressbook-window.cpp
-@@ -52,7 +52,7 @@ struct _AddressBookWindowPrivate
-   _AddressBookWindowPrivate (Ekiga::ContactCore & _core):core (_core) { }
- 
-   Ekiga::ContactCore & core;
--  std::vector<boost::signals::connection> connections;
-+  std::vector<boost::signals2::connection> connections;
-   GtkWidget *tree_view;
-   GtkWidget *notebook;
-   GtkTreeSelection *selection;
-@@ -579,7 +579,7 @@ addressbook_window_finalize (GObject *obj)
- {
-   AddressBookWindow *self = ADDRESSBOOK_WINDOW (obj);
- 
--  for (std::vector<boost::signals::connection>::iterator iter
-+  for (std::vector<boost::signals2::connection>::iterator iter
- 	 = self->priv->connections.begin ();
-        iter != self->priv->connections.end ();
-        iter++)
-@@ -613,7 +613,7 @@ addressbook_window_new (Ekiga::ContactCore &core)
- {
-   AddressBookWindow *self = NULL;
- 
--  boost::signals::connection conn;
-+  boost::signals2::connection conn;
- 
-   GtkWidget *menu_bar = NULL;
-   GtkWidget *frame = NULL;
---- lib/engine/gui/gtk-frontend/book-view-gtk.cpp.orig	2013-02-18 21:36:51 UTC
-+++ lib/engine/gui/gtk-frontend/book-view-gtk.cpp
-@@ -62,7 +62,7 @@ struct _BookViewGtkPrivate
-   GtkWidget *scrolled_window;
- 
-   Ekiga::BookPtr book;
--  std::list<boost::signals::connection> connections;
-+  std::list<boost::signals2::connection> connections;
- };
- 
- 
-@@ -447,7 +447,7 @@ book_view_gtk_dispose (GObject *obj)
- 
-   view = BOOK_VIEW_GTK (obj);
- 
--  for (std::list<boost::signals::connection>::iterator iter
-+  for (std::list<boost::signals2::connection>::iterator iter
- 	 = view->priv->connections.begin ();
-        iter != view->priv->connections.end ();
-        ++iter)
---- lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp.orig	2013-02-18 21:36:51 UTC
-+++ lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
-@@ -56,7 +56,7 @@ struct _CallHistoryViewGtkPrivate
-   boost::shared_ptr<History::Book> book;
-   GtkListStore* store;
-   GtkTreeView* tree;
--  std::vector<boost::signals::connection> connections;
-+  std::vector<boost::signals2::connection> connections;
- };
- 
- /* this is what we put in the view */
-@@ -229,7 +229,7 @@ call_history_view_gtk_dispose (GObject* obj)
- 
-   view = CALL_HISTORY_VIEW_GTK (obj);
- 
--  for (std::vector<boost::signals::connection>::iterator iter
-+  for (std::vector<boost::signals2::connection>::iterator iter
- 	 = view->priv->connections.begin ();
-        iter != view->priv->connections.end ();
-        iter++)
-@@ -314,7 +314,7 @@ call_history_view_gtk_new (boost::shared_ptr<History::
-   GtkCellRenderer *renderer = NULL;
-   GtkTreeSelection *selection = NULL;
- 
--  boost::signals::connection conn;
-+  boost::signals2::connection conn;
- 
-   g_return_val_if_fail (book, (GtkWidget*)NULL);
- 
---- lib/engine/gui/gtk-frontend/call-window.cpp.orig	2013-02-18 21:37:04 UTC
-+++ lib/engine/gui/gtk-frontend/call-window.cpp
-@@ -181,7 +181,7 @@ struct _EkigaCallWindowPrivate
- 
-   GtkWidget *transfer_call_popup;
- 
--  std::vector<boost::signals::connection> connections;
-+  std::vector<boost::signals2::connection> connections;
- };
- 
- /* properties */
-@@ -2207,7 +2207,7 @@ ekiga_call_window_transfer_dialog_run (EkigaCallWindow
- static void
- ekiga_call_window_connect_engine_signals (EkigaCallWindow *cw)
- {
--  boost::signals::connection conn;
-+  boost::signals2::connection conn;
- 
-   g_return_if_fail (EKIGA_IS_CALL_WINDOW (cw));
- 
---- lib/engine/gui/gtk-frontend/chat-area.cpp.orig	2013-02-18 21:36:51 UTC
-+++ lib/engine/gui/gtk-frontend/chat-area.cpp
-@@ -58,7 +58,7 @@ class ChatAreaHelper;
- struct _ChatAreaPrivate
- {
-   Ekiga::Chat* chat;
--  boost::signals::connection connection;
-+  boost::signals2::connection connection;
-   boost::shared_ptr<ChatAreaHelper> helper;
-   GmTextBufferEnhancer* enhancer;
-   GtkWidget* smiley_menu;
---- lib/engine/gui/gtk-frontend/chat-window.cpp.orig	2013-02-18 21:36:51 UTC
-+++ lib/engine/gui/gtk-frontend/chat-window.cpp
-@@ -54,7 +54,7 @@ struct _ChatWindowPrivate
-   {}
- 
-   Ekiga::ServiceCore& core;
--  std::list<boost::signals::connection> connections;
-+  std::list<boost::signals2::connection> connections;
- 
-   GtkWidget* notebook;
- };
-@@ -405,7 +405,7 @@ chat_window_finalize (GObject* obj)
- 
-   self = CHAT_WINDOW (obj);
- 
--  for (std::list<boost::signals::connection>::iterator iter
-+  for (std::list<boost::signals2::connection>::iterator iter
- 	 = self->priv->connections.begin ();
-        iter != self->priv->connections.end ();
-        ++iter)
---- lib/engine/gui/gtk-frontend/heap-view.cpp.orig	2013-02-18 21:36:51 UTC
-+++ lib/engine/gui/gtk-frontend/heap-view.cpp
-@@ -47,7 +47,7 @@
- struct _HeapViewPrivate
- {
-   Ekiga::HeapPtr heap;
--  std::vector<boost::signals::connection> connections;
-+  std::vector<boost::signals2::connection> connections;
- 
-   GtkTreeStore* store;
-   GtkTreeView* view;
-@@ -454,7 +454,7 @@ heap_view_set_heap (HeapView* self,
- {
-   if (self->priv->heap) {
- 
--    for (std::vector<boost::signals::connection>::iterator iter
-+    for (std::vector<boost::signals2::connection>::iterator iter
- 	   = self->priv->connections.begin ();
- 	 iter != self->priv->connections.end ();
- 	 iter++)
-@@ -465,7 +465,7 @@ heap_view_set_heap (HeapView* self,
- 
-   if (heap) {
- 
--    boost::signals::connection conn;
-+    boost::signals2::connection conn;
- 
-     conn = heap->removed.connect (boost::bind (&on_heap_removed, self));
-     self->priv->connections.push_back (conn);
---- lib/engine/gui/gtk-frontend/preferences-window.cpp.orig	2013-02-18 21:37:04 UTC
-+++ lib/engine/gui/gtk-frontend/preferences-window.cpp
-@@ -88,7 +88,7 @@ typedef struct _GmPreferencesWindow
-   GtkWidget *iface;
-   GtkWidget *fsbutton;
-   Ekiga::ServiceCore *core;
--  std::vector<boost::signals::connection> connections;
-+  std::vector<boost::signals2::connection> connections;
- } GmPreferencesWindow;
- 
- #define GM_PREFERENCES_WINDOW(x) (GmPreferencesWindow *) (x)
-@@ -1357,7 +1357,7 @@ preferences_window_new (Ekiga::ServiceCore & core)
- 
-   gm_window_hide_on_delete (window);
- 
--  boost::signals::connection conn;
-+  boost::signals2::connection conn;
-   boost::shared_ptr<Ekiga::VideoInputCore> videoinput_core = core.get<Ekiga::VideoInputCore> ("videoinput-core");
-   boost::shared_ptr<Ekiga::AudioInputCore> audioinput_core = core.get<Ekiga::AudioInputCore> ("audioinput-core");
-   boost::shared_ptr<Ekiga::AudioOutputCore> audiooutput_core = core.get<Ekiga::AudioOutputCore> ("audiooutput-core");
---- lib/engine/gui/gtk-frontend/presentity-view.cpp.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/gui/gtk-frontend/presentity-view.cpp
-@@ -40,8 +40,8 @@
- struct _PresentityViewPrivate
- {
-   Ekiga::Presentity* presentity;
--  boost::signals::connection updated_conn;
--  boost::signals::connection removed_conn;
-+  boost::signals2::connection updated_conn;
-+  boost::signals2::connection removed_conn;
- 
-   /* we contain those, so no need to unref them */
-   GtkWidget* presence_image;
---- lib/engine/gui/gtk-frontend/roster-view-gtk.cpp.orig	2013-02-18 21:37:04 UTC
-+++ lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
-@@ -60,7 +60,7 @@ struct _RosterViewGtkPrivate
- {
-   boost::shared_ptr<Ekiga::PresenceCore> core;
- 
--  std::vector<boost::signals::connection> connections;
-+  std::vector<boost::signals2::connection> connections;
-   GtkTreeStore *store;
-   GtkTreeView *tree_view;
-   GSList *folded_groups;
-@@ -1382,7 +1382,7 @@ roster_view_gtk_set_core (RosterViewGtk* self,
- {
-   if (self->priv->core) {
- 
--    for (std::vector<boost::signals::connection>::iterator iter
-+    for (std::vector<boost::signals2::connection>::iterator iter
- 	   = self->priv->connections.begin ();
- 	 iter != self->priv->connections.end ();
- 	 iter++)
-@@ -1393,7 +1393,7 @@ roster_view_gtk_set_core (RosterViewGtk* self,
- 
-   if (core) {
- 
--    boost::signals::connection conn;
-+    boost::signals2::connection conn;
- 
-     conn = core->cluster_added.connect (boost::bind (&on_cluster_added, self, _1));
-     self->priv->connections.push_back (conn);
---- lib/engine/gui/gtk-frontend/statusicon.cpp.orig	2013-02-18 21:37:04 UTC
-+++ lib/engine/gui/gtk-frontend/statusicon.cpp
-@@ -68,7 +68,7 @@ struct _StatusIconPrivate
-   GtkWidget *popup_menu;
-   gboolean has_message;
- 
--  std::vector<boost::signals::connection> connections;
-+  std::vector<boost::signals2::connection> connections;
- 
-   int blink_id;
-   std::string status;
-@@ -174,7 +174,7 @@ statusicon_finalize (GObject *obj)
-   if (self->priv->blink_image)
-     g_free (self->priv->blink_image);
- 
--  for (std::vector<boost::signals::connection>::iterator iter = self->priv->connections.begin () ;
-+  for (std::vector<boost::signals2::connection>::iterator iter = self->priv->connections.begin () ;
-        iter != self->priv->connections.end ();
-        iter++)
-     iter->disconnect ();
-@@ -548,7 +548,7 @@ status_icon_new (Ekiga::ServiceCore & core)
-   if (!statusicon_should_run ())
-     return self;
- 
--  boost::signals::connection conn;
-+  boost::signals2::connection conn;
- 
-   self = STATUSICON (g_object_new (STATUSICON_TYPE, NULL));
-   self->priv = new StatusIconPrivate (core);
---- lib/engine/gui/gtk-frontend/statusicon.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/gui/gtk-frontend/statusicon.h
-@@ -42,7 +42,7 @@
- 
- #include <gtk/gtk.h>
- 
--#include <boost/signals.hpp>
-+#include <boost/signals2.hpp>
- #include <boost/bind.hpp>
- 
- G_BEGIN_DECLS
---- lib/engine/hal/hal-core.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/hal/hal-core.h
-@@ -40,7 +40,7 @@
- 
- #include "services.h"
- 
--#include <boost/signals.hpp>
-+#include <boost/signals2.hpp>
- #include <boost/bind.hpp>
- 
- #include <set>
-@@ -114,24 +114,24 @@ namespace Ekiga
-       /** This signal is emitted when an Ekiga::HalManager has been
-        * added to the HalCore Service.
-        */
--       boost::signal1<void, HalManager &> manager_added;
-+       boost::signals2::signal<void(HalManager &)> manager_added;
- 
- 
-       /*** API to act on HAL events ***/
- 
-       /** See hal-manager.h for the API
-        */
--      boost::signal4<void, const std::string &, const std::string &, unsigned, HalManager*> videoinput_device_added;
--      boost::signal4<void, const std::string &, const std::string &, unsigned, HalManager*> videoinput_device_removed;
-+      boost::signals2::signal<void(const std::string &, const std::string &, unsigned, HalManager*)> videoinput_device_added;
-+      boost::signals2::signal<void(const std::string &, const std::string &, unsigned, HalManager*)> videoinput_device_removed;
- 
--      boost::signal3<void, const std::string &, const std::string &, HalManager*> audioinput_device_added;
--      boost::signal3<void, const std::string &, const std::string &, HalManager*> audioinput_device_removed;
-+      boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> audioinput_device_added;
-+      boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> audioinput_device_removed;
- 
--      boost::signal3<void, const std::string &, const std::string &, HalManager*> audiooutput_device_added;
--      boost::signal3<void, const std::string &, const std::string &, HalManager*> audiooutput_device_removed;
-+      boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> audiooutput_device_added;
-+      boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> audiooutput_device_removed;
- 
--      boost::signal3<void, const std::string &, const std::string &, HalManager*> network_interface_up;
--      boost::signal3<void, const std::string &, const std::string &, HalManager*> network_interface_down;
-+      boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> network_interface_up;
-+      boost::signals2::signal<void(const std::string &, const std::string &, HalManager*)> network_interface_down;
- 
-   private:
- 
---- lib/engine/hal/hal-manager.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/hal/hal-manager.h
-@@ -75,50 +75,50 @@ namespace Ekiga
-        * @param device the device name.
-        * @param capabilities source-dependent device capabilites (e.g. V4L1 or V4L2 for video4linux).
-        */
--      boost::signal3<void, std::string, std::string, unsigned> videoinput_device_added;
-+      boost::signals2::signal<void(std::string, std::string, unsigned)> videoinput_device_added;
- 
-       /** This signal is emitted when a video input device is removed from the system.
-        * @param source the video input framework (e.g. video4linux, etc.).
-        * @param device the device name.
-        * @param capabilities source-dependent device capabilites (e.g. V4L1 or V4L2 for video4linux).
-        */
--      boost::signal3<void, std::string, std::string, unsigned> videoinput_device_removed;
-+      boost::signals2::signal<void(std::string, std::string, unsigned)> videoinput_device_removed;
- 
-       /** This signal is emitted when an audio input device is added to the system.
-        * @param source the audio input framework (e.g. alsa, oss, etc.).
-        * @param device the device name.
-        */
--      boost::signal2<void, std::string, std::string> audioinput_device_added;
-+      boost::signals2::signal<void(std::string, std::string)> audioinput_device_added;
- 
-       /** This signal is emitted when an audio input device is removed from the system.
-        * @param source the audio input framework (e.g. alsa, oss, etc.).
-        * @param device the device name.
-        */
--      boost::signal2<void, std::string, std::string> audioinput_device_removed;
-+      boost::signals2::signal<void(std::string, std::string)> audioinput_device_removed;
- 
-       /** This signal is emitted when an audio output device is added to the system.
-        * @param source the audio output framework (e.g. alsa, oss, etc.).
-        * @param device the device name.
-        */
--      boost::signal2<void, std::string, std::string> audiooutput_device_added;
-+      boost::signals2::signal<void(std::string, std::string)> audiooutput_device_added;
- 
-       /** This signal is emitted when an audio output device is removed from the system.
-        * @param source the audio output framework (e.g. alsa, oss, etc.).
-        * @param device the device name.
-        */
--      boost::signal2<void, std::string, std::string> audiooutput_device_removed;
-+      boost::signals2::signal<void(std::string, std::string)> audiooutput_device_removed;
- 
-       /** This signal is emitted when a network device comes up.
-        * @param interface_name the interface name (e.g. eth0, etc.).
-        * @param ip4_address the IPv4 address (e.g. "192.168.0.1").
-        */
--      boost::signal2<void, std::string, std::string> network_interface_up;
-+      boost::signals2::signal<void(std::string, std::string)> network_interface_up;
- 
-       /** This signal is emitted when a network device goes down.
-        * @param interface_name the interface name (e.g. eth0, etc.).
-        * @param ip4_address the IPv4 address (e.g. "192.168.0.1").
-        */
--      boost::signal2<void, std::string, std::string> network_interface_down;
-+      boost::signals2::signal<void(std::string, std::string)> network_interface_down;
-   };
- 
- /**
---- lib/engine/notification/notification-core.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/notification/notification-core.h
-@@ -77,7 +77,7 @@ namespace Ekiga
-     void action_trigger ()
-     { if (action_callback) action_callback (); }
- 
--    boost::signal0<void> removed;
-+    boost::signals2::signal<void(void)> removed;
- 
-   private:
- 
-@@ -109,7 +109,7 @@ namespace Ekiga
-     void push_notification (boost::shared_ptr<Notification> notification)
-     { notification_added (notification); }
- 
--    boost::signal1<void, boost::shared_ptr<Notification> > notification_added;
-+    boost::signals2::signal<void(boost::shared_ptr<Notification>)> notification_added;
-   };
- };
- 
---- lib/engine/presence/cluster.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/presence/cluster.h
-@@ -66,16 +66,16 @@ namespace Ekiga
-      * from the Cluster.
-      * @param The Heap in question.
-      */
--    boost::signal1<void, HeapPtr > heap_added;
--    boost::signal1<void, HeapPtr > heap_removed;
-+    boost::signals2::signal<void(HeapPtr)> heap_added;
-+    boost::signals2::signal<void(HeapPtr)> heap_removed;
- 
-     /** Those signals are forwarded from the given Heap
-      * @param The Heap in question.
-      */
--    boost::signal1<void, HeapPtr > heap_updated;
--    boost::signal2<void, HeapPtr , PresentityPtr > presentity_added;
--    boost::signal2<void, HeapPtr , PresentityPtr > presentity_updated;
--    boost::signal2<void, HeapPtr , PresentityPtr > presentity_removed;
-+    boost::signals2::signal<void(HeapPtr)> heap_updated;
-+    boost::signals2::signal<void(HeapPtr , PresentityPtr )> presentity_added;
-+    boost::signals2::signal<void(HeapPtr , PresentityPtr )> presentity_updated;
-+    boost::signals2::signal<void(HeapPtr , PresentityPtr )> presentity_removed;
-   };
- 
-   typedef boost::shared_ptr<Cluster> ClusterPtr;
---- lib/engine/presence/heap.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/presence/heap.h
-@@ -83,15 +83,15 @@ namespace Ekiga
- 
-     /** This signal is emitted  when a Presentity has been added to the Heap.
-      */
--    boost::signal1<void, PresentityPtr > presentity_added;
-+    boost::signals2::signal<void(PresentityPtr)> presentity_added;
- 
-     /** This signal is emitted when a Presentity has been updated in the Heap.
-      */
--    boost::signal1<void, PresentityPtr > presentity_updated;
-+    boost::signals2::signal<void(PresentityPtr)> presentity_updated;
- 
-     /** This signal is emitted when a Presentity has been removed from the Heap.
-      */
--    boost::signal1<void, PresentityPtr > presentity_removed;
-+    boost::signals2::signal<void(PresentityPtr)> presentity_removed;
-   };
- 
-   typedef boost::shared_ptr<Heap> HeapPtr;
---- lib/engine/presence/presence-core.cpp.orig	2013-02-18 21:36:51 UTC
-+++ lib/engine/presence/presence-core.cpp
-@@ -49,7 +49,7 @@ Ekiga::PresenceCore::PresenceCore (Ekiga::ServiceCore&
- 
- Ekiga::PresenceCore::~PresenceCore ()
- {
--  for (std::list<boost::signals::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter)
-+  for (std::list<boost::signals2::connection>::iterator iter = conns.begin (); iter != conns.end (); ++iter)
-     iter->disconnect ();
- }
- 
---- lib/engine/presence/presence-core.h.orig	2013-02-18 21:36:51 UTC
-+++ lib/engine/presence/presence-core.h
-@@ -97,8 +97,8 @@ namespace Ekiga
-      * presence information about an uri it was required to handle.
-      * The information is given as a pair of strings (uri, data).
-      */
--    boost::signal2<void, std::string, std::string> presence_received;
--    boost::signal2<void, std::string, std::string> status_received;
-+    boost::signals2::signal<void(std::string, std::string)> presence_received;
-+    boost::signals2::signal<void(std::string, std::string)> status_received;
-   };
- 
-   class PresencePublisher
-@@ -180,22 +180,22 @@ namespace Ekiga
-     /** This signal is emitted when an Ekiga::Cluster has been added
-      * to the PresenceCore Service.
-      */
--    boost::signal1<void, ClusterPtr > cluster_added;
-+    boost::signals2::signal<void(ClusterPtr)> cluster_added;
- 
-     /** Those signals are forwarding the heap_added, heap_updated
-      * and heap_removed from the given Cluster.
-      *
-      */
--    boost::signal2<void, ClusterPtr , HeapPtr > heap_added;
--    boost::signal2<void, ClusterPtr , HeapPtr > heap_updated;
--    boost::signal2<void, ClusterPtr , HeapPtr > heap_removed;
-+    boost::signals2::signal<void(ClusterPtr , HeapPtr )> heap_added;
-+    boost::signals2::signal<void(ClusterPtr , HeapPtr )> heap_updated;
-+    boost::signals2::signal<void(ClusterPtr , HeapPtr )> heap_removed;
- 
-     /** Those signals are forwarding the presentity_added, presentity_updated
-      * and presentity_removed from the given Heap of the given Cluster.
-      */
--    boost::signal3<void, ClusterPtr , HeapPtr , PresentityPtr > presentity_added;
--    boost::signal3<void, ClusterPtr , HeapPtr , PresentityPtr > presentity_updated;
--    boost::signal3<void, ClusterPtr , HeapPtr , PresentityPtr > presentity_removed;
-+    boost::signals2::signal<void(ClusterPtr , HeapPtr , PresentityPtr )> presentity_added;
-+    boost::signals2::signal<void(ClusterPtr , HeapPtr , PresentityPtr )> presentity_updated;
-+    boost::signals2::signal<void(ClusterPtr , HeapPtr , PresentityPtr )> presentity_removed;
- 
-   private:
- 
-@@ -256,8 +256,8 @@ namespace Ekiga
-     /** Those signals are emitted whenever information has been received
-      * about an uri ; the information is a pair of strings (uri, information).
-      */
--    boost::signal2<void, std::string, std::string> presence_received;
--    boost::signal2<void, std::string, std::string> status_received;
-+    boost::signals2::signal<void(std::string, std::string)> presence_received;
-+    boost::signals2::signal<void(std::string, std::string)> status_received;
- 
-   private:
- 
-@@ -321,7 +321,7 @@ namespace Ekiga
- 
-   private:
- 
--    std::list<boost::signals::connection> conns;
-+    std::list<boost::signals2::connection> conns;
-   };
- 
- /**
---- lib/engine/presence/uri-presentity.h.orig	2013-02-18 21:36:51 UTC
-+++ lib/engine/presence/uri-presentity.h
-@@ -60,7 +60,7 @@ namespace Ekiga
-    */
-   class URIPresentity:
-     public Ekiga::Presentity,
--    public boost::signals::trackable
-+    public boost::signals2::trackable
-   {
-   public:
- 
---- lib/engine/protocol/call-core.cpp.orig	2013-02-18 21:36:51 UTC
-+++ lib/engine/protocol/call-core.cpp
-@@ -48,7 +48,7 @@ using namespace Ekiga;
- 
- CallCore::~CallCore ()
- {
--  for (std::list<boost::signals::connection>::iterator iter = manager_connections.begin ();
-+  for (std::list<boost::signals2::connection>::iterator iter = manager_connections.begin ();
-        iter != manager_connections.end ();
-        ++iter)
-     iter->disconnect ();
-@@ -103,7 +103,7 @@ bool CallCore::dial (const std::string uri)
- 
- void CallCore::add_call (boost::shared_ptr<Call> call, boost::shared_ptr<CallManager> manager)
- {
--  std::list<boost::signals::connection> conns;
-+  std::list<boost::signals2::connection> conns;
- 
-   conns.push_back (call->ringing.connect (boost::bind (&CallCore::on_ringing_call, this, call, manager)));
-   conns.push_back (call->setup.connect (boost::bind (&CallCore::on_setup_call, this, call, manager)));
-@@ -124,7 +124,7 @@ void CallCore::add_call (boost::shared_ptr<Call> call,
- 
- void CallCore::remove_call (boost::shared_ptr<Call> call)
- {
--  for (std::list<boost::signals::connection>::iterator iter2 = call_connections [call->get_id ()].begin ();
-+  for (std::list<boost::signals2::connection>::iterator iter2 = call_connections [call->get_id ()].begin ();
-        iter2 != call_connections [call->get_id ()].end ();
-        ++iter2)
-     iter2->disconnect ();
---- lib/engine/protocol/call-core.h.orig	2013-02-18 21:36:51 UTC
-+++ lib/engine/protocol/call-core.h
-@@ -45,7 +45,7 @@
- #include "call-protocol-manager.h"
- #include <boost/smart_ptr.hpp>
- 
--#include <boost/signals.hpp>
-+#include <boost/signals2.hpp>
- #include <boost/bind.hpp>
- #include <set>
- #include <map>
-@@ -126,7 +126,7 @@ namespace Ekiga
-       /** This signal is emitted when a Ekiga::CallManager has been
-        * added to the CallCore Service.
-        */
--      boost::signal1<void, boost::shared_ptr<CallManager> > manager_added;
-+      boost::signals2::signal<void(boost::shared_ptr<CallManager>)> manager_added;
- 
- 
-       /*** Call Management ***/                 
-@@ -141,21 +141,21 @@ namespace Ekiga
-       
-       /** See call.h for the API
-        */
--      boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > ringing_call;
--      boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > setup_call;
--      boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > missed_call;
--      boost::signal3<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string> cleared_call;
--      boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > established_call;
--      boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > held_call;
--      boost::signal2<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call> > retrieved_call;
--      boost::signal5<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string, Call::StreamType, bool> stream_opened;
--      boost::signal5<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string, Call::StreamType, bool> stream_closed;
--      boost::signal4<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string, Call::StreamType> stream_paused;
--      boost::signal4<void, boost::shared_ptr<CallManager> , boost::shared_ptr<Call>, std::string, Call::StreamType> stream_resumed;
-+      boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> ringing_call;
-+      boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> setup_call;
-+      boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> missed_call;
-+      boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string)> cleared_call;
-+      boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> established_call;
-+      boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> held_call;
-+      boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>)> retrieved_call;
-+      boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string, Call::StreamType, bool)> stream_opened;
-+      boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string, Call::StreamType, bool)> stream_closed;
-+      boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string, Call::StreamType)> stream_paused;
-+      boost::signals2::signal<void(boost::shared_ptr<CallManager>, boost::shared_ptr<Call>, std::string, Call::StreamType)> stream_resumed;
- 
-       /*** Misc ***/
--      boost::signal1<void, boost::shared_ptr<CallManager> > manager_ready;
--      boost::signal0<void> ready;
-+      boost::signals2::signal<void(boost::shared_ptr<CallManager>)> manager_ready;
-+      boost::signals2::signal<void(void)> ready;
- 
-       /** This chain allows the CallCore to report errors to the user
-        */
-@@ -186,8 +186,8 @@ namespace Ekiga
- 
-       
-       std::set<boost::shared_ptr<CallManager> > managers;
--      std::list<boost::signals::connection> manager_connections;
--      std::map<std::string, std::list<boost::signals::connection> > call_connections;
-+      std::list<boost::signals2::connection> manager_connections;
-+      std::map<std::string, std::list<boost::signals2::connection> > call_connections;
-       unsigned nr_ready;
-     };
- 
---- lib/engine/protocol/call-manager.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/protocol/call-manager.h
-@@ -40,7 +40,7 @@
- #define __CALL_MANAGER_H__
- 
- #include <set>
--#include <boost/signals.hpp>
-+#include <boost/signals2.hpp>
- #include <boost/bind.hpp>
- 
- #include <boost/smart_ptr.hpp>
-@@ -99,7 +99,7 @@ namespace Ekiga
-     /** This signal is emitted when a Ekiga::CallProtocolManager has been
-      * added to the CallManager.
-      */
--    boost::signal1<void, boost::shared_ptr<CallProtocolManager> > manager_added;
-+    boost::signals2::signal<void(boost::shared_ptr<CallProtocolManager>)> manager_added;
- 
- 
-     /*                 
-@@ -213,7 +213,7 @@ namespace Ekiga
-     /*
-      * MISC
-      */
--    boost::signal0<void> ready;
-+    boost::signals2::signal<void(void)> ready;
- 
-     private:
-     std::set<boost::shared_ptr<CallProtocolManager> > managers;
---- lib/engine/protocol/call.h.orig	2013-02-18 21:36:51 UTC
-+++ lib/engine/protocol/call.h
-@@ -38,7 +38,7 @@
- #ifndef __CALL_H__
- #define __CALL_H__
- 
--#include <boost/signals.hpp>
-+#include <boost/signals2.hpp>
- #include <boost/bind.hpp>
- #include <string>
- 
-@@ -198,69 +198,69 @@ namespace Ekiga
- 
-       /* Signal emitted when the call is established
-        */
--      boost::signal0<void> established;
-+      boost::signals2::signal<void(void)> established;
- 
-       /* Signal emitted when an established call is cleared
-        * @param: a string describing why the call was cleared
-        */
--      boost::signal1<void, std::string> cleared;
-+      boost::signals2::signal<void(std::string)> cleared;
- 
-       /* Signal emitted when the call is missed, ie cleared
-        * without having been established
-        */
--      boost::signal0<void> missed;
-+      boost::signals2::signal<void(void)> missed;
- 
-       /* Signal emitted when the call is forwarded
-        */
--      boost::signal0<void> forwarded;
-+      boost::signals2::signal<void(void)> forwarded;
- 
-       /* Signal emitted when the call is held
-        */
--      boost::signal0<void> held;
-+      boost::signals2::signal<void(void)> held;
- 
-       /* Signal emitted when the call is retrieved
-        */
--      boost::signal0<void> retrieved;
-+      boost::signals2::signal<void(void)> retrieved;
- 
-       /* Signal emitted when the call is being setup
-        */
--      boost::signal0<void> setup;
-+      boost::signals2::signal<void(void)> setup;
- 
-       /* Signal emitted when the remote party is ringing
-        */
--      boost::signal0<void> ringing;
-+      boost::signals2::signal<void(void)> ringing;
- 
-       /* Signal emitted when a stream is opened
-        * @param the stream name
-        * @param the stream type
-        * @param transmission or reception
-        */
--      boost::signal3<void, std::string, StreamType, bool> stream_opened;
-+      boost::signals2::signal<void(std::string, StreamType, bool)> stream_opened;
- 
-       /* Signal emitted when a stream is closed
-        * @param the stream name
-        * @param the stream type
-        * @param transmission or reception
-        */
--      boost::signal3<void, std::string, StreamType, bool> stream_closed;
-+      boost::signals2::signal<void(std::string, StreamType, bool)> stream_closed;
- 
-       /* Signal emitted when a transmitted stream is paused
-        * @param the stream name
-        * @param the stream type
-        * @param transmission or reception
-        */
--      boost::signal2<void, std::string, StreamType> stream_paused;
-+      boost::signals2::signal<void(std::string, StreamType)> stream_paused;
- 
-       /* Signal emitted when a transmitted stream is resumed
-        * @param the stream name
-        * @param the stream type
-        * @param transmission or reception
-        */
--      boost::signal2<void, std::string, StreamType> stream_resumed;
-+      boost::signals2::signal<void(std::string, StreamType)> stream_resumed;
- 
-       /** This signal is emitted when the Call is removed.
-        */
--      boost::signal0<void> removed;
-+      boost::signals2::signal<void(void)> removed;
-      
-     };
- 
---- lib/engine/videoinput/videoinput-core.h.orig	2013-02-19 06:11:02 UTC
-+++ lib/engine/videoinput/videoinput-core.h
-@@ -45,7 +45,7 @@
- #include "videoinput-manager.h"
- #include "videoinput-gmconf-bridge.h"
- 
--#include <boost/signals.hpp>
-+#include <boost/signals2.hpp>
- #include <boost/bind.hpp>
- #include <glib.h>
- #include <set>
-@@ -146,7 +146,7 @@ namespace Ekiga
-       /** This signal is emitted when a Ekiga::VideoInputManager has been
-        * added to the VideoInputCore Service.
-        */
--       boost::signal1<void, VideoInputManager &> manager_added;
-+       boost::signals2::signal<void(VideoInputManager &)> manager_added;
- 
- 
-       /*** VideoInput Device Management ***/
-@@ -277,23 +277,23 @@ namespace Ekiga
- 
-       /** See videoinput-manager.h for the API
-        */
--      boost::signal3<void, VideoInputManager &, VideoInputDevice &, VideoInputSettings&> device_opened;
--      boost::signal2<void, VideoInputManager &, VideoInputDevice &> device_closed;
--      boost::signal3<void, VideoInputManager &, VideoInputDevice &, VideoInputErrorCodes> device_error;
-+      boost::signals2::signal<void(VideoInputManager &, VideoInputDevice &, VideoInputSettings&)> device_opened;
-+      boost::signals2::signal<void(VideoInputManager &, VideoInputDevice &)> device_closed;
-+      boost::signals2::signal<void(VideoInputManager &, VideoInputDevice &, VideoInputErrorCodes)> device_error;
- 
-       /** This signal is emitted when a video input has been added to the system.
-        * This signal will be emitted if add_device was called with a device name and
-        * a manager claimed support for this device.
-        * @param device the video input device that was added.
-        */
--      boost::signal2<void, VideoInputDevice, bool> device_added;
-+      boost::signals2::signal<void(VideoInputDevice, bool)> device_added;
- 
-       /** This signal is emitted when a video input has been removed from the system.
-        * This signal will be emitted if remove_device was called with a device name and
-        * a manager claimed support for this device.
-        * @param device the video input device that was removed.
-        */
--      boost::signal2<void, VideoInputDevice, bool> device_removed;
-+      boost::signals2::signal<void(VideoInputDevice, bool)> device_removed;
- 
-   private:
-       void on_set_device (const VideoInputDevice & device);
---- lib/engine/videoinput/videoinput-manager.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/videoinput/videoinput-manager.h
-@@ -39,7 +39,7 @@
- #define __VIDEOINPUT_MANAGER_H__
- 
- #include <vector>
--#include <boost/signals.hpp>
-+#include <boost/signals2.hpp>
- #include <boost/bind.hpp>
- 
- #include "videoinput-info.h"
-@@ -159,18 +159,18 @@ namespace Ekiga
-        * @param device the video input device that was opened.
-        * @param config the current video input device configuration (current brightness, colour, etc.).
-        */
--      boost::signal2<void, VideoInputDevice, VideoInputSettings> device_opened;
-+      boost::signals2::signal<void(VideoInputDevice, VideoInputSettings)> device_opened;
- 
-       /** This signal is emitted when a video input device is closed.
-        * @param device the video input device that was closed.
-        */
--      boost::signal1<void, VideoInputDevice> device_closed;
-+      boost::signals2::signal<void(VideoInputDevice)> device_closed;
- 
-       /** This signal is emitted when an error occurs when opening a video input device.
-        * @param device the video input device that caused the error.
-        * @param error_code the video input device error code.
-        */
--      boost::signal2<void, VideoInputDevice, VideoInputErrorCodes> device_error;
-+      boost::signals2::signal<void(VideoInputDevice, VideoInputErrorCodes)> device_error;
- 
-   protected:  
-       typedef struct ManagerState {
---- lib/engine/videooutput/videooutput-core.h.orig	2013-02-18 21:36:51 UTC
-+++ lib/engine/videooutput/videooutput-core.h
-@@ -42,7 +42,7 @@
- #include "videooutput-gmconf-bridge.h"
- #include "videooutput-manager.h"
- 
--#include <boost/signals.hpp>
-+#include <boost/signals2.hpp>
- #include <boost/bind.hpp>
- #include <set>
- #include <map>
-@@ -116,7 +116,7 @@ namespace Ekiga
-       /** This signal is emitted when a Ekiga::VideoOutputManager has been
-        * added to the VideoOutputCore Service.
-        */
--      boost::signal1<void, VideoOutputManager &> manager_added;
-+      boost::signals2::signal<void(VideoOutputManager &)> manager_added;
- 
- 
-       /*** Videooutput Management ***/
-@@ -165,11 +165,11 @@ namespace Ekiga
- 
-       /** See videooutput-manager.h for the API
-        */
--      boost::signal6<void, VideoOutputManager &, VideoOutputAccel, VideoOutputMode, unsigned, bool, bool> device_opened;
--      boost::signal1<void, VideoOutputManager &> device_closed;
--      boost::signal2<void, VideoOutputManager &, VideoOutputErrorCodes> device_error;
--      boost::signal2<void, VideoOutputManager &, VideoOutputFSToggle> fullscreen_mode_changed;
--      boost::signal3<void, VideoOutputManager &, unsigned, unsigned> size_changed;
-+      boost::signals2::signal<void(VideoOutputManager &, VideoOutputAccel, VideoOutputMode, unsigned, bool, bool)> device_opened;
-+      boost::signals2::signal<void(VideoOutputManager &)> device_closed;
-+      boost::signals2::signal<void(VideoOutputManager &, VideoOutputErrorCodes)> device_error;
-+      boost::signals2::signal<void(VideoOutputManager &, VideoOutputFSToggle)> fullscreen_mode_changed;
-+      boost::signals2::signal<void(VideoOutputManager &, unsigned, unsigned)> size_changed;
- 
- 
-   private:
---- lib/engine/videooutput/videooutput-manager.h.orig	2013-02-19 06:11:02 UTC
-+++ lib/engine/videooutput/videooutput-manager.h
-@@ -38,7 +38,7 @@
- #ifndef __VIDEOOUTPUT_MANAGER_H__
- #define __VIDEOOUTPUT_MANAGER_H__
- 
--#include <boost/signals.hpp>
-+#include <boost/signals2.hpp>
- #include <boost/bind.hpp>
- 
- #include "videooutput-info.h"
-@@ -108,16 +108,16 @@ namespace Ekiga
-        * @param both_streams if a frame from both local and remote stream has been received.
-        * @param ext_stream if a frame from an extended video stream has been received.
-        */
--      boost::signal5<void, VideoOutputAccel, VideoOutputMode, unsigned, bool, bool> device_opened;
-+      boost::signals2::signal<void(VideoOutputAccel, VideoOutputMode, unsigned, bool, bool)> device_opened;
- 
-       /** This signal is emitted when a video output device is closed.
-        */
--      boost::signal0<void> device_closed;
-+      boost::signals2::signal<void(void)> device_closed;
- 
-       /** This signal is emitted when an error occurs when opening a video output device.
-        * @param error_code the video output device error code.
-        */
--      boost::signal1<void, VideoOutputErrorCodes> device_error;
-+      boost::signals2::signal<void(VideoOutputErrorCodes)> device_error;
- 
-       /** This signal is emitted when a manager switches autonomously into or out of fullscreen mode.
-        * Some managers like DX and XV  allow the user to switch between FS
-@@ -127,7 +127,7 @@ namespace Ekiga
-        * or when it is being zoomed in or out.
-        * @param toggle VO_FS_ON or VO_FS_OFF depending on whether FS was activated or deactivated.
-        */
--      boost::signal1<void, VideoOutputFSToggle> fullscreen_mode_changed;
-+      boost::signals2::signal<void(VideoOutputFSToggle)> fullscreen_mode_changed;
- 
-       /** This signal is emitted the video output size has changed.
-        * This signal is called whenever the size of the widget carrying the video signal
-@@ -136,7 +136,7 @@ namespace Ekiga
-        * @param width the new width of the widget.
-        * @param height the new height of the widget.
-        */
--      boost::signal2<void, unsigned, unsigned> size_changed;
-+      boost::signals2::signal<void(unsigned, unsigned)> size_changed;
- 
-   protected:  
-       virtual void get_display_info (DisplayInfo &) { };
---- man/Makefile.in.orig	2013-02-20 21:44:16 UTC
-+++ man/Makefile.in
-@@ -55,7 +55,6 @@ subdir = man
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
--	$(top_srcdir)/m4/ax_boost_signals.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
- 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-@@ -125,8 +124,6 @@ AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
- BOOST_LDFLAGS = @BOOST_LDFLAGS@
--BOOST_LIBS = @BOOST_LIBS@
--BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@
- CATALOGS = @CATALOGS@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
---- pixmaps/Makefile.in.orig	2013-02-20 21:44:16 UTC
-+++ pixmaps/Makefile.in
-@@ -57,7 +57,6 @@ DIST_COMMON = $(nobase_dist_icon_DATA) $(srcdir)/Makef
- 	$(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
--	$(top_srcdir)/m4/ax_boost_signals.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
- 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-@@ -125,8 +124,6 @@ AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
- BOOST_LDFLAGS = @BOOST_LDFLAGS@
--BOOST_LIBS = @BOOST_LIBS@
--BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@
- CATALOGS = @CATALOGS@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
---- plugins/Makefile.in.orig	2013-02-20 21:44:16 UTC
-+++ plugins/Makefile.in
-@@ -55,7 +55,6 @@ subdir = plugins
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
--	$(top_srcdir)/m4/ax_boost_signals.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
- 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-@@ -135,8 +134,6 @@ AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
- BOOST_LDFLAGS = @BOOST_LDFLAGS@
--BOOST_LIBS = @BOOST_LIBS@
--BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@
- CATALOGS = @CATALOGS@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
---- plugins/avahi/Makefile.in.orig	2013-02-20 21:44:16 UTC
-+++ plugins/avahi/Makefile.in
-@@ -56,7 +56,6 @@ subdir = plugins/avahi
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
--	$(top_srcdir)/m4/ax_boost_signals.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
- 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-@@ -176,8 +175,6 @@ AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
- BOOST_LDFLAGS = @BOOST_LDFLAGS@
--BOOST_LIBS = @BOOST_LIBS@
--BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@
- CATALOGS = @CATALOGS@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
-@@ -398,7 +395,7 @@ libgmavahi_la_SOURCES = \
- libgmavahi_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
- libgmavahi_la_LIBADD = \
- 	$(top_builddir)/lib/libekiga.la \
--	$(BOOST_LDFLAGS) $(BOOST_LIBS) $(AVAHI_LIBS)
-+	$(BOOST_LDFLAGS) $(AVAHI_LIBS)
- 
- all: all-am
- 
---- plugins/avahi/avahi-cluster.h.orig	2012-11-07 20:43:51 UTC
-+++ plugins/avahi/avahi-cluster.h
-@@ -53,7 +53,7 @@ namespace Avahi
-   class Cluster:
-     public Ekiga::Service,
-     public Ekiga::ClusterImpl<Heap>,
--    public boost::signals::trackable
-+    public boost::signals2::trackable
-   {
-   public:
- 
---- plugins/avahi/avahi-heap.h.orig	2013-02-18 21:36:51 UTC
-+++ plugins/avahi/avahi-heap.h
-@@ -60,7 +60,7 @@ namespace Avahi
-   class Heap:
-     public Ekiga::PresenceFetcher,
-     public Ekiga::HeapImpl<Ekiga::URIPresentity>,
--    public boost::signals::trackable
-+    public boost::signals2::trackable
-   {
-   public:
- 
---- plugins/evolution/Makefile.in.orig	2013-02-20 21:44:16 UTC
-+++ plugins/evolution/Makefile.in
-@@ -56,7 +56,6 @@ subdir = plugins/evolution
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
--	$(top_srcdir)/m4/ax_boost_signals.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
- 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-@@ -176,8 +175,6 @@ AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
- BOOST_LDFLAGS = @BOOST_LDFLAGS@
--BOOST_LIBS = @BOOST_LIBS@
--BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@
- CATALOGS = @CATALOGS@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
-@@ -397,7 +394,7 @@ libgmevolution_la_SOURCES = \
- libgmevolution_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
- libgmevolution_la_LIBADD = \
- 	$(top_builddir)/lib/libekiga.la \
--	$(BOOST_LDFLAGS) $(BOOST_LIBS) $(EDS_LIBS) $(GLIB_LIBS)
-+	$(BOOST_LDFLAGS) $(EDS_LIBS) $(GLIB_LIBS)
- 
- all: all-am
- 
---- plugins/gstreamer/Makefile.in.orig	2013-02-20 21:44:17 UTC
-+++ plugins/gstreamer/Makefile.in
-@@ -56,7 +56,6 @@ subdir = plugins/gstreamer
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
--	$(top_srcdir)/m4/ax_boost_signals.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
- 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-@@ -176,8 +175,6 @@ AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
- BOOST_LDFLAGS = @BOOST_LDFLAGS@
--BOOST_LIBS = @BOOST_LIBS@
--BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@
- CATALOGS = @CATALOGS@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
-@@ -404,7 +401,7 @@ libgmgstreamer_la_SOURCES = \
- 
- libgmgstreamer_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
- libgmgstreamer_la_LIBADD = \
--	$(BOOST_LDFLAGS) $(BOOST_LIBS) $(GSTREAMER_LIBS) $(PTLIB_LIBS)
-+	$(BOOST_LDFLAGS) $(GSTREAMER_LIBS) $(PTLIB_LIBS)
- 
- all: all-am
- 
---- plugins/kab/Makefile.in.orig	2013-02-20 21:44:17 UTC
-+++ plugins/kab/Makefile.in
-@@ -56,7 +56,6 @@ subdir = plugins/kab
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
--	$(top_srcdir)/m4/ax_boost_signals.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
- 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-@@ -173,8 +172,6 @@ AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
- BOOST_LDFLAGS = @BOOST_LDFLAGS@
--BOOST_LIBS = @BOOST_LIBS@
--BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@
- CATALOGS = @CATALOGS@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
---- plugins/kde/Makefile.in.orig	2013-02-20 21:44:17 UTC
-+++ plugins/kde/Makefile.in
-@@ -56,7 +56,6 @@ subdir = plugins/kde
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
--	$(top_srcdir)/m4/ax_boost_signals.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
- 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-@@ -173,8 +172,6 @@ AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
- BOOST_LDFLAGS = @BOOST_LDFLAGS@
--BOOST_LIBS = @BOOST_LIBS@
--BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@
- CATALOGS = @CATALOGS@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
-@@ -386,7 +383,7 @@ libgmkde_la_SOURCES = \
- 
- libgmkde_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
- libgmkde_la_LIBADD = \
--	$(BOOST_LDFLAGS) $(BOOST_LIBS) $(KDE_LIBS)
-+	$(BOOST_LDFLAGS) $(KDE_LIBS)
- 
- all: all-am
- 
---- plugins/ldap/Makefile.in.orig	2013-02-20 21:44:17 UTC
-+++ plugins/ldap/Makefile.in
-@@ -56,7 +56,6 @@ subdir = plugins/ldap
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
--	$(top_srcdir)/m4/ax_boost_signals.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
- 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-@@ -176,8 +175,6 @@ AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
- BOOST_LDFLAGS = @BOOST_LDFLAGS@
--BOOST_LIBS = @BOOST_LIBS@
--BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@
- CATALOGS = @CATALOGS@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
-@@ -398,7 +395,7 @@ libgmldap_la_SOURCES = \
- libgmldap_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
- libgmldap_la_LIBADD = \
- 	$(top_builddir)/lib/libekiga.la \
--	$(LDAP_LIBS) $(BOOST_LDFLAGS) $(BOOST_LIBS) $(GLIB_LIBS) $(XML_LIBS)
-+	$(LDAP_LIBS) $(BOOST_LDFLAGS) $(GLIB_LIBS) $(XML_LIBS)
- 
- all: all-am
- 
---- plugins/ldap/ldap-book.h.orig	2012-11-07 20:43:51 UTC
-+++ plugins/ldap/ldap-book.h
-@@ -124,7 +124,7 @@ namespace OPENLDAP
- 
-     xmlNodePtr get_node ();
- 
--    boost::signal0<void> trigger_saving;
-+    boost::signals2::signal<void(void)> trigger_saving;
- 
-     bool is_ekiga_net_book () const;
- 
---- plugins/libnotify/Makefile.in.orig	2013-02-20 21:44:17 UTC
-+++ plugins/libnotify/Makefile.in
-@@ -56,7 +56,6 @@ subdir = plugins/libnotify
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
--	$(top_srcdir)/m4/ax_boost_signals.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
- 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-@@ -159,8 +158,6 @@ AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
- BOOST_LDFLAGS = @BOOST_LDFLAGS@
--BOOST_LIBS = @BOOST_LIBS@
--BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@
- CATALOGS = @CATALOGS@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
-@@ -374,7 +371,7 @@ libgmlibnotify_la_SOURCES = \
- libgmlibnotify_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
- libgmlibnotify_la_LIBADD = \
- 	$(top_builddir)/lib/libekiga.la \
--	$(BOOST_LDFLAGS) $(BOOST_LIBS) $(NOTIFY_LIBS)
-+	$(BOOST_LDFLAGS) $(NOTIFY_LIBS)
- 
- all: all-am
- 
---- plugins/libnotify/libnotify-main.cpp.orig	2013-02-18 21:37:04 UTC
-+++ plugins/libnotify/libnotify-main.cpp
-@@ -51,7 +51,7 @@
- 
- class LibNotify:
-   public Ekiga::Service,
--  public boost::signals::trackable
-+  public boost::signals2::trackable
- {
- public:
- 
-@@ -77,7 +77,7 @@ class LibNotify: (private)
-                              boost::shared_ptr<Ekiga::Call>  call);
-   void on_call_notification_closed (gpointer self);
- 
--  typedef std::map<boost::shared_ptr<Ekiga::Notification>, std::pair<boost::signals::connection, boost::shared_ptr<NotifyNotification> > > container_type;
-+  typedef std::map<boost::shared_ptr<Ekiga::Notification>, std::pair<boost::signals2::connection, boost::shared_ptr<NotifyNotification> > > container_type;
-   container_type live;
- };
- 
-@@ -234,10 +234,10 @@ LibNotify::on_notification_added (boost::shared_ptr<Ek
-                                     notify_action_cb, notification.get (), NULL);
- 
-   g_signal_connect (notif, "closed", G_CALLBACK (on_notif_closed), notification.get ());
--  boost::signals::connection conn = notification->removed.connect (boost::bind (&LibNotify::on_notification_removed,
-+  boost::signals2::connection conn = notification->removed.connect (boost::bind (&LibNotify::on_notification_removed,
-                                                                                 this, notification));
- 
--  live[notification] = std::pair<boost::signals::connection, boost::shared_ptr<NotifyNotification> > (conn, boost::shared_ptr<NotifyNotification> (notif, g_object_unref));
-+  live[notification] = std::pair<boost::signals2::connection, boost::shared_ptr<NotifyNotification> > (conn, boost::shared_ptr<NotifyNotification> (notif, g_object_unref));
- 
-   notify_notification_show (notif, NULL);
- }
---- plugins/loudmouth/Makefile.in.orig	2013-02-20 21:44:17 UTC
-+++ plugins/loudmouth/Makefile.in
-@@ -56,7 +56,6 @@ subdir = plugins/loudmouth
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
--	$(top_srcdir)/m4/ax_boost_signals.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
- 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-@@ -179,8 +178,6 @@ AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
- BOOST_LDFLAGS = @BOOST_LDFLAGS@
--BOOST_LIBS = @BOOST_LIBS@
--BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@
- CATALOGS = @CATALOGS@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
-@@ -415,7 +412,7 @@ libgmloudmouth_la_SOURCES = \
- libgmloudmouth_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
- libgmloudmouth_la_LIBADD = \
- 	$(top_builddir)/lib/libekiga.la \
--	$(BOOST_LDFLAGS) $(BOOST_LIBS) $(XML_LIBS) $(LOUDMOUTH_LIBS)
-+	$(BOOST_LDFLAGS) $(XML_LIBS) $(LOUDMOUTH_LIBS)
- 
- all: all-am
- 
---- plugins/loudmouth/loudmouth-account.h.orig	2012-11-07 20:43:51 UTC
-+++ plugins/loudmouth/loudmouth-account.h
-@@ -70,7 +70,7 @@ namespace LM
- 
-     xmlNodePtr get_node () const;
- 
--    boost::signal0<void> trigger_saving;
-+    boost::signals2::signal<void(void)> trigger_saving;
- 
-     const std::string get_name () const;
- 
---- plugins/loudmouth/loudmouth-heap-roster.h.orig	2012-11-07 20:43:51 UTC
-+++ plugins/loudmouth/loudmouth-heap-roster.h
-@@ -46,7 +46,7 @@ namespace LM
-   class HeapRoster:
-     public Ekiga::HeapImpl<Presentity>,
-     public LM::Handler,
--    public boost::signals::trackable
-+    public boost::signals2::trackable
-   {
-   public:
- 
---- plugins/loudmouth/loudmouth-helpers.h.orig	2012-11-07 20:43:51 UTC
-+++ plugins/loudmouth/loudmouth-helpers.h
-@@ -37,7 +37,7 @@
- #define __LOUDMOUTH_HELPERS_H__
- 
- #include <boost/smart_ptr.hpp>
--#include <boost/signals.hpp>
-+#include <boost/signals2.hpp>
- 
- #include <loudmouth/loudmouth.h>
- 
---- plugins/loudmouth/loudmouth-presentity.h.orig	2012-11-07 20:43:51 UTC
-+++ plugins/loudmouth/loudmouth-presentity.h
-@@ -78,7 +78,7 @@ namespace LM
- 
-     bool has_chat;
- 
--    boost::signal0<void> chat_requested;
-+    boost::signals2::signal<void(void)> chat_requested;
- 
-   private:
-     LmConnection* connection;
---- plugins/resource-list/Makefile.in.orig	2013-02-20 21:44:17 UTC
-+++ plugins/resource-list/Makefile.in
-@@ -56,7 +56,6 @@ subdir = plugins/resource-list
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
--	$(top_srcdir)/m4/ax_boost_signals.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
- 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-@@ -178,8 +177,6 @@ AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
- BOOST_LDFLAGS = @BOOST_LDFLAGS@
--BOOST_LIBS = @BOOST_LIBS@
--BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@
- CATALOGS = @CATALOGS@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
-@@ -412,7 +409,7 @@ libgmresource_list_la_LDFLAGS = \
- libgmresource_list_la_LIBADD = \
- 	$(top_builddir)/lib/libekiga.la \
- 	$(top_builddir)/plugins/xcap/libgmxcap.la \
--	$(BOOST_LDFLAGS) $(BOOST_LIBS) $(GLIB_LIBS) $(XML_LIBS)
-+	$(BOOST_LDFLAGS) $(GLIB_LIBS) $(XML_LIBS)
- 
- all: all-am
- 
---- plugins/resource-list/rl-heap.cpp.orig	2012-11-07 20:43:51 UTC
-+++ plugins/resource-list/rl-heap.cpp
-@@ -185,7 +185,7 @@ RL::Heap::visit_presentities (boost::function1<bool, E
- {
-   bool go_on = true;
- 
--  for (std::map<PresentityPtr,std::list<boost::signals::connection> >::const_iterator
-+  for (std::map<PresentityPtr,std::list<boost::signals2::connection> >::const_iterator
- 	 iter = presentities.begin ();
-        go_on && iter != presentities.end ();
-        ++iter)
-@@ -254,7 +254,7 @@ RL::Heap::refresh ()
-   while ( !presentities.empty ()) {
- 
-     presentities.begin()->first->removed ();
--    for (std::list<boost::signals::connection>::const_iterator iter2
-+    for (std::list<boost::signals2::connection>::const_iterator iter2
- 	   = presentities.begin()->second.begin ();
- 	 iter2 != presentities.begin()->second.end ();
- 	 ++iter2)
-@@ -366,7 +366,7 @@ RL::Heap::parse_list (xmlNodePtr list)
- 	&& xmlStrEqual (BAD_CAST ("entry"), child->name)) {
- 
-       PresentityPtr presentity(new Presentity (services, path, doc, child, writable));
--      std::list<boost::signals::connection> conns;
-+      std::list<boost::signals2::connection> conns;
-       conns.push_back (presentity->updated.connect (boost::bind (boost::ref (presentity_updated), presentity)));
-       conns.push_back (presentity->removed.connect (boost::bind(boost::ref (presentity_removed),presentity)));
-       conns.push_back (presentity->trigger_reload.connect (boost::bind (&RL::Heap::refresh, this)));
-@@ -381,7 +381,7 @@ void
- RL::Heap::push_presence (const std::string uri_,
- 			 const std::string presence)
- {
--  for (std::map<PresentityPtr,std::list<boost::signals::connection> >::const_iterator
-+  for (std::map<PresentityPtr,std::list<boost::signals2::connection> >::const_iterator
- 	 iter = presentities.begin ();
-        iter != presentities.end ();
-        ++iter) {
-@@ -395,7 +395,7 @@ void
- RL::Heap::push_status (const std::string uri_,
- 		       const std::string status)
- {
--  for (std::map<PresentityPtr,std::list<boost::signals::connection> >::const_iterator
-+  for (std::map<PresentityPtr,std::list<boost::signals2::connection> >::const_iterator
- 	 iter = presentities.begin ();
-        iter != presentities.end ();
-        ++iter) {
-@@ -514,7 +514,7 @@ RL::Heap::new_entry ()
- 			   "contact on a remote server"));
- 
-   std::set<std::string> all_groups;
--  for (std::map<PresentityPtr,std::list<boost::signals::connection> >::const_iterator
-+  for (std::map<PresentityPtr,std::list<boost::signals2::connection> >::const_iterator
- 	 iter = presentities.begin ();
-        iter != presentities.end ();
-        ++iter) {
---- plugins/resource-list/rl-heap.h.orig	2012-11-07 20:43:51 UTC
-+++ plugins/resource-list/rl-heap.h
-@@ -90,7 +90,7 @@ namespace RL {
-     void push_status (const std::string uri,
- 		      const std::string status);
- 
--    boost::signal0<void> trigger_saving;
-+    boost::signals2::signal<void(void)> trigger_saving;
- 
-   private:
- 
-@@ -106,7 +106,7 @@ namespace RL {
-     boost::shared_ptr<xmlDoc> doc;
-     xmlNodePtr list_node;
- 
--    std::map<PresentityPtr, std::list<boost::signals::connection> > presentities;
-+    std::map<PresentityPtr, std::list<boost::signals2::connection> > presentities;
- 
-     void refresh ();
- 
---- plugins/resource-list/rl-list.cpp.orig	2012-11-07 20:43:51 UTC
-+++ plugins/resource-list/rl-list.cpp
-@@ -94,9 +94,9 @@ class RL::ListImpl (public)
- 
-   void publish () const;
- 
--  boost::signal1<void, boost::shared_ptr<Entry> > entry_added;
--  boost::signal1<void, boost::shared_ptr<Entry> > entry_updated;
--  boost::signal1<void, boost::shared_ptr<Entry> > entry_removed;
-+  boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_added;
-+  boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_updated;
-+  boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_removed;
- 
- 
-   /* data for its children */
-@@ -104,7 +104,7 @@ class RL::ListImpl (public)
- 
-   std::list<ChildType> ordering;
-   std::list<boost::shared_ptr<List> > lists;
--  std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > > entries;
-+  std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > > entries;
- };
- 
- 
-@@ -235,12 +235,12 @@ RL::ListImpl::flush ()
-     (*iter)->flush ();
-   lists.clear ();
- 
--  for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::iterator iter = entries.begin ();
-+  for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::iterator iter = entries.begin ();
-        iter != entries.end ();
-        ++iter) {
- 
-     iter->first->removed ();
--    for (std::list<boost::signals::connection>::iterator conn_iter
-+    for (std::list<boost::signals2::connection>::iterator conn_iter
- 	   = iter->second.begin ();
- 	 conn_iter != iter->second.end ();
- 	 ++conn_iter)
-@@ -342,10 +342,10 @@ RL::ListImpl::parse ()
- 							    entry_pos,
- 							    display_name,
- 							    doc, child));
--      std::list<boost::signals::connection> conns;
-+      std::list<boost::signals2::connection> conns;
-       conns.push_back (entry->updated.connect (boost::bind (boost::ref (entry_updated), entry)));
-       conns.push_back (entry->removed.connect (boost::bind (boost::ref (entry_removed), entry)));
--      entries.push_back (std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > (entry, conns));
-+      entries.push_back (std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > (entry, conns));
-       ordering.push_back (ENTRY);
-       entry_pos++;
-       entry_added (entry);
-@@ -363,7 +363,7 @@ RL::ListImpl::push_presence (const std::string uri_,
-        ++iter)
-     (*iter)->push_presence (uri_, presence);
- 
--  for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::const_iterator iter = entries.begin ();
-+  for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::const_iterator iter = entries.begin ();
-        iter != entries.end ();
-        ++iter) {
- 
-@@ -381,7 +381,7 @@ RL::ListImpl::push_status (const std::string uri_,
-        ++iter)
-     (*iter)->push_status (uri_, status);
- 
--  for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::const_iterator iter = entries.begin ();
-+  for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::const_iterator iter = entries.begin ();
-        iter != entries.end ();
-        ++iter) {
- 
-@@ -400,7 +400,7 @@ RL::ListImpl::visit_presentities (boost::function1<boo
-        ++iter)
-     go_on = (*iter)->visit_presentities (visitor);
- 
--  for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::const_iterator iter = entries.begin ();
-+  for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::const_iterator iter = entries.begin ();
-        go_on && iter != entries.end ();
-        ++iter) {
- 
-@@ -418,7 +418,7 @@ RL::ListImpl::publish () const
-        ++iter)
-     (*iter)->publish ();
- 
--  for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals::connection> > >::const_iterator iter = entries.begin ();
-+  for (std::list<std::pair<boost::shared_ptr<Entry>, std::list<boost::signals2::connection> > >::const_iterator iter = entries.begin ();
-        iter != entries.end ();
-        ++iter) {
- 
---- plugins/resource-list/rl-list.h.orig	2012-11-07 20:43:51 UTC
-+++ plugins/resource-list/rl-list.h
-@@ -74,9 +74,9 @@ namespace RL
- 
-     void publish () const;
- 
--    boost::signal1<void, boost::shared_ptr<Entry> > entry_added;
--    boost::signal1<void, boost::shared_ptr<Entry> > entry_updated;
--    boost::signal1<void, boost::shared_ptr<Entry> > entry_removed;
-+    boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_added;
-+    boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_updated;
-+    boost::signals2::signal<void(boost::shared_ptr<Entry>)> entry_removed;
- 
-     /* this method orders the list to get rid of all its children */
-     void flush ();
---- plugins/resource-list/rl-presentity.h.orig	2012-11-07 20:43:51 UTC
-+++ plugins/resource-list/rl-presentity.h
-@@ -79,7 +79,7 @@ namespace RL
- 
-     bool populate_menu (Ekiga::MenuBuilder &);
- 
--    boost::signal0<void> trigger_reload;
-+    boost::signals2::signal<void(void)> trigger_reload;
- 
-   private:
- 
---- plugins/xcap/Makefile.in.orig	2013-02-20 21:44:17 UTC
-+++ plugins/xcap/Makefile.in
-@@ -56,7 +56,6 @@ subdir = plugins/xcap
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
--	$(top_srcdir)/m4/ax_boost_signals.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
- 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-@@ -174,8 +173,6 @@ AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
- BOOST_LDFLAGS = @BOOST_LDFLAGS@
--BOOST_LIBS = @BOOST_LIBS@
--BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@
- CATALOGS = @CATALOGS@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
-@@ -392,7 +389,7 @@ libgmxcap_la_SOURCES = \
- libgmxcap_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
- libgmxcap_la_LIBADD = \
- 	$(top_builddir)/lib/libekiga.la \
--	$(BOOST_LDFLAGS) $(BOOST_LIBS) $(SOUP_LIBS)
-+	$(BOOST_LDFLAGS) $(SOUP_LIBS)
- 
- all: all-am
- 
---- sounds/Makefile.in.orig	2013-02-20 21:44:17 UTC
-+++ sounds/Makefile.in
-@@ -56,7 +56,6 @@ subdir = sounds
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
--	$(top_srcdir)/m4/ax_boost_signals.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
- 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-@@ -124,8 +123,6 @@ AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
- BOOST_LDFLAGS = @BOOST_LDFLAGS@
--BOOST_LIBS = @BOOST_LIBS@
--BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@
- CATALOGS = @CATALOGS@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
---- src/Makefile.in.orig	2013-02-20 21:44:17 UTC
-+++ src/Makefile.in
-@@ -93,7 +93,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile
- 	$(srcdir)/ekiga-config-tool.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \
--	$(top_srcdir)/m4/ax_boost_signals.m4 \
- 	$(top_srcdir)/m4/gnome-doc-utils.m4 \
- 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
- 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-@@ -240,8 +239,6 @@ AVAHI_LIBS = @AVAHI_LIBS@
- AWK = @AWK@
- BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
- BOOST_LDFLAGS = @BOOST_LDFLAGS@
--BOOST_LIBS = @BOOST_LIBS@
--BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@
- CATALOGS = @CATALOGS@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
-@@ -490,7 +487,7 @@ nodist_ekiga_SOURCES = $(am__append_6)
- GIT_REVISION = \"$$(cd ../.git; git describe )\"
- CACHED_REVISION = $$(cat revision.h 2>/dev/null | cut -c24-)
- AM_CXXFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(OPAL_CFLAGS) $(PTLIB_CFLAGS) $(BOOST_CPPFLAGS) $(XML_CFLAGS)
--AM_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(DBUS_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS) $(BOOST_LDFLAGS) $(BOOST_LIBS) $(XML_LIBS)
-+AM_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(DBUS_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS) $(BOOST_LDFLAGS) $(XML_LIBS)
- ekiga_LDADD = \
- 	$(top_builddir)/lib/libekiga.la $(AM_LIBS)
- 
---- src/gui/assistant.cpp.orig	2013-02-18 21:37:04 UTC
-+++ src/gui/assistant.cpp
-@@ -95,7 +95,7 @@ struct _EkigaAssistantPrivate
-   gint last_active_page;
- 
-   GtkListStore *summary_model;
--  std::vector<boost::signals::connection> connections;
-+  std::vector<boost::signals2::connection> connections;
- };
- 
- /* presenting the network connection type to the user */
-@@ -1679,7 +1679,7 @@ ekiga_assistant_new (Ekiga::ServiceCore& service_core)
-   g_signal_connect (assistant, "key-press-event",
-                     G_CALLBACK (ekiga_assistant_key_press_cb), NULL);
- 
--  boost::signals::connection conn;
-+  boost::signals2::connection conn;
-   assistant->priv->videoinput_core = service_core.get<Ekiga::VideoInputCore> ("videoinput-core");
-   assistant->priv->audioinput_core = service_core.get<Ekiga::AudioInputCore> ("audioinput-core");
-   assistant->priv->audiooutput_core = service_core.get<Ekiga::AudioOutputCore> ("audiooutput-core");
---- src/gui/main_window.cpp.orig	2013-02-18 21:36:51 UTC
-+++ src/gui/main_window.cpp
-@@ -129,7 +129,7 @@ struct _EkigaMainWindowPrivate
-   unsigned calling_state;
- 
-   gulong roster_selection_connection_id;
--  std::vector<boost::signals::connection> connections;
-+  std::vector<boost::signals2::connection> connections;
- };
- 
- /* properties */
-@@ -1706,7 +1706,7 @@ ekiga_main_window_class_init (EkigaMainWindowClass *kl
- static void
- ekiga_main_window_connect_engine_signals (EkigaMainWindow *mw)
- {
--  boost::signals::connection conn;
-+  boost::signals2::connection conn;
- 
-   g_return_if_fail (EKIGA_IS_MAIN_WINDOW (mw));
- 
---- src/gui/statusmenu.cpp.orig	2013-02-18 21:37:04 UTC
-+++ src/gui/statusmenu.cpp
-@@ -51,7 +51,7 @@
- struct _StatusMenuPrivate
- {
-   boost::shared_ptr<Ekiga::PersonalDetails> personal_details;
--  std::vector<boost::signals::connection> connections;
-+  std::vector<boost::signals2::connection> connections;
- 
-   GtkListStore *list_store; // List store storing the menu
-   GtkWindow    *parent;     // Parent window
-@@ -796,7 +796,7 @@ status_menu_new (Ekiga::ServiceCore & core)
- {
-   StatusMenu *self = NULL;
- 
--  boost::signals::connection conn;
-+  boost::signals2::connection conn;
-   GtkCellRenderer *renderer = NULL;
-   GSList *custom_status_array [NUM_STATUS_TYPES];
- 
diff --git a/net-im/ekiga/files/patch-configure b/net-im/ekiga/files/patch-configure
deleted file mode 100644
index dbba96488363..000000000000
--- a/net-im/ekiga/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2013-07-11 12:30:00.000000000 +0200
-+++ configure	2013-07-11 12:31:26.000000000 +0200
-@@ -18351,7 +18351,7 @@
-   # Check whether --enable-gconf was given.
- if test "${enable_gconf+set}" = set; then :
-   enableval=$enable_gconf; if test "x$enableval" = "xyes"; then
--  enable_gconf = yes
-+  enable_gconf=yes
- fi
- else
-   enable_gconf=yes
diff --git a/net-im/ekiga/files/patch-lib_engine_notification_notification-core.h b/net-im/ekiga/files/patch-lib_engine_notification_notification-core.h
deleted file mode 100644
index 99542342cb9f..000000000000
--- a/net-im/ekiga/files/patch-lib_engine_notification_notification-core.h
+++ /dev/null
@@ -1,39 +0,0 @@
-In file included from ../lib/engine/videoinput/videoinput-core.cpp:44:
-In file included from ../lib/engine/videoinput/videoinput-core.h:40:
-In file included from ../lib/engine/framework/services.h:48:
-In file included from /usr/local/include/boost/signals.hpp:9:
-In file included from /usr/local/include/boost/signal.hpp:27:
-In file included from /usr/local/include/boost/signals/signal0.hpp:24:
-In file included from /usr/local/include/boost/signals/signal_template.hpp:37:
-In file included from /usr/local/include/boost/function/function0.hpp:11:
-In file included from /usr/local/include/boost/function/detail/maybe_include.hpp:13:
-/usr/local/include/boost/function/function_template.hpp:159:33: error: called object type 'nullptr_t' is not a function or function pointer
-          BOOST_FUNCTION_RETURN((*f)(BOOST_FUNCTION_ARGS));
-                                ^~~~
-/usr/local/include/boost/function/function_template.hpp:81:36: note: expanded from macro 'BOOST_FUNCTION_RETURN'
-#  define BOOST_FUNCTION_RETURN(X) X
-                                   ^
-/usr/local/include/boost/function/function_template.hpp:925:53: note: in instantiation of member function 'boost::detail::function::void_function_obj_invoker0<nullptr_t, void>::invoke' requested here
-        { { &manager_type::manage }, &invoker_type::invoke };
-                                                    ^
-/usr/local/include/boost/function/function_template.hpp:716:13: note: in instantiation of function template specialization 'boost::function0<void>::assign_to<nullptr_t>' requested here
-      this->assign_to(f);
-            ^
-../lib/engine/notification/notification-core.h:59:61: note: in instantiation of function template specialization 'boost::function0<void>::function0<nullptr_t>' requested here
-                  boost::function0<void> action_callback_ = NULL)
-                                                            ^
-/usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL'
-#define NULL    nullptr
-                ^
-
---- lib/engine/notification/notification-core.h.orig	2012-11-07 20:43:51 UTC
-+++ lib/engine/notification/notification-core.h
-@@ -56,7 +56,7 @@ namespace Ekiga
- 		  const std::string title_,
- 		  const std::string body_,
-                   const std::string action_name_ = "",
--                  boost::function0<void> action_callback_ = NULL)
-+                  boost::function0<void> action_callback_ = 0)
-       : level(level_), title(title_), body(body_), action_name(action_name_), action_callback(action_callback_)
-     {}
- 
diff --git a/net-im/ekiga/pkg-descr b/net-im/ekiga/pkg-descr
deleted file mode 100644
index 488e9b7ca7d8..000000000000
--- a/net-im/ekiga/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Ekiga (formely known as GnomeMeeting) is an open source
-VoIP and video conferencing application for GNOME.
-Ekiga uses both the H.323 and SIP protocols.
-
-WWW: https://www.ekiga.org/
diff --git a/net-im/ekiga/pkg-plist b/net-im/ekiga/pkg-plist
deleted file mode 100644
index 3f192e26f6ee..000000000000
--- a/net-im/ekiga/pkg-plist
+++ /dev/null
@@ -1,604 +0,0 @@
-bin/ekiga
-bin/ekiga-config-tool
-%%DBUS%%bin/ekiga-helper
-%%ETCDIR%%/ekiga.schemas
-lib/ekiga/%%VERSION%%/libekiga.so
-man/man1/ekiga.1.gz
-%%AVAHI%%lib/ekiga/%%VERSION%%/plugins/libgmavahi.so
-%%EVOLUTION%%lib/ekiga/4.0.1/plugins/libgmevolution.so
-%%LDAP%%lib/ekiga/4.0.1/plugins/libgmldap.so
-%%NOTIFY%%lib/ekiga/%%VERSION%%/plugins/libgmlibnotify.so
-share/applications/ekiga.desktop
-%%DBUS%%share/dbus-1/services/org.ekiga.Ekiga.service
-%%DBUS%%share/dbus-1/services/org.ekiga.Helper.service
-%%GNOMEHELP%%share/gnome/help/ekiga/C/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/lumi.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/call_window.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d4.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d5.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d6.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d7.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/config_d9.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/call_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/roster.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/addressbook_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/addressbook_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/addressbook_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/chat_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/status.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/call_history.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/accounts_ekiga_net.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/accounts_ekiga_call_out.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/monitoring_lines.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/C/figures/video_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/lumi.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/call_window.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d4.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d5.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d6.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d7.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/config_d9.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/call_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/roster.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/addressbook_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/addressbook_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/addressbook_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/chat_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/status.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/call_history.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/accounts_ekiga_net.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/accounts_ekiga_call_out.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/monitoring_lines.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/bg/figures/video_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/lumi.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/call_window.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d4.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d5.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d6.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d7.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/config_d9.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/call_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/roster.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/addressbook_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/addressbook_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/addressbook_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/chat_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/status.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/call_history.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/accounts_ekiga_net.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/accounts_ekiga_call_out.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/monitoring_lines.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ca/figures/video_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/lumi.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/call_window.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d4.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d5.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d6.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d7.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/config_d9.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/call_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/roster.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/addressbook_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/addressbook_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/addressbook_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/chat_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/status.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/call_history.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/accounts_ekiga_net.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/accounts_ekiga_call_out.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/monitoring_lines.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/de/figures/video_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/lumi.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/call_window.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d4.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d5.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d6.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d7.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/config_d9.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/call_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/roster.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/addressbook_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/addressbook_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/addressbook_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/chat_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/status.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/call_history.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/accounts_ekiga_net.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/accounts_ekiga_call_out.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/monitoring_lines.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/el/figures/video_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/lumi.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/call_window.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/config_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/config_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/config_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/config_d4.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/config_d5.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/config_d6.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/config_d7.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/config_d9.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/call_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/roster.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/addressbook_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/addressbook_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/addressbook_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/chat_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/status.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/call_history.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/accounts_ekiga_net.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/accounts_ekiga_call_out.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/monitoring_lines.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/en_GB/figures/video_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/lumi.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/call_window.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/config_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/config_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/config_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/config_d4.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/config_d5.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/config_d6.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/config_d7.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/config_d9.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/call_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/roster.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/addressbook_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/addressbook_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/addressbook_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/chat_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/status.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/call_history.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/accounts_ekiga_net.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/accounts_ekiga_call_out.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/monitoring_lines.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/es/figures/video_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/lumi.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/call_window.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/config_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/config_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/config_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/config_d4.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/config_d5.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/config_d6.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/config_d7.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/config_d9.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/call_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/roster.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/addressbook_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/addressbook_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/addressbook_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/chat_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/status.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/call_history.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/accounts_ekiga_net.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/accounts_ekiga_call_out.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/monitoring_lines.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/eu/figures/video_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/lumi.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/call_window.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/config_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/config_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/config_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/config_d4.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/config_d5.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/config_d6.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/config_d7.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/config_d9.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/call_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/roster.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/addressbook_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/addressbook_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/addressbook_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/chat_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/status.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/call_history.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/accounts_ekiga_net.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/accounts_ekiga_call_out.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/monitoring_lines.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fi/figures/video_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/lumi.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/call_window.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/config_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/config_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/config_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/config_d4.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/config_d5.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/config_d6.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/config_d7.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/config_d9.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/call_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/roster.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/addressbook_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/addressbook_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/addressbook_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/chat_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/status.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/call_history.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/accounts_ekiga_net.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/accounts_ekiga_call_out.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/monitoring_lines.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/fr/figures/video_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/lumi.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/call_window.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/config_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/config_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/config_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/config_d4.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/config_d5.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/config_d6.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/config_d7.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/config_d9.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/call_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/roster.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/addressbook_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/addressbook_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/addressbook_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/chat_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/status.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/call_history.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/accounts_ekiga_net.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/accounts_ekiga_call_out.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/monitoring_lines.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/oc/figures/video_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/lumi.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/call_window.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/config_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/config_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/config_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/config_d4.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/config_d5.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/config_d6.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/config_d7.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/config_d9.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/call_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/roster.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/addressbook_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/addressbook_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/addressbook_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/chat_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/status.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/call_history.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/accounts_ekiga_net.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/accounts_ekiga_call_out.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/monitoring_lines.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/pt_BR/figures/video_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/lumi.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/call_window.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/config_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/config_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/config_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/config_d4.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/config_d5.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/config_d6.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/config_d7.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/config_d9.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/call_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/roster.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/addressbook_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/addressbook_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/addressbook_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/chat_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/status.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/call_history.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/accounts_ekiga_net.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/accounts_ekiga_call_out.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/monitoring_lines.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/ru/figures/video_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/lumi.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/call_window.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/config_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/config_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/config_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/config_d4.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/config_d5.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/config_d6.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/config_d7.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/config_d9.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/call_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/roster.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/addressbook_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/addressbook_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/addressbook_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/chat_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/status.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/call_history.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/accounts_ekiga_net.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/accounts_ekiga_call_out.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/monitoring_lines.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sl/figures/video_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/lumi.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/call_window.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/config_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/config_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/config_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/config_d4.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/config_d5.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/config_d6.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/config_d7.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/config_d9.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/call_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/roster.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/addressbook_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/addressbook_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/addressbook_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/chat_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/status.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/call_history.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/accounts_ekiga_net.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/accounts_ekiga_call_out.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/monitoring_lines.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/sv/figures/video_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/lumi.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/call_window.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/config_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/config_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/config_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/config_d4.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/config_d5.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/config_d6.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/config_d7.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/config_d9.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/call_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/roster.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/addressbook_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/addressbook_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/addressbook_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/chat_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/status.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/call_history.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/accounts_ekiga_net.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/accounts_ekiga_call_out.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/monitoring_lines.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/uk/figures/video_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/ekiga.xml
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/lumi.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/call_window.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/config_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/config_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/config_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/config_d4.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/config_d5.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/config_d6.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/config_d7.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/config_d8.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/config_d9.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/call_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/roster.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/addressbook_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/addressbook_d2.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/addressbook_d3.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/chat_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/status.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/call_history.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/accounts_d1.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/accounts_ekiga_net.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/accounts_ekiga_call_out.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/accounts_sip.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/accounts_h323.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/monitoring_lines.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/audio_codecs.png
-%%GNOMEHELP%%share/gnome/help/ekiga/zh_CN/figures/video_codecs.png
-share/icons/hicolor/128x128/apps/ekiga.png
-share/icons/hicolor/16x16/apps/ekiga.png
-share/icons/hicolor/22x22/apps/ekiga.png
-share/icons/hicolor/24x24/apps/ekiga.png
-share/icons/hicolor/32x32/apps/ekiga.png
-share/icons/hicolor/48x48/apps/ekiga.png
-share/icons/hicolor/64x64/apps/ekiga.png
-share/icons/hicolor/72x72/apps/ekiga.png
-share/locale/am/LC_MESSAGES/ekiga.mo
-share/locale/ar/LC_MESSAGES/ekiga.mo
-share/locale/as/LC_MESSAGES/ekiga.mo
-share/locale/ast/LC_MESSAGES/ekiga.mo
-share/locale/az/LC_MESSAGES/ekiga.mo
-share/locale/bg/LC_MESSAGES/ekiga.mo
-share/locale/bn/LC_MESSAGES/ekiga.mo
-share/locale/bn_IN/LC_MESSAGES/ekiga.mo
-share/locale/bs/LC_MESSAGES/ekiga.mo
-share/locale/ca/LC_MESSAGES/ekiga.mo
-share/locale/ca@valencia/LC_MESSAGES/ekiga.mo
-share/locale/crh/LC_MESSAGES/ekiga.mo
-share/locale/cs/LC_MESSAGES/ekiga.mo
-share/locale/cy/LC_MESSAGES/ekiga.mo
-share/locale/da/LC_MESSAGES/ekiga.mo
-share/locale/de/LC_MESSAGES/ekiga.mo
-share/locale/dz/LC_MESSAGES/ekiga.mo
-share/locale/el/LC_MESSAGES/ekiga.mo
-share/locale/en@shaw/LC_MESSAGES/ekiga.mo
-share/locale/en_CA/LC_MESSAGES/ekiga.mo
-share/locale/en_GB/LC_MESSAGES/ekiga.mo
-share/locale/eo/LC_MESSAGES/ekiga.mo
-share/locale/es/LC_MESSAGES/ekiga.mo
-share/locale/et/LC_MESSAGES/ekiga.mo
-share/locale/eu/LC_MESSAGES/ekiga.mo
-share/locale/fa/LC_MESSAGES/ekiga.mo
-share/locale/fi/LC_MESSAGES/ekiga.mo
-share/locale/fr/LC_MESSAGES/ekiga.mo
-share/locale/ga/LC_MESSAGES/ekiga.mo
-share/locale/gl/LC_MESSAGES/ekiga.mo
-share/locale/gu/LC_MESSAGES/ekiga.mo
-share/locale/he/LC_MESSAGES/ekiga.mo
-share/locale/hi/LC_MESSAGES/ekiga.mo
-share/locale/hr/LC_MESSAGES/ekiga.mo
-share/locale/hu/LC_MESSAGES/ekiga.mo
-share/locale/id/LC_MESSAGES/ekiga.mo
-share/locale/is/LC_MESSAGES/ekiga.mo
-share/locale/it/LC_MESSAGES/ekiga.mo
-share/locale/ja/LC_MESSAGES/ekiga.mo
-share/locale/ka/LC_MESSAGES/ekiga.mo
-share/locale/kk/LC_MESSAGES/ekiga.mo
-share/locale/kn/LC_MESSAGES/ekiga.mo
-share/locale/ko/LC_MESSAGES/ekiga.mo
-share/locale/ku/LC_MESSAGES/ekiga.mo
-share/locale/lt/LC_MESSAGES/ekiga.mo
-share/locale/lv/LC_MESSAGES/ekiga.mo
-share/locale/mai/LC_MESSAGES/ekiga.mo
-share/locale/mk/LC_MESSAGES/ekiga.mo
-share/locale/ml/LC_MESSAGES/ekiga.mo
-share/locale/mn/LC_MESSAGES/ekiga.mo
-share/locale/mr/LC_MESSAGES/ekiga.mo
-share/locale/ms/LC_MESSAGES/ekiga.mo
-share/locale/nb/LC_MESSAGES/ekiga.mo
-share/locale/ne/LC_MESSAGES/ekiga.mo
-share/locale/nl/LC_MESSAGES/ekiga.mo
-share/locale/nn/LC_MESSAGES/ekiga.mo
-share/locale/oc/LC_MESSAGES/ekiga.mo
-share/locale/or/LC_MESSAGES/ekiga.mo
-share/locale/pa/LC_MESSAGES/ekiga.mo
-share/locale/pl/LC_MESSAGES/ekiga.mo
-share/locale/pt/LC_MESSAGES/ekiga.mo
-share/locale/pt_BR/LC_MESSAGES/ekiga.mo
-share/locale/ro/LC_MESSAGES/ekiga.mo
-share/locale/ru/LC_MESSAGES/ekiga.mo
-share/locale/rw/LC_MESSAGES/ekiga.mo
-share/locale/si/LC_MESSAGES/ekiga.mo
-share/locale/sk/LC_MESSAGES/ekiga.mo
-share/locale/sl/LC_MESSAGES/ekiga.mo
-share/locale/sq/LC_MESSAGES/ekiga.mo
-share/locale/sr/LC_MESSAGES/ekiga.mo
-share/locale/sr@latin/LC_MESSAGES/ekiga.mo
-share/locale/sv/LC_MESSAGES/ekiga.mo
-share/locale/ta/LC_MESSAGES/ekiga.mo
-share/locale/te/LC_MESSAGES/ekiga.mo
-share/locale/th/LC_MESSAGES/ekiga.mo
-share/locale/tr/LC_MESSAGES/ekiga.mo
-share/locale/ug/LC_MESSAGES/ekiga.mo
-share/locale/uk/LC_MESSAGES/ekiga.mo
-share/locale/vi/LC_MESSAGES/ekiga.mo
-share/locale/wa/LC_MESSAGES/ekiga.mo
-share/locale/xh/LC_MESSAGES/ekiga.mo
-share/locale/zh_CN/LC_MESSAGES/ekiga.mo
-share/locale/zh_HK/LC_MESSAGES/ekiga.mo
-share/locale/zh_TW/LC_MESSAGES/ekiga.mo
-%%GNOMEHELP%%share/omf/ekiga/ekiga-C.omf
-%%GNOMEHELP%%share/omf/ekiga/ekiga-bg.omf
-%%GNOMEHELP%%share/omf/ekiga/ekiga-ca.omf
-%%GNOMEHELP%%share/omf/ekiga/ekiga-de.omf
-%%GNOMEHELP%%share/omf/ekiga/ekiga-el.omf
-%%GNOMEHELP%%share/omf/ekiga/ekiga-en_GB.omf
-%%GNOMEHELP%%share/omf/ekiga/ekiga-es.omf
-%%GNOMEHELP%%share/omf/ekiga/ekiga-eu.omf
-%%GNOMEHELP%%share/omf/ekiga/ekiga-fi.omf
-%%GNOMEHELP%%share/omf/ekiga/ekiga-fr.omf
-%%GNOMEHELP%%share/omf/ekiga/ekiga-oc.omf
-%%GNOMEHELP%%share/omf/ekiga/ekiga-pt_BR.omf
-%%GNOMEHELP%%share/omf/ekiga/ekiga-ru.omf
-%%GNOMEHELP%%share/omf/ekiga/ekiga-sl.omf
-%%GNOMEHELP%%share/omf/ekiga/ekiga-sv.omf
-%%GNOMEHELP%%share/omf/ekiga/ekiga-uk.omf
-%%GNOMEHELP%%share/omf/ekiga/ekiga-zh_CN.omf
-share/pixmaps/ekiga/ekiga-logo.png
-share/sounds/ekiga/busytone.wav
-share/sounds/ekiga/dialtone.wav
-share/sounds/ekiga/newmessage.wav
-share/sounds/ekiga/ring.wav
-share/sounds/ekiga/voicemail.wav
diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile
index 7955a8cc7c01..83e6ece5a70a 100644
--- a/net-mgmt/Makefile
+++ b/net-mgmt/Makefile
@@ -214,7 +214,6 @@
     SUBDIR += openlldp
     SUBDIR += openvmps
     SUBDIR += p0f
-    SUBDIR += p0f2
     SUBDIR += p5-AnyEvent-SNMP
     SUBDIR += p5-BigIP-iControl
     SUBDIR += p5-Cflow
@@ -381,7 +380,6 @@
     SUBDIR += torrus
     SUBDIR += triton-guesttools
     SUBDIR += unbound_exporter
-    SUBDIR += unifi-poller
     SUBDIR += unifi6
     SUBDIR += victoria-metrics
     SUBDIR += virt-viewer
diff --git a/net-mgmt/p0f2/Makefile b/net-mgmt/p0f2/Makefile
deleted file mode 100644
index 66537eefe7c0..000000000000
--- a/net-mgmt/p0f2/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-PORTNAME=	p0f2
-PORTVERSION=	2.0.8
-PORTREVISION=	2
-CATEGORIES=	net-mgmt security
-MASTER_SITES=	http://lcamtuf.coredump.cx/p0f3/releases/old/2.x/
-DISTNAME=	p0f-${DISTVERSION}
-
-MAINTAINER=	fuz@fuz.su
-COMMENT=	Passive OS fingerprinting tool
-
-LICENSE=	LGPL21
-LICENSE_FILE=	${WRKSRC}/doc/COPYING
-
-DEPRECATED=	newer version available in net-mgmt/p0f
-EXPIRATION_DATE=	2021-12-31
-
-USES=		gmake tar:tgz
-USE_RC_SUBR=	p0f2
-ALL_TARGET=	all p0fq tools
-CONFLICTS=	p0f-3.*
-WRKSRC=		${WRKDIR}/p0f
-
-PORTDOCS=	COPYING CREDITS ChangeLog KNOWN_BUGS README TODO win-memleak.txt
-OPTIONS_DEFINE=	DOCS
-
-post-patch:
-.for f in config.h doc/README
-	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/${f}
-.endfor
-
-do-install:
-.for ii in p0f test/p0fq test/sendack test/sendack2 test/sendsyn
-	${INSTALL_PROGRAM} ${WRKSRC}/${ii} ${STAGEDIR}${PREFIX}/bin
-.endfor
-	${INSTALL_SCRIPT} ${WRKSRC}/p0frep ${STAGEDIR}${PREFIX}/bin
-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/p0f
-.for ii in . a. o. r.
-	${INSTALL_DATA} ${WRKSRC}/p0f${ii}fp ${STAGEDIR}${PREFIX}/etc/p0f
-.endfor
-	${INSTALL_MAN} ${WRKSRC}/p0f.1 ${STAGEDIR}${MANPREFIX}/man/man1
-
-do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for ii in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${ii} ${STAGEDIR}${DOCSDIR}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/net-mgmt/p0f2/distinfo b/net-mgmt/p0f2/distinfo
deleted file mode 100644
index 72fbe16eb7eb..000000000000
--- a/net-mgmt/p0f2/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1631114743
-SHA256 (p0f-2.0.8.tgz) = 6c4d8745f04e59f2ba68d56fd1554551592f08a0497c9fc21b84498f47d1aee0
-SIZE (p0f-2.0.8.tgz) = 136877
diff --git a/net-mgmt/p0f2/files/p0f2.in b/net-mgmt/p0f2/files/p0f2.in
deleted file mode 100644
index c5c35f137206..000000000000
--- a/net-mgmt/p0f2/files/p0f2.in
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: p0f2
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# p0f_enable (bool):	Set to NO by default.
-#
-# p0f_user:		User to drop privileges and change to
-#
-# p0f_int:		Network interface to listen on
-#
-# p0f_sock (path):	Path to socket used to communicate with p0f
-#
-# p0f_args:		Additonal options passed to the p0f daemon
-#
-# p0f_log (path):	File where p0f logs matches
-#
-# p0f_db (path):	Location of fingerprint db. 
-#			Defaults to %%PREFIX%%/p0f/p0f.fp
-
-. /etc/rc.subr
-
-name="p0f"
-rcvar=p0f_enable
-
-load_rc_config ${name}
-
-: ${p0f_enable:="NO"}
-: ${p0f_user:="root"}
-: ${p0f_sock:="/var/run/${name}.sock"}
-: ${p0f_log:="/var/log/p0f.log"}
-: ${p0f_db:="%%PREFIX%%/etc/p0f/p0f.fp"}
-
-stop_cmd="${name}_stopcmd"
-status_cmd="${name}_statuscmd"
-
-pidfile=/var/run/${name}.pid
-p0f_command="%%PREFIX%%/bin/${name} -i ${p0f_int} -u ${p0f_user} -Q ${p0f_sock} -o ${p0f_log} -f ${p0f_db} ${p0f_args}"
-command="/usr/sbin/daemon"
-command_args="-f -p ${pidfile} ${p0f_command}"
-
-p0f_statuscmd()
-{
-	if [ ! -e $pidfile ];
-	then
-		echo "pidfile does not exist. $name is not running?";
-		exit 1;
-	fi
-
-	if pgrep -F $pidfile >/dev/null;
-	then
-		echo "$name is running.";
-	else
-		echo "$name is not running.";
-		exit 1;
-	fi
-}
-
-p0f_stopcmd()
-{
-	if pgrep -F $pidfile >/dev/null; 
-	then
-		p0fpid=`cat $pidfile`;
-		kill $sig_stop ${p0fpid};
-		wait_for_pids ${p0fpid};
-	else
-		echo "$name is not running.";
-		exit 1;
-	fi
-}
-
-run_rc_command "$1"
diff --git a/net-mgmt/p0f2/files/patch-mk__FreeBSD b/net-mgmt/p0f2/files/patch-mk__FreeBSD
deleted file mode 100644
index 01c1d4af865a..000000000000
--- a/net-mgmt/p0f2/files/patch-mk__FreeBSD
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./mk/FreeBSD.orig	2014-02-28 09:14:15.972688127 +0100
-+++ ./mk/FreeBSD	2014-02-28 09:15:04.890685340 +0100
-@@ -7,10 +7,10 @@
- # (C) Copyright 2000-2006 by Michal Zalewski <lcamtuf@coredump.cx>
- #
- 
--CC      = gcc
-+CC      ?= gcc
- LIBS	= -lpcap
- STRIP   = strip
--CFLAGS  = -O3 -Wall -fomit-frame-pointer -funroll-loops \
-+CFLAGS  += -Wall \
-           -DUSE_BPF=\"${USE_BPF}\" \
- 	  -I/usr/include/pcap -I/usr/local/include/pcap -I/usr/local/include
- FILE	= p0f
diff --git a/net-mgmt/p0f2/files/patch-p0f-query.c b/net-mgmt/p0f2/files/patch-p0f-query.c
deleted file mode 100644
index 0a7655a80953..000000000000
--- a/net-mgmt/p0f2/files/patch-p0f-query.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- p0f-query.c.orig	2021-09-08 15:25:07 UTC
-+++ p0f-query.c
-@@ -46,8 +46,8 @@ static _u16 flags;
- static _s16 score = NO_SCORE;
- 
- /* Imports for statistics */
--_u32 packet_count, matched_packets, st_time, file_cksum;
--_u8  operating_mode;
-+extern _u32 packet_count, matched_packets, st_time, file_cksum;
-+extern _u8  operating_mode;
- 
- #define SAD_HASH(a)	((((a) << 16) ^ ((a) << 8) ^ (a)))
- 
diff --git a/net-mgmt/p0f2/pkg-descr b/net-mgmt/p0f2/pkg-descr
deleted file mode 100644
index 0b8f6b8719cf..000000000000
--- a/net-mgmt/p0f2/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-from the README:
-
-Passive OS fingerprinting is based on information coming from a remote host
-when it establishes a connection to our system.  Captured packets contain
-enough information to identify the operating system.  In contrast to active
-scanners such as nmap and QueSO, p0f does not send anything to the host being
-identified.
-
-For more information, read Spitzner's text at:
-http://www.enteract.com/~lspitz/finger.html .
-
-from the maintainer:
-
-Use of this program requires read access to the packet filtering
-device, typically /dev/bpf0.  Granting such access allows the users
-who have it to put your Ethernet device into promiscuous mode and
-sniff your network.  See
-http://www.infoworld.com/articles/op/xml/00/05/29/000529opswatch.xml
-if you do not understand how this can be harmful.  Running p0f with
-no options will cause it to analyse packets intended for other
-hosts.
-
-WWW: http://lcamtuf.coredump.cx/p0f.shtml
diff --git a/net-mgmt/p0f2/pkg-plist b/net-mgmt/p0f2/pkg-plist
deleted file mode 100644
index 87b65303dfa3..000000000000
--- a/net-mgmt/p0f2/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-bin/p0f
-bin/p0fq
-bin/p0frep
-bin/sendack
-bin/sendack2
-bin/sendsyn
-etc/p0f/p0f.fp
-etc/p0f/p0fa.fp
-etc/p0f/p0fo.fp
-etc/p0f/p0fr.fp
-man/man1/p0f.1.gz
diff --git a/net-mgmt/unifi-poller/Makefile b/net-mgmt/unifi-poller/Makefile
deleted file mode 100644
index 9a6f15f953c0..000000000000
--- a/net-mgmt/unifi-poller/Makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-# Created by: Anthony Brown <anthony@found-it.net>
-
-PORTNAME=	unifi-poller
-DISTVERSIONPREFIX=v
-DISTVERSION=	2.1.3
-CATEGORIES=	net-mgmt
-
-MAINTAINER=	anthony@found-it.net
-COMMENT=	Collect unifi controller data
-
-LICENSE=	MIT
-
-BROKEN=		Unfetchable due to upstream name change
-DEPRECATED=	Now called unpoller by upstream
-EXPIRATION_DATE=2021-12-31
-
-USES=		go:modules
-
-USERS=	unifi-poller
-GROUPS=	unifi-poller
-
-USE_GITHUB=	yes
-GH_TUPLE=	\
-		BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \
-		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
-		cespare:xxhash:v2.1.1:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \
-		davidnewhall:md2roff:aeae646f49d23457ca0f701a381cfa5f1eefc4e7:davidnewhall_md2roff/vendor/github.com/davidnewhall/md2roff \
-		russross:blackfriday:v2.1.0:russross_blackfriday/vendor/gopkg.in/russross/blackfriday.v2 \
-		go-yaml:yaml:496545a6307b:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \
-		golang:crypto:4f45737414dc:golang_crypto/vendor/golang.org/x/crypto \
-		golang:net:e915ea6b2b7d:golang_net/vendor/golang.org/x/net \
-		golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \
-		golang:sys:66c3f260301c:golang_sys/vendor/golang.org/x/sys \
-		golang:term:72f3dc4e9b72:golang_term/vendor/golang.org/x/term \
-		golift:cnfg:v0.0.7:golift_cnfg/vendor/golift.io/cnfg \
-		golift:version:v0.0.2:golift_version/vendor/golift.io/version \
-		gorilla:mux:v1.8.0:gorilla_mux/vendor/github.com/gorilla/mux \
-		influxdata:influxdb1-client:b269163b24ab:influxdata_influxdb1_client/vendor/github.com/influxdata/influxdb1-client \
-		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
-		prometheus:client_golang:v1.10.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
-		prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
-		prometheus:common:v0.20.0:prometheus_common/vendor/github.com/prometheus/common \
-		prometheus:procfs:v0.6.0:prometheus_procfs/vendor/github.com/prometheus/procfs \
-		protocolbuffers:protobuf-go:v1.26.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
-		spf13:pflag:85dd5c8bc61c:spf13_pflag/vendor/github.com/spf13/pflag \
-		unifi-poller:influxunifi:d2de22bd896d:unifi_poller_influxunifi/vendor/github.com/unifi-poller/influxunifi \
-		unifi-poller:inputunifi:7fd4a2cdb411:unifi_poller_inputunifi/vendor/github.com/unifi-poller/inputunifi \
-		unifi-poller:lokiunifi:9e27b9fcffc5:unifi_poller_lokiunifi/vendor/github.com/unifi-poller/lokiunifi \
-		unifi-poller:poller:efda34dd8222:unifi_poller_poller/vendor/github.com/unifi-poller/poller \
-		unifi-poller:promunifi:f15144f260be:unifi_poller_promunifi/vendor/github.com/unifi-poller/promunifi \
-		unifi-poller:unifi:v0.0.8:unifi_poller_unifi/vendor/github.com/unifi-poller/unifi \
-		unifi-poller:webserver:b4db5feaea83:unifi_poller_webserver/vendor/github.com/unifi-poller/webserver
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.options.mk>
-
-post-build:
-	(cd ${GO_WRKSRC} && \
-	  ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} run github.com/davidnewhall/md2roff --manual="unifi-poller" --version="${DISTVERSION}" examples/MANUAL.md)
-	@${REINPLACE_CMD} -e "s/{{BINARY}}/unifi-poller/g" -e "s/{{BINARYU}}/unifi_poller/g" -e "s/{{CONFIG_FILE}}/up.conf/g" \
-			${GO_WRKSRC}/init/bsd/freebsd.rc.d
-
-do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/unifi-poller \
-	${STAGEDIR}${PREFIX}/share/doc/unifi-poller \
-	${STAGEDIR}${MAN1PREFIX}/man/man1
-	${INSTALL_PROGRAM} ${WRKDIR}/bin/unifi-poller ${STAGEDIR}${PREFIX}/bin/unifi-poller
-	${INSTALL_SCRIPT} ${WRKSRC}/init/bsd/freebsd.rc.d ${STAGEDIR}${PREFIX}/etc/rc.d/unifi-poller
-	${INSTALL_MAN} ${WRKSRC}/examples/up.conf.example ${STAGEDIR}${PREFIX}/etc/unifi-poller/up.conf.sample
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${GO_WRKSRC}/examples/MANUAL.md ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${GO_WRKSRC}/examples/MANUAL.html ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${GO_WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${GO_WRKSRC}/examples/up.conf.example ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${GO_WRKSRC}/examples/up.json.example ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${GO_WRKSRC}/examples/up.yaml.example ${STAGEDIR}${DOCSDIR}
-.endif
-	${INSTALL_MAN} ${GO_WRKSRC}/examples/MANUAL ${STAGEDIR}${MAN1PREFIX}/man/man1/unifi-poller.1
-
-.include <bsd.port.mk>
diff --git a/net-mgmt/unifi-poller/distinfo b/net-mgmt/unifi-poller/distinfo
deleted file mode 100644
index 23c4253c70ed..000000000000
--- a/net-mgmt/unifi-poller/distinfo
+++ /dev/null
@@ -1,61 +0,0 @@
-TIMESTAMP = 1618743560
-SHA256 (unifi-poller-unifi-poller-v2.1.3_GH0.tar.gz) = fb4930cb6c7a9fde187f2b57846c5bf183dfc6e04018f66609ccb1ade2cccb85
-SIZE (unifi-poller-unifi-poller-v2.1.3_GH0.tar.gz) = 77139
-SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
-SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
-SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
-SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
-SHA256 (cespare-xxhash-v2.1.1_GH0.tar.gz) = 0ee31178d2c5a1249be4e26294a2f428008dc4e1ecbbfbe47f74e41026df1148
-SIZE (cespare-xxhash-v2.1.1_GH0.tar.gz) = 9292
-SHA256 (davidnewhall-md2roff-aeae646f49d23457ca0f701a381cfa5f1eefc4e7_GH0.tar.gz) = 48f0da9535a6cf2b12f15f2b56e0a35cec285f8d756aa1fbc0ab121c53ce0939
-SIZE (davidnewhall-md2roff-aeae646f49d23457ca0f701a381cfa5f1eefc4e7_GH0.tar.gz) = 3588
-SHA256 (russross-blackfriday-v2.1.0_GH0.tar.gz) = a13af0fc5305713f5154693feaf654d024689efea76390091a5e8c757335b4f4
-SIZE (russross-blackfriday-v2.1.0_GH0.tar.gz) = 92896
-SHA256 (go-yaml-yaml-496545a6307b_GH0.tar.gz) = ed0e11dc14bbbd4127031d7e8b9e58dad885e2c44a16359d2f64b71d1d1f692a
-SIZE (go-yaml-yaml-496545a6307b_GH0.tar.gz) = 90156
-SHA256 (golang-crypto-4f45737414dc_GH0.tar.gz) = a741e69ef8961b0e4cac39e52b7a6513bc26ebc3648bdf87d62fc0860eeefb24
-SIZE (golang-crypto-4f45737414dc_GH0.tar.gz) = 1727053
-SHA256 (golang-net-e915ea6b2b7d_GH0.tar.gz) = 9e2929a3cb56eba373c2661968e60382434f8980f36307cc83ea618cffea4c63
-SIZE (golang-net-e915ea6b2b7d_GH0.tar.gz) = 1249467
-SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3
-SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702
-SHA256 (golang-sys-66c3f260301c_GH0.tar.gz) = c694fdfa95b4b21d3bc777019b1f2422e56c5f57f049bd8f485bab5fa19cbba1
-SIZE (golang-sys-66c3f260301c_GH0.tar.gz) = 1219296
-SHA256 (golang-term-72f3dc4e9b72_GH0.tar.gz) = 875a8c3dec0071ba412c3968b11705b467ed00419a395cb4af306565511cb9ee
-SIZE (golang-term-72f3dc4e9b72_GH0.tar.gz) = 15000
-SHA256 (golift-cnfg-v0.0.7_GH0.tar.gz) = d0955194148c9b02d823a3521e37b1a163af200a7652c7a61f31af8bc04d74f1
-SIZE (golift-cnfg-v0.0.7_GH0.tar.gz) = 15879
-SHA256 (golift-version-v0.0.2_GH0.tar.gz) = af3f2d11ff6c63310cae802adbacdc257a68ad29ed89c75e2fa6a5d8c656eb80
-SIZE (golift-version-v0.0.2_GH0.tar.gz) = 5212
-SHA256 (gorilla-mux-v1.8.0_GH0.tar.gz) = ea2639259d2ce6f402636655e91eb93ba69c139e3cbf80b044ee393ada53757b
-SIZE (gorilla-mux-v1.8.0_GH0.tar.gz) = 45517
-SHA256 (influxdata-influxdb1-client-b269163b24ab_GH0.tar.gz) = b9e7ebd1aae41f0849c750958d1c5f11cfe6c3cb91808b131752c173575bea76
-SIZE (influxdata-influxdb1-client-b269163b24ab_GH0.tar.gz) = 59210
-SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b
-SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184
-SHA256 (prometheus-client_golang-v1.10.0_GH0.tar.gz) = e7305f84aa6553d9dd4bfd148d29289df36a9df82dae7be3c6eda62feb56f3d1
-SIZE (prometheus-client_golang-v1.10.0_GH0.tar.gz) = 176316
-SHA256 (prometheus-client_model-v0.2.0_GH0.tar.gz) = 4ab1be9cdfa702d7f49beeb09a256bcc6a2aad55e8a0a37e7732a46934264e12
-SIZE (prometheus-client_model-v0.2.0_GH0.tar.gz) = 10986
-SHA256 (prometheus-common-v0.20.0_GH0.tar.gz) = fdb23e113db6d3f12654a8e2282a10aaa1806b8ca53c2fab26412d0d98cecd22
-SIZE (prometheus-common-v0.20.0_GH0.tar.gz) = 123986
-SHA256 (prometheus-procfs-v0.6.0_GH0.tar.gz) = 6ad7a23cf4db9fa5dbf2c5d8fbd0fbf5ffe48e3ddb7bf15f9359813d764ce73c
-SIZE (prometheus-procfs-v0.6.0_GH0.tar.gz) = 169898
-SHA256 (protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 26218474bcf776ecf32d7d194c6bfaca8e7b4f0c087e5b595fd50fbb31409676
-SIZE (protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 1270215
-SHA256 (spf13-pflag-85dd5c8bc61c_GH0.tar.gz) = c74805afef2921dca0c00452e845d8e1c59abb2803130e49e0a03b79ac2d9230
-SIZE (spf13-pflag-85dd5c8bc61c_GH0.tar.gz) = 52040
-SHA256 (unifi-poller-influxunifi-d2de22bd896d_GH0.tar.gz) = 4168a236d977f7a98fe404cf6f6cda528e08ee4c60ee96014029a81d581095f2
-SIZE (unifi-poller-influxunifi-d2de22bd896d_GH0.tar.gz) = 32473
-SHA256 (unifi-poller-inputunifi-7fd4a2cdb411_GH0.tar.gz) = 3806b6d89bda82cb52e5860183ec121fdf8b90c1f57b6c2c4349cabee8c26512
-SIZE (unifi-poller-inputunifi-7fd4a2cdb411_GH0.tar.gz) = 28488
-SHA256 (unifi-poller-lokiunifi-9e27b9fcffc5_GH0.tar.gz) = 6a9a03eef0d783f5147773b0cbd860fae9d2d045c019006305e1d764d3811964
-SIZE (unifi-poller-lokiunifi-9e27b9fcffc5_GH0.tar.gz) = 24837
-SHA256 (unifi-poller-poller-efda34dd8222_GH0.tar.gz) = 2091ec85a4b0a167684926e2c5feeeb8133decba52decdf4cbd22ec9bc4661de
-SIZE (unifi-poller-poller-efda34dd8222_GH0.tar.gz) = 8722
-SHA256 (unifi-poller-promunifi-f15144f260be_GH0.tar.gz) = dd520912499848694460b0bf828e06d6ac79f1358dc10897207b50da4165fe25
-SIZE (unifi-poller-promunifi-f15144f260be_GH0.tar.gz) = 36880
-SHA256 (unifi-poller-unifi-v0.0.8_GH0.tar.gz) = 8a88dc57bc6c6ad4adac17ee6a6292b54a823fe93559fdb8d2eae78925961d95
-SIZE (unifi-poller-unifi-v0.0.8_GH0.tar.gz) = 73144
-SHA256 (unifi-poller-webserver-b4db5feaea83_GH0.tar.gz) = b79b479a44b1e0638820614198a9deebcb400a4dca46e9888ac00e3127a2ec24
-SIZE (unifi-poller-webserver-b4db5feaea83_GH0.tar.gz) = 8564
diff --git a/net-mgmt/unifi-poller/pkg-descr b/net-mgmt/unifi-poller/pkg-descr
deleted file mode 100644
index a1110f25d833..000000000000
--- a/net-mgmt/unifi-poller/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Unifi-poller collects your UniFi controller data and reports it to
-an InfluxDB instance, or export it for Prometheus collection.
-
-WWW: https://github.com/unifi-poller/unifi-poller
diff --git a/net-mgmt/unifi-poller/pkg-plist b/net-mgmt/unifi-poller/pkg-plist
deleted file mode 100644
index 69c7c5bc3643..000000000000
--- a/net-mgmt/unifi-poller/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-bin/unifi-poller
-etc/rc.d/unifi-poller
-@sample etc/unifi-poller/up.conf.sample
-%%PORTDOCS%%%%DOCSDIR%%/MANUAL.md
-%%PORTDOCS%%%%DOCSDIR%%/MANUAL.html
-%%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/up.conf.example
-%%PORTDOCS%%%%DOCSDIR%%/up.json.example
-%%PORTDOCS%%%%DOCSDIR%%/up.yaml.example
-man/man1/unifi-poller.1.gz
diff --git a/net/Makefile b/net/Makefile
index a8131a8d36f2..16c98902698b 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -20,7 +20,6 @@
     SUBDIR += aoe
     SUBDIR += apache-commons-net
     SUBDIR += apinger
-    SUBDIR += appkonference
     SUBDIR += aprsc
     SUBDIR += aquantia-atlantic-kmod
     SUBDIR += arataga
@@ -411,7 +410,6 @@
     SUBDIR += libsignal-protocol-c
     SUBDIR += libslirp
     SUBDIR += libsrtp2
-    SUBDIR += libstorj
     SUBDIR += libtnl
     SUBDIR += libtrace
     SUBDIR += libunp
@@ -1037,7 +1035,6 @@
     SUBDIR += py-ec2-cli-tools
     SUBDIR += py-errbot
     SUBDIR += py-eventlet
-    SUBDIR += py-flask-xml-rpc
     SUBDIR += py-gdown
     SUBDIR += py-geopy
     SUBDIR += py-gntp
@@ -1598,7 +1595,6 @@
     SUBDIR += yconalyzer
     SUBDIR += yggdrasil
     SUBDIR += yptransitd
-    SUBDIR += zebra
     SUBDIR += zebra-server
     SUBDIR += zeroconf-ioslave
     SUBDIR += zerotier
diff --git a/net/appkonference/Makefile b/net/appkonference/Makefile
deleted file mode 100644
index d14c56d04afa..000000000000
--- a/net/appkonference/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# Created by: Alex Deiter <Alex.Deiter@Gmail.COM>
-
-PORTNAME=	appkonference
-PORTVERSION=	2.8
-PORTREVISION=	3
-CATEGORIES=	net
-MASTER_SITES=	SF
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	High-performance Asterisk voice/video conferencing plugin
-
-DEPRECATED=	Outdated, depends on unsupported version of net/asterisk
-EXPIRATION_DATE=2021-12-31
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-BROKEN=		does not build with net/asterisk1{6,8}
-
-ONLY_FOR_ARCHS=		amd64 armv6 armv7 i386 powerpc powerpc64 powerpc64le
-ONLY_FOR_ARCHS_REASON=	not yet ported to this architecture
-
-USES=		compiler:features gmake
-USE_CSTD=	gnu89
-WRKSRC=		${WRKDIR}/${PORTNAME}/konference
-MAKE_ARGS=	ASTERISK_SRC_VERSION=1300
-# Fix build with clang11
-CFLAGS+=	-fcommon
-
-PLIST_FILES=	lib/asterisk/modules/app_konference.so
-
-OPTIONS_DEFINE=		OPTIMIZED_CFLAGS
-OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS
-
-OPTIMIZED_CFLAGS_CFLAGS=	-O3 -ffast-math
-
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} && ${CHOSEN_COMPILER_TYPE} == gcc
-CFLAGS+=	-funroll-all-loops -fsingle-precision-constant
-.endif
-
-.if ${CHOSEN_COMPILER_TYPE} == clang
-CFLAGS+=        -fblocks
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net/appkonference/distinfo b/net/appkonference/distinfo
deleted file mode 100644
index be7221dd436f..000000000000
--- a/net/appkonference/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1595103827
-SHA256 (appkonference-2.8.tar.gz) = 7bd50a10fe98e6a57be8b678de20493df395d0035f6f0a47ac5709ca8e753387
-SIZE (appkonference-2.8.tar.gz) = 194169
diff --git a/net/appkonference/files/patch-Makefile b/net/appkonference/files/patch-Makefile
deleted file mode 100644
index 953854ff8ae7..000000000000
--- a/net/appkonference/files/patch-Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
---- Makefile.orig	2016-01-05 16:43:05 UTC
-+++ Makefile
-@@ -13,7 +13,7 @@
- #
- 
- # asterisk source directory
--ASTERISK_SRC_DIR =
-+ASTERISK_SRC_DIR = ${LOCALBASE}
- 
- ifndef	ASTERISK_SRC_DIR
-   $(warning Asterisk source directory is not set)
-@@ -21,7 +21,7 @@ ifndef	ASTERISK_SRC_DIR
- endif
- 
- # asterisk version
--ASTERISK_SRC_VERSION = $(shell if [ -e $(ASTERISK_SRC_DIR)/.version ] ; then cat $(ASTERISK_SRC_DIR)/.version | awk -F. '{printf "%01d%02d",$$1,$$2}' ; fi)
-+ASTERISK_SRC_VERSION = 18
- 
- ifeq	($(ASTERISK_SRC_VERSION),)
-   $(warning Asterisk version is not set)
-@@ -32,7 +32,7 @@ endif
- ASTERISK_INCLUDE_DIR = $(ASTERISK_SRC_DIR)/include
- 
- # asterisk module directory
--INSTALL_MODULES_DIR = /usr/lib/asterisk/modules
-+INSTALL_MODULES_DIR = ${PREFIX}/lib/asterisk/modules
- 
- # module release
- RELEASE = 2.7
-@@ -84,12 +84,12 @@ INCLUDE = -I$(ASTERISK_INCLUDE_DIR)
- # compiler flags
- #
- 
--CFLAGS = -pipe -Wall -Wmissing-prototypes -Wmissing-declarations -MD -MP $(DEBUG)
-+CFLAGS += -pipe -Wall -Wmissing-prototypes -Wmissing-declarations -MD -MP $(DEBUG)
- #CFLAGS += -O3 -march=pentium3 -msse -mfpmath=sse,387 -ffast-math
- # PERF: below is 10% faster than -O2 or -O3 alone.
- #CFLAGS += -O3 -ffast-math -funroll-loops
- # below is another 5% faster or so.
--CFLAGS += -O3 -ffast-math -funroll-all-loops -fsingle-precision-constant
-+#CFLAGS += -O3 -ffast-math -funroll-all-loops -fsingle-precision-constant
- #CFLAGS += -mcpu=7450 -faltivec -mabi=altivec -mdynamic-no-pic
- # adding -msse -mfpmath=sse has little effect.
- #CFLAGS += -O3 -msse -mfpmath=sse
-@@ -102,7 +102,7 @@ CFLAGS += -fPIC
- # preprocessor flags
- #
- 
--CPPFLAGS = $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE
-+CPPFLAGS += $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE
- CPPFLAGS += -DRELEASE=\"$(RELEASE)\"
- CPPFLAGS += -DASTERISK_SRC_VERSION=$(ASTERISK_SRC_VERSION)
- CPPFLAGS += -DCHANNEL_TABLE_SIZE=$(CHANNEL_TABLE_SIZE)
-@@ -127,7 +127,7 @@ CPPFLAGS += -DAC_USE_ULAW
- #
- # Uncomment this if you want to use *bsd kqueue for timing
- #
--# CPPFLAGS += -DKQUEUE
-+CPPFLAGS += -DKQUEUE
- #
- 
- #
-@@ -207,7 +207,8 @@ clean:
- $(OBJS): $(INCS)
- 
- $(TARGET): $(OBJS)
--	$(CC) $(SOLINK) -o $@ $(OBJS)
-+	$(CC) $(LDFLAGS) $(SOLINK) -o $@ $(OBJS)
- 
- install:
--	if [ -f $(TARGET) ]; then $(INSTALL) -m 755 $(TARGET) $(INSTALL_MODULES_DIR); fi
-+	mkdir -p $(DESTDIR)$(INSTALL_MODULES_DIR)
-+	${BSD_INSTALL_LIB} $(TARGET) $(DESTDIR)$(INSTALL_MODULES_DIR)
diff --git a/net/appkonference/files/patch-konference_libwebrtc_typedefs.h b/net/appkonference/files/patch-konference_libwebrtc_typedefs.h
deleted file mode 100644
index bb127c593b25..000000000000
--- a/net/appkonference/files/patch-konference_libwebrtc_typedefs.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- libwebrtc/typedefs.h.orig	2019-08-04 15:52:12 UTC
-+++ libwebrtc/typedefs.h
-@@ -48,7 +48,19 @@
- #define WEBRTC_ARCH_32_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
- #else
--#error Please add support for your architecture in typedefs.h
-+/* instead of failing, use typical unix defines... */
-+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-+#define WEBRTC_ARCH_LITTLE_ENDIAN
-+#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-+#define WEBRTC_ARCH_BIG_ENDIAN
-+#else
-+#error __BYTE_ORDER__ is not defined
-+#endif
-+#if defined(__LP64__)
-+#define WEBRTC_ARCH_64_BITS
-+#else
-+#define WEBRTC_ARCH_32_BITS
-+#endif
- #endif
- 
- #if !(defined(WEBRTC_ARCH_LITTLE_ENDIAN) ^ defined(WEBRTC_ARCH_BIG_ENDIAN))
diff --git a/net/appkonference/pkg-descr b/net/appkonference/pkg-descr
deleted file mode 100644
index 3a76ed1f8afb..000000000000
--- a/net/appkonference/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-App_konference is a channel-independent conference application.
-It features efficient audio mixing algorithms as well as video selection
-support based on VAD, DTMF or CLI.
-
-WWW: https://sourceforge.net/projects/appkonference/
diff --git a/net/libstorj/Makefile b/net/libstorj/Makefile
deleted file mode 100644
index d6ed980e3d31..000000000000
--- a/net/libstorj/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-PORTNAME=	libstorj
-PORTVERSION=	1.0.3
-DISTVERSIONPREFIX=	v
-PORTREVISION=	6
-CATEGORIES=	net
-
-MAINTAINER=	jhixson@FreeBSD.org
-COMMENT=	C library and CLI for encrypted file transfer on the Storj network
-
-LICENSE=	LGPL21+
-
-DEPRECATED=	Deprecated in favour of net/storj due to v3 rearchitecture
-EXPIRATION_DATE=2021-12-31
-
-LIB_DEPENDS=	libjson-c.so:devel/json-c \
-		libuv.so:devel/libuv \
-		libcurl.so:ftp/curl \
-		libnettle.so:security/nettle \
-		libmicrohttpd.so:www/libmicrohttpd
-
-USES=		autoreconf gmake libtool localbase pkgconfig
-USE_CSTD=	gnu99
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	Storj
-
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-MAKE_JOBS_UNSAFE=	yes  # ./storjtests.h:10:10: fatal error: 'mockbridgeinfo.json.h' file not found
-
-#CFLAGS+=	-I. -I${LOCALBASE}/include
-#LDFLAGS+=	-L. -L${LOCALBASE}/lib
-
-.include <bsd.port.options.mk>
-
-.if ${ARCH} != amd64 && ${ARCH} != i386
-USE_GCC=	yes
-.endif
-
-.include <bsd.port.mk>
diff --git a/net/libstorj/distinfo b/net/libstorj/distinfo
deleted file mode 100644
index 9eaaa40dc76a..000000000000
--- a/net/libstorj/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1527190057
-SHA256 (Storj-libstorj-v1.0.3_GH0.tar.gz) = 0f68f6a8374b93c240ae3a87c2f08feb34f812685858935bf079c1d0501ad032
-SIZE (Storj-libstorj-v1.0.3_GH0.tar.gz) = 170838
diff --git a/net/libstorj/files/patch-src_crypto.c b/net/libstorj/files/patch-src_crypto.c
deleted file mode 100644
index d1b0a2a1d3e2..000000000000
--- a/net/libstorj/files/patch-src_crypto.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/crypto.c.orig	2018-05-10 18:45:47 UTC
-+++ src/crypto.c
-@@ -216,7 +216,7 @@ int sha512_of_str(const uint8_t *str, int str_len, uin
-     return 0;
- }
- 
--void pbkdf2_hmac_sha512 (
-+void off_pbkdf2_hmac_sha512 (
-     unsigned key_length,
-     const uint8_t *key,
-     unsigned iterations,
diff --git a/net/libstorj/files/patch-src_crypto.h b/net/libstorj/files/patch-src_crypto.h
deleted file mode 100644
index 5212609b064f..000000000000
--- a/net/libstorj/files/patch-src_crypto.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/crypto.h.orig	2018-05-10 18:45:47 UTC
-+++ src/crypto.h
-@@ -40,7 +40,7 @@ int double_ripemd160sha256(uint8_t *data, uint64_t dat
- int double_ripemd160sha256_as_string(uint8_t *data, uint64_t data_size,
-                                     char **digest);
- 
--void pbkdf2_hmac_sha512(unsigned key_length,
-+void off_pbkdf2_hmac_sha512(unsigned key_length,
-                         const uint8_t *key,
-                         unsigned iterations,
-                         unsigned salt_length, const uint8_t *salt,
diff --git a/net/libstorj/pkg-descr b/net/libstorj/pkg-descr
deleted file mode 100644
index 6189741a0862..000000000000
--- a/net/libstorj/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-C library for encrypted file transfer on the Storj network
-
-WWW: https://github.com/Storj/libstorj
diff --git a/net/libstorj/pkg-plist b/net/libstorj/pkg-plist
deleted file mode 100644
index d11ac67fa53f..000000000000
--- a/net/libstorj/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/storj
-include/storj.h
-lib/libstorj.a
-lib/libstorj.so
-lib/libstorj.so.0
-lib/libstorj.so.0.0.0
-libdata/pkgconfig/libstorj.pc
diff --git a/net/py-flask-xml-rpc/Makefile b/net/py-flask-xml-rpc/Makefile
deleted file mode 100644
index b7e31c6e5244..000000000000
--- a/net/py-flask-xml-rpc/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-PORTNAME=	Flask-XML-RPC
-PORTVERSION=	0.1.2
-PORTREVISION=	1
-CATEGORIES=	net python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER=	john@saltant.com
-COMMENT=	Adds support for creating XML-RPC APIs to Flask
-
-LICENSE=	MIT
-
-DEPRECATED=	No longer maintained upstream
-EXPIRATION_DATE=	2021-12-31
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
-
-# 2.7,3.4+
-USES=		python:3.6+
-USE_PYTHON=	autoplist distutils
-
-NO_ARCH=	yes
-
-do-test:
-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
-
-.include <bsd.port.mk>
diff --git a/net/py-flask-xml-rpc/distinfo b/net/py-flask-xml-rpc/distinfo
deleted file mode 100644
index 1f3d97035cc5..000000000000
--- a/net/py-flask-xml-rpc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1487439353
-SHA256 (Flask-XML-RPC-0.1.2.tar.gz) = 4adc7482240a916e8c2205cba38b4bd6e648692d189419686a3116768fa48ab7
-SIZE (Flask-XML-RPC-0.1.2.tar.gz) = 5756
diff --git a/net/py-flask-xml-rpc/files/patch-flaskext_xmlrpc.py b/net/py-flask-xml-rpc/files/patch-flaskext_xmlrpc.py
deleted file mode 100644
index 968a359e210e..000000000000
--- a/net/py-flask-xml-rpc/files/patch-flaskext_xmlrpc.py
+++ /dev/null
@@ -1,56 +0,0 @@
-Obtained-From: https://bitbucket.org/leafstorm/flask-xml-rpc/pull-requests/2/added-python3-support-alongside-python2/commits
-
-# HG changeset patch
-# User Maxime "Pepe_" Buquet <pep+code@bouah.net>
-# Date 1425540278 -32400
-# Node ID 9da0e2bcfe5e32a1db95b639f41f67d3e1a43b80
-# Parent  06a6c81e3a98ecb647e729e239f5de11814901d3
-Added Python3 support alongside Python2
-
---- flaskext/xmlrpc.py.orig	2015-03-05 00:00:00 UTC
-+++ flaskext/xmlrpc.py
-@@ -10,9 +10,16 @@
- """
- 
- from flask import request, current_app
--from SimpleXMLRPCServer import SimpleXMLRPCDispatcher as Dispatcher
- import sys
--import xmlrpclib
-+
-+if sys.version_info[0] == 2:
-+    from SimpleXMLRPCServer import SimpleXMLRPCDispatcher as Dispatcher
-+    import xmlrpclib
-+    string_types = basestring
-+else:
-+    from xmlrpc.server import SimpleXMLRPCDispatcher as Dispatcher
-+    import xmlrpc.client as xmlrpclib
-+    string_types = str
- 
- Fault = xmlrpclib.Fault
- 
-@@ -97,7 +104,7 @@
-                      If not given, the function's :obj:`__name__` attribute
-                      will be used.
-         """
--        if isinstance(function, basestring):
-+        if isinstance(function, string_types):
-             return lambda fn: self.register_function(fn, function)
-         return Dispatcher.register_function(self, function, name)
-     
-@@ -198,7 +205,7 @@
-                      If not given, the function's :obj:`__name__` attribute
-                      will be used.
-         """
--        if isinstance(function, basestring):
-+        if isinstance(function, string_types):
-             return lambda fn: self.register_function(fn, function)
-         if name is None:
-             name = function.__name__
-@@ -249,7 +256,8 @@
-     """
-     try:
-         return xmlrpclib.loads(response)[0][0]
--    except Fault, fault:
-+    except Fault:
-+        _, fault = sys.exec_info()[:2]
-         return fault
diff --git a/net/py-flask-xml-rpc/files/patch-tests_test-xmlrpc.py b/net/py-flask-xml-rpc/files/patch-tests_test-xmlrpc.py
deleted file mode 100644
index 435c195bd21c..000000000000
--- a/net/py-flask-xml-rpc/files/patch-tests_test-xmlrpc.py
+++ /dev/null
@@ -1,45 +0,0 @@
-Obtained-From: https://bitbucket.org/leafstorm/flask-xml-rpc/pull-requests/2/added-python3-support-alongside-python2/commits
-
-# HG changeset patch
-# User Maxime "Pepe_" Buquet <pep+code@bouah.net>
-# Date 1425540278 -32400
-# Node ID 9da0e2bcfe5e32a1db95b639f41f67d3e1a43b80
-# Parent  06a6c81e3a98ecb647e729e239f5de11814901d3
-Added Python3 support alongside Python2
-
---- tests/test-xmlrpc.py.orig	2015-03-05 00:00:00 UTC
-+++ tests/test-xmlrpc.py
-@@ -7,12 +7,19 @@
- :copyright: (c) 2010 by Matthew "LeafStorm" Frazier.
- :license: MIT, see LICENSE for more details.
- """
--import xmlrpclib
- from flask import Flask
- from flaskext.xmlrpc import (XMLRPCHandler, XMLRPCNamespace, Fault,
-                              dump_method_call, load_method_response,
-                              test_xmlrpc_call, XMLRPCTester)
- 
-+import sys
-+PY2 = sys.version_info[0] == 2
-+
-+if PY2:
-+    import xmlrpclib
-+else:
-+    import xmlrpc.client as xmlrpclib
-+
- 
- def hello(name='world'):
-     if not name:
-@@ -39,7 +46,11 @@
-         handler = XMLRPCHandler('api')
-         app = Flask(__name__)
-         handler.connect(app, '/api')
--        assert app.view_functions[handler.endpoint_name].im_self is handler
-+        if PY2:
-+            app_handler = app.view_functions[handler.endpoint_name].im_self
-+        else:
-+            app_handler = app.view_functions[handler.endpoint_name].__self__
-+        assert app_handler is handler
-     
-     def test_register(self):
-         handler = XMLRPCHandler('api')
diff --git a/net/py-flask-xml-rpc/pkg-descr b/net/py-flask-xml-rpc/pkg-descr
deleted file mode 100644
index 84ef9edd7260..000000000000
--- a/net/py-flask-xml-rpc/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Flask-XML-RPC is an extension for Flask that makes it easy to create APIs
-based on the XML-RPC standard. It features easy registration of methods
-and namespacing, connects seamlessly to your Flask app, and includes
-plenty of testing helpers.
-
-WWW: https://pythonhosted.org/Flask-XML-RPC/
diff --git a/net/zebra/Makefile b/net/zebra/Makefile
deleted file mode 100644
index e9f91f12accb..000000000000
--- a/net/zebra/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-# Created by: Andreas Klemm <andreas@klemm.gtn.com>
-
-PORTNAME=	zebra
-PORTVERSION=	0.95a
-PORTREVISION=	10
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.ripe.net/mirrors/sites/ftp.zebra.org/pub/zebra/
-
-MAINTAINER=	bdrewery@FreeBSD.org
-COMMENT=	Free RIPv1, RIPv2, OSPFv2, BGP4 route software (server/reflector)
-
-LICENSE=	GPLv2 LGPL21
-LICENSE_COMB=	multi
-
-DEPRECATED=	Abandoned upstream, last release in 2005. Consider migrating to net/frr7 or net/bird2
-EXPIRATION_DATE=2021-12-31
-
-CONFLICTS=	openbgpd quagga quagga-re openospfd
-
-SUB_FILES=	pkg-message zebractl
-SUB_LIST=	BGPDARGS=${BGPDARGS} \
-		OSPFDARGS=${OSPFDARGS} \
-		OSPF6DARGS=${OSPFDARGS} \
-		RIPDARGS=${RIPDARGS} \
-		RIPNGDARGS=${RIPNGDARGS} \
-		ZEBRAARGS=${ZEBRAARGS}
-USE_SUBMAKE=	yes
-GNU_CONFIGURE=	yes
-USES=		cpe readline
-CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc/zebra
-CPE_VENDOR=	gnu
-
-PORTSCOUT=	ignore:1
-
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}"
-
-OPTIONS_DEFINE=	IPV6 PAM OSPFNSSA SNMP TCPZEBRA BGPD OSPF6D OSPFD RIPD RIPNGD VTYSH
-
-PAM_DESC=	PAM authentication for vtysh
-OSPFNSSA_DESC=	undergoing NSSA feature
-TCPZEBRA_DESC=	TCP/IP socket connection
-BGPD_DESC=	BGPD support
-OSPF6D_DESC=	OSPF6D support
-OSPFD_DESC=	OSPFD support
-RIPD_DESC=	RIPD support
-RIPNGD_DESC=	RIPNGD support
-VTYSH_DESC=	VTYSH support
-
-OPTIONS_DEFAULT=	BGPD OSPF6D OSPFD RIPD RIPNGD VTYSH
-OPTIONS_SUB=	yes
-NO_OPTIONS_SORT=	yes
-
-PAM_CONFIGURE_WITH=		pam
-OSPFNSSA_CONFIGURE_ENABLE=	nssa
-SNMP_CONFIGURE_ENABLE=		snmp
-SNMP_LIB_DEPENDS+=		libnetsnmp.so:net-mgmt/net-snmp
-TCPZEBRA_CONFIGURE_ENABLE=	tcp-zebra
-BGPD_CONFIGURE_ENABLE=		bgpd
-OSPF6D_CONFIGURE_ENABLE=	ospf6d
-OSPFD_CONFIGURE_ENABLE=		ospfd
-RIPD_CONFIGURE_ENABLE=		ripd
-RIPNGD_CONFIGURE_ENABLE=	ripngd
-VTYSH_CONFIGURE_ENABLE=		vtysh
-IPV6_CONFIGURE_ENABLE=		ipv6
-
-INFO=		zebra
-
-BGPDARGS?=	-d
-OSPFDARGS?=	-d
-OSPF6DARGS?=	-d
-RIPDARGS?=	-d
-RIPNGDARGS?=	-d
-ZEBRAARGS?=	-d
-
-.include <bsd.port.options.mk>
-
-.if !${PORT_OPTIONS:MIPV6} && ${PORT_OPTIONS:MOSPF6D}
-IGNORE=		OSPF6D requires IPV6 option
-.endif
-.if !${PORT_OPTIONS:MIPV6} && ${PORT_OPTIONS:MRIPNGD}
-IGNORE=		RIPNGD requires IPV6 option
-.endif
-
-post-install:
-	@( cd ${WRKSRC}/doc; ${RM} zebra*info*; \
-	   ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} zebra.info install )
-	@${ECHO_MSG} "===>     installing zebra startup file..."
-	${INSTALL_SCRIPT} ${WRKDIR}/zebractl ${STAGEDIR}${PREFIX}/sbin/zebractl
-	@${ECHO_MSG} "done."
-
-.include <bsd.port.mk>
diff --git a/net/zebra/distinfo b/net/zebra/distinfo
deleted file mode 100644
index a02a819da9a4..000000000000
--- a/net/zebra/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (zebra-0.95a.tar.gz) = e7f8cbb367c325062625c881a97adc4cf6d3d138a25341451193652944888d1f
-SIZE (zebra-0.95a.tar.gz) = 1370152
diff --git a/net/zebra/files/patch-configure b/net/zebra/files/patch-configure
deleted file mode 100644
index 6b3a510c89e4..000000000000
--- a/net/zebra/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Thu May 19 11:13:47 2005
-+++ configure		Thu May 19 11:15:55 2005
-@@ -5772,6 +5772,8 @@
-                      zebra_ipforward_path="proc";;
-   "/dev/ip")
-                      case "$host" in
-+		       *-freebsd-*)   IPFORWARD=ipforward_sysctl.o
-+				      zebra_ipforward_path="sysctl";; 
- 		       *-linux-*)     IPFORWARD=ipforward_proc.o
- 				      zebra_ipforward_path="proc";;
-                        *-nec-sysv4*)  IPFORWARD=ipforward_ews.o
diff --git a/net/zebra/files/patch-ioctl.c b/net/zebra/files/patch-ioctl.c
deleted file mode 100644
index dab8b25369fb..000000000000
--- a/net/zebra/files/patch-ioctl.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- zebra/ioctl.c.orig	Tue Oct 23 11:31:29 2001
-+++ zebra/ioctl.c	Fri Oct  4 19:45:04 2002
-@@ -349,6 +349,7 @@
-   int ret;
-   struct ifreq ifreq;
- 
-+  bzero(&ifreq, sizeof(struct ifreq));
-   ifreq_set_name (&ifreq, ifp);
- 
-   ifreq.ifr_flags = ifp->flags;
-@@ -371,6 +372,7 @@
-   int ret;
-   struct ifreq ifreq;
- 
-+  bzero(&ifreq, sizeof(struct ifreq));
-   ifreq_set_name (&ifreq, ifp);
- 
-   ifreq.ifr_flags = ifp->flags;
-@@ -473,6 +475,9 @@
-   mask.sin6_len = sizeof (struct sockaddr_in6);
- #endif
-   memcpy (&addreq.ifra_prefixmask, &mask, sizeof (struct sockaddr_in6));
-+
-+  addreq.ifra_lifetime.ia6t_vltime = 0xffffffff;
-+  addreq.ifra_lifetime.ia6t_pltime = 0xffffffff;
-   
-   addreq.ifra_lifetime.ia6t_pltime = ND6_INFINITE_LIFETIME; 
-   addreq.ifra_lifetime.ia6t_vltime = ND6_INFINITE_LIFETIME; 
diff --git a/net/zebra/files/patch-ospfd__ospf_spf.c b/net/zebra/files/patch-ospfd__ospf_spf.c
deleted file mode 100644
index 2305ac9102c3..000000000000
--- a/net/zebra/files/patch-ospfd__ospf_spf.c
+++ /dev/null
@@ -1,291 +0,0 @@
-Index: ospfd/ospf_spf.c
-===================================================================
-RCS file: /cvsroot/zebra/ospfd/ospf_spf.c,v
-retrieving revision 1.124
-diff -u -r1.124 ospf_spf.c
---- ospfd/ospf_spf.c	28 Mar 2003 19:55:28 -0000	1.124
-+++ ospfd/ospf_spf.c	22 Feb 2006 03:03:26 -0000
-@@ -29,6 +29,7 @@
- #include "table.h"
- #include "log.h"
- #include "sockunion.h"          /* for inet_ntop () */
-+#include "pqueue.h"
- 
- #include "ospfd/ospfd.h"
- #include "ospfd/ospf_interface.h"
-@@ -114,7 +115,7 @@
- }
- 
- void
--ospf_vertex_add_parent (struct vertex *v)
-+ospf_vertex_connect_to_parent (struct vertex *v)
- {
-   struct vertex_nexthop *nh;
-   listnode node;
-@@ -458,48 +459,36 @@
-     }
- }
- 
--void
--ospf_install_candidate (list candidate, struct vertex *w)
-+int
-+ospf_vertex_cmp (void *a, void *b)
- {
--  listnode node;
--  struct vertex *cw;
--
--  if (list_isempty (candidate))
--    {
--      listnode_add (candidate, w);
--      return;
--    }
-+  struct vertex *va = (struct vertex *) a;
-+  struct vertex *vb = (struct vertex *) b;
-+  /* ascending order */
-+  return (va->distance - vb->distance);
-+}
- 
--  /* Install vertex with sorting by distance. */
--  for (node = listhead (candidate); node; nextnode (node))
--    {
--      cw = (struct vertex *) getdata (node);
--      if (cw->distance > w->distance)
--        {
--          list_add_node_prev (candidate, node, w);
--          break;
--        }
--      else if (node->next == NULL)
--        {
--          list_add_node_next (candidate, node, w);
--          break;
--        }
--    }
-+void
-+ospf_install_candidate (struct pqueue *candidate_list, struct vertex *w)
-+{
-+  if (IS_DEBUG_OSPF_EVENT)
-+    zlog_info ("candidate: type: %d id: %s p: %p distance: %lu",
-+               w->type, inet_ntoa (w->id), w, (u_long)w->distance);
-+  pqueue_enqueue (w, candidate_list);
- }
- 
- /* RFC2328 Section 16.1 (2). */
- void
- ospf_spf_next (struct vertex *v, struct ospf_area *area,
--               list candidate, struct route_table *rv,
-+               struct pqueue *candidate_list, struct route_table *rv,
-                struct route_table *nv)
- {
-   struct ospf_lsa *w_lsa = NULL;
--  struct vertex *w, *cw;
-+  struct vertex *w;
-   u_char *p;
-   u_char *lim;
-   struct router_lsa_link *l = NULL;
-   struct in_addr *r;
--  listnode node;
-   int type = 0;
- 
-   /* If this is a router-LSA, and bit V of the router-LSA (see Section
-@@ -618,58 +607,22 @@
-       else
-         w->distance = v->distance;
- 
--      /* Is there already vertex W in candidate list? */
--      node = ospf_vertex_lookup (candidate, w->id, w->type);
--      if (node == NULL)
--        {
--          /* Calculate nexthop to W. */
--          ospf_nexthop_calculation (area, v, w);
--
--          ospf_install_candidate (candidate, w);
--        }
--      else
--        {
--          cw = (struct vertex *) getdata (node);
--
--          /* if D is greater than. */
--          if (cw->distance < w->distance)
--            {
--              ospf_vertex_free (w);
--              continue;
--            }
--          /* equal to. */
--          else if (cw->distance == w->distance)
--            {
--              /* Calculate nexthop to W. */
--              ospf_nexthop_calculation (area, v, w);
--              ospf_nexthop_merge (cw->nexthop, w->nexthop);
--              list_delete_all_node (w->nexthop);
--              ospf_vertex_free (w);
--            }
--          /* less than. */
--          else
--            {
--              /* Calculate nexthop. */
--              ospf_nexthop_calculation (area, v, w);
--
--              /* Remove old vertex from candidate list. */
--              ospf_vertex_free (cw);
--              listnode_delete (candidate, cw);
-+      /* calculate nexthop */
-+      ospf_nexthop_calculation (area, v, w);
- 
--              /* Install new to candidate. */
--              ospf_install_candidate (candidate, w);
--            }
--        }
-+      /* install candidate */
-+      ospf_install_candidate (candidate_list, w);
-     }
- }
- 
- /* Add vertex V to SPF tree. */
--void
-+struct vertex *
- ospf_spf_register (struct vertex *v, struct route_table *rv,
- 		   struct route_table *nv)
- {
-   struct prefix p;
-   struct route_node *rn;
-+  struct vertex *cv;
- 
-   p.family = AF_INET;
-   p.prefixlen = IPV4_MAX_BITLEN;
-@@ -680,7 +633,39 @@
-   else
-     rn = route_node_get (nv, &p);
- 
--  rn->info = v;
-+  cv = rn->info;
-+
-+  /* if the route does not exist yet, just install and return */
-+  if (! cv)
-+    {
-+      rn->info = v;
-+      return v;
-+    }
-+
-+  /* if D is greater than. */
-+  if (cv->distance < v->distance)
-+    ospf_vertex_free (v);
-+
-+  /* equal to. */
-+  else if (cv->distance == v->distance)
-+    {
-+      /* Merge nexthop to D. */
-+      ospf_nexthop_merge (cv->nexthop, v->nexthop);
-+      list_delete_all_node (v->nexthop);
-+      ospf_vertex_free (v);
-+    }
-+
-+  /* less than. */
-+  else
-+    {
-+      /* As long as sorting in the candidate_list works,
-+      cv->distance never become more than v->distance
-+      (i.e. (cv->distance > v->distance) should not happen). */
-+      assert (0);
-+    }
-+
-+  /* the vertex is dropped anyway */
-+  return NULL;
- }
- 
- void
-@@ -709,6 +694,7 @@
-   listnode cnode;
-   listnode nnode;
-   struct vertex_nexthop *nexthop;
-+  struct vertex *w;
- 
-   if (v->type == OSPF_VERTEX_ROUTER)
-     {
-@@ -734,8 +720,8 @@
- 
-   for (cnode = listhead (v->child); cnode; nextnode (cnode))
-     {
--      v = getdata (cnode);
--      ospf_spf_dump (v, i);
-+      w = getdata (cnode);
-+      ospf_spf_dump (w, i);
-     }
- }
- 
-@@ -895,8 +881,7 @@
- ospf_spf_calculate (struct ospf_area *area, struct route_table *new_table, 
-                     struct route_table *new_rtrs)
- {
--  list candidate;
--  listnode node;
-+  struct pqueue *candidate_list;
-   struct vertex *v;
-   struct route_table *rv;
-   struct route_table *nv;
-@@ -925,7 +910,8 @@
-   nv = route_table_init ();
- 
-   /* Clear the list of candidate vertices. */ 
--  candidate = list_new ();
-+  candidate_list = pqueue_create ();
-+  candidate_list->cmp = ospf_vertex_cmp;
- 
-   /* Initialize the shortest-path tree to only the root (which is the
-      router doing the calculation). */
-@@ -939,29 +925,37 @@
- 
-   for (;;)
-     {
--      /* RFC2328 16.1. (2). */
--      ospf_spf_next (v, area, candidate, rv, nv);
-+      if (v != NULL)
-+        {
-+          if (IS_DEBUG_OSPF_EVENT)
-+            zlog_info ("determined: type: %d id: %s p: %p distance: %lu",
-+                       v->type, inet_ntoa (v->id), v, (u_long)v->distance);
-+
-+          /* RFC2328 16.1. (2). */
-+          ospf_spf_next (v, area, candidate_list, rv, nv);
-+        }
- 
-       /* RFC2328 16.1. (3). */
-       /* If at this step the candidate list is empty, the shortest-
-          path tree (of transit vertices) has been completely built and
-          this stage of the procedure terminates. */
--      if (listcount (candidate) == 0)
-+      if (candidate_list->size == 0)
-         break;
- 
-       /* Otherwise, choose the vertex belonging to the candidate list
-          that is closest to the root, and add it to the shortest-path
-          tree (removing it from the candidate list in the
-          process). */ 
--      node = listhead (candidate);
--      v = getdata (node);
--      ospf_vertex_add_parent (v);
--
--      /* Reveve from the candidate list. */
--      listnode_delete (candidate, v);
-+      v = pqueue_dequeue (candidate_list);
- 
-       /* Add to SPF tree. */
--      ospf_spf_register (v, rv, nv);
-+      v = ospf_spf_register (v, rv, nv);
-+
-+      /* Skip rest if the vertex is rejected to be installed in SPF tree */
-+      if (v == NULL)
-+        continue;
-+
-+      ospf_vertex_connect_to_parent (v);
- 
-       /* Note that when there is a choice of vertices closest to the
-          root, network vertices must be chosen before router vertices
-@@ -993,7 +987,7 @@
-   ospf_spf_route_free (nv);
- 
-   /* Free candidate list */
--  list_free (candidate);
-+  pqueue_delete (candidate_list);
- 
-   /* Increment SPF Calculation Counter. */
-   area->spf_calculation++;
diff --git a/net/zebra/files/patch-ospfd_ospf_dump.c b/net/zebra/files/patch-ospfd_ospf_dump.c
deleted file mode 100644
index fbda1abf8294..000000000000
--- a/net/zebra/files/patch-ospfd_ospf_dump.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ospfd/ospf_dump.c.orig	2003-11-04 20:10:17.000000000 +0100
-+++ ospfd/ospf_dump.c	2014-03-18 14:22:06.123332679 +0100
-@@ -607,7 +607,7 @@
- 
-   iph = (struct ip *) STREAM_PNT (s);
- 
--#ifdef GNU_LINUX
-+#if defined(GNU_LINUX) || defined(__FreeBSD__)
-   length = ntohs (iph->ip_len);
- #else /* GNU_LINUX */
-   length = iph->ip_len;
diff --git a/net/zebra/files/patch-ospfd_ospf_lsa.c b/net/zebra/files/patch-ospfd_ospf_lsa.c
deleted file mode 100644
index 8a6de6ac49ba..000000000000
--- a/net/zebra/files/patch-ospfd_ospf_lsa.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- ./ospfd/ospf_lsa.c.orig	2005-05-26 11:40:19.000000000 -0500
-+++ ./ospfd/ospf_lsa.c	2014-04-09 15:16:46.751621976 -0500
-@@ -3247,6 +3247,7 @@
-   listnode node;
-   struct ospf *ospf = THREAD_ARG (t);
-   int i;
-+  time_t ct;
-   list lsa_to_refresh = list_new ();
- 
-   if (IS_DEBUG_OSPF (lsa, LSA_REFRESH))
-@@ -3254,16 +3255,26 @@
- 
-   
-   i = ospf->lsa_refresh_queue.index;
-+
-+  if ((ct = time(NULL)) < ospf->lsa_refresher_started) {
-+    zlog_info ("LSA[Refresh]: ospf_lsa_refresh_walker(): HACK: fixing lsa_refresher_started: %d -> %d", ospf->lsa_refresher_started, ct);
-+    ospf->lsa_refresher_started = ct;
-+  }
-   
-   ospf->lsa_refresh_queue.index =
-     (ospf->lsa_refresh_queue.index +
--     (time (NULL) - ospf->lsa_refresher_started) / OSPF_LSA_REFRESHER_GRANULARITY)
-+     (ct - ospf->lsa_refresher_started) / OSPF_LSA_REFRESHER_GRANULARITY)
-     % OSPF_LSA_REFRESHER_SLOTS;
- 
-   if (IS_DEBUG_OSPF (lsa, LSA_REFRESH))
-     zlog_info ("LSA[Refresh]: ospf_lsa_refresh_walker(): next index %d",
- 	       ospf->lsa_refresh_queue.index);
- 
-+  if (ospf->lsa_refresh_queue.index >= OSPF_LSA_REFRESHER_SLOTS) {
-+    zlog_info ("LSA[Refresh]: ospf_lsa_refresh_walker(): HACK: fixing index: %hu -> 0", ospf->lsa_refresh_queue.index);
-+    ospf->lsa_refresh_queue.index = 0;
-+  }
-+
-   for (;i != ospf->lsa_refresh_queue.index;
-        i = (i + 1) % OSPF_LSA_REFRESHER_SLOTS)
-     {
diff --git a/net/zebra/files/patch-ospfd_ospf_packet.c b/net/zebra/files/patch-ospfd_ospf_packet.c
deleted file mode 100644
index 8e4ca1f80f5f..000000000000
--- a/net/zebra/files/patch-ospfd_ospf_packet.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- ospfd/ospf_packet.c.orig	2005-06-21 02:58:24.000000000 +0200
-+++ ospfd/ospf_packet.c	2014-03-18 14:22:06.129332906 +0100
-@@ -528,7 +528,7 @@
-   iph.ip_hl = sizeof (struct ip) >> 2;
-   iph.ip_v = IPVERSION;
-   iph.ip_tos = IPTOS_PREC_INTERNETCONTROL;
--#if defined(__NetBSD__) || defined(__FreeBSD__)
-+#if defined(__NetBSD__)
-   iph.ip_len = iph.ip_hl*4 + op->length;
- #else
-   iph.ip_len = htons (iph.ip_hl*4 + op->length);
-@@ -1893,13 +1894,13 @@
-       return NULL;
-     }
- 
--#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(OpenBSD_IP_LEN)
-+#if defined(__NetBSD__) || defined(OpenBSD_IP_LEN)
-   ip_len = iph.ip_len;
- #else
-   ip_len = ntohs (iph.ip_len);
- #endif
- 
--#if !defined(GNU_LINUX) && !defined(OpenBSD_IP_LEN)
-+#if !defined(GNU_LINUX) && !defined(OpenBSD_IP_LEN) && !defined(__FreeBSD__)
-   /*
-    * Kernel network code touches incoming IP header parameters,
-    * before protocol specific processing.
diff --git a/net/zebra/files/patch-zebra-kernel_socket.c b/net/zebra/files/patch-zebra-kernel_socket.c
deleted file mode 100644
index d8868e362e9c..000000000000
--- a/net/zebra/files/patch-zebra-kernel_socket.c
+++ /dev/null
@@ -1,41 +0,0 @@
---- ./zebra/kernel_socket.c.orig	2003-11-27 10:35:50.000000000 -0600
-+++ ./zebra/kernel_socket.c	2014-06-13 12:53:05.553677585 -0500
-@@ -58,8 +58,12 @@
-   {RTM_REDIRECT, "RTM_REDIRECT"},
-   {RTM_MISS,     "RTM_MISS"},
-   {RTM_LOCK,     "RTM_LOCK"},
-+#ifdef RTM_OLDADD
-   {RTM_OLDADD,   "RTM_OLDADD"},
-+#endif
-+#ifdef RTM_OLDDEL
-   {RTM_OLDDEL,   "RTM_OLDDEL"},
-+#endif
-   {RTM_RESOLVE,  "RTM_RESOLVE"},
-   {RTM_NEWADDR,  "RTM_NEWADDR"},
-   {RTM_DELADDR,  "RTM_DELADDR"},
-@@ -91,9 +95,13 @@
- #ifdef RTF_MASK
-   {RTF_MASK,      "MASK"},
- #endif /* RTF_MASK */
-+#ifdef RTF_CLONING
-   {RTF_CLONING,   "CLONING"},
-+#endif /* RTF_CLONING */
-   {RTF_XRESOLVE,  "XRESOLVE"},
-+#ifdef RTF_LLINFO
-   {RTF_LLINFO,    "LLINFO"},
-+#endif /* RTF_LLINFO */
-   {RTF_STATIC,    "STATIC"},
-   {RTF_BLACKHOLE, "BLACKHOLE"},
-   {RTF_PROTO1,    "PROTO1"},
-@@ -593,9 +601,11 @@
-   if (gate && message == RTM_ADD)
-     msg.rtm.rtm_flags |= RTF_GATEWAY;
- 
-+#ifdef RTF_CLONING
-   if (! gate && message == RTM_ADD && ifp &&
-       (ifp->flags & IFF_POINTOPOINT) == 0)
-     msg.rtm.rtm_flags |= RTF_CLONING;
-+#endif */ RTF_CLONING */
- 
-   /* If no protocol specific gateway is specified, use link
-      address for gateway. */
diff --git a/net/zebra/files/patch-zebra_Makefile.in b/net/zebra/files/patch-zebra_Makefile.in
deleted file mode 100644
index c613ec176af0..000000000000
--- a/net/zebra/files/patch-zebra_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- zebra/Makefile.in.orig	Sat Jun 29 15:26:54 2002
-+++ zebra/Makefile.in	Wed Jul 24 19:16:06 2002
-@@ -404,7 +404,7 @@
- 
- 
- #client : client_main.o ../lib/libzebra.a
--#	$(CC) -g -o client client_main.o ../lib/libzebra.a $(LIBS) $(LIB_IPV6)
-+#	$(CC) -o client client_main.o ../lib/libzebra.a $(LIBS) $(LIB_IPV6)
- 
- install-sysconfDATA: $(sysconf_DATA)
- 	@$(NORMAL_INSTALL)
diff --git a/net/zebra/files/pkg-message.in b/net/zebra/files/pkg-message.in
deleted file mode 100644
index 60c744520da7..000000000000
--- a/net/zebra/files/pkg-message.in
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-To run zebra you should add in your /etc/rc.conf these lines:
-
-defaultrouter="NO"
-router_enable="YES"
-router="%%PREFIX%%/sbin/zebractl"
-router_flags="start"
-EOM
-}
-]
diff --git a/net/zebra/files/zebractl.in b/net/zebra/files/zebractl.in
deleted file mode 100644
index af1733ffe41c..000000000000
--- a/net/zebra/files/zebractl.in
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh
-#
-# zebra start/stop script by "Andreas Klemm <andreas@FreeBSD.ORG>"
-#
-
-usage()
-{
-	echo "$0: usage: $0 [ start | stop | restart ]"
-	exit 1
-}
-
-if [ $# -lt 1 ]; then
-	echo "$0: error: one argument needed"; usage
-elif [ $# -gt 1 ]; then
-	echo "$0: error: only one argument needed"; usage
-fi
-
-case $1 in
-	start)
-		if [ ! -f %%ETCDIR%%/zebra.conf ]; then
-			echo "error: zebra.conf config file is mandatory"
-			exit 1
-		fi
-		[ -f %%ETCDIR%%/zebra.conf ] \
-			&& %%PREFIX%%/sbin/zebra %%ZEBRAARGS%% && echo -n ' zebra'
-		[ -f %%ETCDIR%%/ripd.conf ] \
-			&& %%PREFIX%%/sbin/ripd %%RIPDARGS%% && echo -n ' ripd'
-		[ -f %%ETCDIR%%/ripngd.conf ] \
-			&& %%PREFIX%%/sbin/ripngd %%RIPNGDARGS%% && echo -n ' ripngd'
-		[ -f %%ETCDIR%%/ospfd.conf ] \
-			&& %%PREFIX%%/sbin/ospfd %%OSPFDARGS%% && echo -n ' ospfd'
-		[ -f %%ETCDIR%%/ospf6d.conf ] \
-			&& %%PREFIX%%/sbin/ospf6d %%OSPF6DARGS%% && echo -n ' ospf6d'
-		[ -f %%ETCDIR%%/bgpd.conf ] \
-			&& %%PREFIX%%/sbin/bgpd %%BGPDARGS%% && echo -n ' bgpd'
-		;;
-
-	stop)
-		[ -f %%ETCDIR%%/ripd.conf ] && killall ripd
-		[ -f %%ETCDIR%%/ripngd.conf ] && killall ripngd
-		[ -f %%ETCDIR%%/ospfd.conf ] && killall ospfd
-		[ -f %%ETCDIR%%/ospf6d.conf ] && killall ospf6d
-		[ -f %%ETCDIR%%/bgpd.conf ] && killall bgpd
-		[ -f %%ETCDIR%%/zebra.conf ] &&  killall zebra
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-
-	*)	echo "$0: error: unknown option $1"
-		usage
-		;;
-esac
-exit 0
diff --git a/net/zebra/pkg-descr b/net/zebra/pkg-descr
deleted file mode 100644
index 005d35bc4f1b..000000000000
--- a/net/zebra/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-GNU Zebra is a free software (distributed under GNU Generic Public
-License) which manages TCP/IP based routing protocols.
-
-It supports BGP-4 protocol as described in RFC1771 (A Border Gateway
-Protocol 4) and RIPv1, RIPv2 and OSPFv2.
-
-Zebra uses multithread technology under multithread supported UNIX
-kernels.  However it can be run under not-multithread supported
-UNIX kernels.
-
-Zebra is intended to be used as a Route Server and a Route Reflector.
-Zebra is not a toolkit, it provides full routing power under a new
-architecture.
-
-WWW: http://www.zebra.org/
diff --git a/net/zebra/pkg-plist b/net/zebra/pkg-plist
deleted file mode 100644
index fa4de00f8e28..000000000000
--- a/net/zebra/pkg-plist
+++ /dev/null
@@ -1,23 +0,0 @@
-%%BGPD%%sbin/bgpd
-%%OSPF6D%%sbin/ospf6d
-%%OSPFD%%sbin/ospfd
-%%RIPD%%sbin/ripd
-%%RIPNGD%%sbin/ripngd
-sbin/zebra
-sbin/zebractl
-%%VTYSH%%bin/vtysh
-%%BGPD%%etc/zebra/bgpd.conf.sample
-%%BGPD%%etc/zebra/bgpd.conf.sample2
-%%OSPF6D%%etc/zebra/ospf6d.conf.sample
-%%OSPFD%%etc/zebra/ospfd.conf.sample
-%%RIPD%%etc/zebra/ripd.conf.sample
-%%RIPNGD%%etc/zebra/ripngd.conf.sample
-%%VTYSH%%etc/zebra/vtysh.conf.sample
-etc/zebra/zebra.conf.sample
-man/man1/vtysh.1.gz
-man/man8/bgpd.8.gz
-man/man8/ospf6d.8.gz
-man/man8/ospfd.8.gz
-man/man8/ripd.8.gz
-man/man8/ripngd.8.gz
-man/man8/zebra.8.gz
diff --git a/security/Makefile b/security/Makefile
index 82eb040a919c..0762d545acd6 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -383,7 +383,6 @@
     SUBDIR += munge
     SUBDIR += mussh
     SUBDIR += n2n
-    SUBDIR += nacl
     SUBDIR += ncrack
     SUBDIR += ncrypt
     SUBDIR += nebula
@@ -406,7 +405,6 @@
     SUBDIR += nyx
     SUBDIR += oath-toolkit
     SUBDIR += obfs4proxy-tor
-    SUBDIR += obfsclient
     SUBDIR += ocaml-cryptgps
     SUBDIR += ocaml-cryptokit
     SUBDIR += ocaml-ssl
diff --git a/security/nacl/Makefile b/security/nacl/Makefile
deleted file mode 100644
index 6dd790016b63..000000000000
--- a/security/nacl/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# Created by: David Thiel <lx@FreeBSD.org>
-
-PORTNAME=	nacl
-PORTVERSION=	20110221
-PORTREVISION=	2
-CATEGORIES=	security
-MASTER_SITES=	http://hyperelliptic.org/nacl/
-
-MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	High speed cryptography library
-
-LICENSE=	PD
-
-DEPRECATED=	Unmaintained by upstream, use libsodium instead
-EXPIRATION_DATE=2021-12-31
-
-USES=		tar:bzip2
-USE_BINUTILS=	yes
-MAKE_JOBS_UNSAFE=	yes
-
-ONLY_FOR_ARCHS=	i386 amd64
-
-MYARCH=		${ARCH:S/i386/x86/}
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|$$| -fPIC|" ${WRKSRC}/okcompilers/c
-	@${REINPLACE_CMD} -e "s|gcc|${CC}|" ${WRKSRC}/okcompilers/c
-	@${REINPLACE_CMD} -e "s|g++|${CXX}|" ${WRKSRC}/okcompilers/cpp
-
-pre-build:
-	${RM} -r ${WRKSRC}/crypto_onetimeauth/poly1305/amd64
-	${PRINTF} "%s\n\t%s\n" "all:" "${SH} ./do" > ${WRKSRC}/Makefile
-
-post-build:
-	${AR} -r ${WRKSRC}/build/HOSTNAME/lib/${MYARCH}/libnacl.a \
-	    ${WRKSRC}/build/HOSTNAME/lib/${MYARCH}/randombytes.o
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/build/HOSTNAME/bin/nacl-sha256 \
-	    ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/build/HOSTNAME/bin/nacl-sha512 \
-	    ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/build/HOSTNAME/lib/${MYARCH}/* \
-	    ${STAGEDIR}${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/build/HOSTNAME/include/${MYARCH}/* \
-	    ${STAGEDIR}${PREFIX}/include
-
-.include <bsd.port.mk>
diff --git a/security/nacl/distinfo b/security/nacl/distinfo
deleted file mode 100644
index 49154ad59ba8..000000000000
--- a/security/nacl/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (nacl-20110221.tar.bz2) = 4f277f89735c8b0b8a6bbd043b3efb3fa1cc68a9a5da6a076507d067fc3b3bf8
-SIZE (nacl-20110221.tar.bz2) = 163415
diff --git a/security/nacl/files/patch-curvecp_socket__udp.c b/security/nacl/files/patch-curvecp_socket__udp.c
deleted file mode 100644
index f49d0709f1fd..000000000000
--- a/security/nacl/files/patch-curvecp_socket__udp.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- curvecp/socket_udp.c.orig	2011-02-21 01:49:34 UTC
-+++ curvecp/socket_udp.c
-@@ -6,6 +6,10 @@
- #include "socket.h"
- #include "blocking.h"
- 
-+#ifndef SOL_IP
-+#define SOL_IP IPPROTO_IP  /* FreeBSD requires protocol number */
-+#endif
-+
- static void enable_bsd_fragmentation(int fd)
- {
- #ifdef IP_DONTFRAG
diff --git a/security/nacl/files/patch-do b/security/nacl/files/patch-do
deleted file mode 100644
index c5287955c77e..000000000000
--- a/security/nacl/files/patch-do
+++ /dev/null
@@ -1,22 +0,0 @@
---- do.orig	2011-02-21 01:49:34 UTC
-+++ do
-@@ -6,7 +6,7 @@
- 
- version=`cat version`
- project=nacl
--shorthostname=`hostname | sed 's/\..*//' | tr -cd '[a-z][A-Z][0-9]'`
-+shorthostname=HOSTNAME
- 
- top="`pwd`/build/$shorthostname"
- bin="$top/bin"
-@@ -38,8 +38,8 @@ mkdir -p "$bin"
- mkdir -p "$lib"
- mkdir -p "$include"
- 
--exec >"$top/log"
--exec 2>&1
-+#exec >"$top/log"
-+#exec 2>&1
- exec 5>"$top/data"
- exec </dev/null
- 
diff --git a/security/nacl/pkg-descr b/security/nacl/pkg-descr
deleted file mode 100644
index 8e70b44fa662..000000000000
--- a/security/nacl/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-NaCl (pronounced "salt") is a new easy-to-use high-speed software
-library for network communication, encryption, decryption, signatures,
-etc. NaCl's goal is to provide all of the core operations needed to
-build higher-level cryptographic tools.
-
-Of course, other libraries already exist for these core operations.
-NaCl advances the state of the art by improving security, by improving
-usability, and by improving speed.
-
-WWW: https://nacl.cr.yp.to/
diff --git a/security/nacl/pkg-plist b/security/nacl/pkg-plist
deleted file mode 100644
index 9143295123aa..000000000000
--- a/security/nacl/pkg-plist
+++ /dev/null
@@ -1,45 +0,0 @@
-bin/nacl-sha256
-bin/nacl-sha512
-include/cpucycles.h
-include/crypto_auth.h
-include/crypto_auth_hmacsha256.h
-include/crypto_auth_hmacsha512256.h
-include/crypto_box.h
-include/crypto_box_curve25519xsalsa20poly1305.h
-include/crypto_core_hsalsa20.h
-include/crypto_core_salsa20.h
-include/crypto_core_salsa2012.h
-include/crypto_core_salsa208.h
-include/crypto_hash.h
-include/crypto_hash_sha256.h
-include/crypto_hash_sha512.h
-include/crypto_hashblocks.h
-include/crypto_hashblocks_sha256.h
-include/crypto_hashblocks_sha512.h
-include/crypto_int16.h
-include/crypto_int32.h
-include/crypto_int64.h
-include/crypto_int8.h
-include/crypto_onetimeauth.h
-include/crypto_onetimeauth_poly1305.h
-include/crypto_scalarmult_curve25519.h
-include/crypto_secretbox.h
-include/crypto_secretbox_xsalsa20poly1305.h
-include/crypto_sign.h
-include/crypto_sign_edwards25519sha512batch.h
-include/crypto_stream.h
-include/crypto_stream_aes128ctr.h
-include/crypto_stream_salsa20.h
-include/crypto_stream_salsa2012.h
-include/crypto_stream_salsa208.h
-include/crypto_stream_xsalsa20.h
-include/crypto_uint16.h
-include/crypto_uint32.h
-include/crypto_uint64.h
-include/crypto_uint8.h
-include/crypto_verify_16.h
-include/crypto_verify_32.h
-include/randombytes.h
-lib/cpucycles.o
-lib/libnacl.a
-lib/randombytes.o
diff --git a/security/obfsclient/Makefile b/security/obfsclient/Makefile
deleted file mode 100644
index 83170a32f0ea..000000000000
--- a/security/obfsclient/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# Created by: Fabian Keil <fk@fabiankeil.de>
-
-PORTNAME=	obfsclient
-PORTVERSION=	0.0.2
-DISTVERSIONPREFIX=	v
-PORTREVISION=	11
-CATEGORIES=	security
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Tor-managed pluggable transport client
-
-LICENSE=	BSD2CLAUSE MIT ISCL BSD3CLAUSE
-LICENSE_COMB=	multi
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-DEPRECATED=	https://github.com/Yawning/obfsclient/issues/37
-EXPIRATION_DATE=	2021-12-31
-
-LIB_DEPENDS=	liballium-1.0.so:devel/liballium \
-		libevent.so:devel/libevent
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	Yawning
-
-GNU_CONFIGURE=	yes
-USES=		autoreconf compiler:c++11-lib localbase pkgconfig ssl
-TEST_TARGET=	check
-
-PLIST_FILES=	bin/${PORTNAME}
-
-PORTDOCS=	COPYING
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.pre.mk>
-
-BROKEN=		fails to build
-.if ${SSL_DEFAULT} == base
-BROKEN_FreeBSD_12=	field has incomplete type 'HMAC_CTX' (aka 'hmac_ctx_st')
-BROKEN_FreeBSD_13=	field has incomplete type 'HMAC_CTX' (aka 'hmac_ctx_st')
-.endif
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.post.mk>
diff --git a/security/obfsclient/distinfo b/security/obfsclient/distinfo
deleted file mode 100644
index 880dba10950f..000000000000
--- a/security/obfsclient/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1464782963
-SHA256 (Yawning-obfsclient-v0.0.2_GH0.tar.gz) = cbfbf7c69403a0ddd3830ba70cdddea7df175d010fcb99dde65f9fc6c01b98da
-SIZE (Yawning-obfsclient-v0.0.2_GH0.tar.gz) = 374644
diff --git a/security/obfsclient/files/patch-crypto-ctr.h b/security/obfsclient/files/patch-crypto-ctr.h
deleted file mode 100644
index 525d9d623056..000000000000
--- a/security/obfsclient/files/patch-crypto-ctr.h
+++ /dev/null
@@ -1,42 +0,0 @@
-From c91f7bbf3e0eedb080319ba3cfed7b47597b5aeb Mon Sep 17 00:00:00 2001
-From: Yawning Angel <yawning@torproject.org>
-Date: Sun, 20 Apr 2014 16:52:06 +0000
-Subject: Fix a potential bug found by clang's scan-build.
-
-With all current uses of Ctr, the conditional I was missing is never
-triggered since the paramenters are guaranteed to be sane, but this is
-not guaranteed to be true in the future.
-
-scan-build also points out a bunch of things in easylogging++ and gtest
-but they don't look to be real problems.
----
- ChangeLog                     | 2 ++ [diff removed]
- src/schwanenlied/crypto/ctr.h | 5 ++++-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/schwanenlied/crypto/ctr.h b/src/schwanenlied/crypto/ctr.h
-index 79bb71b..92d932d 100644
---- src/schwanenlied/crypto/ctr.h
-+++ src/schwanenlied/crypto/ctr.h
-@@ -91,6 +91,8 @@ class Ctr {
-       return false;
-     if (ctr_len == 0)
-       return false;
-+    if ((iv == nullptr && iv_len != 0) || (iv != nullptr && iv_len == 0))
-+      return false;
-     if (ctr_len + iv_len != ecb_impl_.block_length())
-       return false;
- 
-@@ -100,7 +102,8 @@ class Ctr {
-       return false;
- 
-     iv_size_ = iv_len;
--    ::std::memcpy(&ctr_[0], iv, iv_len);
-+    if (iv != nullptr)
-+      ::std::memcpy(&ctr_[0], iv, iv_len);
-     ::std::memcpy(&ctr_[iv_len], ctr, ctr_len);
- 
-     has_state_ = true;
--- 
-2.3.0
-
diff --git a/security/obfsclient/files/patch-ext-easylogging++.h b/security/obfsclient/files/patch-ext-easylogging++.h
deleted file mode 100644
index a7414ccaa527..000000000000
--- a/security/obfsclient/files/patch-ext-easylogging++.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/ext/easylogging++.h.orig	2014-03-28 09:35:09.000000000 +0100
-+++ src/ext/easylogging++.h	2015-08-23 00:44:41.276551000 +0200
-@@ -3586,7 +3586,7 @@ class LogMessage {
-     LogMessage(const Level& level, const char* file, unsigned long int line, const char* func,  // NOLINT
-                           base::VRegistry::VLevel verboseLevel, Logger* logger) :
-                   m_level(level), m_file(file), m_line(line), m_func(func),
--                  m_verboseLevel(verboseLevel), m_logger(logger), m_message(std::move(logger->stream().str())) {
-+                  m_verboseLevel(verboseLevel), m_logger(logger), m_message(logger->stream().str()) {
-     }
-     inline const Level& level(void) const { return m_level; }
-     inline const char* file(void) const { return m_file; }
-@@ -3895,7 +3895,7 @@ class LogDispatcher : base::NoCopy {
-         if (ELPP->hasFlag(LoggingFlag::StrictLogFileSizeCheck)) {
-             tc->validateFileRolling(m_logMessage.level(), ELPP->preRollOutHandler());
-         }
--        dispatch(std::move(m_logMessage.logger()->logBuilder()->build(&m_logMessage, m_dispatchAction == base::DispatchAction::NormalLog)));
-+        dispatch(m_logMessage.logger()->logBuilder()->build(&m_logMessage, m_dispatchAction == base::DispatchAction::NormalLog));
-         if (lockLogger) {
-             m_logMessage.logger()->unlock();
-         }
diff --git a/security/obfsclient/files/patch-ext-optionparser.h b/security/obfsclient/files/patch-ext-optionparser.h
deleted file mode 100644
index 0cc58e85ef58..000000000000
--- a/security/obfsclient/files/patch-ext-optionparser.h
+++ /dev/null
@@ -1,31 +0,0 @@
-From 85dd63b32a0b77c57cbae224f7862a5fb9c069a8 Mon Sep 17 00:00:00 2001
-From: Yawning Angel <yawning@torproject.org>
-Date: Sat, 14 Jun 2014 22:42:35 +0000
-Subject: Fix build on GCC 4.9.0.
-
-Just potentially uninitialized warnings in the 3rd party command line
-option parsing code, probably spurious and should be ignored but,
-initialize them for now.
----
- src/ext/optionparser.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/ext/optionparser.h b/src/ext/optionparser.h
-index 17bf6ad..64e2dfc 100644
---- src/ext/optionparser.h
-+++ src/ext/optionparser.h
-@@ -1554,9 +1554,9 @@ inline bool Parser::workhorse(bool gnu, const Descriptor usage[], int numargs, c
- 
-     do // loop over short options in group, for long options the body is executed only once
-     {
--      int idx;
-+      int idx = 0;
- 
--      const char* optarg;
-+      const char* optarg = 0;
- 
-       /******************** long option **********************/
-       if (handle_short_options == false || try_single_minus_longopt)
--- 
-2.3.0
-
diff --git a/security/obfsclient/files/patch-scramblesuit-client.cc b/security/obfsclient/files/patch-scramblesuit-client.cc
deleted file mode 100644
index 528b357405b7..000000000000
--- a/security/obfsclient/files/patch-scramblesuit-client.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-From 9c164b2afb666d0bcd26ba3eeb6da07a9fff551c Mon Sep 17 00:00:00 2001
-From: Yawning Angel <yawning@torproject.org>
-Date: Sat, 14 Jun 2014 23:09:08 +0000
-Subject: Suppress more useless warnings.
-
-Apparently I forgot to check the IAT code when I switched to building
-wiht -Wextra, since no one should use it.
----
- src/schwanenlied/pt/scramblesuit/client.cc | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/schwanenlied/pt/scramblesuit/client.cc b/src/schwanenlied/pt/scramblesuit/client.cc
-index e967b7b..c6e1a20 100644
---- src/schwanenlied/pt/scramblesuit/client.cc
-+++ src/schwanenlied/pt/scramblesuit/client.cc
-@@ -468,8 +468,10 @@ bool Client::schedule_iat_transmit() {
-   // Lazy timer initialization
-   if (iat_timer_ev_ == nullptr) {
-     event_callback_fn cb = [](evutil_socket_t sock,
--                              short witch,
-+                              short which,
-                               void* arg) {
-+      (void)sock;
-+      (void)which;
-       reinterpret_cast<Client*>(arg)->on_iat_transmit();
-     };
-     iat_timer_ev_ = evtimer_new(base_, cb, this);
--- 
-2.3.0
-
diff --git a/security/obfsclient/pkg-descr b/security/obfsclient/pkg-descr
deleted file mode 100644
index f2db7fc9f08e..000000000000
--- a/security/obfsclient/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-obfsclient is a C++11 Tor-managed pluggable transport client
-implementation of the following protocols:
-
-obfs2 - The Twobfuscator
-obfs3 - The Threebfuscator
-ScrambleSuit - Experimental
-
-WWW: https://github.com/yawning/obfsclient
diff --git a/sysutils/Makefile b/sysutils/Makefile
index eb881d42ee41..ba4175878160 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1248,7 +1248,6 @@
     SUBDIR += samdruckerclientshell
     SUBDIR += samefile
     SUBDIR += samesame
-    SUBDIR += sample
     SUBDIR += sanoid
     SUBDIR += sanoid-devel
     SUBDIR += sas2ircu
diff --git a/sysutils/sample/Makefile b/sysutils/sample/Makefile
deleted file mode 100644
index e0e5299fc18a..000000000000
--- a/sysutils/sample/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-PORTNAME=	sample
-PORTVERSION=	0.02f
-PORTREVISION=	1
-CATEGORIES=	sysutils
-
-MAINTAINER=	wg@FreeBSD.org
-COMMENT=	Examine periodic stack traces of all running processes
-
-BROKEN_FreeBSD_13=	does not build: vm_page_unhold(page) API has changed
-BROKEN_FreeBSD_14=	does not build: vm_page_unhold(page) API has changed
-DEPRECATED=		abandoned upstream, incompatible with newer kernels
-EXPIRATION_DATE=	2021-12-31
-
-LICENSE=	BSD3CLAUSE
-
-ONLY_FOR_ARCHS=	amd64
-ONLY_FOR_ARCHS_REASON=	device driver part of the program only supports amd64
-
-BUILD_DEPENDS=	${LOCALBASE}/lib/libbfd.a:devel/libbfd \
-		${LOCALBASE}/lib/libiberty.a:devel/gnulibiberty \
-		${LOCALBASE}/lib/libxo.a:devel/libxo
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	freenas
-GH_TAGNAME=	45e2b86
-
-BINARY_ALIAS=	python=${PYTHON_CMD}
-USES=		python:build kmod
-USE_PYTHON=	cython
-
-MAKE_ENV=	SYSDIR=${SRC_BASE}/sys
-
-SSP_UNSAFE=	yes
-
-do-install:
-	${INSTALL_KLD} ${WRKSRC}/driver/sample_driver.ko ${STAGEDIR}${KMODDIR}
-	${INSTALL_MAN} ${WRKSRC}/sample/sample.8 ${STAGEDIR}${PREFIX}/man/man8
-	${INSTALL_PROGRAM} ${WRKSRC}/sample/sample ${STAGEDIR}${PREFIX}/bin
-
-.include <bsd.port.mk>
diff --git a/sysutils/sample/distinfo b/sysutils/sample/distinfo
deleted file mode 100644
index 67e6e6724fc3..000000000000
--- a/sysutils/sample/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (freenas-sample-0.02f-45e2b86_GH0.tar.gz) = 48d03eabd6c2acc3e311c16aac983d5d1aa2eac6577db48d668599f4b5717764
-SIZE (freenas-sample-0.02f-45e2b86_GH0.tar.gz) = 31533
diff --git a/sysutils/sample/pkg-descr b/sysutils/sample/pkg-descr
deleted file mode 100644
index d2df60606abf..000000000000
--- a/sysutils/sample/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-A program for examining periodic stack traces of all running processes.
-
-WWW: https://github.com/freenas/sample
diff --git a/sysutils/sample/pkg-plist b/sysutils/sample/pkg-plist
deleted file mode 100644
index 99f531414f2e..000000000000
--- a/sysutils/sample/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-/%%KMODDIR%%/sample_driver.ko
-bin/sample
-man/man8/sample.8.gz
diff --git a/www/Makefile b/www/Makefile
index d5f02119f181..168b2d21b0e3 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -208,7 +208,6 @@
     SUBDIR += gopherus
     SUBDIR += gotty
     SUBDIR += gpx2map
-    SUBDIR += grafana
     SUBDIR += grafana6
     SUBDIR += grafana7
     SUBDIR += grafana8
@@ -334,7 +333,6 @@
     SUBDIR += matomo
     SUBDIR += mattermost-server
     SUBDIR += mattermost-webapp
-    SUBDIR += mediawiki131
     SUBDIR += mediawiki135
     SUBDIR += mediawiki136
     SUBDIR += mediawiki137
@@ -1400,7 +1398,6 @@
     SUBDIR += phpvirtualbox-legacy
     SUBDIR += piwigo
     SUBDIR += plasma5-plasma-browser-integration
-    SUBDIR += plugger
     SUBDIR += pmwiki
     SUBDIR += pnews
     SUBDIR += podcastamatic
@@ -1453,20 +1450,6 @@
     SUBDIR += py-cssmin
     SUBDIR += py-cssselect
     SUBDIR += py-cssutils
-    SUBDIR += py-dj31-django-auth-ldap
-    SUBDIR += py-dj31-django-cacheops
-    SUBDIR += py-dj31-django-cors-headers
-    SUBDIR += py-dj31-django-debug-toolbar
-    SUBDIR += py-dj31-django-filter
-    SUBDIR += py-dj31-django-js-asset
-    SUBDIR += py-dj31-django-mptt
-    SUBDIR += py-dj31-django-prometheus
-    SUBDIR += py-dj31-django-redis
-    SUBDIR += py-dj31-django-tables2
-    SUBDIR += py-dj31-django-taggit
-    SUBDIR += py-dj31-django-timezone-field
-    SUBDIR += py-dj31-djangorestframework
-    SUBDIR += py-dj31-drf-yasg
     SUBDIR += py-dj32-django-auth-ldap
     SUBDIR += py-dj32-django-cacheops
     SUBDIR += py-dj32-django-cors-headers
@@ -1592,7 +1575,6 @@
     SUBDIR += py-django-webpack-loader
     SUBDIR += py-django-widget-tweaks
     SUBDIR += py-django22
-    SUBDIR += py-django31
     SUBDIR += py-django32
     SUBDIR += py-django40
     SUBDIR += py-django_compressor
diff --git a/www/grafana/Makefile b/www/grafana/Makefile
deleted file mode 100644
index db8201933132..000000000000
--- a/www/grafana/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Created by: Bartek Rutkowski <robak@FreeBSD.org>
-
-PORTNAME=	grafana
-PORTVERSION=	1.9.1
-CATEGORIES=	www
-MASTER_SITES=	http://grafanarel.s3.amazonaws.com/
-
-MAINTAINER=	robak@FreeBSD.org
-COMMENT=	Dashboard and graph editor for Graphite, InfluxDB & OpenTSDB
-
-LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE.md
-
-DEPRECATED=	No longer maintained upstream, use www/grafana8
-EXPIRATION_DATE=	2021-12-31
-
-USES=		cpe
-
-NO_BUILD=	yes
-
-do-install:
-	@cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/
-	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' >> ${TMPPLIST}
-
-.include <bsd.port.mk>
diff --git a/www/grafana/distinfo b/www/grafana/distinfo
deleted file mode 100644
index 5005593e38b4..000000000000
--- a/www/grafana/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (grafana-1.9.1.tar.gz) = c328c7a002622f672affbcaabd5e64ae279be1051ee27c62ba22bfed63680508
-SIZE (grafana-1.9.1.tar.gz) = 1263568
diff --git a/www/grafana/pkg-descr b/www/grafana/pkg-descr
deleted file mode 100644
index 2ed2074f7bf0..000000000000
--- a/www/grafana/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Grafana is An open source, feature rich metrics dashboard
-and graph editor for Graphite, InfluxDB & OpenTSDB.
-
-WWW: https://github.com/grafana/grafana
diff --git a/www/grafana/pkg-plist b/www/grafana/pkg-plist
deleted file mode 100644
index cd828838619a..000000000000
--- a/www/grafana/pkg-plist
+++ /dev/null
@@ -1,129 +0,0 @@
-%%WWWDIR%%/LICENSE.md
-%%WWWDIR%%/NOTICE.md
-%%WWWDIR%%/README.md
-%%WWWDIR%%/app/app.496fdc2e.js
-%%WWWDIR%%/app/app.js
-%%WWWDIR%%/app/components/require.config.js
-%%WWWDIR%%/app/controllers/console-ctrl.js
-%%WWWDIR%%/app/dashboards/default.json
-%%WWWDIR%%/app/dashboards/empty.json
-%%WWWDIR%%/app/dashboards/scripted.js
-%%WWWDIR%%/app/dashboards/scripted_async.js
-%%WWWDIR%%/app/dashboards/scripted_gen_and_save.js
-%%WWWDIR%%/app/dashboards/scripted_templated.js
-%%WWWDIR%%/app/dashboards/template_vars.json
-%%WWWDIR%%/app/features/panellinkeditor/module.html
-%%WWWDIR%%/app/panels/graph/axisEditor.html
-%%WWWDIR%%/app/panels/graph/legend.popover.html
-%%WWWDIR%%/app/panels/graph/module.html
-%%WWWDIR%%/app/panels/graph/styleEditor.html
-%%WWWDIR%%/app/panels/singlestat/editor.html
-%%WWWDIR%%/app/panels/singlestat/module.html
-%%WWWDIR%%/app/panels/text/editor.html
-%%WWWDIR%%/app/panels/text/module.html
-%%WWWDIR%%/app/panels/timepicker/custom.html
-%%WWWDIR%%/app/panels/timepicker/editor.html
-%%WWWDIR%%/app/panels/timepicker/module.html
-%%WWWDIR%%/app/panels/timepicker/refreshctrl.html
-%%WWWDIR%%/app/partials/annotations_editor.html
-%%WWWDIR%%/app/partials/confirm_modal.html
-%%WWWDIR%%/app/partials/console.html
-%%WWWDIR%%/app/partials/dashLoaderShare.html
-%%WWWDIR%%/app/partials/dashboard.html
-%%WWWDIR%%/app/partials/dashboard_topnav.html
-%%WWWDIR%%/app/partials/dasheditor.html
-%%WWWDIR%%/app/partials/edit_json.html
-%%WWWDIR%%/app/partials/elasticsearch/annotation_editor.html
-%%WWWDIR%%/app/partials/graphite/annotation_editor.html
-%%WWWDIR%%/app/partials/graphite/editor.html
-%%WWWDIR%%/app/partials/help_modal.html
-%%WWWDIR%%/app/partials/import.html
-%%WWWDIR%%/app/partials/influxdb/annotation_editor.html
-%%WWWDIR%%/app/partials/influxdb/editor.html
-%%WWWDIR%%/app/partials/inspector.html
-%%WWWDIR%%/app/partials/loadmetrics.html
-%%WWWDIR%%/app/partials/metrics.html
-%%WWWDIR%%/app/partials/modal.html
-%%WWWDIR%%/app/partials/opentsdb/editor.html
-%%WWWDIR%%/app/partials/paneleditor.html
-%%WWWDIR%%/app/partials/panelgeneral.html
-%%WWWDIR%%/app/partials/playlist.html
-%%WWWDIR%%/app/partials/roweditor.html
-%%WWWDIR%%/app/partials/search.html
-%%WWWDIR%%/app/partials/share-panel.html
-%%WWWDIR%%/app/partials/submenu.html
-%%WWWDIR%%/app/partials/templating_editor.html
-%%WWWDIR%%/app/partials/unsaved-changes.html
-%%WWWDIR%%/build.txt
-%%WWWDIR%%/config.sample.js
-%%WWWDIR%%/css/bootstrap-responsive.min.css
-%%WWWDIR%%/css/bootstrap.dark.min.css
-%%WWWDIR%%/css/bootstrap.light.min.css
-%%WWWDIR%%/css/grafana.dark.min.21253ffa.css
-%%WWWDIR%%/css/grafana.dark.min.css
-%%WWWDIR%%/css/grafana.light.min.81a2958f.css
-%%WWWDIR%%/css/grafana.light.min.css
-%%WWWDIR%%/font/FontAwesome.otf
-%%WWWDIR%%/font/fontawesome-webfont.eot
-%%WWWDIR%%/font/fontawesome-webfont.svg
-%%WWWDIR%%/font/fontawesome-webfont.ttf
-%%WWWDIR%%/font/fontawesome-webfont.woff
-%%WWWDIR%%/img/check_radio_sheet.png
-%%WWWDIR%%/img/checkbox.png
-%%WWWDIR%%/img/checkbox_white.png
-%%WWWDIR%%/img/cubes.png
-%%WWWDIR%%/img/fav16.png
-%%WWWDIR%%/img/fav32.png
-%%WWWDIR%%/img/fav_dark_16.png
-%%WWWDIR%%/img/fav_dark_32.png
-%%WWWDIR%%/img/glyphicons-halflings-white.png
-%%WWWDIR%%/img/glyphicons-halflings.png
-%%WWWDIR%%/img/kibana.png
-%%WWWDIR%%/img/light.png
-%%WWWDIR%%/img/load.gif
-%%WWWDIR%%/img/load_big.gif
-%%WWWDIR%%/img/logo_transparent_200x.png
-%%WWWDIR%%/img/small.png
-%%WWWDIR%%/index.html
-%%WWWDIR%%/plugins/custom.panel.example/editor.html
-%%WWWDIR%%/plugins/custom.panel.example/module.html
-%%WWWDIR%%/plugins/custom.panel.example/module.js
-%%WWWDIR%%/plugins/datasource.example.js
-%%WWWDIR%%/test/karma.conf.js
-%%WWWDIR%%/test/mocks/dashboard-mock.js
-%%WWWDIR%%/test/specs/dashboardSrv-specs.js
-%%WWWDIR%%/test/specs/dashboardViewStateSrv-specs.js
-%%WWWDIR%%/test/specs/gfunc-specs.js
-%%WWWDIR%%/test/specs/graph-ctrl-specs.js
-%%WWWDIR%%/test/specs/graph-specs.js
-%%WWWDIR%%/test/specs/graph-tooltip-specs.js
-%%WWWDIR%%/test/specs/graphiteDatasource-specs.js
-%%WWWDIR%%/test/specs/graphiteTargetCtrl-specs.js
-%%WWWDIR%%/test/specs/helpers.js
-%%WWWDIR%%/test/specs/influxQueryBuilder-specs.js
-%%WWWDIR%%/test/specs/influxSeries-specs.js
-%%WWWDIR%%/test/specs/influxdb-datasource-specs.js
-%%WWWDIR%%/test/specs/kbn-format-specs.js
-%%WWWDIR%%/test/specs/lexer-specs.js
-%%WWWDIR%%/test/specs/parser-specs.js
-%%WWWDIR%%/test/specs/row-ctrl-specs.js
-%%WWWDIR%%/test/specs/seriesOverridesCtrl-specs.js
-%%WWWDIR%%/test/specs/sharePanelCtrl-specs.js
-%%WWWDIR%%/test/specs/templateSrv-specs.js
-%%WWWDIR%%/test/specs/templateValuesSrv-specs.js
-%%WWWDIR%%/test/specs/timeSeries-specs.js
-%%WWWDIR%%/test/specs/timeSrv-specs.js
-%%WWWDIR%%/test/test-main.js
-%%WWWDIR%%/test/tests.html
-%%WWWDIR%%/vendor/angular/angular-mocks.js
-%%WWWDIR%%/vendor/css/animate.min.css
-%%WWWDIR%%/vendor/css/font-awesome.min.css
-%%WWWDIR%%/vendor/css/normalize.min.css
-%%WWWDIR%%/vendor/css/spectrum.css
-%%WWWDIR%%/vendor/css/timepicker.css
-%%WWWDIR%%/vendor/jquery/jquery.flot.fillbetween.js
-%%WWWDIR%%/vendor/jquery/jquery.flot.pie.js
-%%WWWDIR%%/vendor/license.json
-%%WWWDIR%%/vendor/require/css-build.js
-%%WWWDIR%%/vendor/require/require.js
-%%WWWDIR%%/vendor/require/tmpl.js
diff --git a/www/mediawiki131/Makefile b/www/mediawiki131/Makefile
deleted file mode 100644
index 1236f719478c..000000000000
--- a/www/mediawiki131/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# Created by: Gerrit Beine <tux@pinguru.net>
-
-PORTNAME=	mediawiki
-PORTVERSION=	1.31.16
-CATEGORIES=	www
-MASTER_SITES=	http://releases.wikimedia.org/mediawiki/${PORTVERSION:R}/
-PKGNAMESUFFIX=	131${PHP_PKGNAMESUFFIX}
-
-MAINTAINER=	wen@FreeBSD.org
-COMMENT=	Wiki engine used by Wikipedia
-
-LICENSE=	GPLv2
-
-CONFLICTS=	mediawiki13[5-7]
-
-DEPRECATED=	Upstream EOL
-EXPIRATION_DATE=2021-12-31
-
-USES=		cpe php:flavors shebangfix
-SHEBANG_FILES=	maintenance/dev/*.sh \
-		maintenance/postgres/*.pl \
-		maintenance/storage/make-blobs \
-		includes/shell/limit.sh
-SHEBANG_LANG=	hhvm
-hhvm_OLD_CMD=	/usr/bin/hhvm
-hhvm_CMD=	${LOCALBASE}/bin/hhvm # not installed by anything yet
-USE_PHP=	ctype dom fileinfo hash iconv intl json mbstring openssl pcre \
-		readline session xml xmlreader zlib
-MEDIAWIKIDIR?=	www/mediawiki
-
-IGNORE_WITH_PHP=	80
-
-NO_BUILD=	yes
-PLIST=		${WRKDIR}/plist
-
-SUB_FILES=	pkg-message
-SUB_LIST=	MEDIAWIKIDIR=${PREFIX}/${MEDIAWIKIDIR}
-
-OPTIONS_DEFINE=	LDAP MEMCACHED IMAGICK SOCKETS
-OPTIONS_SINGLE=	DB
-OPTIONS_SINGLE_DB=	MYSQL PGSQL SQLITE
-OPTIONS_DEFAULT=	MYSQL SOCKETS
-
-MEMCACHED_DESC=	Use memcached
-IMAGICK_DESC=	Use ImageMagick
-SOCKETS_DESC=	Use sockets
-
-MYSQL_USES=	mysql
-MYSQL_USE=	php=mysqli
-PGSQL_USE=	php=pgsql
-SQLITE_USE=	php=sqlite3
-LDAP_USE=	php=ldap
-SOCKETS_USE=	php=sockets
-
-MEMCACHED_RUN_DEPENDS=	memcached:databases/memcached
-IMAGICK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
-
-pre-install:
-	@${FIND} -s -d ${WRKSRC} -not -type d | ${SED} "s?${WRKSRC}?${MEDIAWIKIDIR}?g" >>${PLIST}
-	@${ECHO} "@dir %%WWWDIR%%/cache" >> ${PLIST}
-	@${ECHO} "@mode 0777" >> ${PLIST}
-	@${ECHO} "@dir %%WWWDIR%%/images" >> ${PLIST}
-	@${ECHO} "@mode" >> ${PLIST}
-	@${ECHO} @dir ${MEDIAWIKIDIR} >> ${PLIST}
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${MEDIAWIKIDIR}
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${MEDIAWIKIDIR}
-
-.include <bsd.port.mk>
diff --git a/www/mediawiki131/distinfo b/www/mediawiki131/distinfo
deleted file mode 100644
index 6bfd84140ade..000000000000
--- a/www/mediawiki131/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1633070792
-SHA256 (mediawiki-1.31.16.tar.gz) = 0515145c8e0d8a0a187971e08e1bd6749d7ea2839e8666e217fb91f038d0589b
-SIZE (mediawiki-1.31.16.tar.gz) = 35639454
diff --git a/www/mediawiki131/files/pkg-message.in b/www/mediawiki131/files/pkg-message.in
deleted file mode 100644
index b05e89945b5f..000000000000
--- a/www/mediawiki131/files/pkg-message.in
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Remember to check
-
-%%MEDIAWIKIDIR%%/INSTALL
-
-and
-
-%%MEDIAWIKIDIR%%/UPGRADE
-
-for details
-EOM
-}
-]
diff --git a/www/mediawiki131/pkg-descr b/www/mediawiki131/pkg-descr
deleted file mode 100644
index dac83f83ccda..000000000000
--- a/www/mediawiki131/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-MediaWiki is the collaborative editing software that runs Wikipedia,
-the free encyclopedia, and other projects.
-It's designed to handle a large number of users and pages without imposing
-too rigid a structure or workflow.
-
-WWW: http://www.mediawiki.org/
diff --git a/www/plugger/Makefile b/www/plugger/Makefile
deleted file mode 100644
index 55b7029ef129..000000000000
--- a/www/plugger/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# Created by: Jay Sachs <sachs@cs.williams.edu>
-
-PORTNAME=	plugger
-PORTVERSION=	5.1.5
-CATEGORIES=	www audio graphics multimedia
-MASTER_SITES=	http://fredrik.hubbe.net/plugger/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Multimedia front-end plugin for Mozilla or Opera
-
-DEPRECATED=	Uses incompatible plugin interface NPAPI
-EXPIRATION_DATE=2021-12-31
-
-USES=		webplugin:native xorg
-USE_XORG=	xext xt sm ice xext x11
-GNU_CONFIGURE=	yes
-
-PKGDEINSTALL=	${PKGINSTALL}
-
-WEBPLUGIN_FILES=npplugger.so
-
-post-patch:
-	@${REINPLACE_CMD} \
-		-e 's|/usr/X11R6/lib/xscreensaver|${LOCALBASE}/bin/xscreensaver-hacks|g' \
-		-e 's|+useFrontEndProgram||g' \
-		${WRKSRC}/pluggerrc
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/plugger-${PORTVERSION} \
-		${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/plugger-controller \
-		${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/plugger-oohelper \
-		${STAGEDIR}${PREFIX}/bin
-	@${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR}
-	${INSTALL_LIB} ${WRKSRC}/plugger.so \
-		${STAGEDIR}${WEBPLUGIN_DIR}/npplugger.so
-	${INSTALL_DATA} ${WRKSRC}/pluggerrc \
-		${STAGEDIR}${PREFIX}/etc/pluggerrc-${PORTVERSION}.sample
-	${INSTALL_MAN} ${WRKSRC}/plugger.7 ${STAGEDIR}${MANPREFIX}/man/man7
-
-local-install:
-	@${MKDIR} ${HOME}/.plugger
-	${INSTALL_PROGRAM} ${WRKSRC}/plugger-${PORTVERSION} \
-		${HOME}/.plugger
-	${INSTALL_PROGRAM} ${WRKSRC}/plugger-controller \
-		${HOME}/.plugger
-	${INSTALL_SCRIPT} ${WRKSRC}/plugger-oohelper \
-		${HOME}/.plugger
-	if [ -f ${HOME}/.plugger/pluggerrc-${PORTVERSION} ]; then \
-		${MV} ${HOME}/.plugger/pluggerrc-${PORTVERSION} \
-			${HOME}/.plugger/pluggerrc-${PORTVERSION}.old; \
-	fi
-	${INSTALL_DATA} ${WRKSRC}/pluggerrc \
-		${HOME}/.plugger/pluggerrc-${PORTVERSION}
-
-local-mozilla-install: local-install
-	@${MKDIR} ${HOME}/.mozilla/plugins
-	${INSTALL_PROGRAM} ${WRKSRC}/plugger.so \
-		${HOME}/.mozilla/plugins/npplugger.so
-
-local-opera-install: local-install
-	@${MKDIR} ${HOME}/.opera/plugins
-	${INSTALL_PROGRAM} ${WRKSRC}/plugger.so \
-		${HOME}/.opera/plugins/npplugger.so
-
-.include <bsd.port.mk>
diff --git a/www/plugger/distinfo b/www/plugger/distinfo
deleted file mode 100644
index 65c2925c7512..000000000000
--- a/www/plugger/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (plugger-5.1.5.tar.gz) = 4a5f2042547f07de2377ba2ef8c7b48505ca4e1d0fab929cd70e8ed061536baf
-SIZE (plugger-5.1.5.tar.gz) = 90790
diff --git a/www/plugger/files/patch-Makefile.in b/www/plugger/files/patch-Makefile.in
deleted file mode 100644
index 529b5467b17d..000000000000
--- a/www/plugger/files/patch-Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.in.orig	Tue May  3 11:46:47 2005
-+++ Makefile.in	Tue May  3 11:48:35 2005
-@@ -30,7 +30,7 @@
- CC=@CC@
- LD=@LD@
- BINFORMAT=bin
--OPT_FLAGS=-O2
-+OPT_FLAGS=@CFLAGS@
- 
- @SET_MAKE@
- 
-@@ -66,7 +66,7 @@
- DEBUG= # -DDEBUG # -DPLUGIN_TRACE
- DEFINES=$(STREAM) -DVERSION=\"$(VERSION)\" $(DEBUG)
- COMMON_CFLAGS=$(OPT_FLAGS) -I$(SDK)/include -I@x_includes@ -DXP_UNIX $(DEFINES)
--COMMON_LDFLAGS=
-+COMMON_LDFLAGS=@LDFLAGS@
- NORM_CFLAGS=
- NORM_LDFLAGS=
- XCFLAGS=@XCFLAGS@ @X_CFLAGS@
-@@ -132,7 +132,7 @@
- plugger-helper.o: plugger.h
- 
- plugger.o: plugger.c plugger.h
--	$(CC) -c $(SHARED_CFLAGS) -o plugger.o plugger.c
-+	$(CC) -c $(SHARED_CFLAGS) -DSYSCONFDIR=\"$(prefix)/etc\" -o plugger.o plugger.c
- 
- plugger-common.o: plugger-common.c plugger.h
- 	$(CC) -c $(SHARED_CFLAGS) -o plugger-common.o plugger-common.c
diff --git a/www/plugger/files/patch-configure b/www/plugger/files/patch-configure
deleted file mode 100644
index 4fcd27968af2..000000000000
--- a/www/plugger/files/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure.orig	Tue May  3 11:49:26 2005
-+++ configure	Tue May  3 11:50:09 2005
-@@ -3704,10 +3704,10 @@
-      XLDFLAGS='-expect_unresolved "*" -shared -msym -O3'
-   ;;
- 
--  FreeBSD)
-+  FreeBSD*)
-      case "`file /bin/ls`" in
-        *ELF*)
--         XCFLAGS=-fpic
-+         XCFLAGS=-fPIC
-          XLDFLAGS=-shared
-        ;;
-        *)
diff --git a/www/plugger/files/patch-plugger-helper.c b/www/plugger/files/patch-plugger-helper.c
deleted file mode 100644
index 1de82fcd68c9..000000000000
--- a/www/plugger/files/patch-plugger-helper.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- plugger-helper.c~	2004-07-20 17:17:23.000000000 +0200
-+++ plugger-helper.c	2011-12-20 20:28:35.572299134 +0100
-@@ -310,10 +310,10 @@
- 
-   int x;
- 
--  if(!(flags & H_SWALLOW)) return;
--  if(!victim) return;
--  if(!WINDOW) return;
--  if(old_parent == WINDOW) return;
-+  if(!(flags & H_SWALLOW)) return 0;
-+  if(!victim) return 0;
-+  if(!WINDOW) return 0;
-+  if(old_parent == WINDOW) return 0;
- 
-   switch(gobble_state)
-   {
-@@ -486,7 +486,7 @@
-   exit(EX_UNAVAILABLE);
- }
- 
--static int run(void)
-+static void run(void)
- {
-   char *argv[10];
-   char buffer[65536];
diff --git a/www/plugger/files/patch-plugger-oohelper b/www/plugger/files/patch-plugger-oohelper
deleted file mode 100644
index 9357f9b655f0..000000000000
--- a/www/plugger/files/patch-plugger-oohelper
+++ /dev/null
@@ -1,16 +0,0 @@
---- plugger-oohelper.orig	Tue May  3 12:20:51 2005
-+++ plugger-oohelper	Tue May  3 12:21:12 2005
-@@ -45,11 +45,11 @@
-   done
- done
- 
--if [ "x${ooprefix}" == "xs" ]; then
-+if [ "x${ooprefix}" = "xs" ]; then
-   exec s$1 -n "$@" "$file" >/dev/null
- fi
- 
--if [ "x${ooprefix}" == "xo" ]; then
-+if [ "x${ooprefix}" = "xo" ]; then
-   exec oo$1 -n "$@" "$file" >/dev/null
- fi
- 
diff --git a/www/plugger/files/patch-plugger.c b/www/plugger/files/patch-plugger.c
deleted file mode 100644
index 93674e685f60..000000000000
--- a/www/plugger/files/patch-plugger.c
+++ /dev/null
@@ -1,59 +0,0 @@
---- plugger.c.orig	2004-08-04 20:03:29.000000000 +0200
-+++ plugger.c	2011-12-20 20:23:39.068175279 +0100
-@@ -624,16 +624,6 @@
-   if(cb(fname, data)) return 1;
- #endif
- 
--  sprintf(fname,"/usr/local/netscape/%s",basename);
--  if(cb(fname, data)) return 1;
--  sprintf(fname,"/etc/%s",basename);
--  if(cb(fname, data)) return 1;
--  sprintf(fname,"/usr/etc/%s",basename);
--  if(cb(fname, data)) return 1;
--  sprintf(fname,"/usr/local/etc/%s",basename);
--  if(cb(fname, data)) return 1;
--  if(cb(basename, data)) return 1;
--  
-   return 0;
- }
- 
-@@ -1060,17 +1050,17 @@
- 
-   D("start_standalone!\n");
- 
--  if(!THIS->command) { D("no command!\n"); return; }
--  if(!WINDOW) { D("No window!\n"); return; }
-+  if(!THIS->command) { D("no command!\n"); return NPERR_GENERIC_ERROR; }
-+  if(!WINDOW) { D("No window!\n"); return NPERR_GENERIC_ERROR; }
- 
-   if(THIS->flags & H_URL)
-   {
--    if(!THIS->url) { D("No url!\n"); return; }
-+    if(!THIS->url) { D("No url!\n"); return NPERR_GENERIC_ERROR; }
-   }else{
--    if(!THIS->stream) { D("No stream!\n"); return; }
-+    if(!THIS->stream) { D("No stream!\n"); return NPERR_GENERIC_ERROR; }
-   }
- 
--  if(THIS->waitfd!=-1) { D("Already started!\n"); return; }
-+  if(THIS->waitfd!=-1) { D("Already started!\n"); return NPERR_GENERIC_ERROR; }
-   D("Actually starging!\n");
- 
-   if(socketpair(AF_UNIX, SOCK_STREAM, 0, bar) < 0)
-@@ -1082,7 +1072,7 @@
-   if(THIS->pid1==-1)
-   {
-     NPN_Status(instance, "My_Fork failed!");
--    return;
-+    return NPERR_GENERIC_ERROR;
-   }
-   
-   if(!THIS->pid1)
-@@ -1097,6 +1087,7 @@
-     THIS->waitfd=bar[0];
-     close(bar[1]);
-   }
-+  return NPERR_NO_ERROR;
- }
- 
- 
diff --git a/www/plugger/pkg-descr b/www/plugger/pkg-descr
deleted file mode 100644
index 1901cec2d279..000000000000
--- a/www/plugger/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Plugger is a multimedia plugin for Unix Netscape 3.0 or later that
-handles Quicktime, MPEG, MP2, AVI, SGI-movie, Tiff, DL, IFF-anim,
-MIDI, Soundtracker, AU, WAV and Commodore 64 audio files. Since
-Plugger 3.0, MPEG audio and video can be streamed.
-
-Plugger is a very small plugin, because plugger uses external programs
-to show/play the different formats.
-
-WWW: http://www.hubbe.net/~hubbe/plugger.html
diff --git a/www/plugger/pkg-install b/www/plugger/pkg-install
deleted file mode 100644
index 335ebb8884a3..000000000000
--- a/www/plugger/pkg-install
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-[ $# != 2 ] && exit 1
-PKGNAME=$1
-ACTION=$2
-
-FILES_DELETE="pluggerrc-5.1.3.old"
-
-ETCDIR=${PKG_PREFIX}/etc
-
-RM=/bin/rm
-CP=/bin/cp
-ECHO=/bin/echo
-
-case "$ACTION" in
-
-POST-INSTALL)
-	if [ ! -f ${ETCDIR}/pluggerrc-5.1.5 ]; then
-		${CP} ${ETCDIR}/pluggerrc-5.1.5.sample ${ETCDIR}/pluggerrc-5.1.5
-	fi
-	;;
-
-DEINSTALL)
-	for file in ${FILES_DELETE}
-	do
-		if [ -f ${ETCDIR}/${file} ]; then
-			${RM} ${ETCDIR}/${file}
-		fi
-	done
-	;;
-
-PRE-INSTALL)
-	${ECHO}
-	${ECHO} "Run ''make local-mozilla-install'' as user to locally"
-	${ECHO} "install plugger for Mozilla"
-	${ECHO}
-	${ECHO} "Run ''make local-opera-install'' as user to locally"
-	${ECHO} "install plugger for Opera"
-	${ECHO}
-	${ECHO} "NOTE:  For plugger-oohelper to work, [o|s]office must be"
-	${ECHO} "in the PATH."
-	${ECHO}
-	;;
-
-POST-DEINSTALL)
-	${ECHO}
-	${ECHO} "If you are permanently removing this port,"
-	${ECHO} "you should do a ''rm -f ${ETCDIR}/pluggerrc-5.1.5''"
-	${ECHO} "to remove it."
-	${ECHO}
-	;;
-
-*)
-	exit 1
-	;;
-esac
-
-exit
diff --git a/www/plugger/pkg-plist b/www/plugger/pkg-plist
deleted file mode 100644
index 0bba39a7884f..000000000000
--- a/www/plugger/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/plugger-5.1.5
-bin/plugger-controller
-bin/plugger-oohelper
-@sample etc/pluggerrc-5.1.5.sample
-man/man7/plugger.7.gz
-%%WEBPLUGIN_DIR%%/npplugger.so
diff --git a/www/py-dj31-django-auth-ldap/Makefile b/www/py-dj31-django-auth-ldap/Makefile
deleted file mode 100644
index 1eda46f24939..000000000000
--- a/www/py-dj31-django-auth-ldap/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# Created by: Alexander Kriventsov <avk@vl.ru>
-
-PORTNAME=	django-auth-ldap
-PORTVERSION=	3.0.0
-CATEGORIES=	www security python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj31-
-
-MAINTAINER=	kai@FreeBSD.org
-COMMENT=	LDAP integration for django.contrib.auth
-
-LICENSE=	BSD2CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-DEPRECATED=	Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
-EXPIRATION_DATE=	2021-12-31
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django31>=2.2:www/py-django31@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ldap>=3.1:net/py-ldap@${PY_FLAVOR}
-
-USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
-
-NO_ARCH=	yes
-PORTDOCS=	*
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django-auth-ldap \
-			${PYTHON_PKGNAMEPREFIX}dj32-django-auth-ldap
-
-OPTIONS_DEFINE=	DOCS
-DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
-DOCS_VARS=		PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
-
-.include <bsd.port.pre.mk>
-
-# Set a locale to avoid build/configure errors.  The UTF-8 mode is enabled by
-# default when the locale is C since Python 3.7.
-.if ${PYTHON_REL} < 30700
-USE_LOCALE=	en_US.UTF-8
-.endif
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC}/build/sphinx/html && \
- 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
-			"! -name .buildinfo -and ! -name objects.inv")
-
-.include <bsd.port.post.mk>
diff --git a/www/py-dj31-django-auth-ldap/distinfo b/www/py-dj31-django-auth-ldap/distinfo
deleted file mode 100644
index 9757a29522ad..000000000000
--- a/www/py-dj31-django-auth-ldap/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1627743489
-SHA256 (django-auth-ldap-3.0.0.tar.gz) = 1f2d5c562d9ba9a5e9a64099ae9798e1a63840a11afe4d1c4a9c74121f066eaa
-SIZE (django-auth-ldap-3.0.0.tar.gz) = 52381
diff --git a/www/py-dj31-django-auth-ldap/files/patch-docs_conf.py b/www/py-dj31-django-auth-ldap/files/patch-docs_conf.py
deleted file mode 100644
index 8ab329172ad8..000000000000
--- a/www/py-dj31-django-auth-ldap/files/patch-docs_conf.py
+++ /dev/null
@@ -1,22 +0,0 @@
-Avoid the download of various intersphinx inventories during build.  Only two
-intersphinx mappings are used and the documentation can be built/used without
-them.
-
---- docs/conf.py.orig	2021-02-28 15:46:24 UTC
-+++ docs/conf.py
-@@ -186,15 +186,3 @@ texinfo_documents = [
- 
- 
- # -- Extension configuration -------------------------------------------------
--
--# -- Options for intersphinx extension ---------------------------------------
--
--intersphinx_mapping = {
--    "python": ("https://docs.python.org/3/", None),
--    "django": (
--        "https://docs.djangoproject.com/en/stable/",
--        "https://docs.djangoproject.com/en/stable/_objects/",
--    ),
--    "pythonldap": ("https://python-ldap.readthedocs.io/en/latest/", None),
--    "tox": ("https://tox.readthedocs.io/en/latest/", None),
--}
diff --git a/www/py-dj31-django-auth-ldap/pkg-descr b/www/py-dj31-django-auth-ldap/pkg-descr
deleted file mode 100644
index 74682fda4265..000000000000
--- a/www/py-dj31-django-auth-ldap/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a Django authentication backend that authenticates against an LDAP
-service. Configuration can be as simple as a single distinguished name template,
-but there are many rich configuration options for working with users, groups,
-and permissions.
-
-WWW: https://github.com/django-auth-ldap/django-auth-ldap
diff --git a/www/py-dj31-django-cacheops/Makefile b/www/py-dj31-django-cacheops/Makefile
deleted file mode 100644
index ff4452bd33b6..000000000000
--- a/www/py-dj31-django-cacheops/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-PORTNAME=	django-cacheops
-PORTVERSION=	6.0
-CATEGORIES=	www python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj31-
-
-MAINTAINER=	kai@FreeBSD.org
-COMMENT=	Slick ORM cache with automatic granular event-driven invalidation
-
-LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-DEPRECATED=	Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
-EXPIRATION_DATE=	2021-12-31
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django31>=2.1:www/py-django31@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}redis>=3.0.0:databases/py-redis@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}funcy>=1.8<2.0:devel/py-funcy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR}
-
-USES=		python:3.6+
-USE_PYTHON=	autoplist distutils
-
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django-cacheops \
-			${PYTHON_PKGNAMEPREFIX}dj32-django-cacheops
-
-NO_ARCH=		yes
-
-.include <bsd.port.mk>
diff --git a/www/py-dj31-django-cacheops/distinfo b/www/py-dj31-django-cacheops/distinfo
deleted file mode 100644
index 03199b8d7ccb..000000000000
--- a/www/py-dj31-django-cacheops/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1626791653
-SHA256 (django-cacheops-6.0.tar.gz) = 78e161ebd96a32e28e19ec7da31f2afed9e62a79726b8b5f0ed12dd16c2e5841
-SIZE (django-cacheops-6.0.tar.gz) = 70280
diff --git a/www/py-dj31-django-cacheops/pkg-descr b/www/py-dj31-django-cacheops/pkg-descr
deleted file mode 100644
index 9df3c28b800e..000000000000
--- a/www/py-dj31-django-cacheops/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-A slick app that supports automatic or manual queryset caching and automatic
-granular event-driven invalidation.
-
-It uses redis as backend for ORM cache and redis or filesystem for simple
-time-invalidated one.
-
-And there is more to it:
-
-* Decorators to cache any user function or view as a queryset or by time
-* Extensions for django and jinja2 templates
-* Transparent transaction support
-* Dog-pile prevention mechanism
-* A couple of hacks to make django faster
-
-WWW: https://github.com/Suor/django-cacheops
diff --git a/www/py-dj31-django-cors-headers/Makefile b/www/py-dj31-django-cors-headers/Makefile
deleted file mode 100644
index 7a471799a71a..000000000000
--- a/www/py-dj31-django-cors-headers/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-PORTNAME=	django-cors-headers
-PORTVERSION=	3.8.0
-CATEGORIES=	www python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj31-
-
-MAINTAINER=	kai@FreeBSD.org
-COMMENT=	Handles server headers required for Cross-Origin Resource Sharing
-
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-DEPRECATED=	Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
-EXPIRATION_DATE=	2021-12-31
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django31>=2.2:www/py-django31@${PY_FLAVOR}
-
-USES=		python:3.6+
-USE_PYTHON=	autoplist distutils
-
-NO_ARCH=		yes
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django-cors-headers \
-			${PYTHON_PKGNAMEPREFIX}dj32-django-cors-headers
-
-.include <bsd.port.mk>
diff --git a/www/py-dj31-django-cors-headers/distinfo b/www/py-dj31-django-cors-headers/distinfo
deleted file mode 100644
index badafd002f54..000000000000
--- a/www/py-dj31-django-cors-headers/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1629747537
-SHA256 (django-cors-headers-3.8.0.tar.gz) = 4b8e13bf8d3df50ac4b986bd87085c3073dd56402ede109222ea34a774f9ec1b
-SIZE (django-cors-headers-3.8.0.tar.gz) = 20391
diff --git a/www/py-dj31-django-cors-headers/pkg-descr b/www/py-dj31-django-cors-headers/pkg-descr
deleted file mode 100644
index 7248fec2ba2d..000000000000
--- a/www/py-dj31-django-cors-headers/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-A Django App that adds CORS (Cross-Origin Resource Sharing) headers to
-responses.
-
-WWW: https://github.com/adamchainz/django-cors-headers
diff --git a/www/py-dj31-django-debug-toolbar/Makefile b/www/py-dj31-django-debug-toolbar/Makefile
deleted file mode 100644
index f495190bdacd..000000000000
--- a/www/py-dj31-django-debug-toolbar/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# Created by: Johannes Meixner <johannes@perceivon.net>
-
-PORTNAME=	django-debug-toolbar
-PORTVERSION=	3.2.2
-CATEGORIES=	www python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj31-
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Configurable set of panels to display debug information
-
-LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-DEPRECATED=	Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
-EXPIRATION_DATE=	2021-12-31
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django31>=2.2:www/py-django31@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sqlparse>=0.2.0:databases/py-sqlparse@${PY_FLAVOR}
-
-USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
-
-NO_ARCH=	yes
-
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django-debug-toolbar \
-			${PYTHON_PKGNAMEPREFIX}dj32-django-debug-toolbar
-
-.include <bsd.port.mk>
diff --git a/www/py-dj31-django-debug-toolbar/distinfo b/www/py-dj31-django-debug-toolbar/distinfo
deleted file mode 100644
index 6117166a86cd..000000000000
--- a/www/py-dj31-django-debug-toolbar/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1632037252
-SHA256 (django-debug-toolbar-3.2.2.tar.gz) = 8c5b13795d4040008ee69ba82dcdd259c49db346cf7d0de6e561a49d191f0860
-SIZE (django-debug-toolbar-3.2.2.tar.gz) = 117685
diff --git a/www/py-dj31-django-debug-toolbar/pkg-descr b/www/py-dj31-django-debug-toolbar/pkg-descr
deleted file mode 100644
index 9a28df80297f..000000000000
--- a/www/py-dj31-django-debug-toolbar/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-The Django Debug Toolbar is a configurable set of panels that display various
-debug information about the current request/response and when clicked, display
-more details about the panel's content.
-
-WWW: https://github.com/jazzband/django-debug-toolbar
diff --git a/www/py-dj31-django-filter/Makefile b/www/py-dj31-django-filter/Makefile
deleted file mode 100644
index 8f87ab53dba1..000000000000
--- a/www/py-dj31-django-filter/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-PORTNAME=	django-filter
-DISTVERSION=	2.4.0
-CATEGORIES=	www python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj31-
-
-MAINTAINER=	kai@FreeBSD.org
-COMMENT=	Dynamic filtering for querysets with Django
-
-LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-DEPRECATED=	Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
-EXPIRATION_DATE=	2021-12-31
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django31>=2.2:www/py-django31@${PY_FLAVOR}
-
-USES=		python:3.6+
-USE_PYTHON=	distutils autoplist
-
-NO_ARCH=		yes
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django-filter \
-			${PYTHON_PKGNAMEPREFIX}dj32-django-filter
-
-.include <bsd.port.mk>
diff --git a/www/py-dj31-django-filter/distinfo b/www/py-dj31-django-filter/distinfo
deleted file mode 100644
index 9419870dc0d4..000000000000
--- a/www/py-dj31-django-filter/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1611059912
-SHA256 (django-filter-2.4.0.tar.gz) = 84e9d5bb93f237e451db814ed422a3a625751cbc9968b484ecc74964a8696b06
-SIZE (django-filter-2.4.0.tar.gz) = 146904
diff --git a/www/py-dj31-django-filter/pkg-descr b/www/py-dj31-django-filter/pkg-descr
deleted file mode 100644
index 8b454bf6899f..000000000000
--- a/www/py-dj31-django-filter/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Django-filter is a reusable Django application allowing users to declaratively
-add dynamic QuerySet filtering from URL parameters.
-
-WWW: https://github.com/carltongibson/django-filter
diff --git a/www/py-dj31-django-js-asset/Makefile b/www/py-dj31-django-js-asset/Makefile
deleted file mode 100644
index 087538745229..000000000000
--- a/www/py-dj31-django-js-asset/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-PORTNAME=	django-js-asset
-DISTVERSION=	1.2.2
-PORTREVISION=	1
-CATEGORIES=	www python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj31-
-
-MAINTAINER=	kai@FreeBSD.org
-COMMENT=	Insert script tags with additional attributes for django.forms.Media
-
-LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-DEPRECATED=	Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
-EXPIRATION_DATE=	2021-12-31
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django31>0:www/py-django31@${PY_FLAVOR}
-
-USES=		python:3.6+
-USE_PYTHON=	distutils autoplist
-
-NO_ARCH=		yes
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django-js-asset \
-			${PYTHON_PKGNAMEPREFIX}dj32-django-js-asset
-
-.include <bsd.port.mk>
diff --git a/www/py-dj31-django-js-asset/distinfo b/www/py-dj31-django-js-asset/distinfo
deleted file mode 100644
index 95516ac977d9..000000000000
--- a/www/py-dj31-django-js-asset/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1586294408
-SHA256 (django-js-asset-1.2.2.tar.gz) = c163ae80d2e0b22d8fb598047cd0dcef31f81830e127cfecae278ad574167260
-SIZE (django-js-asset-1.2.2.tar.gz) = 4436
diff --git a/www/py-dj31-django-js-asset/pkg-descr b/www/py-dj31-django-js-asset/pkg-descr
deleted file mode 100644
index 1b3c52191784..000000000000
--- a/www/py-dj31-django-js-asset/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Insert script tags with additional attributes (such as "id" and "data" for
-CSP-compatible data injection) for the django.forms.Media package.
-
-WWW: https://github.com/matthiask/django-js-asset
diff --git a/www/py-dj31-django-mptt/Makefile b/www/py-dj31-django-mptt/Makefile
deleted file mode 100644
index b10637d614e4..000000000000
--- a/www/py-dj31-django-mptt/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# Created by: Carlo Strub
-
-PORTNAME=	django-mptt
-PORTVERSION=	0.13.2
-CATEGORIES=	www python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj31-
-
-MAINTAINER=	kai@FreeBSD.org
-COMMENT=	Utilities for implementing Modified Preorder Tree Traversal in Django
-
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-DEPRECATED=	Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
-EXPIRATION_DATE=	2021-12-31
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django31>=2.2:www/py-django31@${PY_FLAVOR}\
-		${PYTHON_PKGNAMEPREFIX}dj31-django-js-asset>0:www/py-dj31-django-js-asset@${PY_FLAVOR}
-
-USES=		python:3.6+
-USE_PYTHON=	autoplist distutils
-
-NO_ARCH=		yes
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django-happenings \
-			${PYTHON_PKGNAMEPREFIX}django-mptt \
-			${PYTHON_PKGNAMEPREFIX}dj32-django-mptt
-
-.include <bsd.port.mk>
diff --git a/www/py-dj31-django-mptt/distinfo b/www/py-dj31-django-mptt/distinfo
deleted file mode 100644
index 0bdcf556bdd0..000000000000
--- a/www/py-dj31-django-mptt/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1630358088
-SHA256 (django-mptt-0.13.2.tar.gz) = 34ee8fc9462c397bb20bca5e2eeffea8c7b09bfc2302d15e7bb5e62f01f670e8
-SIZE (django-mptt-0.13.2.tar.gz) = 102873
diff --git a/www/py-dj31-django-mptt/pkg-descr b/www/py-dj31-django-mptt/pkg-descr
deleted file mode 100644
index 965e7289f5b7..000000000000
--- a/www/py-dj31-django-mptt/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Utilities for implementing Modified Preorder Tree Traversal with your Django
-Models and working with trees of Model instances.
-
-WWW: https://github.com/django-mptt/django-mptt
diff --git a/www/py-dj31-django-prometheus/Makefile b/www/py-dj31-django-prometheus/Makefile
deleted file mode 100644
index 2e4150e32623..000000000000
--- a/www/py-dj31-django-prometheus/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-PORTNAME=	django-prometheus
-PORTVERSION=	2.1.0
-CATEGORIES=	www python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj31-
-
-MAINTAINER=	kai@FreeBSD.org
-COMMENT=	Export Django monitoring metrics for Prometheus.io
-
-LICENSE=	APACHE20
-
-DEPRECATED=	Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
-EXPIRATION_DATE=	2021-12-31
-
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django31>=2.2:www/py-django31@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}prometheus-client>=0.7:net-mgmt/py-prometheus-client@${PY_FLAVOR}
-
-USES=		python:3.6+
-USE_PYTHON=	autoplist distutils
-
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django-prometheus \
-			${PYTHON_PKGNAMEPREFIX}dj32-django-prometheus
-
-NO_ARCH=		yes
-
-OPTIONS_GROUP=		DATABASE CACHE
-OPTIONS_GROUP_DATABASE=	MYSQL PGSQL
-OPTIONS_GROUP_CACHE=	MEMCACHED REDIS
-
-MEMCACHED_DESC=		Memcached distributed memory caching support
-
-MEMCACHED_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-memcached>=0:databases/py-python-memcached@${PY_FLAVOR}
-MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mysqlclient>=0:databases/py-mysqlclient@${PY_FLAVOR}
-PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=0:databases/py-psycopg2@${PY_FLAVOR}
-REDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dj31-django-redis>=4.8:www/py-dj31-django-redis@${PY_FLAVOR}
-
-.include <bsd.port.mk>
diff --git a/www/py-dj31-django-prometheus/distinfo b/www/py-dj31-django-prometheus/distinfo
deleted file mode 100644
index d5a34e2b0e80..000000000000
--- a/www/py-dj31-django-prometheus/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1611058868
-SHA256 (django-prometheus-2.1.0.tar.gz) = dd3f8da1399140fbef5c00d1526a23d1ade286b144281c325f8e409a781643f2
-SIZE (django-prometheus-2.1.0.tar.gz) = 24615
diff --git a/www/py-dj31-django-prometheus/pkg-descr b/www/py-dj31-django-prometheus/pkg-descr
deleted file mode 100644
index 5bb2be69d186..000000000000
--- a/www/py-dj31-django-prometheus/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-This library exports Django monitoring metrics for Prometheus.io.
-
-It provides support to monitor the following databases types:
-
-* SQLite (via Django)
-* PostgreSQL
-* MySQL
-
-In addition, caches can also be monitored:
-
-* memcached
-* Redis
-
-It's even possible to export metrics of Django models and migrations.
-
-WWW: https://github.com/korfuri/django-prometheus
diff --git a/www/py-dj31-django-redis/Makefile b/www/py-dj31-django-redis/Makefile
deleted file mode 100644
index f0809bb482c3..000000000000
--- a/www/py-dj31-django-redis/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-PORTNAME=	django-redis
-PORTVERSION=	5.1.0
-CATEGORIES=	www databases python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj31-
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Full featured Redis cache/session backend for Django
-
-LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-DEPRECATED=	Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
-EXPIRATION_DATE=	2021-12-31
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django31>=2.2:www/py-django31@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}redis>=3<4:databases/py-redis@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hiredis>=0:databases/py-hiredis@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}msgpack>=0:devel/py-msgpack@${PY_FLAVOR}
-
-USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
-
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django-redis \
-			${PYTHON_PKGNAMEPREFIX}dj32-django-redis
-
-NO_ARCH=	yes
-
-do-test:
-	@cd ${WRKSRC}/tests && ${PYTHON_CMD} runtests.py
-
-.include <bsd.port.mk>
diff --git a/www/py-dj31-django-redis/distinfo b/www/py-dj31-django-redis/distinfo
deleted file mode 100644
index cd19505dd98b..000000000000
--- a/www/py-dj31-django-redis/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1638556632
-SHA256 (django-redis-5.1.0.tar.gz) = 98fb3d31633a1addea1aeb558a647359908bbcf78c0833f99496c5348fe3c1b4
-SIZE (django-redis-5.1.0.tar.gz) = 44112
diff --git a/www/py-dj31-django-redis/pkg-descr b/www/py-dj31-django-redis/pkg-descr
deleted file mode 100644
index 765564e7a725..000000000000
--- a/www/py-dj31-django-redis/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-Django-redis is a BSD Licensed, full featured Redis cache/session
-backend for Django.
-
-Why use django-redis?
-
- * Modular client system (pluggable clients).
- * Master-Slave support in the default client.
- * Used in production in several projects as cache and session storage.
- * Supports infinite timeouts.
- * Python 3 support in same code base.
- * Facilities for raw access to Redis client/connection pool.
- * Highly configurable (can emulate memcached exception behavior, for
-   example).
- * Unix sockets supported by default.
- * Pluggable parsers.
-
-WWW: https://github.com/jazzband/django-redis
diff --git a/www/py-dj31-django-tables2/Makefile b/www/py-dj31-django-tables2/Makefile
deleted file mode 100644
index e13099501807..000000000000
--- a/www/py-dj31-django-tables2/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# Created by: Kozlov Sergey <kozlov.sergey.404@gmail.com>
-
-PORTNAME=	django-tables2
-DISTVERSION=	2.4.0
-CATEGORIES=	www python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj31-
-
-MAINTAINER=	kai@FreeBSD.org
-COMMENT=	Table/data-grid framework for Django
-
-LICENSE=	BSD2CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-DEPRECATED=	Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
-EXPIRATION_DATE=	2021-12-31
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django31>=1.11:www/py-django31@${PY_FLAVOR}
-
-USES=		python:3.7+
-USE_PYTHON=	distutils autoplist
-
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django-tables2 \
-			${PYTHON_PKGNAMEPREFIX}dj32-django-tables2
-
-NO_ARCH=		yes
-
-OPTIONS_DEFINE=		TABLIB
-
-TABLIB_DESC=		Enable support for exporting table datasets
-TABLIB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tablib>=0:textproc/py-tablib@${PY_FLAVOR}
-
-.include <bsd.port.mk>
diff --git a/www/py-dj31-django-tables2/distinfo b/www/py-dj31-django-tables2/distinfo
deleted file mode 100644
index 6f74431aa1a0..000000000000
--- a/www/py-dj31-django-tables2/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1626792729
-SHA256 (django-tables2-2.4.0.tar.gz) = 4eb526464ee56a0b7d827d1da9a4f257e44edb5e1cbb6a0cfb6ca0fed70d8e4f
-SIZE (django-tables2-2.4.0.tar.gz) = 77919
diff --git a/www/py-dj31-django-tables2/pkg-descr b/www/py-dj31-django-tables2/pkg-descr
deleted file mode 100644
index e4a9e8e434f9..000000000000
--- a/www/py-dj31-django-tables2/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-django-tables2 simplifies the task of turning sets of data into HTML tables.
-It has native support for pagination and sorting, does for HTML tables what
-django.forms does for HTML forms.
-
-WWW: https://github.com/jieter/django-tables2
diff --git a/www/py-dj31-django-taggit/Makefile b/www/py-dj31-django-taggit/Makefile
deleted file mode 100644
index 4e1586d61992..000000000000
--- a/www/py-dj31-django-taggit/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-PORTNAME=	django-taggit
-PORTVERSION=	1.5.1
-CATEGORIES=	www python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj31-
-
-MAINTAINER=	kai@FreeBSD.org
-COMMENT=	Reusable Django application for simple tagging
-
-LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-DEPRECATED=	Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
-EXPIRATION_DATE=	2021-12-31
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django31>=2.2:www/py-django31@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dj31-djangorestframework>0:www/py-dj31-djangorestframework@${PY_FLAVOR}
-
-USES=		python:3.6+
-USE_PYTHON=	autoplist distutils
-
-NO_ARCH=		yes
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django-taggit \
-			${PYTHON_PKGNAMEPREFIX}dj32-django-taggit
-
-do-test:
-	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m django test --settings=tests.settings -v3
-
-.include <bsd.port.mk>
diff --git a/www/py-dj31-django-taggit/distinfo b/www/py-dj31-django-taggit/distinfo
deleted file mode 100644
index 4326d6431755..000000000000
--- a/www/py-dj31-django-taggit/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1626793131
-SHA256 (django-taggit-1.5.1.tar.gz) = e5bb62891f458d55332e36a32e19c08d20142c43f74bc5656c803f8af25c084a
-SIZE (django-taggit-1.5.1.tar.gz) = 52766
diff --git a/www/py-dj31-django-taggit/pkg-descr b/www/py-dj31-django-taggit/pkg-descr
deleted file mode 100644
index 1c0759657dfc..000000000000
--- a/www/py-dj31-django-taggit/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-django-taggit a simpler approach to tagging with Django.
-
-WWW: https://github.com/jazzband/django-taggit
diff --git a/www/py-dj31-django-timezone-field/Makefile b/www/py-dj31-django-timezone-field/Makefile
deleted file mode 100644
index 0fc58a379e7e..000000000000
--- a/www/py-dj31-django-timezone-field/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-PORTNAME=	django-timezone-field
-DISTVERSION=	4.1.2
-CATEGORIES=	www python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj31-
-
-MAINTAINER=	kai@FreeBSD.org
-COMMENT=	Provides database and form fields for pytz timezone objects for Django
-
-LICENSE=	BSD2CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
-
-DEPRECATED=	Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
-EXPIRATION_DATE=	2021-12-31
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django31>=1.11:www/py-django31@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}
-
-USES=		python:3.6+
-USE_PYTHON=	distutils autoplist
-
-NO_ARCH=		yes
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django-timezone-field \
-			${PYTHON_PKGNAMEPREFIX}dj32-django-timezone-field
-
-.include <bsd.port.mk>
diff --git a/www/py-dj31-django-timezone-field/distinfo b/www/py-dj31-django-timezone-field/distinfo
deleted file mode 100644
index aa1cc15ade0e..000000000000
--- a/www/py-dj31-django-timezone-field/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1616796675
-SHA256 (django-timezone-field-4.1.2.tar.gz) = cffac62452d060e365938aa9c9f7b72d70d8b26b9c60243bce227b35abd1b9df
-SIZE (django-timezone-field-4.1.2.tar.gz) = 8419
diff --git a/www/py-dj31-django-timezone-field/pkg-descr b/www/py-dj31-django-timezone-field/pkg-descr
deleted file mode 100644
index 83be226cc201..000000000000
--- a/www/py-dj31-django-timezone-field/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Provides database and form fields for pytz timezone objects for Django.
-
-WWW: https://github.com/mfogel/django-timezone-field
diff --git a/www/py-dj31-djangorestframework/Makefile b/www/py-dj31-djangorestframework/Makefile
deleted file mode 100644
index 2ab323d6f616..000000000000
--- a/www/py-dj31-djangorestframework/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-PORTNAME=	djangorestframework
-PORTVERSION=	3.12.4
-CATEGORIES=	www python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj31-
-
-MAINTAINER=	kai@FreeBSD.org
-COMMENT=	Django REST framework
-
-LICENSE=	BSD2CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE.md
-
-DEPRECATED=	Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
-EXPIRATION_DATE=	2021-12-31
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django31>=2.2:www/py-django31@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR}
-
-USES=		python:3.6+
-USE_PYTHON=	distutils autoplist
-
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}djangorestframework3* \
-			${PYTHON_PKGNAMEPREFIX}djangorestframework \
-			${PYTHON_PKGNAMEPREFIX}dj32-djangorestframework
-NO_ARCH=		yes
-
-.include <bsd.port.mk>
diff --git a/www/py-dj31-djangorestframework/distinfo b/www/py-dj31-djangorestframework/distinfo
deleted file mode 100644
index 01fbb2133c85..000000000000
--- a/www/py-dj31-djangorestframework/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1616796749
-SHA256 (djangorestframework-3.12.4.tar.gz) = f747949a8ddac876e879190df194b925c177cdeb725a099db1460872f7c0a7f2
-SIZE (djangorestframework-3.12.4.tar.gz) = 825004
diff --git a/www/py-dj31-djangorestframework/pkg-descr b/www/py-dj31-djangorestframework/pkg-descr
deleted file mode 100644
index fc24440c9a9b..000000000000
--- a/www/py-dj31-djangorestframework/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Django REST framework is a powerful and flexible toolkit that makes
-it easy to build Web APIs.
-
-WWW: https://www.django-rest-framework.org/
diff --git a/www/py-dj31-drf-yasg/Makefile b/www/py-dj31-drf-yasg/Makefile
deleted file mode 100644
index d1012b6ba632..000000000000
--- a/www/py-dj31-drf-yasg/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-PORTNAME=	drf-yasg
-DISTVERSION=	1.20.0
-CATEGORIES=	www python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj31-
-
-MAINTAINER=	kai@FreeBSD.org
-COMMENT=	Yet Another Swagger Generator
-
-LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE.rst
-
-DEPRECATED=	Extended support of Django 3.1 ends December 2021, upgrade to the Django 3.2+ version of this port. See https://www.djangoproject.com/download/
-EXPIRATION_DATE=	2021-12-31
-
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.0.6:devel/py-setuptools_scm@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django31>=2.2.16:www/py-django31@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dj31-djangorestframework>=3.10.3:www/py-dj31-djangorestframework@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}coreapi>=2.3.3:devel/py-coreapi@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}coreschema>=0.0.4:devel/py-coreschema@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}inflection>=0.3.1:devel/py-inflection@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.15.34:devel/py-ruamel.yaml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}uritemplate>=3.0.0:net/py-uritemplate@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}
-
-USES=		python:3.6+
-USE_PYTHON=	distutils autoplist
-
-CONFLICTS_INSTALL=	${PYTHON_PGKNAMEPREFIX}drf-yasg \
-			${PYTHON_PGKNAMEPREFIX}dj32-drf-yasg
-
-NO_ARCH=		yes
-
-OPTIONS_DEFINE=		VALIDATION
-OPTIONS_DEFAULT=	VALIDATION
-
-VALIDATION_DESC=	Enable built-in OpenAPI validation mechanisms
-VALIDATION_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}swagger-spec-validator>=2.1.0:devel/py-swagger-spec-validator@${PY_FLAVOR}
-
-.include <bsd.port.mk>
diff --git a/www/py-dj31-drf-yasg/distinfo b/www/py-dj31-drf-yasg/distinfo
deleted file mode 100644
index 20815e62ee72..000000000000
--- a/www/py-dj31-drf-yasg/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1604143828
-SHA256 (drf-yasg-1.20.0.tar.gz) = d50f197c7f02545d0b736df88c6d5cf874f8fea2507ad85ad7de6ae5bf2d9e5a
-SIZE (drf-yasg-1.20.0.tar.gz) = 1800321
diff --git a/www/py-dj31-drf-yasg/pkg-descr b/www/py-dj31-drf-yasg/pkg-descr
deleted file mode 100644
index e9ddcdf2d62c..000000000000
--- a/www/py-dj31-drf-yasg/pkg-descr
+++ /dev/null
@@ -1,20 +0,0 @@
-Generate real Swagger/OpenAPI 2.0 specifications from a Django Rest
-Framework API.
-
-Features:
-
-- full support for nested serializers and schemas
-- response schemas and descriptions
-- model definitions compatible with codegen tools
-- customization hooks at all points in the spec generation process
-- JSON and YAML format for spec
-- bundles latest version of swagger-ui and redoc for viewing the generated
-  documentation
-- schema view is cacheable out of the box
-- generated Swagger schema can be automatically validated by
-  swagger-spec-validator or flex
-- supports Django REST Framework API versioning with URLPathVersioning
-  and NamespaceVersioning (other DRF or custom versioning schemes are
-  not currently supported)
-
-WWW: https://github.com/axnsan12/drf-yasg
diff --git a/www/py-django31/Makefile b/www/py-django31/Makefile
deleted file mode 100644
index e580e00bb746..000000000000
--- a/www/py-django31/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
-
-PORTNAME=	django
-PORTVERSION=	3.1.14
-CATEGORIES=	www python
-MASTER_SITES=	CHEESESHOP \
-		https://www.djangoproject.com/m/releases/${PORTVERSION}/
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX=	31
-DISTNAME=	Django-${PORTVERSION}
-DIST_SUBDIR=	python
-
-MAINTAINER=	python@FreeBSD.org
-COMMENT=	High-level Python Web Framework
-
-LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-DEPRECATED=	Upgrade to Django 3.2+. Mainstream support ended (April 6, 2021). Extended support ends December 2021. See https://www.djangoproject.com/download/
-EXPIRATION_DATE=	2021-12-31
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}asgiref>0:www/py-asgiref@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sqlparse>=0:databases/py-sqlparse@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tblib>0:devel/py-tblib@${PY_FLAVOR}
-
-USES=		cpe python:3.6+ shebangfix
-USE_PYTHON=	autoplist distutils
-
-NO_ARCH=	yes
-
-DOCSDIR=	${PREFIX}/share/doc/py-django
-PLIST_FILES=	man/man1/django-admin.1.gz
-PORTDOCS=	*
-
-SHEBANG_FILES=	django/bin/django-admin.py \
-		django/conf/project_template/manage.py-tpl
-
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django22 \
-			${PYTHON_PKGNAMEPREFIX}django32
-
-CPE_VENDOR=	djangoproject
-
-# Upstream archive contains files with UTF-8 names
-EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar
-
-OPTIONS_DEFINE=	DOCS HTMLDOCS
-OPTIONS_GROUP=	DATABASE
-OPTIONS_GROUP_DATABASE=	PGSQL MYSQL SQLITE
-OPTIONS_DEFAULT=SQLITE
-HTMLDOCS_DESC=	Install HTML documentation (requires Sphinx)
-
-HTMLDOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
-HTMLDOCS_IMPLIES=	DOCS
-PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}
-MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mysqlclient>=1.3.13:databases/py-mysqlclient@${PY_FLAVOR}
-SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
-
-post-build-HTMLDOCS-on:
-	cd ${WRKSRC}/docs && ${MAKE} html SPHINXBUILD=sphinx-build-${PYTHON_VER}
-
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/docs/man/* ${STAGEDIR}/${MAN1PREFIX}/man/man1
-	@${ECHO_MSG}	""
-	@${ECHO_MSG}	"	* See http://docs.djangoproject.com/ for complete documentation"
-	@${ECHO_MSG}	""
-
-post-install-HTMLDOCS-on:
-	${MKDIR} ${STAGEDIR}/${DOCSDIR}
-	${CP} -R ${WRKSRC}/docs/_build/html ${STAGEDIR}/${DOCSDIR}
-
-do-test:
-	@cd ${WRKSRC} && ${PYTHON_CMD} tests/runtests.py --settings=test_sqlite
-
-.include <bsd.port.mk>
diff --git a/www/py-django31/distinfo b/www/py-django31/distinfo
deleted file mode 100644
index c6f6efb4110e..000000000000
--- a/www/py-django31/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1639011193
-SHA256 (python/Django-3.1.14.tar.gz) = 72a4a5a136a214c39cf016ccdd6b69e2aa08c7479c66d93f3a9b5e4bb9d8a347
-SIZE (python/Django-3.1.14.tar.gz) = 9659386
diff --git a/www/py-django31/pkg-descr b/www/py-django31/pkg-descr
deleted file mode 100644
index 0ea493b87ab6..000000000000
--- a/www/py-django31/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Django is a high-level Python Web framework that encourages rapid development
-and clean, pragmatic design.
-
-Developed and used over the past two years by a fast-moving online-news
-operation, Django was designed from scratch to handle two challenges: the
-intensive deadlines of a newsroom and the stringent requirements of experienced
-Web developers. It has convenient niceties for developing content-management
-systems, but it's an excellent tool for building any Web site.
-
-WWW: https://www.djangoproject.com/