Update to version 2.2 after repository copy.

PR:		11277
Submitted by:	Makoto MATSUSHITA <matusita@jp.FreeBSD.ORG>

1 files changed, 31 insertions, 54 deletions

diff --git a/x11-wm/fvwm2-i18n/files/patch-aa b/x11-wm/fvwm2-i18n/files/patch-aa
index 3692906..2395b64 100644
--- a/x11-wm/fvwm2-i18n/files/patch-aa
+++ b/x11-wm/fvwm2-i18n/files/patch-aa
@@ -1,51 +1,6 @@
---- Fvwm.tmpl.dist	Wed Jan 22 22:38:49 1997
-+++ Fvwm.tmpl	Thu Jan 30 15:27:41 1997
-@@ -97,7 +97,7 @@
-  * Set this to YES if you would like the programs in the utils directory
-  * installed.
-  *************************************************************************/
--#define InstallUtils NO
-+#define InstallUtils YES
- 
- 
- /**************************************************************************
-@@ -268,6 +268,9 @@
- /* Or if you prefer a more minimal setup, you could try something like: */
- /* OPTION_DEFINES = -DSHAPE -DVECTOR_BUTTONS */
- 
-+/* FreeBSD ports -- Assumes += notation is allowed */
-+OPTION_DEFINES += -DENABLE_REMOTE_CHANGEDESKS
-+/* FreeBSD ports */
- 
- /***************************************************************************
-  * The following section only needs to be changed if you do not want
-@@ -388,7 +391,7 @@
- #endif
- 
- #ifndef FvwmIconPath
--#define FvwmIconPath $(INCDIR)/bitmaps\:$(INCDIR)/pixmaps
-+#define FvwmIconPath $(FVWMDIR)/pixmaps\:$(INCDIR)/bitmaps\:$(INCDIR)/pixmaps
- #endif
- 
-    ICONPATH = FvwmIconPath
---- sample.fvwmrc/Imakefile.dist	Thu Apr 25 23:23:35 1996
-+++ sample.fvwmrc/Imakefile	Thu Jan 30 15:47:29 1997
-@@ -8,5 +8,12 @@
- NullMake()
- 
- #if InstallSample
-+/* FreeBSD ports -- maybe a bug(typo?). reported. */
- InstallNonExecFile(system$(FVWMRC),$(FVWMDIR))
-+/* FreeBSD ports */
-+/* FreeBSD ports -- More informations are welcomed :-) */
-+InstallNonExecFile(decor_examples,$(FVWMDIR))
-+InstallNonExecFile(system.fvwm2rc-sample-1,$(FVWMDIR))
-+InstallNonExecFile(system.fvwm2rc-sample-2,$(FVWMDIR))
-+/* FreeBSD ports */
- #endif
---- sample.fvwmrc/system.fvwm2rc.dist	Thu Jan 16 05:29:42 1997
-+++ sample.fvwmrc/system.fvwm2rc	Thu Jan 30 15:58:20 1997
-@@ -13,12 +13,12 @@
+--- sample.fvwmrc/system.fvwm2rc.dist	Mon Nov  2 03:08:40 1998
++++ sample.fvwmrc/system.fvwm2rc	Tue Apr 20 18:06:09 1999
+@@ -8,12 +8,12 @@
  ClickTime 750
  
  # make sure these fonts exist on your system:
@@ -61,7 +16,29 @@
  
  ColormapFocus FollowsMouse
  
-@@ -289,12 +289,12 @@
+@@ -282,18 +282,18 @@
+ *FvwmIconMan*Resolution  page
+ *FvwmIconMan*background  bisque3
+ *FvwmIconMan*foreground  black
+-*FvwmIconMan*font        7x13bold
++*FvwmIconMan*font        7x13bold,-*-fixed-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-12-*-*-*-*-*-*-*
+ *FvwmIconMan*format      "%t"
+ *FvwmIconMan*action      Mouse   1 N sendcommand Focus, sendcommand "Iconify"
+ *FvwmIconMan*action      Mouse   2 N sendcommand "Iconify 1"
+ *FvwmIconMan*action      Mouse   3 N sendcommand "FvwmIdent"
+ *FvwmIconMan*followfocus true
+-*FvwmIconMan*sort        false
++*FvwmIconMan*sort        none
+ *FvwmIconMan*plainbutton          up black bisque3
+ *FvwmIconMan*selectbutton         down black bisque3
+ *FvwmIconMan*focusbutton          up yellow firebrick
+ *FvwmIconMan*focusandselectButton down yellow firebrick
+-*FvwmIconMan*dontshow icon=Untitled name=Untitled
++*FvwmIconMan*dontshow icon=Untitled title=Untitled
+ #*FvwmIconMan*drawicons true
+ *FvwmIconMan*buttongeometry  300x0
+ *FvwmIconMan*managergeometry 1x5
+@@ -302,12 +302,12 @@
  # Just choose colors and a fonts
  *FvwmIdentBack MidnightBlue
  *FvwmIdentFore Yellow
@@ -71,12 +48,12 @@
  ########################### Pager #########################################
  *FvwmPagerBack #908090
  *FvwmPagerFore #484048
--*FvwmPagerFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*
+-#*FvwmPagerFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*
 +*FvwmPagerFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*,-*-fixed-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-mincho-medium-r-normal-*-10-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-10-*-*-*-*-*-*-*
+ # turn off desktop names for swallowing in above button bar example:
+ *FvwmPagerFont none
  *FvwmPagerHilight #cab3ca
- *FvwmPagerGeometry -1-1
- *FvwmPagerLabel 0 Misc
-@@ -306,7 +306,7 @@
+@@ -328,7 +328,7 @@
  ##########################FvwmWinList##################################
  *FvwmWinListBack #908090
  *FvwmWinListFore Black
@@ -85,7 +62,7 @@
  *FvwmWinListAction Click1 Iconify -1,Focus
  *FvwmWinListAction Click2 Iconify
  *FvwmWinListAction Click3 Module "FvwmIdent" FvwmIdent
-@@ -334,7 +334,7 @@
+@@ -356,7 +356,7 @@
  #*FvwmIconBoxFore       blue
  *FvwmIconBoxGeometry    5x1+0+0
  *FvwmIconBoxMaxIconSize 64x38