Update fvwm2-current package to 2.3.31

ChangeLog too long to include here, available in ChangeLog file in DISTFILE.

Fixes pkg/12588 by Martti Kuparinen <martti.kuparinen@iki.fi>

4 files changed, 15 insertions, 13 deletions

diff --git a/wm/fvwm2-current/Makefile b/wm/fvwm2-current/Makefile
index 8033e96dcc1..0f3a8ec46f4 100644
--- a/wm/fvwm2-current/Makefile
+++ b/wm/fvwm2-current/Makefile
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/03/20 14:54:36 rh Exp $
+# $NetBSD: Makefile,v 1.2 2001/04/27 15:14:58 zuntum Exp $
 #
 
-FVWM_VERSION=	2.3.29
 DISTNAME=	fvwm-${FVWM_VERSION}
 PKGNAME=	fvwm2-${FVWM_VERSION}
 CATEGORIES=	wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} fvwm_icons.tgz
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.fvwm.org/
@@ -18,8 +16,12 @@ DEPENDS+=	xpmroot-2.*:../../x11/xpmroot
 DEPENDS+=	readline-*:../../devel/readline
 DEPENDS+=	rplay-3.*:../../audio/rplay
 
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+
 CONFLICTS=	fvwm-2.*
 
+FVWM_VERSION=	2.3.31
+
 USE_X11BASE=	yes
 GNU_CONFIGURE=	yes
 PLIST_SUBST+=	VERSION=${FVWM_VERSION}
diff --git a/wm/fvwm2-current/distinfo b/wm/fvwm2-current/distinfo
index 8ae15da5144..3031857b25f 100644
--- a/wm/fvwm2-current/distinfo
+++ b/wm/fvwm2-current/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/17 16:03:45 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/04/27 15:14:58 zuntum Exp $
 
-SHA1 (fvwm-2.3.29.tar.gz) = 8205ff58f881035ecbbb7e07aba50d2ae749409d
-Size (fvwm-2.3.29.tar.gz) = 1616825 bytes
+SHA1 (fvwm-2.3.31.tar.gz) = c1dbfe6d0e6a298195a97f549b3ca1ecacd4e2d4
+Size (fvwm-2.3.31.tar.gz) = 1629547 bytes
 SHA1 (fvwm_icons.tgz) = 418356862ab564ac0b771300b53004aea7c7c1ec
 Size (fvwm_icons.tgz) = 368640 bytes
-SHA1 (patch-aa) = 0f1a1b3a8d9df1482a91c6985d416067b2755977
+SHA1 (patch-aa) = fffa99f080c706c26c381c1bde4ce838e8beea34
diff --git a/wm/fvwm2-current/patches/patch-aa b/wm/fvwm2-current/patches/patch-aa
index d35839f01f8..dcde6b6c3d5 100644
--- a/wm/fvwm2-current/patches/patch-aa
+++ b/wm/fvwm2-current/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/20 14:54:36 rh Exp $
+$NetBSD: patch-aa,v 1.2 2001/04/27 15:14:59 zuntum Exp $
 
 --- utils/Makefile.in.orig	Fri Mar  2 19:38:46 2001
 +++ utils/Makefile.in
@@ -6,12 +6,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/20 14:54:36 rh Exp $
  xpm_CFLAGS = @xpm_CFLAGS@
  xpm_LIBS = @xpm_LIBS@
  
--bin_PROGRAMS = @XPMROOT@ xselection
-+bin_PROGRAMS = xselection
+-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
+ EXTRA_PROGRAMS = xpmroot 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
diff --git a/wm/fvwm2-current/pkg/PLIST b/wm/fvwm2-current/pkg/PLIST
index 2056630b40e..a666b1757cb 100644
--- a/wm/fvwm2-current/pkg/PLIST
+++ b/wm/fvwm2-current/pkg/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2001/03/28 10:10:24 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/04/27 15:14:59 zuntum Exp $
 bin/fvwm2
 bin/FvwmCommand
-bin/xselection
 bin/fvwm-config
 bin/fvwmbug
 bin/fvwm-menu-xlock
@@ -343,6 +342,7 @@ libexec/fvwm/${VERSION}/FvwmDebug
 libexec/fvwm/${VERSION}/FvwmDragWell
 libexec/fvwm/${VERSION}/FvwmEvent
 libexec/fvwm/${VERSION}/FvwmForm
+libexec/fvwm/${VERSION}/FvwmGtk
 libexec/fvwm/${VERSION}/FvwmTalk
 libexec/fvwm/${VERSION}/FvwmIconBox
 libexec/fvwm/${VERSION}/FvwmIconMan