4 files changed, 20 insertions, 25 deletions

diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index e2250e6bb2d0..5416ff0eaedc 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	WindowMaker
-# Version required:	0.20.1
+# Version required:	0.20.2
 # Date created:		August 13, 1997
 # Whom:			handy@physics.montana.edu
 #
-# $Id: Makefile,v 1.34 1998/09/30 13:24:39 tg Exp $
+# $Id: Makefile,v 1.35 1998/10/19 10:57:04 tg Exp $
 
-DISTNAME=	WindowMaker-0.20.1
-PKGNAME=	windowmaker-0.20.1
+DISTNAME=	WindowMaker-0.20.2
+PKGNAME=	windowmaker-0.20.2
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.windowmaker.org/pub/beta/srcs/ \
 		ftp://ftp.io.com/pub/mirror/windowmaker/beta/srcs/ \
@@ -15,7 +15,6 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES}
 
 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 \
@@ -28,32 +27,17 @@ CONFIGURE_ENV=	X11BASE=${X11BASE}
 CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
 	--with-nlsdir=${LOCALBASE}/lib/locale \
 	--with-gfx-libs="-L${LOCALBASE}/lib" \
-	--with-gfx-incs="-I${LOCALBASE}/include/tiff34 -I${LOCALBASE}/include"
+	--with-gfx-incs="-I${LOCALBASE}/include/tiff34 -I${LOCALBASE}/include" \
+	--disable-debug
 
 MAN1=	geticonset.1x getstyle.1x seticons.1x setstyle.1x \
 	wdwrite.1x wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x
 
 DATAFILES=	WindowMaker-data.tar.gz
 
-post-extract:
-	cd ${WRKSRC}; ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} libPropList.tar.gz
-
 post-patch:
 	@perl -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c
 
-pre-configure:
-	@(cd ${WRKSRC}/libPropList && CC="${CC}" CXX="${CXX}" \
-	    ac_cv_path_CC="${CC}" CFLAGS="${CFLAGS} -fPIC" \
-	    INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \
-	    INSTALL_DATA="${INSTALL_DATA}" \
-	    INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-	    INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-	    ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; \
-	    ${MAKE} ${MAKE_ENV})
-
-pre-install:
-	@(cd ${WRKSRC}/libPropList; ${MAKE} ${MAKE_ENV} install)
-
 post-install:
 	${MKDIR} ${PREFIX}/share/WindowMaker/Pixmaps/
 	${INSTALL_DATA} ${WRKDIR}/WindowMaker-data/pixmaps/* \
diff --git a/x11-wm/windowmaker/distinfo b/x11-wm/windowmaker/distinfo
index f5508fc3ee05..46a3274c71e7 100644
--- a/x11-wm/windowmaker/distinfo
+++ b/x11-wm/windowmaker/distinfo
@@ -1,2 +1,2 @@
-MD5 (WindowMaker-0.20.1.tar.gz) = 6ed696ff93b3ecaf155dacbaa32fcfda
+MD5 (WindowMaker-0.20.2.tar.gz) = 26f92b4697238911f51566530f1915a3
 MD5 (WindowMaker-data.tar.gz) = 6ea0c37314ea9e9ab27e8bdf45a31a82
diff --git a/x11-wm/windowmaker/files/patch-ah b/x11-wm/windowmaker/files/patch-ah
new file mode 100644
index 000000000000..98271d305b53
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-ah
@@ -0,0 +1,11 @@
+--- WINGs/usleep.c.orig	Wed Oct 21 14:43:55 1998
++++ WINGs/usleep.c	Mon Oct 26 19:27:37 1998
+@@ -11,6 +11,8 @@
+ # include <sys/types.h>
+ #endif
+ 
++#include <unistd.h>
++#include <string.h>
+ 
+ #if defined(HAVE_SELECT)
+ 
diff --git a/x11-wm/windowmaker/pkg-plist b/x11-wm/windowmaker/pkg-plist
index 3c20c719f289..d770b56ec944 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/dockit
 bin/geticonset
 bin/getstyle
 bin/seticons
@@ -249,7 +248,6 @@ share/WindowMaker/Styles/Pastel
 share/WindowMaker/Styles/Pink
 share/WindowMaker/Styles/Pumpkin
 share/WindowMaker/Styles/Purple
-share/WindowMaker/Styles/Rainbow
 share/WindowMaker/Styles/Red
 share/WindowMaker/Styles/RednBlue
 share/WindowMaker/Styles/ShinyBrown
@@ -262,6 +260,7 @@ share/WindowMaker/Themes/Night
 share/WindowMaker/Themes/OpenStep
 share/WindowMaker/Themes/Pastel
 share/WindowMaker/autostart.sh
+share/WindowMaker/exitscript.sh
 share/WindowMaker/menu
 share/WindowMaker/menu.cz
 share/WindowMaker/menu.de
@@ -281,6 +280,7 @@ share/WindowMaker/menu.no
 share/WindowMaker/menu.pt
 share/WindowMaker/menu.ru
 share/WindowMaker/menu.se
+share/WindowMaker/menu.sl
 share/WindowMaker/menu.tr
 share/WindowMaker/plmenu
 share/WindowMaker/wmmacros