Attachment #237914 for bug #267612

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




PORTNAME=	wmqstat
PORTVERSION=	0.0.4
PORTREVISION=	3
CATEGORIES=	games windowmaker
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/wmQStat%20${PORTVERSION}



LICENSE=	GPLv2

BROKEN_FreeBSD_13=	ld: error: duplicate symbol: display
BROKEN_FreeBSD_14=	ld: error: duplicate symbol: display

RUN_DEPENDS=	qstat:games/qstat

USES=		xorg


OPTIONS_DEFINE=	DOCS

# Unbreak the build against Clang
post-patch:
	@${REINPLACE_CMD} -e 's, inline,,' ${WRKSRC}/wmgeneral/list.h

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Added Link Here

(-)b/games/wmqstat/files/patch-wmgeneral_list.h (+11 lines)
1	--- wmgeneral/list.h.orig 2003-04-09 19:48:21 UTC
2	+++ wmgeneral/list.h
3	@@ -30,7 +30,7 @@ Boston, MA 02111-1307, USA. */
4	#define __LIST_H_
5
6	#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
7	-# define INLINE inline
8	+# define INLINE
9	#else
10	# define INLINE
11	#endif

Added Link Here

(-)b/games/wmqstat/files/patch-wmgeneral_wmgeneral.c (+10 lines)
1	--- wmgeneral/wmgeneral.c.orig 2022-11-07 08:44:56 UTC
2	+++ wmgeneral/wmgeneral.c
3	@@ -55,6 +55,7 @@
4	/* X11 Variables */
5	/*****************/
6
7	+Display *display;
8	Window Root;
9	int screen;
10	int x_fd;

Added Link Here

(-)b/games/wmqstat/files/patch-wmgeneral_wmgeneral.h (-1 / +11 lines)
0	-	1	--- wmgeneral/wmgeneral.h.orig 2003-04-09 19:48:21 UTC
		2	+++ wmgeneral/wmgeneral.h
		3	@@ -36,7 +36,7 @@ typedef struct {
		4	/* Global variable */
		5	/*******************/
		6
		7	-Display *display;
		8	+extern Display *display;
		9
		10	/***********************/
		11	/* Function Prototypes */

Return to bug 267612

Lines 1-6 Link Here

(-)b/games/wmqstat/Makefile (-8 / +1 lines)
1	PORTNAME= wmqstat	1	PORTNAME= wmqstat
2	PORTVERSION= 0.0.4	2	PORTVERSION= 0.0.4
3	PORTREVISION= 2	3	PORTREVISION= 3
4	CATEGORIES= games windowmaker	4	CATEGORIES= games windowmaker
5	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/wmQStat%20${PORTVERSION}	5	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/wmQStat%20${PORTVERSION}
6		6
Lines 10-18 WWW= http://wmqstat.sourceforge.net/ Link Here
10		10
11	LICENSE= GPLv2	11	LICENSE= GPLv2
12		12
13	BROKEN_FreeBSD_13= ld: error: duplicate symbol: display
14	BROKEN_FreeBSD_14= ld: error: duplicate symbol: display
15
16	RUN_DEPENDS= qstat:games/qstat	13	RUN_DEPENDS= qstat:games/qstat
17		14
18	USES= xorg	15	USES= xorg
Lines 23-32 PORTDOCS= README Link Here
23		20
24	OPTIONS_DEFINE= DOCS	21	OPTIONS_DEFINE= DOCS
25		22
26	# Unbreak the build against Clang
27	post-patch:
28	@${REINPLACE_CMD} -e 's, inline,,' ${WRKSRC}/wmgeneral/list.h
29
30	do-install:	23	do-install:
31	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin	24	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
32	@${MKDIR} ${STAGEDIR}${DOCSDIR}	25	@${MKDIR} ${STAGEDIR}${DOCSDIR}