Update port to version 2.2.5.

Install default configuration file in etc. This file is not managed at
install/deinstall times because it is actually a sample file: it will be
used only if you don't have a per-user .fvwm2rc file.

PR:		25691 (modified)
Submitted by:	Martti Kuparinen <martti.kuparinen@iki.fi>

3 files changed, 41 insertions, 39 deletions

diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile
index 6c43142674f3..7dfdaa6cc9c0 100644
--- a/x11-wm/fvwm24/Makefile
+++ b/x11-wm/fvwm24/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fvwm
-PORTVERSION=	2.2.4
+PORTVERSION=	2.2.5
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/
@@ -30,6 +30,8 @@ MAN1=	FvwmAnimate.1 FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \
 
 post-install:
 	@${MKDIR} ${PREFIX}/icons
+	@${MKDIR} ${PREFIX}/etc
+	@${CP} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc ${PREFIX}/etc
 	${INSTALL_DATA} ${WRKDIR}/*.xpm ${PREFIX}/icons
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/x11-wm/fvwm24/distinfo b/x11-wm/fvwm24/distinfo
index 99cda52ce627..6172d2304249 100644
--- a/x11-wm/fvwm24/distinfo
+++ b/x11-wm/fvwm24/distinfo
@@ -1,2 +1,2 @@
-MD5 (fvwm-2.2.4.tar.gz) = 14ec1ca8ba305345078b7ed4c9cfdcfb
+MD5 (fvwm-2.2.5.tar.gz) = 4d871dc12d7534843f6b311add963030
 MD5 (fvwm_icons.tgz) = 7b254da269a236d77c790581701442cb
diff --git a/x11-wm/fvwm24/pkg-plist b/x11-wm/fvwm24/pkg-plist
index 99399f6b73b2..e8d442e8ac4b 100644
--- a/x11-wm/fvwm24/pkg-plist
+++ b/x11-wm/fvwm24/pkg-plist
@@ -1,6 +1,7 @@
-bin/fvwm2
 bin/FvwmCommand
+bin/fvwm2
 bin/xpmroot
+etc/system.fvwm2rc
 icons/Jlock.xpm
 icons/Jnews.xpm
 icons/Jrecycle.xpm
@@ -317,40 +318,39 @@ icons/xterm.xpm
 icons/xv.xpm
 icons/xv2.xpm
 icons/xview.xpm
-libexec/fvwm/2.2.4/FvwmAnimate
-libexec/fvwm/2.2.4/FvwmAudio
-libexec/fvwm/2.2.4/FvwmAuto
-libexec/fvwm/2.2.4/FvwmBacker
-libexec/fvwm/2.2.4/FvwmBanner
-libexec/fvwm/2.2.4/FvwmButtons
-libexec/fvwm/2.2.4/FvwmCpp
-libexec/fvwm/2.2.4/FvwmEvent
-libexec/fvwm/2.2.4/FvwmForm
-libexec/fvwm/2.2.4/FvwmIconBox
-libexec/fvwm/2.2.4/FvwmIconMan
-libexec/fvwm/2.2.4/FvwmIdent
-libexec/fvwm/2.2.4/FvwmM4
-libexec/fvwm/2.2.4/FvwmPager
-libexec/fvwm/2.2.4/FvwmRearrange
-libexec/fvwm/2.2.4/FvwmCascade
-libexec/fvwm/2.2.4/FvwmTile
-libexec/fvwm/2.2.4/FvwmSave
-libexec/fvwm/2.2.4/FvwmSaveDesk
-libexec/fvwm/2.2.4/FvwmScroll
-libexec/fvwm/2.2.4/FvwmTalk
-libexec/fvwm/2.2.4/FvwmWinList
-libexec/fvwm/2.2.4/FvwmCommandS
-libexec/fvwm/2.2.4/FvwmConfig
-libexec/fvwm/2.2.4/FvwmConsole
-libexec/fvwm/2.2.4/FvwmConsoleC
-libexec/fvwm/2.2.4/FvwmConsoleC.pl
-libexec/fvwm/2.2.4/FvwmDebug
-libexec/fvwm/2.2.4/FvwmGoodStuff
-libexec/fvwm/2.2.4/FvwmPipe
-libexec/fvwm/2.2.4/FvwmScript
-libexec/fvwm/2.2.4/FvwmTaskBar
-libexec/fvwm/2.2.4/FvwmWharf
-@dirrm lib/X11/fvwm2
-@dirrm libexec/fvwm/2.2.4
+libexec/fvwm/2.2.5/FvwmAnimate
+libexec/fvwm/2.2.5/FvwmAudio
+libexec/fvwm/2.2.5/FvwmAuto
+libexec/fvwm/2.2.5/FvwmBacker
+libexec/fvwm/2.2.5/FvwmBanner
+libexec/fvwm/2.2.5/FvwmButtons
+libexec/fvwm/2.2.5/FvwmCascade
+libexec/fvwm/2.2.5/FvwmCommandS
+libexec/fvwm/2.2.5/FvwmConfig
+libexec/fvwm/2.2.5/FvwmConsole
+libexec/fvwm/2.2.5/FvwmConsoleC
+libexec/fvwm/2.2.5/FvwmConsoleC.pl
+libexec/fvwm/2.2.5/FvwmCpp
+libexec/fvwm/2.2.5/FvwmDebug
+libexec/fvwm/2.2.5/FvwmEvent
+libexec/fvwm/2.2.5/FvwmForm
+libexec/fvwm/2.2.5/FvwmGoodStuff
+libexec/fvwm/2.2.5/FvwmIconBox
+libexec/fvwm/2.2.5/FvwmIconMan
+libexec/fvwm/2.2.5/FvwmIdent
+libexec/fvwm/2.2.5/FvwmM4
+libexec/fvwm/2.2.5/FvwmPager
+libexec/fvwm/2.2.5/FvwmPipe
+libexec/fvwm/2.2.5/FvwmRearrange
+libexec/fvwm/2.2.5/FvwmSave
+libexec/fvwm/2.2.5/FvwmSaveDesk
+libexec/fvwm/2.2.5/FvwmScript
+libexec/fvwm/2.2.5/FvwmScroll
+libexec/fvwm/2.2.5/FvwmTalk
+libexec/fvwm/2.2.5/FvwmTaskBar
+libexec/fvwm/2.2.5/FvwmTile
+libexec/fvwm/2.2.5/FvwmWharf
+libexec/fvwm/2.2.5/FvwmWinList
+@dirrm libexec/fvwm/2.2.5
 @dirrm libexec/fvwm
-@dirrm icons
+@unexec rmdir %D/icons 2>/dev/null || true