Update to 2.5.12.

pkgsrc changes:
  - Support pkgviews
  - Disable ancient GTK+ module

Changes in alpha release 2.5.12 (6-Oct-2004)

* New commands:

   - EdgeLeaveCommand

* New module features:

   - FvwmIconMan: ShowOnlyFocused option.

-------------------------------------------------------------------

Changes in alpha release 2.5.11 (30-Sep-2004)

* Multiple window names can be specified in conditions.

* Window-specific key/mouse bindings. (Bindings no longer have to
  be global.)

* The default fvwm configuration files are now: ~/.fvwm/config and
  $FVWM_DATADIR/config. Five previously used config file locations
  are still searched as usual for backward compatibility.

* New extended variables $[w.desk] and $[w.layer].

* New options GrowOnWindowLayer and GrowOnlayers to the Maximize
  command.

* New Style option "State".

* New Style option "CenterPlacement".

* New option to FvwmIconMan: ShowNoIcons.

* New WindowList tracker and other enhancements in Perl library.

* New option to fvwm-menu-directory: --func-name.

* Improved FvwmWindowMenu module.

* Fluxbox-like Alt-Button3 resizing with the new Resize options
  Direction, WarpToBorder and FixedDirection

* Enhanced "Test (Version >= x.y.z)" option to allow version
  comparisons.

* New FvwmButtons options: ActiveColorset, ActiveIcon, ActiveTitle,
  PressColorset, PressIcon and PressTitle.

* New FvwmButtons swallow option: SwallowNew.

* The option CurrentGlobalPageAnyDesk was accidentally named
  CurrentGlobbalPageAnyDesk before.

* New conditions AnyScreen and Overlapped.

* The Read and PipeRead commands return 1 if the file or command
  could be read or executed and -1 otherwise.

* New menu option TearOffImmediately.

* Added support for Solaris' Xinerama.

* New option MailDir in FvwmTaskBar.

* MoveToPage command:

    New options wrapx, wrapy, nodesklimitx and nodesklimity.
    New suffix 'w' to allow for window relative movement.

3 files changed, 11 insertions, 10 deletions

diff --git a/wm/fvwm-devel/Makefile b/wm/fvwm-devel/Makefile
index 4be59844be3..24d30e383c4 100644
--- a/wm/fvwm-devel/Makefile
+++ b/wm/fvwm-devel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2004/10/03 00:18:22 tv Exp $
+# $NetBSD: Makefile,v 1.6 2004/11/26 23:54:56 epg Exp $
 
-DISTNAME=	fvwm-2.5.10
+DISTNAME=	fvwm-2.5.12
 PKGNAME=	${DISTNAME:S/fvwm/&-devel/}
 PKGREVISION=	1
 CATEGORIES=	x11 wm
@@ -13,6 +13,8 @@ COMMENT=	Development version of X11 Virtual window manager
 
 CONFLICTS=	fvwm-[0-9]* fvwm1-[0-9]* fvwm2-[0-9]*
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
@@ -25,7 +27,6 @@ CONFIGURE_ARGS+=	--without-rplay-library
 CONFIGURE_ARGS+=	--without-stroke-library
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/modules/FvwmGtk/FvwmGtk.1 ${PREFIX}/man/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/fvwm
 	cd ${WRKSRC}/sample.fvwmrc && ${INSTALL_DATA} \
 		`${LS} | ${GREP} -v Makefile` \
@@ -36,5 +37,4 @@ post-install:
 .include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/fvwm-devel/PLIST b/wm/fvwm-devel/PLIST
index ca8542e27b9..61565ce12cb 100644
--- a/wm/fvwm-devel/PLIST
+++ b/wm/fvwm-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/06/27 07:09:26 epg Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/11/26 23:54:56 epg Exp $
 bin/FvwmCommand
 bin/fvwm
 bin/fvwm-bug
@@ -30,7 +30,6 @@ libexec/fvwm/${PKGVERSION}/FvwmDebug
 libexec/fvwm/${PKGVERSION}/FvwmDragWell
 libexec/fvwm/${PKGVERSION}/FvwmEvent
 libexec/fvwm/${PKGVERSION}/FvwmForm
-libexec/fvwm/${PKGVERSION}/FvwmGtk
 libexec/fvwm/${PKGVERSION}/FvwmGtkDebug
 libexec/fvwm/${PKGVERSION}/FvwmIconBox
 libexec/fvwm/${PKGVERSION}/FvwmIconMan
@@ -64,7 +63,6 @@ man/man1/FvwmDebug.1
 man/man1/FvwmDragWell.1
 man/man1/FvwmEvent.1
 man/man1/FvwmForm.1
-man/man1/FvwmGtk.1
 man/man1/FvwmGtkDebug.1
 man/man1/FvwmIconBox.1
 man/man1/FvwmIconMan.1
@@ -173,6 +171,9 @@ ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/fvwm.mo
 ${PKGLOCALEDIR}/locale/sv_SE/LC_MESSAGES/FvwmScript.mo
 ${PKGLOCALEDIR}/locale/sv_SE/LC_MESSAGES/FvwmTaskBar.mo
 ${PKGLOCALEDIR}/locale/sv_SE/LC_MESSAGES/fvwm.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/FvwmScript.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/FvwmTaskBar.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/fvwm.mo
 @dirrm share/fvwm/perllib/General
 @dirrm share/fvwm/perllib/FVWM/Tracker
 @dirrm share/fvwm/perllib/FVWM/Module
diff --git a/wm/fvwm-devel/distinfo b/wm/fvwm-devel/distinfo
index 9e8c12ba588..4675dffbae3 100644
--- a/wm/fvwm-devel/distinfo
+++ b/wm/fvwm-devel/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2004/06/27 07:09:26 epg Exp $
+$NetBSD: distinfo,v 1.3 2004/11/26 23:54:56 epg Exp $
 
-SHA1 (fvwm-2.5.10.tar.bz2) = 6d27a3e79ca24e4b5e72d5ec82e35278d1417b09
-Size (fvwm-2.5.10.tar.bz2) = 1788873 bytes
+SHA1 (fvwm-2.5.12.tar.bz2) = 74417b69ef44dc926b8579bec30a73a2acf647a7
+Size (fvwm-2.5.12.tar.bz2) = 1917317 bytes
 SHA1 (patch-aa) = 4786fed07aadb0cebe72dcaae847232f1b7f8818