[pkgsrc/trunk]: pkgsrc/wm/jwm Misc pkgsrc tweaks for the latest jwm-2.3.6:

[tsutsui <tsutsui%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f1789f67c6ca
branches:  trunk
changeset: 353710:f1789f67c6ca
user:      tsutsui <tsutsui%pkgsrc.org@localhost>
date:      Mon Oct 10 13:22:22 2016 +0000

description:
Misc pkgsrc tweaks for the latest jwm-2.3.6:

- LICENSE has been changed from GPLv2 to MIT since 2.3.6
- use proper ${PREFIX} in system.jwmrc for default icons
- add and enable svg option in options.mk for default icons
- explicitly pass --disable-foo to CONFIGURE_ARGS for disabled options

While here, avoid SUBST on post-patch for future mkpatches ops.

Bump PKGREVISION.

diffstat:

 wm/jwm/Makefile   |   8 +++++---
 wm/jwm/options.mk |  16 +++++++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diffs (74 lines):

diff -r a0967373e5db -r f1789f67c6ca wm/jwm/Makefile
--- a/wm/jwm/Makefile   Mon Oct 10 13:17:26 2016 +0000
+++ b/wm/jwm/Makefile   Mon Oct 10 13:22:22 2016 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2016/08/21 11:18:37 ryoon Exp $
+# $NetBSD: Makefile,v 1.30 2016/10/10 13:22:22 tsutsui Exp $
 #
 
 DISTNAME=              jwm-2.3.6
+PKGREVISION=           1
 CATEGORIES=            wm x11
 MASTER_SITES=          http://www.joewing.net/programs/jwm/releases/
 EXTRACT_SUFX=          .tar.xz
@@ -9,7 +10,7 @@
 MAINTAINER=            tsutsui%NetBSD.org@localhost
 HOMEPAGE=              http://www.joewing.net/programs/jwm/
 COMMENT=               Lightweight window manager with virtual desktops
-LICENSE=               gnu-gpl-v2
+LICENSE=               mit
 
 USE_TOOLS+=            pkg-config
 
@@ -30,9 +31,10 @@
 SUBST_SED.egdir=       -e 's,@@EGDIR@@,${EGDIR},g'
 
 SUBST_CLASSES+=                icondir
-SUBST_STAGE.icondir=   post-patch
+SUBST_STAGE.icondir=   pre-configure
 SUBST_FILES.icondir=   example.jwmrc
 SUBST_SED.icondir=     -e 's|/usr/share/icons|${PREFIX}/share/icons|g'
+SUBST_SED.icondir+=    -e 's|/usr/local/share|${PREFIX}/share|g'
 
 PKG_SYSCONFSUBDIR=     jwm
 EGDIR=                 ${PREFIX}/share/examples/jwm
diff -r a0967373e5db -r f1789f67c6ca wm/jwm/options.mk
--- a/wm/jwm/options.mk Mon Oct 10 13:17:26 2016 +0000
+++ b/wm/jwm/options.mk Mon Oct 10 13:22:22 2016 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.5 2014/01/19 15:27:16 tsutsui Exp $
+# $NetBSD: options.mk,v 1.6 2016/10/10 13:22:22 tsutsui Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.jwm
-PKG_SUPPORTED_OPTIONS= debug fribidi jpeg png
-PKG_SUGGESTED_OPTIONS= fribidi jpeg png
+PKG_SUPPORTED_OPTIONS= debug fribidi jpeg png svg
+PKG_SUGGESTED_OPTIONS= fribidi jpeg png svg
 
 .include "../../mk/bsd.options.mk"
 
@@ -13,10 +13,14 @@
 .if !empty(PKG_OPTIONS:Mfribidi)
 .include "../../converters/fribidi/buildlink3.mk"
 BUILDLINK_API_DEPENDS.fribidi+=   fribidi>=0.19.2
+.else
+CONFIGURE_ARGS+=       --disable-fribidi
 .endif
 
 .if !empty(PKG_OPTIONS:Mjpeg)
 .include "../../mk/jpeg.buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-jpeg
 .endif
 
 .if !empty(PKG_OPTIONS:Mpng)
@@ -24,3 +28,9 @@
 .else
 CONFIGURE_ARGS+=       --disable-png
 .endif
+
+.if !empty(PKG_OPTIONS:Msvg)
+.include "../../graphics/librsvg/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-rsvg
+.endif