Attachment #190594 for bug #225867




PORTVERSION=	4.4
PORTREVISION=	2
CATEGORIES=	games
MASTER_SITES=	https://cyber.dabamos.de/pub/distfiles/
DISTNAME=	${PORTNAME}
MAN6=	xroach.6

DPADD+=		${LOCALBASE}/lib/libX11.a ${LIBM}
CFLAGS+=	-I${LOCALBASE}/include
LDADD+=		-L${LOCALBASE}/lib -lX11 -lm

MANDIR=${LOCALBASE}/man/man
DEPRECATED=	Broken for more than 6 months
EXPIRATION_DATE=	2017-08-23

BINOWN=		bin
BINDIR=		${LOCALBASE}/bin
BINMODE=	755

MAINTAINER=	kidon@posteo.de
COMMENT=	Cockroaches hide under your windows

USES=		imake
USE_XORG=	x11 xext
PLIST_FILES=bin/xroach man/man6/xroach.6.gz

do-install:
	${INSTALL_PROGRAM} -s ${WRKSRC}/xroach ${STAGEDIR}${PREFIX}/bin
	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.man ${STAGEDIR}${MAN6PREFIX}/man/man6/${PORTNAME}.6

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (xroach.tar.gz) = 88a4e436b7d93d34b062e548366af1eda62a1402518793b14339e9f5fde4b0da	1	SHA256 (xroach.tar.gz) = 819ee19f8c333d9adaa4ab58829445112e1865b85a6ca82296d66399af344e07
2	SIZE (xroach.tar.gz) = 15404	2	SIZE (xroach.tar.gz) = 21694




--- Makefile.orig	Tue Jun  8 19:12:04 1993
+++ Makefile	Sun Sep  8 03:45:39 2002
@@ -1,9 +1,16 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/8/93
+#	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	xroach
-MAN6=	xroach.0
-CFLAGS+= -I${.CURDIR}/bitmaps
-DPADD=	${LIBX} ${LIBM}
-LDADD=	-lX11/X11 -lm
+MAN6=	xroach.6
+
+DPADD+=		${LOCALBASE}/lib/libX11.a ${LIBM}
+CFLAGS+=	-I${LOCALBASE}/include -I${.CURDIR}/bitmaps
+LDADD+=		-L${LOCALBASE}/lib -lX11 -lm
+
+MANDIR=        ${LOCALBASE}/man/man
+
+BINOWN=        bin
+BINDIR=        ${LOCALBASE}/bin
+BINMODE=       755
 
 .include <bsd.prog.mk>




--- xroach.c.orig	1993-06-04 21:47:09.000000000 +0200
+++ xroach.c	2011-12-20 19:03:53.816175581 +0100
@@ -77,7 +77,7 @@
 int MarkHiddenRoaches();
 Pixel AllocNamedColor();
 
-void
+int
 main(ac, av)
 int ac;
 char *av[];
@@ -96,19 +96,23 @@
     /*
        Process command line options.
     */
-    for (ax=1; ax<ac; ax++) {
-	arg = av[ax];
+    for (ax=1; ax<ac; ) {
+	arg = av[ax++];
+
+	if (ax >= ac)
+	    Usage();
+
 	if (strcmp(arg, "-display") == 0) {
-	    display_name = av[++ax];
+	    display_name = av[ax++];
 	}
 	else if (strcmp(arg, "-rc") == 0) {
-	    roachColor = av[++ax];
+	    roachColor = av[ax++];
 	}
 	else if (strcmp(arg, "-speed") == 0) {
-	    roachSpeed = atof(av[++ax]);
+	    roachSpeed = atof(av[ax++]);
 	}
 	else if (strcmp(arg, "-roaches") == 0) {
-	    maxRoaches = strtol(av[++ax], (char **)NULL, 0);
+	    maxRoaches = strtol(av[ax++], (char **)NULL, 0);
 	}
 	else {
 	    Usage();
@@ -212,6 +216,7 @@
     CoverRoot();
     
     XCloseDisplay(display);
+    return(0);
 }
 
 #define USEPRT(msg) fprintf(stderr, msg)
@@ -465,7 +470,7 @@
     Region covered;
     Region visible;
     Window *children;
-    int nChildren;
+    unsigned int nChildren;
     Window dummy;
     XWindowAttributes wa;
     int wx;

Return to bug 225867

Lines 5-27 Link Here

(-)Makefile (-10 / +16 lines)
5	PORTVERSION= 4.4	5	PORTVERSION= 4.4
6	PORTREVISION= 2	6	PORTREVISION= 2
7	CATEGORIES= games	7	CATEGORIES= games
8	MASTER_SITES= http://www.skysmurf.nl/comp/FreeBSD/distfiles/	8	MASTER_SITES= https://cyber.dabamos.de/pub/distfiles/
9	DISTNAME= ${PORTNAME}	9	DISTNAME= ${PORTNAME}
		10	MAN6= xroach.6
10		11
11	MAINTAINER= ports@FreeBSD.org	12	DPADD+= ${LOCALBASE}/lib/libX11.a ${LIBM}
12	COMMENT= Cockroaches hide under your windows	13	CFLAGS+= -I${LOCALBASE}/include
		14	LDADD+= -L${LOCALBASE}/lib -lX11 -lm
13		15
14	BROKEN= unfetchable (apparently abandoned upstream)	16	MANDIR=${LOCALBASE}/man/man
15	DEPRECATED= Broken for more than 6 months
16	EXPIRATION_DATE= 2017-08-23
17		17
18	USE_XORG= x11	18	BINOWN= bin
19	PLIST_FILES= bin/xroach man/man6/xroach.6.gz	19	BINDIR= ${LOCALBASE}/bin
		20	BINMODE= 755
20		21
21	WRKSRC= ${WRKDIR}/pub/bsd-sources/4.4BSD-Lite/usr/src/games/xroach	22	MAINTAINER= kidon@posteo.de
		23	COMMENT= Cockroaches hide under your windows
22		24
		25	USES= imake
		26	USE_XORG= x11 xext
		27	PLIST_FILES=bin/xroach man/man6/xroach.6.gz
		28
23	do-install:	29	do-install:
24	${INSTALL_PROGRAM} -s ${WRKSRC}/xroach ${STAGEDIR}${PREFIX}/bin	30	${INSTALL_PROGRAM} -s ${WRKSRC}/xroach ${STAGEDIR}${PREFIX}/bin
25	${INSTALL_MAN} ${WRKSRC}/xroach.6 ${STAGEDIR}${MAN6PREFIX}/man/man6	31	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.man ${STAGEDIR}${MAN6PREFIX}/man/man6/${PORTNAME}.6
26		32
27	.include <bsd.port.mk>	33	.include <bsd.port.mk>

Lines 1-24 Link Here

(-)files/patch-Makefile (-24 lines)
1	--- Makefile.orig Tue Jun 8 19:12:04 1993
2	+++ Makefile Sun Sep 8 03:45:39 2002
3	@@ -1,9 +1,16 @@
4	-# @(#)Makefile 8.1 (Berkeley) 6/8/93
5	+# @(#)Makefile 8.1 (Berkeley) 5/31/93
6
7	PROG= xroach
8	-MAN6= xroach.0
9	-CFLAGS+= -I${.CURDIR}/bitmaps
10	-DPADD= ${LIBX} ${LIBM}
11	-LDADD= -lX11/X11 -lm
12	+MAN6= xroach.6
13	+
14	+DPADD+= ${LOCALBASE}/lib/libX11.a ${LIBM}
15	+CFLAGS+= -I${LOCALBASE}/include -I${.CURDIR}/bitmaps
16	+LDADD+= -L${LOCALBASE}/lib -lX11 -lm
17	+
18	+MANDIR= ${LOCALBASE}/man/man
19	+
20	+BINOWN= bin
21	+BINDIR= ${LOCALBASE}/bin
22	+BINMODE= 755
23
24	.include <bsd.prog.mk>

Lines 1-58 Link Here

(-)files/patch-xroach.c (-58 lines)
1	--- xroach.c.orig 1993-06-04 21:47:09.000000000 +0200
2	+++ xroach.c 2011-12-20 19:03:53.816175581 +0100
3	@@ -77,7 +77,7 @@
4	int MarkHiddenRoaches();
5	Pixel AllocNamedColor();
6
7	-void
8	+int
9	main(ac, av)
10	int ac;
11	char *av[];
12	@@ -96,19 +96,23 @@
13	/*
14	Process command line options.
15	*/
16	- for (ax=1; ax<ac; ax++) {
17	- arg = av[ax];
18	+ for (ax=1; ax<ac; ) {
19	+ arg = av[ax++];
20	+
21	+ if (ax >= ac)
22	+ Usage();
23	+
24	if (strcmp(arg, "-display") == 0) {
25	- display_name = av[++ax];
26	+ display_name = av[ax++];
27	}
28	else if (strcmp(arg, "-rc") == 0) {
29	- roachColor = av[++ax];
30	+ roachColor = av[ax++];
31	}
32	else if (strcmp(arg, "-speed") == 0) {
33	- roachSpeed = atof(av[++ax]);
34	+ roachSpeed = atof(av[ax++]);
35	}
36	else if (strcmp(arg, "-roaches") == 0) {
37	- maxRoaches = strtol(av[++ax], (char **)NULL, 0);
38	+ maxRoaches = strtol(av[ax++], (char **)NULL, 0);
39	}
40	else {
41	Usage();
42	@@ -212,6 +216,7 @@
43	CoverRoot();
44
45	XCloseDisplay(display);
46	+ return(0);
47	}
48
49	#define USEPRT(msg) fprintf(stderr, msg)
50	@@ -465,7 +470,7 @@
51	Region covered;
52	Region visible;
53	Window *children;
54	- int nChildren;
55	+ unsigned int nChildren;
56	Window dummy;
57	XWindowAttributes wa;
58	int wx;