diff options
| author | tsutsui <tsutsui> | 2016-10-10 13:22:22 +0000 |
|---|---|---|
| committer | tsutsui <tsutsui> | 2016-10-10 13:22:22 +0000 |
| commit | 2fee1ef86eeb6d48850b831b0e72138f0a005807 (patch) | |
| tree | bc4ffe4c2e7e5d4270c8fe49370a0777c8f6ff7e /wm | |
| parent | 690519c0edc8516c079a6d978a07900512946cd9 (diff) | |
| download | pkgsrc-2fee1ef86eeb6d48850b831b0e72138f0a005807.tar.gz | |
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 (limited to 'wm')
| -rw-r--r-- | wm/jwm/Makefile | 8 | ||||
| -rw-r--r-- | wm/jwm/options.mk | 16 |
2 files changed, 18 insertions, 6 deletions
diff --git a/wm/jwm/Makefile b/wm/jwm/Makefile index 5636ebbf2c8..6d376ca6202 100644 --- a/wm/jwm/Makefile +++ b/wm/jwm/Makefile @@ -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 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 diff --git a/wm/jwm/options.mk b/wm/jwm/options.mk index 9456bec2358..f0e093df927 100644 --- a/wm/jwm/options.mk +++ b/wm/jwm/options.mk @@ -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+= fribidi>=0.19.2 .else CONFIGURE_ARGS+= --disable-png .endif + +.if !empty(PKG_OPTIONS:Msvg) +.include "../../graphics/librsvg/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-rsvg +.endif |