Attachment #63338 for bug #94507

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




#

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

MAINTAINER=	ports@FreeBSD.org
COMMENT=	The Puto Amo Window Manager

BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash2

DOCS=		AUTHORS Changelog GPL INSTALL README THANKS
PLIST=		${WRKDIR}/pkg-plist
USE_BZIP2=	yes
USE_GMAKE=	yes
USE_X_PREFIX=	yes
USE_XPM=	yes
USE_GMAKE=	yes
MAKEFILE=	Makefile.in
MAKE_ARGS=	GCC="${CC}" MAKE.binary="${CC} ${LDFLAGS} -o"

CFLAGS+=	-I. -I${X11BASE}/include -DNDEBUG
LDFLAGS=	-lm -L${X11BASE}/lib -lXpm -lXrandr
		bash ./0 --prefix=${PREFIX} --datadir=${PREFIX}/share/pawm

.include <bsd.port.pre.mk>

.if ${OSVERSION} < 500000
CFLAGS+=	-Dintmax_t=u_int32_t -Duintmax_t=u_int32_t \
		-Dstrtoimax=strtoll -Dstrtoumax=strtoull \
		-DSIZE_MAX=UINT_MAX
	${ECHO_CMD} @dirrm share/pawm/icons >> ${PLIST}
	${ECHO_CMD} @dirrm share/pawm >> ${PLIST}
.if !defined(NOPORTDOCS)
.for ii in ${DOCS}
	${ECHO_CMD} share/doc/pawm/${ii} >> ${PLIST}
.endfor
	${ECHO_CMD} @dirrm share/doc/pawm >> ${PLIST}
.endif

.if ${X_WINDOW_SYSTEM} == xfree86-3 || 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 libstartup-notification-1.0`
LDFLAGS+=	`pkg-config --libs libstartup-notification-1.0`
.endif

post-patch:
.if ${OSVERSION} < 500000
	@${GREP} -lR "<stdint\.h>" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
		's|<stdint\.h>|<inttypes.h>|g'
.endif

do-configure:
	@${ECHO_CMD} -n > ${WRKSRC}/config.h
	@${ECHO_CMD} '#define PROJECT "${PORTNAME}"' >> ${WRKSRC}/config.h
	@${ECHO_CMD} '#define VERSION "${PORTVERSION}"' >> ${WRKSRC}/config.h
	@${ECHO_CMD} '#define CONFDIR "${PREFIX}/etc"' >> ${WRKSRC}/config.h
	@${ECHO_CMD} '#define DATADIR "${DATADIR}"' >> ${WRKSRC}/config.h

do-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
		${INSTALL_DATA} $$ii ${PREFIX}/share/pawm/icons ; \
	done
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
.for ii in AUTHORS Changelog GPL INSTALL README THANKS
	${INSTALL_DATA} ${WRKSRC}/${ii} ${DOCSDIR}
.endfor
.endif

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)x11-wm/pawm/distinfo (-3 / +3 lines)
1	MD5 (pawm-1.9.7.tar.bz2) = 9ba4bb81166995cbefd5ee2660217d9c	1	MD5 (pawm-2.2.0.tar.bz2) = ed810bff65c8ccc97d8963adf6f4304a
2	SHA256 (pawm-1.9.7.tar.bz2) = b9a5e3b4895328c8f26bfbab894ef93d6c0215925e344f488b9a48019994d880	2	SHA256 (pawm-2.2.0.tar.bz2) = 976db753a275f9d49d2752dba64754f7889d6af190103ea196fd72a7f7c4c5a8
3	SIZE (pawm-1.9.7.tar.bz2) = 100424	3	SIZE (pawm-2.2.0.tar.bz2) = 123542

Line 0 Link Here

(-)x11-wm/pawm/files/patch-src__pashut.c (+10 lines)
	1	--- src/pashut.c.orig Sat Feb 25 00:55:09 2006
	2	+++ src/pashut.c Sun Feb 26 03:15:23 2006
	3	@@ -24,6 +24,7 @@
	4	#include "pabar.h"
	5	#include "pafont.h"
	6	#include "pashut.h"
	7	+#include "signals.h"
	8
	9
	10	static void shut_all(void *);




--- 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);




--- 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);




$FreeBSD: ports/x11-wm/pawm/files/patch-src_cfgpool.c,v 1.1 2003/10/18 23:48:03 trevor Exp $

FreeBSD 4 is not C99-compliant.

--- src/cfgpool.c.orig	Wed Aug  6 14:27:17 2003
+++ src/cfgpool.c	Sat Oct 18 17:18:40 2003
@@ -309,13 +309,13 @@ legal value*. So, for proper error check
     EINVAL: Couldn't parse a well-formed natural number.
     ERANGE: Overflow while parsing the number.
 */
-uintmax_t
+u_int32_t
 cfgpool_getnatural (CfgPool pool, const char *key, unsigned int base) {
 
     char *value=NULL;
     char *tailptr=NULL;
     int tmperrno=errno;
-    uintmax_t natural=0;
+    u_int32_t natural=0;
 
     ASSERT(pool);
     ASSERT(key);
@@ -329,7 +329,7 @@ cfgpool_getnatural (CfgPool pool, const 
 
     /* Well, it seems we have a value... Translate to correct type */
     errno=0;
-    natural=strtoumax(value, &tailptr, base);
+    natural=strtoull(value, &tailptr, base);
     
     if (errno) natural=0,tmperrno=ERANGE;
     if ((!natural) && (tailptr==value)) tmperrno=EINVAL;
@@ -359,13 +359,13 @@ legal value*. So, for proper error check
     ERANGE: Overflow while parsing the number.
 */
 
-intmax_t
+u_int32_t
 cfgpool_getinteger (CfgPool pool, const char *key, unsigned int base) {
 
     char *value=NULL;
     char *tailptr=NULL;
     int tmperrno=errno;
-    intmax_t integer=0;
+    u_int32_t integer=0;
 
     ASSERT(pool);
     ASSERT(key);
@@ -379,7 +379,7 @@ cfgpool_getinteger (CfgPool pool, const 
 
     /* Well, it seems we have a value... Translate to correct type */
     errno=0;
-    integer=strtoimax(value, &tailptr, base);
+    integer=strtoll(value, &tailptr, base);
     
     if (errno) integer=0,tmperrno=ERANGE;
     if ((!integer) && (tailptr==value)) tmperrno=EINVAL;




$FreeBSD: ports/x11-wm/pawm/files/patch-src_cfgpool.h,v 1.1 2003/10/18 23:48:03 trevor Exp $

FreeBSD 4 is not C99-compliant.

--- src/cfgpool.h.orig	Wed Jul 10 07:33:57 2002
+++ src/cfgpool.h	Sat Oct 18 16:14:11 2003
@@ -25,21 +25,16 @@
 #ifndef __X_CFGPOOL_X__
 #define __X_CFGPOOL_X__
 
-#include <stdint.h>
 #include <limits.h>
 #include <inttypes.h>
 
-#if SSIZE_MAX > SIZE_MAX
-#error Cannot build, since SSIZE_MAX appears to be greater than SIZE_MAX!!!
-#endif
-
 typedef struct CfgPool *CfgPool;
 
 CfgPool cfgpool_create (const char *);
 CfgPool cfgpool_delete (CfgPool);
 
 char *    cfgpool_getstring  (CfgPool, const char *);
-uintmax_t cfgpool_getnatural (CfgPool, const char *, unsigned int);
-intmax_t  cfgpool_getinteger (CfgPool, const char *, unsigned int);
+u_int32_t cfgpool_getnatural (CfgPool, const char *, unsigned int);
+u_int32_t cfgpool_getinteger (CfgPool, const char *, unsigned int);
 
 #endif




$FreeBSD: ports/x11-wm/pawm/files/patch-src_chain.c,v 1.1 2003/10/18 23:48:03 trevor Exp $

FreeBSD 4 is not C99-compliant.

--- src/chain.c.orig	Wed Aug  6 14:27:17 2003
+++ src/chain.c	Sat Oct 18 16:30:50 2003
@@ -22,7 +22,7 @@ Copyright (C) 2002,03 Ra_l N__ez de Aren
 #include <stddef.h>
 #include <errno.h>
 #include <limits.h>
-#include <stdint.h>
+#include <sys/types.h>
 #include "chain.h"
 #include "mobs.h"
 
@@ -199,7 +199,7 @@ void *chain_put (Chain chain, void *item
     ASSERT(chain);
     ASSERT(item);
 
-    if (chain->size==SIZE_MAX) {
+    if (chain->size==UINT_MAX) {
         errno=EFBIG;
         return NULL;
     }




$FreeBSD: ports/x11-wm/pawm/files/patch-src_paclock.c,v 1.1 2004/03/11 19:07:33 trevor Exp $

--- src/paclock.c.orig	Fri Jan 16 13:22:09 2004
+++ src/paclock.c	Thu Mar 11 18:00:10 2004
@@ -20,6 +20,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+#include <signal.h>
 #include "pabar.h"
 #include "paclock.h"
 #include "timux.h"




$FreeBSD: ports/x11-wm/pawm/files/patch-src_pashut.c,v 1.1 2004/03/11 19:07:33 trevor Exp $

--- src/pashut.c.orig	Thu Sep  4 22:29:02 2003
+++ src/pashut.c	Thu Mar 11 18:08:38 2004
@@ -20,6 +20,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+#include <signal.h>
 #include "pashut.h"
 #include "pawindow.h"
 #include "pabar.h"




$FreeBSD: ports/x11-wm/pawm/files/patch-src_timux.c,v 1.1 2003/10/18 23:48:03 trevor Exp $

FreeBSD 4 is not C99-compliant.

--- src/timux.c.orig	Wed Aug  6 14:27:19 2003
+++ src/timux.c	Sat Oct 18 17:14:40 2003
@@ -45,7 +45,7 @@ struct TiMux {
     TiMuxEvent target;
 };
 
-static volatile uintmax_t timux_count=0;
+static volatile uint32_t timux_count=0;
 static TiMux theTiMux=NULL;
 
 static void TheHandlerTM   (int);




$FreeBSD: ports/x11-wm/pawm/files/patch-src_timux.h,v 1.1 2003/10/18 23:48:03 trevor Exp $

FreeBSD 4 is not C99-compliant.

--- src/timux.h.orig	Wed Apr 24 11:07:32 2002
+++ src/timux.h	Sat Oct 18 17:15:40 2003
@@ -25,13 +25,11 @@
 #ifndef __X_TIMUX_X__
 #define __X_TIMUX_X__
 
-#include <stdint.h>
-
 /* NOTE: timestamps, and so resolutions, are expressed in milliseconds */
 
 typedef struct TiMux *TiMux;
-typedef uint_fast32_t tempus;
-typedef uint_fast64_t jobid;
+typedef uint32_t tempus;
+typedef uint64_t jobid;
 typedef void (*duty) (void *);
 
 TiMux timux_create (void);




$FreeBSD: ports/x11-wm/pawm/files/patch-src_wm.c,v 1.1 2004/04/14 16:06:04 trevor Exp $

Make ANSI C89/C90-compliant to compile with GCC 2.X.
author:  Volker Stolz

--- src/wm.c.orig	Wed Apr 14 16:32:24 2004
+++ src/wm.c	Wed Apr 14 16:32:44 2004
@@ -311,8 +311,8 @@
 
     char *tmpvalue;
 
-    SAY ("Initializing window manager...");
     int (*olderrorhandler) (Display *, XErrorEvent *);
+    SAY ("Initializing window manager...");
 
     if (reference_count++) return !0;
  




bin/pawm
etc/pawm.conf
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/Changelog
%%PORTDOCS%%%%DOCSDIR%%/GPL
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/THANKS
%%DATADIR%%/icons/close_d.xpm
%%DATADIR%%/icons/close_d_256.xpm
%%DATADIR%%/icons/close_h.xpm
%%DATADIR%%/icons/close_h_256.xpm
%%DATADIR%%/icons/close_o.xpm
%%DATADIR%%/icons/close_o_256.xpm
%%DATADIR%%/icons/max_d.xpm
%%DATADIR%%/icons/max_d_256.xpm
%%DATADIR%%/icons/max_h.xpm
%%DATADIR%%/icons/max_h_256.xpm
%%DATADIR%%/icons/max_o.xpm
%%DATADIR%%/icons/max_o_256.xpm
%%DATADIR%%/icons/min_d.xpm
%%DATADIR%%/icons/min_d_256.xpm
%%DATADIR%%/icons/min_h.xpm
%%DATADIR%%/icons/min_h_256.xpm
%%DATADIR%%/icons/min_o.xpm
%%DATADIR%%/icons/min_o_256.xpm
%%DATADIR%%/icons/penguin-gentoo.xpm
%%DATADIR%%/icons/penguin-gentoo_256.xpm
%%DATADIR%%/icons/penguin.xpm
%%DATADIR%%/icons/penguin_256.xpm
%%DATADIR%%/icons/powerbutton_active.xpm
%%DATADIR%%/icons/powerbutton_active_256.xpm
%%DATADIR%%/icons/powerbutton_normal.xpm
%%DATADIR%%/icons/powerbutton_normal_256.xpm
%%DATADIR%%/icons/powerbutton_pressed.xpm
%%DATADIR%%/icons/powerbutton_pressed_256.xpm
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 94507

Lines 6-57 Link Here

(-)x11-wm/pawm/Makefile (-31 / +48 lines)
6	#	6	#
7		7
8	PORTNAME= pawm	8	PORTNAME= pawm
9	PORTVERSION= 1.9.7	9	PORTVERSION= 2.2.0
10	CATEGORIES= x11-wm	10	CATEGORIES= x11-wm
11	MASTER_SITES= http://www.pleyades.net/pawm/files/	11	MASTER_SITES= http://www.pleyades.net/pawm/files/
12		12
13	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= ports@FreeBSD.org
14	COMMENT= The Puto Amo Window Manager	14	COMMENT= The Puto Amo Window Manager
15		15
16	BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash2
17
18	DOCS= AUTHORS Changelog GPL INSTALL README THANKS
19	PLIST= ${WRKDIR}/pkg-plist
20	USE_BZIP2= yes	16	USE_BZIP2= yes
21	USE_GMAKE= yes
22	USE_X_PREFIX= yes	17	USE_X_PREFIX= yes
		18	USE_XPM= yes
		19	USE_GMAKE= yes
		20	MAKEFILE= Makefile.in
		21	MAKE_ARGS= GCC="${CC}" MAKE.binary="${CC} ${LDFLAGS} -o"
23		22
24	do-configure:	23	CFLAGS+= -I. -I${X11BASE}/include -DNDEBUG
25	cd ${WRKSRC} && \	24	LDFLAGS= -lm -L${X11BASE}/lib -lXpm -lXrandr
26	bash ./0 --prefix=${PREFIX} --datadir=${PREFIX}/share/pawm
27		25
28	pre-install:	26	.include <bsd.port.pre.mk>
29	${ECHO_CMD} bin/pawm > ${PLIST}	27
30	${ECHO_CMD} etc/pawm.conf >> ${PLIST}	28	.if ${OSVERSION} < 500000
31	for ii in `${LS} ${WRKSRC}/data/icons`; do \	29	CFLAGS+= -Dintmax_t=u_int32_t -Duintmax_t=u_int32_t \
32	${ECHO_CMD} share/pawm/icons/$$ii >> ${PLIST}; \	30	-Dstrtoimax=strtoll -Dstrtoumax=strtoull \
33	done	31	-DSIZE_MAX=UINT_MAX
34	${ECHO_CMD} @dirrm share/pawm/icons >> ${PLIST}
35	${ECHO_CMD} @dirrm share/pawm >> ${PLIST}
36	.if !defined(NOPORTDOCS)
37	.for ii in ${DOCS}
38	${ECHO_CMD} share/doc/pawm/${ii} >> ${PLIST}
39	.endfor
40	${ECHO_CMD} @dirrm share/doc/pawm >> ${PLIST}
41	.endif	32	.endif
42		33
		34	.if ${X_WINDOW_SYSTEM} == xfree86-3 \|\| defined(WITHOUT_XFT)
		35	CFLAGS+= -DDISABLE_XFT
		36	.else
		37	LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft
		38	CFLAGS+= `pkg-config --cflags xft`
		39	LDFLAGS+= `pkg-config --libs xft`
		40	.endif
		41
		42	.if defined(WITH_SN)
		43	LIB_DEPENDS+= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
		44	CFLAGS+= -DENABLE_STARTUP -DSN_API_NOT_YET_FROZEN \
		45	`pkg-config --cflags libstartup-notification-1.0`
		46	LDFLAGS+= `pkg-config --libs libstartup-notification-1.0`
		47	.endif
		48
		49	post-patch:
		50	.if ${OSVERSION} < 500000
		51	@${GREP} -lR "<stdint\.h>" ${WRKSRC} \| ${XARGS} ${REINPLACE_CMD} -e \
		52	's\|<stdint\.h>\|<inttypes.h>\|g'
		53	.endif
		54
		55	do-configure:
		56	@${ECHO_CMD} -n > ${WRKSRC}/config.h
		57	@${ECHO_CMD} '#define PROJECT "${PORTNAME}"' >> ${WRKSRC}/config.h
		58	@${ECHO_CMD} '#define VERSION "${PORTVERSION}"' >> ${WRKSRC}/config.h
		59	@${ECHO_CMD} '#define CONFDIR "${PREFIX}/etc"' >> ${WRKSRC}/config.h
		60	@${ECHO_CMD} '#define DATADIR "${DATADIR}"' >> ${WRKSRC}/config.h
		61
43	do-install:	62	do-install:
44	${INSTALL_PROGRAM} ${WRKSRC}/bin/pawm ${PREFIX}/bin	63	${INSTALL_PROGRAM} ${WRKSRC}/src/pawm ${PREFIX}/bin
45	${INSTALL_DATA} ${WRKSRC}/conf/pawm.conf ${PREFIX}/etc/	64	${INSTALL_DATA} ${WRKSRC}/conf/pawm.conf ${PREFIX}/etc
46	${MKDIR} ${PREFIX}/share/pawm/icons	65	@${MKDIR} ${DATADIR}/icons
47	for ii in `${LS} ${WRKSRC}/data/icons/*`; do \	66	${INSTALL_DATA} ${WRKSRC}/data/icons/*.xpm ${DATADIR}/icons
48	${INSTALL_DATA} $$ii ${PREFIX}/share/pawm/icons ; \
49	done
50	.if !defined(NOPORTDOCS)	67	.if !defined(NOPORTDOCS)
51	${MKDIR} ${DOCSDIR}	68	@${MKDIR} ${DOCSDIR}
52	.for ii in ${DOCS}	69	.for ii in AUTHORS Changelog GPL INSTALL README THANKS
53	${INSTALL_DATA} ${WRKSRC}/${ii} ${DOCSDIR}	70	${INSTALL_DATA} ${WRKSRC}/${ii} ${DOCSDIR}
54	.endfor	71	.endfor
55	.endif	72	.endif
56		73
57	.include <bsd.port.mk>	74	.include <bsd.port.post.mk>

Line 0 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);

Line 0 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);

Lines 1-56 Link Here

(-)x11-wm/pawm/files/patch-src_cfgpool.c (-56 lines)
1	$FreeBSD: ports/x11-wm/pawm/files/patch-src_cfgpool.c,v 1.1 2003/10/18 23:48:03 trevor Exp $
2
3	FreeBSD 4 is not C99-compliant.
4
5	--- src/cfgpool.c.orig Wed Aug 6 14:27:17 2003
6	+++ src/cfgpool.c Sat Oct 18 17:18:40 2003
7	@@ -309,13 +309,13 @@ legal value*. So, for proper error check
8	EINVAL: Couldn't parse a well-formed natural number.
9	ERANGE: Overflow while parsing the number.
10	*/
11	-uintmax_t
12	+u_int32_t
13	cfgpool_getnatural (CfgPool pool, const char *key, unsigned int base) {
14
15	char *value=NULL;
16	char *tailptr=NULL;
17	int tmperrno=errno;
18	- uintmax_t natural=0;
19	+ u_int32_t natural=0;
20
21	ASSERT(pool);
22	ASSERT(key);
23	@@ -329,7 +329,7 @@ cfgpool_getnatural (CfgPool pool, const
24
25	/* Well, it seems we have a value... Translate to correct type */
26	errno=0;
27	- natural=strtoumax(value, &tailptr, base);
28	+ natural=strtoull(value, &tailptr, base);
29
30	if (errno) natural=0,tmperrno=ERANGE;
31	if ((!natural) && (tailptr==value)) tmperrno=EINVAL;
32	@@ -359,13 +359,13 @@ legal value*. So, for proper error check
33	ERANGE: Overflow while parsing the number.
34	*/
35
36	-intmax_t
37	+u_int32_t
38	cfgpool_getinteger (CfgPool pool, const char *key, unsigned int base) {
39
40	char *value=NULL;
41	char *tailptr=NULL;
42	int tmperrno=errno;
43	- intmax_t integer=0;
44	+ u_int32_t integer=0;
45
46	ASSERT(pool);
47	ASSERT(key);
48	@@ -379,7 +379,7 @@ cfgpool_getinteger (CfgPool pool, const
49
50	/* Well, it seems we have a value... Translate to correct type */
51	errno=0;
52	- integer=strtoimax(value, &tailptr, base);
53	+ integer=strtoll(value, &tailptr, base);
54
55	if (errno) integer=0,tmperrno=ERANGE;
56	if ((!integer) && (tailptr==value)) tmperrno=EINVAL;

Lines 1-30 Link Here

(-)x11-wm/pawm/files/patch-src_cfgpool.h (-30 lines)
1	$FreeBSD: ports/x11-wm/pawm/files/patch-src_cfgpool.h,v 1.1 2003/10/18 23:48:03 trevor Exp $
2
3	FreeBSD 4 is not C99-compliant.
4
5	--- src/cfgpool.h.orig Wed Jul 10 07:33:57 2002
6	+++ src/cfgpool.h Sat Oct 18 16:14:11 2003
7	@@ -25,21 +25,16 @@
8	#ifndef __X_CFGPOOL_X__
9	#define __X_CFGPOOL_X__
10
11	-#include <stdint.h>
12	#include <limits.h>
13	#include <inttypes.h>
14
15	-#if SSIZE_MAX > SIZE_MAX
16	-#error Cannot build, since SSIZE_MAX appears to be greater than SIZE_MAX!!!
17	-#endif
18	-
19	typedef struct CfgPool *CfgPool;
20
21	CfgPool cfgpool_create (const char *);
22	CfgPool cfgpool_delete (CfgPool);
23
24	char * cfgpool_getstring (CfgPool, const char *);
25	-uintmax_t cfgpool_getnatural (CfgPool, const char *, unsigned int);
26	-intmax_t cfgpool_getinteger (CfgPool, const char *, unsigned int);
27	+u_int32_t cfgpool_getnatural (CfgPool, const char *, unsigned int);
28	+u_int32_t cfgpool_getinteger (CfgPool, const char *, unsigned int);
29
30	#endif

Lines 1-24 Link Here

(-)x11-wm/pawm/files/patch-src_chain.c (-24 lines)
1	$FreeBSD: ports/x11-wm/pawm/files/patch-src_chain.c,v 1.1 2003/10/18 23:48:03 trevor Exp $
2
3	FreeBSD 4 is not C99-compliant.
4
5	--- src/chain.c.orig Wed Aug 6 14:27:17 2003
6	+++ src/chain.c Sat Oct 18 16:30:50 2003
7	@@ -22,7 +22,7 @@ Copyright (C) 2002,03 Ra_l N__ez de Aren
8	#include <stddef.h>
9	#include <errno.h>
10	#include <limits.h>
11	-#include <stdint.h>
12	+#include <sys/types.h>
13	#include "chain.h"
14	#include "mobs.h"
15
16	@@ -199,7 +199,7 @@ void chain_put (Chain chain, void item
17	ASSERT(chain);
18	ASSERT(item);
19
20	- if (chain->size==SIZE_MAX) {
21	+ if (chain->size==UINT_MAX) {
22	errno=EFBIG;
23	return NULL;
24	}

Lines 1-12 Link Here

(-)x11-wm/pawm/files/patch-src_paclock.c (-12 lines)
1	$FreeBSD: ports/x11-wm/pawm/files/patch-src_paclock.c,v 1.1 2004/03/11 19:07:33 trevor Exp $
2
3	--- src/paclock.c.orig Fri Jan 16 13:22:09 2004
4	+++ src/paclock.c Thu Mar 11 18:00:10 2004
5	@@ -20,6 +20,7 @@
6	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
7	*/
8
9	+#include <signal.h>
10	#include "pabar.h"
11	#include "paclock.h"
12	#include "timux.h"

Lines 1-12 Link Here

(-)x11-wm/pawm/files/patch-src_pashut.c (-12 lines)
1	$FreeBSD: ports/x11-wm/pawm/files/patch-src_pashut.c,v 1.1 2004/03/11 19:07:33 trevor Exp $
2
3	--- src/pashut.c.orig Thu Sep 4 22:29:02 2003
4	+++ src/pashut.c Thu Mar 11 18:08:38 2004
5	@@ -20,6 +20,7 @@
6	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
7	*/
8
9	+#include <signal.h>
10	#include "pashut.h"
11	#include "pawindow.h"
12	#include "pabar.h"

Lines 1-15 Link Here

(-)x11-wm/pawm/files/patch-src_timux.c (-15 lines)
1	$FreeBSD: ports/x11-wm/pawm/files/patch-src_timux.c,v 1.1 2003/10/18 23:48:03 trevor Exp $
2
3	FreeBSD 4 is not C99-compliant.
4
5	--- src/timux.c.orig Wed Aug 6 14:27:19 2003
6	+++ src/timux.c Sat Oct 18 17:14:40 2003
7	@@ -45,7 +45,7 @@ struct TiMux {
8	TiMuxEvent target;
9	};
10
11	-static volatile uintmax_t timux_count=0;
12	+static volatile uint32_t timux_count=0;
13	static TiMux theTiMux=NULL;
14
15	static void TheHandlerTM (int);

Lines 1-22 Link Here

(-)x11-wm/pawm/files/patch-src_timux.h (-22 lines)
1	$FreeBSD: ports/x11-wm/pawm/files/patch-src_timux.h,v 1.1 2003/10/18 23:48:03 trevor Exp $
2
3	FreeBSD 4 is not C99-compliant.
4
5	--- src/timux.h.orig Wed Apr 24 11:07:32 2002
6	+++ src/timux.h Sat Oct 18 17:15:40 2003
7	@@ -25,13 +25,11 @@
8	#ifndef __X_TIMUX_X__
9	#define __X_TIMUX_X__
10
11	-#include <stdint.h>
12	-
13	/* NOTE: timestamps, and so resolutions, are expressed in milliseconds */
14
15	typedef struct TiMux *TiMux;
16	-typedef uint_fast32_t tempus;
17	-typedef uint_fast64_t jobid;
18	+typedef uint32_t tempus;
19	+typedef uint64_t jobid;
20	typedef void (duty) (void );
21
22	TiMux timux_create (void);

Lines 1-17 Link Here

(-)x11-wm/pawm/files/patch-src_wm.c (-17 lines)
1	$FreeBSD: ports/x11-wm/pawm/files/patch-src_wm.c,v 1.1 2004/04/14 16:06:04 trevor Exp $
2
3	Make ANSI C89/C90-compliant to compile with GCC 2.X.
4	author: Volker Stolz
5
6	--- src/wm.c.orig Wed Apr 14 16:32:24 2004
7	+++ src/wm.c Wed Apr 14 16:32:44 2004
8	@@ -311,8 +311,8 @@
9
10	char *tmpvalue;
11
12	- SAY ("Initializing window manager...");
13	int (olderrorhandler) (Display , XErrorEvent *);
14	+ SAY ("Initializing window manager...");
15
16	if (reference_count++) return !0;
17

Line 0 Link Here

(-)x11-wm/pawm/pkg-plist (+39 lines)
	1	bin/pawm
	2	etc/pawm.conf
	3	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
	4	%%PORTDOCS%%%%DOCSDIR%%/Changelog
	5	%%PORTDOCS%%%%DOCSDIR%%/GPL
	6	%%PORTDOCS%%%%DOCSDIR%%/INSTALL
	7	%%PORTDOCS%%%%DOCSDIR%%/README
	8	%%PORTDOCS%%%%DOCSDIR%%/THANKS
	9	%%DATADIR%%/icons/close_d.xpm
	10	%%DATADIR%%/icons/close_d_256.xpm
	11	%%DATADIR%%/icons/close_h.xpm
	12	%%DATADIR%%/icons/close_h_256.xpm
	13	%%DATADIR%%/icons/close_o.xpm
	14	%%DATADIR%%/icons/close_o_256.xpm
	15	%%DATADIR%%/icons/max_d.xpm
	16	%%DATADIR%%/icons/max_d_256.xpm
	17	%%DATADIR%%/icons/max_h.xpm
	18	%%DATADIR%%/icons/max_h_256.xpm
	19	%%DATADIR%%/icons/max_o.xpm
	20	%%DATADIR%%/icons/max_o_256.xpm
	21	%%DATADIR%%/icons/min_d.xpm
	22	%%DATADIR%%/icons/min_d_256.xpm
	23	%%DATADIR%%/icons/min_h.xpm
	24	%%DATADIR%%/icons/min_h_256.xpm
	25	%%DATADIR%%/icons/min_o.xpm
	26	%%DATADIR%%/icons/min_o_256.xpm
	27	%%DATADIR%%/icons/penguin-gentoo.xpm
	28	%%DATADIR%%/icons/penguin-gentoo_256.xpm
	29	%%DATADIR%%/icons/penguin.xpm
	30	%%DATADIR%%/icons/penguin_256.xpm
	31	%%DATADIR%%/icons/powerbutton_active.xpm
	32	%%DATADIR%%/icons/powerbutton_active_256.xpm
	33	%%DATADIR%%/icons/powerbutton_normal.xpm
	34	%%DATADIR%%/icons/powerbutton_normal_256.xpm
	35	%%DATADIR%%/icons/powerbutton_pressed.xpm
	36	%%DATADIR%%/icons/powerbutton_pressed_256.xpm
	37	@dirrm %%DATADIR%%/icons
	38	@dirrm %%DATADIR%%
	39	%%PORTDOCS%%@dirrm %%DOCSDIR%%