remove gnome2 conflicts from mate-screensaver

[Richard PALO <richard%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Richard PALO <richard%NetBSD.org@localhost>
Pushed By:	richard
Date:		Mon May 16 13:46:57 2016 +0200
Changeset:	3d6a2c7923d66a03212f5fe121647d94642685c6

Modified Files:
	mate-screensaver/Makefile
	mate-screensaver/PLIST
	mate-screensaver/distinfo
Added Files:
	mate-screensaver/patches/patch-configure

Log Message:
remove gnome2 conflicts from mate-screensaver

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3d6a2c7923d66a03212f5fe121647d94642685c6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mate-screensaver/Makefile                | 12 ++++++++++--
 mate-screensaver/PLIST                   | 30 ++++++++++++++----------------
 mate-screensaver/distinfo                |  1 +
 mate-screensaver/patches/patch-configure | 15 +++++++++++++++
 4 files changed, 40 insertions(+), 18 deletions(-)

diffs:
diff --git a/mate-screensaver/Makefile b/mate-screensaver/Makefile
index f95b92d..7e33c96 100644
--- a/mate-screensaver/Makefile
+++ b/mate-screensaver/Makefile
@@ -1,5 +1,6 @@
 # $NetBSD: Makefile,v 1.9 2015/04/10 12:20:36 krytarowski Exp $
 
+PKGREVISION= 1
 .include "../../wip/mate/Makefile.common"
 
 DISTNAME=	mate-screensaver-${MATE_VERSION}
@@ -7,8 +8,6 @@ CATEGORIES=	x11
 
 COMMENT=	Screen saver and locker for the MATE desktop
 
-CONFLICTS+=	gnome-screensaver-[0-9]*
-
 PKGCONFIG_OVERRIDE+=	data/mate-screensaver.pc.in
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
@@ -56,6 +55,15 @@ CONF_FILES+=	${PREFIX}/share/examples/pam.d/mate-screensaver \
 DEPENDS+=	consolekit-[0-9]*:../../sysutils/consolekit
 .endif
 
+post-install:
+	# avoid conflicts with gnome-screensaver
+	${RM} -f ${DESTDIR}${PREFIX}/share/applications/screensavers/gnomelogo-floaters.desktop
+	${RM} -f ${DESTDIR}${PREFIX}/share/pixmaps/gnome-logo-white.svg
+	cd ${DESTDIR}${PREFIX}/share/applications/screensavers && \
+	for f in *; do			\
+		${MV} $$f mate-$$f; 	\
+	done
+
 .include "../../devel/glib2/schemas.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../wip/mate-desktop/buildlink3.mk"
diff --git a/mate-screensaver/PLIST b/mate-screensaver/PLIST
index 6dc66a0..f649ac5 100644
--- a/mate-screensaver/PLIST
+++ b/mate-screensaver/PLIST
@@ -12,21 +12,20 @@ man/man1/mate-screensaver-command.1
 man/man1/mate-screensaver-preferences.1
 man/man1/mate-screensaver.1
 share/applications/mate-screensaver-preferences.desktop
-share/applications/screensavers/cosmos-slideshow.desktop
-share/applications/screensavers/footlogo-floaters.desktop
-share/applications/screensavers/gnomelogo-floaters.desktop
-share/applications/screensavers/personal-slideshow.desktop
-share/applications/screensavers/popsquares.desktop
-share/backgrounds/cosmos/background-1.xml
-share/backgrounds/cosmos/blue-marble-west.jpg
-share/backgrounds/cosmos/cloud.jpg
-share/backgrounds/cosmos/comet.jpg
-share/backgrounds/cosmos/earth-horizon.jpg
-share/backgrounds/cosmos/galaxy-ngc3370.jpg
-share/backgrounds/cosmos/helix-nebula.jpg
-share/backgrounds/cosmos/jupiter.jpg
-share/backgrounds/cosmos/sombrero.jpg
-share/backgrounds/cosmos/whirlpool.jpg
+share/applications/screensavers/mate-cosmos-slideshow.desktop
+share/applications/screensavers/mate-footlogo-floaters.desktop
+share/applications/screensavers/mate-personal-slideshow.desktop
+share/applications/screensavers/mate-popsquares.desktop
+share/backgrounds/mate-cosmos/background-1.xml
+share/backgrounds/mate-cosmos/blue-marble-west.jpg
+share/backgrounds/mate-cosmos/cloud.jpg
+share/backgrounds/mate-cosmos/comet.jpg
+share/backgrounds/mate-cosmos/earth-horizon.jpg
+share/backgrounds/mate-cosmos/galaxy-ngc3370.jpg
+share/backgrounds/mate-cosmos/helix-nebula.jpg
+share/backgrounds/mate-cosmos/jupiter.jpg
+share/backgrounds/mate-cosmos/sombrero.jpg
+share/backgrounds/mate-cosmos/whirlpool.jpg
 share/dbus-1/services/org.mate.ScreenSaver.service
 share/desktop-directories/mate-screensaver.directory
 share/examples/mate-screensaver/xdg/autostart/mate-screensaver.desktop
@@ -128,5 +127,4 @@ share/locale/zh_TW/LC_MESSAGES/mate-screensaver.mo
 share/mate-background-properties/cosmos.xml
 share/mate-screensaver/lock-dialog-default.ui
 share/mate-screensaver/mate-screensaver-preferences.ui
-share/pixmaps/gnome-logo-white.svg
 share/pixmaps/mate-logo-white.svg
diff --git a/mate-screensaver/distinfo b/mate-screensaver/distinfo
index d86856e..005e1e7 100644
--- a/mate-screensaver/distinfo
+++ b/mate-screensaver/distinfo
@@ -4,4 +4,5 @@ SHA1 (mate-screensaver-1.14.0.tar.xz) = 72c0eccfb5a25ba03830f710f68f4d164feab7df
 RMD160 (mate-screensaver-1.14.0.tar.xz) = f5d0e0c5d0773f389faae8c4b1688c1d982e35be
 SHA512 (mate-screensaver-1.14.0.tar.xz) = 7a6377a530e0bea56469147a87cf358cf2759beeca75c5fb19781a096b24eec5e286f52bf9b22a09a1f7c6e9b991aee21cedaafe7c7bb9d7edf2b5410e9158f2
 Size (mate-screensaver-1.14.0.tar.xz) = 4910280 bytes
+SHA1 (patch-configure) = 7d59fa943a0410db98456dadcf17ba000f3ba0fc
 SHA1 (patch-src_gs-auth-pam.c) = 7b9ad4af83d21c4d5090cd2fa01ca25468cd7e49
diff --git a/mate-screensaver/patches/patch-configure b/mate-screensaver/patches/patch-configure
new file mode 100644
index 0000000..e36d12e
--- /dev/null
+++ b/mate-screensaver/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD$
+
+avoid conflict with gnome-screensaver
+
+--- configure.orig	2016-04-07 19:45:55.000000000 +0000
++++ configure
+@@ -18343,7 +18343,7 @@ fi
+ 
+ 
+ # Saver engine stuff
+-SLIDESHOW_COSMOS_DIR="${EXPANDED_DATADIR}/backgrounds/cosmos"
++SLIDESHOW_COSMOS_DIR="${EXPANDED_DATADIR}/backgrounds/mate-cosmos"
+ 
+ 
+