7 files changed, 14 insertions, 21 deletions

diff --git a/MOVED b/MOVED
index 1495e90b2e7d..aad295116194 100644
--- a/MOVED
+++ b/MOVED
@@ -16595,3 +16595,4 @@ emulators/advancemame||2021-10-31|Has expired: Heavily outdated and unmaintained
 devel/clanlib||2021-10-31|Has expired: Upstream no longer maintained
 astro/boinc-setiathome||2021-11-03|No longer giving out work units
 astro/boinc-astropulse||2021-11-04|boinc-setiathome removed, no longer needed
+multimedia/celluloid-devel|multimedia/celluloid|Out of date: use multimedia/celluloid for now
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 201a42ac8faa..1c0ab02b08db 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -28,7 +28,6 @@
     SUBDIR += ccextractor
     SUBDIR += cclive
     SUBDIR += celluloid
-    SUBDIR += celluloid-devel
     SUBDIR += cheese
     SUBDIR += chilitags
     SUBDIR += cineencoder
diff --git a/multimedia/celluloid-devel/Makefile b/multimedia/celluloid-devel/Makefile
deleted file mode 100644
index a7b921abc1fb..000000000000
--- a/multimedia/celluloid-devel/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-DISTVERSION=	0.22
-PKGNAMESUFFIX=	-devel
-
-MASTERDIR=	${.CURDIR}/../celluloid
-DISTINFO_FILE=	${.CURDIR}/distinfo
-
-USE_GNOME=	gtk40
-PLIST_FILES=	${ar el id ie ko nb_NO te ur:L:C,.*,share/locale/&/LC_MESSAGES/${PORTNAME}.mo,}
-
-.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/celluloid-devel/distinfo b/multimedia/celluloid-devel/distinfo
deleted file mode 100644
index 39ccbcfbe694..000000000000
--- a/multimedia/celluloid-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1636045846
-SHA256 (celluloid-player-celluloid-v0.22_GH0.tar.gz) = dc5a7da19f89cf5dd6caeab2625fea1b8ac9a0311bfb14f5dc1e9c76daba4a9f
-SIZE (celluloid-player-celluloid-v0.22_GH0.tar.gz) = 489189
diff --git a/multimedia/celluloid/Makefile b/multimedia/celluloid/Makefile
index 9e75fb0ab6c5..3f2fff3fc695 100644
--- a/multimedia/celluloid/Makefile
+++ b/multimedia/celluloid/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	celluloid
 DISTVERSIONPREFIX=	v
-DISTVERSION?=	0.21
+DISTVERSION=	0.22
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -11,12 +11,10 @@ LICENSE=	GPLv3+
 LIB_DEPENDS=	libepoxy.so:graphics/libepoxy \
 		libmpv.so:multimedia/mpv
 
-CONFLICTS_INSTALL=	${PORTNAME}*
-
 USES=		compiler:c11 desktop-file-utils gettext-tools gnome \
 		meson pkgconfig python:3.5+,build shebangfix tar:xz
 USE_GITHUB=	yes
-USE_GNOME?=	cairo gtk30
+USE_GNOME=	gtk40
 GH_ACCOUNT=	${PORTNAME}-player
 SHEBANG_FILES=	src/generate-authors.py meson-post-install.py
 GLIB_SCHEMAS=	io.github.GnomeMpv.gschema.xml \
diff --git a/multimedia/celluloid/distinfo b/multimedia/celluloid/distinfo
index cea918292712..39ccbcfbe694 100644
--- a/multimedia/celluloid/distinfo
+++ b/multimedia/celluloid/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1616412350
-SHA256 (celluloid-player-celluloid-v0.21_GH0.tar.gz) = 322bed4337857c3c6e3affe312573e88128aef346528508c58a12cab4867a64d
-SIZE (celluloid-player-celluloid-v0.21_GH0.tar.gz) = 377260
+TIMESTAMP = 1636045846
+SHA256 (celluloid-player-celluloid-v0.22_GH0.tar.gz) = dc5a7da19f89cf5dd6caeab2625fea1b8ac9a0311bfb14f5dc1e9c76daba4a9f
+SIZE (celluloid-player-celluloid-v0.22_GH0.tar.gz) = 489189
diff --git a/multimedia/celluloid/pkg-plist b/multimedia/celluloid/pkg-plist
index 7d93170a0c24..e400fb3dac36 100644
--- a/multimedia/celluloid/pkg-plist
+++ b/multimedia/celluloid/pkg-plist
@@ -4,11 +4,13 @@ share/applications/io.github.celluloid_player.Celluloid.desktop
 share/dbus-1/services/io.github.celluloid_player.Celluloid.service
 share/icons/hicolor/scalable/apps/io.github.celluloid_player.Celluloid.svg
 share/icons/hicolor/symbolic/apps/io.github.celluloid_player.Celluloid-symbolic.svg
+share/locale/ar/LC_MESSAGES/celluloid.mo
 share/locale/bg/LC_MESSAGES/celluloid.mo
 share/locale/ca/LC_MESSAGES/celluloid.mo
 share/locale/cs/LC_MESSAGES/celluloid.mo
 share/locale/da/LC_MESSAGES/celluloid.mo
 share/locale/de/LC_MESSAGES/celluloid.mo
+share/locale/el/LC_MESSAGES/celluloid.mo
 share/locale/eo/LC_MESSAGES/celluloid.mo
 share/locale/es/LC_MESSAGES/celluloid.mo
 share/locale/eu/LC_MESSAGES/celluloid.mo
@@ -17,9 +19,13 @@ share/locale/fi/LC_MESSAGES/celluloid.mo
 share/locale/fr/LC_MESSAGES/celluloid.mo
 share/locale/hr/LC_MESSAGES/celluloid.mo
 share/locale/hu/LC_MESSAGES/celluloid.mo
+share/locale/id/LC_MESSAGES/celluloid.mo
+share/locale/ie/LC_MESSAGES/celluloid.mo
 share/locale/is/LC_MESSAGES/celluloid.mo
 share/locale/it/LC_MESSAGES/celluloid.mo
 share/locale/ja/LC_MESSAGES/celluloid.mo
+share/locale/ko/LC_MESSAGES/celluloid.mo
+share/locale/nb_NO/LC_MESSAGES/celluloid.mo
 share/locale/nl/LC_MESSAGES/celluloid.mo
 share/locale/pl/LC_MESSAGES/celluloid.mo
 share/locale/pt_BR/LC_MESSAGES/celluloid.mo
@@ -31,8 +37,10 @@ share/locale/sl/LC_MESSAGES/celluloid.mo
 share/locale/sr/LC_MESSAGES/celluloid.mo
 share/locale/sr@latin/LC_MESSAGES/celluloid.mo
 share/locale/sv/LC_MESSAGES/celluloid.mo
+share/locale/te/LC_MESSAGES/celluloid.mo
 share/locale/tr/LC_MESSAGES/celluloid.mo
 share/locale/uk/LC_MESSAGES/celluloid.mo
+share/locale/ur/LC_MESSAGES/celluloid.mo
 share/locale/zh_CN/LC_MESSAGES/celluloid.mo
 share/locale/zh_TW/LC_MESSAGES/celluloid.mo
 share/metainfo/io.github.celluloid_player.Celluloid.appdata.xml