Update Window Maker package to version 0.20.2 using patches supplied by

Johnny C. Lam in PR pkg/6490.

4 files changed, 249 insertions, 79 deletions

diff --git a/x11/windowmaker/Makefile b/x11/windowmaker/Makefile
index 760c90b9c06..f8aa4ea1fb2 100644
--- a/x11/windowmaker/Makefile
+++ b/x11/windowmaker/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 1998/08/20 15:17:38 tsarna Exp $
+# $NetBSD: Makefile,v 1.15 1998/11/26 19:16:29 tron Exp $
 
-DISTNAME=		WindowMaker-0.16.1
-PKGNAME=		windowmaker-0.16.1
+DISTNAME=		WindowMaker-0.20.2
+PKGNAME=		windowmaker-0.20.2
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.windowmaker.org/pub/beta/srcs/ \
 			ftp://ftp.windowmaker.org/pub/contrib/icons/
@@ -12,32 +12,29 @@ MAINTAINER=		magick@bundy.lip.owl.de
 HOMEPAGE=		http://windowmaker.org/
 
 DEPENDS+=		xpm-3.4k:../../graphics/xpm
+DEPENDS+=		giflib-3.0:../../graphics/giflib
 DEPENDS+=		jpeg-6b:../../graphics/jpeg
 DEPENDS+=		png-1.0.2:../../graphics/png
 DEPENDS+=		tiff-3.4:../../graphics/tiff
-BUILD_DEPENDS=		bison:../../devel/bison
-#libPropList needs bison for the parser. Yacc runs through, but WMaker crashes
-#afterwards
 
 CONFIGURE_ENV+=		INSTALL="${INSTALL}" \
 			INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 			INSTALL_DATA="${INSTALL_DATA}" \
 			INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-CONFLICTS=		windowmaker-0.6.3
+CONFLICTS=		windowmaker-0.6.3 windowmaker-0.16.1
 
 USE_X11=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-gfx-incs=-I${LOCALBASE}/include \
-			--with-gfx-libs=-L${LOCALBASE}/lib \
-
-pre-configure:
-	@(cd ${WRKSRC} && tar xvzf libPropList.tar.gz && cd libPropList && \
-	 ./configure && ${MAKE})
+CONFIGURE_ARGS+=	--with-nlsdir=${PREFIX}/share/locale \
+			--with-gfx-incs="-I${LOCALBASE}/include -I${LOCALBASE}/include/giflib" \
+			--with-gfx-libs=-L${LOCALBASE}/lib
 
 post-install:
 	(cd ${WRKDIR}/WindowMaker-data/pixmaps/ ; for i in * ; do \
 	 ${INSTALL_DATA} $$i ${PREFIX}/share/WindowMaker/Pixmaps/ ; \
 	 done )
+	${INSTALL_DATA_DIR} ${PREFIX}/share/WindowMaker/Sounds
+	${TOUCH} ${PREFIX}/share/WindowMaker/Sounds/.keep_me
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/windowmaker/files/md5 b/x11/windowmaker/files/md5
index 6bde8ec7431..8946015620f 100644
--- a/x11/windowmaker/files/md5
+++ b/x11/windowmaker/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.3 1998/08/07 13:29:08 agc Exp $
+$NetBSD: md5,v 1.4 1998/11/26 19:16:30 tron Exp $
 
-MD5 (WindowMaker-0.16.1.tar.gz) = c28b9e99a70903d149c089a2dd399422
+MD5 (WindowMaker-0.20.2.tar.gz) = 26f92b4697238911f51566530f1915a3
 MD5 (WindowMaker-data.tar.gz) = 6ea0c37314ea9e9ab27e8bdf45a31a82
diff --git a/x11/windowmaker/patches/patch-aa b/x11/windowmaker/patches/patch-aa
new file mode 100644
index 00000000000..261182520b2
--- /dev/null
+++ b/x11/windowmaker/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 1998/11/26 19:21:32 tron Exp $
+
+--- doc/Makefile.in.orig	Fri Oct 23 08:03:58 1998
++++ doc/Makefile.in	Mon Nov 23 17:55:34 1998
+@@ -137,7 +137,7 @@
+ 	for i in $$list; do \
+ 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+ 	  else file=$$i; fi; \
+-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
++	  ext=`echo $$i | sed -e 's/^.*\\.//' | sed -e 's/[a-z]*$$//'`; \
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ 	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
diff --git a/x11/windowmaker/pkg/PLIST b/x11/windowmaker/pkg/PLIST
index 49dce95409e..fb98c8c9407 100644
--- a/x11/windowmaker/pkg/PLIST
+++ b/x11/windowmaker/pkg/PLIST
@@ -1,60 +1,174 @@
-@comment $NetBSD: PLIST,v 1.4 1998/07/12 21:24:53 tron Exp $
-bin/wmaker
-bin/wxcopy
-bin/wxpaste
-bin/wdwrite
+@comment $NetBSD: PLIST,v 1.5 1998/11/26 19:16:30 tron Exp $
+GNUstep/Apps/WPrefs.app/WPrefs
+GNUstep/Apps/WPrefs.app/WPrefs.tiff
+GNUstep/Apps/WPrefs.app/WPrefs.xpm
+GNUstep/Apps/WPrefs.app/tiff/advancetonewworkspace.tiff
+GNUstep/Apps/WPrefs.app/tiff/animations.tiff
+GNUstep/Apps/WPrefs.app/tiff/appearance.tiff
+GNUstep/Apps/WPrefs.app/tiff/clip.tiff
+GNUstep/Apps/WPrefs.app/tiff/configs.tiff
+GNUstep/Apps/WPrefs.app/tiff/cycleworkspaces.tiff
+GNUstep/Apps/WPrefs.app/tiff/dock.tiff
+GNUstep/Apps/WPrefs.app/tiff/dontlinkworkspaces.tiff
+GNUstep/Apps/WPrefs.app/tiff/ergonomic.tiff
+GNUstep/Apps/WPrefs.app/tiff/expert.tiff
+GNUstep/Apps/WPrefs.app/tiff/fonts.tiff
+GNUstep/Apps/WPrefs.app/tiff/iconprefs.tiff
+GNUstep/Apps/WPrefs.app/tiff/keyboard.tiff
+GNUstep/Apps/WPrefs.app/tiff/keyboardprefs.tiff
+GNUstep/Apps/WPrefs.app/tiff/keyshortcuts.tiff
+GNUstep/Apps/WPrefs.app/tiff/menualign1.tiff
+GNUstep/Apps/WPrefs.app/tiff/menualign2.tiff
+GNUstep/Apps/WPrefs.app/tiff/menuprefs.tiff
+GNUstep/Apps/WPrefs.app/tiff/menus.tiff
+GNUstep/Apps/WPrefs.app/tiff/minimouseleft.tiff
+GNUstep/Apps/WPrefs.app/tiff/minimousemiddle.tiff
+GNUstep/Apps/WPrefs.app/tiff/minimouseright.tiff
+GNUstep/Apps/WPrefs.app/tiff/moreanim.tiff
+GNUstep/Apps/WPrefs.app/tiff/mousesettings.tiff
+GNUstep/Apps/WPrefs.app/tiff/mousespeed.tiff
+GNUstep/Apps/WPrefs.app/tiff/newstyle.tiff
+GNUstep/Apps/WPrefs.app/tiff/nonopaque.tiff
+GNUstep/Apps/WPrefs.app/tiff/oldstyle.tiff
+GNUstep/Apps/WPrefs.app/tiff/opaque.tiff
+GNUstep/Apps/WPrefs.app/tiff/paths.tiff
+GNUstep/Apps/WPrefs.app/tiff/sound.tiff
+GNUstep/Apps/WPrefs.app/tiff/speed0.tiff
+GNUstep/Apps/WPrefs.app/tiff/speed0s.tiff
+GNUstep/Apps/WPrefs.app/tiff/speed1.tiff
+GNUstep/Apps/WPrefs.app/tiff/speed1s.tiff
+GNUstep/Apps/WPrefs.app/tiff/speed2.tiff
+GNUstep/Apps/WPrefs.app/tiff/speed2s.tiff
+GNUstep/Apps/WPrefs.app/tiff/speed3.tiff
+GNUstep/Apps/WPrefs.app/tiff/speed3s.tiff
+GNUstep/Apps/WPrefs.app/tiff/speed4.tiff
+GNUstep/Apps/WPrefs.app/tiff/speed4s.tiff
+GNUstep/Apps/WPrefs.app/tiff/timer0.tiff
+GNUstep/Apps/WPrefs.app/tiff/timer0s.tiff
+GNUstep/Apps/WPrefs.app/tiff/timer1.tiff
+GNUstep/Apps/WPrefs.app/tiff/timer1s.tiff
+GNUstep/Apps/WPrefs.app/tiff/timer2.tiff
+GNUstep/Apps/WPrefs.app/tiff/timer2s.tiff
+GNUstep/Apps/WPrefs.app/tiff/timer3.tiff
+GNUstep/Apps/WPrefs.app/tiff/timer3s.tiff
+GNUstep/Apps/WPrefs.app/tiff/timer4.tiff
+GNUstep/Apps/WPrefs.app/tiff/timer4s.tiff
+GNUstep/Apps/WPrefs.app/tiff/timer5.tiff
+GNUstep/Apps/WPrefs.app/tiff/timer5s.tiff
+GNUstep/Apps/WPrefs.app/tiff/whandling.tiff
+GNUstep/Apps/WPrefs.app/tiff/windowfocus.tiff
+GNUstep/Apps/WPrefs.app/tiff/workspace.tiff
+GNUstep/Apps/WPrefs.app/tiff/xis.tiff
+GNUstep/Apps/WPrefs.app/xpm/advancetonewworkspace.xpm
+GNUstep/Apps/WPrefs.app/xpm/animations.xpm
+GNUstep/Apps/WPrefs.app/xpm/appearance.xpm
+GNUstep/Apps/WPrefs.app/xpm/clip.xpm
+GNUstep/Apps/WPrefs.app/xpm/configs.xpm
+GNUstep/Apps/WPrefs.app/xpm/cycleworkspaces.xpm
+GNUstep/Apps/WPrefs.app/xpm/dock.xpm
+GNUstep/Apps/WPrefs.app/xpm/dontlinkworkspaces.xpm
+GNUstep/Apps/WPrefs.app/xpm/ergonomic.xpm
+GNUstep/Apps/WPrefs.app/xpm/expert.xpm
+GNUstep/Apps/WPrefs.app/xpm/fonts.xpm
+GNUstep/Apps/WPrefs.app/xpm/iconprefs.xpm
+GNUstep/Apps/WPrefs.app/xpm/keyboard.xpm
+GNUstep/Apps/WPrefs.app/xpm/keyboardprefs.xpm
+GNUstep/Apps/WPrefs.app/xpm/keyshortcuts.xpm
+GNUstep/Apps/WPrefs.app/xpm/menualign1.xpm
+GNUstep/Apps/WPrefs.app/xpm/menualign2.xpm
+GNUstep/Apps/WPrefs.app/xpm/menuprefs.xpm
+GNUstep/Apps/WPrefs.app/xpm/menus.xpm
+GNUstep/Apps/WPrefs.app/xpm/minimouseleft.xpm
+GNUstep/Apps/WPrefs.app/xpm/minimousemiddle.xpm
+GNUstep/Apps/WPrefs.app/xpm/minimouseright.xpm
+GNUstep/Apps/WPrefs.app/xpm/moreanim.xpm
+GNUstep/Apps/WPrefs.app/xpm/mousesettings.xpm
+GNUstep/Apps/WPrefs.app/xpm/mousespeed.xpm
+GNUstep/Apps/WPrefs.app/xpm/newstyle.xpm
+GNUstep/Apps/WPrefs.app/xpm/nonopaque.xpm
+GNUstep/Apps/WPrefs.app/xpm/oldstyle.xpm
+GNUstep/Apps/WPrefs.app/xpm/opaque.xpm
+GNUstep/Apps/WPrefs.app/xpm/paths.xpm
+GNUstep/Apps/WPrefs.app/xpm/sound.xpm
+GNUstep/Apps/WPrefs.app/xpm/speed0.xpm
+GNUstep/Apps/WPrefs.app/xpm/speed0s.xpm
+GNUstep/Apps/WPrefs.app/xpm/speed1.xpm
+GNUstep/Apps/WPrefs.app/xpm/speed1s.xpm
+GNUstep/Apps/WPrefs.app/xpm/speed2.xpm
+GNUstep/Apps/WPrefs.app/xpm/speed2s.xpm
+GNUstep/Apps/WPrefs.app/xpm/speed3.xpm
+GNUstep/Apps/WPrefs.app/xpm/speed3s.xpm
+GNUstep/Apps/WPrefs.app/xpm/speed4.xpm
+GNUstep/Apps/WPrefs.app/xpm/speed4s.xpm
+GNUstep/Apps/WPrefs.app/xpm/timer0.xpm
+GNUstep/Apps/WPrefs.app/xpm/timer0s.xpm
+GNUstep/Apps/WPrefs.app/xpm/timer1.xpm
+GNUstep/Apps/WPrefs.app/xpm/timer1s.xpm
+GNUstep/Apps/WPrefs.app/xpm/timer2.xpm
+GNUstep/Apps/WPrefs.app/xpm/timer2s.xpm
+GNUstep/Apps/WPrefs.app/xpm/timer3.xpm
+GNUstep/Apps/WPrefs.app/xpm/timer3s.xpm
+GNUstep/Apps/WPrefs.app/xpm/timer4.xpm
+GNUstep/Apps/WPrefs.app/xpm/timer4s.xpm
+GNUstep/Apps/WPrefs.app/xpm/timer5.xpm
+GNUstep/Apps/WPrefs.app/xpm/timer5s.xpm
+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/geticonset
 bin/getstyle
-bin/setstyle
 bin/seticons
-bin/geticonset
-bin/wmsetbg
+bin/setstyle
+bin/wdwrite
+bin/wm-oldmenu2new
+bin/wmaker
 bin/wmaker.inst
-bin/convertstyle
-bin/dockit
-lib/libWINGs.a
-lib/libwraster.a
-lib/libWMaker.a
+bin/wmsetbg
+bin/wxcopy
+bin/wxpaste
+include/WMaker.h
+include/proplist.h
 include/wraster.h
 include/WINGs.h
-include/WMaker.h
+include/WINGsP.h
+include/WUtil.h
+lib/libPropList.a
+lib/libWINGs.a
+lib/libWMaker.a
+lib/libwraster.a
+man/man1/geticonset.1
+man/man1/getstyle.1
+man/man1/seticons.1
+man/man1/setstyle.1
+man/man1/wdwrite.1
+man/man1/wmaker.1
+man/man1/wmsetbg.1
+man/man1/wxcopy.1
+man/man1/wxpaste.1
 share/WINGs/Images.tiff
 share/WINGs/Images.xpm
+share/WINGs/defaultIcon.tiff
+share/WINGs/defaultIcon.xpm
+share/WindowMaker/Backgrounds/BlueImage.jpeg
+share/WindowMaker/Backgrounds/BlueWaves.jpeg
+share/WindowMaker/Backgrounds/SeaNight.jpeg
+share/WindowMaker/Defaults/WMGLOBAL
 share/WindowMaker/Defaults/WMRootMenu
+share/WindowMaker/Defaults/WMState
 share/WindowMaker/Defaults/WMWindowAttributes
 share/WindowMaker/Defaults/WindowMaker
-share/WindowMaker/Defaults/WMState
-share/WindowMaker/Styles/Black
-share/WindowMaker/Styles/Blue
-share/WindowMaker/Styles/BlueAluminum
-share/WindowMaker/Styles/Brown
-share/WindowMaker/Styles/Chumbo
-share/WindowMaker/Styles/Copper
-share/WindowMaker/Styles/DarkBlue
-share/WindowMaker/Styles/Fire
-share/WindowMaker/Styles/Food
-share/WindowMaker/Styles/Golden
-share/WindowMaker/Styles/Green
-share/WindowMaker/Styles/LightBlue
-share/WindowMaker/Styles/Pastel
-share/WindowMaker/Styles/Pumpkin
-share/WindowMaker/Styles/Purple
-share/WindowMaker/Styles/Rainbow
-share/WindowMaker/Styles/Red
-share/WindowMaker/Styles/RednBlue
-share/WindowMaker/Styles/Traditional
-share/WindowMaker/Themes/Default
-share/WindowMaker/Themes/Pastel
-share/WindowMaker/Themes/OpenStep
-share/WindowMaker/Pixmaps/GNUstep.tiff
-share/WindowMaker/Pixmaps/GNUstep.xpm
-share/WindowMaker/Pixmaps/GNUstep3D.tiff
-share/WindowMaker/Pixmaps/GNUstep3D.xpm
-share/WindowMaker/Pixmaps/defaultAppIcon.tiff
-share/WindowMaker/Pixmaps/defaultAppIcon.xpm
-share/WindowMaker/Pixmaps/clip.tiff
-share/WindowMaker/Pixmaps/clip.xpm
-share/WindowMaker/Pixmaps/GNUterm.tiff
-share/WindowMaker/Pixmaps/GNUterm.xpm
+share/WindowMaker/IconSets/Default
+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/defaultAppIcon.tiff
+share/WindowMaker/Icons/defaultAppIcon.xpm
 share/WindowMaker/Pixmaps/Ant.xpm
 share/WindowMaker/Pixmaps/Antennae.xpm
 share/WindowMaker/Pixmaps/Bee48x48.xpm
@@ -86,13 +200,13 @@ share/WindowMaker/Pixmaps/HandOpen.xpm
 share/WindowMaker/Pixmaps/HandPointing.xpm
 share/WindowMaker/Pixmaps/HandPointingLeft.xpm
 share/WindowMaker/Pixmaps/HandPunch.xpm
-share/WindowMaker/Pixmaps/PDF.xpm
 share/WindowMaker/Pixmaps/HandReach.xpm
 share/WindowMaker/Pixmaps/HeroSandwich.dir.xpm
 share/WindowMaker/Pixmaps/LadyBug48x48.xpm
 share/WindowMaker/Pixmaps/Microphone.xpm
 share/WindowMaker/Pixmaps/Netscape.xpm
 share/WindowMaker/Pixmaps/NewsAgent.xpm
+share/WindowMaker/Pixmaps/PDF.xpm
 share/WindowMaker/Pixmaps/Padlock.xpm
 share/WindowMaker/Pixmaps/Paint.xpm
 share/WindowMaker/Pixmaps/Pencils.24.xpm
@@ -114,36 +228,82 @@ share/WindowMaker/Pixmaps/monitor.xpm
 share/WindowMaker/Pixmaps/paint.xpm
 share/WindowMaker/Pixmaps/tile.black.xpm
 share/WindowMaker/Pixmaps/tile.snow.xpm
+share/WindowMaker/Pixmaps/tile.tiff
 share/WindowMaker/Pixmaps/tile.xpm
 share/WindowMaker/Pixmaps/tile2.xpm
 share/WindowMaker/Pixmaps/xv.xpm
-share/WindowMaker/Backgrounds/BlueImage.jpeg
-share/WindowMaker/IconSets/Default
-share/WindowMaker/Copyright
-share/WindowMaker/wmmacros
 share/WindowMaker/README
+share/WindowMaker/Sounds/.keep_me
+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
+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
+share/WindowMaker/Styles/Pink
+share/WindowMaker/Styles/Pumpkin
+share/WindowMaker/Styles/Purple
+share/WindowMaker/Styles/Red
+share/WindowMaker/Styles/RednBlue
+share/WindowMaker/Styles/ShinyBrown
+share/WindowMaker/Styles/Summer
+share/WindowMaker/Styles/Traditional
+share/WindowMaker/Styles/VioletBlue
+share/WindowMaker/Themes/BlueWaves
+share/WindowMaker/Themes/Default
+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
+share/WindowMaker/menu.dk
+share/WindowMaker/menu.el
+share/WindowMaker/menu.es
+share/WindowMaker/menu.fi
 share/WindowMaker/menu.fr
 share/WindowMaker/menu.gl
+share/WindowMaker/menu.he
+share/WindowMaker/menu.hr
+share/WindowMaker/menu.it
 share/WindowMaker/menu.ja
 share/WindowMaker/menu.ko
 share/WindowMaker/menu.nl
-share/WindowMaker/menu.pt
-share/WindowMaker/menu.it
 share/WindowMaker/menu.no
-share/WindowMaker/menu.he
-share/WindowMaker/menu.es
+share/WindowMaker/menu.pt
 share/WindowMaker/menu.ru
-share/WindowMaker/menu
-share/WindowMaker/autostart.sh
-@exec mkdir %D/share/WindowMaker/Sounds
-@dirrm share/WindowMaker/Defaults
-@dirrm share/WindowMaker/Styles
-@dirrm share/WindowMaker/Themes
-@dirrm share/WindowMaker/Pixmaps
+share/WindowMaker/menu.se
+share/WindowMaker/menu.sl
+share/WindowMaker/menu.tr
+share/WindowMaker/plmenu
+share/WindowMaker/wmmacros
+@dirrm GNUstep/Apps/WPrefs.app/tiff
+@dirrm GNUstep/Apps/WPrefs.app/xpm
+@dirrm GNUstep/Apps/WPrefs.app
+@dirrm GNUstep/Apps
+@dirrm GNUstep
+@dirrm share/WINGs
 @dirrm share/WindowMaker/Backgrounds
+@dirrm share/WindowMaker/Defaults
 @dirrm share/WindowMaker/IconSets
+@dirrm share/WindowMaker/Icons
+@dirrm share/WindowMaker/Pixmaps
 @dirrm share/WindowMaker/Sounds
-@dirrm share/WINGs
+@dirrm share/WindowMaker/Styles
+@dirrm share/WindowMaker/Themes
 @dirrm share/WindowMaker