- Update to 0.95.5.

- Use new syntax in LIB_DEPENDS.
- Add STAGEDIR support.
- USE ${opt}_FOO for OPTIONS.

PR:	ports/184359

8 files changed, 89 insertions, 102 deletions

diff --git a/x11-wm/libwraster/Makefile b/x11-wm/libwraster/Makefile
index 540eaf394b3b..272592dad525 100644
--- a/x11-wm/libwraster/Makefile
+++ b/x11-wm/libwraster/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libwraster
-PORTVERSION=	0.95.4
-PORTREVISION=	1
+PORTVERSION=	0.95.5
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://windowmaker.org/pub/%SUBDIR%/
 MASTER_SITE_SUBDIR=	source/release
@@ -13,10 +12,10 @@ COMMENT=	Window Maker raster graphics library
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	gif:${PORTSDIR}/graphics/giflib \
-		png15:${PORTSDIR}/graphics/png \
-		jbig:${PORTSDIR}/graphics/jbigkit \
-		tiff:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libjbig.so:${PORTSDIR}/graphics/jbigkit \
+		libtiff.so:${PORTSDIR}/graphics/tiff
 
 USES=		pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
@@ -37,12 +36,11 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		get-wraster-flags.1
 
-NO_STAGE=	yes
 pre-build:
 	cd ${WRKSRC} && ${MAKE} config-paths.h
 
 post-install:
-	cd ${WRKSRC}/doc \
-		&& ${INSTALL_MAN} get-wraster-flags.1 ${MANPREFIX}/man/man1
+	cd ${WRKSRC}/doc && ${INSTALL_MAN} \
+	    get-wraster-flags.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/x11-wm/libwraster/distinfo b/x11-wm/libwraster/distinfo
index 20c61534cd6b..a8a58b4c50e7 100644
--- a/x11-wm/libwraster/distinfo
+++ b/x11-wm/libwraster/distinfo
@@ -1,2 +1,2 @@
-SHA256 (WindowMaker-0.95.4.tar.gz) = 2bea97f00570f05ff115d147457c16abefe496a4fc882a027152ce592d768e45
-SIZE (WindowMaker-0.95.4.tar.gz) = 2789390
+SHA256 (WindowMaker-0.95.5.tar.gz) = 4b25f474fde032a060c93fbc50f1ce04729ab17ea963ca3eb8dbb82f49af70d0
+SIZE (WindowMaker-0.95.5.tar.gz) = 2927995
diff --git a/x11-wm/libwraster/pkg-plist b/x11-wm/libwraster/pkg-plist
index 7bbed37683c3..5994eb85254e 100644
--- a/x11-wm/libwraster/pkg-plist
+++ b/x11-wm/libwraster/pkg-plist
@@ -6,3 +6,4 @@ lib/libwraster.la
 lib/libwraster.so
 lib/libwraster.so.4
 libdata/pkgconfig/wrlib.pc
+man/man1/get-wraster-flags.1.gz
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index d3c9874cf5c3..766ff9748b3d 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	windowmaker
-PORTVERSION=	0.95.4
-PORTREVISION=	1
+PORTVERSION=	0.95.5
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://windowmaker.org/pub/%SUBDIR%/
 MASTER_SITE_SUBDIR=	source/release
@@ -14,17 +13,19 @@ COMMENT=	GNUstep-compliant NeXTstep window manager clone
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	gif:${PORTSDIR}/graphics/giflib \
-		png15:${PORTSDIR}/graphics/png \
-		jbig:${PORTSDIR}/graphics/jbigkit \
-		tiff:${PORTSDIR}/graphics/tiff \
-		wraster:${PORTSDIR}/x11-wm/libwraster
-RUN_DEPENDS=	${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons
+LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libjbig.so:${PORTSDIR}/graphics/jbigkit \
+		libtiff.so:${PORTSDIR}/graphics/tiff \
+		libwraster.so:${PORTSDIR}/x11-wm/libwraster
+RUN_DEPENDS=	libwraster>=${PORTVERSION}:${PORTSDIR}/x11-wm/libwraster \
+		${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons
 
 USES=		pathfix perl5 pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 USE_XORG=	xft xinerama xmu xpm
+CONFIGURE_ENV=	ac_cv_header_sys_inotify_h=no
 CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
 		--with-nlsdir=${PREFIX}/share/locale \
 		--with-libs-from="-L${LOCALBASE}/lib" \
@@ -37,56 +38,33 @@ CPPFLAGS+=	-DPREFIX=\\\"${PREFIX}\\\" -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 PORTDOCS=	AUTHORS BUGFORM BUGS ChangeLog FAQ FAQ.I18N INSTALL \
 		INSTALL-WMAKER NEWS README README.definable-cursor TODO
+LINGUAS=	be bg bs ca cs da de el es et fi fr gl hr hu hy it \
+		ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW
 
 OPTIONS_DEFINE=	DOCS NLS XRANDR
+OPTIONS_SUB=	NLS
+NLS_USES=	gettext
+NLS_CONFIGURE_ENV=	LINGUAS="${LINGUAS}"
+NLS_CONFIGURE_ENABLE=	locale
+XRANDR_USE=	XORG=xrandr
+XRANDR_CONFIGURE_ENABLE=	xrandr
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64 && ${OSVERSION} < 800000
 CONFIGURE_ENV+=	ac_cv_c_inline_asm=no
 .endif
-
 .if ${OSVERSION} < 800000
 CPPFLAGS+=	-DHAVE_SYS_SELECT_H
 .endif
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-LINGUAS=	be bg bs ca cs da de el es et fi fr gl hr hu hy it \
-		ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW
-CONFIGURE_ENV+=	LINGUAS="${LINGUAS}"
-PLIST_SUB=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-locale
-PLIST_SUB=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MXRANDR}
-USE_XORG+=	xrandr
-CONFIGURE_ARGS+=--enable-xrandr
-.endif
-
-MANLANG=	"" cs sk ru
-MAN1_EN=	geticonset.1x getstyle.1x seticons.1x setstyle.1x wdwrite.1x \
-		wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x get-wings-flags.1 \
-		get-wutil-flags.1 wdread.1 WindowMaker.1x wmagnify.1x \
-		wmgenmenu.1 wmmenugen.1 WPrefs.1x
-MAN8_EN=	upgrade-windowmaker-defaults.8
-MAN1_CS=	geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x \
-		wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x
-MAN1_SK=	geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x \
-		wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x
-MAN1_RU=	geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x \
-		wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x
-
 post-install:
 	@${MKDIR} \
-		${PREFIX}/GNUstep/Applications/WPrefs.app/xpm \
-		${PREFIX}/share/WindowMaker/Sounds
+	    ${STAGEDIR}${PREFIX}/GNUstep/Applications/WPrefs.app/xpm \
+	    ${STAGEDIR}${PREFIX}/share/WindowMaker/Sounds
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/windowmaker/distinfo b/x11-wm/windowmaker/distinfo
index 20c61534cd6b..a8a58b4c50e7 100644
--- a/x11-wm/windowmaker/distinfo
+++ b/x11-wm/windowmaker/distinfo
@@ -1,2 +1,2 @@
-SHA256 (WindowMaker-0.95.4.tar.gz) = 2bea97f00570f05ff115d147457c16abefe496a4fc882a027152ce592d768e45
-SIZE (WindowMaker-0.95.4.tar.gz) = 2789390
+SHA256 (WindowMaker-0.95.5.tar.gz) = 4b25f474fde032a060c93fbc50f1ce04729ab17ea963ca3eb8dbb82f49af70d0
+SIZE (WindowMaker-0.95.5.tar.gz) = 2927995
diff --git a/x11-wm/windowmaker/files/patch-WINGs__proplist.c b/x11-wm/windowmaker/files/patch-WINGs__proplist.c
deleted file mode 100644
index b79aa59b097e..000000000000
--- a/x11-wm/windowmaker/files/patch-WINGs__proplist.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- WINGs/proplist.c.orig	2013-05-03 02:48:24.000000000 +0900
-+++ WINGs/proplist.c	2013-05-03 02:52:24.000000000 +0900
-@@ -1162,7 +1162,7 @@
- 	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 *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/x11-wm/windowmaker/files/patch-configure b/x11-wm/windowmaker/files/patch-configure
deleted file mode 100644
index 67467d341fa8..000000000000
--- a/x11-wm/windowmaker/files/patch-configure
+++ /dev/null
@@ -1,23 +0,0 @@
---- configure.orig	2013-05-02 15:16:38.000000000 +0900
-+++ configure	2013-05-02 15:17:26.000000000 +0900
-@@ -12042,20 +12042,6 @@
- fi
- 
- 
--for ac_header in sys/inotify.h
--do :
--  ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default"
--if test "x$ac_cv_header_sys_inotify_h" = x""yes; then :
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_SYS_INOTIFY_H 1
--_ACEOF
--
--$as_echo "#define HAVE_INOTIFY 1" >>confdefs.h
--
--fi
--
--done
--
- 
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
diff --git a/x11-wm/windowmaker/pkg-plist b/x11-wm/windowmaker/pkg-plist
index d73d64d8ac65..2620d24b6fbe 100644
--- a/x11-wm/windowmaker/pkg-plist
+++ b/x11-wm/windowmaker/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 @exec mkdir -p %D/GNUstep/Applications/WPrefs.app/xpm
 @exec mkdir -p %D/share/WindowMaker/Sounds
 GNUstep/Applications/WPrefs.app/WPrefs
@@ -10,7 +11,9 @@ GNUstep/Applications/WPrefs.app/tiff/clip.tiff
 GNUstep/Applications/WPrefs.app/tiff/configs.tiff
 GNUstep/Applications/WPrefs.app/tiff/cycleworkspaces.tiff
 GNUstep/Applications/WPrefs.app/tiff/dock.tiff
+GNUstep/Applications/WPrefs.app/tiff/dockclipdrawersection.tiff
 GNUstep/Applications/WPrefs.app/tiff/dontlinkworkspaces.tiff
+GNUstep/Applications/WPrefs.app/tiff/drawer.tiff
 GNUstep/Applications/WPrefs.app/tiff/ergonomic.tiff
 GNUstep/Applications/WPrefs.app/tiff/expert.tiff
 GNUstep/Applications/WPrefs.app/tiff/fonts.tiff
@@ -111,7 +114,7 @@ lib/libWMaker.so.1
 lib/libWUtil.a
 lib/libWUtil.la
 lib/libWUtil.so
-lib/libWUtil.so.2
+lib/libWUtil.so.3
 libdata/pkgconfig/WINGs.pc
 share/WINGs/Images.tiff
 share/WINGs/Images.xpm
@@ -121,6 +124,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
@@ -342,12 +346,61 @@ share/WindowMaker/wmmacros
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/WindowMaker.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/WPrefs.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/WindowMaker.mo
+man/cs/man1/geticonset.1x.gz
+man/cs/man1/getstyle.1x.gz
+man/cs/man1/seticons.1x.gz
+man/cs/man1/setstyle.1x.gz
+man/cs/man1/wdwrite.1x.gz
+man/cs/man1/wmaker.1x.gz
+man/cs/man1/wmsetbg.1x.gz
+man/cs/man1/wxcopy.1x.gz
+man/cs/man1/wxpaste.1x.gz
+man/man1/WPrefs.1x.gz
+man/man1/WindowMaker.1x.gz
+man/man1/get-wings-flags.1.gz
+man/man1/get-wutil-flags.1.gz
+man/man1/geticonset.1x.gz
+man/man1/getstyle.1x.gz
+man/man1/seticons.1x.gz
+man/man1/setstyle.1x.gz
+man/man1/wdread.1.gz
+man/man1/wdwrite.1x.gz
+man/man1/wmagnify.1x.gz
+man/man1/wmaker.1x.gz
+man/man1/wmgenmenu.1.gz
+man/man1/wmmenugen.1.gz
+man/man1/wmsetbg.1x.gz
+man/man1/wxcopy.1x.gz
+man/man1/wxpaste.1x.gz
+man/man8/upgrade-windowmaker-defaults.8.gz
+man/ru/man1/geticonset.1x.gz
+man/ru/man1/getstyle.1x.gz
+man/ru/man1/seticons.1x.gz
+man/ru/man1/setstyle.1x.gz
+man/ru/man1/wdwrite.1x.gz
+man/ru/man1/wmaker.1x.gz
+man/ru/man1/wmsetbg.1x.gz
+man/ru/man1/wxcopy.1x.gz
+man/ru/man1/wxpaste.1x.gz
+man/sk/man1/geticonset.1x.gz
+man/sk/man1/getstyle.1x.gz
+man/sk/man1/seticons.1x.gz
+man/sk/man1/setstyle.1x.gz
+man/sk/man1/wdwrite.1x.gz
+man/sk/man1/wmaker.1x.gz
+man/sk/man1/wmsetbg.1x.gz
+man/sk/man1/wxcopy.1x.gz
+man/sk/man1/wxpaste.1x.gz
 @dirrmtry share/locale/hy/LC_MESSAGES
 @dirrmtry share/locale/hy
 @dirrm share/WindowMaker/Styles
 @dirrm share/WindowMaker/Sounds
 @dirrm share/WindowMaker/IconSets
 @dirrm share/WindowMaker/Backgrounds
+@dirrm share/WindowMaker/Themes
+@dirrm share/WindowMaker/Pixmaps
+@dirrm share/WindowMaker/Icons
+@dirrm share/WindowMaker
 @dirrm share/WINGs
 @dirrmtry man/sk/man1
 @dirrmtry man/sk