diff --git a/wm/jwm/Makefile b/wm/jwm/Makefile index 22ffbc1ee641..5bcbd36c3db2 100644 --- a/wm/jwm/Makefile +++ b/wm/jwm/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.48 2021/04/21 11:42:51 adam Exp $ +# $NetBSD: Makefile,v 1.49 2021/11/14 18:42:27 tsutsui Exp $ -DISTNAME= jwm-2.3.7 -PKGREVISION= 12 +DISTNAME= jwm-2.4.0 CATEGORIES= wm x11 -MASTER_SITES= http://www.joewing.net/programs/jwm/releases/ +MASTER_SITES= http://joewing.net/projects/jwm/releases/ EXTRACT_SUFX= .tar.xz MAINTAINER= tsutsui@NetBSD.org @@ -11,7 +10,7 @@ HOMEPAGE= https://joewing.net/projects/jwm/ COMMENT= Lightweight window manager with virtual desktops LICENSE= mit -USE_TOOLS+= pkg-config +USE_TOOLS+= automake pkg-config GNU_CONFIGURE= yes @@ -45,7 +44,9 @@ INSTALLATION_DIRS= bin BUILDLINK_DEPMETHOD.libXt?= build +.include "../../devel/pango/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/libXinerama/buildlink3.mk" diff --git a/wm/jwm/PLIST b/wm/jwm/PLIST index f7447b42e2ee..8be252115dc1 100644 --- a/wm/jwm/PLIST +++ b/wm/jwm/PLIST @@ -1,10 +1,11 @@ -@comment $NetBSD: PLIST,v 1.5 2017/10/21 18:07:33 tsutsui Exp $ +@comment $NetBSD: PLIST,v 1.6 2021/11/14 18:42:27 tsutsui Exp $ bin/jwm man/man1/jwm.1 share/examples/jwm/system.jwmrc share/jwm/jwm-blue.svg share/jwm/jwm-gray.svg share/jwm/jwm-orange.svg +share/jwm/jwm-red.svg share/jwm/jwm.xbm share/locale/da/LC_MESSAGES/jwm.mo share/locale/de/LC_MESSAGES/jwm.mo @@ -12,10 +13,12 @@ share/locale/es/LC_MESSAGES/jwm.mo share/locale/fr/LC_MESSAGES/jwm.mo share/locale/hu/LC_MESSAGES/jwm.mo share/locale/it/LC_MESSAGES/jwm.mo +share/locale/lt/LC_MESSAGES/jwm.mo share/locale/nl/LC_MESSAGES/jwm.mo share/locale/pl/LC_MESSAGES/jwm.mo share/locale/pt/LC_MESSAGES/jwm.mo share/locale/pt_BR/LC_MESSAGES/jwm.mo share/locale/ru/LC_MESSAGES/jwm.mo +share/locale/tr/LC_MESSAGES/jwm.mo share/locale/zh_CN/LC_MESSAGES/jwm.mo share/locale/zh_TW/LC_MESSAGES/jwm.mo diff --git a/wm/jwm/distinfo b/wm/jwm/distinfo index d4d29693b340..d9930aafcc48 100644 --- a/wm/jwm/distinfo +++ b/wm/jwm/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.14 2021/10/26 11:25:14 nia Exp $ +$NetBSD: distinfo,v 1.15 2021/11/14 18:42:27 tsutsui Exp $ -BLAKE2s (jwm-2.3.7.tar.xz) = ba8f893e582189983c5db910dd1eb4b43e338b717565d4aa2021535852df1502 -SHA512 (jwm-2.3.7.tar.xz) = dab0241518e52aa2e3e1ef3f67b6965ceb683bdb0224de7d3a653d76440606d70e86e35047eda40ea53a80aa227408be77739ad7c53d51f53026e3d113ab7efc -Size (jwm-2.3.7.tar.xz) = 350332 bytes +BLAKE2s (jwm-2.4.0.tar.xz) = bb9291dae4356bd4f7fb330189129a951d7dbec2b2929fefdc7b250c91c9f695 +SHA512 (jwm-2.4.0.tar.xz) = 3e91aed42eaabb6df508c2b71c78bbc3e7391ea843fba42f565a4d163df55147ddacbb8567d6e21d49a71d7d79d9b58bcd9979b2dee83ba3c1e65a789e5cec41 +Size (jwm-2.4.0.tar.xz) = 296128 bytes SHA1 (patch-Makefile.in) = 0ae071bfa59770c3b07f8ab6ce138e6d92318e1f +SHA1 (patch-po_Makefile.in.in) = d2f300b2e8e0889d301fc77db68fd08d760efdd1 SHA1 (patch-src_Makefile.in) = db9b310a04e0542fbbacaba7633bfd0a286d778c diff --git a/wm/jwm/options.mk b/wm/jwm/options.mk index f0e093df927e..e228b14f53d9 100644 --- a/wm/jwm/options.mk +++ b/wm/jwm/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.6 2016/10/10 13:22:22 tsutsui Exp $ +# $NetBSD: options.mk,v 1.7 2021/11/14 18:42:27 tsutsui Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.jwm -PKG_SUPPORTED_OPTIONS= debug fribidi jpeg png svg -PKG_SUGGESTED_OPTIONS= fribidi jpeg png svg +PKG_SUPPORTED_OPTIONS= debug cairo jpeg png svg +PKG_SUGGESTED_OPTIONS= cairo jpeg png svg .include "../../mk/bsd.options.mk" @@ -10,11 +10,10 @@ PKG_SUGGESTED_OPTIONS= fribidi jpeg png svg CONFIGURE_ARGS+= --enable-debug .endif -.if !empty(PKG_OPTIONS:Mfribidi) -.include "../../converters/fribidi/buildlink3.mk" -BUILDLINK_API_DEPENDS.fribidi+= fribidi>=0.19.2 +.if !empty(PKG_OPTIONS:Mcairo) +.include "../../graphics/cairo/buildlink3.mk" .else -CONFIGURE_ARGS+= --disable-fribidi +CONFIGURE_ARGS+= --disable-cairo .endif .if !empty(PKG_OPTIONS:Mjpeg) diff --git a/wm/jwm/patches/patch-po_Makefile.in.in b/wm/jwm/patches/patch-po_Makefile.in.in new file mode 100644 index 000000000000..6ddb05f90a10 --- /dev/null +++ b/wm/jwm/patches/patch-po_Makefile.in.in @@ -0,0 +1,60 @@ +$NetBSD: patch-po_Makefile.in.in,v 1.1 2021/11/14 18:42:27 tsutsui Exp $ + +- @mkdir_p@ seems no longer supported by newer automake + +--- po/Makefile.in.in.orig 2021-10-05 23:35:20.000000000 +0000 ++++ po/Makefile.in.in +@@ -32,17 +32,9 @@ gettextsrcdir = $(datadir)/gettext/po + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + +-# We use $(mkdir_p). +-# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as +-# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, +-# @install_sh@ does not start with $(SHELL), so we add it. +-# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined +-# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake +-# versions, $(mkinstalldirs) and $(install_sh) are unused. + mkinstalldirs = $(SHELL) @install_sh@ -d + install_sh = $(SHELL) @install_sh@ + MKDIR_P = @MKDIR_P@ +-mkdir_p = @mkdir_p@ + + # When building gettext-tools, we prefer to use the built programs + # rather than installed programs. However, we can't do that when we +@@ -266,7 +258,7 @@ install: install-exec install-data + install-exec: + install-data: install-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext-tools"; then \ +- $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ ++ $(MKDIR_P) $(DESTDIR)$(gettextsrcdir); \ + for file in $(DISTFILES.common) Makevars.template; do \ + $(INSTALL_DATA) $(srcdir)/$$file \ + $(DESTDIR)$(gettextsrcdir)/$$file; \ +@@ -284,7 +276,7 @@ install-data-yes: all + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ +- $(mkdir_p) $(DESTDIR)$$dir; \ ++ $(MKDIR_P) $(DESTDIR)$$dir; \ + if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ + $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ + echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ +@@ -324,7 +316,7 @@ installdirs: installdirs-exec installdir + installdirs-exec: + installdirs-data: installdirs-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext-tools"; then \ +- $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ ++ $(MKDIR_P) $(DESTDIR)$(gettextsrcdir); \ + else \ + : ; \ + fi +@@ -335,7 +327,7 @@ installdirs-data-yes: + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ +- $(mkdir_p) $(DESTDIR)$$dir; \ ++ $(MKDIR_P) $(DESTDIR)$$dir; \ + for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ + if test -n "$$lc"; then \ + if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \