mate-backgrounds: redo a patch differently

During the build phase, translation files are generated, installed, and
then deleted. This needs to be better sorted out upstream.

5 files changed, 20 insertions, 125 deletions

diff --git a/graphics/mate-backgrounds/Makefile b/graphics/mate-backgrounds/Makefile
index 2bfa7823798..f612128a21a 100644
--- a/graphics/mate-backgrounds/Makefile
+++ b/graphics/mate-backgrounds/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2022/11/27 04:54:18 gutteridge Exp $
+# $NetBSD: Makefile,v 1.24 2022/11/27 19:57:39 gutteridge Exp $
 
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=	mate-backgrounds-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	Set of backgrounds packaged with the MATE desktop
diff --git a/graphics/mate-backgrounds/PLIST b/graphics/mate-backgrounds/PLIST
index 6f2e88313c9..601ac75dffd 100644
--- a/graphics/mate-backgrounds/PLIST
+++ b/graphics/mate-backgrounds/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2021/08/06 01:12:53 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.7 2022/11/27 19:57:39 gutteridge Exp $
 share/backgrounds/mate/abstract/Arc-Colors-Transparent-Wallpaper.png
 share/backgrounds/mate/abstract/Elephants.jpg
 share/backgrounds/mate/abstract/Elephants_3840x2160.jpg
@@ -29,109 +29,6 @@ share/backgrounds/mate/nature/Storm.jpg
 share/backgrounds/mate/nature/TwoWings.jpg
 share/backgrounds/mate/nature/Wood.jpg
 share/backgrounds/mate/nature/YellowFlower.jpg
-share/locale/af/LC_MESSAGES/mate-backgrounds.mo
-share/locale/am/LC_MESSAGES/mate-backgrounds.mo
-share/locale/an/LC_MESSAGES/mate-backgrounds.mo
-share/locale/ar/LC_MESSAGES/mate-backgrounds.mo
-share/locale/as/LC_MESSAGES/mate-backgrounds.mo
-share/locale/ast/LC_MESSAGES/mate-backgrounds.mo
-share/locale/be/LC_MESSAGES/mate-backgrounds.mo
-share/locale/bg/LC_MESSAGES/mate-backgrounds.mo
-share/locale/bn/LC_MESSAGES/mate-backgrounds.mo
-share/locale/bn_IN/LC_MESSAGES/mate-backgrounds.mo
-share/locale/br/LC_MESSAGES/mate-backgrounds.mo
-share/locale/bs/LC_MESSAGES/mate-backgrounds.mo
-share/locale/ca/LC_MESSAGES/mate-backgrounds.mo
-share/locale/ca@valencia/LC_MESSAGES/mate-backgrounds.mo
-share/locale/cmn/LC_MESSAGES/mate-backgrounds.mo
-share/locale/crh/LC_MESSAGES/mate-backgrounds.mo
-share/locale/cs/LC_MESSAGES/mate-backgrounds.mo
-share/locale/cy/LC_MESSAGES/mate-backgrounds.mo
-share/locale/da/LC_MESSAGES/mate-backgrounds.mo
-share/locale/de/LC_MESSAGES/mate-backgrounds.mo
-share/locale/dz/LC_MESSAGES/mate-backgrounds.mo
-share/locale/el/LC_MESSAGES/mate-backgrounds.mo
-share/locale/en_AU/LC_MESSAGES/mate-backgrounds.mo
-share/locale/en_CA/LC_MESSAGES/mate-backgrounds.mo
-share/locale/en_GB/LC_MESSAGES/mate-backgrounds.mo
-share/locale/eo/LC_MESSAGES/mate-backgrounds.mo
-share/locale/es/LC_MESSAGES/mate-backgrounds.mo
-share/locale/es_AR/LC_MESSAGES/mate-backgrounds.mo
-share/locale/es_CO/LC_MESSAGES/mate-backgrounds.mo
-share/locale/es_MX/LC_MESSAGES/mate-backgrounds.mo
-share/locale/et/LC_MESSAGES/mate-backgrounds.mo
-share/locale/eu/LC_MESSAGES/mate-backgrounds.mo
-share/locale/fa/LC_MESSAGES/mate-backgrounds.mo
-share/locale/fi/LC_MESSAGES/mate-backgrounds.mo
-share/locale/fr/LC_MESSAGES/mate-backgrounds.mo
-share/locale/fr_CA/LC_MESSAGES/mate-backgrounds.mo
-share/locale/frp/LC_MESSAGES/mate-backgrounds.mo
-share/locale/fur/LC_MESSAGES/mate-backgrounds.mo
-share/locale/fy/LC_MESSAGES/mate-backgrounds.mo
-share/locale/ga/LC_MESSAGES/mate-backgrounds.mo
-share/locale/gl/LC_MESSAGES/mate-backgrounds.mo
-share/locale/gu/LC_MESSAGES/mate-backgrounds.mo
-share/locale/he/LC_MESSAGES/mate-backgrounds.mo
-share/locale/hi/LC_MESSAGES/mate-backgrounds.mo
-share/locale/hr/LC_MESSAGES/mate-backgrounds.mo
-share/locale/hu/LC_MESSAGES/mate-backgrounds.mo
-share/locale/hy/LC_MESSAGES/mate-backgrounds.mo
-share/locale/id/LC_MESSAGES/mate-backgrounds.mo
-share/locale/ie/LC_MESSAGES/mate-backgrounds.mo
-share/locale/is/LC_MESSAGES/mate-backgrounds.mo
-share/locale/it/LC_MESSAGES/mate-backgrounds.mo
-share/locale/ja/LC_MESSAGES/mate-backgrounds.mo
-share/locale/ka/LC_MESSAGES/mate-backgrounds.mo
-share/locale/kk/LC_MESSAGES/mate-backgrounds.mo
-share/locale/kn/LC_MESSAGES/mate-backgrounds.mo
-share/locale/ko/LC_MESSAGES/mate-backgrounds.mo
-share/locale/ku/LC_MESSAGES/mate-backgrounds.mo
-share/locale/ku_IQ/LC_MESSAGES/mate-backgrounds.mo
-share/locale/ky/LC_MESSAGES/mate-backgrounds.mo
-share/locale/la/LC_MESSAGES/mate-backgrounds.mo
-share/locale/lt/LC_MESSAGES/mate-backgrounds.mo
-share/locale/lv/LC_MESSAGES/mate-backgrounds.mo
-share/locale/mai/LC_MESSAGES/mate-backgrounds.mo
-share/locale/mg/LC_MESSAGES/mate-backgrounds.mo
-share/locale/mk/LC_MESSAGES/mate-backgrounds.mo
-share/locale/ml/LC_MESSAGES/mate-backgrounds.mo
-share/locale/mn/LC_MESSAGES/mate-backgrounds.mo
-share/locale/mr/LC_MESSAGES/mate-backgrounds.mo
-share/locale/ms/LC_MESSAGES/mate-backgrounds.mo
-share/locale/nb/LC_MESSAGES/mate-backgrounds.mo
-share/locale/nds/LC_MESSAGES/mate-backgrounds.mo
-share/locale/ne/LC_MESSAGES/mate-backgrounds.mo
-share/locale/nl/LC_MESSAGES/mate-backgrounds.mo
-share/locale/nn/LC_MESSAGES/mate-backgrounds.mo
-share/locale/oc/LC_MESSAGES/mate-backgrounds.mo
-share/locale/or/LC_MESSAGES/mate-backgrounds.mo
-share/locale/pa/LC_MESSAGES/mate-backgrounds.mo
-share/locale/pl/LC_MESSAGES/mate-backgrounds.mo
-share/locale/ps/LC_MESSAGES/mate-backgrounds.mo
-share/locale/pt/LC_MESSAGES/mate-backgrounds.mo
-share/locale/pt_BR/LC_MESSAGES/mate-backgrounds.mo
-share/locale/ro/LC_MESSAGES/mate-backgrounds.mo
-share/locale/ru/LC_MESSAGES/mate-backgrounds.mo
-share/locale/rw/LC_MESSAGES/mate-backgrounds.mo
-share/locale/si/LC_MESSAGES/mate-backgrounds.mo
-share/locale/sk/LC_MESSAGES/mate-backgrounds.mo
-share/locale/sl/LC_MESSAGES/mate-backgrounds.mo
-share/locale/sq/LC_MESSAGES/mate-backgrounds.mo
-share/locale/sr/LC_MESSAGES/mate-backgrounds.mo
-share/locale/sr@latin/LC_MESSAGES/mate-backgrounds.mo
-share/locale/sv/LC_MESSAGES/mate-backgrounds.mo
-share/locale/ta/LC_MESSAGES/mate-backgrounds.mo
-share/locale/te/LC_MESSAGES/mate-backgrounds.mo
-share/locale/th/LC_MESSAGES/mate-backgrounds.mo
-share/locale/tr/LC_MESSAGES/mate-backgrounds.mo
-share/locale/ug/LC_MESSAGES/mate-backgrounds.mo
-share/locale/uk/LC_MESSAGES/mate-backgrounds.mo
-share/locale/ur/LC_MESSAGES/mate-backgrounds.mo
-share/locale/uz/LC_MESSAGES/mate-backgrounds.mo
-share/locale/vi/LC_MESSAGES/mate-backgrounds.mo
-share/locale/zh_CN/LC_MESSAGES/mate-backgrounds.mo
-share/locale/zh_HK/LC_MESSAGES/mate-backgrounds.mo
-share/locale/zh_TW/LC_MESSAGES/mate-backgrounds.mo
 share/mate-background-properties/mate-abstract.xml
 share/mate-background-properties/mate-desktop.xml
 share/mate-background-properties/mate-nature.xml
diff --git a/graphics/mate-backgrounds/distinfo b/graphics/mate-backgrounds/distinfo
index 55c5a7bbfb5..f6d2a0f95b0 100644
--- a/graphics/mate-backgrounds/distinfo
+++ b/graphics/mate-backgrounds/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2022/11/27 04:54:18 gutteridge Exp $
+$NetBSD: distinfo,v 1.12 2022/11/27 19:57:39 gutteridge Exp $
 
 BLAKE2s (mate-backgrounds-1.26.0.tar.xz) = 4a498534e6d30a9157a0c791eaf728f1facd8e70913a907f4e234dbf4086e6a9
 SHA512 (mate-backgrounds-1.26.0.tar.xz) = 48ceb91abf6f7840a9fd7f504e887e54d234410df07dd07a2d155b28cf8d6518b743be767e02cbb774bd817e640b755eec2a73abd4d2d3685e3b4377e9a58476
 Size (mate-backgrounds-1.26.0.tar.xz) = 46808396 bytes
-SHA1 (patch-Makefile.in) = 29ff00608208267d9898ca527bab180c23fcb4c8
+SHA1 (patch-po_Makefile.in.in) = 55a20a9ce86fe026559da3d683d8d73be95c0b1d
diff --git a/graphics/mate-backgrounds/patches/patch-Makefile.in b/graphics/mate-backgrounds/patches/patch-Makefile.in
deleted file mode 100644
index eb0f1e6127e..00000000000
--- a/graphics/mate-backgrounds/patches/patch-Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.1 2022/11/27 04:55:40 gutteridge Exp $
-
-Continue to install .mo files. Some other expectation in the build tooling
-isn't working as intended.
-
---- Makefile.in.orig	2021-08-04 08:39:51.000000000 +0000
-+++ Makefile.in
-@@ -830,8 +830,8 @@ dist-hook:
- 
- # we don't want to install mo files, all translations are already stored
- # in xml files
--install-data-local:
--	$(MAKE) -C po uninstall
-+#install-data-local:
-+#	$(MAKE) -C po uninstall
- 
- # Build ChangeLog from GIT  history
- ChangeLog:
diff --git a/graphics/mate-backgrounds/patches/patch-po_Makefile.in.in b/graphics/mate-backgrounds/patches/patch-po_Makefile.in.in
new file mode 100644
index 00000000000..e45d62fa9da
--- /dev/null
+++ b/graphics/mate-backgrounds/patches/patch-po_Makefile.in.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-po_Makefile.in.in,v 1.1 2022/11/27 19:57:39 gutteridge Exp $
+
+Remove directories after purging translation files. (During the build
+phase, translation files are generated, installed, and then deleted.
+This needs to be better sorted out upstream.)
+
++++ po/Makefile.in.in
+@@ -367,6 +367,7 @@ uninstall-data-yes:
+ 	  for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+ 	    rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+ 	  done; \
++	  rm -fr $(DESTDIR)$(localedir); \
+ 	done
+ 
+ check: all