Changes 0.95.5:

* Window Maker can now maximize windows to the top/bottom halves of the screen as well as to the corners (top left, top right etc). The keyboard shortcuts to do that can be configured via WPrefs
* Support for drawers in the dock has been added
* Keyboard shortcuts to move windows between workspaces
* Window border colours and width are now configurable
* The menu is now able to parse command-generated proplist style menus. WPrefs support for this has been added too
* Plus a few other new features and a lot of bug fixes and code cleanups by various people.

6 files changed, 44 insertions, 68 deletions

diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index 7f4f4d44f45..e74198ccb9d 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.104 2013/07/05 13:29:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.105 2014/01/17 08:48:06 adam Exp $
 
-DISTNAME=	WindowMaker-0.95.4
+DISTNAME=	WindowMaker-0.95.5
 PKGNAME=	${DISTNAME:S/WindowMaker/windowmaker/}
-PKGREVISION=	5
 CATEGORIES=	x11 wm windowmaker
 MASTER_SITES=	http://windowmaker.info/pub/source/release/
-EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.windowmaker.info/
 COMMENT=	GNUStep-compliant NEXTSTEP(tm) window manager clone
+LICENSE=	gnu-gpl-v2
 
 BROKEN_GETTEXT_DETECTION=	yes
 
@@ -65,7 +64,18 @@ BUILD_DEFS+=		WINDOWMAKER_OPTIONS
 CONFIGURE_ARGS+=	--enable-${option}
 .endfor
 
-post-extract:
+SUBST_CLASSES+=		fix-path
+SUBST_STAGE.fix-path=	pre-configure
+SUBST_MESSAGE.fix-path=	Fixing absolute paths.
+SUBST_FILES.fix-path=	WINGs/wapplication.c
+SUBST_FILES.fix-path+=	WindowMaker/Defaults/WindowMaker.in
+SUBST_FILES.fix-path+=	WPrefs.app/Paths.c
+SUBST_FILES.fix-path+=	WindowMaker/menu*
+SUBST_FILES.fix-path+=	WindowMaker/plmenu*
+SUBST_SED.fix-path=	-e 's,/usr/local,${PREFIX},g'
+SUBST_SED.fix-path+=	-e 's,${PREFIX}/GNUstep,${PREFIX}/share/GNUstep,g'
+
+pre-configure:
 	${RM} -f ${WRKSRC}/WindowMaker/Defaults/WMState \
 		 ${WRKSRC}/WindowMaker/Defaults/WMWindowAttributes \
 		 ${WRKSRC}/WindowMaker/Defaults/WindowMaker \
@@ -75,22 +85,12 @@ post-extract:
 	do \
 		${MV} "$$manfile" `${ECHO} "$$manfile" | ${SED} "s/1x$$/1/"`; \
 	done;
-	set -e; \
-	cd ${WRKSRC} && \
-	for f in WINGs/wapplication.c WindowMaker/Defaults/WindowMaker.in \
-		WPrefs.app/Paths.c WindowMaker/menu* WindowMaker/plmenu*; do \
-		${SED}	-e "s|/usr/local|${PREFIX}|g" \
-			-e "s|${PREFIX}/GNUstep|${PREFIX}/share/GNUstep|g" \
-			"$$f" > "$$f".new && \
-		${MV} "$$f".new "$$f"; \
-	done
 
 post-install:
 	${TOUCH} ${DESTDIR}${PREFIX}/share/WindowMaker/SoundSets/.directory
 	${TOUCH} ${DESTDIR}${PREFIX}/share/WindowMaker/Sounds/.directory
 	cd ${WRKSRC} && \
-	${INSTALL_DATA} \
-		README README.definable-cursor FAQ FAQ.I18N \
+	${INSTALL_DATA} README README.definable-cursor FAQ FAQ.I18N \
 		${DESTDIR}${PREFIX}/share/doc/WindowMaker
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/wm/windowmaker/PLIST b/wm/windowmaker/PLIST
index 909f8050c9d..90ca31345fa 100644
--- a/wm/windowmaker/PLIST
+++ b/wm/windowmaker/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2013/05/21 14:38:40 hans Exp $
+@comment $NetBSD: PLIST,v 1.19 2014/01/17 08:48:06 adam Exp $
 bin/convertfonts
 bin/get-wings-flags
 bin/get-wraster-flags
@@ -25,14 +25,20 @@ include/WINGs/WUtil.h
 include/WMaker.h
 include/wraster.h
 lib/libWINGs.la
-lib/libWINGs.a
-lib/libWMaker.a
 lib/libWMaker.la
-lib/libWUtil.a
 lib/libWUtil.la
 lib/libwraster.la
 lib/pkgconfig/WINGs.pc
 lib/pkgconfig/wrlib.pc
+man/cs/man1/geticonset.1
+man/cs/man1/getstyle.1
+man/cs/man1/seticons.1
+man/cs/man1/setstyle.1
+man/cs/man1/wdwrite.1
+man/cs/man1/wmaker.1
+man/cs/man1/wmsetbg.1
+man/cs/man1/wxcopy.1
+man/cs/man1/wxpaste.1
 man/man1/WPrefs.1
 man/man1/WindowMaker.1
 man/man1/get-wings-flags.1
@@ -42,8 +48,8 @@ man/man1/geticonset.1
 man/man1/getstyle.1
 man/man1/seticons.1
 man/man1/setstyle.1
-man/man1/wdwrite.1
 man/man1/wdread.1
+man/man1/wdwrite.1
 man/man1/wmagnify.1
 man/man1/wmaker.1
 man/man1/wmgenmenu.1
@@ -52,16 +58,6 @@ man/man1/wmsetbg.1
 man/man1/wxcopy.1
 man/man1/wxpaste.1
 man/man8/upgrade-windowmaker-defaults.8
-man/cs/man1/geticonset.1
-man/cs/man1/getstyle.1
-man/cs/man1/seticons.1
-man/cs/man1/setstyle.1
-man/cs/man1/wdwrite.1
-man/cs/man1/wmaker.1
-man/cs/man1/wmaker.1
-man/cs/man1/wmsetbg.1
-man/cs/man1/wxcopy.1
-man/cs/man1/wxpaste.1
 man/ru/man1/geticonset.1
 man/ru/man1/getstyle.1
 man/ru/man1/seticons.1
@@ -90,7 +86,9 @@ share/GNUstep/Applications/WPrefs.app/tiff/clip.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/configs.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/cycleworkspaces.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/dock.tiff
+share/GNUstep/Applications/WPrefs.app/tiff/dockclipdrawersection.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/dontlinkworkspaces.tiff
+share/GNUstep/Applications/WPrefs.app/tiff/drawer.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/ergonomic.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/expert.tiff
 share/GNUstep/Applications/WPrefs.app/tiff/fonts.tiff
@@ -160,6 +158,7 @@ share/WindowMaker/Backgrounds/BlueImage.jpeg
 share/WindowMaker/IconSets/Default.iconset
 share/WindowMaker/Icons/BitchX.tiff
 share/WindowMaker/Icons/BitchX.xpm
+share/WindowMaker/Icons/Drawer.png
 share/WindowMaker/Icons/Ear.png
 share/WindowMaker/Icons/Ftp.png
 share/WindowMaker/Icons/GNUstep.tiff
diff --git a/wm/windowmaker/distinfo b/wm/windowmaker/distinfo
index 16cf3cd7c7e..afbba969671 100644
--- a/wm/windowmaker/distinfo
+++ b/wm/windowmaker/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.35 2013/07/06 10:19:31 tron Exp $
+$NetBSD: distinfo,v 1.36 2014/01/17 08:48:06 adam Exp $
 
-SHA1 (WindowMaker-0.95.4.tar.gz) = 1477954668012010cf7991cb8139205768205717
-RMD160 (WindowMaker-0.95.4.tar.gz) = 9316c30d9d2ebd1080711596ec1b97158997fa3a
-Size (WindowMaker-0.95.4.tar.gz) = 2789390 bytes
-SHA1 (patch-WINGs_proplist.c) = 8636ebf38659b03e11c1e616c95b43a1708be69f
+SHA1 (WindowMaker-0.95.5.tar.gz) = b04aef6a9076dd31a4e819275a78ece1784db28e
+RMD160 (WindowMaker-0.95.5.tar.gz) = 40b7782e1c86c0f850a48daad23cdcdb13f74785
+Size (WindowMaker-0.95.5.tar.gz) = 2927995 bytes
 SHA1 (patch-aa) = e926a78bc5b800a1e5fbc8792099fc4a97ae916f
-SHA1 (patch-ab) = 794946828ede1816ea3b6a4c17f00465e1ae06c9
+SHA1 (patch-ab) = f954dadf7863a0ffc5eb4fb31bfadc218570324d
 SHA1 (patch-ac) = 0a2843e3f8e8456080082d1f3e57f58a5d440d18
 SHA1 (patch-ad) = ec668c0e40289e87e92ec85d26810ef358d2407a
 SHA1 (patch-ae) = af4cf08ef774080efeaa5baa2662748418b442a3
@@ -13,7 +12,7 @@ SHA1 (patch-af) = 87c1ddd22f4afae10ae60f012d12a41de44b0f12
 SHA1 (patch-ag) = 4447310218e73ab0b78e563dabc9ce9614d68cfd
 SHA1 (patch-ai) = 44a6a63bad867e6bc614b58688d59aa610b8553b
 SHA1 (patch-aj) = 248d7088ee2ce861898a7474cde8a08f4b879ee9
-SHA1 (patch-ak) = 33935c1d6192b2e3833cf1d5b3c724269cb051b3
+SHA1 (patch-ak) = 40221313ce3456f4357082caec17991390607159
 SHA1 (patch-doc_cs_Makefile.in) = ab0b42a60863fec8fba0de0e8a2ae74fa3cf8103
 SHA1 (patch-doc_ru_Makefile.in) = 7c0b861c6bbe457e8e55e0265335195b95bbe031
 SHA1 (patch-wrlib_gif.c) = c050efa872151a326a2e96af16acb40c3bba4a9c
diff --git a/wm/windowmaker/patches/patch-WINGs_proplist.c b/wm/windowmaker/patches/patch-WINGs_proplist.c
deleted file mode 100644
index fb240d0e385..00000000000
--- a/wm/windowmaker/patches/patch-WINGs_proplist.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-WINGs_proplist.c,v 1.1 2013/05/23 15:08:50 joerg Exp $
-
---- WINGs/proplist.c.orig	2013-05-23 12:40:45.000000000 +0000
-+++ WINGs/proplist.c
-@@ -1162,7 +1162,7 @@ WMPropList *WMMergePLDictionaries(WMProp
- 	WMPropList *key, *value, *dvalue;
- 	WMHashEnumerator e;
- 
--	wassertr(source->type == WPLDictionary && dest->type == WPLDictionary);
-+	wassertrv(source->type == WPLDictionary && dest->type == WPLDictionary, NULL);
- 
- 	if (source == dest)
- 		return dest;
-@@ -1189,7 +1189,7 @@ WMPropList *WMSubtractPLDictionaries(WMP
- 	WMPropList *key, *value, *dvalue;
- 	WMHashEnumerator e;
- 
--	wassertr(source->type == WPLDictionary && dest->type == WPLDictionary);
-+	wassertrv(source->type == WPLDictionary && dest->type == WPLDictionary, NULL);
- 
- 	if (source == dest) {
- 		WMPropList *keys = WMGetPLDictionaryKeys(dest);
diff --git a/wm/windowmaker/patches/patch-ab b/wm/windowmaker/patches/patch-ab
index 3d80b288ee9..937677e563d 100644
--- a/wm/windowmaker/patches/patch-ab
+++ b/wm/windowmaker/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.14 2013/05/21 14:38:40 hans Exp $
+$NetBSD: patch-ab,v 1.15 2014/01/17 08:48:06 adam Exp $
 
 --- configure.orig	2013-01-09 21:43:05.000000000 +0000
 +++ configure
-@@ -11613,9 +11613,9 @@ test "x$exec_prefix" = xNONE && exec_pre
+@@ -11948,9 +11948,9 @@ test "x$exec_prefix" = xNONE && exec_pre
  _bindir=`eval echo $bindir`
  _bindir=`eval echo $_bindir`
  
diff --git a/wm/windowmaker/patches/patch-ak b/wm/windowmaker/patches/patch-ak
index a907ea0faf0..aece7a70c9b 100644
--- a/wm/windowmaker/patches/patch-ak
+++ b/wm/windowmaker/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.5 2013/05/30 15:18:28 hans Exp $
+$NetBSD: patch-ak,v 1.6 2014/01/17 08:48:06 adam Exp $
 
---- util/Makefile.in.orig	2013-01-09 21:43:07.000000000 +0000
+--- util/Makefile.in.orig	2013-09-12 22:00:17.000000000 +0000
 +++ util/Makefile.in
-@@ -374,21 +374,21 @@ AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" 
+@@ -375,21 +375,21 @@ AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" 
  	-DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\"
  
  liblist = @LIBRARY_SEARCH_PATH@ @INTLIBS@
@@ -14,15 +14,15 @@ $NetBSD: patch-ak,v 1.5 2013/05/30 15:18:28 hans Exp $
  wxpaste_LDADD = @XLFLAGS@ @XLIBS@
 -getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
 +getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.la @XLFLAGS@ @XLIBS@ $(liblist)
- getstyle_SOURCES = getstyle.c fontconv.c
+ getstyle_SOURCES = getstyle.c fontconv.c common.h
  setstyle_LDADD = \
  	$(top_builddir)/WINGs/libWUtil.la \
  	@XLFLAGS@ @XLIBS@ $(liblist)
  
- setstyle_SOURCES = setstyle.c fontconv.c
+ setstyle_SOURCES = setstyle.c fontconv.c common.h
 -convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
 +convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.la @XLFLAGS@ @XLIBS@ $(liblist)
- convertfonts_SOURCES = convertfonts.c fontconv.c
+ convertfonts_SOURCES = convertfonts.c fontconv.c common.h
 -seticons_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
 -geticonset_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
 +seticons_LDADD = $(top_builddir)/WINGs/libWUtil.la @XLFLAGS@ @XLIBS@ $(liblist)