3 files changed, 26 insertions, 17 deletions

diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index bdc99a639fe1..90e6f32b4234 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xfce4-fsguard-plugin
-PORTVERSION=	1.0.0
-PORTREVISION=	3
+PORTVERSION=	1.0.1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -20,17 +19,16 @@ GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gtk20 intltool intlhack pkgconfig
-USE_XFCE=	configenv libgui libutil panel
+USE_GNOME=	gnomehack gtk20 intltool intlhack
+USE_XFCE=	configenv libmenu libutil panel
 USE_XORG=	x11
+USE_PKGCONFIG=	build
 
-CONFIGURE_ARGS=	--disable-debug
+OPTIONS_DEFINE= NLS
 
-OPTIONS=	NLS "Enable Native Language Support" on
+.include <bsd.port.options.mk>
 
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
@@ -39,4 +37,9 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.post.mk>
+post-patch:
+.if empty(PORT_OPTIONS:MNLS)
+	@${REINPLACE_CMD} -e 's|	po||' ${WRKSRC}/Makefile.in
+.endif
+
+.include <bsd.port.mk>
diff --git a/sysutils/xfce4-fsguard-plugin/distinfo b/sysutils/xfce4-fsguard-plugin/distinfo
index 699fecc3f5bd..f75f3cca02cd 100644
--- a/sysutils/xfce4-fsguard-plugin/distinfo
+++ b/sysutils/xfce4-fsguard-plugin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfce4-fsguard-plugin-1.0.0.tar.bz2) = 8659fcb4d8eec58de1dd898d6895ad7f13a717a73a884b1a3723d743088d21cb
-SIZE (xfce4/xfce4-fsguard-plugin-1.0.0.tar.bz2) = 185750
+SHA256 (xfce4/xfce4-fsguard-plugin-1.0.1.tar.bz2) = fffb7ee09769ec0b991b8752b848578e6434a675a939c5588f0728c2ef33aab7
+SIZE (xfce4/xfce4-fsguard-plugin-1.0.1.tar.bz2) = 356783
diff --git a/sysutils/xfce4-fsguard-plugin/pkg-plist b/sysutils/xfce4-fsguard-plugin/pkg-plist
index f660e1f91c33..31acf25ec69a 100644
--- a/sysutils/xfce4-fsguard-plugin/pkg-plist
+++ b/sysutils/xfce4-fsguard-plugin/pkg-plist
@@ -1,4 +1,5 @@
-libexec/xfce4/panel-plugins/xfce4-fsguard-plugin
+lib/xfce4/panel/plugins/libfsguard.la
+lib/xfce4/panel/plugins/libfsguard.so
 share/icons/hicolor/16x16/apps/xfce4-fsguard-plugin-urgent.png
 share/icons/hicolor/16x16/apps/xfce4-fsguard-plugin-warning.png
 share/icons/hicolor/16x16/apps/xfce4-fsguard-plugin.png
@@ -20,6 +21,7 @@ share/icons/hicolor/48x48/apps/xfce4-fsguard-plugin.png
 share/icons/hicolor/scalable/apps/xfce4-fsguard-plugin-urgent.svg
 share/icons/hicolor/scalable/apps/xfce4-fsguard-plugin-warning.svg
 share/icons/hicolor/scalable/apps/xfce4-fsguard-plugin.svg
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-fsguard-plugin.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/xfce4-fsguard-plugin.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/xfce4-fsguard-plugin.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/xfce4-fsguard-plugin.mo
@@ -32,6 +34,7 @@ share/icons/hicolor/scalable/apps/xfce4-fsguard-plugin.svg
 %%NLS%%share/locale/fi/LC_MESSAGES/xfce4-fsguard-plugin.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/xfce4-fsguard-plugin.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/xfce4-fsguard-plugin.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-fsguard-plugin.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/xfce4-fsguard-plugin.mo
 %%NLS%%share/locale/id/LC_MESSAGES/xfce4-fsguard-plugin.mo
 %%NLS%%share/locale/it/LC_MESSAGES/xfce4-fsguard-plugin.mo
@@ -47,6 +50,7 @@ share/icons/hicolor/scalable/apps/xfce4-fsguard-plugin.svg
 %%NLS%%share/locale/pt/LC_MESSAGES/xfce4-fsguard-plugin.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-fsguard-plugin.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/xfce4-fsguard-plugin.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-fsguard-plugin.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/xfce4-fsguard-plugin.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/xfce4-fsguard-plugin.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/xfce4-fsguard-plugin.mo
@@ -57,8 +61,9 @@ share/icons/hicolor/scalable/apps/xfce4-fsguard-plugin.svg
 %%NLS%%share/locale/vi/LC_MESSAGES/xfce4-fsguard-plugin.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-fsguard-plugin.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-fsguard-plugin.mo
-share/xfce4/panel-plugins/fsguard.desktop
-@dirrmtry share/xfce4/panel-plugins
+share/xfce4/panel/plugins/fsguard.desktop
+@dirrmtry share/xfce4/panel/plugins
+@dirrmtry share/xfce4/panel
 @dirrmtry share/xfce4
 %%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ur_PK
@@ -70,5 +75,6 @@ share/xfce4/panel-plugins/fsguard.desktop
 %%NLS%%@dirrmtry share/locale/kk
 %%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ast
-@dirrmtry libexec/xfce4/panel-plugins
-@dirrmtry libexec/xfce4
+@dirrmtry lib/xfce4/panel/plugins
+@dirrmtry lib/xfce4/panel
+@dirrmtry lib/xfce4