Updated wm/fvwm-devel to 2.5.23

* Lots of bug fixes
* Fixed perl path in the installed package (detected with PKG_DEVELOPER=yes
  and CHECK_PORTABILITY=yes in /etc/mk.conf)

5 files changed, 44 insertions, 20 deletions

diff --git a/wm/fvwm-devel/Makefile b/wm/fvwm-devel/Makefile
index 81b6b886f46..08fda952295 100644
--- a/wm/fvwm-devel/Makefile
+++ b/wm/fvwm-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2007/11/01 10:36:58 martti Exp $
+# $NetBSD: Makefile,v 1.23 2007/11/09 12:07:06 martti Exp $
 
 DISTNAME=	fvwm-${FVWM_VER}
 #PKGREVISION=	1
@@ -12,7 +12,7 @@ COMMENT=	Development version of X11 Virtual window manager
 #LICENSE=	gnu-gpl-v2
 
 CONFLICTS=	fvwm1-[0-9]* fvwm2-[0-9]*
-FVWM_VER=	2.5.21
+FVWM_VER=	2.5.23
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
@@ -30,10 +30,29 @@ CONFIGURE_ARGS+=	--without-gnome
 CONFIGURE_ARGS+=	--without-rplay-library
 CONFIGURE_ARGS+=	--without-stroke-library
 
+SUBST_CLASSES+=		perl
+SUBST_STAGE.perl=	post-build
+SUBST_MESSAGE.perl=	Fixing path to perl
+SUBST_FILES.perl+=	bin/fvwm-convert-2.4
+SUBST_FILES.perl+=	bin/fvwm-convert-2.6
+SUBST_FILES.perl+=	bin/fvwm-menu-desktop
+SUBST_FILES.perl+=	bin/fvwm-menu-directory
+SUBST_FILES.perl+=	bin/fvwm-menu-headlines
+SUBST_FILES.perl+=	bin/fvwm-menu-xlock
+SUBST_FILES.perl+=	bin/fvwm-perllib
+SUBST_FILES.perl+=	modules/FvwmConsole/FvwmConsoleC.pl
+SUBST_FILES.perl+=	modules/FvwmDebug/FvwmDebug
+SUBST_FILES.perl+=	modules/FvwmDebug/FvwmGtkDebug
+SUBST_FILES.perl+=	modules/FvwmPerl/FvwmPerl
+SUBST_FILES.perl+=	modules/FvwmTabs/FvwmTabs
+SUBST_FILES.perl+=	modules/FvwmWindowMenu/FvwmWindowMenu
+SUBST_FILES.perl+=	modules/FvwmScript/Scripts/FvwmScript-ComExample
+SUBST_FILES.perl+=	modules/FvwmScript/Scripts/FvwmScript-Setup95
+SUBST_SED.perl=		-e "s|${TOOLS_CMD.perl}|${PERL5}|"
+
 post-install:
 	cd ${WRKSRC}/sample.fvwmrc && ${INSTALL_DATA} \
-		`${LS} | ${GREP} -v Makefile` \
-		${PREFIX}/share/examples/fvwm
+		`ls | grep -v Makefile` ${PREFIX}/share/examples/fvwm
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
diff --git a/wm/fvwm-devel/PLIST b/wm/fvwm-devel/PLIST
index ed6432d1c69..e31f52efb78 100644
--- a/wm/fvwm-devel/PLIST
+++ b/wm/fvwm-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2007/01/22 07:25:47 martti Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/11/09 12:07:06 martti Exp $
 bin/FvwmCommand
 bin/fvwm
 bin/fvwm-bug
@@ -109,7 +109,6 @@ share/fvwm/ConfigFvwmDefaults
 share/fvwm/ConfigFvwmIconBox
 share/fvwm/ConfigFvwmIconMan
 share/fvwm/ConfigFvwmIdent
-share/fvwm/ConfigFvwmMenuDefaults
 share/fvwm/ConfigFvwmPager
 share/fvwm/ConfigFvwmProxyDefaults
 share/fvwm/ConfigFvwmScroll
@@ -185,5 +184,11 @@ share/locale/zh_CN/LC_MESSAGES/fvwm.mo
 @dirrm share/fvwm/perllib
 @dirrm share/fvwm
 @dirrm share/examples/fvwm
+@dirrm share/doc/fvwm/modules
+@dirrm share/doc/fvwm/images/svg_rendering
+@dirrm share/doc/fvwm/images
+@dirrm share/doc/fvwm/fvwm
+@dirrm share/doc/fvwm/commands
+@dirrm share/doc/fvwm
 @dirrm libexec/fvwm/${FVWM_VER}
 @dirrm libexec/fvwm
diff --git a/wm/fvwm-devel/distinfo b/wm/fvwm-devel/distinfo
index 4b49a89c137..a497853d565 100644
--- a/wm/fvwm-devel/distinfo
+++ b/wm/fvwm-devel/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2007/01/22 07:25:47 martti Exp $
+$NetBSD: distinfo,v 1.13 2007/11/09 12:07:06 martti Exp $
 
-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
+SHA1 (fvwm-2.5.23.tar.bz2) = 0a80afc06b4d6729e73e7e3a5797ed98d01d1b4e
+RMD160 (fvwm-2.5.23.tar.bz2) = 214b834c9939ba062263b3ca7637df276bc86e8c
+Size (fvwm-2.5.23.tar.bz2) = 2513623 bytes
+SHA1 (patch-aa) = 5f530f15410c580dd3cad671e863d5f1506af2c6
+SHA1 (patch-ab) = 4df59dbcd630c2fcb1cf703bc4aefb7223081c7c
diff --git a/wm/fvwm-devel/patches/patch-aa b/wm/fvwm-devel/patches/patch-aa
index 1af14299ef4..eb18d6fec03 100644
--- a/wm/fvwm-devel/patches/patch-aa
+++ b/wm/fvwm-devel/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2007/01/22 07:25:48 martti Exp $
+$NetBSD: patch-aa,v 1.6 2007/11/09 12:07:06 martti Exp $
 
---- 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 @@
+--- bin/Makefile.in.orig	2007-09-01 10:30:54.000000000 +0000
++++ bin/Makefile.in	2007-11-07 08:14:22.000000000 +0000
+@@ -728,14 +728,8 @@
  	_fvwm-perllib.1
  
  install-exec-local:
diff --git a/wm/fvwm-devel/patches/patch-ab b/wm/fvwm-devel/patches/patch-ab
index 298ca5539a2..18157d612a4 100644
--- a/wm/fvwm-devel/patches/patch-ab
+++ b/wm/fvwm-devel/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2006/07/25 07:24:02 martti Exp $
+$NetBSD: patch-ab,v 1.3 2007/11/09 12:07:07 martti Exp $
 
---- config.h.in.orig	2006-07-19 20:34:57.000000000 +0000
-+++ config.h.in	2006-07-25 10:17:10.000000000 +0000
-@@ -521,7 +521,7 @@
+--- config.h.in.orig	2007-09-01 10:31:54.000000000 +0000
++++ config.h.in	2007-11-07 08:14:53.000000000 +0000
+@@ -530,7 +530,7 @@
         #pragma alloca
  #  else
  #    ifndef alloca /* predefined by HP cc +Olibcalls */