Attachment #140641 for bug #187295

View | Details | Raw Unified | Return to bug 187295
Collapse All | Expand All




# $FreeBSD: head/x11-wm/jwm/Makefile 340722 2014-01-22 17:00:46Z mat $

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

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

LICENSE=	GPLv2

USE_XZ=		yes
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=	x11
GNU_CONFIGURE=	yes

CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

OPTIONS_DEFINE=		CAIRO DEBUG FRIBIDI JPEG NLS PNG SVG XEXT XFT \
			XINERAMA XMU XPM XRENDER
OPTIONS_DEFAULT=	JPEG NLS PNG FRIBIDI XEXT XFT XINERAMA XMU XPM XRENDER
OPTIONS_SUB=		yes

CAIRO_USE=		GNOME=cairo
CAIRO_CONFIGURE_ENABLE=	cairo
DEBUG_CONFIGURE_ENABLE=	debug
FRIBIDI_DESC=		Unicode Bidirectional Algorithm support
FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
FRIBIDI_CONFIGURE_ENABLE=fribidi
JPEG_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
JPEG_CONFIGURE_ENABLE=	jpeg
NLS_USES=		gettext
NLS_CONFIGURE_ENABLE=	nls
PNG_LIB_DEPENDS=	libpng15.so:${PORTSDIR}/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
XINERAMA_USE=		XORG=xinerama
XINERAMA_CONFIGURE_ENABLE=xinerama
XMU_DESC=		X11 Miscellaneous Utilities support
XMU_USE=		XORG=xmu
XMU_CONFIGURE_ENABLE=	xmu
XPM_USE=		XORG=xpm
XPM_CONFIGURE_ENABLE=	xpm
XRENDER_DESC=		X11 Render Extension support
XRENDER_USE=		XORG=xrender
XRENDER_CONFIGURE_ENABLE=xrender

.include <bsd.port.options.mk>
.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:MXFT} && empty(PORT_OPTIONS:MXRENDER)
IGNORE=		XFT support requires XRENDER
.else
CONFIGURE_ARGS+=        --disable-jpeg
.endif

.if ${PORT_OPTIONS:MXMU} && empty(PORT_OPTIONS:MXEXT)
IGNORE=		XMU support requires XEXT
.else
CONFIGURE_ARGS+=        --disable-png
.endif

.if ${PORT_OPTIONS:MXPM} && empty(PORT_OPTIONS:MXEXT)
IGNORE=		XPM support requires XEXT
.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
		${STAGEDIR}${MANPREFIX}/man/man1)
	(cd ${WRKSRC} && ${INSTALL_DATA} example.jwmrc \
		${STAGEDIR}${PREFIX}/etc/system.jwmrc.sample)

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)x11-wm/jwm/distinfo (-2 / +2 lines)
1	SHA256 (jwm-2.1.0.tar.bz2) = 5c99f9023dc8c2597effdaacc240ff4c2e07e77c8244f3bf1de5cc483bcf08ab	1	SHA256 (jwm-2.2.1.tar.xz) = 27e1cd786494d3ac32806220ff141dd6bdfa4ced63a57859999d7ec8b5fb8a0b
2	SIZE (jwm-2.1.0.tar.bz2) = 163590	2	SIZE (jwm-2.2.1.tar.xz) = 282896





--- example.jwmrc.orig
+++ example.jwmrc
@@ -4,7 +4,8 @@
    <!-- The root menu, if this is undefined you will not get a menu. -->
    <!-- Additional RootMenu attributes: onroot, labeled, label -->
    <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>
 
     <!-- The root menu. -->
     <RootMenu onroot="12">
-        <Program icon="terminal.png" label="Terminal">xterm</Program>
+        <Program icon="rxvt.png" label="Terminal">rxvt</Program>
+        <Program icon="xterm.png" label="Terminal">xterm</Program>
         <Menu icon="folder.png" label="Applications">
             <Program icon="music.png" label="Audacious">audacious</Program>
             <Program icon="calculator.png" label="Calculator">xcalc</Program>
@@ -120,7 +121,10 @@
          for icons in multiple paths.
       -->
     <IconPath>
-        /usr/share/icons/wm-icons/32x32-gant
+        $HOME/.icons
+        %%PREFIX%%/share/icons
+        %%PREFIX%%/share/pixmaps
+        %%PREFIX%%/lib/X11/icons
     </IconPath>
 
     <!-- Virtual Desktops -->
-      /usr/share/icons/wm-icons/32x32-gant
+      $HOME/.icons
+      %%PREFIX%%/share/icons
+      %%PREFIX%%/share/pixmaps
+      %%PREFIX%%/lib/X11/icons
    </IconPath>
 
    <!-- Virtual Desktops -->




@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
%%NLS%%share/locale/de/LC_MESSAGES/jwm.mo
%%NLS%%share/locale/es/LC_MESSAGES/jwm.mo
%%NLS%%share/locale/fr/LC_MESSAGES/jwm.mo
%%NLS%%share/locale/it/LC_MESSAGES/jwm.mo
%%NLS%%share/locale/nl/LC_MESSAGES/jwm.mo
%%NLS%%share/locale/pl/LC_MESSAGES/jwm.mo
%%NLS%%share/locale/pt-PT/LC_MESSAGES/jwm.mo
%%NLS%%share/locale/ru/LC_MESSAGES/jwm.mo
%%NLS%%@dirrmtry share/locale/pt-PT/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/pt-PT

Return to bug 187295

Lines 2-25 Link Here

(-)x11-wm/jwm/Makefile (-83 / +52 lines)
2	# $FreeBSD: head/x11-wm/jwm/Makefile 340722 2014-01-22 17:00:46Z mat $	2	# $FreeBSD: head/x11-wm/jwm/Makefile 340722 2014-01-22 17:00:46Z mat $
3		3
4	PORTNAME= jwm	4	PORTNAME= jwm
5	PORTVERSION= 2.1.0	5	PORTVERSION= 2.2.1
6	CATEGORIES= x11-wm	6	CATEGORIES= x11-wm
7	MASTER_SITES= SF \	7	MASTER_SITES= http://joewing.net/programs/jwm/releases/
8	http://joewing.net/programs/jwm/releases/
9		8
10	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
11	COMMENT= Joe's Window Manager	10	COMMENT= Joe's Window Manager
12		11
13	LICENSE= GPLv2	12	LICENSE= GPLv2
14		13
15	OPTIONS_DEFINE= FRIBIDI XEXT XFT XINERAMA XMU XPM XRENDER JPEG PNG DEBUG	14	USE_XZ= yes
16	OPTIONS_DEFAULT=FRIBIDI XEXT XFT XINERAMA XMU XPM XRENDER JPEG PNG
17	FRIBIDI_DESC= Unicode Bidirectional Algorithm support
18	XEXT_DESC= X11 Shape Extension support
19	XMU_DESC= X11 Miscellaneous Utilities support
20	XRENDER_DESC= X11 Render Extension support
21
22	USE_BZIP2= yes
23	USES= pkgconfig	15	USES= pkgconfig
24	USE_XORG= x11	16	USE_XORG= x11
25	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
Lines 27-112 Link Here
27	CPPFLAGS+= -I${LOCALBASE}/include	19	CPPFLAGS+= -I${LOCALBASE}/include
28	LDFLAGS+= -L${LOCALBASE}/lib	20	LDFLAGS+= -L${LOCALBASE}/lib
29		21
30	.include <bsd.port.options.mk>	22	OPTIONS_DEFINE= CAIRO DEBUG FRIBIDI JPEG NLS PNG SVG XEXT XFT \
31		23	XINERAMA XMU XPM XRENDER
32	.if ${PORT_OPTIONS:MFRIBIDI}	24	OPTIONS_DEFAULT= JPEG NLS PNG FRIBIDI XEXT XFT XINERAMA XMU XPM XRENDER
33	LIB_DEPENDS+= libfribidi.so:${PORTSDIR}/converters/fribidi	25	OPTIONS_SUB= yes
34	.else	26
35	CONFIGURE_ARGS+= --disable-fribidi	27	CAIRO_USE= GNOME=cairo
36	.endif	28	CAIRO_CONFIGURE_ENABLE= cairo
37		29	DEBUG_CONFIGURE_ENABLE= debug
38	.if ${PORT_OPTIONS:MXEXT}	30	FRIBIDI_DESC= Unicode Bidirectional Algorithm support
39	USE_XORG+= xext	31	FRIBIDI_LIB_DEPENDS= libfribidi.so:${PORTSDIR}/converters/fribidi
40	.else	32	FRIBIDI_CONFIGURE_ENABLE=fribidi
41	CONFIGURE_ARGS+= --disable-shape	33	JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg
42	.endif	34	JPEG_CONFIGURE_ENABLE= jpeg
		35	NLS_USES= gettext
		36	NLS_CONFIGURE_ENABLE= nls
		37	PNG_LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png
		38	PNG_CONFIGURE_ENABLE= png
		39	SVG_USE= GNOME=librsvg2
		40	SVG_CONFIGURE_ENABLE= rsvg
		41	XEXT_DESC= X11 Shape Extension support
		42	XEXT_USE= XORG=xext
		43	XEXT_CONFIGURE_ENABLE= shape
		44	XFT_USE= XORG=xft
		45	XFT_CONFIGURE_ENABLE= xft
		46	XINERAMA_USE= XORG=xinerama
		47	XINERAMA_CONFIGURE_ENABLE=xinerama
		48	XMU_DESC= X11 Miscellaneous Utilities support
		49	XMU_USE= XORG=xmu
		50	XMU_CONFIGURE_ENABLE= xmu
		51	XPM_USE= XORG=xpm
		52	XPM_CONFIGURE_ENABLE= xpm
		53	XRENDER_DESC= X11 Render Extension support
		54	XRENDER_USE= XORG=xrender
		55	XRENDER_CONFIGURE_ENABLE=xrender
43		56
44	.if ${PORT_OPTIONS:MXFT}	57	.include <bsd.port.options.mk>
45	.if empty(PORT_OPTIONS:MXRENDER)
46	IGNORE= XFT support requires XRENDER
47	.endif
48	USE_XORG+= xft
49	.else
50	CONFIGURE_ARGS+= --disable-xft
51	.endif
52
53	.if ${PORT_OPTIONS:MXINERAMA}
54	USE_XORG+= xinerama
55	.else
56	CONFIGURE_ARGS+= --disable-xinerama
57	.endif
58
59	.if ${PORT_OPTIONS:MXMU}
60	.if empty(PORT_OPTIONS:MXEXT)
61	IGNORE= XMU support requires XEXT
62	.endif
63	USE_XORG+= xmu
64	.else
65	CONFIGURE_ARGS+= --disable-xmu
66	.endif
67
68	.if ${PORT_OPTIONS:MXPM}
69	.if empty(PORT_OPTIONS:MXEXT)
70	IGNORE= XPM support requires XEXT
71	.endif
72	USE_XORG+= xpm
73	.else
74	CONFIGURE_ARGS+= --disable-xpm
75	.endif
76
77	.if ${PORT_OPTIONS:MXRENDER}
78	USE_XORG+= xrender
79	.else
80	CONFIGURE_ARGS+= --disable-xrender
81	.endif
82		58
83	.if ${PORT_OPTIONS:MJPEG}	59	.if ${PORT_OPTIONS:MXFT} && empty(PORT_OPTIONS:MXRENDER)
84	LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg	60	IGNORE= XFT support requires XRENDER
85	.else
86	CONFIGURE_ARGS+= --disable-jpeg
87	.endif	61	.endif
88		62
89	.if ${PORT_OPTIONS:MPNG}	63	.if ${PORT_OPTIONS:MXMU} && empty(PORT_OPTIONS:MXEXT)
90	LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png	64	IGNORE= XMU support requires XEXT
91	.else
92	CONFIGURE_ARGS+= --disable-png
93	.endif	65	.endif
94		66
95	.if ${PORT_OPTIONS:MDEBUG}	67	.if ${PORT_OPTIONS:MXPM} && empty(PORT_OPTIONS:MXEXT)
96	CONFIGURE_ARGS+= --enable-debug	68	IGNORE= XPM support requires XEXT
97	.endif	69	.endif
98		70
99	post-patch:	71	post-patch:
100	@${REINPLACE_CMD} -e 's\|-O2\|\|' ${WRKSRC}/configure	72	@${REINPLACE_CMD} -e \
101	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|' ${WRKSRC}/example.jwmrc	73	's\|%%PREFIX%%\|${PREFIX}\|' ${WRKSRC}/example.jwmrc
102	@${REINPLACE_CMD} -e 's\|fribidi_char_sets_utf8.h\|fribidi-char-sets.h\|' ${WRKSRC}/src/jwm.h	74	@${REINPLACE_CMD} -e \
103		75	's\|install -m 644\|@INSTALL_DATA@\| ; \
104	do-install:	76	s\|jwmrc$$\|jwmrc.sample\|' ${WRKSRC}/Makefile.in
105	(cd ${WRKSRC}/src && ${INSTALL_PROGRAM} jwm \	77	@${REINPLACE_CMD} -e \
106	${STAGEDIR}${PREFIX}/bin)	78	'/EXE/s\|install\|@INSTALL_PROGRAM@\| ; \
107	(cd ${WRKSRC} && ${INSTALL_MAN} jwm.1 \	79	/strip/s\|^\|#\|' ${WRKSRC}/src/Makefile.in
108	${STAGEDIR}${MANPREFIX}/man/man1)
109	(cd ${WRKSRC} && ${INSTALL_DATA} example.jwmrc \
110	${STAGEDIR}${PREFIX}/etc/system.jwmrc.sample)
111		80
112	.include <bsd.port.mk>	81	.include <bsd.port.mk>

Lines 3-27 Link Here

(-)x11-wm/jwm/files/patch-example.jwmrc (-20 / +20 lines)
3		3
4	--- example.jwmrc.orig	4	--- example.jwmrc.orig
5	+++ example.jwmrc	5	+++ example.jwmrc
6	@@ -5,7 +5,8 @@	6	@@ -4,7 +4,8 @@
7	<!-- The root menu, if this is undefined you will not get a menu. -->
8	<!-- Additional RootMenu attributes: onroot, labeled, label -->
9	<RootMenu height="32" onroot="12">
10	- <Program icon="terminal.png" label="Terminal">xterm</Program>
11	+ <Program icon="rxvt.png" label="rxvt">rxvt</Program>
12	+ <Program icon="xterm.png" label="xterm">xterm</Program>
13		7
14	<Menu icon="folder.png" label="Applications">	8	<!-- The root menu. -->
15	<Program icon="editor.png" label="Dia">dia</Program>	9	<RootMenu onroot="12">
16	@@ -150,7 +151,10 @@	10	- <Program icon="terminal.png" label="Terminal">xterm</Program>
17	</PopupStyle>	11	+ <Program icon="rxvt.png" label="Terminal">rxvt</Program>
		12	+ <Program icon="xterm.png" label="Terminal">xterm</Program>
		13	<Menu icon="folder.png" label="Applications">
		14	<Program icon="music.png" label="Audacious">audacious</Program>
		15	<Program icon="calculator.png" label="Calculator">xcalc</Program>
		16	@@ -120,7 +121,10 @@
		17	for icons in multiple paths.
		18	-->
		19	<IconPath>
		20	- /usr/share/icons/wm-icons/32x32-gant
		21	+ $HOME/.icons
		22	+ %%PREFIX%%/share/icons
		23	+ %%PREFIX%%/share/pixmaps
		24	+ %%PREFIX%%/lib/X11/icons
		25	</IconPath>
18		26
19	<IconPath>	27	<!-- Virtual Desktops -->
20	- /usr/share/icons/wm-icons/32x32-gant
21	+ $HOME/.icons
22	+ %%PREFIX%%/share/icons
23	+ %%PREFIX%%/share/pixmaps
24	+ %%PREFIX%%/lib/X11/icons
25	</IconPath>
26
27	<!-- Virtual Desktops -->

Lines 3-5 Link Here

(-)x11-wm/jwm/pkg-plist (+10 lines)
3	@unexec if cmp -s %D/etc/system.jwmrc %D/etc/system.jwmrc.sample; then rm -f %D/etc/system.jwmrc; fi	3	@unexec if cmp -s %D/etc/system.jwmrc %D/etc/system.jwmrc.sample; then rm -f %D/etc/system.jwmrc; fi
4	etc/system.jwmrc.sample	4	etc/system.jwmrc.sample
5	@exec if [ ! -f %D/etc/system.jwmrc ]; then cp -p %D/etc/system.jwmrc.sample %D/etc/system.jwmrc; fi	5	@exec if [ ! -f %D/etc/system.jwmrc ]; then cp -p %D/etc/system.jwmrc.sample %D/etc/system.jwmrc; fi
		6	%%NLS%%share/locale/de/LC_MESSAGES/jwm.mo
		7	%%NLS%%share/locale/es/LC_MESSAGES/jwm.mo
		8	%%NLS%%share/locale/fr/LC_MESSAGES/jwm.mo
		9	%%NLS%%share/locale/it/LC_MESSAGES/jwm.mo
		10	%%NLS%%share/locale/nl/LC_MESSAGES/jwm.mo
		11	%%NLS%%share/locale/pl/LC_MESSAGES/jwm.mo
		12	%%NLS%%share/locale/pt-PT/LC_MESSAGES/jwm.mo
		13	%%NLS%%share/locale/ru/LC_MESSAGES/jwm.mo
		14	%%NLS%%@dirrmtry share/locale/pt-PT/LC_MESSAGES
		15	%%NLS%%@dirrmtry share/locale/pt-PT