git: bec1cf2daa32 - main - GNOME: Remove erroneous ports and changes

From: Neel Chauhan <nc_at_FreeBSD.org>
Date: Sat, 16 Apr 2022 19:16:49 UTC
The branch main has been updated by nc:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bec1cf2daa32b6344d723f81581d1a27ed9f807a

commit bec1cf2daa32b6344d723f81581d1a27ed9f807a
Author:     Neel Chauhan <nc@FreeBSD.org>
AuthorDate: 2022-04-16 19:15:19 +0000
Commit:     Neel Chauhan <nc@FreeBSD.org>
CommitDate: 2022-04-16 19:16:09 +0000

    GNOME: Remove erroneous ports and changes
    
    These changes were committed prematurely.
    
    This reverts commit affdd52ee2036bd4f53ee3f3e9322d07643a6f99.
    
    This reverts commit bec10d1fe1d77710091167a46d7644a1dae4b5dc.
    
    This reverts commit 55b3e98b1cc8f1d72fa209f8aac1223b9d530ece.
    
    This reverts commit e13e865e25f6cddaff4344e8a78f5f5b90ecb686.
    
    This reverts commit ca5e34d343d59a176119ec235199d5aa1b1d36cf.
---
 Mk/Uses/gnome.mk             |  16 +-
 devel/Makefile               |   1 -
 devel/glibmm268/Makefile     |  28 ---
 devel/glibmm268/distinfo     |   3 -
 devel/glibmm268/pkg-descr    |   3 -
 devel/glibmm268/pkg-plist    | 436 -------------------------------------------
 graphics/Makefile            |   1 -
 graphics/cairomm16/Makefile  |  25 ---
 graphics/cairomm16/distinfo  |   3 -
 graphics/cairomm16/pkg-descr |   3 -
 graphics/cairomm16/pkg-plist |  34 ----
 11 files changed, 4 insertions(+), 549 deletions(-)

diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk
index fd8137af7839..f79319ebd250 100644
--- a/Mk/Uses/gnome.mk
+++ b/Mk/Uses/gnome.mk
@@ -79,9 +79,9 @@ _USE_GNOME_ALL+=dconf evolutiondataserver3 gnomecontrolcenter3 gnomedesktop3 \
 _USE_GNOME_ALL+=gtk40 libadwaita gtksourceview5
 
 # C++ bindings
-_USE_GNOME_ALL+=atkmm cairomm cairomm16 gconfmm26 glibmm glibmm268 gtkmm24 \
+_USE_GNOME_ALL+=atkmm cairomm gconfmm26 glibmm gtkmm24 \
 		gtkmm30 gtksourceviewmm3 libgdamm5 libxml++26 libsigc++20 \
-		libsigc++30 pangomm
+		pangomm
 
 # glib-mkenums often fails with C locale
 # https://gitlab.gnome.org/GNOME/glib/issues/1430
@@ -109,17 +109,11 @@ cairo_LIB_DEPENDS=	libcairo.so:graphics/cairo
 cairomm_LIB_DEPENDS=	libcairomm-1.0.so:graphics/cairomm
 cairomm_USE_GNOME_IMPL=	cairo libxml++26
 
-cairomm16_LIB_DEPENDS=	libcairomm-1.16.so:graphics/cairomm16
-cairomm16_USE_GNOME_IMPL=	cairo libxml++26
-
 gconfmm26_LIB_DEPENDS=		libgconfmm-2.6.so:devel/gconfmm26
 gconfmm26_USE_GNOME_IMPL=	glibmm gconf2
 
-glibmm_lib_depends=	libglibmm-2.4.so:devel/glibmm
-glibmm_use_gnome_impl=	libsigc++20 glib20
-
-glibmm268_lib_depends=		libglibmm-2.68.so:devel/glibmm268
-glibmm268_use_gnome_impl=	libsigc++30 glib20
+glibmm_LIB_DEPENDS=	libglibmm-2.4.so:devel/glibmm
+glibmm_USE_GNOME_IMPL=	libsigc++20 glib20
 
 gsound_BUILD_DEPENDS=	gsound-play:audio/gsound
 gsound_LIB_DEPENDS=	libgsound.so:audio/gsound
@@ -140,8 +134,6 @@ libgdamm5_USE_GNOME_IMPL=	libgda5 glibmm
 
 libsigc++20_LIB_DEPENDS=	libsigc-2.0.so:devel/libsigc++20
 
-libsigc++30_LIB_DEPENDS=	libsigc-3.0.so:devel/libsigc++30
-
 pangomm_LIB_DEPENDS=	libpangomm-1.4.so:x11-toolkits/pangomm
 pangomm_USE_GNOME_IMPL=	pango glibmm cairomm
 
diff --git a/devel/Makefile b/devel/Makefile
index c3e31d45e266..44e8ebe95e9b 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -870,7 +870,6 @@
     SUBDIR += glademm
     SUBDIR += glib20
     SUBDIR += glibmm
-    SUBDIR += glibmm268
     SUBDIR += gllvm
     SUBDIR += global
     SUBDIR += glog
diff --git a/devel/glibmm268/Makefile b/devel/glibmm268/Makefile
deleted file mode 100644
index 584c86a5a561..000000000000
--- a/devel/glibmm268/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# Created by: Adam Weinberger <adamw@FreeBSD.org>
-
-PORTNAME=	glibmm
-PORTVERSION=	2.70.0
-CATEGORIES=	devel
-MASTER_SITES=	GNOME
-PKGMAMESUFFIX=	268
-DIST_SUBDIR=	gnome
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	C++ interfaces for glib2
-
-LICENSE=	LGPL21
-
-LIB_DEPENDS=	libsigc-3.0.so:devel/libsigc++30
-
-USES=		compiler:c++11-lang gettext gnome meson pathfix perl5 \
-		pkgconfig python:3.7+,build shebangfix tar:xz
-USE_GNOME=	glib20 libsigc++20
-USE_LDCONFIG=	yes
-
-SHEBANG_GLOB=	*.py
-
-MESON_ARGS=	-Dbuild-documentation=false
-
-PLIST_SUB=	VERSION=2.68
-
-.include <bsd.port.mk>
diff --git a/devel/glibmm268/distinfo b/devel/glibmm268/distinfo
deleted file mode 100644
index e55eb925d648..000000000000
--- a/devel/glibmm268/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1650134801
-SHA256 (gnome/glibmm-2.70.0.tar.xz) = 8008fd8aeddcc867a3f97f113de625f6e96ef98cf7860379813a9c0feffdb520
-SIZE (gnome/glibmm-2.70.0.tar.xz) = 7874312
diff --git a/devel/glibmm268/pkg-descr b/devel/glibmm268/pkg-descr
deleted file mode 100644
index 2524fea2896b..000000000000
--- a/devel/glibmm268/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-C++ interfaces for glib20.
-
-WWW: https://www.gtkmm.org/
diff --git a/devel/glibmm268/pkg-plist b/devel/glibmm268/pkg-plist
deleted file mode 100644
index 7fde1c6e007f..000000000000
--- a/devel/glibmm268/pkg-plist
+++ /dev/null
@@ -1,436 +0,0 @@
-include/giomm-%%VERSION%%/giomm.h
-include/giomm-%%VERSION%%/giomm/action.h
-include/giomm-%%VERSION%%/giomm/actiongroup.h
-include/giomm-%%VERSION%%/giomm/actionmap.h
-include/giomm-%%VERSION%%/giomm/appinfo.h
-include/giomm-%%VERSION%%/giomm/applaunchcontext.h
-include/giomm-%%VERSION%%/giomm/application.h
-include/giomm-%%VERSION%%/giomm/applicationcommandline.h
-include/giomm-%%VERSION%%/giomm/asyncinitable.h
-include/giomm-%%VERSION%%/giomm/asyncresult.h
-include/giomm-%%VERSION%%/giomm/bufferedinputstream.h
-include/giomm-%%VERSION%%/giomm/bufferedoutputstream.h
-include/giomm-%%VERSION%%/giomm/cancellable.h
-include/giomm-%%VERSION%%/giomm/charsetconverter.h
-include/giomm-%%VERSION%%/giomm/contenttype.h
-include/giomm-%%VERSION%%/giomm/converter.h
-include/giomm-%%VERSION%%/giomm/converterinputstream.h
-include/giomm-%%VERSION%%/giomm/converteroutputstream.h
-include/giomm-%%VERSION%%/giomm/credentials.h
-include/giomm-%%VERSION%%/giomm/datainputstream.h
-include/giomm-%%VERSION%%/giomm/dataoutputstream.h
-include/giomm-%%VERSION%%/giomm/dbusactiongroup.h
-include/giomm-%%VERSION%%/giomm/dbusaddress.h
-include/giomm-%%VERSION%%/giomm/dbusauthobserver.h
-include/giomm-%%VERSION%%/giomm/dbusconnection.h
-include/giomm-%%VERSION%%/giomm/dbuserror.h
-include/giomm-%%VERSION%%/giomm/dbuserrorutils.h
-include/giomm-%%VERSION%%/giomm/dbusinterface.h
-include/giomm-%%VERSION%%/giomm/dbusinterfaceskeleton.h
-include/giomm-%%VERSION%%/giomm/dbusinterfacevtable.h
-include/giomm-%%VERSION%%/giomm/dbusintrospection.h
-include/giomm-%%VERSION%%/giomm/dbusmenumodel.h
-include/giomm-%%VERSION%%/giomm/dbusmessage.h
-include/giomm-%%VERSION%%/giomm/dbusmethodinvocation.h
-include/giomm-%%VERSION%%/giomm/dbusobject.h
-include/giomm-%%VERSION%%/giomm/dbusobjectmanager.h
-include/giomm-%%VERSION%%/giomm/dbusobjectmanagerclient.h
-include/giomm-%%VERSION%%/giomm/dbusobjectmanagerserver.h
-include/giomm-%%VERSION%%/giomm/dbusobjectproxy.h
-include/giomm-%%VERSION%%/giomm/dbusobjectskeleton.h
-include/giomm-%%VERSION%%/giomm/dbusownname.h
-include/giomm-%%VERSION%%/giomm/dbusproxy.h
-include/giomm-%%VERSION%%/giomm/dbusserver.h
-include/giomm-%%VERSION%%/giomm/dbussubtreevtable.h
-include/giomm-%%VERSION%%/giomm/dbusutils.h
-include/giomm-%%VERSION%%/giomm/dbuswatchname.h
-include/giomm-%%VERSION%%/giomm/desktopappinfo.h
-include/giomm-%%VERSION%%/giomm/drive.h
-include/giomm-%%VERSION%%/giomm/emblem.h
-include/giomm-%%VERSION%%/giomm/emblemedicon.h
-include/giomm-%%VERSION%%/giomm/enums.h
-include/giomm-%%VERSION%%/giomm/error.h
-include/giomm-%%VERSION%%/giomm/file.h
-include/giomm-%%VERSION%%/giomm/fileattributeinfo.h
-include/giomm-%%VERSION%%/giomm/fileattributeinfolist.h
-include/giomm-%%VERSION%%/giomm/filedescriptorbased.h
-include/giomm-%%VERSION%%/giomm/fileenumerator.h
-include/giomm-%%VERSION%%/giomm/fileicon.h
-include/giomm-%%VERSION%%/giomm/fileinfo.h
-include/giomm-%%VERSION%%/giomm/fileinputstream.h
-include/giomm-%%VERSION%%/giomm/fileiostream.h
-include/giomm-%%VERSION%%/giomm/filemonitor.h
-include/giomm-%%VERSION%%/giomm/filenamecompleter.h
-include/giomm-%%VERSION%%/giomm/fileoutputstream.h
-include/giomm-%%VERSION%%/giomm/filterinputstream.h
-include/giomm-%%VERSION%%/giomm/filteroutputstream.h
-include/giomm-%%VERSION%%/giomm/icon.h
-include/giomm-%%VERSION%%/giomm/inetaddress.h
-include/giomm-%%VERSION%%/giomm/inetsocketaddress.h
-include/giomm-%%VERSION%%/giomm/init.h
-include/giomm-%%VERSION%%/giomm/initable.h
-include/giomm-%%VERSION%%/giomm/inputstream.h
-include/giomm-%%VERSION%%/giomm/iostream.h
-include/giomm-%%VERSION%%/giomm/listmodel.h
-include/giomm-%%VERSION%%/giomm/liststore.h
-include/giomm-%%VERSION%%/giomm/loadableicon.h
-include/giomm-%%VERSION%%/giomm/memoryinputstream.h
-include/giomm-%%VERSION%%/giomm/memoryoutputstream.h
-include/giomm-%%VERSION%%/giomm/menu.h
-include/giomm-%%VERSION%%/giomm/menuattributeiter.h
-include/giomm-%%VERSION%%/giomm/menuitem.h
-include/giomm-%%VERSION%%/giomm/menulinkiter.h
-include/giomm-%%VERSION%%/giomm/menumodel.h
-include/giomm-%%VERSION%%/giomm/mount.h
-include/giomm-%%VERSION%%/giomm/mountoperation.h
-include/giomm-%%VERSION%%/giomm/networkaddress.h
-include/giomm-%%VERSION%%/giomm/networkmonitor.h
-include/giomm-%%VERSION%%/giomm/networkservice.h
-include/giomm-%%VERSION%%/giomm/notification.h
-include/giomm-%%VERSION%%/giomm/outputstream.h
-include/giomm-%%VERSION%%/giomm/permission.h
-include/giomm-%%VERSION%%/giomm/pollableinputstream.h
-include/giomm-%%VERSION%%/giomm/pollableoutputstream.h
-include/giomm-%%VERSION%%/giomm/private/action_p.h
-include/giomm-%%VERSION%%/giomm/private/actiongroup_p.h
-include/giomm-%%VERSION%%/giomm/private/actionmap_p.h
-include/giomm-%%VERSION%%/giomm/private/appinfo_p.h
-include/giomm-%%VERSION%%/giomm/private/applaunchcontext_p.h
-include/giomm-%%VERSION%%/giomm/private/application_p.h
-include/giomm-%%VERSION%%/giomm/private/applicationcommandline_p.h
-include/giomm-%%VERSION%%/giomm/private/asyncinitable_p.h
-include/giomm-%%VERSION%%/giomm/private/asyncresult_p.h
-include/giomm-%%VERSION%%/giomm/private/bufferedinputstream_p.h
-include/giomm-%%VERSION%%/giomm/private/bufferedoutputstream_p.h
-include/giomm-%%VERSION%%/giomm/private/cancellable_p.h
-include/giomm-%%VERSION%%/giomm/private/charsetconverter_p.h
-include/giomm-%%VERSION%%/giomm/private/converter_p.h
-include/giomm-%%VERSION%%/giomm/private/converterinputstream_p.h
-include/giomm-%%VERSION%%/giomm/private/converteroutputstream_p.h
-include/giomm-%%VERSION%%/giomm/private/credentials_p.h
-include/giomm-%%VERSION%%/giomm/private/datainputstream_p.h
-include/giomm-%%VERSION%%/giomm/private/dataoutputstream_p.h
-include/giomm-%%VERSION%%/giomm/private/dbusactiongroup_p.h
-include/giomm-%%VERSION%%/giomm/private/dbusaddress_p.h
-include/giomm-%%VERSION%%/giomm/private/dbusauthobserver_p.h
-include/giomm-%%VERSION%%/giomm/private/dbusconnection_p.h
-include/giomm-%%VERSION%%/giomm/private/dbuserror_p.h
-include/giomm-%%VERSION%%/giomm/private/dbuserrorutils_p.h
-include/giomm-%%VERSION%%/giomm/private/dbusinterface_p.h
-include/giomm-%%VERSION%%/giomm/private/dbusinterfaceskeleton_p.h
-include/giomm-%%VERSION%%/giomm/private/dbusinterfacevtable_p.h
-include/giomm-%%VERSION%%/giomm/private/dbusintrospection_p.h
-include/giomm-%%VERSION%%/giomm/private/dbusmenumodel_p.h
-include/giomm-%%VERSION%%/giomm/private/dbusmessage_p.h
-include/giomm-%%VERSION%%/giomm/private/dbusmethodinvocation_p.h
-include/giomm-%%VERSION%%/giomm/private/dbusobject_p.h
-include/giomm-%%VERSION%%/giomm/private/dbusobjectmanager_p.h
-include/giomm-%%VERSION%%/giomm/private/dbusobjectmanagerclient_p.h
-include/giomm-%%VERSION%%/giomm/private/dbusobjectmanagerserver_p.h
-include/giomm-%%VERSION%%/giomm/private/dbusobjectproxy_p.h
-include/giomm-%%VERSION%%/giomm/private/dbusobjectskeleton_p.h
-include/giomm-%%VERSION%%/giomm/private/dbusownname_p.h
-include/giomm-%%VERSION%%/giomm/private/dbusproxy_p.h
-include/giomm-%%VERSION%%/giomm/private/dbusserver_p.h
-include/giomm-%%VERSION%%/giomm/private/dbussubtreevtable_p.h
-include/giomm-%%VERSION%%/giomm/private/dbusutils_p.h
-include/giomm-%%VERSION%%/giomm/private/dbuswatchname_p.h
-include/giomm-%%VERSION%%/giomm/private/desktopappinfo_p.h
-include/giomm-%%VERSION%%/giomm/private/drive_p.h
-include/giomm-%%VERSION%%/giomm/private/emblem_p.h
-include/giomm-%%VERSION%%/giomm/private/emblemedicon_p.h
-include/giomm-%%VERSION%%/giomm/private/enums_p.h
-include/giomm-%%VERSION%%/giomm/private/error_p.h
-include/giomm-%%VERSION%%/giomm/private/file_p.h
-include/giomm-%%VERSION%%/giomm/private/fileattributeinfo_p.h
-include/giomm-%%VERSION%%/giomm/private/fileattributeinfolist_p.h
-include/giomm-%%VERSION%%/giomm/private/filedescriptorbased_p.h
-include/giomm-%%VERSION%%/giomm/private/fileenumerator_p.h
-include/giomm-%%VERSION%%/giomm/private/fileicon_p.h
-include/giomm-%%VERSION%%/giomm/private/fileinfo_p.h
-include/giomm-%%VERSION%%/giomm/private/fileinputstream_p.h
-include/giomm-%%VERSION%%/giomm/private/fileiostream_p.h
-include/giomm-%%VERSION%%/giomm/private/filemonitor_p.h
-include/giomm-%%VERSION%%/giomm/private/filenamecompleter_p.h
-include/giomm-%%VERSION%%/giomm/private/fileoutputstream_p.h
-include/giomm-%%VERSION%%/giomm/private/filterinputstream_p.h
-include/giomm-%%VERSION%%/giomm/private/filteroutputstream_p.h
-include/giomm-%%VERSION%%/giomm/private/icon_p.h
-include/giomm-%%VERSION%%/giomm/private/inetaddress_p.h
-include/giomm-%%VERSION%%/giomm/private/inetsocketaddress_p.h
-include/giomm-%%VERSION%%/giomm/private/initable_p.h
-include/giomm-%%VERSION%%/giomm/private/inputstream_p.h
-include/giomm-%%VERSION%%/giomm/private/iostream_p.h
-include/giomm-%%VERSION%%/giomm/private/listmodel_p.h
-include/giomm-%%VERSION%%/giomm/private/liststore_p.h
-include/giomm-%%VERSION%%/giomm/private/loadableicon_p.h
-include/giomm-%%VERSION%%/giomm/private/memoryinputstream_p.h
-include/giomm-%%VERSION%%/giomm/private/memoryoutputstream_p.h
-include/giomm-%%VERSION%%/giomm/private/menu_p.h
-include/giomm-%%VERSION%%/giomm/private/menuattributeiter_p.h
-include/giomm-%%VERSION%%/giomm/private/menuitem_p.h
-include/giomm-%%VERSION%%/giomm/private/menulinkiter_p.h
-include/giomm-%%VERSION%%/giomm/private/menumodel_p.h
-include/giomm-%%VERSION%%/giomm/private/mount_p.h
-include/giomm-%%VERSION%%/giomm/private/mountoperation_p.h
-include/giomm-%%VERSION%%/giomm/private/networkaddress_p.h
-include/giomm-%%VERSION%%/giomm/private/networkmonitor_p.h
-include/giomm-%%VERSION%%/giomm/private/networkservice_p.h
-include/giomm-%%VERSION%%/giomm/private/notification_p.h
-include/giomm-%%VERSION%%/giomm/private/outputstream_p.h
-include/giomm-%%VERSION%%/giomm/private/permission_p.h
-include/giomm-%%VERSION%%/giomm/private/pollableinputstream_p.h
-include/giomm-%%VERSION%%/giomm/private/pollableoutputstream_p.h
-include/giomm-%%VERSION%%/giomm/private/propertyaction_p.h
-include/giomm-%%VERSION%%/giomm/private/proxy_p.h
-include/giomm-%%VERSION%%/giomm/private/proxyaddress_p.h
-include/giomm-%%VERSION%%/giomm/private/proxyresolver_p.h
-include/giomm-%%VERSION%%/giomm/private/remoteactiongroup_p.h
-include/giomm-%%VERSION%%/giomm/private/resolver_p.h
-include/giomm-%%VERSION%%/giomm/private/resource_p.h
-include/giomm-%%VERSION%%/giomm/private/seekable_p.h
-include/giomm-%%VERSION%%/giomm/private/settings_p.h
-include/giomm-%%VERSION%%/giomm/private/settingsschema_p.h
-include/giomm-%%VERSION%%/giomm/private/settingsschemakey_p.h
-include/giomm-%%VERSION%%/giomm/private/settingsschemasource_p.h
-include/giomm-%%VERSION%%/giomm/private/simpleaction_p.h
-include/giomm-%%VERSION%%/giomm/private/simpleactiongroup_p.h
-include/giomm-%%VERSION%%/giomm/private/simpleiostream_p.h
-include/giomm-%%VERSION%%/giomm/private/simplepermission_p.h
-include/giomm-%%VERSION%%/giomm/private/socket_p.h
-include/giomm-%%VERSION%%/giomm/private/socketaddress_p.h
-include/giomm-%%VERSION%%/giomm/private/socketaddressenumerator_p.h
-include/giomm-%%VERSION%%/giomm/private/socketclient_p.h
-include/giomm-%%VERSION%%/giomm/private/socketconnectable_p.h
-include/giomm-%%VERSION%%/giomm/private/socketconnection_p.h
-include/giomm-%%VERSION%%/giomm/private/socketcontrolmessage_p.h
-include/giomm-%%VERSION%%/giomm/private/socketlistener_p.h
-include/giomm-%%VERSION%%/giomm/private/socketservice_p.h
-include/giomm-%%VERSION%%/giomm/private/srvtarget_p.h
-include/giomm-%%VERSION%%/giomm/private/tcpconnection_p.h
-include/giomm-%%VERSION%%/giomm/private/tcpwrapperconnection_p.h
-include/giomm-%%VERSION%%/giomm/private/themedicon_p.h
-include/giomm-%%VERSION%%/giomm/private/threadedsocketservice_p.h
-include/giomm-%%VERSION%%/giomm/private/tlscertificate_p.h
-include/giomm-%%VERSION%%/giomm/private/tlsclientconnection_p.h
-include/giomm-%%VERSION%%/giomm/private/tlsconnection_p.h
-include/giomm-%%VERSION%%/giomm/private/tlsdatabase_p.h
-include/giomm-%%VERSION%%/giomm/private/tlsinteraction_p.h
-include/giomm-%%VERSION%%/giomm/private/tlspassword_p.h
-include/giomm-%%VERSION%%/giomm/private/tlsserverconnection_p.h
-include/giomm-%%VERSION%%/giomm/private/unixconnection_p.h
-include/giomm-%%VERSION%%/giomm/private/unixcredentialsmessage_p.h
-include/giomm-%%VERSION%%/giomm/private/unixfdlist_p.h
-include/giomm-%%VERSION%%/giomm/private/unixfdmessage_p.h
-include/giomm-%%VERSION%%/giomm/private/unixinputstream_p.h
-include/giomm-%%VERSION%%/giomm/private/unixoutputstream_p.h
-include/giomm-%%VERSION%%/giomm/private/unixsocketaddress_p.h
-include/giomm-%%VERSION%%/giomm/private/volume_p.h
-include/giomm-%%VERSION%%/giomm/private/volumemonitor_p.h
-include/giomm-%%VERSION%%/giomm/private/zlibcompressor_p.h
-include/giomm-%%VERSION%%/giomm/private/zlibdecompressor_p.h
-include/giomm-%%VERSION%%/giomm/propertyaction.h
-include/giomm-%%VERSION%%/giomm/proxy.h
-include/giomm-%%VERSION%%/giomm/proxyaddress.h
-include/giomm-%%VERSION%%/giomm/proxyresolver.h
-include/giomm-%%VERSION%%/giomm/remoteactiongroup.h
-include/giomm-%%VERSION%%/giomm/resolver.h
-include/giomm-%%VERSION%%/giomm/resource.h
-include/giomm-%%VERSION%%/giomm/seekable.h
-include/giomm-%%VERSION%%/giomm/settings.h
-include/giomm-%%VERSION%%/giomm/settingsschema.h
-include/giomm-%%VERSION%%/giomm/settingsschemakey.h
-include/giomm-%%VERSION%%/giomm/settingsschemasource.h
-include/giomm-%%VERSION%%/giomm/simpleaction.h
-include/giomm-%%VERSION%%/giomm/simpleactiongroup.h
-include/giomm-%%VERSION%%/giomm/simpleiostream.h
-include/giomm-%%VERSION%%/giomm/simplepermission.h
-include/giomm-%%VERSION%%/giomm/slot_async.h
-include/giomm-%%VERSION%%/giomm/socket.h
-include/giomm-%%VERSION%%/giomm/socketaddress.h
-include/giomm-%%VERSION%%/giomm/socketaddressenumerator.h
-include/giomm-%%VERSION%%/giomm/socketclient.h
-include/giomm-%%VERSION%%/giomm/socketconnectable.h
-include/giomm-%%VERSION%%/giomm/socketconnection.h
-include/giomm-%%VERSION%%/giomm/socketcontrolmessage.h
-include/giomm-%%VERSION%%/giomm/socketlistener.h
-include/giomm-%%VERSION%%/giomm/socketservice.h
-include/giomm-%%VERSION%%/giomm/socketsource.h
-include/giomm-%%VERSION%%/giomm/srvtarget.h
-include/giomm-%%VERSION%%/giomm/tcpconnection.h
-include/giomm-%%VERSION%%/giomm/tcpwrapperconnection.h
-include/giomm-%%VERSION%%/giomm/themedicon.h
-include/giomm-%%VERSION%%/giomm/threadedsocketservice.h
-include/giomm-%%VERSION%%/giomm/tlscertificate.h
-include/giomm-%%VERSION%%/giomm/tlsclientconnection.h
-include/giomm-%%VERSION%%/giomm/tlsclientconnectionimpl.h
-include/giomm-%%VERSION%%/giomm/tlsconnection.h
-include/giomm-%%VERSION%%/giomm/tlsdatabase.h
-include/giomm-%%VERSION%%/giomm/tlsinteraction.h
-include/giomm-%%VERSION%%/giomm/tlspassword.h
-include/giomm-%%VERSION%%/giomm/tlsserverconnection.h
-include/giomm-%%VERSION%%/giomm/tlsserverconnectionimpl.h
-include/giomm-%%VERSION%%/giomm/unixconnection.h
-include/giomm-%%VERSION%%/giomm/unixcredentialsmessage.h
-include/giomm-%%VERSION%%/giomm/unixfdlist.h
-include/giomm-%%VERSION%%/giomm/unixfdmessage.h
-include/giomm-%%VERSION%%/giomm/unixinputstream.h
-include/giomm-%%VERSION%%/giomm/unixoutputstream.h
-include/giomm-%%VERSION%%/giomm/unixsocketaddress.h
-include/giomm-%%VERSION%%/giomm/volume.h
-include/giomm-%%VERSION%%/giomm/volumemonitor.h
-include/giomm-%%VERSION%%/giomm/wrap_init.h
-include/giomm-%%VERSION%%/giomm/zlibcompressor.h
-include/giomm-%%VERSION%%/giomm/zlibdecompressor.h
-include/glibmm-%%VERSION%%/glibmm.h
-include/glibmm-%%VERSION%%/glibmm/base64.h
-include/glibmm-%%VERSION%%/glibmm/binding.h
-include/glibmm-%%VERSION%%/glibmm/bytearray.h
-include/glibmm-%%VERSION%%/glibmm/bytes.h
-include/glibmm-%%VERSION%%/glibmm/checksum.h
-include/glibmm-%%VERSION%%/glibmm/class.h
-include/glibmm-%%VERSION%%/glibmm/containerhandle_shared.h
-include/glibmm-%%VERSION%%/glibmm/convert.h
-include/glibmm-%%VERSION%%/glibmm/date.h
-include/glibmm-%%VERSION%%/glibmm/datetime.h
-include/glibmm-%%VERSION%%/glibmm/debug.h
-include/glibmm-%%VERSION%%/glibmm/dispatcher.h
-include/glibmm-%%VERSION%%/glibmm/enums.h
-include/glibmm-%%VERSION%%/glibmm/environ.h
-include/glibmm-%%VERSION%%/glibmm/error.h
-include/glibmm-%%VERSION%%/glibmm/exceptionhandler.h
-include/glibmm-%%VERSION%%/glibmm/extraclassinit.h
-include/glibmm-%%VERSION%%/glibmm/fileutils.h
-include/glibmm-%%VERSION%%/glibmm/i18n-lib.h
-include/glibmm-%%VERSION%%/glibmm/i18n.h
-include/glibmm-%%VERSION%%/glibmm/init.h
-include/glibmm-%%VERSION%%/glibmm/interface.h
-include/glibmm-%%VERSION%%/glibmm/iochannel.h
-include/glibmm-%%VERSION%%/glibmm/keyfile.h
-include/glibmm-%%VERSION%%/glibmm/main.h
-include/glibmm-%%VERSION%%/glibmm/markup.h
-include/glibmm-%%VERSION%%/glibmm/miscutils.h
-include/glibmm-%%VERSION%%/glibmm/module.h
-include/glibmm-%%VERSION%%/glibmm/nodetree.h
-include/glibmm-%%VERSION%%/glibmm/object.h
-include/glibmm-%%VERSION%%/glibmm/objectbase.h
-include/glibmm-%%VERSION%%/glibmm/optioncontext.h
-include/glibmm-%%VERSION%%/glibmm/optionentry.h
-include/glibmm-%%VERSION%%/glibmm/optiongroup.h
-include/glibmm-%%VERSION%%/glibmm/pattern.h
-include/glibmm-%%VERSION%%/glibmm/priorities.h
-include/glibmm-%%VERSION%%/glibmm/private/binding_p.h
-include/glibmm-%%VERSION%%/glibmm/private/bytearray_p.h
-include/glibmm-%%VERSION%%/glibmm/private/bytes_p.h
-include/glibmm-%%VERSION%%/glibmm/private/checksum_p.h
-include/glibmm-%%VERSION%%/glibmm/private/convert_p.h
-include/glibmm-%%VERSION%%/glibmm/private/date_p.h
-include/glibmm-%%VERSION%%/glibmm/private/datetime_p.h
-include/glibmm-%%VERSION%%/glibmm/private/enums_p.h
-include/glibmm-%%VERSION%%/glibmm/private/fileutils_p.h
-include/glibmm-%%VERSION%%/glibmm/private/interface_p.h
-include/glibmm-%%VERSION%%/glibmm/private/iochannel_p.h
-include/glibmm-%%VERSION%%/glibmm/private/keyfile_p.h
-include/glibmm-%%VERSION%%/glibmm/private/markup_p.h
-include/glibmm-%%VERSION%%/glibmm/private/miscutils_p.h
-include/glibmm-%%VERSION%%/glibmm/private/module_p.h
-include/glibmm-%%VERSION%%/glibmm/private/nodetree_p.h
-include/glibmm-%%VERSION%%/glibmm/private/object_p.h
-include/glibmm-%%VERSION%%/glibmm/private/optioncontext_p.h
-include/glibmm-%%VERSION%%/glibmm/private/optionentry_p.h
-include/glibmm-%%VERSION%%/glibmm/private/optiongroup_p.h
-include/glibmm-%%VERSION%%/glibmm/private/regex_p.h
-include/glibmm-%%VERSION%%/glibmm/private/shell_p.h
-include/glibmm-%%VERSION%%/glibmm/private/spawn_p.h
-include/glibmm-%%VERSION%%/glibmm/private/timezone_p.h
-include/glibmm-%%VERSION%%/glibmm/private/unicode_p.h
-include/glibmm-%%VERSION%%/glibmm/private/uriutils_p.h
-include/glibmm-%%VERSION%%/glibmm/private/variant_p.h
-include/glibmm-%%VERSION%%/glibmm/private/variantdict_p.h
-include/glibmm-%%VERSION%%/glibmm/private/variantiter_p.h
-include/glibmm-%%VERSION%%/glibmm/private/varianttype_p.h
-include/glibmm-%%VERSION%%/glibmm/property.h
-include/glibmm-%%VERSION%%/glibmm/propertyproxy.h
-include/glibmm-%%VERSION%%/glibmm/propertyproxy_base.h
-include/glibmm-%%VERSION%%/glibmm/quark.h
-include/glibmm-%%VERSION%%/glibmm/random.h
-include/glibmm-%%VERSION%%/glibmm/refptr.h
-include/glibmm-%%VERSION%%/glibmm/regex.h
-include/glibmm-%%VERSION%%/glibmm/shell.h
-include/glibmm-%%VERSION%%/glibmm/signalproxy.h
-include/glibmm-%%VERSION%%/glibmm/signalproxy_connectionnode.h
-include/glibmm-%%VERSION%%/glibmm/spawn.h
-include/glibmm-%%VERSION%%/glibmm/stringutils.h
-include/glibmm-%%VERSION%%/glibmm/timer.h
-include/glibmm-%%VERSION%%/glibmm/timezone.h
-include/glibmm-%%VERSION%%/glibmm/unicode.h
-include/glibmm-%%VERSION%%/glibmm/uriutils.h
-include/glibmm-%%VERSION%%/glibmm/ustring.h
-include/glibmm-%%VERSION%%/glibmm/utility.h
-include/glibmm-%%VERSION%%/glibmm/value.h
-include/glibmm-%%VERSION%%/glibmm/value_basictypes.h
-include/glibmm-%%VERSION%%/glibmm/value_custom.h
-include/glibmm-%%VERSION%%/glibmm/variant.h
-include/glibmm-%%VERSION%%/glibmm/variant_basictypes.h
-include/glibmm-%%VERSION%%/glibmm/variantdbusstring.h
-include/glibmm-%%VERSION%%/glibmm/variantdict.h
-include/glibmm-%%VERSION%%/glibmm/variantiter.h
-include/glibmm-%%VERSION%%/glibmm/varianttype.h
-include/glibmm-%%VERSION%%/glibmm/vectorutils.h
-include/glibmm-%%VERSION%%/glibmm/wrap.h
-include/glibmm-%%VERSION%%/glibmm/wrap_init.h
-include/glibmm-%%VERSION%%/glibmm_generate_extra_defs/generate_extra_defs.h
-lib/giomm-%%VERSION%%/include/giommconfig.h
-lib/glibmm-%%VERSION%%/include/glibmmconfig.h
-lib/glibmm-%%VERSION%%/proc/generate_wrap_init.pl
-lib/glibmm-%%VERSION%%/proc/gmmproc
-lib/glibmm-%%VERSION%%/proc/m4/base.m4
-lib/glibmm-%%VERSION%%/proc/m4/class_boxedtype.m4
-lib/glibmm-%%VERSION%%/proc/m4/class_boxedtype_static.m4
-lib/glibmm-%%VERSION%%/proc/m4/class_generic.m4
-lib/glibmm-%%VERSION%%/proc/m4/class_gobject.m4
-lib/glibmm-%%VERSION%%/proc/m4/class_interface.m4
-lib/glibmm-%%VERSION%%/proc/m4/class_opaque_copyable.m4
-lib/glibmm-%%VERSION%%/proc/m4/class_opaque_refcounted.m4
-lib/glibmm-%%VERSION%%/proc/m4/class_shared.m4
-lib/glibmm-%%VERSION%%/proc/m4/compare.m4
-lib/glibmm-%%VERSION%%/proc/m4/convert.m4
-lib/glibmm-%%VERSION%%/proc/m4/convert_base.m4
-lib/glibmm-%%VERSION%%/proc/m4/convert_gio.m4
-lib/glibmm-%%VERSION%%/proc/m4/convert_glib.m4
-lib/glibmm-%%VERSION%%/proc/m4/convert_glibmm.m4
-lib/glibmm-%%VERSION%%/proc/m4/ctor.m4
-lib/glibmm-%%VERSION%%/proc/m4/doc.m4
-lib/glibmm-%%VERSION%%/proc/m4/enum.m4
-lib/glibmm-%%VERSION%%/proc/m4/gerror.m4
-lib/glibmm-%%VERSION%%/proc/m4/initialize.m4
-lib/glibmm-%%VERSION%%/proc/m4/initialize_base.m4
-lib/glibmm-%%VERSION%%/proc/m4/initialize_gio.m4
-lib/glibmm-%%VERSION%%/proc/m4/initialize_glib.m4
-lib/glibmm-%%VERSION%%/proc/m4/initialize_glibmm.m4
-lib/glibmm-%%VERSION%%/proc/m4/member.m4
-lib/glibmm-%%VERSION%%/proc/m4/method.m4
-lib/glibmm-%%VERSION%%/proc/m4/property.m4
-lib/glibmm-%%VERSION%%/proc/m4/signal.m4
-lib/glibmm-%%VERSION%%/proc/m4/vfunc.m4
-lib/glibmm-%%VERSION%%/proc/pm/DocsParser.pm
-lib/glibmm-%%VERSION%%/proc/pm/Enum.pm
-lib/glibmm-%%VERSION%%/proc/pm/Function.pm
-lib/glibmm-%%VERSION%%/proc/pm/FunctionBase.pm
-lib/glibmm-%%VERSION%%/proc/pm/GtkDefs.pm
-lib/glibmm-%%VERSION%%/proc/pm/Object.pm
-lib/glibmm-%%VERSION%%/proc/pm/Output.pm
-lib/glibmm-%%VERSION%%/proc/pm/Property.pm
-lib/glibmm-%%VERSION%%/proc/pm/Util.pm
-lib/glibmm-%%VERSION%%/proc/pm/WrapParser.pm
-lib/libgiomm-%%VERSION%%.so
-lib/libgiomm-%%VERSION%%.so.1
-lib/libgiomm-%%VERSION%%.so.1.3.0
-lib/libglibmm-%%VERSION%%.so
-lib/libglibmm-%%VERSION%%.so.1
-lib/libglibmm-%%VERSION%%.so.1.3.0
-lib/libglibmm_generate_extra_defs-%%VERSION%%.so
-lib/libglibmm_generate_extra_defs-%%VERSION%%.so.1
-lib/libglibmm_generate_extra_defs-%%VERSION%%.so.1.3.0
-libdata/pkgconfig/giomm-%%VERSION%%.pc
-libdata/pkgconfig/glibmm-%%VERSION%%.pc
diff --git a/graphics/Makefile b/graphics/Makefile
index 736a0fd48d77..0348a23f45c5 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -88,7 +88,6 @@
     SUBDIR += cadubi
     SUBDIR += cairo
     SUBDIR += cairomm
-    SUBDIR += cairomm16
     SUBDIR += cal3d
     SUBDIR += camera
     SUBDIR += camerakit
diff --git a/graphics/cairomm16/Makefile b/graphics/cairomm16/Makefile
deleted file mode 100644
index f62e337e677b..000000000000
--- a/graphics/cairomm16/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Created by: Michael Johnson <ahze@FreeBSD.org>
-
-PORTNAME=	cairomm
-PORTVERSION=	1.16.1
-CATEGORIES=	graphics
-PKGNAMESUFFIX=	16
-MASTER_SITES=	http://cairographics.org/releases/
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	C++ interface to cairo
-
-LICENSE=	LGPL20
-
-LIB_DEPENDS=	libfreetype.so:print/freetype2 \
-		libpng.so:graphics/png \
-		libsigc-3.0.so:devel/libsigc++30
-
-USE_LDCONFIG=	yes
-USES=		compiler:c++17-lang gnome libtool meson pathfix pkgconfig \
-		tar:xz xorg
-USE_CXXSTD=	c++17
-USE_GNOME=	cairo libxml++26
-USE_XORG=	x11 xext xrender
-
-.include <bsd.port.mk>
diff --git a/graphics/cairomm16/distinfo b/graphics/cairomm16/distinfo
deleted file mode 100644
index 85e651089133..000000000000
--- a/graphics/cairomm16/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1650133414
-SHA256 (cairomm-1.16.1.tar.xz) = 6f6060d8e98dd4b8acfee2295fddbdd38cf487c07c26aad8d1a83bb9bff4a2c6
-SIZE (cairomm-1.16.1.tar.xz) = 580020
diff --git a/graphics/cairomm16/pkg-descr b/graphics/cairomm16/pkg-descr
deleted file mode 100644
index 4a85fd74a9db..000000000000
--- a/graphics/cairomm16/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-C++ interface to cairo
-
-WWW: http://cairographics.org
diff --git a/graphics/cairomm16/pkg-plist b/graphics/cairomm16/pkg-plist
deleted file mode 100644
index bdd7b8398a13..000000000000
--- a/graphics/cairomm16/pkg-plist
+++ /dev/null
@@ -1,34 +0,0 @@
-include/cairomm-1.16/cairomm/cairomm.h
-include/cairomm-1.16/cairomm/context.h
-include/cairomm-1.16/cairomm/device.h
-include/cairomm-1.16/cairomm/enums.h
-include/cairomm-1.16/cairomm/exception.h
-include/cairomm-1.16/cairomm/fontface.h
-include/cairomm-1.16/cairomm/fontoptions.h
-include/cairomm-1.16/cairomm/matrix.h
-include/cairomm-1.16/cairomm/path.h
-include/cairomm-1.16/cairomm/pattern.h
-include/cairomm-1.16/cairomm/quartz_font.h
-include/cairomm-1.16/cairomm/quartz_surface.h
-include/cairomm-1.16/cairomm/refptr.h
-include/cairomm-1.16/cairomm/region.h
-include/cairomm-1.16/cairomm/scaledfont.h
-include/cairomm-1.16/cairomm/script.h
-include/cairomm-1.16/cairomm/script_surface.h
-include/cairomm-1.16/cairomm/surface.h
-include/cairomm-1.16/cairomm/types.h
-include/cairomm-1.16/cairomm/win32_font.h
-include/cairomm-1.16/cairomm/win32_surface.h
-include/cairomm-1.16/cairomm/xlib_surface.h
-lib/cairomm-1.16/include/cairommconfig.h
-lib/libcairomm-1.16.so
-lib/libcairomm-1.16.so.1
-lib/libcairomm-1.16.so.1.4.0
-libdata/pkgconfig/cairomm-1.16.pc
-libdata/pkgconfig/cairomm-ft-1.16.pc
-libdata/pkgconfig/cairomm-pdf-1.16.pc
-libdata/pkgconfig/cairomm-png-1.16.pc
-libdata/pkgconfig/cairomm-ps-1.16.pc
-libdata/pkgconfig/cairomm-svg-1.16.pc
-libdata/pkgconfig/cairomm-xlib-1.16.pc
-libdata/pkgconfig/cairomm-xlib-xrender-1.16.pc