4 files changed, 30 insertions, 39 deletions

diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index 63c407080b47..669a0b7c2a44 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.2
+# Version required:	0.19.3
 # Date created:		August 13, 1997
 # Whom:			handy@physics.montana.edu
 #
-# $Id: Makefile,v 1.23 1998/09/04 06:24:11 tg Exp $
+# $Id: Makefile,v 1.24 1998/09/09 05:57:17 tg Exp $
 
-DISTNAME=	WindowMaker-0.19.2
-PKGNAME=	windowmaker-0.19.2
+DISTNAME=	WindowMaker-0.19.3
+PKGNAME=	windowmaker-0.19.3
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.windowmaker.org/pub/beta/srcs/ \
 		ftp://ftp.io.com/pub/mirror/windowmaker/beta/srcs/ \
@@ -16,6 +16,7 @@ MAINTAINER=	handy@physics.montana.edu
 
 RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
+		gif\\.3\\.:${PORTSDIR}/graphics/giflib \
 		jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg \
 		png\\.2\\.:${PORTSDIR}/graphics/png \
 		tiff34\\.1:${PORTSDIR}/graphics/tiff34
diff --git a/x11-wm/windowmaker-i18n/distinfo b/x11-wm/windowmaker-i18n/distinfo
index 40120d98726e..fbdb13d1f5b0 100644
--- a/x11-wm/windowmaker-i18n/distinfo
+++ b/x11-wm/windowmaker-i18n/distinfo
@@ -1 +1 @@
-MD5 (WindowMaker-0.19.2.tar.gz) = 5f0412c818f04af39db41babdfdfff84
+MD5 (WindowMaker-0.19.3.tar.gz) = 78dde5909b87fd0d11352a011a944e78
diff --git a/x11-wm/windowmaker-i18n/files/patch-ad b/x11-wm/windowmaker-i18n/files/patch-ad
index 0d3282492542..f8325ed0654a 100644
--- a/x11-wm/windowmaker-i18n/files/patch-ad
+++ b/x11-wm/windowmaker-i18n/files/patch-ad
@@ -1,14 +1,14 @@
---- configure.orig	Sun Sep  6 16:29:01 1998
-+++ configure	Tue Sep  8 08:02:03 1998
-@@ -3525,14 +3525,14 @@
+--- configure.orig	Wed Sep  9 03:50:34 1998
++++ configure	Thu Sep 10 17:50:27 1998
+@@ -3584,14 +3584,14 @@
  #
  
  if test "$tif" = yes; then
 -    echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6
--echo "configure:3530: checking for TIFFGetVersion in -ltiff" >&5
+-echo "configure:3589: 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:3530: checking for TIFFGetVersion in -ltiff34" >&5
++echo "configure:3589: 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,25 +17,24 @@
 -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 3538 "configure"
+ #line 3597 "configure"
  #include "confdefs.h"
-@@ -3560,22 +3560,22 @@
+@@ -3619,22 +3619,21 @@
  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:3573: checking for TIFFGetVersion in -ltiff" >&5
+ 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
@@ -44,9 +43,9 @@
 -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 3581 "configure"
+ #line 3640 "configure"
  #include "confdefs.h"
-@@ -3603,26 +3603,25 @@
+@@ -3662,24 +3661,24 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -59,13 +58,13 @@
  
 -	fi
      fi
--    
+     
      if test ! "$ICONEXT" = "tiff"; then
 -	echo $ac_n "checking for TIFFGetVersion in -ltiff34""... $ac_c" 1>&6
--echo "configure:3618: checking for TIFFGetVersion in -ltiff34" >&5
+-echo "configure:3677: 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
++	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
 +ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -73,38 +72,26 @@
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-ltiff34 $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $GFXLIBS -lm $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 3626 "configure"
-+#line 3625 "configure"
+ #line 3685 "configure"
  #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3633,7 +3632,7 @@
- TIFFGetVersion()
- ; return 0; }
- EOF
--if { (eval echo configure:3637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3648,12 +3647,13 @@
+@@ -3707,12 +3706,12 @@
  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 -lz $GFXLIBS"
  		ICONEXT="tiff"
  else
    echo "$ac_t""no" 1>&6
  fi
- 
+-
 +	fi
      fi
  fi
  
-@@ -3823,7 +3823,7 @@
+@@ -3882,7 +3881,7 @@
  
  
  
diff --git a/x11-wm/windowmaker-i18n/pkg-plist b/x11-wm/windowmaker-i18n/pkg-plist
index 2d1cc4d3f4d8..ed238329c3ac 100644
--- a/x11-wm/windowmaker-i18n/pkg-plist
+++ b/x11-wm/windowmaker-i18n/pkg-plist
@@ -177,10 +177,12 @@ share/WindowMaker/Styles/Brown
 share/WindowMaker/Styles/Chumbo
 share/WindowMaker/Styles/Copper
 share/WindowMaker/Styles/DarkBlue
+share/WindowMaker/Styles/DarkRed
 share/WindowMaker/Styles/Fire
 share/WindowMaker/Styles/Food
 share/WindowMaker/Styles/Golden
 share/WindowMaker/Styles/Green
+share/WindowMaker/Styles/GreyBlue
 share/WindowMaker/Styles/Gtk
 share/WindowMaker/Styles/LightBlue
 share/WindowMaker/Styles/Pastel
@@ -190,6 +192,7 @@ share/WindowMaker/Styles/Purple
 share/WindowMaker/Styles/Rainbow
 share/WindowMaker/Styles/Red
 share/WindowMaker/Styles/RednBlue
+share/WindowMaker/Styles/ShinyBrown
 share/WindowMaker/Styles/Summer
 share/WindowMaker/Styles/Traditional
 share/WindowMaker/Styles/VioletBlue