Welcome Mate Desktop 1.8

The porting work as been done by gnome@ (kwm) and Eric Turgeon (ericturgeon@ghostbsd.org)

5 files changed, 29 insertions, 32 deletions

diff --git a/x11/mate-screensaver/Makefile b/x11/mate-screensaver/Makefile
index 9c2cdcb5de65..d9cf57b26390 100644
--- a/x11/mate-screensaver/Makefile
+++ b/x11/mate-screensaver/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mate-screensaver
-PORTVERSION=	1.6.1
-PORTREVISION=	1
+PORTVERSION=	1.8.0
 CATEGORIES=	x11 mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -17,7 +16,7 @@ LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		gettext gmake pathfix pkgconfig tar:xz
 USE_GL=		gl
 USE_MATE=	desktop libmatekbd menus
 USE_XORG=	ice sm x11 xext xtst xxf86misc xxf86vm xscrnsaver
@@ -32,19 +31,16 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 GLIB_SCHEMAS=	org.mate.screensaver.gschema.xml
 
-#PLIST=		${WRKDIR}/pkg-plist
 SUB_FILES+=	mate-screensaver.pam
 
-XSCREENSAVER_DIR=	${PREFIX}/share/xscreensaver/config
+XSCREENSAVER_DIR=	${LOCALBASE}/share/xscreensaver/config
 SCREENSAVER_DIR=	share/applications/screensavers
 
 XSCREENSAVER_EXCLUDE=	"(popsquares.xml)"
 
-OPTIONS_DEFINE=	PAM KEYRING HACKS
-OPTIONS_DEFAULT=PAM KEYRING
+OPTIONS_DEFINE=	PAM XSCREENSAVER
+OPTIONS_DEFAULT=PAM
 PAM_DESC=	Pluggable Authentication Module support
-KEYRING_DESC=	MateKeyring integration (needs PAM)
-HACKS_DESC=	Install extra gnome xscreensavers
 
 .include <bsd.port.options.mk>
 
@@ -62,42 +58,26 @@ CONFIGURE_ARGS+=--disable-pam
 PLIST_SUB+=	PAM="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MKEYRING} && ${PORT_OPTIONS:MPAM}
-SUB_LIST+=	PAM_KEYRING=
-USE_MATE+=	keyring:run
-.else
-SUB_LIST+=	PAM_KEYRING=\#
-.endif
-
-pre-everything::
-.if !${PORT_OPTIONS:MPAM} && ${PORT_OPTIONS:MKEYRING}
-	@${ECHO_MSG} "Keyring integration is disabled because it needs PAM."
-.endif
-
 post-patch:
 .if ${PORT_OPTIONS:MPAM}
 	@${REINPLACE_CMD} -e 's|/etc/pam.d|${PREFIX}/etc/pam.d|g' \
 		${WRKSRC}/src/gs-auth-pam.c
 .endif
 
-#.if defined (HACKS)
 #pre-install:
 #	@${CAT} ${.CURDIR}/pkg-plist > ${PLIST}
-#	@cd ${STAGEDIR}${XSCREENSAVER_DIR} && ${FIND} -s * -maxdepth 1 -type f -name "*.xml" | \
+#	@cd ${XSCREENSAVER_DIR} && ${FIND} -s * -maxdepth 1 -type f -name "*.xml" | \
 #		${GREP} -Ev ${XSCREENSAVER_EXCLUDE} | \
 #		${SED} -e 's:^:${SCREENSAVER_DIR}/:' | \
 #		${SED} -e 's:[.]xml$$:.desktop:' >> ${PLIST}
 #	@${ECHO_CMD} @dirrm ${SCREENSAVER_DIR} >> ${PLIST}
-#.endif
 
 post-install:
-#.if defined(HACKS)
-#	${MKDIR} ${STAGEDIR}${PREFIX}/${SCREENSAVER_DIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${SCREENSAVER_DIR}
 #	cd ${STAGEDIR}${PREFIX}/${SCREENSAVER_DIR} && \
-#		${FIND} -s ${STAGEDIR}${XSCREENSAVER_DIR} -maxdepth 1 -type f -name "*.xml" | \
+#		${FIND} -s ${XSCREENSAVER_DIR} -maxdepth 1 -type f -name "*.xml" | \
 #			${GREP} -Ev ${XSCREENSAVER_EXCLUDE} | \
 #			${XARGS} ${WRKSRC}/data/migrate-xscreensaver-config.sh
-#.endif
 .if ${PORT_OPTIONS:MPAM}
 	${INSTALL_DATA} ${WRKDIR}/mate-screensaver.pam ${STAGEDIR}${PREFIX}/etc/pam.d/mate-screensaver
 .endif
diff --git a/x11/mate-screensaver/distinfo b/x11/mate-screensaver/distinfo
index 6589f69b998b..4452af601feb 100644
--- a/x11/mate-screensaver/distinfo
+++ b/x11/mate-screensaver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mate/mate-screensaver-1.6.1.tar.xz) = b04801e68d013c899cdfefceed25e28040c21197a2da40cd650be52ac643843c
-SIZE (mate/mate-screensaver-1.6.1.tar.xz) = 4974032
+SHA256 (mate/mate-screensaver-1.8.0.tar.xz) = 93979d0a6203fa0b59eb5477bdd5b78788a1b1adc861c3d0085339b859ec3106
+SIZE (mate/mate-screensaver-1.8.0.tar.xz) = 4869084
diff --git a/x11/mate-screensaver/files/mate-screensaver.pam.in b/x11/mate-screensaver/files/mate-screensaver.pam.in
index d689fe96489a..a7b414a82f69 100644
--- a/x11/mate-screensaver/files/mate-screensaver.pam.in
+++ b/x11/mate-screensaver/files/mate-screensaver.pam.in
@@ -1,3 +1,3 @@
 auth		include		system
-%%PAM_KEYRING%%auth		optional	%%LOCALBASE%%/lib/pam_mate_keyring.so
+#%%PAM_KEYRING%%auth		optional	%%LOCALBASE%%/lib/pam_mate_keyring.so
 account		include		system
diff --git a/x11/mate-screensaver/pkg-descr b/x11/mate-screensaver/pkg-descr
index 85e6a6e17dfa..1fa5faf16407 100644
--- a/x11/mate-screensaver/pkg-descr
+++ b/x11/mate-screensaver/pkg-descr
@@ -6,4 +6,4 @@ It is designed to support:
         * translation into other languages
         * user switching
 
-http://mate-desktop.org/
+WWW: http://mate-desktop.org/
diff --git a/x11/mate-screensaver/pkg-plist b/x11/mate-screensaver/pkg-plist
index fdb8fa3cbc22..920755c15549 100644
--- a/x11/mate-screensaver/pkg-plist
+++ b/x11/mate-screensaver/pkg-plist
@@ -21,6 +21,7 @@ share/MateConf/gsettings/org.mate.screensaver.gschema.migrate
 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
@@ -48,6 +49,7 @@ share/locale/br/LC_MESSAGES/mate-screensaver.mo
 share/locale/ca/LC_MESSAGES/mate-screensaver.mo
 share/locale/ca@valencia/LC_MESSAGES/mate-screensaver.mo
 share/locale/crh/LC_MESSAGES/mate-screensaver.mo
+share/locale/cmn/LC_MESSAGES/mate-screensaver.mo
 share/locale/cs/LC_MESSAGES/mate-screensaver.mo
 share/locale/cy/LC_MESSAGES/mate-screensaver.mo
 share/locale/da/LC_MESSAGES/mate-screensaver.mo
@@ -59,6 +61,7 @@ share/locale/en_AU/LC_MESSAGES/mate-screensaver.mo
 share/locale/en_CA/LC_MESSAGES/mate-screensaver.mo
 share/locale/en_GB/LC_MESSAGES/mate-screensaver.mo
 share/locale/es/LC_MESSAGES/mate-screensaver.mo
+share/locale/es_AR/LC_MESSAGES/mate-screensaver.mo
 share/locale/et/LC_MESSAGES/mate-screensaver.mo
 share/locale/eu/LC_MESSAGES/mate-screensaver.mo
 share/locale/fa/LC_MESSAGES/mate-screensaver.mo
@@ -76,9 +79,11 @@ share/locale/is/LC_MESSAGES/mate-screensaver.mo
 share/locale/it/LC_MESSAGES/mate-screensaver.mo
 share/locale/ja/LC_MESSAGES/mate-screensaver.mo
 share/locale/ka/LC_MESSAGES/mate-screensaver.mo
+share/locale/kk/LC_MESSAGES/mate-screensaver.mo
 share/locale/kn/LC_MESSAGES/mate-screensaver.mo
 share/locale/ko/LC_MESSAGES/mate-screensaver.mo
 share/locale/ku/LC_MESSAGES/mate-screensaver.mo
+share/locale/ky/LC_MESSAGES/mate-screensaver.mo
 share/locale/lt/LC_MESSAGES/mate-screensaver.mo
 share/locale/lv/LC_MESSAGES/mate-screensaver.mo
 share/locale/mai/LC_MESSAGES/mate-screensaver.mo
@@ -114,6 +119,7 @@ share/locale/te/LC_MESSAGES/mate-screensaver.mo
 share/locale/th/LC_MESSAGES/mate-screensaver.mo
 share/locale/tr/LC_MESSAGES/mate-screensaver.mo
 share/locale/uk/LC_MESSAGES/mate-screensaver.mo
+share/locale/ur/LC_MESSAGES/mate-screensaver.mo
 share/locale/vi/LC_MESSAGES/mate-screensaver.mo
 share/locale/zh_CN/LC_MESSAGES/mate-screensaver.mo
 share/locale/zh_HK/LC_MESSAGES/mate-screensaver.mo
@@ -121,11 +127,14 @@ share/locale/zh_TW/LC_MESSAGES/mate-screensaver.mo
 share/mate-background-properties/cosmos.xml
 %%DATADIR%%/lock-dialog-default.ui
 %%DATADIR%%/mate-screensaver-preferences.ui
+share/pixmaps/gnome-logo-white.svg
 share/pixmaps/mate-logo-white.svg
 @dirrm %%DATADIR%%
 @dirrmtry share/mate-background-properties
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/ur/LC_MESSAGES
+@dirrmtry share/locale/ur
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -144,14 +153,22 @@ share/pixmaps/mate-logo-white.svg
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/mai/LC_MESSAGES
 @dirrmtry share/locale/mai
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/es_AR/LC_MESSAGES
+@dirrmtry share/locale/es_AR
 @dirrmtry share/locale/en@shaw/LC_MESSAGES
 @dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/crh/LC_MESSAGES
 @dirrmtry share/locale/crh
+@dirrmtry share/locale/cmn/LC_MESSAGES
+@dirrmtry share/locale/cmn
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
 @dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES