3 files changed, 12 insertions, 90 deletions

diff --git a/x11/mate-screensaver/Makefile b/x11/mate-screensaver/Makefile
index ad07d878e5b1..d16578e06f68 100644
--- a/x11/mate-screensaver/Makefile
+++ b/x11/mate-screensaver/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mate-screensaver
-PORTVERSION=	1.8.0
-PORTREVISION=	1
+PORTVERSION=	1.8.1
 CATEGORIES=	x11 mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -21,7 +20,7 @@ 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
-USE_GNOME=	glib20 gnomehier gtk20 intlhack
+USE_GNOME=	glib20 gtk20 intlhack
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xscreensaverdir=${XSCREENSAVER_DIR} \
 		--with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks \
@@ -43,21 +42,16 @@ OPTIONS_DEFINE=	PAM XSCREENSAVER
 OPTIONS_DEFAULT=PAM
 PAM_DESC=	Pluggable Authentication Module support
 
-.include <bsd.port.options.mk>
+XSCREENSAVER_RUN_DEPENDS=	xscreensaver-gnome-hacks>=0:${PORTSDIR}/x11/xscreensaver-gnome-hacks
 
-.if ${PORT_OPTIONS:MXSCREENSAVER}
-RUN_DEPENDS=	xscreensaver-gnome-hacks>=0:${PORTSDIR}/x11/xscreensaver-gnome-hacks
-.endif
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MPAM}
-RUN_DEPENDS+=	pam_helper:${PORTSDIR}/security/pam_helper
-CONFIGURE_ARGS+=--enable-authentication-scheme=helper \
+PAM_RUN_DEPENDS=	pam_helper:${PORTSDIR}/security/pam_helper
+PAM_CONFIGURE_ON=--enable-authentication-scheme=helper \
 		--with-passwd-helper=${LOCALBASE}/bin/pam_helper
-PLIST_SUB+=	PAM=""
-.else
-CONFIGURE_ARGS+=--disable-pam
-PLIST_SUB+=	PAM="@comment "
-.endif
+PAM_CONFIGURE_OFF=--disable-pam
+
+.include <bsd.port.options.mk>
 
 post-patch:
 .if ${PORT_OPTIONS:MPAM}
@@ -65,20 +59,8 @@ post-patch:
 		${WRKSRC}/src/gs-auth-pam.c
 .endif
 
-#pre-install:
-#	@${CAT} ${.CURDIR}/pkg-plist > ${PLIST}
-#	@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}
-
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${SCREENSAVER_DIR}
-#	cd ${STAGEDIR}${PREFIX}/${SCREENSAVER_DIR} && \
-#		${FIND} -s ${XSCREENSAVER_DIR} -maxdepth 1 -type f -name "*.xml" | \
-#			${GREP} -Ev ${XSCREENSAVER_EXCLUDE} | \
-#			${XARGS} ${WRKSRC}/data/migrate-xscreensaver-config.sh
 .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 4452af601feb..dd02d039171b 100644
--- a/x11/mate-screensaver/distinfo
+++ b/x11/mate-screensaver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mate/mate-screensaver-1.8.0.tar.xz) = 93979d0a6203fa0b59eb5477bdd5b78788a1b1adc861c3d0085339b859ec3106
-SIZE (mate/mate-screensaver-1.8.0.tar.xz) = 4869084
+SHA256 (mate/mate-screensaver-1.8.1.tar.xz) = a3dd1fe9e8d05b7815544fa186c43a35271dd8b512d6b0377038df02c28c9d62
+SIZE (mate/mate-screensaver-1.8.1.tar.xz) = 4874424
diff --git a/x11/mate-screensaver/pkg-plist b/x11/mate-screensaver/pkg-plist
index 920755c15549..d71b279617ef 100644
--- a/x11/mate-screensaver/pkg-plist
+++ b/x11/mate-screensaver/pkg-plist
@@ -5,11 +5,7 @@ bin/mate-screensaver-preferences
 etc/xdg/autostart/mate-screensaver.desktop
 etc/xdg/menus/mate-screensavers.menu
 libdata/pkgconfig/mate-screensaver.pc
-@owner root
-@mode 6555
-libexec/mate-screensaver-dialog
-@owner
-@mode
+@(,,6555) libexec/mate-screensaver-dialog
 libexec/mate-screensaver-gl-helper
 libexec/mate-screensaver/floaters
 libexec/mate-screensaver/popsquares
@@ -129,59 +125,3 @@ share/mate-background-properties/cosmos.xml
 %%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
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/ps/LC_MESSAGES
-@dirrmtry share/locale/ps
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/nds/LC_MESSAGES
-@dirrmtry share/locale/nds
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mg/LC_MESSAGES
-@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
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@dirrmtry share/desktop-directories
-@dirrmtry share/backgrounds/cosmos
-@dirrmtry share/backgrounds
-@dirrmtry share/applications/screensavers
-@dirrm libexec/mate-screensaver
-@dirrmtry etc/xdg/menus