update to 2.3.26 and added gnome support.

PR:		24001
Submitted by:	Martti Kuparinen <martti.kuparinen@piuha.net>
Approved by:	maintainer

8 files changed, 60 insertions, 98 deletions

diff --git a/x11-wm/fvwm2-beta/Makefile b/x11-wm/fvwm2-beta/Makefile
index dde1597a6735..46ad88f85f43 100644
--- a/x11-wm/fvwm2-beta/Makefile
+++ b/x11-wm/fvwm2-beta/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fvwm
-PORTVERSION=	2.3.20
+PORTVERSION=	2.3.26
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/
@@ -20,6 +20,7 @@ USE_XPM=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 PLIST_SUB=	VER=${PORTVERSION}
+CONFIGURE_ARGS=	--enable-gnome
 
 MAN1=	FvwmAuto.1 FvwmAnimate.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \
 	FvwmCommand.1 FvwmConsole.1 FvwmConsoleC.pl.1 FvwmCpp.1 FvwmDebug.1 \
@@ -28,7 +29,8 @@ MAN1=	FvwmAuto.1 FvwmAnimate.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \
 	FvwmSave.1 FvwmSaveDesk.1 FvwmScript.1 FvwmScroll.1 FvwmTaskBar.1 \
 	FvwmTheme.1 FvwmWharf.1 FvwmWinList.1 \
 	fvwm-menu-xlock.1 fvwm-menu-directory.1 fvwm-menu-desktop.1 \
-	fvwm-menu-headlines.1 fvwm2.1 fvwmbug.1 fvwmrc_convert.1 xpmroot.1
+	fvwm-menu-headlines.1 fvwm2.1 fvwm24_convert.1 fvwmbug.1 \
+	fvwmrc_convert.1 xpmroot.1
 
 post-extract:
 	@if ! (cd ${WRKDIR}/${DISTNAME} && ${MKDIR} icons && cd icons && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/fvwm_icons.tgz ${EXTRACT_AFTER_ARGS}); then \
@@ -39,6 +41,5 @@ post-install:
 	@${MKDIR} ${PREFIX}/lib/X11/fvwm2/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/icons/*.xpm \
 		${PREFIX}/lib/X11/fvwm2/pixmaps
-	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/fvwm2-beta/distinfo b/x11-wm/fvwm2-beta/distinfo
index 59e6917fe797..01f89bfbd64b 100644
--- a/x11-wm/fvwm2-beta/distinfo
+++ b/x11-wm/fvwm2-beta/distinfo
@@ -1,2 +1,2 @@
-MD5 (fvwm-2.3.20.tar.gz) = 88f5dd56927134a3eaa42b8e03859c00
+MD5 (fvwm-2.3.26.tar.gz) = 03032f7ea722ce71ba8def2dd1936867
 MD5 (fvwm_icons.tgz) = 7b254da269a236d77c790581701442cb
diff --git a/x11-wm/fvwm2-beta/pkg-message b/x11-wm/fvwm2-beta/pkg-message
deleted file mode 100644
index 4d4ca35e6d57..000000000000
--- a/x11-wm/fvwm2-beta/pkg-message
+++ /dev/null
@@ -1,22 +0,0 @@
-Notes for XFree86 3.3/3.3.1 and LANG=ja_JP.EUC:
-
-There are some bug (?) in already released XFree86 based on X11R6.3, i.e.,
-XFree86 3.3 and XFree86 3.3.1, when X client runs under LANG=ja_JP.EUC.
-
-If you want to use this fvwm2 with LANG=ja_JP.EUC (which means "run fvwm2,
-with environment variable 'LANG' is set to 'ja_JP.EUC' to enable to display
-Japanese Kanji/Hiragana/Katakana characters"), apply following patch to
-/usr/X11R6/lib/X11/locale/ja/XLC_LOCALE (or equivalent).
-
-*** lib/X11/locale/ja/XLC_LOCALE.dist	Mon Aug  4 16:44:48 1997
---- lib/X11/locale/ja/XLC_LOCALE	Wed Oct  8 01:28:00 1997
-***************
-*** 35,40 ****
---- 35,41 ----
-  	}
-  	font	{
-  		primary		JISX0201.1976-0:GR
-+ 		substitute	JISX0201.1976-0:GR
-  		vertical_rotate	all
-  	}
-  }
diff --git a/x11-wm/fvwm2-beta/pkg-plist b/x11-wm/fvwm2-beta/pkg-plist
index 4ff1f3cfe1a6..0665de79a2c1 100644
--- a/x11-wm/fvwm2-beta/pkg-plist
+++ b/x11-wm/fvwm2-beta/pkg-plist
@@ -5,6 +5,7 @@ bin/fvwm-menu-directory
 bin/fvwm-menu-headlines
 bin/fvwm-menu-xlock
 bin/fvwm2
+bin/fvwm24_convert
 bin/fvwmbug
 bin/xpmroot
 bin/xselection
@@ -363,32 +364,33 @@ share/fvwm/ConfigFvwmDefaults
 share/fvwm/ConfigFvwmSetup
 share/fvwm/ConfigFvwmBacker
 share/fvwm/ConfigFvwmButtons
-share/fvwm/FormFvwmSetup.
-share/fvwm/FormFvwmForm.
-share/fvwm/FormFvwmCapture.
-share/fvwm/FormFvwmQuitVerify.
-share/fvwm/FormFvwmRlogin.
-share/fvwm/FormFvwmRootCursor.
-share/fvwm/FormFvwmTalk.
-share/fvwm/FormFvwmTalkHelp.
+share/fvwm/FvwmForm-Setup
+share/fvwm/FvwmForm-Form
+share/fvwm/FvwmForm-Capture
+share/fvwm/FvwmForm-QuitVerify
+share/fvwm/FvwmForm-Rlogin
+share/fvwm/FvwmForm-RootCursor
+share/fvwm/FvwmForm-Talk
+share/fvwm/FvwmForm-TalkHelp
 share/fvwm/ConfigFvwmIconBox
 share/fvwm/ConfigFvwmIconMan
 share/fvwm/ConfigFvwmIdent
 share/fvwm/ConfigFvwmPager
-share/fvwm/ScriptFvwmBellSetup
-share/fvwm/ScriptFvwmButtons
-share/fvwm/ScriptFvwmColorset
-share/fvwm/ScriptFvwmDate
-share/fvwm/ScriptFvwmBaseConfig
-share/fvwm/ScriptFvwmFileBrowser
-share/fvwm/ScriptFvwmFind
-share/fvwm/ScriptFvwmKeyboardSetup
-share/fvwm/ScriptFvwmPointerSetup
-share/fvwm/ScriptFvwmQuit
-share/fvwm/ScriptFvwmScreenDump
-share/fvwm/ScriptFvwmScreenSetup
-share/fvwm/ScriptFvwmSetup95
-share/fvwm/script-fvwm-setup95.pl
+share/fvwm/FvwmScript-BellSetup
+share/fvwm/FvwmScript-Buttons
+share/fvwm/FvwmScript-Colorset
+share/fvwm/FvwmScript-Date
+share/fvwm/FvwmScript-BaseConfig
+share/fvwm/FvwmScript-FileBrowser
+share/fvwm/FvwmScript-Find
+share/fvwm/FvwmScript-KeyboardSetup
+share/fvwm/FvwmScript-PointerSetup
+share/fvwm/FvwmScript-Quit
+share/fvwm/FvwmScript-ScreenDump
+share/fvwm/FvwmScript-ScreenSetup
+share/fvwm/FvwmScript-Setup95
+share/fvwm/FvwmScript-WidgetDemo
+share/fvwm/fvwm-script-setup95.pl
 share/fvwm/ConfigFvwmScroll
 share/fvwm/ConfigFvwmTaskBar
 share/fvwm/ConfigFvwmWinList
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index dde1597a6735..46ad88f85f43 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fvwm
-PORTVERSION=	2.3.20
+PORTVERSION=	2.3.26
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/
@@ -20,6 +20,7 @@ USE_XPM=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 PLIST_SUB=	VER=${PORTVERSION}
+CONFIGURE_ARGS=	--enable-gnome
 
 MAN1=	FvwmAuto.1 FvwmAnimate.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \
 	FvwmCommand.1 FvwmConsole.1 FvwmConsoleC.pl.1 FvwmCpp.1 FvwmDebug.1 \
@@ -28,7 +29,8 @@ MAN1=	FvwmAuto.1 FvwmAnimate.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \
 	FvwmSave.1 FvwmSaveDesk.1 FvwmScript.1 FvwmScroll.1 FvwmTaskBar.1 \
 	FvwmTheme.1 FvwmWharf.1 FvwmWinList.1 \
 	fvwm-menu-xlock.1 fvwm-menu-directory.1 fvwm-menu-desktop.1 \
-	fvwm-menu-headlines.1 fvwm2.1 fvwmbug.1 fvwmrc_convert.1 xpmroot.1
+	fvwm-menu-headlines.1 fvwm2.1 fvwm24_convert.1 fvwmbug.1 \
+	fvwmrc_convert.1 xpmroot.1
 
 post-extract:
 	@if ! (cd ${WRKDIR}/${DISTNAME} && ${MKDIR} icons && cd icons && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/fvwm_icons.tgz ${EXTRACT_AFTER_ARGS}); then \
@@ -39,6 +41,5 @@ post-install:
 	@${MKDIR} ${PREFIX}/lib/X11/fvwm2/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/icons/*.xpm \
 		${PREFIX}/lib/X11/fvwm2/pixmaps
-	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/fvwm2-devel/distinfo b/x11-wm/fvwm2-devel/distinfo
index 59e6917fe797..01f89bfbd64b 100644
--- a/x11-wm/fvwm2-devel/distinfo
+++ b/x11-wm/fvwm2-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (fvwm-2.3.20.tar.gz) = 88f5dd56927134a3eaa42b8e03859c00
+MD5 (fvwm-2.3.26.tar.gz) = 03032f7ea722ce71ba8def2dd1936867
 MD5 (fvwm_icons.tgz) = 7b254da269a236d77c790581701442cb
diff --git a/x11-wm/fvwm2-devel/pkg-message b/x11-wm/fvwm2-devel/pkg-message
deleted file mode 100644
index 4d4ca35e6d57..000000000000
--- a/x11-wm/fvwm2-devel/pkg-message
+++ /dev/null
@@ -1,22 +0,0 @@
-Notes for XFree86 3.3/3.3.1 and LANG=ja_JP.EUC:
-
-There are some bug (?) in already released XFree86 based on X11R6.3, i.e.,
-XFree86 3.3 and XFree86 3.3.1, when X client runs under LANG=ja_JP.EUC.
-
-If you want to use this fvwm2 with LANG=ja_JP.EUC (which means "run fvwm2,
-with environment variable 'LANG' is set to 'ja_JP.EUC' to enable to display
-Japanese Kanji/Hiragana/Katakana characters"), apply following patch to
-/usr/X11R6/lib/X11/locale/ja/XLC_LOCALE (or equivalent).
-
-*** lib/X11/locale/ja/XLC_LOCALE.dist	Mon Aug  4 16:44:48 1997
---- lib/X11/locale/ja/XLC_LOCALE	Wed Oct  8 01:28:00 1997
-***************
-*** 35,40 ****
---- 35,41 ----
-  	}
-  	font	{
-  		primary		JISX0201.1976-0:GR
-+ 		substitute	JISX0201.1976-0:GR
-  		vertical_rotate	all
-  	}
-  }
diff --git a/x11-wm/fvwm2-devel/pkg-plist b/x11-wm/fvwm2-devel/pkg-plist
index 4ff1f3cfe1a6..0665de79a2c1 100644
--- a/x11-wm/fvwm2-devel/pkg-plist
+++ b/x11-wm/fvwm2-devel/pkg-plist
@@ -5,6 +5,7 @@ bin/fvwm-menu-directory
 bin/fvwm-menu-headlines
 bin/fvwm-menu-xlock
 bin/fvwm2
+bin/fvwm24_convert
 bin/fvwmbug
 bin/xpmroot
 bin/xselection
@@ -363,32 +364,33 @@ share/fvwm/ConfigFvwmDefaults
 share/fvwm/ConfigFvwmSetup
 share/fvwm/ConfigFvwmBacker
 share/fvwm/ConfigFvwmButtons
-share/fvwm/FormFvwmSetup.
-share/fvwm/FormFvwmForm.
-share/fvwm/FormFvwmCapture.
-share/fvwm/FormFvwmQuitVerify.
-share/fvwm/FormFvwmRlogin.
-share/fvwm/FormFvwmRootCursor.
-share/fvwm/FormFvwmTalk.
-share/fvwm/FormFvwmTalkHelp.
+share/fvwm/FvwmForm-Setup
+share/fvwm/FvwmForm-Form
+share/fvwm/FvwmForm-Capture
+share/fvwm/FvwmForm-QuitVerify
+share/fvwm/FvwmForm-Rlogin
+share/fvwm/FvwmForm-RootCursor
+share/fvwm/FvwmForm-Talk
+share/fvwm/FvwmForm-TalkHelp
 share/fvwm/ConfigFvwmIconBox
 share/fvwm/ConfigFvwmIconMan
 share/fvwm/ConfigFvwmIdent
 share/fvwm/ConfigFvwmPager
-share/fvwm/ScriptFvwmBellSetup
-share/fvwm/ScriptFvwmButtons
-share/fvwm/ScriptFvwmColorset
-share/fvwm/ScriptFvwmDate
-share/fvwm/ScriptFvwmBaseConfig
-share/fvwm/ScriptFvwmFileBrowser
-share/fvwm/ScriptFvwmFind
-share/fvwm/ScriptFvwmKeyboardSetup
-share/fvwm/ScriptFvwmPointerSetup
-share/fvwm/ScriptFvwmQuit
-share/fvwm/ScriptFvwmScreenDump
-share/fvwm/ScriptFvwmScreenSetup
-share/fvwm/ScriptFvwmSetup95
-share/fvwm/script-fvwm-setup95.pl
+share/fvwm/FvwmScript-BellSetup
+share/fvwm/FvwmScript-Buttons
+share/fvwm/FvwmScript-Colorset
+share/fvwm/FvwmScript-Date
+share/fvwm/FvwmScript-BaseConfig
+share/fvwm/FvwmScript-FileBrowser
+share/fvwm/FvwmScript-Find
+share/fvwm/FvwmScript-KeyboardSetup
+share/fvwm/FvwmScript-PointerSetup
+share/fvwm/FvwmScript-Quit
+share/fvwm/FvwmScript-ScreenDump
+share/fvwm/FvwmScript-ScreenSetup
+share/fvwm/FvwmScript-Setup95
+share/fvwm/FvwmScript-WidgetDemo
+share/fvwm/fvwm-script-setup95.pl
 share/fvwm/ConfigFvwmScroll
 share/fvwm/ConfigFvwmTaskBar
 share/fvwm/ConfigFvwmWinList