Updated wm/fvwm-devel to 2.5.21

* New features:

   - The command Scroll can now be used for interactive scrolling.
   - New Style options: StippledIconTitle, !StickyStippledTitle,
     and !StickyStippledIconTitle.
   - Full support for menu context (M) key and mouse bindings.  See
     the section Menu Bindings in the man page for details.
   - Hilighted menu backgrounds now use pixmaps gradients and
     transparency from their related colorset.
   - New window conditions: StickyIcon, StickyAcrossPagesIcon and
     StickyAcrossDesksIcon.

* Changed features:

   - "Mouse n M N" is no longer used to disable or remap the
      builtin tear off menu button. See the section Tear Off Menus
      for details on replacement commands.

* Bug Fixes

4 files changed, 13 insertions, 13 deletions

diff --git a/wm/fvwm-devel/Makefile b/wm/fvwm-devel/Makefile
index 4bd90b55bad..1205bf20ecc 100644
--- a/wm/fvwm-devel/Makefile
+++ b/wm/fvwm-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/12/27 13:37:41 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2007/01/22 07:25:47 martti Exp $
 
 DISTNAME=	fvwm-${FVWM_VER}
 #PKGREVISION=	1
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.fvwm.org/
 COMMENT=	Development version of X11 Virtual window manager
 
 CONFLICTS=	fvwm1-[0-9]* fvwm2-[0-9]*
-FVWM_VER=	2.5.19
+FVWM_VER=	2.5.21
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
diff --git a/wm/fvwm-devel/PLIST b/wm/fvwm-devel/PLIST
index 35ef36d4cb3..ed6432d1c69 100644
--- a/wm/fvwm-devel/PLIST
+++ b/wm/fvwm-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/07/02 15:54:42 martti Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/01/22 07:25:47 martti Exp $
 bin/FvwmCommand
 bin/fvwm
 bin/fvwm-bug
@@ -85,7 +85,6 @@ man/man1/FvwmWinList.1
 man/man1/FvwmWindowMenu.1
 man/man1/fvwm-bug.1
 man/man1/fvwm-config.1
-man/man1/fvwm-convert-2.2.1
 man/man1/fvwm-convert-2.4.1
 man/man1/fvwm-convert-2.6.1
 man/man1/fvwm-menu-desktop.1
@@ -110,6 +109,7 @@ share/fvwm/ConfigFvwmDefaults
 share/fvwm/ConfigFvwmIconBox
 share/fvwm/ConfigFvwmIconMan
 share/fvwm/ConfigFvwmIdent
+share/fvwm/ConfigFvwmMenuDefaults
 share/fvwm/ConfigFvwmPager
 share/fvwm/ConfigFvwmProxyDefaults
 share/fvwm/ConfigFvwmScroll
diff --git a/wm/fvwm-devel/distinfo b/wm/fvwm-devel/distinfo
index f2c5fda2c9f..4b49a89c137 100644
--- a/wm/fvwm-devel/distinfo
+++ b/wm/fvwm-devel/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2006/12/12 07:05:01 martti Exp $
+$NetBSD: distinfo,v 1.12 2007/01/22 07:25:47 martti Exp $
 
-SHA1 (fvwm-2.5.19.tar.bz2) = b35da6ba6acb2f7bccd84da2ca95e49af2d7dd75
-RMD160 (fvwm-2.5.19.tar.bz2) = 75aabb54a9a66db21a16a339bbc4359b484b58de
-Size (fvwm-2.5.19.tar.bz2) = 1990433 bytes
-SHA1 (patch-aa) = a3661d015c2e11db244084f7d2025f6cd2efe8ed
+SHA1 (fvwm-2.5.21.tar.bz2) = a66746c38d392da826b0c6f880b486c1064ee734
+RMD160 (fvwm-2.5.21.tar.bz2) = 4025f6c75c0919bffdaa9acbc7a4d987617d098b
+Size (fvwm-2.5.21.tar.bz2) = 2062532 bytes
+SHA1 (patch-aa) = e7bf4a3860ddaf2657401bb5eea2edc22bbf3212
 SHA1 (patch-ab) = 71282c66036746dcb4a3905a56f7bf1a75fbd497
diff --git a/wm/fvwm-devel/patches/patch-aa b/wm/fvwm-devel/patches/patch-aa
index c144a4417d8..1af14299ef4 100644
--- a/wm/fvwm-devel/patches/patch-aa
+++ b/wm/fvwm-devel/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2006/12/12 07:05:01 martti Exp $
+$NetBSD: patch-aa,v 1.5 2007/01/22 07:25:48 martti Exp $
 
---- bin/Makefile.in.orig	2006-12-09 12:44:04.000000000 +0000
-+++ bin/Makefile.in	2006-12-12 08:59:49.000000000 +0000
-@@ -703,14 +703,8 @@
+--- bin/Makefile.in.orig	2007-01-20 11:37:15.000000000 +0000
++++ bin/Makefile.in	2007-01-22 08:58:52.000000000 +0000
+@@ -697,14 +697,8 @@
  	_fvwm-perllib.1
  
  install-exec-local: