3 files changed, 136 insertions, 39 deletions

diff --git a/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile
index 016f6216dd57..9c6b4bcf5564 100644
--- a/x11/libxfce4menu/Makefile
+++ b/x11/libxfce4menu/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libxfce4menu
-PORTVERSION=	4.6.1
-PORTREVISION=	3
+PORTVERSION=	4.6.2
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 DIST_SUBDIR=	xfce4
@@ -19,10 +18,18 @@ USE_AUTOTOOLS=	libtool:22
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	glib20 gnomehack gnometarget gtk20 pkgconfig
+USE_GNOME=	glib20 gnomehack gnometarget gtk20 intltool intlhack pkgconfig
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv libutil
 
+CONFIGURE_ARGS=	--enable-gtk-doc-html=no \
+		--disable-debug
+
+OPTIONS=	GTKDOC	"install the library documentation"	off \
+		NLS	"Enable Native Language Support"	on
+
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_GTKDOC)
 BUILD_DEPENDS+=	gtkdocize:${PORTSDIR}/textproc/gtk-doc
 CONFIGURE_ARGS+=--enable-gtk-doc
@@ -32,4 +39,13 @@ CONFIGURE_ARGS+=--disable-gtk-doc
 PLIST_SUB+=	GTK_DOC="@comment "
 .endif
 
-.include <bsd.port.mk>
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11/libxfce4menu/distinfo b/x11/libxfce4menu/distinfo
index 1ed9d4312586..3748d2b5c6a0 100644
--- a/x11/libxfce4menu/distinfo
+++ b/x11/libxfce4menu/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/libxfce4menu-4.6.1.tar.bz2) = 5dc9343885c2c6f931318b2a1cdcc9db
-SHA256 (xfce4/libxfce4menu-4.6.1.tar.bz2) = 5442b458b0e4f6bbbb6ddfbf1a7789dde1d270ab85686a3be77731a4d5ef84da
-SIZE (xfce4/libxfce4menu-4.6.1.tar.bz2) = 404201
+MD5 (xfce4/libxfce4menu-4.6.2.tar.bz2) = ff10cacb76803ee37159e3a43345f0d1
+SHA256 (xfce4/libxfce4menu-4.6.2.tar.bz2) = 62352be57318d6f241c4f6e4b6f9303d0b80246ea8f6e4753a962360a9965162
+SIZE (xfce4/libxfce4menu-4.6.2.tar.bz2) = 375499
diff --git a/x11/libxfce4menu/pkg-plist b/x11/libxfce4menu/pkg-plist
index f8e640a0503c..248c077de45a 100644
--- a/x11/libxfce4menu/pkg-plist
+++ b/x11/libxfce4menu/pkg-plist
@@ -58,38 +58,119 @@ share/gtk-doc/html/libxfce4menu/rules.html
 share/gtk-doc/html/libxfce4menu/style.css
 share/gtk-doc/html/libxfce4menu/up.png
 share/gtk-doc/html/libxfce4menu/utilities.html
-share/locale/ca/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/cs/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/da/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/de/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/el/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/en_GB/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/es/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/eu/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/fi/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/fr/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/gl/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/hu/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/id/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/it/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/ja/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/ku/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/lv/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/nb/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/pl/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/pt_BR/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/pt/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/ro/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/ru/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/sq/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/sv/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/tr/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/uk/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/ur/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/zh_CN/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/am/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/da/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/de/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/el/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/es/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/id/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/it/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/ku/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/libxfce4menu-0.1.mo
+%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_CN
+%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur_PK
+%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur
+%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/uk
+%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ug
+%%NLS%%@dirrmtry share/locale/tr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/tr
+%%NLS%%@dirrmtry share/locale/sv/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sv
+%%NLS%%@dirrmtry share/locale/sq/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sq
+%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ru
+%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ro
+%%NLS%%@dirrmtry share/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pt_BR
+%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pt
+%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pl
+%%NLS%%@dirrmtry share/locale/pa/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pa
+%%NLS%%@dirrmtry share/locale/nn/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/nn
+%%NLS%%@dirrmtry share/locale/nl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/nl
+%%NLS%%@dirrmtry share/locale/nb/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/nb
+%%NLS%%@dirrmtry share/locale/lv/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/lv
+%%NLS%%@dirrmtry share/locale/ku/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ku
+%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/kk
+%%NLS%%@dirrmtry share/locale/ja/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ja
+%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/it
+%%NLS%%@dirrmtry share/locale/id/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/id
+%%NLS%%@dirrmtry share/locale/hu/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/hu
+%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/gl
+%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fr
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+%%NLS%%@dirrmtry share/locale/eu/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/eu
+%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/es
+%%NLS%%@dirrmtry share/locale/en_GB/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/en_GB
+%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/el
+%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/de
+%%NLS%%@dirrmtry share/locale/da/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/da
+%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/cs
+%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ca
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
+%%NLS%%@dirrmtry share/locale/am/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/am
 @dirrm share/gtk-doc/html/libxfce4menu
 @dirrmtry share/gtk-doc/html
-@dirrmtry share/gtk-doc
 @dirrm include/xfce4/libxfce4menu-0.1/libxfce4menu
-@dirrmtry include/xfce4/libxfce4menu-0.1
-@dirrmtry include/xfce4/libxfce4menu-0.1
+@dirrm include/xfce4/libxfce4menu-0.1
+@dirrmtry include/xfce4