aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authoroliver <oliver@FreeBSD.org>2010-05-31 23:27:35 +0800
committeroliver <oliver@FreeBSD.org>2010-05-31 23:27:35 +0800
commit24496af8b65acc7278268f6e650cc174b21f8acd (patch)
treef0281bb6bd790e942149098a833796bedae5a973 /x11
parent1f23a76669f757c5049b533ab7419d6950a4ed58 (diff)
downloadfreebsd-ports-gnome-24496af8b65acc7278268f6e650cc174b21f8acd.tar.gz
freebsd-ports-gnome-24496af8b65acc7278268f6e650cc174b21f8acd.tar.zst
freebsd-ports-gnome-24496af8b65acc7278268f6e650cc174b21f8acd.zip
update xfce to 4.6.2
bump PORTREVISION on all depending ports
Diffstat (limited to 'x11')
-rw-r--r--x11/Terminal/Makefile36
-rw-r--r--x11/Terminal/distinfo6
-rw-r--r--x11/Terminal/files/extra-patch-doc-Makefile.in181
-rw-r--r--x11/Terminal/pkg-plist316
-rw-r--r--x11/avant-window-navigator/Makefile2
-rw-r--r--x11/libexo/Makefile29
-rw-r--r--x11/libexo/distinfo6
-rw-r--r--x11/libexo/files/patch-Makefile.in25
-rw-r--r--x11/libexo/pkg-plist465
-rw-r--r--x11/libxfce4menu/Makefile24
-rw-r--r--x11/libxfce4menu/distinfo6
-rw-r--r--x11/libxfce4menu/pkg-plist145
-rw-r--r--x11/libxfce4util/Makefile25
-rw-r--r--x11/libxfce4util/distinfo6
-rw-r--r--x11/libxfce4util/pkg-plist180
-rw-r--r--x11/xfce4-clipman-plugin/Makefile2
-rw-r--r--x11/xfce4-conf/Makefile24
-rw-r--r--x11/xfce4-conf/distinfo6
-rw-r--r--x11/xfce4-conf/pkg-plist123
-rw-r--r--x11/xfce4-quicklauncher-plugin/Makefile2
-rw-r--r--x11/xfce4-screenshooter-plugin/Makefile2
-rw-r--r--x11/xfce4-taskmanager/Makefile2
-rw-r--r--x11/xfce4-verve-plugin/Makefile2
-rw-r--r--x11/xfce4-wmdock-plugin/Makefile2
-rw-r--r--x11/xfce4-xfapplet-plugin/Makefile2
25 files changed, 1115 insertions, 504 deletions
diff --git a/x11/Terminal/Makefile b/x11/Terminal/Makefile
index bf309c9a363e..e3abab229bed 100644
--- a/x11/Terminal/Makefile
+++ b/x11/Terminal/Makefile
@@ -6,49 +6,53 @@
#
PORTNAME= Terminal
-PORTVERSION= 0.4.3
-PORTREVISION= 3
+PORTVERSION= 0.4.5
CATEGORIES= x11 xfce
-MASTER_SITES= http://www.xfce.org/archive/src/apps/terminal/0.4/
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR= src/apps/${PORTNAME:L}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= Terminal emulator for the X windowing system
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
USE_GMAKE= yes
-USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig vte
+USE_GNOME= gnometarget gtk20 glib20 intltool intlhack pkgconfig vte
USE_XFCE= configenv libexo
+USE_XORG= x11
OPTIONS= DBUS "Enable D-BUS support" on \
- STARTUP "Enable startup notification support" on
+ NLS "Enable Native Language Support" on
MAN1= Terminal.1
+MANLANG= "" ca da es fr gl id it ja pt ru ug zh_CN
.include <bsd.port.pre.mk>
+.if defined(NOPORTDOCS)
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-doc-Makefile.in
+.endif
+
.if !defined(WITHOUT_DBUS)
LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
CONFIGURE_ARGS+=--enable-dbus
-PLIST_SUB+= WITH_DBUS=""
.else
CONFIGURE_ARGS+=--disable-dbus
-PLIST_SUB+= WITH_DBUS="@comment "
.endif
-.if !defined(WITHOUT_STARTUP)
-LIB_DEPENDS+= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-CONFIGURE_ARGS+=--enable-startup-notification
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+CONFIGURE_ARGS+=--enable-nls
+PLIST_SUB+= NLS=""
.else
-CONFIGURE_ARGS+=--disable-startup-notification
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+= NLS="@comment "
.endif
-post-patch:
-.if defined(NOPORTDOCS)
- @${REINPLACE_CMD} -e 's| doc[ ]*||' ${WRKSRC}/Makefile.in
-.endif
+post-install:
+ @-update-desktop-database
.include <bsd.port.post.mk>
diff --git a/x11/Terminal/distinfo b/x11/Terminal/distinfo
index 8f3f175d1a75..c294b0f03b0e 100644
--- a/x11/Terminal/distinfo
+++ b/x11/Terminal/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/Terminal-0.4.3.tar.bz2) = 0ce66b16bcb7ff274d7f93a69993f717
-SHA256 (xfce4/Terminal-0.4.3.tar.bz2) = 270da3e726a782750d392e9d21edc7af2935d1bd08daa254de8b3665115aafbf
-SIZE (xfce4/Terminal-0.4.3.tar.bz2) = 1402717
+MD5 (xfce4/Terminal-0.4.5.tar.bz2) = 3c707628e2e97c6d9566cd74d400036a
+SHA256 (xfce4/Terminal-0.4.5.tar.bz2) = 92fddcbc1422076672d8ec61832793d4ceea2fc0db7d724a6acde0ec2bac8893
+SIZE (xfce4/Terminal-0.4.5.tar.bz2) = 1564662
diff --git a/x11/Terminal/files/extra-patch-doc-Makefile.in b/x11/Terminal/files/extra-patch-doc-Makefile.in
new file mode 100644
index 000000000000..46ba66fbdc8c
--- /dev/null
+++ b/x11/Terminal/files/extra-patch-doc-Makefile.in
@@ -0,0 +1,181 @@
+--- doc/Makefile.in.orig 2010-05-21 22:10:01.000000000 +0200
++++ doc/Makefile.in 2010-05-24 18:36:50.000000000 +0200
+@@ -53,9 +53,9 @@
+ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
++ info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+- install-html-recursive install-info-recursive \
++ install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+@@ -291,7 +291,6 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = \
+- images \
+ po
+
+ HTML_STYLESHEET = $(PACKAGE)-html.xsl
+@@ -359,18 +358,6 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-install-cssDATA: $(css_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(cssdir)" || $(MKDIR_P) "$(DESTDIR)$(cssdir)"
+- @list='$(css_DATA)'; test -n "$(cssdir)" || list=; \
+- for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- echo "$$d$$p"; \
+- done | $(am__base_list) | \
+- while read files; do \
+- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(cssdir)'"; \
+- $(INSTALL_DATA) $$files "$(DESTDIR)$(cssdir)" || exit $$?; \
+- done
+
+ uninstall-cssDATA:
+ @$(NORMAL_UNINSTALL)
+@@ -581,9 +568,6 @@
+ all-am: Makefile $(DATA)
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(cssdir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+- done
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -622,15 +606,11 @@
+
+ dvi-am:
+
+-html: html-recursive
+-
+-html-am:
+-
+ info: info-recursive
+
+ info-am:
+
+-install-data-am: install-cssDATA install-data-local
++install-data-am: install-data-local
+
+ install-dvi: install-dvi-recursive
+
+@@ -638,10 +618,6 @@
+
+ install-exec-am:
+
+-install-html: install-html-recursive
+-
+-install-html-am:
+-
+ install-info: install-info-recursive
+
+ install-info-am:
+@@ -683,10 +659,10 @@
+ all all-am check check-am clean clean-generic clean-libtool \
+ clean-local ctags ctags-recursive dist-hook distclean \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+- dvi-am html html-am info info-am install install-am \
+- install-cssDATA install-data install-data-am \
++ dvi-am info info-am install install-am \
++ install-data install-data-am \
+ install-data-local install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
++ install-exec-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+@@ -698,19 +674,6 @@
+ # install the html files to the destdir
+ install-data-local:
+ for lang in $(ALL_LINGUAS); do \
+- if test -d $(srcdir)/html/$$lang; then \
+- dest=$(DESTDIR)$(docdir)/$$lang; \
+- $(mkinstalldirs) $$dest; \
+- installfiles=`echo $(srcdir)/html/$$lang/*`; \
+- for file in $$installfiles; do \
+- echo "--- Installing "$$file; \
+- $(INSTALL_DATA) $$file $$dest/; \
+- done; \
+- if test x"$$lang" != x"C" -a ! -d $(srcdir)/images/$$lang; then \
+- echo "--- Creating symlink to C images for $$lang"; \
+- ln -sf $(docdir)/C/images $$dest/images; \
+- fi \
+- fi; \
+ file=$(srcdir)/man/$$lang/$(PACKAGE_NAME).1; \
+ if test -f $$file ; then \
+ if test x"$$lang" = x"C"; then \
+@@ -728,13 +691,6 @@
+ uninstall-local:
+ for lang in $(ALL_LINGUAS); do \
+ dest=$(DESTDIR)$(docdir)/$$lang; \
+- if test -d $$dest; then \
+- if test -L $$dest/images; then \
+- rm -rf $$dest; \
+- else \
+- rm -f $$dest/*.html; \
+- fi \
+- fi; \
+ if test x"$$lang" = x"C"; then \
+ dest=$(DESTDIR)$(mandir)/man1/$(PACKAGE).1; \
+ else \
+@@ -748,7 +704,7 @@
+
+ # remove generate html from the srcdir
+ clean-local:
+- rm -rf $(srcdir)/html $(srcdir)/man
++ rm -rf $(srcdir)/man
+
+ # regenerate po(t) files
+ @GENERATE_DOCUMENTATION_TRUE@update-po:
+@@ -760,9 +716,9 @@
+ @GENERATE_DOCUMENTATION_TRUE@ done
+
+ # build the translated help files
+-@GENERATE_DOCUMENTATION_TRUE@doc-build.stamp: $(srcdir)/$(DOCUMENT) $(srcdir)/$(MANPAGE) $(srcdir)/$(HTML_STYLESHEET) $(srcdir)/$(MAN_STYLESHEET)
++@GENERATE_DOCUMENTATION_TRUE@doc-build.stamp: $(srcdir)/$(DOCUMENT) $(srcdir)/$(MANPAGE) $(srcdir)/$(MAN_STYLESHEET)
+ @GENERATE_DOCUMENTATION_TRUE@ @chmod -R u+w $(srcdir); \
+-@GENERATE_DOCUMENTATION_TRUE@ rm -rf $(srcdir)/html $(srcdir)/man; \
++@GENERATE_DOCUMENTATION_TRUE@ rm -rf $(srcdir)/man; \
+ @GENERATE_DOCUMENTATION_TRUE@ echo; \
+ @GENERATE_DOCUMENTATION_TRUE@ echo "*** Generating full XML file ***"; \
+ @GENERATE_DOCUMENTATION_TRUE@ echo "Creating Terminal-options.xml"; \
+@@ -788,11 +744,9 @@
+ @GENERATE_DOCUMENTATION_TRUE@ -i xgen-doc xgen-man; \
+ @GENERATE_DOCUMENTATION_TRUE@ echo "Validating DocBook XML files"; \
+ @GENERATE_DOCUMENTATION_TRUE@ $(XMLLINT) --noout --valid xgen-doc xgen-man; \
+-@GENERATE_DOCUMENTATION_TRUE@ echo "Creating the HTML pages"; \
+-@GENERATE_DOCUMENTATION_TRUE@ $(XSLTPROC) --nonet -o $(srcdir)/html/$$lang/ $(srcdir)/$(HTML_STYLESHEET) xgen-doc; \
+ @GENERATE_DOCUMENTATION_TRUE@ echo "Creating the MAN page"; \
+ @GENERATE_DOCUMENTATION_TRUE@ $(XSLTPROC) --nonet -o $(srcdir)/man/$$lang/$(PACKAGE_NAME).1 $(srcdir)/$(MAN_STYLESHEET) xgen-man; \
+-@GENERATE_DOCUMENTATION_TRUE@ chmod -R u+w $(srcdir)/html/$$lang $(srcdir)/man/$$lang; \
++@GENERATE_DOCUMENTATION_TRUE@ chmod -R u+w $(srcdir)/man/$$lang; \
+ @GENERATE_DOCUMENTATION_TRUE@ rm -f xgen-doc xgen-man; \
+ @GENERATE_DOCUMENTATION_TRUE@ echo; \
+ @GENERATE_DOCUMENTATION_TRUE@ done; \
+@@ -806,7 +760,7 @@
+ @GENERATE_DOCUMENTATION_FALSE@ @false
+
+ @GENERATE_DOCUMENTATION_FALSE@doc-build.stamp:
+-@GENERATE_DOCUMENTATION_FALSE@ @if test ! -d $(srcdir)/html -a ! -d $(srcdir)/man; then \
++@GENERATE_DOCUMENTATION_FALSE@ @if test ! -d $(srcdir)/man; then \
+ @GENERATE_DOCUMENTATION_FALSE@ echo; \
+ @GENERATE_DOCUMENTATION_FALSE@ echo "*** No generated documentation found. If you want to"; \
+ @GENERATE_DOCUMENTATION_FALSE@ echo "*** generate the (translated) documentation, run configure"; \
+@@ -825,10 +779,6 @@
+ # include the html and man files in the dist
+ dist-hook: dist-check-doc doc-build.stamp
+ for lang in $(ALL_LINGUAS); do \
+- if test -d $(srcdir)/html/$$lang; then \
+- mkdir -p $(distdir)/html/$$lang; \
+- cp $(srcdir)/html/$$lang/* $(distdir)/html/$$lang/; \
+- fi; \
+ if test -d $(srcdir)/man/$$lang; then \
+ mkdir -p $(distdir)/man/$$lang; \
+ cp $(srcdir)/man/$$lang/* $(distdir)/man/$$lang/; \
diff --git a/x11/Terminal/pkg-plist b/x11/Terminal/pkg-plist
index 082a29e54be3..3ae8989b90e3 100644
--- a/x11/Terminal/pkg-plist
+++ b/x11/Terminal/pkg-plist
@@ -1,11 +1,10 @@
bin/Terminal
bin/terminal
-libexec/TerminalHelp
share/Terminal/Terminal-toolbars.ui
share/Terminal/Terminal.glade
-share/applications/Terminal.desktop
-share/gnome-control-center/default-apps/Terminal-default-apps.xml
+%%NLS%%share/applications/Terminal.desktop
%%PORTDOCS%%%%DOCSDIR%%/C/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/C/command-line.html
%%PORTDOCS%%%%DOCSDIR%%/C/copyright.html
%%PORTDOCS%%%%DOCSDIR%%/C/faq.html
%%PORTDOCS%%%%DOCSDIR%%/C/getting-started.html
@@ -25,6 +24,7 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
%%PORTDOCS%%%%DOCSDIR%%/C/support.html
%%PORTDOCS%%%%DOCSDIR%%/C/usage.html
%%PORTDOCS%%%%DOCSDIR%%/ca/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/ca/command-line.html
%%PORTDOCS%%%%DOCSDIR%%/ca/copyright.html
%%PORTDOCS%%%%DOCSDIR%%/ca/faq.html
%%PORTDOCS%%%%DOCSDIR%%/ca/getting-started.html
@@ -34,6 +34,7 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
%%PORTDOCS%%%%DOCSDIR%%/ca/support.html
%%PORTDOCS%%%%DOCSDIR%%/ca/usage.html
%%PORTDOCS%%%%DOCSDIR%%/da/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/da/command-line.html
%%PORTDOCS%%%%DOCSDIR%%/da/copyright.html
%%PORTDOCS%%%%DOCSDIR%%/da/faq.html
%%PORTDOCS%%%%DOCSDIR%%/da/getting-started.html
@@ -42,7 +43,18 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
%%PORTDOCS%%%%DOCSDIR%%/da/preferences.html
%%PORTDOCS%%%%DOCSDIR%%/da/support.html
%%PORTDOCS%%%%DOCSDIR%%/da/usage.html
+%%PORTDOCS%%%%DOCSDIR%%/es/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/es/command-line.html
+%%PORTDOCS%%%%DOCSDIR%%/es/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/es/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/es/getting-started.html
+%%PORTDOCS%%%%DOCSDIR%%/es/images
+%%PORTDOCS%%%%DOCSDIR%%/es/index.html
+%%PORTDOCS%%%%DOCSDIR%%/es/preferences.html
+%%PORTDOCS%%%%DOCSDIR%%/es/support.html
+%%PORTDOCS%%%%DOCSDIR%%/es/usage.html
%%PORTDOCS%%%%DOCSDIR%%/fr/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/fr/command-line.html
%%PORTDOCS%%%%DOCSDIR%%/fr/copyright.html
%%PORTDOCS%%%%DOCSDIR%%/fr/faq.html
%%PORTDOCS%%%%DOCSDIR%%/fr/getting-started.html
@@ -52,6 +64,7 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
%%PORTDOCS%%%%DOCSDIR%%/fr/support.html
%%PORTDOCS%%%%DOCSDIR%%/fr/usage.html
%%PORTDOCS%%%%DOCSDIR%%/gl/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/gl/command-line.html
%%PORTDOCS%%%%DOCSDIR%%/gl/copyright.html
%%PORTDOCS%%%%DOCSDIR%%/gl/faq.html
%%PORTDOCS%%%%DOCSDIR%%/gl/getting-started.html
@@ -60,7 +73,18 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
%%PORTDOCS%%%%DOCSDIR%%/gl/preferences.html
%%PORTDOCS%%%%DOCSDIR%%/gl/support.html
%%PORTDOCS%%%%DOCSDIR%%/gl/usage.html
+%%PORTDOCS%%%%DOCSDIR%%/hr/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/hr/command-line.html
+%%PORTDOCS%%%%DOCSDIR%%/hr/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/hr/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/hr/getting-started.html
+%%PORTDOCS%%%%DOCSDIR%%/hr/images
+%%PORTDOCS%%%%DOCSDIR%%/hr/index.html
+%%PORTDOCS%%%%DOCSDIR%%/hr/preferences.html
+%%PORTDOCS%%%%DOCSDIR%%/hr/support.html
+%%PORTDOCS%%%%DOCSDIR%%/hr/usage.html
%%PORTDOCS%%%%DOCSDIR%%/id/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/id/command-line.html
%%PORTDOCS%%%%DOCSDIR%%/id/copyright.html
%%PORTDOCS%%%%DOCSDIR%%/id/faq.html
%%PORTDOCS%%%%DOCSDIR%%/id/getting-started.html
@@ -70,6 +94,7 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
%%PORTDOCS%%%%DOCSDIR%%/id/support.html
%%PORTDOCS%%%%DOCSDIR%%/id/usage.html
%%PORTDOCS%%%%DOCSDIR%%/it/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/it/command-line.html
%%PORTDOCS%%%%DOCSDIR%%/it/copyright.html
%%PORTDOCS%%%%DOCSDIR%%/it/faq.html
%%PORTDOCS%%%%DOCSDIR%%/it/getting-started.html
@@ -79,6 +104,7 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
%%PORTDOCS%%%%DOCSDIR%%/it/support.html
%%PORTDOCS%%%%DOCSDIR%%/it/usage.html
%%PORTDOCS%%%%DOCSDIR%%/ja/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/command-line.html
%%PORTDOCS%%%%DOCSDIR%%/ja/copyright.html
%%PORTDOCS%%%%DOCSDIR%%/ja/faq.html
%%PORTDOCS%%%%DOCSDIR%%/ja/getting-started.html
@@ -97,8 +123,39 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
%%PORTDOCS%%%%DOCSDIR%%/ja/preferences.html
%%PORTDOCS%%%%DOCSDIR%%/ja/support.html
%%PORTDOCS%%%%DOCSDIR%%/ja/usage.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/command-line.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/getting-started.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/images
+%%PORTDOCS%%%%DOCSDIR%%/pt/index.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/preferences.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/support.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/usage.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/command-line.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/getting-started.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/images
+%%PORTDOCS%%%%DOCSDIR%%/ru/index.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/preferences.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/support.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/usage.html
%%PORTDOCS%%%%DOCSDIR%%/terminal.css
+%%PORTDOCS%%%%DOCSDIR%%/ug/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/ug/command-line.html
+%%PORTDOCS%%%%DOCSDIR%%/ug/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/ug/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/ug/getting-started.html
+%%PORTDOCS%%%%DOCSDIR%%/ug/images
+%%PORTDOCS%%%%DOCSDIR%%/ug/index.html
+%%PORTDOCS%%%%DOCSDIR%%/ug/preferences.html
+%%PORTDOCS%%%%DOCSDIR%%/ug/support.html
+%%PORTDOCS%%%%DOCSDIR%%/ug/usage.html
%%PORTDOCS%%%%DOCSDIR%%/zh_CN/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/zh_CN/command-line.html
%%PORTDOCS%%%%DOCSDIR%%/zh_CN/copyright.html
%%PORTDOCS%%%%DOCSDIR%%/zh_CN/faq.html
%%PORTDOCS%%%%DOCSDIR%%/zh_CN/getting-started.html
@@ -107,6 +164,7 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
%%PORTDOCS%%%%DOCSDIR%%/zh_CN/preferences.html
%%PORTDOCS%%%%DOCSDIR%%/zh_CN/support.html
%%PORTDOCS%%%%DOCSDIR%%/zh_CN/usage.html
+share/gnome-control-center/default-apps/Terminal-default-apps.xml
share/icons/hicolor/16x16/stock/navigation/stock_terminal-closetab.png
share/icons/hicolor/16x16/stock/navigation/stock_terminal-newtab.png
share/icons/hicolor/16x16/stock/navigation/stock_terminal-newwindow.png
@@ -117,93 +175,187 @@ share/icons/hicolor/24x24/stock/navigation/stock_terminal-newwindow.png
share/icons/hicolor/24x24/stock/navigation/stock_terminal-reportbug.png
share/icons/hicolor/24x24/stock/navigation/stock_terminal-showborders.png
share/icons/hicolor/24x24/stock/navigation/stock_terminal-showmenu.png
-share/icons/hicolor/48x48/stock/navigation/stock_terminal-compose.png
share/icons/hicolor/48x48/apps/Terminal.png
+share/icons/hicolor/48x48/stock/navigation/stock_terminal-compose.png
share/icons/hicolor/scalable/apps/Terminal.svg
-share/locale/ar/LC_MESSAGES/Terminal.mo
-share/locale/ast/LC_MESSAGES/Terminal.mo
-share/locale/be/LC_MESSAGES/Terminal.mo
-share/locale/ca/LC_MESSAGES/Terminal.mo
-share/locale/cs/LC_MESSAGES/Terminal.mo
-share/locale/da/LC_MESSAGES/Terminal.mo
-share/locale/de/LC_MESSAGES/Terminal.mo
-share/locale/dz/LC_MESSAGES/Terminal.mo
-share/locale/el/LC_MESSAGES/Terminal.mo
-share/locale/en_GB/LC_MESSAGES/Terminal.mo
-share/locale/eo/LC_MESSAGES/Terminal.mo
-share/locale/et/LC_MESSAGES/Terminal.mo
-share/locale/es/LC_MESSAGES/Terminal.mo
-share/locale/eu/LC_MESSAGES/Terminal.mo
-share/locale/fi/LC_MESSAGES/Terminal.mo
-share/locale/fr/LC_MESSAGES/Terminal.mo
-share/locale/gl/LC_MESSAGES/Terminal.mo
-share/locale/he/LC_MESSAGES/Terminal.mo
-share/locale/hu/LC_MESSAGES/Terminal.mo
-share/locale/id/LC_MESSAGES/Terminal.mo
-share/locale/it/LC_MESSAGES/Terminal.mo
-share/locale/ja/LC_MESSAGES/Terminal.mo
-share/locale/kk/LC_MESSAGES/Terminal.mo
-share/locale/ko/LC_MESSAGES/Terminal.mo
-share/locale/ku/LC_MESSAGES/Terminal.mo
-share/locale/lt/LC_MESSAGES/Terminal.mo
-share/locale/lv/LC_MESSAGES/Terminal.mo
-share/locale/nb/LC_MESSAGES/Terminal.mo
-share/locale/nl/LC_MESSAGES/Terminal.mo
-share/locale/pa/LC_MESSAGES/Terminal.mo
-share/locale/pl/LC_MESSAGES/Terminal.mo
-share/locale/pt_BR/LC_MESSAGES/Terminal.mo
-share/locale/pt/LC_MESSAGES/Terminal.mo
-share/locale/ro/LC_MESSAGES/Terminal.mo
-share/locale/ru/LC_MESSAGES/Terminal.mo
-share/locale/sk/LC_MESSAGES/Terminal.mo
-share/locale/sq/LC_MESSAGES/Terminal.mo
-share/locale/sv/LC_MESSAGES/Terminal.mo
-share/locale/tr/LC_MESSAGES/Terminal.mo
-share/locale/uk/LC_MESSAGES/Terminal.mo
-share/locale/ur/LC_MESSAGES/Terminal.mo
-share/locale/ur_PK/LC_MESSAGES/Terminal.mo
-share/locale/vi/LC_MESSAGES/Terminal.mo
-share/locale/zh_CN/LC_MESSAGES/Terminal.mo
-share/locale/zh_TW/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/be/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/da/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/de/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/dz/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/el/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/es/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/et/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/he/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/id/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/it/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ku/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/si/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/Terminal.mo
share/pixmaps/terminal.xpm
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_TW
+%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_CN
+%%NLS%%@dirrmtry share/locale/vi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/vi
+%%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/sk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sk
+%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/si
+%%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/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/lt/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/lt
+%%NLS%%@dirrmtry share/locale/ku/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ku
+%%NLS%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ko
+%%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/hr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/hr
+%%NLS%%@dirrmtry share/locale/he/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/he
+%%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/et/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/et
+%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/es
+%%NLS%%@dirrmtry share/locale/eo/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/eo
+%%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/dz/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/dz
+%%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/be/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/be
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
+%%NLS%%@dirrmtry share/locale/ar/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ar
+@dirrmtry man/zh_CN/man1
+@dirrmtry man/zh_CN
+@dirrmtry share/icons/hicolor/scalable/apps
@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor/24x24/stock/navigation
-@dirrmtry share/icons/hicolor/24x24/stock
-@dirrmtry share/icons/hicolor/24x24
@dirrmtry share/icons/hicolor/48x48/stock/navigation
@dirrmtry share/icons/hicolor/48x48/stock
+@dirrmtry share/icons/hicolor/48x48/apps
@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor
-@dirrmtry icons
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/C/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/C
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/da
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/ca
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/fr
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/gl
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/id
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/it
+@dirrmtry share/icons/hicolor/24x24/stock/navigation
+@dirrmtry share/icons/hicolor/24x24/stock
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/16x16/stock/navigation
+@dirrmtry share/icons/hicolor/16x16/stock
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/gnome-control-center/default-apps
+@dirrmtry share/gnome-control-center
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/zh_CN
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ug
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ru
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pt
%%PORTDOCS%%@dirrm %%DOCSDIR%%/ja/images
%%PORTDOCS%%@dirrm %%DOCSDIR%%/ja
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/zh_CN
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/it
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/id
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/hr
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/gl
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/fr
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/es
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/da
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ca
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/C/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/C
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/applications
@dirrm share/Terminal
-@dirrmtry share/gnome-control-center/default-apps
-@dirrmtry share/icons/hicolor/16x16/stock/navigation
-@dirrmtry share/icons/hicolor/16x16/stock
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor/48x48/stock/navigation
-@dirrmtry share/icons/hicolor/48x48/stock
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/ur/LC_MESSAGES
-@dirrmtry share/locale/ur
-@dirrmtry share/locale/ur_PK/LC_MESSAGES
-@dirrmtry share/locale/ur_PK
diff --git a/x11/avant-window-navigator/Makefile b/x11/avant-window-navigator/Makefile
index e343bc6efaee..c802b67b2b83 100644
--- a/x11/avant-window-navigator/Makefile
+++ b/x11/avant-window-navigator/Makefile
@@ -7,7 +7,7 @@
PORTNAME= avant-window-navigator
PORTVERSION= 0.3.2.1
-PORTREVISION?= 5
+PORTREVISION?= 6
CATEGORIES= x11
MASTER_SITES= http://launchpadlibrarian.net/26374006/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index e9d4643187c9..1f407c9dc40a 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -6,11 +6,10 @@
# $MCom: ports/x11/libexo/Makefile,v 1.1 2006/10/02 21:05:55 ahze Exp $
PORTNAME= libexo
-PORTVERSION= 0.3.106
-PORTREVISION= 3
+PORTVERSION= 0.3.107
CATEGORIES= x11 xfce
DISTNAME= exo-${PORTVERSION}
-MASTER_SITES= http://www.xfce.org/archive/src/xfce/exo/0.3/
+MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
@@ -24,16 +23,22 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= glib20 gnomehack gnometarget gtk20 intltool intlhack pkgconfig
USE_LDCONFIG= yes
USE_PERL5= yes
USE_XFCE= configenv libutil
+CONFIGURE_ARGS= --enable-gtk-doc-html=no \
+ --enable-gtk-doc=no \
+ --disable-debug
+
+PLIST_SUB= VERSION="${PORTVERSION:R}"
+
OPTIONS= HAL "Enable HAL support" on \
NOTIFY "Enable notification support" on \
PYTHON "Enable Python support" off \
+ NLS "Enable Native Language Support" on
MAN1= exo-csource.1 exo-open.1
@@ -56,10 +61,9 @@ PLIST_SUB+= NOTIFY="@comment "
.endif
.if defined(WITH_PYTHON)
-CONFIGURE_ARGS+=--enable-python
USE_PYTHON= yes
+CONFIGURE_ARGS+=--enable-python
.include "${PORTSDIR}/Mk/bsd.python.mk"
-BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2
PLIST_SUB+= PYTHON=""
.else
@@ -67,4 +71,17 @@ CONFIGURE_ARGS+=--disable-python
PLIST_SUB+= PYTHON="@comment "
.endif
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+CONFIGURE_ARGS+=--enable-nls
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+post-install:
+ ${FIND} ${WRKSRC}/docs/reference -type f -regex '.*\.1' \
+ -exec ${INSTALL_MAN} "{}" "${MANPREFIX}/man/man1" \;
+
.include <bsd.port.post.mk>
diff --git a/x11/libexo/distinfo b/x11/libexo/distinfo
index b86770d58ad5..eb8b4fd744ba 100644
--- a/x11/libexo/distinfo
+++ b/x11/libexo/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/exo-0.3.106.tar.bz2) = 927905f89252fa397e50d7a4fbf3c9a7
-SHA256 (xfce4/exo-0.3.106.tar.bz2) = 0b9b8625eb27896402d2a4f219dfb92ac9a1fe1f3e7367709f87fc866f1c02d9
-SIZE (xfce4/exo-0.3.106.tar.bz2) = 1732898
+MD5 (xfce4/exo-0.3.107.tar.bz2) = 3a92cca0c99ee940db4410891c9e8498
+SHA256 (xfce4/exo-0.3.107.tar.bz2) = 0a12ac124bad67c8de7135f7052641239ed640884a71612930f99c425bede2a3
+SIZE (xfce4/exo-0.3.107.tar.bz2) = 1889276
diff --git a/x11/libexo/files/patch-Makefile.in b/x11/libexo/files/patch-Makefile.in
new file mode 100644
index 000000000000..d72c5d05222c
--- /dev/null
+++ b/x11/libexo/files/patch-Makefile.in
@@ -0,0 +1,25 @@
+--- Makefile.in.orig 2010-05-21 18:51:18.000000000 +0200
++++ Makefile.in 2010-05-23 19:55:57.000000000 +0200
+@@ -71,8 +71,8 @@
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = exo exo-csource exo-support exo-desktop-item-edit \
+- exo-hal exo-helper exo-mount exo-mount-notify exo-open docs \
+- icons pixmaps po po-doc python tests
++ exo-hal exo-helper exo-mount exo-mount-notify exo-open \
++ icons pixmaps po python tests
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+@@ -320,11 +320,9 @@
+ exo-mount \
+ $(EXO_MOUNT_NOTIFY_SUBDIR) \
+ exo-open \
+- docs \
+ icons \
+ pixmaps \
+ po \
+- po-doc \
+ $(PYTHON_SUBDIR) \
+ tests
+
diff --git a/x11/libexo/pkg-plist b/x11/libexo/pkg-plist
index 70d2279bcfd6..e6854cd90707 100644
--- a/x11/libexo/pkg-plist
+++ b/x11/libexo/pkg-plist
@@ -7,211 +7,109 @@ bin/exo-preferred-applications
bin/exo-unmount
etc/xdg/xfce4/helpers.rc
etc/xdg/xfce4/mount.rc
-include/exo-0.3/exo/exo-binding.h
-include/exo-0.3/exo/exo-cell-renderer-ellipsized-text.h
-include/exo-0.3/exo/exo-cell-renderer-icon.h
-include/exo-0.3/exo/exo-config.h
-include/exo-0.3/exo/exo-ellipsized-label.h
-include/exo-0.3/exo/exo-enum-types.h
-include/exo-0.3/exo/exo-execute.h
-include/exo-0.3/exo/exo-gdk-pixbuf-extensions.h
-include/exo-0.3/exo/exo-gobject-extensions.h
-include/exo-0.3/exo/exo-gtk-extensions.h
-include/exo-0.3/exo/exo-icon-bar.h
-include/exo-0.3/exo/exo-icon-chooser-dialog.h
-include/exo-0.3/exo/exo-icon-view.h
-include/exo-0.3/exo/exo-md5.h
-include/exo-0.3/exo/exo-mount-point.h
-include/exo-0.3/exo/exo-pango-extensions.h
-include/exo-0.3/exo/exo-string.h
-include/exo-0.3/exo/exo-toolbars-editor-dialog.h
-include/exo-0.3/exo/exo-toolbars-editor.h
-include/exo-0.3/exo/exo-toolbars-model.h
-include/exo-0.3/exo/exo-toolbars-view.h
-include/exo-0.3/exo/exo-tree-view.h
-include/exo-0.3/exo/exo-url.h
-include/exo-0.3/exo/exo-utils.h
-include/exo-0.3/exo/exo-wrap-table.h
-include/exo-0.3/exo/exo-xsession-client.h
-include/exo-0.3/exo/exo.h
-include/exo-0.3/exo-hal/exo-hal.h
-lib/libexo-0.3.a
-lib/libexo-0.3.la
-lib/libexo-0.3.so
-lib/libexo-0.3.so.5
-lib/libexo-hal-0.3.a
-lib/libexo-hal-0.3.la
-lib/libexo-hal-0.3.so
-lib/libexo-hal-0.3.so.5
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-0.3/_exo.a
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-0.3/_exo.la
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-0.3/_exo.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-0.3/exo/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-0.3/exo/__init__.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-0.3/exo/__init__.pyo
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyexo.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyexo.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyexo.pyo
-libdata/pkgconfig/exo-0.3.pc
-libdata/pkgconfig/exo-hal-0.3.pc
-libexec/exo-compose-mail-0.3
-libexec/exo-helper-0.3
-%%NOTIFY%%libexec/exo-mount-notify-0.3
-share/applications/exo-preferred-applications.desktop
-share/gtk-doc/html/exo-0.3/ExoCellRendererEllipsizedText.html
-share/gtk-doc/html/exo-0.3/ExoCellRendererIcon.html
-share/gtk-doc/html/exo-0.3/ExoEllipsizedLabel.html
-share/gtk-doc/html/exo-0.3/ExoIconBar.html
-share/gtk-doc/html/exo-0.3/ExoIconChooserDialog.html
-share/gtk-doc/html/exo-0.3/ExoIconView.html
-share/gtk-doc/html/exo-0.3/ExoToolbarsEditor.html
-share/gtk-doc/html/exo-0.3/ExoToolbarsEditorDialog.html
-share/gtk-doc/html/exo-0.3/ExoToolbarsModel.html
-share/gtk-doc/html/exo-0.3/ExoToolbarsView.html
-share/gtk-doc/html/exo-0.3/ExoTreeView.html
-share/gtk-doc/html/exo-0.3/ExoWrapTable.html
-share/gtk-doc/html/exo-0.3/ExoXsessionClient.html
-share/gtk-doc/html/exo-0.3/ch01.html
-share/gtk-doc/html/exo-0.3/exo-Binding-Properties-Functions.html
-share/gtk-doc/html/exo-0.3/exo-Executing-Applications.html
-share/gtk-doc/html/exo-0.3/exo-Extensions-to-GObject.html
-share/gtk-doc/html/exo-0.3/exo-Extensions-to-Gtk.html
-share/gtk-doc/html/exo-0.3/exo-Extensions-to-Pango.html
-share/gtk-doc/html/exo-0.3/exo-Extensions-to-gdk-pixbuf.html
-share/gtk-doc/html/exo-0.3/exo-HAL-Support-Functions.html
-share/gtk-doc/html/exo-0.3/exo-MD5-functions.html
-share/gtk-doc/html/exo-0.3/exo-Miscellaneous-Utility-Functions.html
-share/gtk-doc/html/exo-0.3/exo-Mount-Points.html
-share/gtk-doc/html/exo-0.3/exo-Opening-URLs.html
-share/gtk-doc/html/exo-0.3/exo-String-Utility-Functions.html
-share/gtk-doc/html/exo-0.3/exo-Version-Information.html
-share/gtk-doc/html/exo-0.3/exo-cell-renderers.html
-share/gtk-doc/html/exo-0.3/exo-csource.html
-share/gtk-doc/html/exo-0.3/exo-deprecated-widgets.html
-share/gtk-doc/html/exo-0.3/exo-extensions.html
-share/gtk-doc/html/exo-0.3/exo-gtk-file-chooser-add-thumbnail-preview.png
-share/gtk-doc/html/exo-0.3/exo-icon-chooser-dialog.png
-share/gtk-doc/html/exo-0.3/exo-miscelleanous.html
-share/gtk-doc/html/exo-0.3/exo-overview.html
-share/gtk-doc/html/exo-0.3/exo-toolbars-editor-dialog.png
-share/gtk-doc/html/exo-0.3/exo-toolbars-editor.png
-share/gtk-doc/html/exo-0.3/exo-toolbars-view.png
-share/gtk-doc/html/exo-0.3/exo-toolbars.html
-share/gtk-doc/html/exo-0.3/exo-tools.html
-share/gtk-doc/html/exo-0.3/exo-widgets.html
-share/gtk-doc/html/exo-0.3/exo-wrap-table.png
-share/gtk-doc/html/exo-0.3/exo-0.3.devhelp
-share/gtk-doc/html/exo-0.3/exo-0.3.devhelp2
-share/gtk-doc/html/exo-0.3/home.png
-share/gtk-doc/html/exo-0.3/index.html
-share/gtk-doc/html/exo-0.3/index.sgml
-share/gtk-doc/html/exo-0.3/ix01.html
-share/gtk-doc/html/exo-0.3/left.png
-share/gtk-doc/html/exo-0.3/right.png
-share/gtk-doc/html/exo-0.3/style.css
-share/gtk-doc/html/exo-0.3/up.png
+include/exo-%%VERSION%%/exo-hal/exo-hal.h
+include/exo-%%VERSION%%/exo/exo-binding.h
+include/exo-%%VERSION%%/exo/exo-cell-renderer-ellipsized-text.h
+include/exo-%%VERSION%%/exo/exo-cell-renderer-icon.h
+include/exo-%%VERSION%%/exo/exo-config.h
+include/exo-%%VERSION%%/exo/exo-ellipsized-label.h
+include/exo-%%VERSION%%/exo/exo-enum-types.h
+include/exo-%%VERSION%%/exo/exo-execute.h
+include/exo-%%VERSION%%/exo/exo-gdk-pixbuf-extensions.h
+include/exo-%%VERSION%%/exo/exo-gobject-extensions.h
+include/exo-%%VERSION%%/exo/exo-gtk-extensions.h
+include/exo-%%VERSION%%/exo/exo-icon-bar.h
+include/exo-%%VERSION%%/exo/exo-icon-chooser-dialog.h
+include/exo-%%VERSION%%/exo/exo-icon-view.h
+include/exo-%%VERSION%%/exo/exo-md5.h
+include/exo-%%VERSION%%/exo/exo-mount-point.h
+include/exo-%%VERSION%%/exo/exo-pango-extensions.h
+include/exo-%%VERSION%%/exo/exo-string.h
+include/exo-%%VERSION%%/exo/exo-toolbars-editor-dialog.h
+include/exo-%%VERSION%%/exo/exo-toolbars-editor.h
+include/exo-%%VERSION%%/exo/exo-toolbars-model.h
+include/exo-%%VERSION%%/exo/exo-toolbars-view.h
+include/exo-%%VERSION%%/exo/exo-tree-view.h
+include/exo-%%VERSION%%/exo/exo-url.h
+include/exo-%%VERSION%%/exo/exo-utils.h
+include/exo-%%VERSION%%/exo/exo-wrap-table.h
+include/exo-%%VERSION%%/exo/exo-xsession-client.h
+include/exo-%%VERSION%%/exo/exo.h
+lib/libexo-%%VERSION%%.a
+lib/libexo-%%VERSION%%.la
+lib/libexo-%%VERSION%%.so
+lib/libexo-%%VERSION%%.so.5
+lib/libexo-hal-%%VERSION%%.a
+lib/libexo-hal-%%VERSION%%.la
+lib/libexo-hal-%%VERSION%%.so
+lib/libexo-hal-%%VERSION%%.so.5
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-%%VERSION%%/_exo.a
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-%%VERSION%%/_exo.la
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-%%VERSION%%/_exo.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-%%VERSION%%/exo/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-%%VERSION%%/exo/__init__.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-%%VERSION%%/exo/__init__.pyo
+libdata/pkgconfig/exo-%%VERSION%%.pc
+libdata/pkgconfig/exo-hal-%%VERSION%%.pc
+libexec/exo-compose-mail-%%VERSION%%
+libexec/exo-helper-%%VERSION%%
+%%NOTIFY%%libexec/exo-mount-notify-%%VERSION%%
+%%NLS%%share/applications/exo-preferred-applications.desktop
share/icons/hicolor/24x24/apps/preferences-desktop-default-applications.png
share/icons/hicolor/48x48/apps/applications-internet.png
share/icons/hicolor/48x48/apps/applications-other.png
share/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
-share/locale/ar/LC_MESSAGES/libexo-0.3.mo
-share/locale/ast/LC_MESSAGES/libexo-0.3.mo
-share/locale/be/LC_MESSAGES/libexo-0.3.mo
-share/locale/ca/LC_MESSAGES/libexo-0.3.mo
-share/locale/cy/LC_MESSAGES/libexo-0.3.mo
-share/locale/cs/LC_MESSAGES/libexo-0.3.mo
-share/locale/da/LC_MESSAGES/libexo-0.3.mo
-share/locale/de/LC_MESSAGES/libexo-0.3.mo
-share/locale/dz/LC_MESSAGES/libexo-0.3.mo
-share/locale/el/LC_MESSAGES/libexo-0.3.mo
-share/locale/en_GB/LC_MESSAGES/libexo-0.3.mo
-share/locale/es/LC_MESSAGES/libexo-0.3.mo
-share/locale/et/LC_MESSAGES/libexo-0.3.mo
-share/locale/eu/LC_MESSAGES/libexo-0.3.mo
-share/locale/fi/LC_MESSAGES/libexo-0.3.mo
-share/locale/fr/LC_MESSAGES/libexo-0.3.mo
-share/locale/gl/LC_MESSAGES/libexo-0.3.mo
-share/locale/he/LC_MESSAGES/libexo-0.3.mo
-share/locale/hu/LC_MESSAGES/libexo-0.3.mo
-share/locale/id/LC_MESSAGES/libexo-0.3.mo
-share/locale/it/LC_MESSAGES/libexo-0.3.mo
-share/locale/ja/LC_MESSAGES/libexo-0.3.mo
-share/locale/ka/LC_MESSAGES/libexo-0.3.mo
-share/locale/kk/LC_MESSAGES/libexo-0.3.mo
-share/locale/ku/LC_MESSAGES/libexo-0.3.mo
-share/locale/lt/LC_MESSAGES/libexo-0.3.mo
-share/locale/lv/LC_MESSAGES/libexo-0.3.mo
-share/locale/mk/LC_MESSAGES/libexo-0.3.mo
-share/locale/nb/LC_MESSAGES/libexo-0.3.mo
-share/locale/nl/LC_MESSAGES/libexo-0.3.mo
-share/locale/nn/LC_MESSAGES/libexo-0.3.mo
-share/locale/pa/LC_MESSAGES/libexo-0.3.mo
-share/locale/pl/LC_MESSAGES/libexo-0.3.mo
-share/locale/pt_BR/LC_MESSAGES/libexo-0.3.mo
-share/locale/pt/LC_MESSAGES/libexo-0.3.mo
-share/locale/ro/LC_MESSAGES/libexo-0.3.mo
-share/locale/ru/LC_MESSAGES/libexo-0.3.mo
-share/locale/sk/LC_MESSAGES/libexo-0.3.mo
-share/locale/sq/LC_MESSAGES/libexo-0.3.mo
-share/locale/sv/LC_MESSAGES/libexo-0.3.mo
-share/locale/tr/LC_MESSAGES/libexo-0.3.mo
-share/locale/uk/LC_MESSAGES/libexo-0.3.mo
-share/locale/ur/LC_MESSAGES/libexo-0.3.mo
-share/locale/ur_PK/LC_MESSAGES/libexo-0.3.mo
-share/locale/zh_CN/LC_MESSAGES/libexo-0.3.mo
-share/locale/zh_TW/LC_MESSAGES/libexo-0.3.mo
-share/pixmaps/exo-0.3/exo-thumbnail-frame.png
-%%PYTHON%%share/pygtk/2.0/defs/exo-0.3/exo.defs
-share/xfce4/doc/C/exo-preferred-applications.html
-share/xfce4/doc/C/images/exo-preferred-applications-internet.png
-share/xfce4/doc/C/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/C/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/C/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/da/exo-preferred-applications.html
-share/xfce4/doc/da/images/exo-preferred-applications-internet.png
-share/xfce4/doc/da/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/da/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/da/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/fr/exo-preferred-applications.html
-share/xfce4/doc/fr/images/exo-preferred-applications-internet.png
-share/xfce4/doc/fr/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/fr/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/fr/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/es/images/exo-preferred-applications-internet.png
-share/xfce4/doc/es/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/es/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/es/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/es/exo-preferred-applications.html
-share/xfce4/doc/gl/exo-preferred-applications.html
-share/xfce4/doc/gl/images/exo-preferred-applications-internet.png
-share/xfce4/doc/gl/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/gl/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/gl/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/id/images/exo-preferred-applications-internet.png
-share/xfce4/doc/id/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/id/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/id/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/id/exo-preferred-applications.html
-share/xfce4/doc/it/images/exo-preferred-applications-internet.png
-share/xfce4/doc/it/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/it/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/it/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/it/exo-preferred-applications.html
-share/xfce4/doc/ja/exo-preferred-applications.html
-share/xfce4/doc/ja/images/exo-preferred-applications-internet.png
-share/xfce4/doc/ja/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/ja/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/ja/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/pt_BR/images/exo-preferred-applications-internet.png
-share/xfce4/doc/pt_BR/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/pt_BR/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/pt_BR/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/pt_BR/exo-preferred-applications.html
-share/xfce4/doc/tr/images/exo-preferred-applications-internet.png
-share/xfce4/doc/tr/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/tr/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/tr/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/tr/exo-preferred-applications.html
+%%NLS%%share/locale/am/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/be/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/bn/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/cy/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/da/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/dz/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/et/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/id/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/ku/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/mk/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/libexo-%%VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/libexo-%%VERSION%%.mo
+share/pixmaps/exo-%%VERSION%%/exo-thumbnail-frame.png
+%%PYTHON%%share/pygtk/2.0/defs/exo-%%VERSION%%/exo.defs
share/xfce4/helpers/Terminal.desktop
share/xfce4/helpers/aterm.desktop
share/xfce4/helpers/balsa.desktop
@@ -242,59 +140,118 @@ share/xfce4/helpers/thunderbird.desktop
share/xfce4/helpers/urxvt.desktop
share/xfce4/helpers/w3m.desktop
share/xfce4/helpers/xterm.desktop
-@dirrmtry etc/xdg/xfce4
-@dirrmtry etc/xdg
-@dirrmtry share/gtk-doc/html
-@dirrm include/exo-0.3/exo
-@dirrm include/exo-0.3/exo-hal
-@dirrm include/exo-0.3
-@dirrmtry lib/xfce4
-@dirrm share/gtk-doc/html/exo-0.3
-@dirrmtry share/gtk-doc/html
-@dirrmtry share/gtk-doc
-@dirrmtry share/applications
-@dirrmtry share/icons/hicolor/24x24/apps
-@dirrmtry share/icons/hicolor/24x24
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/exo-0.3/exo
-%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/exo-0.3
-%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%
-%%PYTHON%%@dirrm share/pygtk/2.0/defs/exo-0.3
+@dirrmtry share/xfce4/helpers
+@dirrmtry share/xfce4
+@dirrm share/pixmaps/exo-%%VERSION%%
+%%PYTHON%%@dirrm share/pygtk/2.0/defs/exo-%%VERSION%%
%%PYTHON%%@dirrmtry share/pygtk/2.0/defs
%%PYTHON%%@dirrmtry share/pygtk/2.0
%%PYTHON%%@dirrmtry share/pygtk
-@dirrm share/pixmaps/exo-0.3
-@dirrmtry share/xfce4/doc/C/images
-@dirrmtry share/xfce4/doc/C
-@dirrmtry share/xfce4/doc/da/images
-@dirrmtry share/xfce4/doc/da
-@dirrmtry share/xfce4/doc/es/images
-@dirrmtry share/xfce4/doc/es
-@dirrmtry share/xfce4/doc/fr/images
-@dirrmtry share/xfce4/doc/fr
-@dirrmtry share/xfce4/doc/gl/images
-@dirrmtry share/xfce4/doc/gl
-@dirrmtry share/xfce4/doc/id/images
-@dirrmtry share/xfce4/doc/id
-@dirrmtry share/xfce4/doc/it/images
-@dirrmtry share/xfce4/doc/it
-@dirrmtry share/xfce4/doc/ja/images
-@dirrmtry share/xfce4/doc/ja
-@dirrmtry share/xfce4/doc/pt_BR/images
-@dirrmtry share/xfce4/doc/pt_BR
-@dirrmtry share/xfce4/doc/tr/images
-@dirrmtry share/xfce4/doc/tr
-@dirrmtry share/xfce4/doc
-@dirrmtry share/xfce4/helpers
-@dirrmtry share/xfce4
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/ur_PK/LC_MESSAGES
-@dirrmtry share/locale/ur_PK
+%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_TW
+%%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/sk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sk
+%%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/mk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/mk
+%%NLS%%@dirrmtry share/locale/lv/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/lv
+%%NLS%%@dirrmtry share/locale/lt/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/lt
+%%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/ka/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ka
+%%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/he/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/he
+%%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/et/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/et
+%%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/dz/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/dz
+%%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/cy/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/cy
+%%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/bn/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/bn
+%%NLS%%@dirrmtry share/locale/be/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/be
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
+%%NLS%%@dirrmtry share/locale/ar/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ar
+%%NLS%%@dirrmtry share/locale/am/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/am
+%%NLS%%@dirrmtry share/applications
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/24x24/apps
+@dirrmtry share/icons/hicolor/24x24
+@dirrm include/exo-%%VERSION%%/exo-hal
+@dirrm include/exo-%%VERSION%%/exo
+@dirrm include/exo-%%VERSION%%
+@dirrmtry etc/xdg/xfce4
+@dirrmtry etc/xdg
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
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index ea5deb62693c..07f6b2a5a18a 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libxfce4util
-PORTVERSION= 4.6.1
+PORTVERSION= 4.6.2
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
@@ -18,17 +18,24 @@ USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GNOME= glib20 gnomehack gnometarget pkgconfig
+USE_GNOME= glib20 gnomehack intltool intlhack pkgconfig
USE_LDCONFIG= yes
USE_XFCE= configenv
-.if defined(WITH_GTKDOC)
-BUILD_DEPENDS+= gtkdocize:${PORTSDIR}/textproc/gtk-doc
-CONFIGURE_ARGS+=--enable-gtk-doc
-PLIST_SUB+= GTK_DOC=""
+CONFIGURE_ARGS= --enable-gtk-doc-html=no \
+ --disable-debug
+
+OPTIONS= NLS "Enable Native Language Support" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+CONFIGURE_ARGS+=--enable-nls
+PLIST_SUB+= NLS=""
.else
-CONFIGURE_ARGS+=--disable-gtk-doc
-PLIST_SUB+= GTK_DOC="@comment "
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+= NLS="@comment "
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo
index a89c0aad103a..3f5ee46d10d3 100644
--- a/x11/libxfce4util/distinfo
+++ b/x11/libxfce4util/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/libxfce4util-4.6.1.tar.bz2) = eac51d58179cbcadc3f802450a8ec9cd
-SHA256 (xfce4/libxfce4util-4.6.1.tar.bz2) = ceecdc7d3c89f547606c2d77a8a42ccf9975c809374fab84ff0833a08510c16b
-SIZE (xfce4/libxfce4util-4.6.1.tar.bz2) = 405327
+MD5 (xfce4/libxfce4util-4.6.2.tar.bz2) = 9c3129d827d480f0906c575e7a13f1e9
+SHA256 (xfce4/libxfce4util-4.6.2.tar.bz2) = ae2e7ed1000bb0b3589643a39a65e6ab64c9ee198045e7b272604986f2e18c83
+SIZE (xfce4/libxfce4util-4.6.2.tar.bz2) = 400115
diff --git a/x11/libxfce4util/pkg-plist b/x11/libxfce4util/pkg-plist
index a41a29b29bf5..9e01fddf05d3 100644
--- a/x11/libxfce4util/pkg-plist
+++ b/x11/libxfce4util/pkg-plist
@@ -1,8 +1,8 @@
include/xfce4/libxfce4util/debug.h
include/xfce4/libxfce4util/i18n.h
-include/xfce4/libxfce4util/libxfce4util.h
include/xfce4/libxfce4util/libxfce4util-config.h
include/xfce4/libxfce4util/libxfce4util-enum-types.h
+include/xfce4/libxfce4util/libxfce4util.h
include/xfce4/libxfce4util/utf8.h
include/xfce4/libxfce4util/util.h
include/xfce4/libxfce4util/xfce-desktopentry.h
@@ -33,8 +33,8 @@ share/gtk-doc/html/libxfce4util/libxfce4util-Miscellaneous-Utilities.html
share/gtk-doc/html/libxfce4util/libxfce4util-POSIX-Signal-Handling.html
share/gtk-doc/html/libxfce4util/libxfce4util-Resource-Config-File-Support.html
share/gtk-doc/html/libxfce4util/libxfce4util-Resource-lookup-functions.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Unicode-Support-Functions.html
share/gtk-doc/html/libxfce4util/libxfce4util-Software-Licenses.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Unicode-Support-Functions.html
share/gtk-doc/html/libxfce4util/libxfce4util-Version-Information.html
share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Generics.html
share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Kiosk-functions.html
@@ -48,48 +48,140 @@ share/gtk-doc/html/libxfce4util/reference.html
share/gtk-doc/html/libxfce4util/right.png
share/gtk-doc/html/libxfce4util/style.css
share/gtk-doc/html/libxfce4util/up.png
-share/locale/am/LC_MESSAGES/libxfce4util.mo
-share/locale/ar/LC_MESSAGES/libxfce4util.mo
-share/locale/ca/LC_MESSAGES/libxfce4util.mo
-share/locale/cs/LC_MESSAGES/libxfce4util.mo
-share/locale/cy/LC_MESSAGES/libxfce4util.mo
-share/locale/da/LC_MESSAGES/libxfce4util.mo
-share/locale/de/LC_MESSAGES/libxfce4util.mo
-share/locale/dz/LC_MESSAGES/libxfce4util.mo
-share/locale/en_GB/LC_MESSAGES/libxfce4util.mo
-share/locale/es/LC_MESSAGES/libxfce4util.mo
-share/locale/et/LC_MESSAGES/libxfce4util.mo
-share/locale/eu/LC_MESSAGES/libxfce4util.mo
-share/locale/fi/LC_MESSAGES/libxfce4util.mo
-share/locale/fr/LC_MESSAGES/libxfce4util.mo
-share/locale/gl/LC_MESSAGES/libxfce4util.mo
-share/locale/he/LC_MESSAGES/libxfce4util.mo
-share/locale/id/LC_MESSAGES/libxfce4util.mo
-share/locale/ja/LC_MESSAGES/libxfce4util.mo
-share/locale/ka/LC_MESSAGES/libxfce4util.mo
-share/locale/ko/LC_MESSAGES/libxfce4util.mo
-share/locale/lt/LC_MESSAGES/libxfce4util.mo
-share/locale/lv/LC_MESSAGES/libxfce4util.mo
-share/locale/mk/LC_MESSAGES/libxfce4util.mo
-share/locale/nb/LC_MESSAGES/libxfce4util.mo
-share/locale/nl/LC_MESSAGES/libxfce4util.mo
-share/locale/pl/LC_MESSAGES/libxfce4util.mo
-share/locale/pt_BR/LC_MESSAGES/libxfce4util.mo
-share/locale/pt/LC_MESSAGES/libxfce4util.mo
-share/locale/ro/LC_MESSAGES/libxfce4util.mo
-share/locale/si/LC_MESSAGES/libxfce4util.mo
-share/locale/sl/LC_MESSAGES/libxfce4util.mo
-share/locale/sq/LC_MESSAGES/libxfce4util.mo
-share/locale/sv/LC_MESSAGES/libxfce4util.mo
-share/locale/tr/LC_MESSAGES/libxfce4util.mo
-share/locale/uk/LC_MESSAGES/libxfce4util.mo
-share/locale/ur/LC_MESSAGES/libxfce4util.mo
-share/locale/zh_CN/LC_MESSAGES/libxfce4util.mo
-@dirrmtry share/locale/ur/LC_MESSAGES
-@dirrmtry share/locale/ur
-@dirrm include/xfce4/libxfce4util
-@dirrmtry include/xfce4
+%%NLS%%share/locale/am/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/cy/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/da/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/de/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/dz/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/es/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/et/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/he/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/id/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/it/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/mk/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/si/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/libxfce4util.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/sl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sl
+%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/si
+%%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/nl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/nl
+%%NLS%%@dirrmtry share/locale/nb/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/nb
+%%NLS%%@dirrmtry share/locale/mk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/mk
+%%NLS%%@dirrmtry share/locale/lv/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/lv
+%%NLS%%@dirrmtry share/locale/lt/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/lt
+%%NLS%%@dirrmtry share/locale/ko/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ko
+%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/kk
+%%NLS%%@dirrmtry share/locale/ka/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ka
+%%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/he/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/he
+%%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/et/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/et
+%%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/dz/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/dz
+%%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/cy/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/cy
+%%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/ar/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ar
+%%NLS%%@dirrmtry share/locale/am/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/am
@dirrm share/gtk-doc/html/libxfce4util
@dirrmtry share/gtk-doc/html
@dirrmtry share/gtk-doc
-@dirrmtry share/xfce4
+@dirrm include/xfce4/libxfce4util
+@dirrmtry include/xfce4
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index be915e7c5e97..4a3ab1895100 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-clipman-plugin
PORTVERSION= 1.1.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11 xfce
MASTER_SITES= http://archive.xfce.org/src/panel-plugins/${PORTNAME}/1.1/
DIST_SUBDIR= xfce4
diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile
index a8bd871f1ff6..b9028ba85533 100644
--- a/x11/xfce4-conf/Makefile
+++ b/x11/xfce4-conf/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xfce4-conf
-PORTVERSION= 4.6.1
-PORTREVISION= 4
+PORTVERSION= 4.6.2
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DISTNAME= xfconf-${PORTVERSION}
@@ -21,14 +20,18 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= glib20 gnometarget gnomehack gtk20 intltool intlhack pkgconfig
USE_LDCONFIG= yes
USE_XFCE= configenv libutil
+USE_XORG= x11
+
+CONFIGURE_ARGS= --enable-gtk-doc-html=no \
+ --disable-debug
OPTIONS= GTKDOC "install the library documentation" off \
- PERL "Install Perl bindings" off
+ PERL "Install Perl bindings" off \
+ NLS "Enable Native Language Support" on
MAN3PREFIX?= ${PREFIX}/lib/perl5/${PERL_VERSION}
@@ -39,9 +42,7 @@ MAN3= Xfce4::Xfconf.3
BUILD_DEPENDS+= p5-ExtUtils-Depends>=0.300:${PORTSDIR}/devel/p5-ExtUtils-Depends \
p5-ExtUtils-PkgConfig>=1.12:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
p5-Glib2>=1.200:${PORTSDIR}/devel/p5-Glib2
-RUN_DEPENDS+= p5-ExtUtils-Depends>=0.300:${PORTSDIR}/devel/p5-ExtUtils-Depends \
- p5-ExtUtils-PkgConfig>=1.12:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
- p5-Glib2>=1.200:${PORTSDIR}/devel/p5-Glib2
+RUN_DEPENDS+= ${BUILD_DEPENDS}
CONFIGURE_ARGS+=--enable-perl-bindings
PLIST_SUB+= PERLBIND=""
.else
@@ -56,6 +57,15 @@ CONFIGURE_ARGS+=--enable-gtk-doc
CONFIGURE_ARGS+=--disable-gtk-doc
.endif
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+CONFIGURE_ARGS+=--enable-nls
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|--module-dir|--module=xfconf &|' \
${WRKSRC}/docs/reference/Makefile.in
diff --git a/x11/xfce4-conf/distinfo b/x11/xfce4-conf/distinfo
index 9f9fa766572e..706fe316bfc9 100644
--- a/x11/xfce4-conf/distinfo
+++ b/x11/xfce4-conf/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfconf-4.6.1.tar.bz2) = d4d3018767ea9eb4b57cc57d4038023b
-SHA256 (xfce4/xfconf-4.6.1.tar.bz2) = 22a596f73795be398382e82e9c11062423daa374339ce6db808f73a6ba19380e
-SIZE (xfce4/xfconf-4.6.1.tar.bz2) = 440499
+MD5 (xfce4/xfconf-4.6.2.tar.bz2) = 5ff93c15077c6dbbcd38c437bc1ab2ef
+SHA256 (xfce4/xfconf-4.6.2.tar.bz2) = 7b2635abc33ae6a76145238ed27557bc1ff91b1a5ee0757962f798a66d56f478
+SIZE (xfce4/xfconf-4.6.2.tar.bz2) = 463902
diff --git a/x11/xfce4-conf/pkg-plist b/x11/xfce4-conf/pkg-plist
index 94c442147561..abfd91b69244 100644
--- a/x11/xfce4-conf/pkg-plist
+++ b/x11/xfce4-conf/pkg-plist
@@ -4,10 +4,10 @@ include/xfce4/xfconf-0/xfconf/xfconf-channel.h
include/xfce4/xfconf-0/xfconf/xfconf-errors.h
include/xfce4/xfconf-0/xfconf/xfconf-types.h
include/xfce4/xfconf-0/xfconf/xfconf.h
-lib/libxfconf-0.so.2
-lib/libxfconf-0.so
-lib/libxfconf-0.la
lib/libxfconf-0.a
+lib/libxfconf-0.la
+lib/libxfconf-0.so
+lib/libxfconf-0.so.2
libdata/pkgconfig/libxfconf-0.pc
libexec/xfconfd
share/dbus-1/services/org.xfce.Xfconf.service
@@ -29,30 +29,37 @@ share/gtk-doc/html/xfconf/xfconf-xfconf-types.html
share/gtk-doc/html/xfconf/xfconf-xfconf.html
share/gtk-doc/html/xfconf/xfconf.devhelp
share/gtk-doc/html/xfconf/xfconf.devhelp2
-share/locale/ca/LC_MESSAGES/xfconf.mo
-share/locale/cs/LC_MESSAGES/xfconf.mo
-share/locale/da/LC_MESSAGES/xfconf.mo
-share/locale/de/LC_MESSAGES/xfconf.mo
-share/locale/es/LC_MESSAGES/xfconf.mo
-share/locale/eu/LC_MESSAGES/xfconf.mo
-share/locale/fi/LC_MESSAGES/xfconf.mo
-share/locale/fr/LC_MESSAGES/xfconf.mo
-share/locale/gl/LC_MESSAGES/xfconf.mo
-share/locale/hu/LC_MESSAGES/xfconf.mo
-share/locale/id/LC_MESSAGES/xfconf.mo
-share/locale/it/LC_MESSAGES/xfconf.mo
-share/locale/ja/LC_MESSAGES/xfconf.mo
-share/locale/nb/LC_MESSAGES/xfconf.mo
-share/locale/nl/LC_MESSAGES/xfconf.mo
-share/locale/pl/LC_MESSAGES/xfconf.mo
-share/locale/pt_BR/LC_MESSAGES/xfconf.mo
-share/locale/pt/LC_MESSAGES/xfconf.mo
-share/locale/ro/LC_MESSAGES/xfconf.mo
-share/locale/ru/LC_MESSAGES/xfconf.mo
-share/locale/sv/LC_MESSAGES/xfconf.mo
-share/locale/tr/LC_MESSAGES/xfconf.mo
-share/locale/uk/LC_MESSAGES/xfconf.mo
-share/locale/zh_CN/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/am/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfconf.mo
%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xfce4/Xfconf/Xfconf.so
%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xfce4/Xfconf/Xfconf.bs
%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xfce4/Xfconf/.packlist
@@ -66,6 +73,68 @@ share/locale/zh_CN/LC_MESSAGES/xfconf.mo
%%PERLBIND%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Xfce4/Xfconf/Install
%%PERLBIND%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Xfce4/Xfconf
%%PERLBIND%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Xfce4
+%%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/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/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/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/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/xfconf
@dirrmtry share/gtk-doc/html
@dirrmtry share/gtk-doc
diff --git a/x11/xfce4-quicklauncher-plugin/Makefile b/x11/xfce4-quicklauncher-plugin/Makefile
index 2e55d7e06ee5..9d8462ad97b7 100644
--- a/x11/xfce4-quicklauncher-plugin/Makefile
+++ b/x11/xfce4-quicklauncher-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-quicklauncher-plugin
PORTVERSION= 1.9.4
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11 xfce
MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
diff --git a/x11/xfce4-screenshooter-plugin/Makefile b/x11/xfce4-screenshooter-plugin/Makefile
index 5e835b4ebbf7..e087557330b1 100644
--- a/x11/xfce4-screenshooter-plugin/Makefile
+++ b/x11/xfce4-screenshooter-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-screenshooter-plugin
PORTVERSION= 1.6.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11 xfce
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-screenshooter/
DISTNAME= xfce4-screenshooter-${PORTVERSION}
diff --git a/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile
index 17fbe3da604a..0d8b61630db8 100644
--- a/x11/xfce4-taskmanager/Makefile
+++ b/x11/xfce4-taskmanager/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-taskmanager
PORTVERSION= 0.4.0.r2
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= x11 xfce
MASTER_SITES= http://freebsd.unixfreunde.de/sources/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/-rc/}
diff --git a/x11/xfce4-verve-plugin/Makefile b/x11/xfce4-verve-plugin/Makefile
index d4ce45d5f9a9..de70661000a7 100644
--- a/x11/xfce4-verve-plugin/Makefile
+++ b/x11/xfce4-verve-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= verve-plugin
PORTVERSION= 0.3.6
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11 xfce
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-verve-plugin/
PKGNAMEPREFIX= xfce4-
diff --git a/x11/xfce4-wmdock-plugin/Makefile b/x11/xfce4-wmdock-plugin/Makefile
index cd43ca421542..a6b3dee5acc9 100644
--- a/x11/xfce4-wmdock-plugin/Makefile
+++ b/x11/xfce4-wmdock-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-wmdock-plugin
PORTVERSION= 0.3.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11 xfce
MASTER_SITES= http://www.ibh.de/~ellguth/develop/
diff --git a/x11/xfce4-xfapplet-plugin/Makefile b/x11/xfce4-xfapplet-plugin/Makefile
index 762d0bdb7a40..ef5c7c1ea2dc 100644
--- a/x11/xfce4-xfapplet-plugin/Makefile
+++ b/x11/xfce4-xfapplet-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-xfapplet-plugin
PORTVERSION= 0.1.0
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= x11 xfce
MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
generated by cgit (git 2.34.1) at 2024-11-25 06:24:35 +0800