- Add upstream patch to fix java/netbeans menu problem after

resize, maximize. From Christian Schulte on ports@.

- While there: tidy Makefile, regen PLIST and merge PFRAG.shared,
don't USE_GROFF.

x11/windowmaker/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.88 2013/06/04 18:42:00 naddy Exp $
+# $OpenBSD: Makefile,v 1.89 2013/08/22 23:03:20 sthen Exp $
 
 COMMENT-main=		window manager that emulates NEXTSTEP(tm)
 COMMENT-lang=		language subpackage for Window Maker
@@ -6,23 +6,27 @@ COMMENT-lang=		language subpackage for Window Maker
 V=			0.92.0
 DISTNAME=		WindowMaker-${V}
 PKGNAME-main=		${DISTNAME:L}
-REVISION-main=		13
-FULLPKGNAME-lang=       windowmaker-lang-${V}
+REVISION-main=		14
+FULLPKGNAME-lang=	windowmaker-lang-${V}
 REVISION-lang=		3
-SHARED_LIBS=		wraster 5.0
+
+SHARED_LIBS +=	wraster              5.0      # 4.0
+
 CATEGORIES=		x11 x11/windowmaker
 
 HOMEPAGE=		http://www.windowmaker.info/
 
-# GPL
+# GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
 
+WANTLIB += X11 Xext Xft Xinerama Xpm Xrender c expat fontconfig
+WANTLIB += freetype jpeg m png pthread-stubs tiff ungif xcb z
+
 MASTER_SITES=		${MASTER_SITE_WINDOWMAKER:=source/release/}
 EXTRACT_SUFX=		.tar.bz2
 
 NO_TEST=		Yes
 SEPARATE_BUILD=		Yes
-USE_GROFF =		Yes
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--enable-static \
@@ -33,15 +37,12 @@ CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" \
 			LINGUAS='be bg bs ca cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW'
 
-MULTI_PACKAGES=         -main -lang
+MULTI_PACKAGES=		-main -lang
 
 MODULES=		devel/gettext
 LIB_DEPENDS=		graphics/tiff \
 			graphics/png \
 			graphics/libungif
-WANTLIB=		X11 Xau Xdmcp Xext Xft Xinerama Xpm Xrender c expat \
-	 		fontconfig freetype m z pthread-stubs xcb jpeg \
-			tiff png ungif
 
 RUN_DEPENDS-lang=	x11/windowmaker>=0.90.0
 LIB_DEPENDS-lang=

x11/windowmaker/patches/patch-src_actions_c

@@ -1,11 +1,17 @@
-$OpenBSD: patch-src_actions_c,v 1.3 2012/03/17 17:32:28 dcoppa Exp $
+$OpenBSD: patch-src_actions_c,v 1.4 2013/08/22 23:03:21 sthen Exp $
 
-This is a backport from WindowMaker cvs which fixes the
-"periodic focus bug" described at:
+1. Fix periodic focus bug
+From: Pedro Gimeno <parigalo@formauri.es>
+Date: Mon, 19 May 2008 17:52:00 -0300
 http://repo.or.cz/w/wmaker-crm.git/commitdiff/c91bb1ba1360006c568db37438779e525868cf17
 
---- src/actions.c.orig	Fri Mar 16 17:10:27 2012
-+++ src/actions.c	Fri Mar 16 17:11:57 2012
+2. Bugfix: java menu problem after resize, maximize
+From: Ambrus Szabo <donamo@donamo.hu>
+Date: Tue, 5 Apr 2011 12:36:11 +0200
+http://repo.or.cz/w/wmaker-crm.git/commit/7490b14bf0573283cd11eea3b1b6392c6f38e2dd
+
+--- src/actions.c.orig	Sun Jul  3 19:25:14 2005
++++ src/actions.c	Wed Jul 17 23:20:47 2013
 @@ -78,6 +78,15 @@ static struct {
  #define SHADE_STEPS	shadePars[(int)wPreferences.shade_speed].steps
  #define SHADE_DELAY	shadePars[(int)wPreferences.shade_speed].delay
@@ -36,3 +42,21 @@ http://repo.or.cz/w/wmaker-crm.git/commitdiff/c91bb1ba1360006c568db37438779e5258
          return;
  
      if (!old_scr)
+@@ -463,8 +472,8 @@ wMaximizeWindow(WWindow *wwin, int directions)
+                     &new_width, &new_height);
+
+     wWindowConfigure(wwin, new_x, new_y, new_width, new_height);
++    wWindowSynthConfigureNotify(wwin);
+
+-
+     WMPostNotificationName(WMNChangedState, wwin, "maximize");
+
+     wSoundPlay(WSOUND_MAXIMIZE);
+@@ -494,6 +503,7 @@ wUnmaximizeWindow(WWindow *wwin)
+
+     wwin->flags.maximized = 0;
+     wWindowConfigure(wwin, x, y, w, h);
++    wWindowSynthConfigureNotify(wwin);
+
+     WMPostNotificationName(WMNChangedState, wwin, "maximize");
+

x11/windowmaker/patches/patch-src_moveres_c

@@ -0,0 +1,17 @@
+$OpenBSD: patch-src_moveres_c,v 1.1 2013/08/22 23:03:21 sthen Exp $
+
+Bugfix: java menu problem after resize, maximize
+From: Ambrus Szabo <donamo@donamo.hu>
+Date: Tue, 5 Apr 2011 12:36:11 +0200
+http://repo.or.cz/w/wmaker-crm.git/commit/7490b14bf0573283cd11eea3b1b6392c6f38e2dd
+
+--- src/moveres.c.orig	Wed Jul 17 23:21:12 2013
++++ src/moveres.c	Wed Jul 17 23:23:43 2013
+@@ -2190,6 +2190,7 @@ wMouseResizeWindow(WWindow *wwin, XEvent *ev)
+                     wwin->flags.user_changed_height = 1;
+
+                 wWindowConfigure(wwin, fx, fy, fw, fh - vert_border);
++                wWindowSynthConfigureNotify(wwin);
+             }
+ #ifdef DEBUG
+             puts("End resize window");

x11/windowmaker/pkg/PFRAG.shared-main

@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared-main,v 1.1 2006/11/21 22:07:07 espie Exp $
-@lib lib/libwraster.so.${LIBwraster_VERSION}

x11/windowmaker/pkg/PLIST-main

@@ -1,28 +1,28 @@
-@comment $OpenBSD: PLIST-main,v 1.1 2006/11/21 22:07:07 espie Exp $
+@comment $OpenBSD: PLIST-main,v 1.2 2013/08/22 23:03:21 sthen Exp $
 @pkgpath x11/windowmaker
 GNUstep/
 GNUstep/Applications/
 GNUstep/Applications/WPrefs.app
-bin/WPrefs
-bin/convertfonts
+@bin bin/WPrefs
+@bin bin/convertfonts
 bin/get-wings-flags
 bin/get-wraster-flags
 bin/get-wutil-flags
-bin/geticonset
-bin/getstyle
-bin/seticons
-bin/setstyle
-bin/wdread
-bin/wdwrite
+@bin bin/geticonset
+@bin bin/getstyle
+@bin bin/seticons
+@bin bin/setstyle
+@bin bin/wdread
+@bin bin/wdwrite
 bin/wkdemenu.pl
 bin/wm-oldmenu2new
-bin/wmagnify
-bin/wmaker
+@bin bin/wmagnify
+@bin bin/wmaker
 bin/wmaker.inst
-bin/wmsetbg
-bin/wmsetup
-bin/wxcopy
-bin/wxpaste
+@bin bin/wmsetbg
+@bin bin/wmsetup
+@bin bin/wxcopy
+@bin bin/wxpaste
 include/WINGs/
 include/WINGs/WINGs.h
 include/WINGs/WINGsP.h
@@ -38,6 +38,7 @@ lib/libWMaker.a
 lib/libWUtil.a
 lib/libwraster.a
 lib/libwraster.la
+@lib lib/libwraster.so.${LIBwraster_VERSION}
 lib/pkgconfig/
 lib/pkgconfig/WINGs.pc
 lib/pkgconfig/wmlib.pc
@@ -263,7 +264,6 @@ share/WindowMaker/menu
 share/WindowMaker/plmenu
 share/WindowMaker/wmmacros
 share/WindowMaker/xtree.dat
-%%SHARED%%
 share/examples/WindowMaker/
 @sample ${SYSCONFDIR}/WindowMaker/
 share/examples/WindowMaker/WMGLOBAL