Remove pkg-plist redundancy.

2 files changed, 38 insertions, 41 deletions

diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index db9baf2..15deb78 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -52,13 +52,10 @@ USE_GNOME=	imlib
 PKGNAMESUFFIX=	-imlib
 CONFIGURE_ARGS+=	--with-gnome --enable-gnome-hints \
 			--enable-gtktest --enable-imlibtest
-PLIST_SUB+=	GNOMEDATADIR="share/fvwm"
-PLIST_SUB+=	GNOMEDATADIR="share/gnome/fvwm"
 PLIST_SUB+=	GTK=""
 .else
 CONFIGURE_ARGS+=	--without-gnome --disable-gnome-hints \
 			--disable-gtktest --disable-imlibtest
-PLIST_SUB+=	GNOMEDATADIR="share/fvwm"
 PLIST_SUB+=	GTK="@comment not installed: "
 .endif
 
diff --git a/x11-wm/fvwm2/pkg-plist b/x11-wm/fvwm2/pkg-plist
index f5d814d..ecf16ab 100644
--- a/x11-wm/fvwm2/pkg-plist
+++ b/x11-wm/fvwm2/pkg-plist
@@ -368,44 +368,44 @@ share/fvwm2/pixmaps/xterm.xpm
 share/fvwm2/pixmaps/xv.xpm
 share/fvwm2/pixmaps/xv2.xpm
 share/fvwm2/pixmaps/xview.xpm
-%%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%%
+share/fvwm/ConfigFvwmBacker
+share/fvwm/ConfigFvwmButtons
+share/fvwm/ConfigFvwmDefaults
+share/fvwm/ConfigFvwmIconBox
+share/fvwm/ConfigFvwmIconMan
+share/fvwm/ConfigFvwmIdent
+share/fvwm/ConfigFvwmPager
+share/fvwm/ConfigFvwmScroll
+share/fvwm/ConfigFvwmSetup
+share/fvwm/ConfigFvwmTaskBar
+share/fvwm/ConfigFvwmWinList
+share/fvwm/FvwmForm-Capture
+share/fvwm/FvwmForm-Form
+share/fvwm/FvwmForm-QuitVerify
+share/fvwm/FvwmForm-Rlogin
+share/fvwm/FvwmForm-RootCursor
+share/fvwm/FvwmForm-Setup
+share/fvwm/FvwmForm-Talk
+share/fvwm/FvwmForm-TalkHelp
+share/fvwm/FvwmScript-BaseConfig
+share/fvwm/FvwmScript-BellSetup
+share/fvwm/FvwmScript-Buttons
+share/fvwm/FvwmScript-Colorset
+share/fvwm/FvwmScript-ComExample
+share/fvwm/FvwmScript-Date
+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-ComExample.pl
+share/fvwm/fvwm-script-setup95.pl
+share/fvwm/system.fvwm2rc-sample-95
+@dirrm share/fvwm
 @dirrm share/fvwm2/pixmaps
 @dirrm share/fvwm2
 @dirrm libexec/fvwm/%%FVWM_VERSION%%