Updated wm/fvwm-devel to 2.5.16

Changes in beta release 2.5.16 (20-Jan-2006)

* New features:

   - If the pointer can not be grabbed in functions, a message is
     printed to the console instead of beeping.

* Bug Fixes:

   - Fixed a couple of build problems introduced in 2.5.15.

Changes in beta release 2.5.15 (14-Jan-2006)

* New features:

   - Variables can be nested, like $[desk.name$[desk.n]].
   - Obsolete one-letter variables work, but generate warnings now.
   - Windows can be placed by any button (now also >3).
   - It is now possible to redefine the buttons usable to finish
     window movement and manual placement.
   - New window condition PlacedByButton.
   - MenuStyle pairs can be negated by prefixing '!'.
   - New generic tabbing module - FvwmTabs.
   - New Style option: EWMHIgnoreWindowType.
   - New MenuStyle options: MouseWheel, ScrollOffPage and
     TrianglesUseFore.
   - To compile from CVS, autoconf-2.53 or above is now required.
     This does not affect compiling the released tarballs.
   - New option "screen" to Move and ResizeMove commands to allow
     specifying the target Xinerama screen.

* Bug Fixes:

   - Supported a new fribidi version 0.10.5 in addition to 0.10.4.
   - Better look for windows with "BorderStyle TiledPixmap".
   - Some EWMH-related 64-bit fixes.
   - Fixed segmentation fault when replacing title of title only
     menus (Bug #1121).
   - Fixes for resizing of shaded windows and resizing/moving
     windows with complex functions.

4 files changed, 18 insertions, 15 deletions

diff --git a/wm/fvwm-devel/Makefile b/wm/fvwm-devel/Makefile
index a938b52aa42..040cf8c7c34 100644
--- a/wm/fvwm-devel/Makefile
+++ b/wm/fvwm-devel/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2006/04/17 13:46:50 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2006/07/02 09:32:55 martti Exp $
 
-DISTNAME=	fvwm-2.5.14
-PKGNAME=	${DISTNAME:S/fvwm/&-devel/}
-PKGREVISION=	1
+DISTNAME=	fvwm-2.5.16
+#PKGREVISION=	1
 CATEGORIES=	x11 wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/
 EXTRACT_SUFX=	.tar.bz2
@@ -11,7 +10,7 @@ MAINTAINER=	epg@NetBSD.org
 HOMEPAGE=	http://www.fvwm.org/
 COMMENT=	Development version of X11 Virtual window manager
 
-CONFLICTS=	fvwm-[0-9]* fvwm1-[0-9]* fvwm2-[0-9]*
+CONFLICTS=	fvwm1-[0-9]* fvwm2-[0-9]*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
diff --git a/wm/fvwm-devel/PLIST b/wm/fvwm-devel/PLIST
index 7012ec0fea0..df98ccf0f1b 100644
--- a/wm/fvwm-devel/PLIST
+++ b/wm/fvwm-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/04/17 07:07:36 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/07/02 09:32:55 martti Exp $
 bin/FvwmCommand
 bin/fvwm
 bin/fvwm-bug
@@ -43,6 +43,7 @@ libexec/fvwm/${PKGVERSION}/FvwmSave
 libexec/fvwm/${PKGVERSION}/FvwmSaveDesk
 libexec/fvwm/${PKGVERSION}/FvwmScript
 libexec/fvwm/${PKGVERSION}/FvwmScroll
+libexec/fvwm/${PKGVERSION}/FvwmTabs
 libexec/fvwm/${PKGVERSION}/FvwmTalk
 libexec/fvwm/${PKGVERSION}/FvwmTaskBar
 libexec/fvwm/${PKGVERSION}/FvwmTheme
@@ -76,6 +77,7 @@ man/man1/FvwmSave.1
 man/man1/FvwmSaveDesk.1
 man/man1/FvwmScript.1
 man/man1/FvwmScroll.1
+man/man1/FvwmTabs.1
 man/man1/FvwmTaskBar.1
 man/man1/FvwmTheme.1
 man/man1/FvwmWharf.1
@@ -112,6 +114,7 @@ share/fvwm/ConfigFvwmPager
 share/fvwm/ConfigFvwmProxyDefaults
 share/fvwm/ConfigFvwmScroll
 share/fvwm/ConfigFvwmSetup
+share/fvwm/ConfigFvwmTabs
 share/fvwm/ConfigFvwmTaskBar
 share/fvwm/ConfigFvwmWinList
 share/fvwm/FvwmForm-Capture
@@ -137,6 +140,7 @@ share/fvwm/FvwmScript-ScreenDump
 share/fvwm/FvwmScript-ScreenSetup
 share/fvwm/FvwmScript-Setup95
 share/fvwm/FvwmScript-WidgetDemo
+share/fvwm/FvwmTabs-DefaultSetup
 share/fvwm/fvwm-script-ComExample.pl
 share/fvwm/fvwm-script-setup95.pl
 share/fvwm/perllib/FVWM/Commands.pm
diff --git a/wm/fvwm-devel/distinfo b/wm/fvwm-devel/distinfo
index b52e3cfac9c..660a9988187 100644
--- a/wm/fvwm-devel/distinfo
+++ b/wm/fvwm-devel/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/10/29 23:45:02 epg Exp $
+$NetBSD: distinfo,v 1.6 2006/07/02 09:32:55 martti Exp $
 
-SHA1 (fvwm-2.5.14.tar.bz2) = 096ac3b0ac077ec8c6a91f234eac70878f56c501
-RMD160 (fvwm-2.5.14.tar.bz2) = 1b9f9093071cfbf5d1ed8be66018fc6add045d8a
-Size (fvwm-2.5.14.tar.bz2) = 1977058 bytes
-SHA1 (patch-aa) = 4786fed07aadb0cebe72dcaae847232f1b7f8818
+SHA1 (fvwm-2.5.16.tar.bz2) = fb12b06bec5992b5d3e640f9a530fe453f5f7a1e
+RMD160 (fvwm-2.5.16.tar.bz2) = 2c0d9c3c1c452d970dbcd4ba4800944714d4c2d4
+Size (fvwm-2.5.16.tar.bz2) = 2018815 bytes
+SHA1 (patch-aa) = 2f9c40c201fb041e71c7553118595f6af1c05030
diff --git a/wm/fvwm-devel/patches/patch-aa b/wm/fvwm-devel/patches/patch-aa
index 82e18587f2b..123450f611d 100644
--- a/wm/fvwm-devel/patches/patch-aa
+++ b/wm/fvwm-devel/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2004/06/27 07:09:26 epg Exp $
+$NetBSD: patch-aa,v 1.3 2006/07/02 09:32:55 martti Exp $
 
---- bin/Makefile.in.orig	Fri Mar 19 11:32:33 2004
-+++ bin/Makefile.in
-@@ -591,14 +591,8 @@ pod2man: \
+--- bin/Makefile.in.orig	2006-01-20 11:22:45.000000000 +0200
++++ bin/Makefile.in	2006-07-01 07:10:20.000000000 +0300
+@@ -697,14 +697,8 @@
  	_fvwm-perllib.1
  
  install-exec-local: