CVS commit: pkgsrc/wm/jwm

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Mon Oct 10 13:22:22 UTC 2016

Modified Files:
        pkgsrc/wm/jwm: Makefile options.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/wm/jwm/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/wm/jwm/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/wm/jwm/Makefile
diff -u pkgsrc/wm/jwm/Makefile:1.29 pkgsrc/wm/jwm/Makefile:1.30
--- pkgsrc/wm/jwm/Makefile:1.29 Sun Aug 21 11:18:37 2016
+++ pkgsrc/wm/jwm/Makefile      Mon Oct 10 13:22:22 2016
@@ -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 @@ EXTRACT_SUFX=          .tar.xz
 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_FILES.egdir=   Makefile.in
 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

Index: pkgsrc/wm/jwm/options.mk
diff -u pkgsrc/wm/jwm/options.mk:1.5 pkgsrc/wm/jwm/options.mk:1.6
--- pkgsrc/wm/jwm/options.mk:1.5        Sun Jan 19 15:27:16 2014
+++ pkgsrc/wm/jwm/options.mk    Mon Oct 10 13:22:22 2016
@@ -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 @@ CONFIGURE_ARGS+=    --enable-debug
 .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 @@ BUILDLINK_API_DEPENDS.fribidi+=   fribid
 .else
 CONFIGURE_ARGS+=       --disable-png
 .endif
+
+.if !empty(PKG_OPTIONS:Msvg)
+.include "../../graphics/librsvg/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-rsvg
+.endif