4 files changed, 105 insertions, 18 deletions
diff --git a/x11-wm/plank/Makefile b/x11-wm/plank/Makefile
index 9e3274ef40bd..e451ab6e67f0 100644
--- a/x11-wm/plank/Makefile
+++ b/x11-wm/plank/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	plank
-PORTVERSION=	0.5.0
+PORTVERSION=	0.6.1
 CATEGORIES=	x11-wm
-MASTER_SITES=	https://launchpadlibrarian.net/156777764/ \
+MASTER_SITES=	https://launchpadlibrarian.net/175961829/ \
 	https://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/
 
 MAINTAINER=	olivierd@FreeBSD.org
@@ -29,7 +29,8 @@ DBUSMENU_DESC=	DBusMenu protocol
 
 CONFIGURE_ARGS=	--enable-gee-0.8 \
 	--disable-benchmark \
-	--disable-headless-tests
+	--disable-headless-tests \
+	--disable-apport
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
diff --git a/x11-wm/plank/distinfo b/x11-wm/plank/distinfo
index a67ec5479288..fef189cc7ec7 100644
--- a/x11-wm/plank/distinfo
+++ b/x11-wm/plank/distinfo
@@ -1,2 +1,2 @@
-SHA256 (plank-0.5.0.tar.xz) = bf0e14dbdc9d30d57e55cc88644ef6e6c296be924bbfc1b345cba1e0c9be1804
-SIZE (plank-0.5.0.tar.xz) = 899884
+SHA256 (plank-0.6.1.tar.xz) = 3636afc5e2c15daa1f8fa1c4a9b1fc9a483c56ea8caf2b071de1a86578138c3c
+SIZE (plank-0.6.1.tar.xz) = 840924
diff --git a/x11-wm/plank/files/patch-data__Makefile.in b/x11-wm/plank/files/patch-data__Makefile.in
index a9845a9812f7..128b1f215422 100644
--- a/x11-wm/plank/files/patch-data__Makefile.in
+++ b/x11-wm/plank/files/patch-data__Makefile.in
@@ -1,10 +1,98 @@
---- ./data/Makefile.in.orig	2013-11-17 13:45:58.000000000 +0000
-+++ ./data/Makefile.in	2014-04-02 20:44:06.000000000 +0000
-@@ -371,7 +371,6 @@
- top_srcdir = @top_srcdir@
- NULL = 
- SUBDIRS = \
--	apport \
- 	icons \
- 	themes \
- 	$(NULL)
+--- ./data/Makefile.in.orig	2014-05-20 11:21:55.000000000 +0000
++++ ./data/Makefile.in	2014-08-02 16:44:50.000000000 +0000
+@@ -148,11 +148,11 @@
+          $(am__cd) "$$dir" && rm -f $$files; }; \
+   }
+ man1dir = $(mandir)/man1
+-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(appdatadir)" \
++am__installdirs = "$(DESTDIR)$(man1dir)" \
+ 	"$(DESTDIR)$(applicationsdir)"
+ NROFF = nroff
+ MANS = $(dist_man_MANS)
+-DATA = $(appdata_DATA) $(applications_DATA)
++DATA = $(applications_DATA)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+   distclean-recursive maintainer-clean-recursive
+ am__recursive_targets = \
+@@ -391,8 +391,6 @@
+ 
+ applicationsdir = $(datadir)/applications
+ applications_DATA = plank.desktop
+-appdatadir = $(datadir)/appdata
+-appdata_DATA = plank.appdata.xml
+ all: all-recursive
+ 
+ .SUFFIXES:
+@@ -475,27 +473,6 @@
+ 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+ 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+-install-appdataDATA: $(appdata_DATA)
+-	@$(NORMAL_INSTALL)
+-	@list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \
+-	if test -n "$$list"; then \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(appdatadir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(appdatadir)" || exit 1; \
+-	fi; \
+-	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)$(appdatadir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(appdatadir)" || exit $$?; \
+-	done
+-
+-uninstall-appdataDATA:
+-	@$(NORMAL_UNINSTALL)
+-	@list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \
+-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+-	dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir)
+ install-applicationsDATA: $(applications_DATA)
+ 	@$(NORMAL_INSTALL)
+ 	@list='$(applications_DATA)'; test -n "$(applicationsdir)" || list=; \
+@@ -677,7 +654,7 @@
+ all-am: Makefile $(MANS) $(DATA)
+ installdirs: installdirs-recursive
+ installdirs-am:
+-	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(applicationsdir)"; do \
++	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(applicationsdir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-recursive
+@@ -731,7 +708,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-appdataDATA install-applicationsDATA \
++install-data-am: install-applicationsDATA \
+ 	install-man
+ 
+ install-dvi: install-dvi-recursive
+@@ -776,7 +753,7 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-appdataDATA uninstall-applicationsDATA \
++uninstall-am: uninstall-applicationsDATA \
+ 	uninstall-man
+ 
+ uninstall-man: uninstall-man1
+@@ -787,7 +764,7 @@
+ 	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+ 	ctags-am distclean distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-appdataDATA \
++	install install-am \
+ 	install-applicationsDATA install-data install-data-am \
+ 	install-dvi install-dvi-am install-exec install-exec-am \
+ 	install-html install-html-am install-info install-info-am \
+@@ -796,7 +773,7 @@
+ 	installdirs installdirs-am maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+-	uninstall-am uninstall-appdataDATA uninstall-applicationsDATA \
++	uninstall-am uninstall-applicationsDATA \
+ 	uninstall-man uninstall-man1
+ 
+ 
diff --git a/x11-wm/plank/pkg-plist b/x11-wm/plank/pkg-plist
index f52d339dd29a..6777ebfa8a95 100644
--- a/x11-wm/plank/pkg-plist
+++ b/x11-wm/plank/pkg-plist
@@ -69,8 +69,6 @@ share/vala/vapi/plank.vapi
 @dirrm %%DATADIR%%/themes/Default
 @dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%
-%%NLS%%@dirrmtry share/locale/sr@latin/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sr@latin
 %%NLS%%@dirrmtry share/locale/sma/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/sma
-@dirrm include/plank
+@dirrmtry include/plank