Mon Oct 10 13:22:22 2016 UTC ()
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.


(tsutsui)
diff -r1.29 -r1.30 pkgsrc/wm/jwm/Makefile
diff -r1.5 -r1.6 pkgsrc/wm/jwm/options.mk
cvs diff -r1.29 -r1.30 pkgsrc/wm/jwm/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/jwm/Makefile 2016/08/21 11:18:37 1.29
+++ pkgsrc/wm/jwm/Makefile 2016/10/10 13:22:22 1.30
@@ -1,48 +1,50 @@ @@ -1,48 +1,50 @@
1# $NetBSD: Makefile,v 1.29 2016/08/21 11:18:37 ryoon Exp $ 1# $NetBSD: Makefile,v 1.30 2016/10/10 13:22:22 tsutsui Exp $
2# 2#
3 3
4DISTNAME= jwm-2.3.6 4DISTNAME= jwm-2.3.6
 5PKGREVISION= 1
5CATEGORIES= wm x11 6CATEGORIES= wm x11
6MASTER_SITES= http://www.joewing.net/programs/jwm/releases/ 7MASTER_SITES= http://www.joewing.net/programs/jwm/releases/
7EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
8 9
9MAINTAINER= tsutsui@NetBSD.org 10MAINTAINER= tsutsui@NetBSD.org
10HOMEPAGE= http://www.joewing.net/programs/jwm/ 11HOMEPAGE= http://www.joewing.net/programs/jwm/
11COMMENT= Lightweight window manager with virtual desktops 12COMMENT= Lightweight window manager with virtual desktops
12LICENSE= gnu-gpl-v2 13LICENSE= mit
13 14
14USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
15 16
16GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
17 18
18.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
19 20
20.if ${X11_TYPE} != "native" || exists(${X11BASE}/include/X11/extensions/Xinerama.h) 21.if ${X11_TYPE} != "native" || exists(${X11BASE}/include/X11/extensions/Xinerama.h)
21CONFIGURE_ARGS+= --enable-xinerama 22CONFIGURE_ARGS+= --enable-xinerama
22# XXX maybe set some build variable about that 23# XXX maybe set some build variable about that
23.endif 24.endif
24 25
25CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 26CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
26 27
27SUBST_CLASSES+= egdir 28SUBST_CLASSES+= egdir
28SUBST_STAGE.egdir= pre-configure 29SUBST_STAGE.egdir= pre-configure
29SUBST_FILES.egdir= Makefile.in 30SUBST_FILES.egdir= Makefile.in
30SUBST_SED.egdir= -e 's,@@EGDIR@@,${EGDIR},g' 31SUBST_SED.egdir= -e 's,@@EGDIR@@,${EGDIR},g'
31 32
32SUBST_CLASSES+= icondir 33SUBST_CLASSES+= icondir
33SUBST_STAGE.icondir= post-patch 34SUBST_STAGE.icondir= pre-configure
34SUBST_FILES.icondir= example.jwmrc 35SUBST_FILES.icondir= example.jwmrc
35SUBST_SED.icondir= -e 's|/usr/share/icons|${PREFIX}/share/icons|g' 36SUBST_SED.icondir= -e 's|/usr/share/icons|${PREFIX}/share/icons|g'
 37SUBST_SED.icondir+= -e 's|/usr/local/share|${PREFIX}/share|g'
36 38
37PKG_SYSCONFSUBDIR= jwm 39PKG_SYSCONFSUBDIR= jwm
38EGDIR= ${PREFIX}/share/examples/jwm 40EGDIR= ${PREFIX}/share/examples/jwm
39CONF_FILES= ${EGDIR}/system.jwmrc ${PKG_SYSCONFDIR}/system.jwmrc 41CONF_FILES= ${EGDIR}/system.jwmrc ${PKG_SYSCONFDIR}/system.jwmrc
40 42
41INSTALLATION_DIRS= bin 43INSTALLATION_DIRS= bin
42 44
43.include "options.mk" 45.include "options.mk"
44 46
45BUILDLINK_DEPMETHOD.libXt?= build 47BUILDLINK_DEPMETHOD.libXt?= build
46 48
47.include "../../devel/gettext-lib/buildlink3.mk" 49.include "../../devel/gettext-lib/buildlink3.mk"
48.include "../../x11/libXft/buildlink3.mk" 50.include "../../x11/libXft/buildlink3.mk"
cvs diff -r1.5 -r1.6 pkgsrc/wm/jwm/options.mk (expand / switch to unified diff)

--- pkgsrc/wm/jwm/options.mk 2014/01/19 15:27:16 1.5
+++ pkgsrc/wm/jwm/options.mk 2016/10/10 13:22:22 1.6
@@ -1,26 +1,36 @@ @@ -1,26 +1,36 @@
1# $NetBSD: options.mk,v 1.5 2014/01/19 15:27:16 tsutsui Exp $ 1# $NetBSD: options.mk,v 1.6 2016/10/10 13:22:22 tsutsui Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.jwm 3PKG_OPTIONS_VAR= PKG_OPTIONS.jwm
4PKG_SUPPORTED_OPTIONS= debug fribidi jpeg png 4PKG_SUPPORTED_OPTIONS= debug fribidi jpeg png svg
5PKG_SUGGESTED_OPTIONS= fribidi jpeg png 5PKG_SUGGESTED_OPTIONS= fribidi jpeg png svg
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9.if !empty(PKG_OPTIONS:Mdebug) 9.if !empty(PKG_OPTIONS:Mdebug)
10CONFIGURE_ARGS+= --enable-debug 10CONFIGURE_ARGS+= --enable-debug
11.endif 11.endif
12 12
13.if !empty(PKG_OPTIONS:Mfribidi) 13.if !empty(PKG_OPTIONS:Mfribidi)
14.include "../../converters/fribidi/buildlink3.mk" 14.include "../../converters/fribidi/buildlink3.mk"
15BUILDLINK_API_DEPENDS.fribidi+= fribidi>=0.19.2 15BUILDLINK_API_DEPENDS.fribidi+= fribidi>=0.19.2
 16.else
 17CONFIGURE_ARGS+= --disable-fribidi
16.endif 18.endif
17 19
18.if !empty(PKG_OPTIONS:Mjpeg) 20.if !empty(PKG_OPTIONS:Mjpeg)
19.include "../../mk/jpeg.buildlink3.mk" 21.include "../../mk/jpeg.buildlink3.mk"
 22.else
 23CONFIGURE_ARGS+= --disable-jpeg
20.endif 24.endif
21 25
22.if !empty(PKG_OPTIONS:Mpng) 26.if !empty(PKG_OPTIONS:Mpng)
23.include "../../graphics/png/buildlink3.mk" 27.include "../../graphics/png/buildlink3.mk"
24.else 28.else
25CONFIGURE_ARGS+= --disable-png 29CONFIGURE_ARGS+= --disable-png
26.endif 30.endif
 31
 32.if !empty(PKG_OPTIONS:Msvg)
 33.include "../../graphics/librsvg/buildlink3.mk"
 34.else
 35CONFIGURE_ARGS+= --disable-rsvg
 36.endif