Attachment #161249 for bug #203247




# $FreeBSD: head/x11-wm/jwm/Makefile 395930 2015-09-03 02:09:53Z vanilla $

PORTNAME=	jwm
PORTVERSION=	2.3.2
CATEGORIES=	x11-wm
MASTER_SITES=	http://joewing.net/projects/jwm/releases/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Joe's Window Manager

XEXT_CONFIGURE_ENABLE=	shape
XFT_USE=		XORG=xft
XFT_CONFIGURE_ENABLE=	xft
XFT_IMPLIES=		XRENDER
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 <bsd.port.options.mk>

.if ${PORT_OPTIONS:MXFT} && empty(PORT_OPTIONS:MXRENDER)
IGNORE=		the XFT support requires XRENDER
.endif

.if ${PORT_OPTIONS:MXMU} && empty(PORT_OPTIONS:MXEXT)
IGNORE=		the XMU support requires XEXT
.endif

.if ${PORT_OPTIONS:MXPM} && empty(PORT_OPTIONS:MXEXT)
IGNORE=		the XPM support requires XEXT
.endif

post-patch:
	@${REINPLACE_CMD} -e \
		's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/example.jwmrc

Lines 1-2 Link Here

(-)x11-wm/jwm/distinfo (-2 / +2 lines)
1	SHA256 (jwm-2.3.1.tar.xz) = 869ff5099841d8a2aba1539a82c670fe4082efc87ddb12bbd409f566cc50e953	1	SHA256 (jwm-2.3.2.tar.xz) = 92a3e66ceb847aac9fa09a24b16c93194f6c52e398f5a88f228b4986ea972c53
2	SIZE (jwm-2.3.1.tar.xz) = 305736	2	SIZE (jwm-2.3.2.tar.xz) = 325648

Lines 1-6 Link Here

(-)x11-wm/jwm/files/patch-example.jwmrc (-3 / +3 lines)
1	--- example.jwmrc.orig	1	--- example.jwmrc.orig 2015-09-13 18:02:54 UTC
2	+++ example.jwmrc	2	+++ example.jwmrc
3	@@ -4,7 +4,8 @@	3	@@ -3,7 +3,8 @@
4		4
5	<!-- The root menu. -->	5	<!-- The root menu. -->
6	<RootMenu onroot="12">	6	<RootMenu onroot="12">
Lines 10-16 Link Here
10	<Menu icon="folder.png" label="Applications">	10	<Menu icon="folder.png" label="Applications">
11	<Program icon="music.png" label="Audacious">audacious</Program>	11	<Program icon="music.png" label="Audacious">audacious</Program>
12	<Program icon="calculator.png" label="Calculator">xcalc</Program>	12	<Program icon="calculator.png" label="Calculator">xcalc</Program>
13	@@ -120,7 +121,10 @@	13	@@ -111,7 +112,10 @@
14	for icons in multiple paths.	14	for icons in multiple paths.
15	-->	15	-->
16	<IconPath>	16	<IconPath>

Lines 4-11 Link Here

(-)x11-wm/jwm/pkg-plist (-1 / +2 lines)
4	%%NLS%%share/locale/de/LC_MESSAGES/jwm.mo	4	%%NLS%%share/locale/de/LC_MESSAGES/jwm.mo
5	%%NLS%%share/locale/es/LC_MESSAGES/jwm.mo	5	%%NLS%%share/locale/es/LC_MESSAGES/jwm.mo
6	%%NLS%%share/locale/fr/LC_MESSAGES/jwm.mo	6	%%NLS%%share/locale/fr/LC_MESSAGES/jwm.mo
		7	%%NLS%%share/locale/hu/LC_MESSAGES/jwm.mo
7	%%NLS%%share/locale/it/LC_MESSAGES/jwm.mo	8	%%NLS%%share/locale/it/LC_MESSAGES/jwm.mo
8	%%NLS%%share/locale/nl/LC_MESSAGES/jwm.mo	9	%%NLS%%share/locale/nl/LC_MESSAGES/jwm.mo
9	%%NLS%%share/locale/pl/LC_MESSAGES/jwm.mo	10	%%NLS%%share/locale/pl/LC_MESSAGES/jwm.mo
10	%%NLS%%share/locale/pt-PT/LC_MESSAGES/jwm.mo	11	%%NLS%%share/locale/pt/LC_MESSAGES/jwm.mo
11	%%NLS%%share/locale/ru/LC_MESSAGES/jwm.mo	12	%%NLS%%share/locale/ru/LC_MESSAGES/jwm.mo

Return to bug 203247

Lines 2-10 Link Here

(-)x11-wm/jwm/Makefile (-16 / +6 lines)
2	# $FreeBSD: head/x11-wm/jwm/Makefile 395930 2015-09-03 02:09:53Z vanilla $	2	# $FreeBSD: head/x11-wm/jwm/Makefile 395930 2015-09-03 02:09:53Z vanilla $
3		3
4	PORTNAME= jwm	4	PORTNAME= jwm
5	PORTVERSION= 2.3.1	5	PORTVERSION= 2.3.2
6	CATEGORIES= x11-wm	6	CATEGORIES= x11-wm
7	MASTER_SITES= http://joewing.net/programs/jwm/releases/	7	MASTER_SITES= http://joewing.net/projects/jwm/releases/
8		8
9	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
10	COMMENT= Joe's Window Manager	10	COMMENT= Joe's Window Manager
Lines 42-72 Link Here
42	XEXT_CONFIGURE_ENABLE= shape	42	XEXT_CONFIGURE_ENABLE= shape
43	XFT_USE= XORG=xft	43	XFT_USE= XORG=xft
44	XFT_CONFIGURE_ENABLE= xft	44	XFT_CONFIGURE_ENABLE= xft
		45	XFT_IMPLIES= XRENDER
45	XINERAMA_USE= XORG=xinerama	46	XINERAMA_USE= XORG=xinerama
46	XINERAMA_CONFIGURE_ENABLE=xinerama	47	XINERAMA_CONFIGURE_ENABLE=xinerama
		48	XINERAMA_IMPLIES= XEXT
47	XMU_DESC= X11 Miscellaneous Utilities support	49	XMU_DESC= X11 Miscellaneous Utilities support
48	XMU_USE= XORG=xmu	50	XMU_USE= XORG=xmu
49	XMU_CONFIGURE_ENABLE= xmu	51	XMU_CONFIGURE_ENABLE= xmu
		52	XMU_IMPLIES= XEXT
50	XPM_USE= XORG=xpm	53	XPM_USE= XORG=xpm
51	XPM_CONFIGURE_ENABLE= xpm	54	XPM_CONFIGURE_ENABLE= xpm
		55	XPM_IMPLIES= XEXT
52	XRENDER_DESC= X11 Render Extension support	56	XRENDER_DESC= X11 Render Extension support
53	XRENDER_USE= XORG=xrender	57	XRENDER_USE= XORG=xrender
54	XRENDER_CONFIGURE_ENABLE=xrender	58	XRENDER_CONFIGURE_ENABLE=xrender
55		59
56	.include <bsd.port.options.mk>
57
58	.if ${PORT_OPTIONS:MXFT} && empty(PORT_OPTIONS:MXRENDER)
59	IGNORE= the XFT support requires XRENDER
60	.endif
61
62	.if ${PORT_OPTIONS:MXMU} && empty(PORT_OPTIONS:MXEXT)
63	IGNORE= the XMU support requires XEXT
64	.endif
65
66	.if ${PORT_OPTIONS:MXPM} && empty(PORT_OPTIONS:MXEXT)
67	IGNORE= the XPM support requires XEXT
68	.endif
69
70	post-patch:	60	post-patch:
71	@${REINPLACE_CMD} -e \	61	@${REINPLACE_CMD} -e \
72	's\|%%PREFIX%%\|${PREFIX}\|' ${WRKSRC}/example.jwmrc	62	's\|%%PREFIX%%\|${PREFIX}\|' ${WRKSRC}/example.jwmrc