7 files changed, 33 insertions, 71 deletions

diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index 10f6c40dcd7a..cd95bb8cf869 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	WindowMaker
-# Version required:	0.19.3
+# Version required:	0.20.0
 # Date created:		August 13, 1997
 # Whom:			handy@physics.montana.edu
 #
-# $Id: Makefile,v 1.30 1998/09/17 00:50:51 asami Exp $
+# $Id: Makefile,v 1.31 1998/09/19 01:33:49 steve Exp $
 
-DISTNAME=	WindowMaker-0.19.3
-PKGNAME=	windowmaker-0.19.3
+DISTNAME=	WindowMaker-0.20.0
+PKGNAME=	windowmaker-0.20.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.windowmaker.org/pub/beta/srcs/ \
 		ftp://ftp.io.com/pub/mirror/windowmaker/beta/srcs/ \
diff --git a/x11-wm/windowmaker-i18n/distinfo b/x11-wm/windowmaker-i18n/distinfo
index fbdb13d1f5b0..b6d6c73193be 100644
--- a/x11-wm/windowmaker-i18n/distinfo
+++ b/x11-wm/windowmaker-i18n/distinfo
@@ -1 +1 @@
-MD5 (WindowMaker-0.19.3.tar.gz) = 78dde5909b87fd0d11352a011a944e78
+MD5 (WindowMaker-0.20.0.tar.gz) = f34b20bd15f7636b197e52fa1b16dada
diff --git a/x11-wm/windowmaker-i18n/files/patch-ad b/x11-wm/windowmaker-i18n/files/patch-ad
index f8325ed0654a..102409029f35 100644
--- a/x11-wm/windowmaker-i18n/files/patch-ad
+++ b/x11-wm/windowmaker-i18n/files/patch-ad
@@ -1,14 +1,14 @@
---- configure.orig	Wed Sep  9 03:50:34 1998
-+++ configure	Thu Sep 10 17:50:27 1998
-@@ -3584,14 +3584,14 @@
+--- configure.orig	Wed Sep 23 10:48:39 1998
++++ configure	Thu Sep 24 09:08:10 1998
+@@ -3629,14 +3629,14 @@
  #
  
  if test "$tif" = yes; then
 -    echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6
--echo "configure:3589: checking for TIFFGetVersion in -ltiff" >&5
+-echo "configure:3634: checking for TIFFGetVersion in -ltiff" >&5
 -ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'`
 +    echo $ac_n "checking for TIFFGetVersion in -ltiff34""... $ac_c" 1>&6
-+echo "configure:3589: checking for TIFFGetVersion in -ltiff34" >&5
++echo "configure:3634: checking for TIFFGetVersion in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFGetVersion | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -17,55 +17,26 @@
 -LIBS="-ltiff $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $GFXLIBS -lm $LIBS"
 +LIBS="-ltiff34 $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $GFXLIBS -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 3597 "configure"
+ #line 3642 "configure"
  #include "confdefs.h"
-@@ -3619,22 +3619,21 @@
+@@ -3664,7 +3664,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  GFXFLAGS="$GFXFLAGS -DUSE_TIFF" GFXLIBS="-ltiff $GFXLIBS" 
-+  GFXFLAGS="$GFXFLAGS -DUSE_TIFF" GFXLIBS="-ltiff34 $GFXLIBS" 
++  GFXFLAGS="$GFXFLAGS -DUSE_TIFF" GFXLIBS="-ltiff34 $GFXLIBS"
  	ICONEXT="tiff"
  else
    echo "$ac_t""no" 1>&6
- fi
- 
-     if test ! "$ICONEXT" = "tiff"; then
--    	if test "$zlib" = "yes"; then
--    	    echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6
-+	echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6
- echo "configure:3632: checking for TIFFGetVersion in -ltiff" >&5
- ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-ltiff $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $GFXLIBS -lz -lm $LIBS"
-+LIBS="-ltiff $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $GFXLIBS -lm $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 3640 "configure"
- #include "confdefs.h"
-@@ -3662,24 +3661,24 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  GFXFLAGS="$GFXFLAGS -DUSE_TIFF" GFXLIBS="-ltiff -lz $GFXLIBS" 
-+  GFXFLAGS="$GFXFLAGS -DUSE_TIFF" GFXLIBS="-ltiff $GFXLIBS" 
- 		ICONEXT="tiff"
- else
-   echo "$ac_t""no" 1>&6
- fi
- 
--	fi
+@@ -3717,14 +3717,14 @@
      fi
      
      if test ! "$ICONEXT" = "tiff"; then
 -	echo $ac_n "checking for TIFFGetVersion in -ltiff34""... $ac_c" 1>&6
--echo "configure:3677: checking for TIFFGetVersion in -ltiff34" >&5
+-echo "configure:3722: checking for TIFFGetVersion in -ltiff34" >&5
 -ac_lib_var=`echo tiff34'_'TIFFGetVersion | sed 'y%./+-%__p_%'`
-+	if test "$zlib" = "yes"; then
-+	    echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6
-+echo "configure:3617: checking for TIFFGetVersion in -ltiff" >&5
++	echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6
++echo "configure:3722: checking for TIFFGetVersion in -ltiff" >&5
 +ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -74,29 +45,14 @@
 -LIBS="-ltiff34 $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $GFXLIBS -lm $LIBS"
 +LIBS="-ltiff $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $GFXLIBS -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 3685 "configure"
+ #line 3730 "configure"
  #include "confdefs.h"
-@@ -3707,12 +3706,12 @@
+@@ -3752,7 +3752,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  GFXFLAGS="$GFXFLAGS -DUSE_TIFF" GFXLIBS="-ltiff34 $GFXLIBS"
-+  GFXFLAGS="$GFXFLAGS -DUSE_TIFF" GFXLIBS="-ltiff -lz $GFXLIBS"
++  GFXFLAGS="$GFXFLAGS -DUSE_TIFF" GFXLIBS="-ltiff $GFXLIBS" 
  		ICONEXT="tiff"
  else
    echo "$ac_t""no" 1>&6
- fi
--
-+	fi
-     fi
- fi
- 
-@@ -3882,7 +3881,7 @@
- 
- 
- 
--gnustepdir="/usr/local/GNUstep"
-+gnustepdir="${prefix}/GNUstep"
- 
- if test "x$GNUSTEP_LOCAL_ROOT" != "x" ; then
- 	gnustepdir=$GNUSTEP_LOCAL_ROOT
diff --git a/x11-wm/windowmaker-i18n/pkg-plist b/x11-wm/windowmaker-i18n/pkg-plist
index ed238329c3ac..f303b6968be9 100644
--- a/x11-wm/windowmaker-i18n/pkg-plist
+++ b/x11-wm/windowmaker-i18n/pkg-plist
@@ -115,7 +115,6 @@ GNUstep/Apps/WPrefs.app/xpm/whandling.xpm
 GNUstep/Apps/WPrefs.app/xpm/windowfocus.xpm
 GNUstep/Apps/WPrefs.app/xpm/workspace.xpm
 GNUstep/Apps/WPrefs.app/xpm/xis.xpm
-bin/convertstyle
 bin/dockit
 bin/geticonset
 bin/getstyle
@@ -149,6 +148,7 @@ share/WINGs/Images.xpm
 share/WINGs/defaultIcon.tiff
 share/WINGs/defaultIcon.xpm
 share/WindowMaker/Backgrounds/BlueImage.jpeg
+share/WindowMaker/Backgrounds/SeaNight.jpeg
 share/WindowMaker/Defaults/WMGLOBAL
 share/WindowMaker/Defaults/WMRootMenu
 share/WindowMaker/Defaults/WMState
@@ -172,6 +172,7 @@ share/WindowMaker/Styles/Autumn
 share/WindowMaker/Styles/Black
 share/WindowMaker/Styles/Blue
 share/WindowMaker/Styles/BlueAluminum
+share/WindowMaker/Styles/BlueDawn
 share/WindowMaker/Styles/BlueishGreen
 share/WindowMaker/Styles/Brown
 share/WindowMaker/Styles/Chumbo
@@ -197,12 +198,14 @@ share/WindowMaker/Styles/Summer
 share/WindowMaker/Styles/Traditional
 share/WindowMaker/Styles/VioletBlue
 share/WindowMaker/Themes/Default
+share/WindowMaker/Themes/Night
 share/WindowMaker/Themes/OpenStep
 share/WindowMaker/Themes/Pastel
 share/WindowMaker/autostart.sh
 share/WindowMaker/menu
 share/WindowMaker/menu.cz
 share/WindowMaker/menu.de
+share/WindowMaker/menu.dk
 share/WindowMaker/menu.el
 share/WindowMaker/menu.es
 share/WindowMaker/menu.fi
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 10f6c40dcd7a..cd95bb8cf869 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	WindowMaker
-# Version required:	0.19.3
+# Version required:	0.20.0
 # Date created:		August 13, 1997
 # Whom:			handy@physics.montana.edu
 #
-# $Id: Makefile,v 1.30 1998/09/17 00:50:51 asami Exp $
+# $Id: Makefile,v 1.31 1998/09/19 01:33:49 steve Exp $
 
-DISTNAME=	WindowMaker-0.19.3
-PKGNAME=	windowmaker-0.19.3
+DISTNAME=	WindowMaker-0.20.0
+PKGNAME=	windowmaker-0.20.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.windowmaker.org/pub/beta/srcs/ \
 		ftp://ftp.io.com/pub/mirror/windowmaker/beta/srcs/ \
diff --git a/x11-wm/windowmaker/distinfo b/x11-wm/windowmaker/distinfo
index fbdb13d1f5b0..b6d6c73193be 100644
--- a/x11-wm/windowmaker/distinfo
+++ b/x11-wm/windowmaker/distinfo
@@ -1 +1 @@
-MD5 (WindowMaker-0.19.3.tar.gz) = 78dde5909b87fd0d11352a011a944e78
+MD5 (WindowMaker-0.20.0.tar.gz) = f34b20bd15f7636b197e52fa1b16dada
diff --git a/x11-wm/windowmaker/pkg-plist b/x11-wm/windowmaker/pkg-plist
index ed238329c3ac..f303b6968be9 100644
--- a/x11-wm/windowmaker/pkg-plist
+++ b/x11-wm/windowmaker/pkg-plist
@@ -115,7 +115,6 @@ GNUstep/Apps/WPrefs.app/xpm/whandling.xpm
 GNUstep/Apps/WPrefs.app/xpm/windowfocus.xpm
 GNUstep/Apps/WPrefs.app/xpm/workspace.xpm
 GNUstep/Apps/WPrefs.app/xpm/xis.xpm
-bin/convertstyle
 bin/dockit
 bin/geticonset
 bin/getstyle
@@ -149,6 +148,7 @@ share/WINGs/Images.xpm
 share/WINGs/defaultIcon.tiff
 share/WINGs/defaultIcon.xpm
 share/WindowMaker/Backgrounds/BlueImage.jpeg
+share/WindowMaker/Backgrounds/SeaNight.jpeg
 share/WindowMaker/Defaults/WMGLOBAL
 share/WindowMaker/Defaults/WMRootMenu
 share/WindowMaker/Defaults/WMState
@@ -172,6 +172,7 @@ share/WindowMaker/Styles/Autumn
 share/WindowMaker/Styles/Black
 share/WindowMaker/Styles/Blue
 share/WindowMaker/Styles/BlueAluminum
+share/WindowMaker/Styles/BlueDawn
 share/WindowMaker/Styles/BlueishGreen
 share/WindowMaker/Styles/Brown
 share/WindowMaker/Styles/Chumbo
@@ -197,12 +198,14 @@ share/WindowMaker/Styles/Summer
 share/WindowMaker/Styles/Traditional
 share/WindowMaker/Styles/VioletBlue
 share/WindowMaker/Themes/Default
+share/WindowMaker/Themes/Night
 share/WindowMaker/Themes/OpenStep
 share/WindowMaker/Themes/Pastel
 share/WindowMaker/autostart.sh
 share/WindowMaker/menu
 share/WindowMaker/menu.cz
 share/WindowMaker/menu.de
+share/WindowMaker/menu.dk
 share/WindowMaker/menu.el
 share/WindowMaker/menu.es
 share/WindowMaker/menu.fi