After just 7 short years, a new release of WindowMaker, 0.95.2

New features and highlights:

Left Half / Right Half Maximize.

Maximus: tiled maximization. Maximizes a window such that it occupies the
  largest area without overlapping others.

New mouse-resizing functionality. Windows can now be resized vertically
  (horizontally) using MOD+Wheel (CTRL+Wheel).

History and TAB completion in dialogs. To use this new functionality in
  your old WMRootMenu, replace %a by %A in the relevant entry. It will
  look like this (Run..., SHEXEC, "%A(Run, Type command:)"). Or use
  wmgenmenu to generate a new menu.

Bouncing appicon effect.

New applications (wmgenmenu and wmmenugen) to generate the root menu
  automatically by looking which applications you have on your $PATH.
  Translations to German, Spanish and French of menus generated by
  wmgenmenu.

Improved dockapp recognition.

And many trivial things which reduce little annoyances one might have.
  For example, an option was added to control whether or not Window Maker
  should do automatic workspace switching to satisfy a focus request from
  a window located in another workspace.

Added keyboard shortcut to uncover/cover the dock.

Mac OS X-style window cycling.

Preliminary XRandR support (needs a bit more work to be bug-free).

Many other bug fixes.

For the ports:
* Remove patches that have been adopted upstream or otherwise made
  obsolete
* Remove the OPTIONS, and enable all features
* Improve PREFIX-safety
* Otherwise simplify the windowmaker port
* Make libwraster a proper slave port

3 files changed, 16 insertions, 44 deletions

diff --git a/x11-wm/libwraster/Makefile b/x11-wm/libwraster/Makefile
index 29a18deea275..6a2ec345a9d4 100644
--- a/x11-wm/libwraster/Makefile
+++ b/x11-wm/libwraster/Makefile
@@ -3,67 +3,32 @@
 # Whom:					Doug Barton <dougb@FreeBSD.org>
 #
 # $FreeBSD$
-#
 
 PORTNAME=	libwraster
-PORTVERSION=	0.92.0
-PORTREVISION=	3
-CATEGORIES=	x11-wm windowmaker
-MASTER_SITES=	${MASTER_SITE_WINDOWMAKER} \
-		http://dougbarton.us/Downloads/
-MASTER_SITE_SUBDIR=	source/release
-DISTNAME=	WindowMaker-${PORTVERSION}
+PORTREVISION=	0
 
-MAINTAINER=	dougb@FreeBSD.org
 COMMENT=	libwraster from Window Maker
 
-LIB_DEPENDS=	gif.5:${PORTSDIR}/graphics/giflib \
-		png.6:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff
-
-MAKE_JOBS_SAFE=	yes
+MASTERDIR=	${.CURDIR}/../windowmaker
 
-USE_AUTOTOOLS=	libtool
-USE_BZIP2=	yes
-USE_GNOME=	pkgconfig
-USE_XORG=	xpm xft
-USE_PERL5=	yes
-USE_GETTEXT=	yes
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
-		--with-nlsdir=${PREFIX}/share/locale \
-		--with-libs-from="-L${LOCALBASE}/lib" \
-		--with-incs-from="-I${LOCALBASE}/include" \
-		--with-gnustepdir="${PREFIX}/GNUstep" \
-		--disable-debug
-USE_LDCONFIG=	yes
+LWR_SLAVE=	yes
 
-PATCHDIR=	${.CURDIR}/../windowmaker/files
-DISTINFO_FILE=	${.CURDIR}/../windowmaker/distinfo
+PATCHDIR=	# To void equivalent in master port
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${.CURDIR}/pkg-plist
 
 CONFLICTS=	windowmaker-0.*
 
-PLIST_FILES=	bin/get-wraster-flags include/wraster.h lib/libwraster.a \
-		lib/libwraster.la lib/libwraster.so lib/libwraster.so.4 \
-		libdata/pkgconfig/wrlib.pc
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == amd64
-CONFIGURE_ENV+=	ac_cv_c_inline_asm=no
-.endif
-
 post-patch:
 	@${CP} ${WRKSRC}/wrlib/Makefile.in ${WRKSRC}/wrlib/Makefile.in.presed
 	@${SED} -e s#$$\(libdir\)/pkgconfig#${PREFIX}/libdata/pkgconfig#g \
 	    ${WRKSRC}/wrlib/Makefile.in.presed > ${WRKSRC}/wrlib/Makefile.in
 
 do-build:
+	cd ${WRKSRC} && ${MAKE} config-paths.h
 	cd ${WRKSRC}/wrlib && ${MAKE}
 
 do-install:
 	cd ${WRKSRC}/wrlib && ${MAKE} install
 
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/x11-wm/libwraster/pkg-descr b/x11-wm/libwraster/pkg-descr
index 93be650463b5..8f09613998c5 100644
--- a/x11-wm/libwraster/pkg-descr
+++ b/x11-wm/libwraster/pkg-descr
@@ -3,4 +3,4 @@ This is the libwraster library from x11-wm/windowmaker.
 The purpose of this port is to allow dockapp ports the choice of
 depending on the full Window Maker port, or just the library.
 
-WWW: http://www.windowmaker.info/
+WWW: http://www.windowmaker.org/
diff --git a/x11-wm/libwraster/pkg-plist b/x11-wm/libwraster/pkg-plist
new file mode 100644
index 000000000000..5c882105b3cc
--- /dev/null
+++ b/x11-wm/libwraster/pkg-plist
@@ -0,0 +1,7 @@
+bin/get-wraster-flags
+include/wraster.h
+lib/libwraster.a
+lib/libwraster.la
+lib/libwraster.so
+lib/libwraster.so.4
+libdata/pkgconfig/wrlib.pc