Update for "windowmaker" package to version 0.51.2 supplied by

Johnny C. Lam in PR pkg/7201. Changes since version 0.51.0:
- fixed bug with window that can get focus if both shaded and hidden.
- maximize for full screen
- fixed problem with frame drawing in non-opaque
- fixed installation path prob [jmknoble@pobox.com]
- fixed bug moving window when only one window is on screen
- fixed bug with ignored GNUstep attributes
- fixed WPrefs crash in Mouse Preferences
- fixed crash bug in WINGs/wmaker startup
- added workaround for kde pager crash bug
- made %W in root menu and wmsetbg -w take numbers starting from 1
- fixed crash bugs with kpanel
- put . to mark hidden apps
- fixed dont set xset stuff option in WPrefs
- fixed menu title messup in WPrefs
- fixed WPrefs message dialogs for invalid menus
- fixed workspace back setting in all screens
- fixed WorkspaceSpecificBack / wmsetbg
- added WindozeCycle patch (being rewritten)
- cleaned up focus/unfocus state transitions
- made WPrefs more robust
- fixed locale file (po) installation stuff
- fixed focus loss when dragging window across workspaces
- fixed workspace baby boom with nextworkspacekey
- removed ignore_next_unmap kluge
- install defaults data in /usr/local/etc
- added menu for miniwindow
- fixed remove resizebar from shaded window
- rewrote library/header search code in configure
- rewrote window move/edge resistance code
- added window border resistance
- changed EdgeResistance option to only YES/NO
- added workaround for glibc bug in sscanf("", bla, bla)
- hopefully fixed WM_COLORMAP_WINDOWS crash bug
- fixed searching of localized menus
- fixed --help option
- fixed handling of docked apps with . in their instance names
- RSupportedFileFormats() in wrlib will now return a static buffer
- fixed bug in StartHidden
- a little faster startup
- will rearrange icons after moving an icon if autoarrangeicons
- fixed icon overlap bug
- fixed crash with internal dialogs and multi-heads
- added standard colormap support to wrlib (taken from libXmu sources)
- fixed memory leak in attribute panel
- fixed crash with CalendarManager deiconify
- fixed heisencrash when mapping new windows
- fixed totally buggy wmaker.inst ~/.xinitrc checker

5 files changed, 62 insertions, 61 deletions

diff --git a/x11/windowmaker/Makefile b/x11/windowmaker/Makefile
index cb0c5241289..ed387535e72 100644
--- a/x11/windowmaker/Makefile
+++ b/x11/windowmaker/Makefile
@@ -1,31 +1,34 @@
-# $NetBSD: Makefile,v 1.24 1999/03/04 13:53:38 tron Exp $
+# $NetBSD: Makefile,v 1.25 1999/03/20 00:17:19 tron Exp $
 
-DISTNAME=		WindowMaker-0.51.0
-PKGNAME=		windowmaker-0.51.0
+DISTNAME=		WindowMaker-0.51.2
+PKGNAME=		windowmaker-0.51.2
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.windowmaker.org/pub/beta/srcs/ \
-			ftp://ftp.windowmaker.org/pub/libs/
+			ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 			WindowMaker-data.tar.gz
 
-MAINTAINER=		lamj@stat.cmu.edu
-HOMEPAGE=		http://www.windowmaker.org/
-
 DEPENDS+=		libproplist-0.8.3:../../devel/libproplist
-DEPENDS+=		xpm-3.4k:../../graphics/xpm
 DEPENDS+=		giflib-3.0:../../graphics/giflib
 DEPENDS+=		jpeg-6b:../../graphics/jpeg
 DEPENDS+=		png-1.0.3:../../graphics/png
 DEPENDS+=		tiff-3.4:../../graphics/tiff
+DEPENDS+=		xpm-3.4k:../../graphics/xpm
+
+MAINTAINER=		lamj@stat.cmu.edu
+HOMEPAGE=		http://www.windowmaker.org/
 
 USE_LIBTOOL=		yes
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-nlsdir=${PREFIX}/share/locale \
-			--with-gfx-incs="-I${LOCALBASE}/include \
+			--with-incs-from="-I${LOCALBASE}/include \
 				-I${LOCALBASE}/include/giflib" \
-			--with-gfx-libs=-L${LOCALBASE}/lib \
 			--enable-modelock
+LDFLAGS+=		-L${LOCALBASE}/lib	# for libintl.a
+CONFIGURE_ENV+=		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+			INSTALL_DATA="${INSTALL_DATA}" \
+			INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 # WINDOWMAKER_OPTIONS is a space-separated list of compile-time options
 # to support.  Currently supported options:
@@ -37,17 +40,14 @@ CONFIGURE_ARGS+=	--with-nlsdir=${PREFIX}/share/locale \
 #
 WINDOWMAKER_OPTIONS?=	gnome kde
 
-CPPFLAGS+=		-I${LOCALBASE}/include
-LDFLAGS+=		-L${LOCALBASE}/lib
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" \
-			INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-			INSTALL_DATA="${INSTALL_DATA}" \
-			INSTALL_SCRIPT="${INSTALL_SCRIPT}"
-
 PLIST_SRC=		${WRKDIR}/.PLIST_SRC_WM
 
 .include "../../mk/bsd.prefs.mk"
 
+.for OPTION in ${WINDOWMAKER_OPTIONS}
+CONFIGURE_ARGS+=	--enable-${OPTION}
+.endfor
+
 # LINGUAS is a space-separated list of locales.  If it is defined, then
 # i18n-support is compiled into Window Maker and the locales specified
 # are installed.
@@ -71,6 +71,9 @@ CONFIGURE_ARGS+=	--enable-kanji
 
 post-extract:
 	${RM} -f ${WRKDIR}/WindowMaker-data/pixmaps/tile.xpm
+	${RM} -f ${WRKSRC}/WindowMaker/Defaults/WMState \
+		 ${WRKSRC}/WindowMaker/Defaults/WMWindowAttributes \
+		 ${WRKSRC}/WindowMaker/Defaults/WindowMaker
 
 pre-configure:
 	@${ECHO} "To compile with i18n support, set the variable LINGUAS"
@@ -80,10 +83,16 @@ 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/SoundSets
 	${INSTALL_DATA_DIR} ${PREFIX}/share/WindowMaker/Sounds
+	${TOUCH} ${PREFIX}/share/WindowMaker/SoundSets/.keep_me
 	${TOUCH} ${PREFIX}/share/WindowMaker/Sounds/.keep_me
-	${INSTALL_DATA} ${WRKSRC}/README.GNOME ${PREFIX}/share/WindowMaker
-	${INSTALL_DATA} ${WRKSRC}/README.KDE ${PREFIX}/share/WindowMaker
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/WindowMaker
+	${INSTALL_DATA} \
+		${WRKSRC}/README \
+		${WRKSRC}/README.GNOME \
+		${WRKSRC}/README.KDE \
+		${PREFIX}/share/doc/WindowMaker
 	@${CAT} ${PKGDIR}/PLIST.nolinguas >${PLIST_SRC}
 .if defined(LINGUAS)
 	@(for lang in ${LINGUAS}; do \
@@ -99,7 +108,3 @@ post-install:
 .endif
 
 .include "../../mk/bsd.pkg.mk"
-
-.for OPTION in ${WINDOWMAKER_OPTIONS}
-CONFIGURE_ARGS+=	--enable-${OPTION}
-.endfor
diff --git a/x11/windowmaker/files/md5 b/x11/windowmaker/files/md5
index d31252631e9..4e5d7390d4a 100644
--- a/x11/windowmaker/files/md5
+++ b/x11/windowmaker/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.7 1999/02/02 10:24:10 tron Exp $
+$NetBSD: md5,v 1.8 1999/03/20 00:17:20 tron Exp $
 
-MD5 (WindowMaker-0.51.0.tar.gz) = c88b940437efe9a0c4f7535f836ce984
+MD5 (WindowMaker-0.51.2.tar.gz) = 041b07bf4771cc91bc8ddd29d2a392a2
 MD5 (WindowMaker-data.tar.gz) = 6ea0c37314ea9e9ab27e8bdf45a31a82
diff --git a/x11/windowmaker/patches/patch-ad b/x11/windowmaker/patches/patch-ad
deleted file mode 100644
index 09d4d6b0102..00000000000
--- a/x11/windowmaker/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.4 1999/02/02 10:24:11 tron Exp $
-
---- WPrefs.app/po/Makefile.in.orig	Thu Jan 28 11:38:16 1999
-+++ WPrefs.app/po/Makefile.in	Sun Jan 31 04:00:09 1999
-@@ -227,7 +227,7 @@
- 			$(mkinstalldirs) $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES; \
- 			chmod 755 $(DESTDIR)$(nlsdir)/$$l; \
- 			chmod 755 $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES; \
--			$(INSTALL) -m 644 $$n $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES/WPrefs.mo; \
-+			$(INSTALL_DATA) $$n $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES/WPrefs.mo; \
- 		fi; \
- 	done
- 
diff --git a/x11/windowmaker/patches/patch-ae b/x11/windowmaker/patches/patch-ae
deleted file mode 100644
index 8b3cef40478..00000000000
--- a/x11/windowmaker/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.4 1999/02/02 10:24:11 tron Exp $
-
---- po/Makefile.in.orig	Wed Jan 20 10:00:00 1999
-+++ po/Makefile.in	Sun Jan 31 04:02:56 1999
-@@ -228,7 +228,7 @@
- 			$(mkinstalldirs) $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES; \
- 			chmod 755 $(DESTDIR)$(nlsdir)/$$l; \
- 			chmod 755 $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES; \
--			$(INSTALL) -m 644 $$n $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES/WindowMaker.mo; \
-+			$(INSTALL_DATA) $$n $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES/WindowMaker.mo; \
- 		fi; \
- 	done
- 
diff --git a/x11/windowmaker/pkg/PLIST.nolinguas b/x11/windowmaker/pkg/PLIST.nolinguas
index 862f494f708..0d2ee49ddbb 100644
--- a/x11/windowmaker/pkg/PLIST.nolinguas
+++ b/x11/windowmaker/pkg/PLIST.nolinguas
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.nolinguas,v 1.2 1999/02/02 10:24:11 tron Exp $
+@comment $NetBSD: PLIST.nolinguas,v 1.3 1999/03/20 00:17:20 tron Exp $
 GNUstep/Apps/WPrefs.app/WPrefs
 GNUstep/Apps/WPrefs.app/WPrefs.tiff
 GNUstep/Apps/WPrefs.app/WPrefs.xpm
@@ -45,7 +45,10 @@ 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/tdel.tiff
+GNUstep/Apps/WPrefs.app/tiff/tedit.tiff
 GNUstep/Apps/WPrefs.app/tiff/temp.tiff
+GNUstep/Apps/WPrefs.app/tiff/textr.tiff
 GNUstep/Apps/WPrefs.app/tiff/theme.tiff
 GNUstep/Apps/WPrefs.app/tiff/timer0.tiff
 GNUstep/Apps/WPrefs.app/tiff/timer0s.tiff
@@ -59,6 +62,7 @@ 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/tnew.tiff
 GNUstep/Apps/WPrefs.app/tiff/whandling.tiff
 GNUstep/Apps/WPrefs.app/tiff/windowfocus.tiff
 GNUstep/Apps/WPrefs.app/tiff/workspace.tiff
@@ -130,6 +134,7 @@ bin/getstyle
 bin/seticons
 bin/setstyle
 bin/wdwrite
+bin/wkdemenu.pl
 bin/wm-oldmenu2new
 bin/wmaker
 bin/wmaker.inst
@@ -137,6 +142,11 @@ bin/wmsetbg
 bin/wsetfont
 bin/wxcopy
 bin/wxpaste
+etc/WindowMaker/WMGLOBAL
+etc/WindowMaker/WMRootMenu
+etc/WindowMaker/WMState
+etc/WindowMaker/WMWindowAttributes
+etc/WindowMaker/WindowMaker
 include/WINGs.h
 include/WINGsP.h
 include/WMaker.h
@@ -145,7 +155,7 @@ include/wraster.h
 lib/libWINGs.a
 lib/libWMaker.a
 lib/libwraster.a
-lib/libwraster.so.1.2
+lib/libwraster.so.2.0
 man/man1/geticonset.1
 man/man1/getstyle.1
 man/man1/seticons.1
@@ -160,11 +170,6 @@ share/WINGs/Images.xpm
 share/WINGs/defaultIcon.tiff
 share/WINGs/defaultIcon.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.iconset
 share/WindowMaker/Icons/BitchX.tiff
 share/WindowMaker/Icons/BitchX.xpm
@@ -279,9 +284,8 @@ share/WindowMaker/Pixmaps/tile.xpm
 share/WindowMaker/Pixmaps/tile2.xpm
 share/WindowMaker/Pixmaps/xv.xpm
 share/WindowMaker/README
-share/WindowMaker/README.GNOME
-share/WindowMaker/README.KDE
 share/WindowMaker/README.themes
+share/WindowMaker/SoundSets/.keep_me
 share/WindowMaker/Sounds/.keep_me
 share/WindowMaker/Styles/Autumn.style
 share/WindowMaker/Styles/Black.style
@@ -311,10 +315,20 @@ share/WindowMaker/Styles/VioletBlue.style
 share/WindowMaker/Themes/Checker.themed/checker.xpm
 share/WindowMaker/Themes/Checker.themed/style
 share/WindowMaker/Themes/Default.style
+share/WindowMaker/Themes/LeetWM.themed/LeetWM.jpg
+share/WindowMaker/Themes/LeetWM.themed/LeetWMMenutb1.jpg
+share/WindowMaker/Themes/LeetWM.themed/LeetWMMenutb2.jpg
+share/WindowMaker/Themes/LeetWM.themed/LeetWMTile1.jpg
+share/WindowMaker/Themes/LeetWM.themed/LeetWMtb1.jpg
+share/WindowMaker/Themes/LeetWM.themed/LeetWMtb2.jpg
+share/WindowMaker/Themes/LeetWM.themed/style
 share/WindowMaker/Themes/Night.themed/SeaNight.jpeg
 share/WindowMaker/Themes/Night.themed/style
 share/WindowMaker/Themes/OpenStep.style
 share/WindowMaker/Themes/Pastel.style
+share/WindowMaker/Themes/STEP2000.themed/BlueImage2.jpeg
+share/WindowMaker/Themes/STEP2000.themed/style
+share/WindowMaker/Themes/SteelBlueSilk.style
 share/WindowMaker/autostart.sh
 share/WindowMaker/exitscript.sh
 share/WindowMaker/menu
@@ -340,25 +354,33 @@ share/WindowMaker/menu.ru
 share/WindowMaker/menu.se
 share/WindowMaker/menu.sl
 share/WindowMaker/menu.tr
+share/WindowMaker/menu.zh_TW.Big5
 share/WindowMaker/plmenu
 share/WindowMaker/plmenu.fr
 share/WindowMaker/plmenu.hr
 share/WindowMaker/wmmacros
 share/WindowMaker/xtree.dat
+share/doc/WindowMaker/README
+share/doc/WindowMaker/README.GNOME
+share/doc/WindowMaker/README.KDE
 @dirrm GNUstep/Apps/WPrefs.app/tiff
 @dirrm GNUstep/Apps/WPrefs.app/xpm
 @dirrm GNUstep/Apps/WPrefs.app
 @dirrm GNUstep/Apps
 @dirrm GNUstep
+@dirrm etc/WindowMaker
 @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/SoundSets
 @dirrm share/WindowMaker/Sounds
 @dirrm share/WindowMaker/Styles
 @dirrm share/WindowMaker/Themes/Checker.themed
+@dirrm share/WindowMaker/Themes/LeetWM.themed
 @dirrm share/WindowMaker/Themes/Night.themed
+@dirrm share/WindowMaker/Themes/STEP2000.themed
 @dirrm share/WindowMaker/Themes
 @dirrm share/WindowMaker
+@dirrm share/doc/WindowMaker