diff --git a/x11-wm/jwm/Makefile b/x11-wm/jwm/Makefile index 95a595e7fd92..10a800637496 100644 --- a/x11-wm/jwm/Makefile +++ b/x11-wm/jwm/Makefile @@ -1,76 +1,81 @@ # Created by: Babak Farrokhi PORTNAME= jwm -PORTVERSION= 2.3.7 +PORTVERSION= 2.4.2 PORTREVISION= 1 CATEGORIES= x11-wm -MASTER_SITES= http://joewing.net/projects/jwm/releases/ +MASTER_SITES= https://github.com/joewing/jwm/releases/download/v${PORTVERSION}/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= john.grafton@gmail.com COMMENT= Joe's Window Manager LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= iconv localbase pkgconfig tar:xz xorg USE_XORG= x11 GNU_CONFIGURE= yes OPTIONS_DEFINE= CAIRO DEBUG FRIBIDI JPEG NLS PNG SVG XEXT XFT \ XINERAMA XMU XPM XRENDER OPTIONS_DEFAULT= FRIBIDI JPEG PNG XEXT XFT XINERAMA XMU XPM XRENDER OPTIONS_SUB= yes CAIRO_USES= gnome CAIRO_USE= GNOME=cairo CAIRO_CONFIGURE_ENABLE= cairo DEBUG_CONFIGURE_ENABLE= debug FRIBIDI_DESC= Unicode Bidirectional Algorithm support FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi FRIBIDI_CONFIGURE_ENABLE=fribidi JPEG_USES= jpeg JPEG_CONFIGURE_ENABLE= jpeg +LIB_DEPENDS+=libfontconfig.so:x11-fonts/fontconfig +LIB_DEPENDS+=libharfbuzz.so:print/harfbuzz +LIB_DEPENDS+=libglib-2.0.so.0:devel/glib20 +LIB_DEPENDS+=libgobject-2.0.so.0:devel/glib20 +LIB_DEPENDS+=libpango-1.0.so.0:x11-toolkits/pango NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CONFIGURE_ENABLE= png SVG_USE= GNOME=librsvg2 SVG_CONFIGURE_ENABLE= rsvg XEXT_DESC= X11 Shape Extension support XEXT_USE= XORG=xext XEXT_CONFIGURE_ENABLE= shape XFT_USE= XORG=xft XFT_CONFIGURE_ENABLE= xft XFT_IMPLIES= XRENDER XFT_LIB_DEPENDS= libfreetype.so:print/freetype2 XINERAMA_USE= XORG=xinerama XINERAMA_CONFIGURE_ENABLE=xinerama XINERAMA_IMPLIES= XEXT XMU_DESC= X11 Miscellaneous Utilities support XMU_USE= XORG=xmu XMU_CONFIGURE_ENABLE= xmu XMU_IMPLIES= XEXT XPM_USE= XORG=xpm XPM_CONFIGURE_ENABLE= xpm XPM_IMPLIES= XEXT XRENDER_DESC= X11 Render Extension support XRENDER_USE= XORG=xrender XRENDER_CONFIGURE_ENABLE=xrender .include .if !empty(ICONV_LIB) CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv=yes .endif post-patch: @${REINPLACE_CMD} -e \ 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/example.jwmrc @${REINPLACE_CMD} -e \ 's|install -m 644|@INSTALL_DATA@| ; \ s|jwmrc$$|jwmrc.sample|' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ '/EXE/s|install|@INSTALL_PROGRAM@| ; \ /strip/s|^|#|' ${WRKSRC}/src/Makefile.in .include diff --git a/x11-wm/jwm/distinfo b/x11-wm/jwm/distinfo index 31cbb9294bc1..a513ab5e7689 100644 --- a/x11-wm/jwm/distinfo +++ b/x11-wm/jwm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1502711665 -SHA256 (jwm-2.3.7.tar.xz) = 745d2f5df3a4ce9ecc8e75445edb3fbe31dd46c0c26d129cc14de7ad8b665326 -SIZE (jwm-2.3.7.tar.xz) = 350332 +TIMESTAMP = 1656520075 +SHA256 (jwm-2.4.2.tar.xz) = 4e07a21774e9defcdddb3ffaa3e18dfe113dfe168fe0428c5e0da987c95e26e5 +SIZE (jwm-2.4.2.tar.xz) = 316000 diff --git a/x11-wm/jwm/files/patch-example.jwmrc b/x11-wm/jwm/files/patch-example.jwmrc index 68f47f15e63b..5112b81be796 100644 --- a/x11-wm/jwm/files/patch-example.jwmrc +++ b/x11-wm/jwm/files/patch-example.jwmrc @@ -1,24 +1,24 @@ --- example.jwmrc.orig 2015-09-13 18:02:54 UTC +++ example.jwmrc @@ -3,7 +3,8 @@ - + -- xterm +- xterm + rxvt + xterm - - audacious - xcalc -@@ -111,7 +112,10 @@ - for icons in multiple paths. - --> + + audacious + xcalc +@@ -139,6 +140,13 @@ -- /usr/share/icons/wm-icons/32x32-aquafusion -+ $HOME/.icons -+ %%PREFIX%%/share/icons -+ %%PREFIX%%/share/pixmaps -+ %%PREFIX%%/lib/X11/icons + /usr/local/share/jwm - - ++ ++ $HOME/.icons ++ %%PREFIX%%/share/icons ++ %%PREFIX%%/share/pixmaps ++ %%PREFIX%%/lib/X11/icons ++ ++ +