>Number:         13994
>Category:       pkg
>Synopsis:       update fvwm2 to the latest version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Sep 18 00:39:01 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Martti Kuparinen
>Release:        NetBSD 1.5.2
>Organization:
>Environment:
System: NetBSD dhcp38 1.5.2 NetBSD 1.5.2 (OMNIBOOK) #1: Wed Aug 29 10:01:32 GMT 2001 root@dhcp38:/usr/src/sys/arch/i386/compile/OMNIBOOK i386


>Description:

Fvwm 2.4.2 has been released. List of changes is too long to be included
here, please see ChangeLog in the build directory for further details.

>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/wm/fvwm2/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile	2001/07/10 20:03:28	1.7
+++ Makefile	2001/09/18 07:35:55
@@ -18,7 +18,7 @@
 
 CONFLICTS=	fvwm-2.*
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
-FVWM_VER=	2.4.0
+FVWM_VER=	2.4.2
 
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/wm/fvwm2/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	2001/07/10 20:03:28	1.3
+++ distinfo	2001/09/18 07:35:55
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.3 2001/07/10 20:03:28 nra Exp $
 
-SHA1 (fvwm-2.4.0.tar.gz) = b7c4c74a7bfad13f0e0a08f0a5d84e45b43fd129
-Size (fvwm-2.4.0.tar.gz) = 1636066 bytes
+SHA1 (fvwm-2.4.2.tar.gz) = 249e6fa64d35d7baa762e29584a019fa960da524
+Size (fvwm-2.4.2.tar.gz) = 1682981 bytes
 SHA1 (fvwm_icons.tgz) = 418356862ab564ac0b771300b53004aea7c7c1ec
 Size (fvwm_icons.tgz) = 368640 bytes
-SHA1 (patch-aa) = eb9012612496251a3bd52f139b5cbab7a6ada531
-SHA1 (patch-ab) = f49788d4c5af55ef296bb37a9a856aa51717f964
+SHA1 (patch-aa) = a2b2f7f6aca946bc3c18929f59ff43d8da945553
+SHA1 (patch-ab) = 1fb3fcd20802af683f4f069deaa75221a21b1318
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/wm/fvwm2/patches/patch-aa,v
retrieving revision 1.2
diff -u -r1.2 patch-aa
--- patch-aa	2001/07/10 20:03:28	1.2
+++ patch-aa	2001/09/18 07:35:55
@@ -1,21 +1,21 @@
 $NetBSD: patch-aa,v 1.2 2001/07/10 20:03:28 nra Exp $
 
---- utils/Makefile.in.orig	Tue Jul 10 14:44:32 2001
-+++ utils/Makefile.in	Tue Jul 10 14:44:50 2001
-@@ -109,13 +109,13 @@
+--- utils/Makefile.in.orig	Tue Sep 18 09:20:20 2001
++++ utils/Makefile.in	Tue Sep 18 09:21:28 2001
+@@ -113,13 +113,13 @@
  xpm_CFLAGS = @xpm_CFLAGS@
  xpm_LIBS = @xpm_LIBS@
  
 -bin_PROGRAMS = @XPMROOT@
-+#bin_PROGRAMS = @XPMROOT@
++bin_PROGRAMS =
  bin_SCRIPTS = fvwm-config fvwmbug fvwm-menu-xlock fvwm-menu-directory 	fvwm-menu-desktop fvwm-menu-headlines fvwm24_convert
  
  
 -EXTRA_PROGRAMS = xpmroot xselection
 +EXTRA_PROGRAMS = xselection
  
--man_MANS = xpmroot.1 fvwmbug.1 fvwmrc_convert.1 fvwm24_convert.1 	fvwm-menu-xlock.1 fvwm-menu-directory.1 	fvwm-menu-desktop.1 fvwm-menu-headlines.1
-+man_MANS = fvwmbug.1 fvwmrc_convert.1 fvwm24_convert.1 	fvwm-menu-xlock.1 fvwm-menu-directory.1 	fvwm-menu-desktop.1 fvwm-menu-headlines.1
+-man_MANS = xpmroot.1 fvwm-config.1 fvwmbug.1 fvwmrc_convert.1 fvwm24_convert.1 	fvwm-menu-xlock.1 fvwm-menu-directory.1 	fvwm-menu-desktop.1 fvwm-menu-headlines.1
++man_MANS = fvwm-config.1 fvwmbug.1 fvwmrc_convert.1 fvwm24_convert.1 	fvwm-menu-xlock.1 fvwm-menu-directory.1 	fvwm-menu-desktop.1 fvwm-menu-headlines.1
  
  EXTRA_DIST = fvwmrc_convert fvwm24_convert.in quantize_pixmaps $(man_MANS)
  
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/wm/fvwm2/patches/patch-ab,v
retrieving revision 1.4
diff -u -r1.4 patch-ab
--- patch-ab	2001/07/10 20:03:28	1.4
+++ patch-ab	2001/09/18 07:35:55
@@ -1,8 +1,8 @@
 $NetBSD: patch-ab,v 1.4 2001/07/10 20:03:28 nra Exp $
 
---- configure.orig	Tue Jul 10 14:17:06 2001
-+++ configure	Tue Jul 10 14:18:19 2001
-@@ -666,7 +666,7 @@
+--- configure.orig	Sun Sep 16 16:33:27 2001
++++ configure	Tue Sep 18 09:22:27 2001
+@@ -670,7 +670,7 @@
  # It thinks the first close brace ends the variable substitution.
  test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
  
@@ -11,16 +11,16 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
-@@ -755,7 +755,7 @@
+@@ -759,7 +759,7 @@
  fi
  
  
 -PACKAGE=fvwm
 +PACKAGE=fvwm2
  
- VERSION=2.4.0
+ VERSION=2.4.2
  
-@@ -3724,7 +3724,7 @@
+@@ -3879,7 +3879,7 @@
  # It thinks the first close brace ends the variable substitution.
  test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
  
Index: pkg/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/wm/fvwm2/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- PLIST	2001/07/10 20:03:29	1.4
+++ PLIST	2001/09/18 07:35:56
@@ -8,41 +8,41 @@
 bin/fvwm2
 bin/fvwm24_convert
 bin/fvwmbug
-lib/X11/fvwm2/2.4.0/FvwmAnimate
-lib/X11/fvwm2/2.4.0/FvwmAudio
-lib/X11/fvwm2/2.4.0/FvwmAuto
-lib/X11/fvwm2/2.4.0/FvwmBacker
-lib/X11/fvwm2/2.4.0/FvwmBanner
-lib/X11/fvwm2/2.4.0/FvwmButtons
-lib/X11/fvwm2/2.4.0/FvwmCascade
-lib/X11/fvwm2/2.4.0/FvwmCommand.pm
-lib/X11/fvwm2/2.4.0/FvwmCommand.sh
-lib/X11/fvwm2/2.4.0/FvwmCommandS
-lib/X11/fvwm2/2.4.0/FvwmConsole
-lib/X11/fvwm2/2.4.0/FvwmConsoleC
-lib/X11/fvwm2/2.4.0/FvwmConsoleC.pl
-lib/X11/fvwm2/2.4.0/FvwmCpp
-lib/X11/fvwm2/2.4.0/FvwmDebug
-lib/X11/fvwm2/2.4.0/FvwmDragWell
-lib/X11/fvwm2/2.4.0/FvwmEvent
-lib/X11/fvwm2/2.4.0/FvwmForm
-lib/X11/fvwm2/2.4.0/FvwmGtk
-lib/X11/fvwm2/2.4.0/FvwmIconBox
-lib/X11/fvwm2/2.4.0/FvwmIconMan
-lib/X11/fvwm2/2.4.0/FvwmIdent
-lib/X11/fvwm2/2.4.0/FvwmM4
-lib/X11/fvwm2/2.4.0/FvwmPager
-lib/X11/fvwm2/2.4.0/FvwmRearrange
-lib/X11/fvwm2/2.4.0/FvwmSave
-lib/X11/fvwm2/2.4.0/FvwmSaveDesk
-lib/X11/fvwm2/2.4.0/FvwmScript
-lib/X11/fvwm2/2.4.0/FvwmScroll
-lib/X11/fvwm2/2.4.0/FvwmTalk
-lib/X11/fvwm2/2.4.0/FvwmTaskBar
-lib/X11/fvwm2/2.4.0/FvwmTheme
-lib/X11/fvwm2/2.4.0/FvwmTile
-lib/X11/fvwm2/2.4.0/FvwmWharf
-lib/X11/fvwm2/2.4.0/FvwmWinList
+lib/X11/fvwm2/${FVWM_VER}/FvwmAnimate
+lib/X11/fvwm2/${FVWM_VER}/FvwmAudio
+lib/X11/fvwm2/${FVWM_VER}/FvwmAuto
+lib/X11/fvwm2/${FVWM_VER}/FvwmBacker
+lib/X11/fvwm2/${FVWM_VER}/FvwmBanner
+lib/X11/fvwm2/${FVWM_VER}/FvwmButtons
+lib/X11/fvwm2/${FVWM_VER}/FvwmCascade
+lib/X11/fvwm2/${FVWM_VER}/FvwmCommand.pm
+lib/X11/fvwm2/${FVWM_VER}/FvwmCommand.sh
+lib/X11/fvwm2/${FVWM_VER}/FvwmCommandS
+lib/X11/fvwm2/${FVWM_VER}/FvwmConsole
+lib/X11/fvwm2/${FVWM_VER}/FvwmConsoleC
+lib/X11/fvwm2/${FVWM_VER}/FvwmConsoleC.pl
+lib/X11/fvwm2/${FVWM_VER}/FvwmCpp
+lib/X11/fvwm2/${FVWM_VER}/FvwmDebug
+lib/X11/fvwm2/${FVWM_VER}/FvwmDragWell
+lib/X11/fvwm2/${FVWM_VER}/FvwmEvent
+lib/X11/fvwm2/${FVWM_VER}/FvwmForm
+lib/X11/fvwm2/${FVWM_VER}/FvwmGtk
+lib/X11/fvwm2/${FVWM_VER}/FvwmIconBox
+lib/X11/fvwm2/${FVWM_VER}/FvwmIconMan
+lib/X11/fvwm2/${FVWM_VER}/FvwmIdent
+lib/X11/fvwm2/${FVWM_VER}/FvwmM4
+lib/X11/fvwm2/${FVWM_VER}/FvwmPager
+lib/X11/fvwm2/${FVWM_VER}/FvwmRearrange
+lib/X11/fvwm2/${FVWM_VER}/FvwmSave
+lib/X11/fvwm2/${FVWM_VER}/FvwmSaveDesk
+lib/X11/fvwm2/${FVWM_VER}/FvwmScript
+lib/X11/fvwm2/${FVWM_VER}/FvwmScroll
+lib/X11/fvwm2/${FVWM_VER}/FvwmTalk
+lib/X11/fvwm2/${FVWM_VER}/FvwmTaskBar
+lib/X11/fvwm2/${FVWM_VER}/FvwmTheme
+lib/X11/fvwm2/${FVWM_VER}/FvwmTile
+lib/X11/fvwm2/${FVWM_VER}/FvwmWharf
+lib/X11/fvwm2/${FVWM_VER}/FvwmWinList
 lib/X11/fvwm2/decor_examples
 lib/X11/fvwm2/pixmaps/Jlock.xpm
 lib/X11/fvwm2/pixmaps/Jnews.xpm
@@ -438,5 +438,5 @@
 share/fvwm2/system.fvwm2rc-sample-95
 @dirrm share/fvwm2
 @dirrm lib/X11/fvwm2/pixmaps
-@dirrm lib/X11/fvwm2/2.4.0
+@dirrm lib/X11/fvwm2/${FVWM_VER}
 @dirrm lib/X11/fvwm2
>Release-Note:
>Audit-Trail:
>Unformatted: