3 files changed, 27 insertions, 20 deletions

diff --git a/x11/mate-screensaver/Makefile b/x11/mate-screensaver/Makefile
index c42c98202388..e8fb6c6d1f82 100644
--- a/x11/mate-screensaver/Makefile
+++ b/x11/mate-screensaver/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mate-screensaver
-PORTVERSION=	1.12.0
-PORTREVISION=	2
+PORTVERSION=	1.18.1
 CATEGORIES=	x11 mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -11,25 +10,28 @@ DIST_SUBDIR=	mate
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	MATE screen saver and locker
 
+LICENSE=	GPLv2 LGPL20
+LICENSE_COMB=	dual
+LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
+LICENSE_FILE_LGPL20=	${WRKSRC}/COPYING.LIB
+
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
-		libnotify.so:devel/libnotify
+		libnotify.so:devel/libnotify \
+		libstartup-notification-1.so:x11/startup-notification
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake pathfix pkgconfig tar:xz
+USES=		gettext gmake localbase pathfix pkgconfig tar:xz
 USE_GL=		gl
 USE_MATE=	desktop libmatekbd menus session:run
-USE_XORG=	ice sm x11 xext xtst xxf86misc xxf86vm xscrnsaver
-USE_GNOME=	glib20 gtk20 intlhack
+USE_XORG=	ice sm x11 xext xscrnsaver xxf86misc xxf86vm
+USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xscreensaverdir=${XSCREENSAVER_DIR} \
 		--with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks \
-		--with-gtk=2.0 \
 		--with-console-kit=yes \
 		--with-systemd=no
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 
 GLIB_SCHEMAS=	org.mate.screensaver.gschema.xml
 
@@ -49,9 +51,9 @@ XSCREENSAVER_RUN_DEPENDS=	xscreensaver-gnome-hacks>=0:x11/xscreensaver-gnome-hac
 OPTIONS_SUB=	yes
 
 PAM_RUN_DEPENDS=	pam_helper:security/pam_helper
-PAM_CONFIGURE_ON=--enable-authentication-scheme=helper \
-		--with-passwd-helper=${LOCALBASE}/bin/pam_helper
-PAM_CONFIGURE_OFF=--disable-pam
+PAM_CONFIGURE_ON=	--enable-authentication-scheme=helper \
+			--with-passwd-helper=${LOCALBASE}/bin/pam_helper
+PAM_CONFIGURE_OFF=	--disable-pam
 
 .include <bsd.port.options.mk>
 
diff --git a/x11/mate-screensaver/distinfo b/x11/mate-screensaver/distinfo
index 2718106c65b0..e9808e2f9f7f 100644
--- a/x11/mate-screensaver/distinfo
+++ b/x11/mate-screensaver/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mate/mate-screensaver-1.12.0.tar.xz) = 198cb5159bd6321c90e0069115909be52eb4382de25cb9c4ba33fa29e3fdc693
-SIZE (mate/mate-screensaver-1.12.0.tar.xz) = 4868924
+TIMESTAMP = 1497537052
+SHA256 (mate/mate-screensaver-1.18.1.tar.xz) = 32bd34ac058e4a9206da5eeea07902f8f9321e76961f766aded605a71c08d135
+SIZE (mate/mate-screensaver-1.18.1.tar.xz) = 4923504
diff --git a/x11/mate-screensaver/pkg-plist b/x11/mate-screensaver/pkg-plist
index d71b279617ef..aee7941bdbb9 100644
--- a/x11/mate-screensaver/pkg-plist
+++ b/x11/mate-screensaver/pkg-plist
@@ -1,11 +1,11 @@
 bin/mate-screensaver
 bin/mate-screensaver-command
 bin/mate-screensaver-preferences
-%%PAM%%etc/pam.d/mate-screensaver
+etc/pam.d/mate-screensaver
 etc/xdg/autostart/mate-screensaver.desktop
 etc/xdg/menus/mate-screensavers.menu
 libdata/pkgconfig/mate-screensaver.pc
-@(,,6555) libexec/mate-screensaver-dialog
+libexec/mate-screensaver-dialog
 libexec/mate-screensaver-gl-helper
 libexec/mate-screensaver/floaters
 libexec/mate-screensaver/popsquares
@@ -13,7 +13,6 @@ libexec/mate-screensaver/slideshow
 man/man1/mate-screensaver-command.1.gz
 man/man1/mate-screensaver-preferences.1.gz
 man/man1/mate-screensaver.1.gz
-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
@@ -37,32 +36,34 @@ share/locale/ar/LC_MESSAGES/mate-screensaver.mo
 share/locale/as/LC_MESSAGES/mate-screensaver.mo
 share/locale/ast/LC_MESSAGES/mate-screensaver.mo
 share/locale/be/LC_MESSAGES/mate-screensaver.mo
-share/locale/be@latin/LC_MESSAGES/mate-screensaver.mo
 share/locale/bg/LC_MESSAGES/mate-screensaver.mo
 share/locale/bn/LC_MESSAGES/mate-screensaver.mo
 share/locale/bn_IN/LC_MESSAGES/mate-screensaver.mo
 share/locale/br/LC_MESSAGES/mate-screensaver.mo
+share/locale/bs/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/crh/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
 share/locale/de/LC_MESSAGES/mate-screensaver.mo
 share/locale/dz/LC_MESSAGES/mate-screensaver.mo
 share/locale/el/LC_MESSAGES/mate-screensaver.mo
-share/locale/en@shaw/LC_MESSAGES/mate-screensaver.mo
 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/es_CO/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
 share/locale/fi/LC_MESSAGES/mate-screensaver.mo
 share/locale/fr/LC_MESSAGES/mate-screensaver.mo
+share/locale/fr_CA/LC_MESSAGES/mate-screensaver.mo
+share/locale/frp/LC_MESSAGES/mate-screensaver.mo
 share/locale/ga/LC_MESSAGES/mate-screensaver.mo
 share/locale/gl/LC_MESSAGES/mate-screensaver.mo
 share/locale/gu/LC_MESSAGES/mate-screensaver.mo
@@ -70,6 +71,7 @@ share/locale/he/LC_MESSAGES/mate-screensaver.mo
 share/locale/hi/LC_MESSAGES/mate-screensaver.mo
 share/locale/hr/LC_MESSAGES/mate-screensaver.mo
 share/locale/hu/LC_MESSAGES/mate-screensaver.mo
+share/locale/hy/LC_MESSAGES/mate-screensaver.mo
 share/locale/id/LC_MESSAGES/mate-screensaver.mo
 share/locale/is/LC_MESSAGES/mate-screensaver.mo
 share/locale/it/LC_MESSAGES/mate-screensaver.mo
@@ -79,6 +81,7 @@ 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/ku_IQ/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
@@ -116,6 +119,7 @@ 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/uz/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