4 files changed, 10 insertions, 28 deletions

diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index a3cf2c3674b0..7098e7ce0a49 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	fvwm
-PORTVERSION=	2.5.14
-PORTREVISION=	5
+PORTVERSION=	2.5.16
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/
diff --git a/x11-wm/fvwm2-devel/distinfo b/x11-wm/fvwm2-devel/distinfo
index 78fe2cec6e1e..9f9c81994828 100644
--- a/x11-wm/fvwm2-devel/distinfo
+++ b/x11-wm/fvwm2-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (fvwm-2.5.14.tar.bz2) = 536045930f14136181d714cf0b696f35
-SHA256 (fvwm-2.5.14.tar.bz2) = d5e2b55738074789f3aad15e1975cde4b78911f4a7104da5ec0de8c9cadf52ec
-SIZE (fvwm-2.5.14.tar.bz2) = 1977058
+MD5 (fvwm-2.5.16.tar.bz2) = 78eb609bd913868f659034173292b9bd
+SHA256 (fvwm-2.5.16.tar.bz2) = 9fb3f38dfd329b3de1cab0b4e500edd7a2d2fbe11357ef0ca11e052e4ee406d9
+SIZE (fvwm-2.5.16.tar.bz2) = 2018815
 MD5 (fvwm_icons.tgz) = de6c2822f1f6d43a0e1daddd0c7a8665
 SHA256 (fvwm_icons.tgz) = 728eb0c837c58439b86a33e8dd4b3edb385372bc83972a2568e6f9d7ef3442a1
 SIZE (fvwm_icons.tgz) = 363406
diff --git a/x11-wm/fvwm2-devel/files/patch-modules-FvwmProxy-FvwmProxy.c b/x11-wm/fvwm2-devel/files/patch-modules-FvwmProxy-FvwmProxy.c
deleted file mode 100644
index d206f800bc9e..000000000000
--- a/x11-wm/fvwm2-devel/files/patch-modules-FvwmProxy-FvwmProxy.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- modules/FvwmProxy/FvwmProxy.c.orig	Fri Aug 12 08:25:45 2005
-+++ modules/FvwmProxy/FvwmProxy.c	Wed Nov  9 07:29:08 2005
-@@ -719,14 +719,15 @@
- {
- 	Bool rc = False;
- 	ProxyWindow *other=proxy->next;
-+	int dx, dy;
- 
- 	for (other=proxy->next; other; other=other->next)
- 	{
- 		if(other->desk != deskNumber)
- 			continue;
- 
--		int dx=abs(proxy->proxyx-other->proxyx);
--		int dy=abs(proxy->proxyy-other->proxyy);
-+		dx=abs(proxy->proxyx-other->proxyx);
-+		dy=abs(proxy->proxyy-other->proxyy);
- 		if (dx<(proxyWidth+proxySeparation) &&
- 				dy<proxyHeight+proxySeparation )
- 		{
diff --git a/x11-wm/fvwm2-devel/pkg-plist b/x11-wm/fvwm2-devel/pkg-plist
index b3db39a6df65..8f9a6d29c65a 100644
--- a/x11-wm/fvwm2-devel/pkg-plist
+++ b/x11-wm/fvwm2-devel/pkg-plist
@@ -47,6 +47,7 @@ libexec/fvwm/%%FVWM_VERSION%%/FvwmSave
 libexec/fvwm/%%FVWM_VERSION%%/FvwmSaveDesk
 libexec/fvwm/%%FVWM_VERSION%%/FvwmScript
 libexec/fvwm/%%FVWM_VERSION%%/FvwmScroll
+libexec/fvwm/%%FVWM_VERSION%%/FvwmTabs
 libexec/fvwm/%%FVWM_VERSION%%/FvwmTalk
 libexec/fvwm/%%FVWM_VERSION%%/FvwmTaskBar
 libexec/fvwm/%%FVWM_VERSION%%/FvwmTheme
@@ -381,6 +382,8 @@ man/man1/xpmroot.1.gz
 %%DATADIR%%/ConfigFvwmIconMan
 %%DATADIR%%/ConfigFvwmIdent
 %%DATADIR%%/ConfigFvwmPager
+%%DATADIR%%/ConfigFvwmProxyDefaults
+%%DATADIR%%/ConfigFvwmTabs
 %%DATADIR%%/ConfigFvwmScroll
 %%DATADIR%%/ConfigFvwmSetup
 %%DATADIR%%/ConfigFvwmTaskBar
@@ -393,7 +396,6 @@ man/man1/xpmroot.1.gz
 %%DATADIR%%/FvwmForm-Setup
 %%DATADIR%%/FvwmForm-Talk
 %%DATADIR%%/FvwmForm-TalkHelp
-%%DATADIR%%/ConfigFvwmProxyDefaults
 %%DATADIR%%/FvwmScript-BaseConfig
 %%DATADIR%%/FvwmScript-BellSetup
 %%DATADIR%%/FvwmScript-Buttons
@@ -409,6 +411,7 @@ man/man1/xpmroot.1.gz
 %%DATADIR%%/FvwmScript-ScreenSetup
 %%DATADIR%%/FvwmScript-Setup95
 %%DATADIR%%/FvwmScript-WidgetDemo
+%%DATADIR%%/FvwmTabs-DefaultSetup
 %%DATADIR%%/fvwm-script-ComExample.pl
 %%DATADIR%%/fvwm-script-setup95.pl
 %%DATADIR%%/system.fvwm2rc-sample-95
@@ -446,8 +449,8 @@ man/man1/xpmroot.1.gz
 %%NLS%%share/locale/sv_SE/LC_MESSAGES/fvwm.mo
 %%NLS%%share/locale/sv_SE/LC_MESSAGES/FvwmTaskBar.mo
 %%NLS%%share/locale/sv_SE/LC_MESSAGES/FvwmScript.mo
-@dirrmtry share/locale/sv_SE/LC_MESSAGES
-@dirrmtry share/locale/sv_SE
+@unexec rmdir %D/share/locale/sv_SE/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sv_SE 2>/dev/null || true
 @dirrm %%DATADIR%%/perllib/General
 @dirrm %%DATADIR%%/perllib/FVWM/Tracker
 @dirrm %%DATADIR%%/perllib/FVWM/Module