From e112160bc3ce0c2925d65194393451aa3c5cb5a9 Mon Sep 17 00:00:00 2001 From: adamw Date: Tue, 29 Jul 2014 16:36:06 +0000 Subject: Rename x11-*/ patch-xy patches to reflect the files they modify. Finally, this is the last of it. --- x11-wm/fvwm/files/patch-Imakefiles | 176 +++++++++++++++++++++ x11-wm/fvwm/files/patch-ab | 113 ------------- x11-wm/fvwm/files/patch-ac | 44 ------ x11-wm/fvwm/files/patch-ad | 176 --------------------- x11-wm/fvwm/files/patch-configure.h | 113 +++++++++++++ .../fvwm/files/patch-sample.fvwmrc-system.fvwmrc | 44 ++++++ 6 files changed, 333 insertions(+), 333 deletions(-) create mode 100644 x11-wm/fvwm/files/patch-Imakefiles delete mode 100644 x11-wm/fvwm/files/patch-ab delete mode 100644 x11-wm/fvwm/files/patch-ac delete mode 100644 x11-wm/fvwm/files/patch-ad create mode 100644 x11-wm/fvwm/files/patch-configure.h create mode 100644 x11-wm/fvwm/files/patch-sample.fvwmrc-system.fvwmrc (limited to 'x11-wm/fvwm') diff --git a/x11-wm/fvwm/files/patch-Imakefiles b/x11-wm/fvwm/files/patch-Imakefiles new file mode 100644 index 000000000000..f5f8a3077242 --- /dev/null +++ b/x11-wm/fvwm/files/patch-Imakefiles @@ -0,0 +1,176 @@ +--- fvwm/Imakefile.orig Sun May 30 11:05:19 1999 ++++ fvwm/Imakefile Sun May 30 11:06:45 1999 +@@ -16,7 +16,7 @@ + + DEPLIBS = $(DEPXLIB) ../libs/libfvwmlib.a + +-#ifdef AlphaArchitecture ++#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) + LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../libs -lfvwmlib + #else + #ifdef HPArchitecture +--- modules/FvwmAudio/Imakefile.orig Sun May 30 11:12:57 1999 ++++ modules/FvwmAudio/Imakefile Sun May 30 11:13:13 1999 +@@ -29,7 +29,7 @@ + + DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a + +-#ifdef AlphaArchitecture ++#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) + LOCAL_LIBRARIES = -ldnet_stub -L../../libs -lfvwmlib + #else + LOCAL_LIBRARIES = -L../../libs -lfvwmlib +--- modules/FvwmAuto/Imakefile.orig Sun May 30 11:13:27 1999 ++++ modules/FvwmAuto/Imakefile Sun May 30 11:13:36 1999 +@@ -13,7 +13,7 @@ + + DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a + +-#ifdef AlphaArchitecture ++#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) + LOCAL_LIBRARIES = -ldnet_stub -L../../libs -lfvwmlib + #else + LOCAL_LIBRARIES = -L../../libs -lfvwmlib +--- modules/FvwmBacker/Imakefile.orig Sun May 30 11:13:54 1999 ++++ modules/FvwmBacker/Imakefile Sun May 30 11:14:03 1999 +@@ -14,7 +14,7 @@ + + DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a + +-#ifdef AlphaArchitecture ++#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) + LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib + #else + LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib +--- modules/FvwmBanner/Imakefile.orig Sun May 30 11:14:13 1999 ++++ modules/FvwmBanner/Imakefile Sun May 30 11:14:26 1999 +@@ -15,7 +15,7 @@ + + DEPLIBS = $(DEPXLIB) + +-#ifdef AlphaArchitecture ++#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) + LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../../libs -lfvwmlib + #else + LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -L../../libs -lfvwmlib +--- modules/FvwmClean/Imakefile.orig Sun May 30 11:14:38 1999 ++++ modules/FvwmClean/Imakefile Sun May 30 11:14:46 1999 +@@ -13,7 +13,7 @@ + + DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a + +-#ifdef AlphaArchitecture ++#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) + LOCAL_LIBRARIES = -ldnet_stub -L../../libs -lfvwmlib + #else + LOCAL_LIBRARIES = -L../../libs -lfvwmlib +--- modules/FvwmDebug/Imakefile.orig Sun May 30 11:15:12 1999 ++++ modules/FvwmDebug/Imakefile Sun May 30 11:15:21 1999 +@@ -12,7 +12,7 @@ + + DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a + +-#ifdef AlphaArchitecture ++#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) + LOCAL_LIBRARIES = -ldnet_stub -L../../libs -lfvwmlib + #else + LOCAL_LIBRARIES = -L../../libs -lfvwmlib +--- modules/FvwmIconBox/Imakefile.orig Sun May 30 11:15:38 1999 ++++ modules/FvwmIconBox/Imakefile Sun May 30 11:15:47 1999 +@@ -16,7 +16,7 @@ + + DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a + +-#ifdef AlphaArchitecture ++#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) + LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../../libs -lfvwmlib + #else + LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -L../../libs -lfvwmlib +--- modules/FvwmIdent/Imakefile.orig Sun May 30 11:16:00 1999 ++++ modules/FvwmIdent/Imakefile Sun May 30 11:16:07 1999 +@@ -12,7 +12,7 @@ + + DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a + +-#ifdef AlphaArchitecture ++#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) + LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib + #else + LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib +--- modules/FvwmPager/Imakefile.orig Sun May 30 11:16:19 1999 ++++ modules/FvwmPager/Imakefile Sun May 30 11:16:28 1999 +@@ -13,7 +13,7 @@ + + DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a + +-#ifdef AlphaArchitecture ++#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) + LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib + #else + LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib +--- modules/FvwmSave/Imakefile.orig Sun May 30 11:16:48 1999 ++++ modules/FvwmSave/Imakefile Sun May 30 11:16:58 1999 +@@ -12,7 +12,7 @@ + + DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a + +-#ifdef AlphaArchitecture ++#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) + LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib + #else + LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib +--- modules/FvwmSaveDesk/Imakefile.orig Sun May 30 11:17:22 1999 ++++ modules/FvwmSaveDesk/Imakefile Sun May 30 11:17:32 1999 +@@ -12,7 +12,7 @@ + + DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a + +-#ifdef AlphaArchitecture ++#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) + LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib + #else + LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib +--- modules/FvwmScroll/Imakefile.orig Sun May 30 11:17:46 1999 ++++ modules/FvwmScroll/Imakefile Sun May 30 11:17:54 1999 +@@ -12,7 +12,7 @@ + + DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a + +-#ifdef AlphaArchitecture ++#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) + LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib + #else + LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib +--- modules/FvwmWinList/Imakefile.orig Sun May 30 11:18:06 1999 ++++ modules/FvwmWinList/Imakefile Sun May 30 11:18:14 1999 +@@ -14,7 +14,7 @@ + + DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a + +-#ifdef AlphaArchitecture ++#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) + LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib + #else + LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib +--- modules/GoodStuff/Imakefile.orig Sun May 30 11:18:25 1999 ++++ modules/GoodStuff/Imakefile Sun May 30 11:18:34 1999 +@@ -16,7 +16,7 @@ + + DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a + +-#ifdef AlphaArchitecture ++#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) + LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../../libs -lfvwmlib + #else + LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -L../../libs -lfvwmlib +--- xpmroot/Imakefile.orig Sun May 30 11:24:14 1999 ++++ xpmroot/Imakefile Sun May 30 11:24:22 1999 +@@ -15,7 +15,7 @@ + + DEPLIBS = $(DEPXLIB) ../libs/libfvwmlib.a + +-#ifdef AlphaArchitecture ++#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) + LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../libs -lfvwmlib + #else + LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -L../libs -lfvwmlib diff --git a/x11-wm/fvwm/files/patch-ab b/x11-wm/fvwm/files/patch-ab deleted file mode 100644 index 6fd353db208d..000000000000 --- a/x11-wm/fvwm/files/patch-ab +++ /dev/null @@ -1,113 +0,0 @@ -*** configure.h.orig Mon Nov 28 15:08:47 1994 ---- configure.h Sun May 30 11:01:24 1999 -*************** -*** 1,7 **** -! #define FVWMDIR "/usr/lib/X11/fvwm" - /* #define FVWMDIR "/local/homes/dsp/nation/modules"*/ -! #define FVWM_ICONDIR "/usr/include/X11/bitmaps:/usr/include/X11/pixmaps" -! #define FVWMRC "/usr/lib/X11/fvwm/system.fvwmrc" - - /* Imake command needed to put modules in desired target location */ - /* Use the second version if it causes grief */ ---- 1,7 ---- -! #define FVWMDIR "%%PREFIX%%/lib/X11/fvwm" - /* #define FVWMDIR "/local/homes/dsp/nation/modules"*/ -! #define FVWM_ICONDIR "%%PREFIX%%/include/X11/bitmaps:%%PREFIX%%/include/X11/pixmaps" -! #define FVWMRC "%%PREFIX%%/lib/X11/fvwm/system.fvwmrc" - - /* Imake command needed to put modules in desired target location */ - /* Use the second version if it causes grief */ -*************** -*** 14,26 **** - * If you want to install it in a different directory, uncomment and - * edit the first line */ - /* #define FVWM_BIN_DIR BINDIR=/local/homes/dsp/nation/bin/4.1.3*/ -! #define FVWM_BIN_DIR BINDIR=/usr/bin/X11 - /*#define FVWM_BIN_DIR*/ - - /* Compiler over-ride for Imakefiles */ - /* Leave it as shown to get your default compiler */ -! #define COMPILER CC=gcc -! /* #define COMPILER */ - - - /*************************************************************************** ---- 14,26 ---- - * If you want to install it in a different directory, uncomment and - * edit the first line */ - /* #define FVWM_BIN_DIR BINDIR=/local/homes/dsp/nation/bin/4.1.3*/ -! #define FVWM_BIN_DIR BINDIR=%%PREFIX%%/bin - /*#define FVWM_BIN_DIR*/ - - /* Compiler over-ride for Imakefiles */ - /* Leave it as shown to get your default compiler */ -! /* #define COMPILER CC=gcc */ -! #define COMPILER - - - /*************************************************************************** -*************** -*** 69,82 **** - * undefine(`include') tofix that one. Some version of m4 - * seem to give good error messages, others don't? - ***************************************************************************/ -! /* #define M4 */ - - /*************************************************************************** - *#define NO_PAGER - * Omits the code for the built-in pager. The pager module FvwmPager - * can be used instead. - ***************************************************************************/ -! /* #define NO_PAGER */ - - /*************************************************************************** - *#define NON_VIRTUAL ---- 69,82 ---- - * undefine(`include') to fix that one. Some version of m4 - * seem to give good error messages, others don't? - ***************************************************************************/ -! #define M4 - - /*************************************************************************** - *#define NO_PAGER - * Omits the code for the built-in pager. The pager module FvwmPager - * can be used instead. - ***************************************************************************/ -! #define NO_PAGER - - /*************************************************************************** - *#define NON_VIRTUAL -*************** -*** 100,106 **** - * Caused fvwm built-in window-list to be omitted. The window-list - * module FvwmWinList can be used instead - ***************************************************************************/ -! /* #define NO_WINDOWLIST */ - - /*************************************************************************** - *#define PRUNE ---- 100,106 ---- - * Caused fvwm built-in window-list to be omitted. The window-list - * module FvwmWinList can be used instead - ***************************************************************************/ -! #define NO_WINDOWLIST - - /*************************************************************************** - *#define PRUNE -*************** -*** 186,192 **** - #define CLOSE_STRING3 "destroy" - #define CLOSE_STRING4 "quit" - -! #ifdef __alpha - #define NEEDS_ALPHA_HEADER - #undef BROKEN_SUN_HEADERS - #endif /* (__alpha) */ ---- 186,192 ---- - #define CLOSE_STRING3 "destroy" - #define CLOSE_STRING4 "quit" - -! #if defined(__alpha) && !defined(__FreeBSD__) - #define NEEDS_ALPHA_HEADER - #undef BROKEN_SUN_HEADERS - #endif /* (__alpha) */ diff --git a/x11-wm/fvwm/files/patch-ac b/x11-wm/fvwm/files/patch-ac deleted file mode 100644 index ac93128be13e..000000000000 --- a/x11-wm/fvwm/files/patch-ac +++ /dev/null @@ -1,44 +0,0 @@ ---- ./sample.fvwmrc/system.fvwmrc.org Fri Dec 2 11:19:12 1994 -+++ ./sample.fvwmrc/system.fvwmrc Wed Jun 7 00:42:50 1995 -@@ -17,6 +17,10 @@ - # If you get it wrong, the most common problem is that color or font settings - # are ignored - -+# for m4 processing we have to undefine the include macro or pathts to -+# /usr/.../include/... will be mangled -+undefine(`include') -+ - ########################################################################### - # set up the colors - # -@@ -63,7 +67,7 @@ - # Set windows to auto-raise after 750 milliseconds if you like it. - # Autoraise can sometimes obscure pop-up windows. Performance is now - # similar to olvwm's auto-raise feature. --#AutoRaise 750 -+AutoRaise 500 - - # Normally, we'll be in focus-follows mouse mode, but uncomment this - # for mwm-style click-to-focus -@@ -176,9 +180,9 @@ - # Module path and paths to the icons - # - # ModulePath is a colon-separated list, just like regular unix PATH --ModulePath /usr/lib/X11/fvwm --PixmapPath /usr/include/X11/pixmaps/ --IconPath /usr/include/X11/bitmaps/ -+ModulePath %%PREFIX%%/lib/X11/fvwm -+PixmapPath %%PREFIX%%/include/X11/pixmaps/ -+IconPath %%PREFIX%%/include/X11/bitmaps/ - - ############################################################################ - # Set the decoration styles and window options -@@ -227,7 +231,7 @@ - - Function "InitFunction" - Module "I" FvwmBanner -- Exec "I" xpmroot /usr/include/X11/pixmaps/fvwm.xpm & -+ Exec "I" xpmroot %%PREFIX%%/include/X11/pixmaps/fvwm.xpm & - Module "I" GoodStuff - Exec "I" exec xterm -geometry 80x64+0+0 & - Wait "I" xterm diff --git a/x11-wm/fvwm/files/patch-ad b/x11-wm/fvwm/files/patch-ad deleted file mode 100644 index f5f8a3077242..000000000000 --- a/x11-wm/fvwm/files/patch-ad +++ /dev/null @@ -1,176 +0,0 @@ ---- fvwm/Imakefile.orig Sun May 30 11:05:19 1999 -+++ fvwm/Imakefile Sun May 30 11:06:45 1999 -@@ -16,7 +16,7 @@ - - DEPLIBS = $(DEPXLIB) ../libs/libfvwmlib.a - --#ifdef AlphaArchitecture -+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) - LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../libs -lfvwmlib - #else - #ifdef HPArchitecture ---- modules/FvwmAudio/Imakefile.orig Sun May 30 11:12:57 1999 -+++ modules/FvwmAudio/Imakefile Sun May 30 11:13:13 1999 -@@ -29,7 +29,7 @@ - - DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a - --#ifdef AlphaArchitecture -+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) - LOCAL_LIBRARIES = -ldnet_stub -L../../libs -lfvwmlib - #else - LOCAL_LIBRARIES = -L../../libs -lfvwmlib ---- modules/FvwmAuto/Imakefile.orig Sun May 30 11:13:27 1999 -+++ modules/FvwmAuto/Imakefile Sun May 30 11:13:36 1999 -@@ -13,7 +13,7 @@ - - DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a - --#ifdef AlphaArchitecture -+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) - LOCAL_LIBRARIES = -ldnet_stub -L../../libs -lfvwmlib - #else - LOCAL_LIBRARIES = -L../../libs -lfvwmlib ---- modules/FvwmBacker/Imakefile.orig Sun May 30 11:13:54 1999 -+++ modules/FvwmBacker/Imakefile Sun May 30 11:14:03 1999 -@@ -14,7 +14,7 @@ - - DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a - --#ifdef AlphaArchitecture -+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) - LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib - #else - LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib ---- modules/FvwmBanner/Imakefile.orig Sun May 30 11:14:13 1999 -+++ modules/FvwmBanner/Imakefile Sun May 30 11:14:26 1999 -@@ -15,7 +15,7 @@ - - DEPLIBS = $(DEPXLIB) - --#ifdef AlphaArchitecture -+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) - LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../../libs -lfvwmlib - #else - LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -L../../libs -lfvwmlib ---- modules/FvwmClean/Imakefile.orig Sun May 30 11:14:38 1999 -+++ modules/FvwmClean/Imakefile Sun May 30 11:14:46 1999 -@@ -13,7 +13,7 @@ - - DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a - --#ifdef AlphaArchitecture -+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) - LOCAL_LIBRARIES = -ldnet_stub -L../../libs -lfvwmlib - #else - LOCAL_LIBRARIES = -L../../libs -lfvwmlib ---- modules/FvwmDebug/Imakefile.orig Sun May 30 11:15:12 1999 -+++ modules/FvwmDebug/Imakefile Sun May 30 11:15:21 1999 -@@ -12,7 +12,7 @@ - - DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a - --#ifdef AlphaArchitecture -+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) - LOCAL_LIBRARIES = -ldnet_stub -L../../libs -lfvwmlib - #else - LOCAL_LIBRARIES = -L../../libs -lfvwmlib ---- modules/FvwmIconBox/Imakefile.orig Sun May 30 11:15:38 1999 -+++ modules/FvwmIconBox/Imakefile Sun May 30 11:15:47 1999 -@@ -16,7 +16,7 @@ - - DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a - --#ifdef AlphaArchitecture -+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) - LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../../libs -lfvwmlib - #else - LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -L../../libs -lfvwmlib ---- modules/FvwmIdent/Imakefile.orig Sun May 30 11:16:00 1999 -+++ modules/FvwmIdent/Imakefile Sun May 30 11:16:07 1999 -@@ -12,7 +12,7 @@ - - DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a - --#ifdef AlphaArchitecture -+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) - LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib - #else - LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib ---- modules/FvwmPager/Imakefile.orig Sun May 30 11:16:19 1999 -+++ modules/FvwmPager/Imakefile Sun May 30 11:16:28 1999 -@@ -13,7 +13,7 @@ - - DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a - --#ifdef AlphaArchitecture -+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) - LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib - #else - LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib ---- modules/FvwmSave/Imakefile.orig Sun May 30 11:16:48 1999 -+++ modules/FvwmSave/Imakefile Sun May 30 11:16:58 1999 -@@ -12,7 +12,7 @@ - - DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a - --#ifdef AlphaArchitecture -+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) - LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib - #else - LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib ---- modules/FvwmSaveDesk/Imakefile.orig Sun May 30 11:17:22 1999 -+++ modules/FvwmSaveDesk/Imakefile Sun May 30 11:17:32 1999 -@@ -12,7 +12,7 @@ - - DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a - --#ifdef AlphaArchitecture -+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) - LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib - #else - LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib ---- modules/FvwmScroll/Imakefile.orig Sun May 30 11:17:46 1999 -+++ modules/FvwmScroll/Imakefile Sun May 30 11:17:54 1999 -@@ -12,7 +12,7 @@ - - DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a - --#ifdef AlphaArchitecture -+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) - LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib - #else - LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib ---- modules/FvwmWinList/Imakefile.orig Sun May 30 11:18:06 1999 -+++ modules/FvwmWinList/Imakefile Sun May 30 11:18:14 1999 -@@ -14,7 +14,7 @@ - - DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a - --#ifdef AlphaArchitecture -+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) - LOCAL_LIBRARIES = $(XLIB) -ldnet_stub -L../../libs -lfvwmlib - #else - LOCAL_LIBRARIES = $(XLIB) -L../../libs -lfvwmlib ---- modules/GoodStuff/Imakefile.orig Sun May 30 11:18:25 1999 -+++ modules/GoodStuff/Imakefile Sun May 30 11:18:34 1999 -@@ -16,7 +16,7 @@ - - DEPLIBS = $(DEPXLIB) ../../libs/libfvwmlib.a - --#ifdef AlphaArchitecture -+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) - LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../../libs -lfvwmlib - #else - LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -L../../libs -lfvwmlib ---- xpmroot/Imakefile.orig Sun May 30 11:24:14 1999 -+++ xpmroot/Imakefile Sun May 30 11:24:22 1999 -@@ -15,7 +15,7 @@ - - DEPLIBS = $(DEPXLIB) ../libs/libfvwmlib.a - --#ifdef AlphaArchitecture -+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) - LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../libs -lfvwmlib - #else - LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -L../libs -lfvwmlib diff --git a/x11-wm/fvwm/files/patch-configure.h b/x11-wm/fvwm/files/patch-configure.h new file mode 100644 index 000000000000..6fd353db208d --- /dev/null +++ b/x11-wm/fvwm/files/patch-configure.h @@ -0,0 +1,113 @@ +*** configure.h.orig Mon Nov 28 15:08:47 1994 +--- configure.h Sun May 30 11:01:24 1999 +*************** +*** 1,7 **** +! #define FVWMDIR "/usr/lib/X11/fvwm" + /* #define FVWMDIR "/local/homes/dsp/nation/modules"*/ +! #define FVWM_ICONDIR "/usr/include/X11/bitmaps:/usr/include/X11/pixmaps" +! #define FVWMRC "/usr/lib/X11/fvwm/system.fvwmrc" + + /* Imake command needed to put modules in desired target location */ + /* Use the second version if it causes grief */ +--- 1,7 ---- +! #define FVWMDIR "%%PREFIX%%/lib/X11/fvwm" + /* #define FVWMDIR "/local/homes/dsp/nation/modules"*/ +! #define FVWM_ICONDIR "%%PREFIX%%/include/X11/bitmaps:%%PREFIX%%/include/X11/pixmaps" +! #define FVWMRC "%%PREFIX%%/lib/X11/fvwm/system.fvwmrc" + + /* Imake command needed to put modules in desired target location */ + /* Use the second version if it causes grief */ +*************** +*** 14,26 **** + * If you want to install it in a different directory, uncomment and + * edit the first line */ + /* #define FVWM_BIN_DIR BINDIR=/local/homes/dsp/nation/bin/4.1.3*/ +! #define FVWM_BIN_DIR BINDIR=/usr/bin/X11 + /*#define FVWM_BIN_DIR*/ + + /* Compiler over-ride for Imakefiles */ + /* Leave it as shown to get your default compiler */ +! #define COMPILER CC=gcc +! /* #define COMPILER */ + + + /*************************************************************************** +--- 14,26 ---- + * If you want to install it in a different directory, uncomment and + * edit the first line */ + /* #define FVWM_BIN_DIR BINDIR=/local/homes/dsp/nation/bin/4.1.3*/ +! #define FVWM_BIN_DIR BINDIR=%%PREFIX%%/bin + /*#define FVWM_BIN_DIR*/ + + /* Compiler over-ride for Imakefiles */ + /* Leave it as shown to get your default compiler */ +! /* #define COMPILER CC=gcc */ +! #define COMPILER + + + /*************************************************************************** +*************** +*** 69,82 **** + * undefine(`include') tofix that one. Some version of m4 + * seem to give good error messages, others don't? + ***************************************************************************/ +! /* #define M4 */ + + /*************************************************************************** + *#define NO_PAGER + * Omits the code for the built-in pager. The pager module FvwmPager + * can be used instead. + ***************************************************************************/ +! /* #define NO_PAGER */ + + /*************************************************************************** + *#define NON_VIRTUAL +--- 69,82 ---- + * undefine(`include') to fix that one. Some version of m4 + * seem to give good error messages, others don't? + ***************************************************************************/ +! #define M4 + + /*************************************************************************** + *#define NO_PAGER + * Omits the code for the built-in pager. The pager module FvwmPager + * can be used instead. + ***************************************************************************/ +! #define NO_PAGER + + /*************************************************************************** + *#define NON_VIRTUAL +*************** +*** 100,106 **** + * Caused fvwm built-in window-list to be omitted. The window-list + * module FvwmWinList can be used instead + ***************************************************************************/ +! /* #define NO_WINDOWLIST */ + + /*************************************************************************** + *#define PRUNE +--- 100,106 ---- + * Caused fvwm built-in window-list to be omitted. The window-list + * module FvwmWinList can be used instead + ***************************************************************************/ +! #define NO_WINDOWLIST + + /*************************************************************************** + *#define PRUNE +*************** +*** 186,192 **** + #define CLOSE_STRING3 "destroy" + #define CLOSE_STRING4 "quit" + +! #ifdef __alpha + #define NEEDS_ALPHA_HEADER + #undef BROKEN_SUN_HEADERS + #endif /* (__alpha) */ +--- 186,192 ---- + #define CLOSE_STRING3 "destroy" + #define CLOSE_STRING4 "quit" + +! #if defined(__alpha) && !defined(__FreeBSD__) + #define NEEDS_ALPHA_HEADER + #undef BROKEN_SUN_HEADERS + #endif /* (__alpha) */ diff --git a/x11-wm/fvwm/files/patch-sample.fvwmrc-system.fvwmrc b/x11-wm/fvwm/files/patch-sample.fvwmrc-system.fvwmrc new file mode 100644 index 000000000000..ac93128be13e --- /dev/null +++ b/x11-wm/fvwm/files/patch-sample.fvwmrc-system.fvwmrc @@ -0,0 +1,44 @@ +--- ./sample.fvwmrc/system.fvwmrc.org Fri Dec 2 11:19:12 1994 ++++ ./sample.fvwmrc/system.fvwmrc Wed Jun 7 00:42:50 1995 +@@ -17,6 +17,10 @@ + # If you get it wrong, the most common problem is that color or font settings + # are ignored + ++# for m4 processing we have to undefine the include macro or pathts to ++# /usr/.../include/... will be mangled ++undefine(`include') ++ + ########################################################################### + # set up the colors + # +@@ -63,7 +67,7 @@ + # Set windows to auto-raise after 750 milliseconds if you like it. + # Autoraise can sometimes obscure pop-up windows. Performance is now + # similar to olvwm's auto-raise feature. +-#AutoRaise 750 ++AutoRaise 500 + + # Normally, we'll be in focus-follows mouse mode, but uncomment this + # for mwm-style click-to-focus +@@ -176,9 +180,9 @@ + # Module path and paths to the icons + # + # ModulePath is a colon-separated list, just like regular unix PATH +-ModulePath /usr/lib/X11/fvwm +-PixmapPath /usr/include/X11/pixmaps/ +-IconPath /usr/include/X11/bitmaps/ ++ModulePath %%PREFIX%%/lib/X11/fvwm ++PixmapPath %%PREFIX%%/include/X11/pixmaps/ ++IconPath %%PREFIX%%/include/X11/bitmaps/ + + ############################################################################ + # Set the decoration styles and window options +@@ -227,7 +231,7 @@ + + Function "InitFunction" + Module "I" FvwmBanner +- Exec "I" xpmroot /usr/include/X11/pixmaps/fvwm.xpm & ++ Exec "I" xpmroot %%PREFIX%%/include/X11/pixmaps/fvwm.xpm & + Module "I" GoodStuff + Exec "I" exec xterm -geometry 80x64+0+0 & + Wait "I" xterm -- cgit