Attachment #110409 for bug #151560

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




#

PORTNAME=	pawm
PORTVERSION=	2.3.0
PORTREVISION=	2
CATEGORIES=	x11-wm
MASTER_SITES=	http://www.pleyades.net/pawm/files/


COMMENT=	The Puto Amo Window Manager

USE_BZIP2=	yes
USE_XORG=	x11 xft xrandr xrender xpm
USE_CMAKE=	yes
CMAKE_ARGS=	-DCMAKE_CONFIG_PREFIX:STRING="${PREFIX}/etc" \
		-DX11_LIBRARY_DIRS:STRING="${LOCALBASE}/lib"

CFLAGS+=	-I. -I${LOCALBASE}/include -DNDEBUG
LDFLAGS=	-lm -L${LOCALBASE}/lib -lXpm

.include <bsd.port.pre.mk>

LDFLAGS+=	-lXrandr
.if defined(WITHOUT_XFT)
CFLAGS+=	-DDISABLE_XFT
.else
LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
CFLAGS+=	`pkg-config --cflags xft`
LDFLAGS+=	`pkg-config --libs xft`
.endif

.if defined(WITH_SN)
LIB_DEPENDS+=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
CFLAGS+=	-DENABLE_STARTUP -DSN_API_NOT_YET_FROZEN \
		`pkg-config --cflags --libs libstartup-notification-1.0`
LDFLAGS+=	`pkg-config --libs libstartup-notification-1.0`
.endif

post-patch:
	@${REINPLACE_CMD} -e \
		'/"\/etc"/s|^|#| ; \
		 /"-O2"/s|^|#| ; \
		 /LINK_DIRECTORIES/s|\.|| ; \
		 /INSTALL/s| /etc| etc|' ${WRKSRC}/CMakeLists.txt

post-install:
	${INSTALL_PROGRAM} ${WRKSRC}/src/pawm ${PREFIX}/bin
	${INSTALL_DATA} ${WRKSRC}/conf/pawm.conf ${PREFIX}/etc
	@${MKDIR} ${DATADIR}/icons
	${INSTALL_DATA} ${WRKSRC}/data/icons/*.xpm ${DATADIR}/icons
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
.for ii in AUTHORS Changelog.old GPL INSTALL README TODO
	${INSTALL_DATA} ${WRKSRC}/${ii} ${DOCSDIR}
.endfor
.endif

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)x11-wm/pawm/distinfo (-3 / +3 lines)
1	MD5 (pawm-2.2.9.tar.bz2) = 0d1a649ec5bc0bf70a50dddeadb813a2	1	MD5 (pawm-2.3.0.tar.bz2) = 1f4e7da972d8c328bb72137797640b05
2	SHA256 (pawm-2.2.9.tar.bz2) = af6cfb77a008cc5face1a9fd8c17b2942a8d530d811d36be3d5289062693d93d	2	SHA256 (pawm-2.3.0.tar.bz2) = 5de0706ecd2f6251a3672305c8d32a6fd0e0a3176191d806f47926dae28945f2
3	SIZE (pawm-2.2.9.tar.bz2) = 133437	3	SIZE (pawm-2.3.0.tar.bz2) = 115648




--- src/button.c.orig	Tue Jul  4 03:19:55 2006
+++ src/button.c	Mon Jul 17 03:28:20 2006
@@ -247,6 +247,9 @@
 	XSetWindowAttributes attributes;
 	Button button=NULL;
 
+	XSetWindowAttributes wattr;
+	unsigned long wmask;
+
 	ASSERT(parent!=None);
 	ASSERT(nface!=None); 
 	ASSERT(hface!=None);
@@ -269,9 +272,6 @@
 
 
 	/** Window creation and basic setup **/
-
-	XSetWindowAttributes wattr;
-	unsigned long wmask;
 
 	wattr.border_pixel=0;
 	wattr.colormap = XCreateColormap (display, ROOT, DEFAULTVISUAL, AllocNone);




--- src/paicon.c.orig	Tue Jul  4 03:19:55 2006
+++ src/paicon.c	Mon Jul 17 03:27:59 2006
@@ -263,6 +263,9 @@
 {
 	PAIcon icon=NULL;
 
+	XSetWindowAttributes wattr;
+	unsigned long wmask;
+
 	ASSERT(image);
 
 	icon=malloc(PAIconBytes);
@@ -273,9 +276,6 @@
 #endif
 
 	icon->image=image;
-
-	XSetWindowAttributes wattr;
-	unsigned long wmask;
 
 	wattr.border_pixel=0;
 	wattr.colormap = XCreateColormap (display, ROOT, DEFAULTVISUAL, AllocNone);




--- src/pawindow.c.orig	Sun Mar  5 10:14:06 2006
+++ src/pawindow.c	Wed Mar  8 13:29:48 2006
@@ -787,10 +787,12 @@
 
 static void canvas_KeyPress(XKeyPressedEvent *event, PAWindow pawindow)
 {
+	XEvent *e;
+
 	ASSERT(event);
 	ASSERT(pawindow);
 
-	XEvent *e = (XEvent *) event;
+	e = (XEvent *) event;
 
 	/* Replay the event if it isn't a pawm keybinding */
 	if (!keyboard_binding_key(event)) {
@@ -1633,6 +1635,7 @@
 	int num_rows=1;
 	int firsticonx, lasticonx, iconx, icony;
 	bool forward= (strcmp((char *)data, "forward")==0 ? 1 : 0);
+  	KeySym testkeysym; KeyCode testkeycode;
 
 
 	/* TODO: Support both rotate method: w/wout popup window*/
@@ -1665,7 +1668,6 @@
                  None, CurrentTime);
 	current_pw=tab_window_draw_all(num_windows, num_rows);
 
-  	KeySym testkeysym; KeyCode testkeycode;
     testkeysym=XStringToKeysym("Tab");
     testkeycode=XKeysymToKeycode(display, testkeysym);
     XGrabKey(display, testkeycode, Mod1Mask, ROOT, False, GrabModeAsync, GrabModeAsync);

Line 0 Link Here

(-)x11-wm/pawm/files/patch-src__pawm.c (+11 lines)
	1	--- src/pawm.c.orig 2010-05-03 11:36:18.000000000 +0900
	2	+++ src/pawm.c 2010-09-22 01:27:38.000000000 +0900
	3	@@ -114,7 +114,7 @@
	4
	5	int main (int argc, char *argv[])
	6	{
	7	- struct sigaction sa_term, sa_chld;
	8	+ struct sigaction sa_term, sa_chld, sa_alrm;
	9
	10	/* Command line parameters */
	11	if (argc > 1) {




--- src/wm.c.orig	Fri Feb 24 05:12:18 2006
+++ src/wm.c	Sun Feb 26 03:10:37 2006
@@ -355,6 +355,9 @@
 	CARD32 tmpdata[20];
 	unsigned long length;
 	int (*olderrorhandler) (Display *, XErrorEvent *);
+#ifndef DISABLE_XRANDR
+	int major, minor,errbase;
+#endif
 
 	SAY ("Initializing window manager...");
 
@@ -373,7 +376,6 @@
 
 #ifndef DISABLE_XRANDR
 	/* Check for XRandr extension */
-	int major, minor,errbase;
 	XRRQueryVersion(display, &major, &minor);
 	XRRQueryExtension(display, &(class.randr_base), &errbase);
 	SAY("Using XRandr %d.%d extension. Event base: %d Error base %d", major, minor, class.randr_base, errbase);

Lines 1-10 Link Here

(-)x11-wm/pawm/pkg-plist (-1 / +2 lines)
1	bin/pawm	1	bin/pawm
2	etc/pawm.conf	2	etc/pawm.conf
3	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS	3	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
4	%%PORTDOCS%%%%DOCSDIR%%/Changelog	4	%%PORTDOCS%%%%DOCSDIR%%/Changelog.old
5	%%PORTDOCS%%%%DOCSDIR%%/GPL	5	%%PORTDOCS%%%%DOCSDIR%%/GPL
6	%%PORTDOCS%%%%DOCSDIR%%/INSTALL	6	%%PORTDOCS%%%%DOCSDIR%%/INSTALL
7	%%PORTDOCS%%%%DOCSDIR%%/README	7	%%PORTDOCS%%%%DOCSDIR%%/README
		8	%%PORTDOCS%%%%DOCSDIR%%/TODO
8	%%DATADIR%%/icons/close_d.xpm	9	%%DATADIR%%/icons/close_d.xpm
9	%%DATADIR%%/icons/close_d_256.xpm	10	%%DATADIR%%/icons/close_d_256.xpm
10	%%DATADIR%%/icons/close_h.xpm	11	%%DATADIR%%/icons/close_h.xpm

Return to bug 151560

Lines 6-13 Link Here

(-)x11-wm/pawm/Makefile (-36 / +16 lines)
6	#	6	#
7		7
8	PORTNAME= pawm	8	PORTNAME= pawm
9	PORTVERSION= 2.2.9	9	PORTVERSION= 2.3.0
10	PORTREVISION= 2
11	CATEGORIES= x11-wm	10	CATEGORIES= x11-wm
12	MASTER_SITES= http://www.pleyades.net/pawm/files/	11	MASTER_SITES= http://www.pleyades.net/pawm/files/
13		12
Lines 15-63 Link Here
15	COMMENT= The Puto Amo Window Manager	14	COMMENT= The Puto Amo Window Manager
16		15
17	USE_BZIP2= yes	16	USE_BZIP2= yes
18	USE_XORG= x11 xrandr xrender xpm	17	USE_XORG= x11 xft xrandr xrender xpm
19	USE_GMAKE= yes	18	USE_CMAKE= yes
20	MAKEFILE= Makefile.in	19	CMAKE_ARGS= -DCMAKE_CONFIG_PREFIX:STRING="${PREFIX}/etc" \
21	MAKE_ARGS= GCC="${CC}" MAKE.binary="${CC} ${LDFLAGS} -o"	20	-DX11_LIBRARY_DIRS:STRING="${LOCALBASE}/lib"
22
23	CFLAGS+= -I. -I${LOCALBASE}/include -DNDEBUG
24	LDFLAGS= -lm -L${LOCALBASE}/lib -lXpm
25
26	.include <bsd.port.pre.mk>
27
28	LDFLAGS+= -lXrandr
29	.if defined(WITHOUT_XFT)
30	CFLAGS+= -DDISABLE_XFT
31	.else
32	LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft
33	CFLAGS+= `pkg-config --cflags xft`
34	LDFLAGS+= `pkg-config --libs xft`
35	.endif
36		21
37	.if defined(WITH_SN)	22	.if defined(WITH_SN)
38	LIB_DEPENDS+= startup-notification-1.0:${PORTSDIR}/x11/startup-notification	23	LIB_DEPENDS+= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
39	CFLAGS+= -DENABLE_STARTUP -DSN_API_NOT_YET_FROZEN \	24	CFLAGS+= -DENABLE_STARTUP -DSN_API_NOT_YET_FROZEN \
40	`pkg-config --cflags libstartup-notification-1.0`	25	`pkg-config --cflags --libs libstartup-notification-1.0`
41	LDFLAGS+= `pkg-config --libs libstartup-notification-1.0`
42	.endif	26	.endif
43		27
44	do-configure:	28	post-patch:
45	@${ECHO_CMD} -n > ${WRKSRC}/config.h	29	@${REINPLACE_CMD} -e \
46	@${ECHO_CMD} '#define PROJECT "${PORTNAME}"' >> ${WRKSRC}/config.h	30	'/"\/etc"/s\|^\|#\| ; \
47	@${ECHO_CMD} '#define VERSION "${PORTVERSION}"' >> ${WRKSRC}/config.h	31	/"-O2"/s\|^\|#\| ; \
48	@${ECHO_CMD} '#define CONFDIR "${PREFIX}/etc"' >> ${WRKSRC}/config.h	32	/LINK_DIRECTORIES/s\|\.\|\| ; \
49	@${ECHO_CMD} '#define DATADIR "${DATADIR}"' >> ${WRKSRC}/config.h	33	/INSTALL/s\| /etc\| etc\|' ${WRKSRC}/CMakeLists.txt
50		34
51	do-install:	35	post-install:
52	${INSTALL_PROGRAM} ${WRKSRC}/src/pawm ${PREFIX}/bin
53	${INSTALL_DATA} ${WRKSRC}/conf/pawm.conf ${PREFIX}/etc
54	@${MKDIR} ${DATADIR}/icons
55	${INSTALL_DATA} ${WRKSRC}/data/icons/*.xpm ${DATADIR}/icons
56	.if !defined(NOPORTDOCS)	36	.if !defined(NOPORTDOCS)
57	@${MKDIR} ${DOCSDIR}	37	@${MKDIR} ${DOCSDIR}
58	.for ii in AUTHORS Changelog GPL INSTALL README	38	.for ii in AUTHORS Changelog.old GPL INSTALL README TODO
59	${INSTALL_DATA} ${WRKSRC}/${ii} ${DOCSDIR}	39	${INSTALL_DATA} ${WRKSRC}/${ii} ${DOCSDIR}
60	.endfor	40	.endfor
61	.endif	41	.endif
62		42
63	.include <bsd.port.post.mk>	43	.include <bsd.port.mk>

Lines 1-22 Link Here

(-)x11-wm/pawm/files/patch-src__button.c (-22 lines)
1	--- src/button.c.orig Tue Jul 4 03:19:55 2006
2	+++ src/button.c Mon Jul 17 03:28:20 2006
3	@@ -247,6 +247,9 @@
4	XSetWindowAttributes attributes;
5	Button button=NULL;
6
7	+ XSetWindowAttributes wattr;
8	+ unsigned long wmask;
9	+
10	ASSERT(parent!=None);
11	ASSERT(nface!=None);
12	ASSERT(hface!=None);
13	@@ -269,9 +272,6 @@
14
15
16	/ Window creation and basic setup /
17	-
18	- XSetWindowAttributes wattr;
19	- unsigned long wmask;
20
21	wattr.border_pixel=0;
22	wattr.colormap = XCreateColormap (display, ROOT, DEFAULTVISUAL, AllocNone);

Lines 1-22 Link Here

(-)x11-wm/pawm/files/patch-src__paicon.c (-22 lines)
1	--- src/paicon.c.orig Tue Jul 4 03:19:55 2006
2	+++ src/paicon.c Mon Jul 17 03:27:59 2006
3	@@ -263,6 +263,9 @@
4	{
5	PAIcon icon=NULL;
6
7	+ XSetWindowAttributes wattr;
8	+ unsigned long wmask;
9	+
10	ASSERT(image);
11
12	icon=malloc(PAIconBytes);
13	@@ -273,9 +276,6 @@
14	#endif
15
16	icon->image=image;
17	-
18	- XSetWindowAttributes wattr;
19	- unsigned long wmask;
20
21	wattr.border_pixel=0;
22	wattr.colormap = XCreateColormap (display, ROOT, DEFAULTVISUAL, AllocNone);

Lines 1-32 Link Here

(-)x11-wm/pawm/files/patch-src__pawindow.cc (-32 lines)
1	--- src/pawindow.c.orig Sun Mar 5 10:14:06 2006
2	+++ src/pawindow.c Wed Mar 8 13:29:48 2006
3	@@ -787,10 +787,12 @@
4
5	static void canvas_KeyPress(XKeyPressedEvent *event, PAWindow pawindow)
6	{
7	+ XEvent *e;
8	+
9	ASSERT(event);
10	ASSERT(pawindow);
11
12	- XEvent e = (XEvent ) event;
13	+ e = (XEvent *) event;
14
15	/* Replay the event if it isn't a pawm keybinding */
16	if (!keyboard_binding_key(event)) {
17	@@ -1633,6 +1635,7 @@
18	int num_rows=1;
19	int firsticonx, lasticonx, iconx, icony;
20	bool forward= (strcmp((char *)data, "forward")==0 ? 1 : 0);
21	+ KeySym testkeysym; KeyCode testkeycode;
22
23
24	/* TODO: Support both rotate method: w/wout popup window*/
25	@@ -1665,7 +1668,6 @@
26	None, CurrentTime);
27	current_pw=tab_window_draw_all(num_windows, num_rows);
28
29	- KeySym testkeysym; KeyCode testkeycode;
30	testkeysym=XStringToKeysym("Tab");
31	testkeycode=XKeysymToKeycode(display, testkeysym);
32	XGrabKey(display, testkeycode, Mod1Mask, ROOT, False, GrabModeAsync, GrabModeAsync);

Lines 1-20 Link Here

(-)x11-wm/pawm/files/patch-src__wm.c (-20 lines)
1	--- src/wm.c.orig Fri Feb 24 05:12:18 2006
2	+++ src/wm.c Sun Feb 26 03:10:37 2006
3	@@ -355,6 +355,9 @@
4	CARD32 tmpdata[20];
5	unsigned long length;
6	int (olderrorhandler) (Display , XErrorEvent *);
7	+#ifndef DISABLE_XRANDR
8	+ int major, minor,errbase;
9	+#endif
10
11	SAY ("Initializing window manager...");
12
13	@@ -373,7 +376,6 @@
14
15	#ifndef DISABLE_XRANDR
16	/* Check for XRandr extension */
17	- int major, minor,errbase;
18	XRRQueryVersion(display, &major, &minor);
19	XRRQueryExtension(display, &(class.randr_base), &errbase);
20	SAY("Using XRandr %d.%d extension. Event base: %d Error base %d", major, minor, class.randr_base, errbase);