20 files changed, 618 insertions, 652 deletions

diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile
index de1530dff4ac..662cfea69004 100644
--- a/x11-wm/fvwm95-i18n/Makefile
+++ b/x11-wm/fvwm95-i18n/Makefile
@@ -1,32 +1,83 @@
 # New ports collection makefile for:	fvwm95-2
 # Version required:	2.0.43a
-# Date created:		Sa   1 Feb 1997 14:46:05 MET
-# Whom:			Andreas Klemm <andreas@klemm.gtn.com>
+# Date created:
+# Whom:			Yoshishige Arai <ryo2@on.rim.or.jp>
 #
-# $Id: Makefile,v 1.20 1998/09/15 11:13:35 asami Exp $
+# $Id$
 #
 
 DISTNAME=	fvwm95-2.0.43a-Autoconf
-PKGNAME=	fvwm95-2.0.43a
+PKGNAME=	fvwm95-i18n-2.0.43a
 CATEGORIES=	x11-wm
-MASTER_SITES=	ftp://mitac11.uia.ac.be/pub/fvwm95/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	ftp://mitac11.uia.ac.be/pub/ \
+		ftp://ftp.plig.org/pub/fvwm95/ \
+		ftp://ftp.terraware.net/pub/Mirrors/FVWM95/ \
+		ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/ \
+		ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/misc/fvwm95/ \
+		http://www.rr.iij4u/~sada/distfiles/ \
+		http://www.freebsd.org/~sada/distfiles/
+DISTFILES=	${EXTRACT_ONLY} fvwm95-2.0.43a-FreeBSD.apmpatch.tar.gz
 
-MAINTAINER=	andreas@FreeBSD.ORG
+PATCH_SITES=	ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/misc/fvwm95/ \
+		http://www.freebsd.org/~sada/distfiles/
+PATCHFILES=	fvwm95-2.0.43a-Autoconf.I18N.diff.gz
+
+MAINTAINER=	ryo2@on.rim.or.jp
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 BUILD_DEPENDS=	${LOCALBASE}/lib/librplay.a:${PORTSDIR}/audio/rplay
-RUN_DEPENDS=	${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons
 
+EXTRACT_ONLY=	${DISTNAME}.tgz ${PKGNAME}-portKit-19981122.tgz
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= --includedir=${LOCALBASE}/include \
-		--libdir=${LOCALBASE}/lib
+CONFIGURE_ARGS+= --prefix=${PREFIX} --x-includes=${X11BASE}/include \
+		--mandir=${MANPREFIX}/man \
+		--includedir=${LOCALBASE}/include --libdir=${LOCALBASE}/lib
+CONFIGURE_ENV+=INSTALL_MAN="${INSTALL_MAN}"
+MAN1=	fvwm95.1 xpmroot.1 FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \
+	FvwmButtons.1 FvwmConsole.1 FvwmCpp.1 FvwmDebug.1 FvwmForm.1 \
+	FvwmIconBox.1 FvwmIconMan.1 FvwmIdent.1 FvwmM4.1 FvwmPager.1 \
+	FvwmSave.1 FvwmSaveDesk.1 FvwmScroll.1 FvwmTalk.1 FvwmTaskBar.1 \
+	FvwmWinList.1
+
+SAMPLEDIR=	${PREFIX}/share/examples/fvwm95
+KITDIR=		${WRKDIR}/${PKGNAME}-portKit
+
+post-extract:
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
+		${DISTDIR}/fvwm95-2.0.43a-FreeBSD.apmpatch.tar.gz \
+		${EXTRACT_AFTER_ARGS} -C ${WRKDIR}
+	${CP} ${WRKDIR}/apmpatch/freebsd-menu.xpm ${WRKSRC}/mini-icons
 
-MAN1=		fvwm95.1
+pre-patch:
+.if !defined(BATCH) && !defined(FOR_CDROM) && !defined(USE_APM)
+	@${ECHO} -n "Are you going to use APM handling? (y/n) ==> "
+	@(read ans; \
+	  case x"$$ans" in \
+	    xy*|xY*) \
+		${ECHO} "Okay, please rerun make like as \"make USE_APM=yes\"."; \
+		${ECHO} "(Don't worry about the following \"*** Error code 1\"s)"; \
+		return 1; \
+		;; \
+	    *) \
+		return 0; \
+		;; \
+	  esac)
+.endif
+post-patch:
+.if defined(USE_APM)
+	@${CAT} ${WRKDIR}/apmpatch/fvwm95-2.0.43a-Autoconf.I18N.apmpatch \
+	| ${PATCH} -d ${WRKSRC}
+.endif
 
 post-install:
-		@${INSTALL_MAN}	$(WRKSRC)/fvwm/fvwm95.man \
-			$(PREFIX)/man/man1/fvwm95.1
+	@(cd ${WRKSRC} ; ${MAKE} install.man)
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${SAMPLEDIR}
+	@${INSTALL_DATA} ${WRKSRC}/example.fvwm95rc  ${SAMPLEDIR}
+.endif
+	@${MKDIR} ${PREFIX}/lib/X11/fvwm95/ja_JP.EUC
+	@${INSTALL_DATA} ${KITDIR}/system.fvwm95rc.jp \
+		${PREFIX}/lib/X11/fvwm95/ja_JP.EUC/system.fvwm95rc
 
 .include <bsd.port.mk>
diff --git a/x11-wm/fvwm95-i18n/distinfo b/x11-wm/fvwm95-i18n/distinfo
index 72bfd4e8dad3..ae1643620e69 100644
--- a/x11-wm/fvwm95-i18n/distinfo
+++ b/x11-wm/fvwm95-i18n/distinfo
@@ -1 +1,4 @@
 MD5 (fvwm95-2.0.43a-Autoconf.tgz) = 6dd2d55de04b74ac7ad1d64202e7c9bf
+MD5 (fvwm95-i18n-2.0.43a-portKit-19981122.tgz) = ff8b799fa12ca258d2ed78bc63b3266a
+MD5 (fvwm95-2.0.43a-FreeBSD.apmpatch.tar.gz) = 6f8ed7542b01b59350950f974f7bb861
+MD5 (fvwm95-2.0.43a-Autoconf.I18N.diff.gz) = 9fd55a9c52cb01398d5570f27d7cad77
diff --git a/x11-wm/fvwm95-i18n/files/patch-aa b/x11-wm/fvwm95-i18n/files/patch-aa
index a573f18a6200..fac4f99799a8 100644
--- a/x11-wm/fvwm95-i18n/files/patch-aa
+++ b/x11-wm/fvwm95-i18n/files/patch-aa
@@ -1,38 +1,24 @@
-*** modules/FvwmAudio/Makefile.in.orig	Tue Sep 10 22:25:33 1996
---- modules/FvwmAudio/Makefile.in	Fri Jun 13 21:41:10 1997
-***************
-*** 10,15 ****
---- 10,17 ----
-  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,34 ****
-  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}
-  
-! EXTRA_DEFINES=-DXPM -DSHAPE
-  CC=@CC@
-! INCLUDES=-I${top_srcdir}/include ${x_includes}
-  CFLAGS=${INCLUDES} @CFLAGS@ ${EXTRA_DEFINES} 
-  MAKEDEPEND=@MAKEDEPEND@
-  INSTALL=@INSTALL@
---- 26,36 ----
-  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} -L${libdir} ${RPLAY_LIBRARY}
-  
-! EXTRA_DEFINES=-DXPM -DSHAPE -DHAVE_RPLAY
-  CC=@CC@
-! INCLUDES=-I${top_srcdir}/include ${x_includes} -I${includedir}
-  CFLAGS=${INCLUDES} @CFLAGS@ ${EXTRA_DEFINES} 
-  MAKEDEPEND=@MAKEDEPEND@
-  INSTALL=@INSTALL@
+diff -urN ../fvwm95-2.0.43a-Autoconf.orig/Makefile.in ./Makefile.in
+--- ../fvwm95-2.0.43a-Autoconf.orig/Makefile.in	Sun Nov 22 04:58:50 1998
++++ ./Makefile.in	Sun Nov 22 04:59:56 1998
+@@ -11,6 +11,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ subdirs=libs fvwm modules utils sample.fvwmrc xpmroot icons mini-icons
++mansubdirs=fvwm modules xpmroot
+ local_defines=@local_defines@
+ 
+ CFLAGS = -O
+@@ -25,6 +26,12 @@
+ 	@for i in ${subdirs}; do \
+ 		echo Installing in $$i ; \
+ 		(cd $$i; ${MAKE} install) \
++	done
++
++install.man:
++	@for i in ${mansubdirs}; do \
++		echo Installing man in $$i ; \
++		(cd $$i; ${MAKE} install.man) \
+ 	done
+ 
+ depend:
diff --git a/x11-wm/fvwm95-i18n/files/patch-ab b/x11-wm/fvwm95-i18n/files/patch-ab
index 2dd9e45c0c44..7a67aab2aed5 100644
--- a/x11-wm/fvwm95-i18n/files/patch-ab
+++ b/x11-wm/fvwm95-i18n/files/patch-ab
@@ -1,16 +1,19 @@
---- 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>
+diff -urN ../fvwm95-2.0.43a-Autoconf.orig/configure ./configure
+--- ../fvwm95-2.0.43a-Autoconf.orig/configure	Sun Nov 22 04:58:50 1998
++++ ./configure	Sun Nov 22 04:59:55 1998
+@@ -2186,6 +2186,7 @@
+ 
+ 
+ 
 +
-+#ifdef __FreeBSD__
-+#include <stdlib.h>
-+#else
- #include <malloc.h>
-+#endif
-+
- #include <string.h>
- #include <sys/types.h>
- #include <sys/time.h>
+ #-------------------------------------------------------------------
+ #
+ # always build Makefiles in examples subdir
+@@ -2352,6 +2353,7 @@
+ s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+ s%@INSTALL_DATA@%$INSTALL_DATA%g
+ s%@LN_S@%$LN_S%g
++s%@INSTALL_MAN@%$INSTALL_MAN%g
+ s%@x_libraries@%$x_libraries%g
+ s%@x_includes@%$x_includes%g
+ s%@fvwm_icons@%$fvwm_icons%g
diff --git a/x11-wm/fvwm95-i18n/files/patch-ac b/x11-wm/fvwm95-i18n/files/patch-ac
index 096346a5dba1..077d45a78268 100644
--- a/x11-wm/fvwm95-i18n/files/patch-ac
+++ b/x11-wm/fvwm95-i18n/files/patch-ac
@@ -1,11 +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}
+diff -urN ../fvwm95-2.0.43a-Autoconf.orig/configure.in ./configure.in
+--- ../fvwm95-2.0.43a-Autoconf.orig/configure.in	Sun Nov 22 04:58:50 1998
++++ ./configure.in	Sun Nov 22 04:59:55 1998
+@@ -183,6 +183,7 @@
+ #-------------------------------------------------------------------
  
- INSTALL=@INSTALL@
--INSTALL_PROGRAM=@INSTALL_PROGRAM@
-+INSTALL_PROGRAM=@INSTALL@ -m 555
- RM=@RM@
- 
- SCRIPTS=fvwmrc_convert quantize_pixmaps
+ AC_SUBST(LIBS)
++AC_SUBST(INSTALL_MAN)
+ AC_SUBST(x_libraries)
+ AC_SUBST(x_includes)
+ AC_SUBST(fvwm_icons)
diff --git a/x11-wm/fvwm95-i18n/files/patch-ad b/x11-wm/fvwm95-i18n/files/patch-ad
index d89120bdd84b..5da2fd618131 100644
--- a/x11-wm/fvwm95-i18n/files/patch-ad
+++ b/x11-wm/fvwm95-i18n/files/patch-ad
@@ -1,346 +1,25 @@
-*** sample.fvwmrc/system.fvwm95rc.orig	Wed Dec 11 23:24:54 1996
---- sample.fvwmrc/system.fvwm95rc	Sun Jun 15 04:08:00 1997
-***************
-*** 90,97 ****
-  # Paths are a colon-separated list, just like regular unix PATH
-  #
-  ModulePath /usr/X11R6/lib/X11/fvwm95/:/usr/local/lib/X11/fvwm95/
-! PixmapPath /usr/include/X11/pixmaps/:/usr/local/mini-icons/
-! IconPath   /usr/include/X11/bitmaps/:/usr/local/icons/
-  
-  #========================================================================#
-  
---- 90,97 ----
-  # Paths are a colon-separated list, just like regular unix PATH
-  #
-  ModulePath /usr/X11R6/lib/X11/fvwm95/:/usr/local/lib/X11/fvwm95/
-! PixmapPath /usr/include/X11/pixmaps/:/usr/X11R6/icons/
-! IconPath   /usr/include/X11/bitmaps/:/usr/X11R6/icons/
-  
-  #========================================================================#
-  
-***************
-*** 173,179 ****
-  + "I"	Module FvwmTaskBar
-  # uncomment the followin line to enable auto-raise with mouse focus:
-  #+ "I"  Module FvwmAuto 500
-! #+ "I"	Exec xv -root -quit /usr/local/icons/bckgnd3.xpm &
-  #+ "I"	Module FvwmButtons MiniButtons
-  #+ "I"	Module FvwmBanner
-  #+ "I"	Module FvwmPager 0 3
---- 173,179 ----
-  + "I"	Module FvwmTaskBar
-  # uncomment the followin line to enable auto-raise with mouse focus:
-  #+ "I"  Module FvwmAuto 500
-! #+ "I"	Exec xv -root -quit /usr/X11R6/icons/bckgnd3.xpm &
-  #+ "I"	Module FvwmButtons MiniButtons
-  #+ "I"	Module FvwmBanner
-  #+ "I"	Module FvwmPager 0 3
-***************
-*** 269,275 ****
-  #--------- Taskbar's start menu
-  
-  DestroyMenu "StartMenu"
-! AddToMenu "StartMenu@linux-menu.xpm@^#808080^" \
-    "&Programs%programs.xpm%"	Popup Programs
-  + "&Documents%documents.xpm%"	Popup Documents
-  + "&Settings%settings.xpm%"	Popup Settings
---- 269,275 ----
-  #--------- Taskbar's start menu
-  
-  DestroyMenu "StartMenu"
-! AddToMenu "StartMenu@freebsd3-menu.xpm@^#808080^" \
-    "&Programs%programs.xpm%"	Popup Programs
-  + "&Documents%documents.xpm%"	Popup Documents
-  + "&Settings%settings.xpm%"	Popup Settings
-***************
-*** 303,314 ****
-  DestroyMenu "Accessories"
-  AddToMenu "Accessories" \
-    "View Running processes%mini-run.xpm%" Exec xterm -font 7x14 \
-!                                               -bg \#c0c0c0 -fg black \
-!                                               -T Top -n Top -e top & 
-  + "Control processes%mini-hex.xpm%"	Exec tkps &
-! + "Hifs%mini-eyes.xpm%"			Exec xterm -ls -bg \#c0c0c0 -fg black \
-!                                                    -T Hifs -name Hifs -geometry 26x24 \
-!                                                    -e hifs &
-  + "System load%mini-perf.xpm%"		Exec xload &
-  + "Memory usage%mini-perf.xpm%"		Exec xmem &
-  + "Calculator%mini-calc.xpm%"		Exec xcalc &
---- 303,314 ----
-  DestroyMenu "Accessories"
-  AddToMenu "Accessories" \
-    "View Running processes%mini-run.xpm%" Exec xterm -font 7x14 \
-! 						-bg \#c0c0c0 -fg black \
-! 						-T Top -n Top -e top & 
-  + "Control processes%mini-hex.xpm%"	Exec tkps &
-! + "Hifs%mini-eyes.xpm%"			Exec xterm -ls -bg \#c0c0c0 \
-! 						-fg black -T Hifs -name Hifs \
-! 						-geometry 26x24 -e hifs &
-  + "System load%mini-perf.xpm%"		Exec xload &
-  + "Memory usage%mini-perf.xpm%"		Exec xmem &
-  + "Calculator%mini-calc.xpm%"		Exec xcalc &
-***************
-*** 368,375 ****
-  DestroyMenu "Internet"
-  AddToMenu "Internet" \
-    "Netscape%mini-nscape.xpm%"	Exec netscape -geometry 790x543+0+0 &
-! + "Mail (Pine)%mini-mail.xpm%"	Exec color_xterm -name Mail -T Mail -ls -fn 8x13 -e pine -i &
-! + "NcFTP%mini-ftp.xpm%"		Exec color_xterm -name NcFtp -T FTP -ls -fn 8x13 -e ncftp &
-  
-  #--------- Editors
-  
---- 368,379 ----
-  DestroyMenu "Internet"
-  AddToMenu "Internet" \
-    "Netscape%mini-nscape.xpm%"	Exec netscape -geometry 790x543+0+0 &
-! + "Mail (Pine)%mini-mail.xpm%"	Exec xterm +cm -tn xterm-color \
-! 						-name Mail -T Mail \
-! 						-ls -fn 8x13 -e pine -i &
-! + "NcFTP%mini-ftp.xpm%"		Exec xterm +cm -tn xterm-color \
-! 						-name NcFtp -T FTP \
-! 						-ls -fn 8x13 -e ncftp &
-  
-  #--------- Editors
-  
-***************
-*** 393,405 ****
-  
-  DestroyMenu "SciApps"
-  AddToMenu "SciApps" \
-!   "IDL%mini-zoom.xpm%"		Exec xterm -T "IDL prompt" -name IDL \
-!                                            -font "-*-lucidatypewriter-medium-r-*-*-12-*" \
-!                                            -e xterm_idl &
-  + "IDL tool%mini-zoom.xpm%"	Exec xidl &
-! + "GNU plot%mini-zoom.xpm%"	Exec xterm -T "GNU plot" -name GNUplot \
-!                                            -font "-*-lucidatypewriter-medium-r-*-*-12-*" \
-!                                            -e gnuplot &
-  
-  #--------- File managers
-  
---- 397,409 ----
-  
-  DestroyMenu "SciApps"
-  AddToMenu "SciApps" \
-!   "IDL%mini-zoom.xpm%"	Exec xterm -T "IDL prompt" -name IDL \
-! 				-font "-*-lucidatypewriter-medium-r-*-*-12-*" \
-! 				-e xterm_idl &
-  + "IDL tool%mini-zoom.xpm%"	Exec xidl &
-! + "GNU plot%mini-zoom.xpm%" Exec xterm -T "GNU plot" -name GNUplot \
-! 				-font "-*-lucidatypewriter-medium-r-*-*-12-*" \
-! 				-e gnuplot &
-  
-  #--------- File managers
-  
-***************
-*** 414,434 ****
-  DestroyMenu "Shells"
-  AddToMenu "Shells" \
-    "Xterm	(7x14 font)%mini-term.xpm%"	Exec xterm -sb -sl 500 \
-!                                                      -j -ls -fn 7x14 &
-  + "Color Rxvt	(VT100)%mini-term.xpm%"		Exec rxvt -font 7x14 -ls &
-! + "Color Xterm	(7x14 font)%mini-term.xpm%"	Exec color_xterm -sb -sl 500 \
-!                                                      -j -ls -fn 7x14 \
-!                                                      -fb 7x14bold \
-!                                                      -title "Color xterm" &
-! + "Color Xterm	(8x13 font)%mini-term.xpm%"	Exec color_xterm -sb -sl 500 \
-!                                                      -j -ls -fn 8x13 \
-!                                                      -title "Color xterm" &
-  + ""					    	Nop
-  + "Large Xterm	(10x20 font)%mini-term.xpm%"	Exec xterm -sb -sl 500 \
-!                                                      -j -ls -fn 10x20 &
-  + "Large Rxvt	(10x20 font)%mini-term.xpm%"	Exec rxvt -font 10x20 -ls &
-! + "Large Color Xterm	(10x20 font)%mini-term.xpm%" Exec color_xterm -sb \
-!                                                 -sl 500 -j -ls -fn 10x20 &
-  
-  #--------- Modules
-  
---- 418,442 ----
-  DestroyMenu "Shells"
-  AddToMenu "Shells" \
-    "Xterm	(7x14 font)%mini-term.xpm%"	Exec xterm -sb -sl 500 \
-! 							-j -ls -fn 7x14 &
-  + "Color Rxvt	(VT100)%mini-term.xpm%"		Exec rxvt -font 7x14 -ls &
-! + "Color Xterm	(7x14 font)%mini-term.xpm%"	Exec xterm +cm -tn xterm-color \
-! 							-sb -sl 500 \
-! 							-j -ls -fn 7x14 \
-! 							-fb 7x14bold \
-! 							-title "Color xterm" &
-! + "Color Xterm	(8x13 font)%mini-term.xpm%"	Exec xterm +cm -tn xterm-color \
-! 							-sb -sl 500 \
-! 							-j -ls -fn 8x13 \
-! 							-title "Color xterm" &
-  + ""					    	Nop
-  + "Large Xterm	(10x20 font)%mini-term.xpm%"	Exec xterm -sb -sl 500 \
-! 							-j -ls -fn 10x20 &
-  + "Large Rxvt	(10x20 font)%mini-term.xpm%"	Exec rxvt -font 10x20 -ls &
-! + "Large Color Xterm	(10x20 font)%mini-term.xpm%" Exec xterm \
-! 							+cm -tn xterm-color \
-! 							-sb -sl 500 \
-! 							-j -ls -fn 10x20 &
-  
-  #--------- Modules
-  
-***************
-*** 561,576 ****
-  DestroyMenu "Utilities"
-  AddToMenu "Utilities@utilities-menu.xpm@^white^" \
-    "Running processes%mini-run.xpm%"	Exec xterm -font 7x14 \
-!                                              -bg \#c0c0c0 -fg black \
-!                                              -T Top -n Top -e top & 
-  + "Calculator%mini-calc.xpm%"		Exec xcalc &
-  + "Manual pages%mini-book1.xpm%" 	Exec xman &
-  + "Magnifying glass%mini-zoom.xpm%" 	Exec xmag &
-  + "Oclock%mini-clock.xpm%" 		Exec oclock &
-  + "Fvwm95 Explorer%mini-ofolder.xpm%"	Exec explorer &
-! + "Xterm%mini-term.xpm%" 		Exec color_xterm -sb -sl 500 -j \
-!                                              -ls -fn 8x13 \
-!                                              -title "Color xterm" &
-  + ""					Nop
-  + "Modules%mini-modules.xpm%"		Popup Module-Popup
-  + ""					Nop
---- 569,585 ----
-  DestroyMenu "Utilities"
-  AddToMenu "Utilities@utilities-menu.xpm@^white^" \
-    "Running processes%mini-run.xpm%"	Exec xterm -font 7x14 \
-! 						-bg \#c0c0c0 -fg black \
-! 						-T Top -n Top -e top & 
-  + "Calculator%mini-calc.xpm%"		Exec xcalc &
-  + "Manual pages%mini-book1.xpm%" 	Exec xman &
-  + "Magnifying glass%mini-zoom.xpm%" 	Exec xmag &
-  + "Oclock%mini-clock.xpm%" 		Exec oclock &
-  + "Fvwm95 Explorer%mini-ofolder.xpm%"	Exec explorer &
-! + "Xterm%mini-term.xpm%" 		Exec xterm +cm -tn xterm-color \
-! 						-sb -sl 500 -j \
-! 						-ls -fn 8x13 \
-! 						-title "Color xterm" &
-  + ""					Nop
-  + "Modules%mini-modules.xpm%"		Popup Module-Popup
-  + ""					Nop
-***************
-*** 754,779 ****
-  # Define the buttons to use.....
-  
-  *FvwmButtons(Title xclock, \
-!              Swallow(UseOld) "xclock" 'Exec xclock -bg \#c0c0c0 \
-!              -padding 0 -geometry -1500-1500 &')
-  *FvwmButtons(2x1, Title load, \
-!              Swallow(UseOld) "xload" 'Exec xload \
-!                      -nolabel -bg grey60 -update 5 -geometry -1500-1500 &')
-  *FvwmButtons(Title xterm, Icon rterm.xpm, \
-!              Action 'Exec "XTerm" color_xterm \
-!                      -ls -sb -fn 8x13 -title "Color xterm" &')
-  *FvwmButtons(Title xfm, Icon Xfm.xpm, \
-!              Action 'Exec "Xfm" xfm -title "File Manager" &') 
-  *FvwmButtons(Title textedit, Icon textedit.xpm, \
-!              Action 'Exec "Textedit" textedit &')
-  *FvwmButtons(Title xcalc, Icon rcalc.xpm, \
-!              Action 'Exec "Calculator" xcalc &')
-  *FvwmButtons(Title xview, Icon xview.xpm, \
-!              Action 'Exec "xv" xv &')
-  *FvwmButtons(Title gview, Icon gv.xpm, \
-!              Action 'Exec "ghostview" ghostview &')
-  *FvwmButtons(Title netscape, Icon nscape.xpm, \
-!              Action 'Exec "Netscape" netscape -geometry 920x622+90+5 &')
-  *FvwmButtons(Title kill, Icon rbomb.xpm, Action Destroy)
-  *FvwmButtons(2x1, Swallow(UseOld) "Desktop" 'FvwmPager 0 0')
-  
---- 763,789 ----
-  # Define the buttons to use.....
-  
-  *FvwmButtons(Title xclock, \
-! 		Swallow(UseOld) "xclock" 'Exec xclock -bg \#c0c0c0 \
-! 			-padding 0 -geometry -1500-1500 &')
-  *FvwmButtons(2x1, Title load, \
-! 		Swallow(UseOld) "xload" 'Exec xload \
-! 			-nolabel -bg grey60 -update 5 -geometry -1500-1500 &')
-  *FvwmButtons(Title xterm, Icon rterm.xpm, \
-! 		Action 'Exec "XTerm" xterm \
-! 			+cm -tn xterm-color \
-! 			-ls -sb -fn 8x13 -title "Color xterm" &')
-  *FvwmButtons(Title xfm, Icon Xfm.xpm, \
-! 		Action 'Exec "Xfm" xfm -title "File Manager" &') 
-  *FvwmButtons(Title textedit, Icon textedit.xpm, \
-! 		Action 'Exec "Textedit" textedit &')
-  *FvwmButtons(Title xcalc, Icon rcalc.xpm, \
-! 		Action 'Exec "Calculator" xcalc &')
-  *FvwmButtons(Title xview, Icon xview.xpm, \
-! 		Action 'Exec "xv" xv &')
-  *FvwmButtons(Title gview, Icon gv.xpm, \
-! 		Action 'Exec "ghostview" ghostview &')
-  *FvwmButtons(Title netscape, Icon nscape.xpm, \
-! 		Action 'Exec "Netscape" netscape -geometry 920x622+90+5 &')
-  *FvwmButtons(Title kill, Icon rbomb.xpm, Action Destroy)
-  *FvwmButtons(2x1, Swallow(UseOld) "Desktop" 'FvwmPager 0 0')
-  
-***************
-*** 788,800 ****
-  *MiniButtonsRows 1
-  *MiniButtonsPadding 1 1
-  
-! *MiniButtons -   mini-term.xpm        Exec    "XTerm" color_xterm -ls -sb -fn 8x13 -title "Color xterm" &
-! *MiniButtons -   mini-filemgr.xpm     Exec    "Xfm" xfm -title "File Manager" & 
-! *MiniButtons -   mini-edit.xpm        Exec  "Textedit" textedit -En 32 &
-! *MiniButtons -   mini-calc.xpm        Exec    "Calculator" xcalc &
-! *MiniButtons -   mini-xv.xpm          Exec    "xv" xv &
-! *MiniButtons -   mini-gv.xpm          Exec    "ghostview" ghostview &
-! *MiniButtons -   mini-nscape.xpm      Exec    "Netscape" netscape -geometry 790x543+0+0 &
-  #*MiniButtons -   mini-bomb.xpm        Destroy
-  
-  #------------------ Identify
---- 798,814 ----
-  *MiniButtonsRows 1
-  *MiniButtonsPadding 1 1
-  
-! *MiniButtons -   mini-term.xpm        Exec "XTerm" xterm \
-! 						+cm -tn xterm-color \
-! 						-ls -sb -fn 8x13 \
-! 						-title "Color xterm" &
-! *MiniButtons -   mini-filemgr.xpm     Exec "Xfm" xfm -title "File Manager" & 
-! *MiniButtons -   mini-edit.xpm        Exec "Textedit" textedit -En 32 &
-! *MiniButtons -   mini-calc.xpm        Exec "Calculator" xcalc &
-! *MiniButtons -   mini-xv.xpm          Exec "xv" xv &
-! *MiniButtons -   mini-gv.xpm          Exec "ghostview" ghostview &
-! *MiniButtons -   mini-nscape.xpm      Exec "Netscape" netscape \
-! 						-geometry 790x543+0+0 &
-  #*MiniButtons -   mini-bomb.xpm        Destroy
-  
-  #------------------ Identify
-***************
-*** 837,843 ****
-  #*FvwmTaskBarShowTransients
-  #*FvwmTaskBarClockFormat %I:%M%p
-  #*FvwmTaskBarHighlightFocus
-! *FvwmTaskBarMailCommand Exec color_xterm -name Mail -T mail -ls -fn 8x13 -e pine -i 
-  #*FvwmTaskBarAutoHide
-  *FvwmTaskBarDeskOnly
-  
---- 851,859 ----
-  #*FvwmTaskBarShowTransients
-  #*FvwmTaskBarClockFormat %I:%M%p
-  #*FvwmTaskBarHighlightFocus
-! *FvwmTaskBarMailCommand Exec xterm \
-! 				+cm -tn xterm-color \
-! 				-name Mail -T mail -ls -fn 8x13 -e pine -i 
-  #*FvwmTaskBarAutoHide
-  *FvwmTaskBarDeskOnly
-  
-***************
-*** 845,847 ****
---- 861,876 ----
-  
-  *FvwmConfigFore Black
-  *FvwmConfigBack #c0c0c0
-+ 
-+ *FvwmAudioPlayCmd builtin-rplay
-+ #*FvwmAudioDir /usr/lib/sounds
-+ #*FvwmAudio startup Cheers.au
-+ #*FvwmAudio shutdown Goodbye.au
-+ #*FvwmAudio unknown doh.au
-+ #*FvwmAudio add_window drip.au
-+ #*FvwmAudio raise_window beep_pure_saw.au
-+ #*FvwmAudio lower_window beep_pure_saw.au
-+ #*FvwmAudio focus_change tap2.au
-+ #*FvwmAudio destroy_window beep_drop_of_water.au
-+ #*FvwmAudio iconify ploop.au
-+ #*FvwmAudio deiconify beep_kind_warning.au
+diff -urN ../fvwm95-2.0.43a-Autoconf.orig/example.fvwm95rc ./example.fvwm95rc
+--- ../fvwm95-2.0.43a-Autoconf.orig/example.fvwm95rc	Sun Nov 22 04:52:28 1998
++++ ./example.fvwm95rc	Sun Nov 22 04:59:33 1998
+@@ -89,9 +89,9 @@
+ # Module path and paths to the icons
+ # Paths are a colon-separated list, just like regular unix PATH
+ #
+-ModulePath /usr/X11R6/lib/X11/fvwm95/:/usr/local/lib/X11/fvwm95/
+-PixmapPath /usr/include/X11/pixmaps/:/usr/local/mini-icons/
+-IconPath   /usr/include/X11/bitmaps/:/usr/local/icons/
++ModulePath /usr/X11R6/lib/X11/fvwm95/
++PixmapPath /usr/X11R6/include/X11/pixmaps/:/usr/X11R6/lib/X11/fvwm95/pixmaps/
++IconPath   /usr/X11R6/include/X11/bitmaps/:/usr/X11R6/lib/X11/fvwm95/pixmaps/
+ 
+ #========================================================================#
+ 
+@@ -269,7 +269,7 @@
+ #--------- Taskbar's start menu
+ 
+ DestroyMenu "StartMenu"
+-AddToMenu "StartMenu@linux-menu.xpm@^#808080^" \
++AddToMenu "StartMenu@freebsd-menu.xpm@^#808080^" \
+   "&Programs%programs.xpm%"	Popup Programs
+ + "&Documents%documents.xpm%"	Popup Documents
+ + "&Settings%settings.xpm%"	Popup Settings
diff --git a/x11-wm/fvwm95-i18n/files/patch-ae b/x11-wm/fvwm95-i18n/files/patch-ae
index c99a4e04c3aa..88b6888f4b51 100644
--- a/x11-wm/fvwm95-i18n/files/patch-ae
+++ b/x11-wm/fvwm95-i18n/files/patch-ae
@@ -1,11 +1,31 @@
---- modules/FvwmTaskBar/Goodies.h.orig	Sun Aug  3 13:00:30 1997
-+++ modules/FvwmTaskBar/Goodies.h	Sun Aug  3 13:00:09 1997
-@@ -1,4 +1,8 @@
-+#ifdef __FreeBSD__
-+#define DEFAULT_MAIL_PATH  "/var/mail/"
-+#else
- #define DEFAULT_MAIL_PATH  "/var/spool/mail/"
-+#endif
- #define DEFAULT_BELL_VOLUME 20
- 
- /* Tip window types */
+diff -urN ../fvwm95-2.0.43a-Autoconf.orig/fvwm/Makefile.in ./fvwm/Makefile.in
+--- ../fvwm95-2.0.43a-Autoconf.orig/fvwm/Makefile.in	Sun Nov 22 04:58:48 1998
++++ ./fvwm/Makefile.in	Sun Nov 22 04:59:53 1998
+@@ -37,6 +37,8 @@
+ MAKEDEPEND=@MAKEDEPEND@
+ INSTALL=@INSTALL@
+ INSTALL_PROGRAM=@INSTALL_PROGRAM@
++INSTALL_MAN=@INSTALL_MAN@ 
++MANPREFIX=@mandir@
+ RM=@RM@
+ 
+ PROG=${fvwm_name}
+@@ -89,6 +91,8 @@
+        virtual.o \
+        windows.o
+ 
++FVWM_MAN = fvwm95.man
++
+ all: ${PROG}
+ 
+ depend:
+@@ -96,6 +100,9 @@
+ 
+ install: all
+ 	${INSTALL_PROGRAM} ${PROG} ${bin_dir}
++
++install.man:
++	${INSTALL_MAN} ${FVWM_MAN} ${MANPREFIX}/man1/${FVWM_MAN:S/man/1/}
+ 
+ clean:
+ 	${RM} ${PROG} ${OBJS} *~ core *.bak
diff --git a/x11-wm/fvwm95-i18n/files/patch-af b/x11-wm/fvwm95-i18n/files/patch-af
new file mode 100644
index 000000000000..3bb8ec800ad0
--- /dev/null
+++ b/x11-wm/fvwm95-i18n/files/patch-af
@@ -0,0 +1,23 @@
+diff -urN ../fvwm95-2.0.43a-Autoconf.orig/fvwm/icons.c ./fvwm/icons.c
+--- ../fvwm95-2.0.43a-Autoconf.orig/fvwm/icons.c	Sun Nov 22 04:58:41 1998
++++ ./fvwm/icons.c	Sun Nov 22 04:59:47 1998
+@@ -88,6 +88,9 @@
+   /* figure out the icon window size */
+   if (!(tmp_win->flags & NOICON_TITLE)||(tmp_win->icon_p_height == 0))
+     {
++      if (tmp_win->icon_name == NULL)
++        tmp_win->icon_name = tmp_win->name;
++                 
+       tmp_win->icon_t_width = XTextWidth(Scr.IconFont.font,
+ 					 tmp_win->icon_name, 
+                                          strlen(tmp_win->icon_name));
+@@ -328,6 +331,9 @@
+ 
+   if (Tmp_win->icon_w == (int)NULL)
+     return;
++
++  if (Tmp_win->icon_name == NULL)
++   Tmp_win->icon_name = Tmp_win->name;
+   
+   Tmp_win->icon_t_width = XTextWidth(Scr.IconFont.font,Tmp_win->icon_name, 
+ 				     strlen(Tmp_win->icon_name));
diff --git a/x11-wm/fvwm95-i18n/files/patch-ag b/x11-wm/fvwm95-i18n/files/patch-ag
new file mode 100644
index 000000000000..f72b579c32f1
--- /dev/null
+++ b/x11-wm/fvwm95-i18n/files/patch-ag
@@ -0,0 +1,36 @@
+diff -urN ../fvwm95-2.0.43a-Autoconf.orig/fvwm/read.c ./fvwm/read.c
+--- ../fvwm95-2.0.43a-Autoconf.orig/fvwm/read.c	Sun Nov 22 04:58:47 1998
++++ ./fvwm/read.c	Sun Nov 22 04:59:56 1998
+@@ -133,6 +133,22 @@
+       if((filename != NULL)&&(filename!= ofilename))
+ 	free(filename);
+       /* find the home directory to look in */
++#ifdef I18N
++	if (Lang != NULL && strlen(Lang) > 0) {
++		Home = FVWMDIR;
++		HomeLen = strlen(Home);
++		home_file = safemalloc(HomeLen + strlen(ofilename)
++			+ strlen(Lang) + 3);
++		strcpy(home_file,Home);
++		strcat(home_file,"/");
++		strcat(home_file, Lang);
++		strcat(home_file, "/");
++		strcat(home_file,ofilename);
++		filename = home_file;
++		fd = fopen(filename,"r");      
++	}
++	if (fd == NULL) {
++#endif
+       Home = FVWMDIR;
+       HomeLen = strlen(Home);
+       home_file = safemalloc(HomeLen + strlen(ofilename)+3);
+@@ -141,6 +157,9 @@
+       strcat(home_file,ofilename);
+       filename = home_file;
+       fd = fopen(filename,"r");      
++#ifdef I18N
++	}
++#endif
+       }
+     }
+ 
diff --git a/x11-wm/fvwm95-i18n/files/patch-ah b/x11-wm/fvwm95-i18n/files/patch-ah
new file mode 100644
index 000000000000..d9d78b242d32
--- /dev/null
+++ b/x11-wm/fvwm95-i18n/files/patch-ah
@@ -0,0 +1,12 @@
+diff -urN ../fvwm95-2.0.43a-Autoconf.orig/icons/Makefile.in ./icons/Makefile.in
+--- ../fvwm95-2.0.43a-Autoconf.orig/icons/Makefile.in	Sun Nov 22 04:52:28 1998
++++ ./icons/Makefile.in	Sun Nov 22 04:59:33 1998
+@@ -2,7 +2,7 @@
+ SHELL=/bin/sh
+ 
+ prefix=@prefix@
+-icon_dir=@prefix@/icons
++icon_dir=@prefix@/lib/X11/fvwm95/pixmaps
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
diff --git a/x11-wm/fvwm95-i18n/files/patch-ai b/x11-wm/fvwm95-i18n/files/patch-ai
new file mode 100644
index 000000000000..f8a61c0f1eee
--- /dev/null
+++ b/x11-wm/fvwm95-i18n/files/patch-ai
@@ -0,0 +1,20 @@
+diff -urN ../fvwm95-2.0.43a-Autoconf.orig/mini-icons/Makefile.in ./mini-icons/Makefile.in
+--- ../fvwm95-2.0.43a-Autoconf.orig/mini-icons/Makefile.in	Sun Nov 22 04:51:30 1998
++++ ./mini-icons/Makefile.in	Sun Nov 22 04:59:33 1998
+@@ -2,7 +2,7 @@
+ SHELL=/bin/sh
+ 
+ prefix=@prefix@
+-icon_dir=@prefix@/icons
++icon_dir=@prefix@/lib/X11/fvwm95/pixmaps
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -13,6 +13,7 @@
+ 	documents.xpm \
+ 	find1.xpm \
+ 	folder.xpm \
++    freebsd-menu.xpm \
+ 	fvwm-menu.xpm \
+ 	gv.xpm \
+ 	help.xpm \
diff --git a/x11-wm/fvwm95-i18n/files/patch-ak b/x11-wm/fvwm95-i18n/files/patch-ak
new file mode 100644
index 000000000000..7aadddd783cf
--- /dev/null
+++ b/x11-wm/fvwm95-i18n/files/patch-ak
@@ -0,0 +1,26 @@
+diff -urN ../fvwm95-2.0.43a-Autoconf.orig/modules/FvwmAudio/Makefile.in ./modules/FvwmAudio/Makefile.in
+--- ../fvwm95-2.0.43a-Autoconf.orig/modules/FvwmAudio/Makefile.in	Sun Nov 22 04:51:49 1998
++++ ./modules/FvwmAudio/Makefile.in	Sun Nov 22 04:59:31 1998
+@@ -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-al b/x11-wm/fvwm95-i18n/files/patch-al
new file mode 100644
index 000000000000..bcb8e3cf245b
--- /dev/null
+++ b/x11-wm/fvwm95-i18n/files/patch-al
@@ -0,0 +1,17 @@
+diff -urN ../fvwm95-2.0.43a-Autoconf.orig/modules/FvwmForm/FvwmForm.c ./modules/FvwmForm/FvwmForm.c
+--- ../fvwm95-2.0.43a-Autoconf.orig/modules/FvwmForm/FvwmForm.c	Sun Nov 22 04:58:25 1998
++++ ./modules/FvwmForm/FvwmForm.c	Sun Nov 22 04:59:35 1998
+@@ -20,7 +20,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-am b/x11-wm/fvwm95-i18n/files/patch-am
new file mode 100644
index 000000000000..49b62614a55d
--- /dev/null
+++ b/x11-wm/fvwm95-i18n/files/patch-am
@@ -0,0 +1,24 @@
+diff -urN ../fvwm95-2.0.43a-Autoconf.orig/modules/Makefile.in ./modules/Makefile.in
+--- ../fvwm95-2.0.43a-Autoconf.orig/modules/Makefile.in	Sun Nov 22 04:52:00 1998
++++ ./modules/Makefile.in	Sun Nov 22 04:59:32 1998
+@@ -10,6 +10,8 @@
+ 	FvwmPager FvwmSave FvwmSaveDesk FvwmScroll FvwmTalk FvwmTaskBar \
+ 	FvwmWinList
+ modules_dir=@prefix@/lib/X11/@fvwm_name@
++INSTALL_MAN=@INSTALL_MAN@
++MANPREFIX=@mandir@
+ 
+ all:
+ 	@for i in ${subdirs}; do \
+@@ -22,6 +24,11 @@
+ 	@for i in ${subdirs}; do \
+ 		echo Installing in $$i ; \
+ 		(cd $$i; ${MAKE} install) \
++	done
++
++install.man:
++	@for i in ${subdirs}; do \
++		(${INSTALL_MAN} $$i/$$i.man ${MANPREFIX}/man1/$$i.1) \
+ 	done
+ 
+ depend:
diff --git a/x11-wm/fvwm95-i18n/files/patch-an b/x11-wm/fvwm95-i18n/files/patch-an
new file mode 100644
index 000000000000..a694acf68d8c
--- /dev/null
+++ b/x11-wm/fvwm95-i18n/files/patch-an
@@ -0,0 +1,25 @@
+diff -urN ../fvwm95-2.0.43a-Autoconf.orig/sample.fvwmrc/system.fvwm95rc ./sample.fvwmrc/system.fvwm95rc
+--- ../fvwm95-2.0.43a-Autoconf.orig/sample.fvwmrc/system.fvwm95rc	Sun Nov 22 04:52:07 1998
++++ ./sample.fvwmrc/system.fvwm95rc	Sun Nov 22 04:59:33 1998
+@@ -89,9 +89,9 @@
+ # Module path and paths to the icons
+ # Paths are a colon-separated list, just like regular unix PATH
+ #
+-ModulePath /usr/X11R6/lib/X11/fvwm95/:/usr/local/lib/X11/fvwm95/
+-PixmapPath /usr/include/X11/pixmaps/:/usr/local/mini-icons/
+-IconPath   /usr/include/X11/bitmaps/:/usr/local/icons/
++ModulePath /usr/X11R6/lib/X11/fvwm95/
++PixmapPath /usr/X11R6/include/X11/pixmaps/:/usr/X11R6/lib/X11/fvwm95/pixmaps/
++IconPath   /usr/X11R6/include/X11/bitmaps/:/usr/X11R6/lib/X11/fvwm95/pixmaps/
+ 
+ #========================================================================#
+ 
+@@ -269,7 +269,7 @@
+ #--------- Taskbar's start menu
+ 
+ DestroyMenu "StartMenu"
+-AddToMenu "StartMenu@linux-menu.xpm@^#808080^" \
++AddToMenu "StartMenu@freebsd-menu.xpm@^#808080^" \
+   "&Programs%programs.xpm%"	Popup Programs
+ + "&Documents%documents.xpm%"	Popup Documents
+ + "&Settings%settings.xpm%"	Popup Settings
diff --git a/x11-wm/fvwm95-i18n/files/patch-ao b/x11-wm/fvwm95-i18n/files/patch-ao
new file mode 100644
index 000000000000..d014f682e1e8
--- /dev/null
+++ b/x11-wm/fvwm95-i18n/files/patch-ao
@@ -0,0 +1,12 @@
+diff -urN ../fvwm95-2.0.43a-Autoconf.orig/utils/Makefile.in ./utils/Makefile.in
+--- ../fvwm95-2.0.43a-Autoconf.orig/utils/Makefile.in	Sun Nov 22 04:51:30 1998
++++ ./utils/Makefile.in	Sun Nov 22 04:59:31 1998
+@@ -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-ap b/x11-wm/fvwm95-i18n/files/patch-ap
new file mode 100644
index 000000000000..b366646b53ac
--- /dev/null
+++ b/x11-wm/fvwm95-i18n/files/patch-ap
@@ -0,0 +1,22 @@
+diff -urN ../fvwm95-2.0.43a-Autoconf.orig/xpmroot/Makefile.in ./xpmroot/Makefile.in
+--- ../fvwm95-2.0.43a-Autoconf.orig/xpmroot/Makefile.in	Sun Nov 22 04:52:00 1998
++++ ./xpmroot/Makefile.in	Sun Nov 22 04:59:32 1998
+@@ -22,6 +22,8 @@
+ MAKEDEPEND=@MAKEDEPEND@
+ INSTALL=@INSTALL@
+ INSTALL_PROGRAM=@INSTALL_PROGRAM@
++INSTALL_MAN=@INSTALL_MAN@ 
++MANPREFIX=@mandir@
+ RM=@RM@
+ 
+ PROG=xpmroot
+@@ -36,6 +38,9 @@
+ 
+ install: all
+ 	${INSTALL_PROGRAM} ${PROG} ${bin_dir}
++
++install.man:
++	${INSTALL_MAN} ${PROG}.man ${MANPREFIX}/man1/${PROG}.1
+ 
+ clean:
+ 	${RM} ${PROG} ${OBJS} *~ core *.bak
diff --git a/x11-wm/fvwm95-i18n/pkg-comment b/x11-wm/fvwm95-i18n/pkg-comment
index fc998e64d367..c95a9d11461a 100644
--- a/x11-wm/fvwm95-i18n/pkg-comment
+++ b/x11-wm/fvwm95-i18n/pkg-comment
@@ -1 +1 @@
-Win95 lookalike version of the fvwm2 window manager.
+Win95 lookalike fvwm2 window manager with an I18N patch.
diff --git a/x11-wm/fvwm95-i18n/pkg-descr b/x11-wm/fvwm95-i18n/pkg-descr
index e94c4f1ea801..a151473d95fc 100644
--- a/x11-wm/fvwm95-i18n/pkg-descr
+++ b/x11-wm/fvwm95-i18n/pkg-descr
@@ -1,6 +1,7 @@
 Fvwm95 is a hack based on fvwm2.x. It tries to emulate the good
 features of a well known product without bloating the regular 
-fvwm code. The main aspects are: 
+fvwm code. Additional internationalized patch supports various
+languages. The main aspects are:
 
 A familiar look and feel. It can be interesting for users moving
 from the MS-World to Unix, or for those who have to switch 
diff --git a/x11-wm/fvwm95-i18n/pkg-plist b/x11-wm/fvwm95-i18n/pkg-plist
index 8786dde05a9e..e7002e126069 100644
--- a/x11-wm/fvwm95-i18n/pkg-plist
+++ b/x11-wm/fvwm95-i18n/pkg-plist
@@ -1,221 +1,6 @@
 bin/fvwm95
 bin/xpmroot
-icons/Mosaic.xpm
-icons/Xfm.xpm
-icons/arrdown2.xpm
-icons/arrows2.xpm
-icons/arrup2.xpm
-icons/bckgnd1.xpm
-icons/bckgnd3.xpm
-icons/bomb.xpm
-icons/ccode.icon
-icons/clamp.xpm
-icons/colormap.xpm
-icons/datebook.xpm
-icons/default.xbm
-icons/desk.xpm
-icons/dialog_box.xpm
-icons/documents.xpm
-icons/doombig.xpm
-icons/doomface.xpm
-icons/editres.xpm
-icons/eps.xpm
-icons/exit.xpm
-icons/find1.xpm
-icons/flow_chart.xpm
-icons/folder.xpm
-icons/folder2.xpm
-icons/folders.xpm
-icons/fvwm-menu.xpm
-icons/fvwm.bitmap
-icons/fvwm.xpm
-icons/fvwm2.xpm
-icons/fvwm2_big.xpm
-icons/fvwm3.xpm
-icons/gnu-animal.xpm
-icons/graphs.xpm
-icons/gv.xpm
-icons/hcode.icon
-icons/help.xpm
-icons/jewelbig.xpm
-icons/k.xpm
-icons/k2.xpm
-icons/lemacs.xpm
-icons/linux-menu.xpm
-icons/mag_glass.xpm
-icons/mail1.xpm
-icons/mail2.xpm
-icons/map.xpm
-icons/math4.xpm
-icons/mini-arch.xpm
-icons/mini-ball.xpm
-icons/mini-bball.xpm
-icons/mini-bomb.xpm
-icons/mini-book1.xpm
-icons/mini-book2.xpm
-icons/mini-books.xpm
-icons/mini-briefcase.xpm
-icons/mini-bug1.xpm
-icons/mini-bug2.xpm
-icons/mini-bx2.xpm
-icons/mini-calc.xpm
-icons/mini-camera.xpm
-icons/mini-cat.xpm
-icons/mini-cave.xpm
-icons/mini-cd.xpm
-icons/mini-cdlabel.xpm
-icons/mini-chinese.xpm
-icons/mini-clipboard.xpm
-icons/mini-clock.xpm
-icons/mini-colors.xpm
-icons/mini-connect.xpm
-icons/mini-crosbone.xpm
-icons/mini-cross.xpm
-icons/mini-desktop.xpm
-icons/mini-diff.xpm
-icons/mini-diskette.xpm
-icons/mini-display.xpm
-icons/mini-doc.xpm
-icons/mini-doc1.xpm
-icons/mini-dog.xpm
-icons/mini-edit.xpm
-icons/mini-espada.xpm
-icons/mini-exclam.xpm
-icons/mini-exp.xpm
-icons/mini-eye.xpm
-icons/mini-eyes.xpm
-icons/mini-fax.xpm
-icons/mini-fdisk.xpm
-icons/mini-filemgr.xpm
-icons/mini-folder.xpm
-icons/mini-font.xpm
-icons/mini-fractal.xpm
-icons/mini-frame.xpm
-icons/mini-ftp.xpm
-icons/mini-gball.xpm
-icons/mini-go.xpm
-icons/mini-gopher.xpm
-icons/mini-graph.xpm
-icons/mini-gv.xpm
-icons/mini-hammer.xpm
-icons/mini-happy.xpm
-icons/mini-hdisk.xpm
-icons/mini-heart.xpm
-icons/mini-hex.xpm
-icons/mini-hextris.xpm
-icons/mini-icons.xpm
-icons/mini-keyboard.xpm
-icons/mini-lock.xpm
-icons/mini-lower.xpm
-icons/mini-mail.xpm
-icons/mini-manual.xpm
-icons/mini-max1.xpm
-icons/mini-maze.xpm
-icons/mini-modules.xpm
-icons/mini-monitor.xpm
-icons/mini-move.xpm
-icons/mini-move1.xpm
-icons/mini-mwm.xpm
-icons/mini-news.xpm
-icons/mini-nscape.xpm
-icons/mini-ofolder.xpm
-icons/mini-olwm.xpm
-icons/mini-pager.xpm
-icons/mini-paint.xpm
-icons/mini-palette.xpm
-icons/mini-pdf.xpm
-icons/mini-pencil.xpm
-icons/mini-penguin.xpm
-icons/mini-perf.xpm
-icons/mini-question.xpm
-icons/mini-raise.xpm
-icons/mini-ray.xpm
-icons/mini-rball.xpm
-icons/mini-resize.xpm
-icons/mini-roach.xpm
-icons/mini-run.xpm
-icons/mini-sh.xpm
-icons/mini-sh1.xpm
-icons/mini-slon.xpm
-icons/mini-sound.xpm
-icons/mini-start.xpm
-icons/mini-stop.xpm
-icons/mini-telnet.xpm
-icons/mini-term.xpm
-icons/mini-tetris.xpm
-icons/mini-trebol.xpm
-icons/mini-turn.xpm
-icons/mini-twm.xpm
-icons/mini-window.xpm
-icons/mini-windows.xpm
-icons/mini-x.xpm
-icons/mini-x2.xpm
-icons/mini-xfig.xpm
-icons/mini-xjewel.xpm
-icons/mini-xkeycaps.xpm
-icons/mini-xlander.xpm
-icons/mini-xmahjongg.xpm
-icons/mini-xsnow.xpm
-icons/mini-xv.xpm
-icons/mini-zoom.xpm
-icons/mini.audiovol.xpm
-icons/mini.checkmark.xpm
-icons/mini.cut.xpm
-icons/mini.destroy.xpm
-icons/mini.excl.xpm
-icons/mini.exit.xpm
-icons/mini.fvwm.xpm
-icons/mini.letter.xpm
-icons/mini.lower.xpm
-icons/mini.move.xpm
-icons/mini.netscape.xpm
-icons/mini.raise.xpm
-icons/mini.resize.xpm
-icons/mini.xarchie.xpm
-icons/mini.xboing.xpm
-icons/mini.xlock.xpm
-icons/mini.xpm
-icons/mini.xterm.xpm
-icons/mini.zircon.xpm
-icons/nscape.xpm
-icons/ocode.icon
-icons/page.xpm
-icons/page2.xpm
-icons/prog.icon
-icons/programs.xpm
-icons/ps.xpm
-icons/question.xpm
-icons/rbomb.xpm
-icons/rcalc.xpm
-icons/rterm.xpm
-icons/run.xpm
-icons/settings.xpm
-icons/shutdown.xpm
-icons/term.xpm
-icons/textedit.xpm
-icons/tiff2.xpm
-icons/toolbox.xpm
-icons/unknown1.xpm
-icons/utilities-menu.xpm
-icons/wierd_page3.xpm
-icons/word_processor.xpm
-icons/world.xpm
-icons/wterm.xpm
-icons/xboingbig.xpm
-icons/xcalc.xpm
-icons/xemacs.xpm
-icons/xlock.xpm
-icons/xman.xpm
-icons/xpaint.xpm
-icons/xterm-axp.xpm
-icons/xterm-blank.xpm
-icons/xterm-dec.xpm
-icons/xterm-sgi.xpm
-icons/xterm-sol.xpm
-icons/xterm-sun.xpm
-icons/xterm.xpm
-icons/xv.xpm
-icons/xview.xpm
+lib/libfvwm95.a
 lib/X11/fvwm95/FvwmAudio
 lib/X11/fvwm95/FvwmAuto
 lib/X11/fvwm95/FvwmBacker
@@ -239,5 +24,226 @@ lib/X11/fvwm95/FvwmWinList
 lib/X11/fvwm95/fvwmrc_convert
 lib/X11/fvwm95/quantize_pixmaps
 lib/X11/fvwm95/system.fvwm95rc
-lib/libfvwm95.a
+lib/X11/fvwm95/ja_JP.EUC/system.fvwm95rc
+lib/X11/fvwm95/pixmaps/Mosaic.xpm
+lib/X11/fvwm95/pixmaps/Xfm.xpm
+lib/X11/fvwm95/pixmaps/arrdown2.xpm
+lib/X11/fvwm95/pixmaps/arrows2.xpm
+lib/X11/fvwm95/pixmaps/arrup2.xpm
+lib/X11/fvwm95/pixmaps/bckgnd1.xpm
+lib/X11/fvwm95/pixmaps/bckgnd3.xpm
+lib/X11/fvwm95/pixmaps/bomb.xpm
+lib/X11/fvwm95/pixmaps/ccode.icon
+lib/X11/fvwm95/pixmaps/clamp.xpm
+lib/X11/fvwm95/pixmaps/colormap.xpm
+lib/X11/fvwm95/pixmaps/datebook.xpm
+lib/X11/fvwm95/pixmaps/default.xbm
+lib/X11/fvwm95/pixmaps/desk.xpm
+lib/X11/fvwm95/pixmaps/dialog_box.xpm
+lib/X11/fvwm95/pixmaps/documents.xpm
+lib/X11/fvwm95/pixmaps/doombig.xpm
+lib/X11/fvwm95/pixmaps/doomface.xpm
+lib/X11/fvwm95/pixmaps/editres.xpm
+lib/X11/fvwm95/pixmaps/eps.xpm
+lib/X11/fvwm95/pixmaps/exit.xpm
+lib/X11/fvwm95/pixmaps/find1.xpm
+lib/X11/fvwm95/pixmaps/flow_chart.xpm
+lib/X11/fvwm95/pixmaps/folder.xpm
+lib/X11/fvwm95/pixmaps/folder2.xpm
+lib/X11/fvwm95/pixmaps/folders.xpm
+lib/X11/fvwm95/pixmaps/freebsd-menu.xpm
+lib/X11/fvwm95/pixmaps/fvwm-menu.xpm
+lib/X11/fvwm95/pixmaps/fvwm.bitmap
+lib/X11/fvwm95/pixmaps/fvwm.xpm
+lib/X11/fvwm95/pixmaps/fvwm2.xpm
+lib/X11/fvwm95/pixmaps/fvwm2_big.xpm
+lib/X11/fvwm95/pixmaps/fvwm3.xpm
+lib/X11/fvwm95/pixmaps/gnu-animal.xpm
+lib/X11/fvwm95/pixmaps/graphs.xpm
+lib/X11/fvwm95/pixmaps/gv.xpm
+lib/X11/fvwm95/pixmaps/hcode.icon
+lib/X11/fvwm95/pixmaps/help.xpm
+lib/X11/fvwm95/pixmaps/jewelbig.xpm
+lib/X11/fvwm95/pixmaps/k.xpm
+lib/X11/fvwm95/pixmaps/k2.xpm
+lib/X11/fvwm95/pixmaps/lemacs.xpm
+lib/X11/fvwm95/pixmaps/linux-menu.xpm
+lib/X11/fvwm95/pixmaps/mag_glass.xpm
+lib/X11/fvwm95/pixmaps/mail1.xpm
+lib/X11/fvwm95/pixmaps/mail2.xpm
+lib/X11/fvwm95/pixmaps/map.xpm
+lib/X11/fvwm95/pixmaps/math4.xpm
+lib/X11/fvwm95/pixmaps/mini-arch.xpm
+lib/X11/fvwm95/pixmaps/mini-ball.xpm
+lib/X11/fvwm95/pixmaps/mini-bball.xpm
+lib/X11/fvwm95/pixmaps/mini-bomb.xpm
+lib/X11/fvwm95/pixmaps/mini-book1.xpm
+lib/X11/fvwm95/pixmaps/mini-book2.xpm
+lib/X11/fvwm95/pixmaps/mini-books.xpm
+lib/X11/fvwm95/pixmaps/mini-briefcase.xpm
+lib/X11/fvwm95/pixmaps/mini-bug1.xpm
+lib/X11/fvwm95/pixmaps/mini-bug2.xpm
+lib/X11/fvwm95/pixmaps/mini-bx2.xpm
+lib/X11/fvwm95/pixmaps/mini-calc.xpm
+lib/X11/fvwm95/pixmaps/mini-camera.xpm
+lib/X11/fvwm95/pixmaps/mini-cat.xpm
+lib/X11/fvwm95/pixmaps/mini-cave.xpm
+lib/X11/fvwm95/pixmaps/mini-cd.xpm
+lib/X11/fvwm95/pixmaps/mini-cdlabel.xpm
+lib/X11/fvwm95/pixmaps/mini-chinese.xpm
+lib/X11/fvwm95/pixmaps/mini-clipboard.xpm
+lib/X11/fvwm95/pixmaps/mini-clock.xpm
+lib/X11/fvwm95/pixmaps/mini-colors.xpm
+lib/X11/fvwm95/pixmaps/mini-connect.xpm
+lib/X11/fvwm95/pixmaps/mini-crosbone.xpm
+lib/X11/fvwm95/pixmaps/mini-cross.xpm
+lib/X11/fvwm95/pixmaps/mini-desktop.xpm
+lib/X11/fvwm95/pixmaps/mini-diff.xpm
+lib/X11/fvwm95/pixmaps/mini-diskette.xpm
+lib/X11/fvwm95/pixmaps/mini-display.xpm
+lib/X11/fvwm95/pixmaps/mini-doc.xpm
+lib/X11/fvwm95/pixmaps/mini-doc1.xpm
+lib/X11/fvwm95/pixmaps/mini-dog.xpm
+lib/X11/fvwm95/pixmaps/mini-edit.xpm
+lib/X11/fvwm95/pixmaps/mini-espada.xpm
+lib/X11/fvwm95/pixmaps/mini-exclam.xpm
+lib/X11/fvwm95/pixmaps/mini-exp.xpm
+lib/X11/fvwm95/pixmaps/mini-eye.xpm
+lib/X11/fvwm95/pixmaps/mini-eyes.xpm
+lib/X11/fvwm95/pixmaps/mini-fax.xpm
+lib/X11/fvwm95/pixmaps/mini-fdisk.xpm
+lib/X11/fvwm95/pixmaps/mini-filemgr.xpm
+lib/X11/fvwm95/pixmaps/mini-folder.xpm
+lib/X11/fvwm95/pixmaps/mini-font.xpm
+lib/X11/fvwm95/pixmaps/mini-fractal.xpm
+lib/X11/fvwm95/pixmaps/mini-frame.xpm
+lib/X11/fvwm95/pixmaps/mini-ftp.xpm
+lib/X11/fvwm95/pixmaps/mini-gball.xpm
+lib/X11/fvwm95/pixmaps/mini-go.xpm
+lib/X11/fvwm95/pixmaps/mini-gopher.xpm
+lib/X11/fvwm95/pixmaps/mini-graph.xpm
+lib/X11/fvwm95/pixmaps/mini-gv.xpm
+lib/X11/fvwm95/pixmaps/mini-hammer.xpm
+lib/X11/fvwm95/pixmaps/mini-happy.xpm
+lib/X11/fvwm95/pixmaps/mini-hdisk.xpm
+lib/X11/fvwm95/pixmaps/mini-heart.xpm
+lib/X11/fvwm95/pixmaps/mini-hex.xpm
+lib/X11/fvwm95/pixmaps/mini-hextris.xpm
+lib/X11/fvwm95/pixmaps/mini-icons.xpm
+lib/X11/fvwm95/pixmaps/mini-keyboard.xpm
+lib/X11/fvwm95/pixmaps/mini-lock.xpm
+lib/X11/fvwm95/pixmaps/mini-lower.xpm
+lib/X11/fvwm95/pixmaps/mini-mail.xpm
+lib/X11/fvwm95/pixmaps/mini-manual.xpm
+lib/X11/fvwm95/pixmaps/mini-max1.xpm
+lib/X11/fvwm95/pixmaps/mini-maze.xpm
+lib/X11/fvwm95/pixmaps/mini-modules.xpm
+lib/X11/fvwm95/pixmaps/mini-monitor.xpm
+lib/X11/fvwm95/pixmaps/mini-move.xpm
+lib/X11/fvwm95/pixmaps/mini-move1.xpm
+lib/X11/fvwm95/pixmaps/mini-mwm.xpm
+lib/X11/fvwm95/pixmaps/mini-news.xpm
+lib/X11/fvwm95/pixmaps/mini-nscape.xpm
+lib/X11/fvwm95/pixmaps/mini-ofolder.xpm
+lib/X11/fvwm95/pixmaps/mini-olwm.xpm
+lib/X11/fvwm95/pixmaps/mini-pager.xpm
+lib/X11/fvwm95/pixmaps/mini-paint.xpm
+lib/X11/fvwm95/pixmaps/mini-palette.xpm
+lib/X11/fvwm95/pixmaps/mini-pdf.xpm
+lib/X11/fvwm95/pixmaps/mini-pencil.xpm
+lib/X11/fvwm95/pixmaps/mini-penguin.xpm
+lib/X11/fvwm95/pixmaps/mini-perf.xpm
+lib/X11/fvwm95/pixmaps/mini-question.xpm
+lib/X11/fvwm95/pixmaps/mini-raise.xpm
+lib/X11/fvwm95/pixmaps/mini-ray.xpm
+lib/X11/fvwm95/pixmaps/mini-rball.xpm
+lib/X11/fvwm95/pixmaps/mini-resize.xpm
+lib/X11/fvwm95/pixmaps/mini-roach.xpm
+lib/X11/fvwm95/pixmaps/mini-run.xpm
+lib/X11/fvwm95/pixmaps/mini-sh.xpm
+lib/X11/fvwm95/pixmaps/mini-sh1.xpm
+lib/X11/fvwm95/pixmaps/mini-slon.xpm
+lib/X11/fvwm95/pixmaps/mini-sound.xpm
+lib/X11/fvwm95/pixmaps/mini-start.xpm
+lib/X11/fvwm95/pixmaps/mini-stop.xpm
+lib/X11/fvwm95/pixmaps/mini-telnet.xpm
+lib/X11/fvwm95/pixmaps/mini-term.xpm
+lib/X11/fvwm95/pixmaps/mini-tetris.xpm
+lib/X11/fvwm95/pixmaps/mini-trebol.xpm
+lib/X11/fvwm95/pixmaps/mini-turn.xpm
+lib/X11/fvwm95/pixmaps/mini-twm.xpm
+lib/X11/fvwm95/pixmaps/mini-window.xpm
+lib/X11/fvwm95/pixmaps/mini-windows.xpm
+lib/X11/fvwm95/pixmaps/mini-x.xpm
+lib/X11/fvwm95/pixmaps/mini-x2.xpm
+lib/X11/fvwm95/pixmaps/mini-xfig.xpm
+lib/X11/fvwm95/pixmaps/mini-xjewel.xpm
+lib/X11/fvwm95/pixmaps/mini-xkeycaps.xpm
+lib/X11/fvwm95/pixmaps/mini-xlander.xpm
+lib/X11/fvwm95/pixmaps/mini-xmahjongg.xpm
+lib/X11/fvwm95/pixmaps/mini-xsnow.xpm
+lib/X11/fvwm95/pixmaps/mini-xv.xpm
+lib/X11/fvwm95/pixmaps/mini-zoom.xpm
+lib/X11/fvwm95/pixmaps/mini.audiovol.xpm
+lib/X11/fvwm95/pixmaps/mini.checkmark.xpm
+lib/X11/fvwm95/pixmaps/mini.cut.xpm
+lib/X11/fvwm95/pixmaps/mini.destroy.xpm
+lib/X11/fvwm95/pixmaps/mini.excl.xpm
+lib/X11/fvwm95/pixmaps/mini.exit.xpm
+lib/X11/fvwm95/pixmaps/mini.fvwm.xpm
+lib/X11/fvwm95/pixmaps/mini.letter.xpm
+lib/X11/fvwm95/pixmaps/mini.lower.xpm
+lib/X11/fvwm95/pixmaps/mini.move.xpm
+lib/X11/fvwm95/pixmaps/mini.netscape.xpm
+lib/X11/fvwm95/pixmaps/mini.raise.xpm
+lib/X11/fvwm95/pixmaps/mini.resize.xpm
+lib/X11/fvwm95/pixmaps/mini.xarchie.xpm
+lib/X11/fvwm95/pixmaps/mini.xboing.xpm
+lib/X11/fvwm95/pixmaps/mini.xlock.xpm
+lib/X11/fvwm95/pixmaps/mini.xpm
+lib/X11/fvwm95/pixmaps/mini.xterm.xpm
+lib/X11/fvwm95/pixmaps/mini.zircon.xpm
+lib/X11/fvwm95/pixmaps/nscape.xpm
+lib/X11/fvwm95/pixmaps/ocode.icon
+lib/X11/fvwm95/pixmaps/page.xpm
+lib/X11/fvwm95/pixmaps/page2.xpm
+lib/X11/fvwm95/pixmaps/prog.icon
+lib/X11/fvwm95/pixmaps/programs.xpm
+lib/X11/fvwm95/pixmaps/ps.xpm
+lib/X11/fvwm95/pixmaps/question.xpm
+lib/X11/fvwm95/pixmaps/rbomb.xpm
+lib/X11/fvwm95/pixmaps/rcalc.xpm
+lib/X11/fvwm95/pixmaps/rterm.xpm
+lib/X11/fvwm95/pixmaps/run.xpm
+lib/X11/fvwm95/pixmaps/settings.xpm
+lib/X11/fvwm95/pixmaps/shutdown.xpm
+lib/X11/fvwm95/pixmaps/term.xpm
+lib/X11/fvwm95/pixmaps/textedit.xpm
+lib/X11/fvwm95/pixmaps/tiff2.xpm
+lib/X11/fvwm95/pixmaps/toolbox.xpm
+lib/X11/fvwm95/pixmaps/unknown1.xpm
+lib/X11/fvwm95/pixmaps/utilities-menu.xpm
+lib/X11/fvwm95/pixmaps/wierd_page3.xpm
+lib/X11/fvwm95/pixmaps/word_processor.xpm
+lib/X11/fvwm95/pixmaps/world.xpm
+lib/X11/fvwm95/pixmaps/wterm.xpm
+lib/X11/fvwm95/pixmaps/xboingbig.xpm
+lib/X11/fvwm95/pixmaps/xcalc.xpm
+lib/X11/fvwm95/pixmaps/xemacs.xpm
+lib/X11/fvwm95/pixmaps/xlock.xpm
+lib/X11/fvwm95/pixmaps/xman.xpm
+lib/X11/fvwm95/pixmaps/xpaint.xpm
+lib/X11/fvwm95/pixmaps/xterm-axp.xpm
+lib/X11/fvwm95/pixmaps/xterm-blank.xpm
+lib/X11/fvwm95/pixmaps/xterm-dec.xpm
+lib/X11/fvwm95/pixmaps/xterm-sgi.xpm
+lib/X11/fvwm95/pixmaps/xterm-sol.xpm
+lib/X11/fvwm95/pixmaps/xterm-sun.xpm
+lib/X11/fvwm95/pixmaps/xterm.xpm
+lib/X11/fvwm95/pixmaps/xv.xpm
+lib/X11/fvwm95/pixmaps/xview.xpm
+share/examples/fvwm95/example.fvwm95rc
+@dirrm lib/X11/fvwm95/pixmaps
+@dirrm lib/X11/fvwm95/ja_JP.EUC
 @dirrm lib/X11/fvwm95
+@dirrm share/examples/fvwm95