5 files changed, 35 insertions, 52 deletions
diff --git a/x11-wm/windowmaker/files/LINGUAS b/x11-wm/windowmaker/files/LINGUAS
index 5c816383846a..87924f639a3b 100644
--- a/x11-wm/windowmaker/files/LINGUAS
+++ b/x11-wm/windowmaker/files/LINGUAS
@@ -1 +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
+bg cs da de el es fi fr gl hr hu it ja ko nl no pl pt ro ru sk sv tr zh_CN zh_TW.Big5
diff --git a/x11-wm/windowmaker/files/patch-bc b/x11-wm/windowmaker/files/patch-bc
index 81792bcdc0fc..5c6d36923fc8 100644
--- a/x11-wm/windowmaker/files/patch-bc
+++ b/x11-wm/windowmaker/files/patch-bc
@@ -1,22 +1,23 @@
---- configure.orig	Thu Jan  4 12:10:11 2001
-+++ configure	Thu Jan  4 12:30:57 2001
-@@ -5897,7 +5897,8 @@
+
+$FreeBSD$
+
+--- configure.orig	Sat Feb 10 21:46:34 2001
++++ configure	Mon Feb 19 21:14:48 2001
+@@ -5897,7 +5897,7 @@
  	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 \
-+	plugins/libwmfun/Makefile contrib/WindowMaker.spec  src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+-	WPrefs.app/po/Makefile \
++	WPrefs.app/po/Makefile plugins/libwmfun/Makefile \
+ 	contrib/Makefile contrib/WindowMaker.spec  src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
  EOF
  cat >> $CONFIG_STATUS <<EOF
- 
-@@ -6030,7 +6031,8 @@
+@@ -6032,7 +6032,7 @@
  	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 \
-+	plugins/libwmfun/Makefile contrib/WindowMaker.spec "}
+-	WPrefs.app/po/Makefile \
++	WPrefs.app/po/Makefile plugins/libwmfun/Makefile \
+ 	contrib/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-be b/x11-wm/windowmaker/files/patch-be
index 7c9a6c35411d..e80e196e5a63 100644
--- a/x11-wm/windowmaker/files/patch-be
+++ b/x11-wm/windowmaker/files/patch-be
@@ -1,5 +1,8 @@
---- plugins/libwmfun/Makefile.in.orig	Thu Jan  4 12:16:06 2001
-+++ plugins/libwmfun/Makefile.in	Fri Jan  5 12:47:05 2001
+
+$FreeBSD$
+
+--- plugins/libwmfun/Makefile.in.orig	Mon Feb 19 21:10:18 2001
++++ plugins/libwmfun/Makefile.in	Mon Feb 19 21:20:52 2001
 @@ -38,7 +38,7 @@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
@@ -23,9 +26,9 @@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
 -libwmfun_la_LIBADD = 
-+libwmfun_la_LIBADD = -lfreetype
++libwmfun_la_LIBADD =
  libwmfun_la_OBJECTS =  bilinear.lo fade.lo generic.lo getopt.lo \
- getopt1.lo wave.lo drawstring.lo
+ getopt1.lo wave.lo
  CFLAGS = @CFLAGS@
 @@ -107,12 +109,12 @@
  all: all-redirect
diff --git a/x11-wm/windowmaker/files/patch-plugins_libwmfun_drawstring.c b/x11-wm/windowmaker/files/patch-plugins_libwmfun_drawstring.c
deleted file mode 100644
index e33411141224..000000000000
--- a/x11-wm/windowmaker/files/patch-plugins_libwmfun_drawstring.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/libwmfun/drawstring.c	2001/01/09 16:22:05	1.1
-+++ plugins/libwmfun/drawstring.c	2001/01/09 16:22:54
-@@ -4,7 +4,7 @@
- #include "generic.h"
- 
- #ifdef USE_FREETYPE
--#include <freetype/freetype.h>
-+#include <freetype2/freetype/freetype.h>
- #endif
- 
- #define MAX_GLYPHS 256
diff --git a/x11-wm/windowmaker/files/patch-util_wmaker.inst.in b/x11-wm/windowmaker/files/patch-util_wmaker.inst.in
index b8e4545d643c..da4a858365c7 100644
--- a/x11-wm/windowmaker/files/patch-util_wmaker.inst.in
+++ b/x11-wm/windowmaker/files/patch-util_wmaker.inst.in
@@ -1,24 +1,14 @@
---- 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
+
+$FreeBSD$
+
+--- util/wmaker.inst.in	2001/02/19 20:05:14	1.1
++++ util/wmaker.inst.in	2001/02/19 20:05:29
+@@ -293,7 +293,7 @@
+  echo "menu that will be used by default is the property list one. Read"
+  echo "    $GSDIR/Library/WindowMaker/README"
+  echo "for information on how to change it."
+-    if [ "${inst_menu%.*}" == "menu" ]; then
++    if [ "${inst_menu%.*}" = "menu" ]; then
+  echo "However, since you have locale set to $LOCALE and plmenu for such locale"
+  echo "was not found, your WMRootMenu contains path to text formated menu:"
+  echo "    $GSDIR/Library/WindowMaker/$inst_menu"