5 files changed, 52 insertions, 56 deletions
diff --git a/x11-wm/fvwm95-i18n/files/patch-aa b/x11-wm/fvwm95-i18n/files/patch-aa
new file mode 100644
index 000000000000..a4df0f298e31
--- /dev/null
+++ b/x11-wm/fvwm95-i18n/files/patch-aa
@@ -0,0 +1,25 @@
+--- modules/FvwmAudio/Makefile.in.orig	Sat Feb  1 13:23:37 1997
++++ modules/FvwmAudio/Makefile.in	Sat Feb  1 13:23:23 1997
+@@ -10,6 +10,8 @@
+ bin_dir=@exec_prefix@/bin
+ x_includes=@x_includes@
+ x_libraries=@x_libraries@
++libdir=@libdir@
++includedir=@includedir@
+ fvwm_icons=@fvwm_icons@
+ fvwm_rc=@fvwm_rc@
+ fvwm_name=@fvwm_name@
+@@ -24,11 +26,11 @@
+ XEXT_LIBRARY=-lXext
+ FVWM_LIBRARY=-l${fvwm_name}
+ RPLAY_LIBRARY=-lrplay
+-LIBS=-L${top_srcdir}/libs ${x_libraries} ${FVWM_LIBRARY} ${XPM_LIBRARY} ${XEXT_LIBRARY} ${X_LIBRARY} ${RPLAY_LIBRARY}
++LIBS=-L${top_srcdir}/libs ${x_libraries} ${FVWM_LIBRARY} ${XPM_LIBRARY} ${XEXT_LIBRARY} ${X_LIBRARY} -L${libdir} ${RPLAY_LIBRARY}
+ 
+ EXTRA_DEFINES=-DXPM -DSHAPE
+ CC=@CC@
+-INCLUDES=-I${top_srcdir}/include ${x_includes}
++INCLUDES=-I${top_srcdir}/include ${x_includes} ${includedir}
+ CFLAGS=${INCLUDES} @CFLAGS@ ${EXTRA_DEFINES} 
+ MAKEDEPEND=@MAKEDEPEND@
+ INSTALL=@INSTALL@
diff --git a/x11-wm/fvwm95-i18n/files/patch-ab b/x11-wm/fvwm95-i18n/files/patch-ab
new file mode 100644
index 000000000000..2dd9e45c0c44
--- /dev/null
+++ b/x11-wm/fvwm95-i18n/files/patch-ab
@@ -0,0 +1,16 @@
+--- modules/FvwmForm/FvwmForm.c.orig	Sat Feb  1 14:02:05 1997
++++ modules/FvwmForm/FvwmForm.c	Sat Feb  1 14:03:13 1997
+@@ -16,7 +16,13 @@
+ #include <X11/cursorfont.h>
+ #define XK_MISCELLANY
+ #include <X11/keysymdef.h>
++
++#ifdef __FreeBSD__
++#include <stdlib.h>
++#else
+ #include <malloc.h>
++#endif
++
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
diff --git a/x11-wm/fvwm95-i18n/files/patch-ac b/x11-wm/fvwm95-i18n/files/patch-ac
new file mode 100644
index 000000000000..096346a5dba1
--- /dev/null
+++ b/x11-wm/fvwm95-i18n/files/patch-ac
@@ -0,0 +1,11 @@
+--- utils/Makefile.in.orig	Sat Feb  1 14:14:12 1997
++++ utils/Makefile.in	Sat Feb  1 14:15:12 1997
+@@ -12,7 +12,7 @@
+ fvwm_dir=${prefix}/lib/X11/${fvwm_name}
+ 
+ INSTALL=@INSTALL@
+-INSTALL_PROGRAM=@INSTALL_PROGRAM@
++INSTALL_PROGRAM=@INSTALL@ -m 555
+ RM=@RM@
+ 
+ SCRIPTS=fvwmrc_convert quantize_pixmaps
diff --git a/x11-wm/fvwm95-i18n/files/patch-ad b/x11-wm/fvwm95-i18n/files/patch-ad
deleted file mode 100644
index 548d2519ef24..000000000000
--- a/x11-wm/fvwm95-i18n/files/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
---- sample.fvwmrc/system.fvwm2rc95.orig	Sun May 19 23:53:55 1996
-+++ sample.fvwmrc/system.fvwm2rc95	Sat May 25 21:04:42 1996
-@@ -83,8 +83,8 @@
- # ModulePath is a colon-separated list, just like regular unix PATH
- #
- ModulePath /usr/X11R6/lib/X11/fvwm95-2/
--PixmapPath /usr/include/X11/pixmaps/:/usr/local/mini-icons/
--IconPath   /usr/include/X11/bitmaps/:/usr/local/icons/
-+PixmapPath /usr/X11R6/include/X11/pixmaps/
-+IconPath   /usr/X11R6/include/X11/bitmaps/
- 
- #========================================================================#
- 
diff --git a/x11-wm/fvwm95-i18n/files/patch-ae b/x11-wm/fvwm95-i18n/files/patch-ae
deleted file mode 100644
index 6c26334b13db..000000000000
--- a/x11-wm/fvwm95-i18n/files/patch-ae
+++ /dev/null
@@ -1,43 +0,0 @@
---- Fvwm.tmpl.orig	Sat May 25 21:09:38 1996
-+++ Fvwm.tmpl	Sat May 25 21:12:21 1996
-@@ -30,6 +30,8 @@
-  ***************************************************************************/
- 
- /* #define FvwmIconPath /usr/include/X11/bitmaps\:/usr/include/X11/pixmaps */
-+#define FvwmIconPath /usr/X11R6/lib/X11/fvwm95-2/mini-icons\:/usr/X11R6/lib/X11
-+/fvwm95-2/icons\:/usr/X11R6/include/X11/pixmaps\:/usr/X11R6/include/X11/bitmaps
- 
- 
- /***************************************************************************
-@@ -80,7 +82,7 @@
-  * Set this to YES if you would like the programs in the utils directory
-  * installed.
-  *************************************************************************/
--#define InstallUtils NO
-+#define InstallUtils YES
- 
- 
- /**************************************************************************
-@@ -149,17 +151,17 @@
-  ***************************************************************************/
- 
- /* Where do you want the fvwm binaries installed. */
--/* #define FvwmBinDir      /usr/local/X11R6/bin */
-+#define FvwmBinDir      /usr/X11R6/bin
- 
- /* Where do you want the fvwm modules installed. */
--/* #define FvwmDir         /usr/local/X11R6/lib/X11/fvwm95-2 */
-+#define FvwmDir         /usr/X11R6/lib/X11/fvwm95-2
- 
- /* Where do you want the fvwm libraries installed. */
--/* #define FvwmLibDir      /usr/local/X11R6/lib */
-+#define FvwmLibDir      /usr/X11R6/lib
- 
- /* Where do you want the fvwm man pages installed. */
--/* #define FvwmManPath     /usr/local/X11R6/man */
--/* #define FvwmManSuffix   1 */
-+#define FvwmManPath     /usr/X11R6/man
-+#define FvwmManSuffix   1
- 
- 
- /***************************************************************************