6 files changed, 84 insertions, 84 deletions

diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index 185bc26f48ed..81105382f7ac 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fvwm
-PORTVERSION=	2.4.3
+PORTVERSION=	2.4.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/
@@ -32,10 +32,10 @@ PLIST_SUB+=	FVWM_VERSION="${PORTVERSION}"
 
 .if defined(HAVE_GNOME)
 USE_GNOME=	yes
-PLIST_SUB+=	GNOME=""
+PLIST_SUB+=	GNOMEDATADIR="share/gnome/fvwm"
 .else
 CONFIGURE_ARGS+=	--disable-gnome
-PLIST_SUB+=	GNOME="@comment "
+PLIST_SUB+=	GNOMEDATADIR="share/fvwm"
 .endif
 
 MAN1=	FvwmAnimate.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \
diff --git a/x11-wm/fvwm2/distinfo b/x11-wm/fvwm2/distinfo
index 0a8786c55878..b7d5fa271d47 100644
--- a/x11-wm/fvwm2/distinfo
+++ b/x11-wm/fvwm2/distinfo
@@ -1,2 +1,2 @@
-MD5 (fvwm-2.4.3.tar.gz) = 20c820251e98ac92cc281a5a0c538328
+MD5 (fvwm-2.4.4.tar.gz) = fdc03dda6d2fc56f89bc4cd80c4973da
 MD5 (fvwm_icons.tgz) = 7b254da269a236d77c790581701442cb
diff --git a/x11-wm/fvwm2/pkg-plist b/x11-wm/fvwm2/pkg-plist
index c677fa2c3ef3..fc9e521939bc 100644
--- a/x11-wm/fvwm2/pkg-plist
+++ b/x11-wm/fvwm2/pkg-plist
@@ -362,45 +362,45 @@ share/fvwm2/pixmaps/xterm.xpm
 share/fvwm2/pixmaps/xv.xpm
 share/fvwm2/pixmaps/xv2.xpm
 share/fvwm2/pixmaps/xview.xpm
-%%GNOME%%share/gnome/fvwm/ConfigFvwmBacker
-%%GNOME%%share/gnome/fvwm/ConfigFvwmButtons
-%%GNOME%%share/gnome/fvwm/ConfigFvwmDefaults
-%%GNOME%%share/gnome/fvwm/ConfigFvwmIconBox
-%%GNOME%%share/gnome/fvwm/ConfigFvwmIconMan
-%%GNOME%%share/gnome/fvwm/ConfigFvwmIdent
-%%GNOME%%share/gnome/fvwm/ConfigFvwmPager
-%%GNOME%%share/gnome/fvwm/ConfigFvwmScroll
-%%GNOME%%share/gnome/fvwm/ConfigFvwmSetup
-%%GNOME%%share/gnome/fvwm/ConfigFvwmTaskBar
-%%GNOME%%share/gnome/fvwm/ConfigFvwmWinList
-%%GNOME%%share/gnome/fvwm/FvwmForm-Capture
-%%GNOME%%share/gnome/fvwm/FvwmForm-Form
-%%GNOME%%share/gnome/fvwm/FvwmForm-QuitVerify
-%%GNOME%%share/gnome/fvwm/FvwmForm-Rlogin
-%%GNOME%%share/gnome/fvwm/FvwmForm-RootCursor
-%%GNOME%%share/gnome/fvwm/FvwmForm-Setup
-%%GNOME%%share/gnome/fvwm/FvwmForm-Talk
-%%GNOME%%share/gnome/fvwm/FvwmForm-TalkHelp
-%%GNOME%%share/gnome/fvwm/FvwmScript-BaseConfig
-%%GNOME%%share/gnome/fvwm/FvwmScript-BellSetup
-%%GNOME%%share/gnome/fvwm/FvwmScript-Buttons
-%%GNOME%%share/gnome/fvwm/FvwmScript-Colorset
-%%GNOME%%share/gnome/fvwm/FvwmScript-Date
-%%GNOME%%share/gnome/fvwm/FvwmScript-FileBrowser
-%%GNOME%%share/gnome/fvwm/FvwmScript-Find
-%%GNOME%%share/gnome/fvwm/FvwmScript-KeyboardSetup
-%%GNOME%%share/gnome/fvwm/FvwmScript-PointerSetup
-%%GNOME%%share/gnome/fvwm/FvwmScript-Quit
-%%GNOME%%share/gnome/fvwm/FvwmScript-ScreenDump
-%%GNOME%%share/gnome/fvwm/FvwmScript-ScreenSetup
-%%GNOME%%share/gnome/fvwm/FvwmScript-Setup95
-%%GNOME%%share/gnome/fvwm/FvwmScript-WidgetDemo
-%%GNOME%%share/gnome/fvwm/fvwm-script-setup95.pl
-%%GNOME%%share/gnome/fvwm/system.fvwm2rc-sample-95
-%%GNOME%%@dirrm share/gnome/fvwm
-%%GNOME%%@unexec rmdir %D/share/gnome 2>/dev/null || true
+%%GNOMEDATADIR%%/ConfigFvwmBacker
+%%GNOMEDATADIR%%/ConfigFvwmButtons
+%%GNOMEDATADIR%%/ConfigFvwmDefaults
+%%GNOMEDATADIR%%/ConfigFvwmIconBox
+%%GNOMEDATADIR%%/ConfigFvwmIconMan
+%%GNOMEDATADIR%%/ConfigFvwmIdent
+%%GNOMEDATADIR%%/ConfigFvwmPager
+%%GNOMEDATADIR%%/ConfigFvwmScroll
+%%GNOMEDATADIR%%/ConfigFvwmSetup
+%%GNOMEDATADIR%%/ConfigFvwmTaskBar
+%%GNOMEDATADIR%%/ConfigFvwmWinList
+%%GNOMEDATADIR%%/FvwmForm-Capture
+%%GNOMEDATADIR%%/FvwmForm-Form
+%%GNOMEDATADIR%%/FvwmForm-QuitVerify
+%%GNOMEDATADIR%%/FvwmForm-Rlogin
+%%GNOMEDATADIR%%/FvwmForm-RootCursor
+%%GNOMEDATADIR%%/FvwmForm-Setup
+%%GNOMEDATADIR%%/FvwmForm-Talk
+%%GNOMEDATADIR%%/FvwmForm-TalkHelp
+%%GNOMEDATADIR%%/FvwmScript-BaseConfig
+%%GNOMEDATADIR%%/FvwmScript-BellSetup
+%%GNOMEDATADIR%%/FvwmScript-Buttons
+%%GNOMEDATADIR%%/FvwmScript-Colorset
+%%GNOMEDATADIR%%/FvwmScript-ComExample
+%%GNOMEDATADIR%%/FvwmScript-Date
+%%GNOMEDATADIR%%/FvwmScript-FileBrowser
+%%GNOMEDATADIR%%/FvwmScript-Find
+%%GNOMEDATADIR%%/FvwmScript-KeyboardSetup
+%%GNOMEDATADIR%%/FvwmScript-PointerSetup
+%%GNOMEDATADIR%%/FvwmScript-Quit
+%%GNOMEDATADIR%%/FvwmScript-ScreenDump
+%%GNOMEDATADIR%%/FvwmScript-ScreenSetup
+%%GNOMEDATADIR%%/FvwmScript-Setup95
+%%GNOMEDATADIR%%/FvwmScript-WidgetDemo
+%%GNOMEDATADIR%%/fvwm-script-ComExample.pl
+%%GNOMEDATADIR%%/fvwm-script-setup95.pl
+%%GNOMEDATADIR%%/system.fvwm2rc-sample-95
+@dirrm %%GNOMEDATADIR%%
 @dirrm share/fvwm2/pixmaps
 @dirrm share/fvwm2
-@dirrm share/fvwm
 @dirrm libexec/fvwm/%%FVWM_VERSION%%
 @dirrm libexec/fvwm
diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile
index 185bc26f48ed..81105382f7ac 100644
--- a/x11-wm/fvwm24/Makefile
+++ b/x11-wm/fvwm24/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fvwm
-PORTVERSION=	2.4.3
+PORTVERSION=	2.4.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
 		http://www.fvwm.org/generated/icon_download/
@@ -32,10 +32,10 @@ PLIST_SUB+=	FVWM_VERSION="${PORTVERSION}"
 
 .if defined(HAVE_GNOME)
 USE_GNOME=	yes
-PLIST_SUB+=	GNOME=""
+PLIST_SUB+=	GNOMEDATADIR="share/gnome/fvwm"
 .else
 CONFIGURE_ARGS+=	--disable-gnome
-PLIST_SUB+=	GNOME="@comment "
+PLIST_SUB+=	GNOMEDATADIR="share/fvwm"
 .endif
 
 MAN1=	FvwmAnimate.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \
diff --git a/x11-wm/fvwm24/distinfo b/x11-wm/fvwm24/distinfo
index 0a8786c55878..b7d5fa271d47 100644
--- a/x11-wm/fvwm24/distinfo
+++ b/x11-wm/fvwm24/distinfo
@@ -1,2 +1,2 @@
-MD5 (fvwm-2.4.3.tar.gz) = 20c820251e98ac92cc281a5a0c538328
+MD5 (fvwm-2.4.4.tar.gz) = fdc03dda6d2fc56f89bc4cd80c4973da
 MD5 (fvwm_icons.tgz) = 7b254da269a236d77c790581701442cb
diff --git a/x11-wm/fvwm24/pkg-plist b/x11-wm/fvwm24/pkg-plist
index c677fa2c3ef3..fc9e521939bc 100644
--- a/x11-wm/fvwm24/pkg-plist
+++ b/x11-wm/fvwm24/pkg-plist
@@ -362,45 +362,45 @@ share/fvwm2/pixmaps/xterm.xpm
 share/fvwm2/pixmaps/xv.xpm
 share/fvwm2/pixmaps/xv2.xpm
 share/fvwm2/pixmaps/xview.xpm
-%%GNOME%%share/gnome/fvwm/ConfigFvwmBacker
-%%GNOME%%share/gnome/fvwm/ConfigFvwmButtons
-%%GNOME%%share/gnome/fvwm/ConfigFvwmDefaults
-%%GNOME%%share/gnome/fvwm/ConfigFvwmIconBox
-%%GNOME%%share/gnome/fvwm/ConfigFvwmIconMan
-%%GNOME%%share/gnome/fvwm/ConfigFvwmIdent
-%%GNOME%%share/gnome/fvwm/ConfigFvwmPager
-%%GNOME%%share/gnome/fvwm/ConfigFvwmScroll
-%%GNOME%%share/gnome/fvwm/ConfigFvwmSetup
-%%GNOME%%share/gnome/fvwm/ConfigFvwmTaskBar
-%%GNOME%%share/gnome/fvwm/ConfigFvwmWinList
-%%GNOME%%share/gnome/fvwm/FvwmForm-Capture
-%%GNOME%%share/gnome/fvwm/FvwmForm-Form
-%%GNOME%%share/gnome/fvwm/FvwmForm-QuitVerify
-%%GNOME%%share/gnome/fvwm/FvwmForm-Rlogin
-%%GNOME%%share/gnome/fvwm/FvwmForm-RootCursor
-%%GNOME%%share/gnome/fvwm/FvwmForm-Setup
-%%GNOME%%share/gnome/fvwm/FvwmForm-Talk
-%%GNOME%%share/gnome/fvwm/FvwmForm-TalkHelp
-%%GNOME%%share/gnome/fvwm/FvwmScript-BaseConfig
-%%GNOME%%share/gnome/fvwm/FvwmScript-BellSetup
-%%GNOME%%share/gnome/fvwm/FvwmScript-Buttons
-%%GNOME%%share/gnome/fvwm/FvwmScript-Colorset
-%%GNOME%%share/gnome/fvwm/FvwmScript-Date
-%%GNOME%%share/gnome/fvwm/FvwmScript-FileBrowser
-%%GNOME%%share/gnome/fvwm/FvwmScript-Find
-%%GNOME%%share/gnome/fvwm/FvwmScript-KeyboardSetup
-%%GNOME%%share/gnome/fvwm/FvwmScript-PointerSetup
-%%GNOME%%share/gnome/fvwm/FvwmScript-Quit
-%%GNOME%%share/gnome/fvwm/FvwmScript-ScreenDump
-%%GNOME%%share/gnome/fvwm/FvwmScript-ScreenSetup
-%%GNOME%%share/gnome/fvwm/FvwmScript-Setup95
-%%GNOME%%share/gnome/fvwm/FvwmScript-WidgetDemo
-%%GNOME%%share/gnome/fvwm/fvwm-script-setup95.pl
-%%GNOME%%share/gnome/fvwm/system.fvwm2rc-sample-95
-%%GNOME%%@dirrm share/gnome/fvwm
-%%GNOME%%@unexec rmdir %D/share/gnome 2>/dev/null || true
+%%GNOMEDATADIR%%/ConfigFvwmBacker
+%%GNOMEDATADIR%%/ConfigFvwmButtons
+%%GNOMEDATADIR%%/ConfigFvwmDefaults
+%%GNOMEDATADIR%%/ConfigFvwmIconBox
+%%GNOMEDATADIR%%/ConfigFvwmIconMan
+%%GNOMEDATADIR%%/ConfigFvwmIdent
+%%GNOMEDATADIR%%/ConfigFvwmPager
+%%GNOMEDATADIR%%/ConfigFvwmScroll
+%%GNOMEDATADIR%%/ConfigFvwmSetup
+%%GNOMEDATADIR%%/ConfigFvwmTaskBar
+%%GNOMEDATADIR%%/ConfigFvwmWinList
+%%GNOMEDATADIR%%/FvwmForm-Capture
+%%GNOMEDATADIR%%/FvwmForm-Form
+%%GNOMEDATADIR%%/FvwmForm-QuitVerify
+%%GNOMEDATADIR%%/FvwmForm-Rlogin
+%%GNOMEDATADIR%%/FvwmForm-RootCursor
+%%GNOMEDATADIR%%/FvwmForm-Setup
+%%GNOMEDATADIR%%/FvwmForm-Talk
+%%GNOMEDATADIR%%/FvwmForm-TalkHelp
+%%GNOMEDATADIR%%/FvwmScript-BaseConfig
+%%GNOMEDATADIR%%/FvwmScript-BellSetup
+%%GNOMEDATADIR%%/FvwmScript-Buttons
+%%GNOMEDATADIR%%/FvwmScript-Colorset
+%%GNOMEDATADIR%%/FvwmScript-ComExample
+%%GNOMEDATADIR%%/FvwmScript-Date
+%%GNOMEDATADIR%%/FvwmScript-FileBrowser
+%%GNOMEDATADIR%%/FvwmScript-Find
+%%GNOMEDATADIR%%/FvwmScript-KeyboardSetup
+%%GNOMEDATADIR%%/FvwmScript-PointerSetup
+%%GNOMEDATADIR%%/FvwmScript-Quit
+%%GNOMEDATADIR%%/FvwmScript-ScreenDump
+%%GNOMEDATADIR%%/FvwmScript-ScreenSetup
+%%GNOMEDATADIR%%/FvwmScript-Setup95
+%%GNOMEDATADIR%%/FvwmScript-WidgetDemo
+%%GNOMEDATADIR%%/fvwm-script-ComExample.pl
+%%GNOMEDATADIR%%/fvwm-script-setup95.pl
+%%GNOMEDATADIR%%/system.fvwm2rc-sample-95
+@dirrm %%GNOMEDATADIR%%
 @dirrm share/fvwm2/pixmaps
 @dirrm share/fvwm2
-@dirrm share/fvwm
 @dirrm libexec/fvwm/%%FVWM_VERSION%%
 @dirrm libexec/fvwm