Upgrade to 0.18.1b.

Submitted by:	Brian Handy <handy@physics.montana.edu>

7 files changed, 52 insertions, 38 deletions

diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index f68f076e1d78..c418219277a2 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.17.5
+# Version required:	0.18.1b
 # Date created:		August 13, 1997
 # Whom:			handy@physics.montana.edu
 #
-# $Id: Makefile,v 1.19 1998/08/07 23:01:40 asami Exp $
+# $Id: Makefile,v 1.20 1998/08/11 08:37:43 tg Exp $
 
-DISTNAME=	WindowMaker-0.17.5
-PKGNAME=	windowmaker-0.17.5
+DISTNAME=	WindowMaker-0.18.1b
+PKGNAME=	windowmaker-0.18.1b
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.windowmaker.org/pub/beta/srcs/ \
 		ftp://ftp.io.com/pub/mirror/windowmaker/beta/srcs/ \
@@ -20,6 +20,7 @@ LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
 		png\\.2\\.:${PORTSDIR}/graphics/png \
 		tiff34\\.1:${PORTSDIR}/graphics/tiff34
 
+WRKSRC=		${WRKDIR}/WindowMaker-0.18.1
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	X11BASE=${X11BASE}
diff --git a/x11-wm/windowmaker-i18n/distinfo b/x11-wm/windowmaker-i18n/distinfo
index 46697d8590ef..67fba31cdfb7 100644
--- a/x11-wm/windowmaker-i18n/distinfo
+++ b/x11-wm/windowmaker-i18n/distinfo
@@ -1 +1 @@
-MD5 (WindowMaker-0.17.5.tar.gz) = 734d07f175bf6b6e89be9f28a5c1136d
+MD5 (WindowMaker-0.18.1b.tar.gz) = 9cbfde81fd41c3accb484069f059686f
diff --git a/x11-wm/windowmaker-i18n/files/patch-ad b/x11-wm/windowmaker-i18n/files/patch-ad
index 3ddedd1ef8af..29df9a2ba6e1 100644
--- a/x11-wm/windowmaker-i18n/files/patch-ad
+++ b/x11-wm/windowmaker-i18n/files/patch-ad
@@ -1,11 +1,11 @@
---- configure.orig	Sun Jul 26 07:22:23 1998
-+++ configure	Sun Aug  9 02:12:31 1998
-@@ -3576,44 +3576,6 @@
+--- configure.orig	Mon Aug 17 19:59:47 1998
++++ configure	Tue Aug 18 10:18:59 1998
+@@ -3524,44 +3524,6 @@
  ICONEXT="xpm"
  #
  if test "$tif" = yes; then
 -    echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6
--echo "configure:3581: checking for TIFFGetVersion in -ltiff" >&5
+-echo "configure:3529: 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
@@ -13,7 +13,7 @@
 -  ac_save_LIBS="$LIBS"
 -LIBS="-ltiff $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $GFXLIBS -lm $LIBS"
 -cat > conftest.$ac_ext <<EOF
--#line 3589 "configure"
+-#line 3537 "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
@@ -24,7 +24,7 @@
 -TIFFGetVersion()
 -; return 0; }
 -EOF
--if { (eval echo configure:3600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+-if { (eval echo configure:3548: \"$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
@@ -43,9 +43,9 @@
 -else
 -  echo "$ac_t""no" 1>&6
  echo $ac_n "checking for TIFFGetVersion in -ltiff34""... $ac_c" 1>&6
- echo "configure:3619: checking for TIFFGetVersion in -ltiff34" >&5
+ echo "configure:3567: checking for TIFFGetVersion in -ltiff34" >&5
  ac_lib_var=`echo tiff34'_'TIFFGetVersion | sed 'y%./+-%__p_%'`
-@@ -3652,8 +3614,6 @@
+@@ -3600,8 +3562,6 @@
    GFXFLAGS="$GFXFLAGS -DUSE_TIFF" GFXLIBS="-ltiff34 $GFXLIBS" ICONEXT="tiff"
  else
    echo "$ac_t""no" 1>&6
diff --git a/x11-wm/windowmaker-i18n/pkg-plist b/x11-wm/windowmaker-i18n/pkg-plist
index 6cb054c025aa..54bf538c18b5 100644
--- a/x11-wm/windowmaker-i18n/pkg-plist
+++ b/x11-wm/windowmaker-i18n/pkg-plist
@@ -24,26 +24,30 @@ lib/libWINGs.a
 include/proplist.h
 include/wraster.h
 include/WINGs.h
+include/WINGsP.h
 include/WMaker.h
 include/WUtil.h
 share/WINGs/Images.tiff
 share/WINGs/Images.xpm
 share/WindowMaker/Backgrounds/BlueImage.jpeg
+share/WindowMaker/Defaults/WMGLOBAL
 share/WindowMaker/Defaults/WMRootMenu
 share/WindowMaker/Defaults/WMState
 share/WindowMaker/Defaults/WMWindowAttributes
 share/WindowMaker/Defaults/WindowMaker
 share/WindowMaker/IconSets/Default
-share/WindowMaker/Pixmaps/GNUstep.tiff
-share/WindowMaker/Pixmaps/GNUstep.xpm
-share/WindowMaker/Pixmaps/GNUstep3D.tiff
-share/WindowMaker/Pixmaps/GNUstep3D.xpm
-share/WindowMaker/Pixmaps/GNUterm.tiff
-share/WindowMaker/Pixmaps/GNUterm.xpm
-share/WindowMaker/Pixmaps/clip.tiff
-share/WindowMaker/Pixmaps/clip.xpm
-share/WindowMaker/Pixmaps/defaultAppIcon.tiff
-share/WindowMaker/Pixmaps/defaultAppIcon.xpm
+share/WindowMaker/Icons/GNUstep.tiff
+share/WindowMaker/Icons/GNUstep.xpm
+share/WindowMaker/Icons/GNUstep3D.tiff
+share/WindowMaker/Icons/GNUstep3D.xpm
+share/WindowMaker/Icons/GNUterm.tiff
+share/WindowMaker/Icons/GNUterm.xpm
+share/WindowMaker/Icons/clip.tiff
+share/WindowMaker/Icons/clip.xpm
+share/WindowMaker/Icons/cliptile.tiff
+share/WindowMaker/Icons/cliptile.xpm
+share/WindowMaker/Icons/defaultAppIcon.tiff
+share/WindowMaker/Icons/defaultAppIcon.xpm
 share/WindowMaker/Pixmaps/tile.tiff
 share/WindowMaker/Pixmaps/tile.xpm
 share/WindowMaker/README
@@ -58,6 +62,7 @@ share/WindowMaker/Styles/Fire
 share/WindowMaker/Styles/Food
 share/WindowMaker/Styles/Golden
 share/WindowMaker/Styles/Green
+share/WindowMaker/Styles/Gtk
 share/WindowMaker/Styles/LightBlue
 share/WindowMaker/Styles/Pastel
 share/WindowMaker/Styles/Pumpkin
@@ -90,6 +95,7 @@ share/WindowMaker/wmmacros
 @dirrm share/WindowMaker/Styles
 @dirrm share/WindowMaker/Sounds
 @dirrm share/WindowMaker/Pixmaps
+@dirrm share/WindowMaker/Icons
 @dirrm share/WindowMaker/IconSets
 @dirrm share/WindowMaker/Defaults
 @dirrm share/WindowMaker/Backgrounds
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index f68f076e1d78..c418219277a2 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	WindowMaker
-# Version required:	0.17.5
+# Version required:	0.18.1b
 # Date created:		August 13, 1997
 # Whom:			handy@physics.montana.edu
 #
-# $Id: Makefile,v 1.19 1998/08/07 23:01:40 asami Exp $
+# $Id: Makefile,v 1.20 1998/08/11 08:37:43 tg Exp $
 
-DISTNAME=	WindowMaker-0.17.5
-PKGNAME=	windowmaker-0.17.5
+DISTNAME=	WindowMaker-0.18.1b
+PKGNAME=	windowmaker-0.18.1b
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.windowmaker.org/pub/beta/srcs/ \
 		ftp://ftp.io.com/pub/mirror/windowmaker/beta/srcs/ \
@@ -20,6 +20,7 @@ LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm \
 		png\\.2\\.:${PORTSDIR}/graphics/png \
 		tiff34\\.1:${PORTSDIR}/graphics/tiff34
 
+WRKSRC=		${WRKDIR}/WindowMaker-0.18.1
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	X11BASE=${X11BASE}
diff --git a/x11-wm/windowmaker/distinfo b/x11-wm/windowmaker/distinfo
index 46697d8590ef..67fba31cdfb7 100644
--- a/x11-wm/windowmaker/distinfo
+++ b/x11-wm/windowmaker/distinfo
@@ -1 +1 @@
-MD5 (WindowMaker-0.17.5.tar.gz) = 734d07f175bf6b6e89be9f28a5c1136d
+MD5 (WindowMaker-0.18.1b.tar.gz) = 9cbfde81fd41c3accb484069f059686f
diff --git a/x11-wm/windowmaker/pkg-plist b/x11-wm/windowmaker/pkg-plist
index 6cb054c025aa..54bf538c18b5 100644
--- a/x11-wm/windowmaker/pkg-plist
+++ b/x11-wm/windowmaker/pkg-plist
@@ -24,26 +24,30 @@ lib/libWINGs.a
 include/proplist.h
 include/wraster.h
 include/WINGs.h
+include/WINGsP.h
 include/WMaker.h
 include/WUtil.h
 share/WINGs/Images.tiff
 share/WINGs/Images.xpm
 share/WindowMaker/Backgrounds/BlueImage.jpeg
+share/WindowMaker/Defaults/WMGLOBAL
 share/WindowMaker/Defaults/WMRootMenu
 share/WindowMaker/Defaults/WMState
 share/WindowMaker/Defaults/WMWindowAttributes
 share/WindowMaker/Defaults/WindowMaker
 share/WindowMaker/IconSets/Default
-share/WindowMaker/Pixmaps/GNUstep.tiff
-share/WindowMaker/Pixmaps/GNUstep.xpm
-share/WindowMaker/Pixmaps/GNUstep3D.tiff
-share/WindowMaker/Pixmaps/GNUstep3D.xpm
-share/WindowMaker/Pixmaps/GNUterm.tiff
-share/WindowMaker/Pixmaps/GNUterm.xpm
-share/WindowMaker/Pixmaps/clip.tiff
-share/WindowMaker/Pixmaps/clip.xpm
-share/WindowMaker/Pixmaps/defaultAppIcon.tiff
-share/WindowMaker/Pixmaps/defaultAppIcon.xpm
+share/WindowMaker/Icons/GNUstep.tiff
+share/WindowMaker/Icons/GNUstep.xpm
+share/WindowMaker/Icons/GNUstep3D.tiff
+share/WindowMaker/Icons/GNUstep3D.xpm
+share/WindowMaker/Icons/GNUterm.tiff
+share/WindowMaker/Icons/GNUterm.xpm
+share/WindowMaker/Icons/clip.tiff
+share/WindowMaker/Icons/clip.xpm
+share/WindowMaker/Icons/cliptile.tiff
+share/WindowMaker/Icons/cliptile.xpm
+share/WindowMaker/Icons/defaultAppIcon.tiff
+share/WindowMaker/Icons/defaultAppIcon.xpm
 share/WindowMaker/Pixmaps/tile.tiff
 share/WindowMaker/Pixmaps/tile.xpm
 share/WindowMaker/README
@@ -58,6 +62,7 @@ share/WindowMaker/Styles/Fire
 share/WindowMaker/Styles/Food
 share/WindowMaker/Styles/Golden
 share/WindowMaker/Styles/Green
+share/WindowMaker/Styles/Gtk
 share/WindowMaker/Styles/LightBlue
 share/WindowMaker/Styles/Pastel
 share/WindowMaker/Styles/Pumpkin
@@ -90,6 +95,7 @@ share/WindowMaker/wmmacros
 @dirrm share/WindowMaker/Styles
 @dirrm share/WindowMaker/Sounds
 @dirrm share/WindowMaker/Pixmaps
+@dirrm share/WindowMaker/Icons
 @dirrm share/WindowMaker/IconSets
 @dirrm share/WindowMaker/Defaults
 @dirrm share/WindowMaker/Backgrounds