Date: Tue, 8 Oct 2013 02:51:29 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/182796: x11-wm/jwm: Update to version 2.1.0 Message-ID: <20131008025129.9c60db162a93d5bad59e4dbc@yahoo.com> Resent-Message-ID: <201310071810.r97IA0o7057628@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 182796 >Category: ports >Synopsis: x11-wm/jwm: Update to version 2.1.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Oct 07 18:10:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 8.4-RELEASE-p3 i386 >Organization: >Environment: >Description: - Update to version 2.1.0 >How-To-Repeat: >Fix: diff -urN /usr/ports/x11-wm/jwm/Makefile x11-wm/jwm/Makefile --- /usr/ports/x11-wm/jwm/Makefile 2013-09-22 01:11:29.000000000 +0900 +++ x11-wm/jwm/Makefile 2013-10-08 00:00:00.000000000 +0900 @@ -2,45 +2,98 @@ # $FreeBSD: head/x11-wm/jwm/Makefile 327786 2013-09-21 00:01:16Z bapt $ PORTNAME= jwm -PORTVERSION= 2.0.1 -PORTREVISION= 4 +PORTVERSION= 2.1.0 CATEGORIES= x11-wm -MASTER_SITES= SF http://joewing.net/programs/jwm/releases/ +MASTER_SITES= SF \ + http://joewing.net/programs/jwm/releases/ MAINTAINER= ports@FreeBSD.org COMMENT= Joe's Window Manager LICENSE= GPLv2 -LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png +OPTIONS_DEFINE= FRIBIDI XEXT XFT XINERAMA XMU XPM XRENDER JPEG PNG DEBUG +OPTIONS_DEFAULT=FRIBIDI XEXT XFT XINERAMA XMU XPM XRENDER JPEG PNG +FRIBIDI_DESC= Unicode Bidirectional Algorithm support +XEXT_DESC= X11 Shape Extension support +XMU_DESC= X11 Miscellaneous Utilities support +XRENDER_DESC= X11 Render Extension support +USE_BZIP2= yes USES= pkgconfig -USE_XORG= xpm +USE_XORG= x11 GNU_CONFIGURE= yes -USE_BZIP2= yes -CFLAGS+= -I${LOCALBASE}/include + CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= jwm.1 - -OPTIONS_DEFINE= FRIBIDI XFT XINERAMA JPEG DEBUG -OPTIONS_DEFAULT= FRIBIDI XFT XINERAMA JPEG -DEBUG_DESC= Enable debugging +.include <bsd.port.options.mk> -FRIBIDI_BUILD_DEPENDS= fribidi:${PORTSDIR}/converters/fribidi -JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg -DEBUG_CONFIGURE_ON= --enable-debug +.if ${PORT_OPTIONS:MFRIBIDI} +LIB_DEPENDS+= fribidi:${PORTSDIR}/converters/fribidi +.else +CONFIGURE_ARGS+= --disable-fribidi +.endif -NO_STAGE= yes -.include <bsd.port.options.mk> +.if ${PORT_OPTIONS:MXEXT} +USE_XORG+= xext +.else +CONFIGURE_ARGS+= --disable-shape +.endif .if ${PORT_OPTIONS:MXFT} +.if empty(PORT_OPTIONS:MXRENDER) +IGNORE= XFT support requires XRENDER +.endif USE_XORG+= xft +.else +CONFIGURE_ARGS+= --disable-xft .endif .if ${PORT_OPTIONS:MXINERAMA} USE_XORG+= xinerama +.else +CONFIGURE_ARGS+= --disable-xinerama +.endif + +.if ${PORT_OPTIONS:MXMU} +.if empty(PORT_OPTIONS:MXEXT) +IGNORE= XMU support requires XEXT +.endif +USE_XORG+= xmu +.else +CONFIGURE_ARGS+= --disable-xmu +.endif + +.if ${PORT_OPTIONS:MXPM} +.if empty(PORT_OPTIONS:MXEXT) +IGNORE= XPM support requires XEXT +.endif +USE_XORG+= xpm +.else +CONFIGURE_ARGS+= --disable-xpm +.endif + +.if ${PORT_OPTIONS:MXRENDER} +USE_XORG+= xrender +.else +CONFIGURE_ARGS+= --disable-xrender +.endif + +.if ${PORT_OPTIONS:MJPEG} +LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg +.else +CONFIGURE_ARGS+= --disable-jpeg +.endif + +.if ${PORT_OPTIONS:MPNG} +LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png +.else +CONFIGURE_ARGS+= --disable-png +.endif + +.if ${PORT_OPTIONS:MDEBUG} +CONFIGURE_ARGS+= --enable-debug .endif post-patch: @@ -49,11 +102,11 @@ @${REINPLACE_CMD} -e 's|fribidi_char_sets_utf8.h|fribidi-char-sets.h|' ${WRKSRC}/src/jwm.h do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/jwm ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/example.jwmrc ${PREFIX}/etc/system.jwmrc.sample - if ! [ -f ${PREFIX}/etc/system.jwmrc ]; then \ - ${INSTALL_DATA} ${WRKSRC}/example.jwmrc ${PREFIX}/etc/system.jwmrc; \ - fi - ${INSTALL_MAN} ${WRKSRC}/jwm.1 ${MANPREFIX}/man/man1 + (cd ${WRKSRC}/src && ${INSTALL_PROGRAM} jwm \ + ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC} && ${INSTALL_MAN} jwm.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1) + (cd ${WRKSRC} && ${INSTALL_DATA} example.jwmrc \ + ${STAGEDIR}${PREFIX}/etc/system.jwmrc.sample) .include <bsd.port.mk> diff -urN /usr/ports/x11-wm/jwm/distinfo x11-wm/jwm/distinfo --- /usr/ports/x11-wm/jwm/distinfo 2013-06-21 03:47:52.000000000 +0900 +++ x11-wm/jwm/distinfo 2013-10-08 00:00:00.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (jwm-2.0.1.tar.bz2) = dcd6a6bd519578dfc2f3cfde269cea1f9090c87ebf2940bff26cbcca00f0a5c7 -SIZE (jwm-2.0.1.tar.bz2) = 248607 +SHA256 (jwm-2.1.0.tar.bz2) = 5c99f9023dc8c2597effdaacc240ff4c2e07e77c8244f3bf1de5cc483bcf08ab +SIZE (jwm-2.1.0.tar.bz2) = 163590 diff -urN /usr/ports/x11-wm/jwm/files/patch-example.jwmrc x11-wm/jwm/files/patch-example.jwmrc --- /usr/ports/x11-wm/jwm/files/patch-example.jwmrc 2013-06-21 03:47:52.000000000 +0900 +++ x11-wm/jwm/files/patch-example.jwmrc 2013-10-08 00:00:00.000000000 +0900 @@ -6,17 +6,19 @@ @@ -5,7 +5,8 @@ <!-- The root menu, if this is undefined you will not get a menu. --> <!-- Additional RootMenu attributes: onroot, labeled, label --> - <RootMenu height="32" onroot="123"> -- <Program icon="rxvt.png" label="Terminal">rxvt</Program> + <RootMenu height="32" onroot="12"> +- <Program icon="terminal.png" label="Terminal">xterm</Program> + <Program icon="rxvt.png" label="rxvt">rxvt</Program> + <Program icon="xterm.png" label="xterm">xterm</Program> <Menu icon="folder.png" label="Applications"> - <Program icon="audacious.png" label="Audacious">audacious</Program> -@@ -136,6 +137,9 @@ + <Program icon="editor.png" label="Dia">dia</Program> +@@ -150,7 +151,10 @@ + </PopupStyle> <IconPath> - $HOME/.icons +- /usr/share/icons/wm-icons/32x32-gant ++ $HOME/.icons + %%PREFIX%%/share/icons + %%PREFIX%%/share/pixmaps + %%PREFIX%%/lib/X11/icons diff -urN /usr/ports/x11-wm/jwm/pkg-plist x11-wm/jwm/pkg-plist --- /usr/ports/x11-wm/jwm/pkg-plist 2013-06-21 03:47:52.000000000 +0900 +++ x11-wm/jwm/pkg-plist 2013-10-08 00:00:00.000000000 +0900 @@ -1,4 +1,5 @@ bin/jwm +man/man1/jwm.1.gz @unexec if cmp -s %D/etc/system.jwmrc %D/etc/system.jwmrc.sample; then rm -f %D/etc/system.jwmrc; fi etc/system.jwmrc.sample @exec if [ ! -f %D/etc/system.jwmrc ]; then cp -p %D/etc/system.jwmrc.sample %D/etc/system.jwmrc; fi >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131008025129.9c60db162a93d5bad59e4dbc>