Update to the long awaited new release 0.63.1.

7 files changed, 77 insertions, 27 deletions

diff --git a/x11-wm/windowmaker/files/LINGUAS b/x11-wm/windowmaker/files/LINGUAS
new file mode 100644
index 000000000000..5c816383846a
--- /dev/null
+++ b/x11-wm/windowmaker/files/LINGUAS
@@ -0,0 +1 @@
+bg cs da de el es fi fr gl hr hu it ja ko nl no pl pt ro ru se sk tr zh_CN zh_TW.Big5
diff --git a/x11-wm/windowmaker/files/patch-bc b/x11-wm/windowmaker/files/patch-bc
index d8bd380ede3b..81792bcdc0fc 100644
--- a/x11-wm/windowmaker/files/patch-bc
+++ b/x11-wm/windowmaker/files/patch-bc
@@ -1,22 +1,22 @@
---- configure.orig	Thu Mar 30 15:37:36 2000
-+++ configure	Fri Mar 31 00:27:19 2000
-@@ -5866,7 +5866,8 @@
- 	WindowMaker/Pixmaps/Makefile WindowMaker/Styles/Makefile \
- 	WindowMaker/Themes/Makefile \
+--- configure.orig	Thu Jan  4 12:10:11 2001
++++ configure	Thu Jan  4 12:30:57 2001
+@@ -5897,7 +5897,8 @@
+ 	WindowMaker/Icons/Makefile WindowMaker/Pixmaps/Makefile \
+ 	WindowMaker/Styles/Makefile WindowMaker/Themes/Makefile \
  	WPrefs.app/Makefile WPrefs.app/tiff/Makefile WPrefs.app/xpm/Makefile \
 -	WPrefs.app/po/Makefile contrib/WindowMaker.spec  src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 +	WPrefs.app/po/Makefile \
-+	libwmfun-0.0.3/libwmfun/Makefile contrib/WindowMaker.spec  src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
++	plugins/libwmfun/Makefile contrib/WindowMaker.spec  src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
  EOF
  cat >> $CONFIG_STATUS <<EOF
  
-@@ -5999,7 +6000,8 @@
- 	WindowMaker/Pixmaps/Makefile WindowMaker/Styles/Makefile \
- 	WindowMaker/Themes/Makefile \
+@@ -6030,7 +6031,8 @@
+ 	WindowMaker/Icons/Makefile WindowMaker/Pixmaps/Makefile \
+ 	WindowMaker/Styles/Makefile WindowMaker/Themes/Makefile \
  	WPrefs.app/Makefile WPrefs.app/tiff/Makefile WPrefs.app/xpm/Makefile \
 -	WPrefs.app/po/Makefile contrib/WindowMaker.spec "}
 +	WPrefs.app/po/Makefile \
-+	libwmfun-0.0.3/libwmfun/Makefile contrib/WindowMaker.spec "}
++	plugins/libwmfun/Makefile contrib/WindowMaker.spec "}
  EOF
  cat >> $CONFIG_STATUS <<\EOF
  for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/x11-wm/windowmaker/files/patch-bd b/x11-wm/windowmaker/files/patch-bd
index 7435bb53bafa..b475c82ba387 100644
--- a/x11-wm/windowmaker/files/patch-bd
+++ b/x11-wm/windowmaker/files/patch-bd
@@ -1,12 +1,12 @@
---- Makefile.in.orig	Tue Feb 15 16:03:27 2000
-+++ Makefile.in	Tue Feb 15 15:22:24 2000
-@@ -92,7 +92,8 @@
- X_LIBRARY_PATH = @X_LIBRARY_PATH@
+--- Makefile.in	2001/01/04 10:32:11	1.1
++++ Makefile.in	2001/01/04 10:32:58
+@@ -91,7 +91,8 @@
+ supported_locales = @supported_locales@
  wprefsdir = @wprefsdir@
  
 -SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc 	contrib
-+SUBDIRS = wrlib WINGs src util po WindowMaker wmlib WPrefs.app doc 	contrib \
-+		libwmfun-0.0.3/libwmfun
++SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc 	contrib \
++		plugins/libwmfun
  
  
- EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS COPYING.OPL 	Install acconfig.h INSTALL.pt 	mkpatch README.KDE README.GNOME WindowMaker.lsm.in 	docklib-0.2.tar.gz libwmfun-0.0.3.tar.gz 
+ EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS COPYING.WTFPL 	Install acconfig.h INSTALL.pt README.pt 	mkpatch README.KDE README.GNOME WindowMaker.lsm.in 	README.definable-cursor 	libwmfun-0.0.3.tar.gz 
diff --git a/x11-wm/windowmaker/files/patch-be b/x11-wm/windowmaker/files/patch-be
index 4b055782f025..7c9a6c35411d 100644
--- a/x11-wm/windowmaker/files/patch-be
+++ b/x11-wm/windowmaker/files/patch-be
@@ -1,5 +1,5 @@
---- libwmfun-0.0.3/libwmfun/Makefile.in.orig	Tue Feb 15 16:04:35 2000
-+++ libwmfun-0.0.3/libwmfun/Makefile.in	Tue Feb 15 15:44:31 2000
+--- plugins/libwmfun/Makefile.in.orig	Thu Jan  4 12:16:06 2001
++++ plugins/libwmfun/Makefile.in	Fri Jan  5 12:47:05 2001
 @@ -38,7 +38,7 @@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
@@ -9,7 +9,7 @@
  
  ACLOCAL = @ACLOCAL@
  AUTOCONF = @AUTOCONF@
-@@ -69,6 +69,8 @@
+@@ -70,6 +70,8 @@
  RANLIB = @RANLIB@
  VERSION = @VERSION@
  
@@ -17,8 +17,17 @@
 +
  lib_LTLIBRARIES = libwmfun.la
  
- libwmfun_la_SOURCES = bilinear.c 		fade.c 		generic.c 		generic.h 		getopt.c 		getopt.h 		getopt1.c 		wave.c
-@@ -104,12 +106,12 @@
+ libwmfun_la_LDFLAGS = -version-info 1:0:1
+@@ -86,7 +88,7 @@
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+-libwmfun_la_LIBADD = 
++libwmfun_la_LIBADD = -lfreetype
+ libwmfun_la_OBJECTS =  bilinear.lo fade.lo generic.lo getopt.lo \
+ getopt1.lo wave.lo drawstring.lo
+ CFLAGS = @CFLAGS@
+@@ -107,12 +109,12 @@
  all: all-redirect
  .SUFFIXES:
  .SUFFIXES: .S .c .lo .o .s
@@ -36,4 +45,13 @@
 +#	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
  
  
- mostlyclean-libLTLIBRARIES:
+ config.h: stamp-h
+@@ -275,7 +277,7 @@
+ install: install-am
+ uninstall-am: uninstall-libLTLIBRARIES
+ uninstall: uninstall-am
+-all-am: Makefile $(LTLIBRARIES) config.h
++all-am: Makefile $(LTLIBRARIES)
+ all-redirect: all-am
+ install-strip:
+ 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
diff --git a/x11-wm/windowmaker/files/patch-bf b/x11-wm/windowmaker/files/patch-bf
index 3863a4199df2..7d0f58251b09 100644
--- a/x11-wm/windowmaker/files/patch-bf
+++ b/x11-wm/windowmaker/files/patch-bf
@@ -1,10 +1,10 @@
---- wrlib/Makefile.in.orig	Fri Mar 31 00:37:27 2000
-+++ wrlib/Makefile.in	Fri Mar 31 11:48:42 2000
-@@ -96,7 +96,7 @@
+--- wrlib/Makefile.in.orig	Sun Jan  7 01:22:01 2001
++++ wrlib/Makefile.in	Mon Jan  8 01:20:22 2001
+@@ -97,7 +97,7 @@
  
  lib_LTLIBRARIES = libwraster.la
  
--libwraster_la_LDFLAGS = -version-info 2:0:0
+-libwraster_la_LDFLAGS = -version-info 2:1:0
 +libwraster_la_LDFLAGS = -version-info 3:0:0
  
  bin_SCRIPTS = get-wraster-flags
diff --git a/x11-wm/windowmaker/files/patch-src_config.h.in b/x11-wm/windowmaker/files/patch-src_config.h.in
new file mode 100644
index 000000000000..95f2aee6d0a0
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-src_config.h.in
@@ -0,0 +1,7 @@
+--- src/config.h.in	2001/01/05 10:30:03	1.1
++++ src/config.h.in	2001/01/05 10:30:18
+@@ -206,3 +206,4 @@
+ /* Version number of package */
+ #undef VERSION
+ 
++#define USE_FREETYPE
diff --git a/x11-wm/windowmaker/files/patch-util_wmaker.inst.in b/x11-wm/windowmaker/files/patch-util_wmaker.inst.in
new file mode 100644
index 000000000000..b8e4545d643c
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-util_wmaker.inst.in
@@ -0,0 +1,24 @@
+--- util/wmaker.inst.in	2001/01/08 01:41:27	1.1
++++ util/wmaker.inst.in	2001/01/08 01:48:25
+@@ -65,12 +65,18 @@
+ 	elif [ "$file" = "WMRootMenu" ]; then
+ 		if [ "$LOCALE" ]; then
+             	    if [ -f $GLOBALDIR/plmenu.${LOCALE%_*} ]; then
+-                	cp $GLOBALDIR/plmenu.${LOCALE%_*} $GSDIR/Defaults/WMRootMenu
++                	sed -e "s|\$HOME/GNUstep|$GSDIR|g" \
++				-e "s:#wmdatadir#:$GLOBALDIR:g" \
++					$GLOBALDIR/plmenu.${LOCALE%_*} > $GSDIR/Defaults/WMRootMenu
+ 		    else
+-			cp $GLOBALDIR/plmenu $GSDIR/Defaults/WMRootMenu
++			sed -e "s|\$HOME/GNUstep|$GSDIR|g" \
++				-e "s:#wmdatadir#:$GLOBALDIR:g" \
++					$GLOBALDIR/plmenu > $GSDIR/Defaults/WMRootMenu
+             	    fi
+         	else
+-            	    cp $GLOBALDIR/plmenu $GSDIR/Defaults/WMRootMenu
++            	    sed -e "s|\$HOME/GNUstep|$GSDIR|g" \
++				-e "s:#wmdatadir#:$GLOBALDIR:g" \
++					$GLOBALDIR/plmenu > $GSDIR/Defaults/WMRootMenu
+         	fi
+ 	else
+ 		if test "x$GNUSTEP_USER_ROOT" = "x"; then