Attachment 190594 Details for Bug 225867 – svn patch

[patch] svn patch

xroach-4.4_2.diff (text/plain), 4.62 KB, created by Philipp Engel on 2018-02-13 20:57:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Engel

Created: 2018-02-13 20:57:23 UTC

Size: 4.62 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 448602)
>+++ Makefile	(working copy)
>@@ -5,23 +5,29 @@
> PORTVERSION=	4.4
> PORTREVISION=	2
> CATEGORIES=	games
>-MASTER_SITES=	http://www.skysmurf.nl/comp/FreeBSD/distfiles/
>+MASTER_SITES=	https://cyber.dabamos.de/pub/distfiles/
> DISTNAME=	${PORTNAME}
>+MAN6=	xroach.6
> 
>-MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	Cockroaches hide under your windows
>+DPADD+=		${LOCALBASE}/lib/libX11.a ${LIBM}
>+CFLAGS+=	-I${LOCALBASE}/include
>+LDADD+=		-L${LOCALBASE}/lib -lX11 -lm
> 
>-BROKEN=		unfetchable (apparently abandoned upstream)
>-DEPRECATED=	Broken for more than 6 months
>-EXPIRATION_DATE=	2017-08-23
>+MANDIR=${LOCALBASE}/man/man
> 
>-USE_XORG=	x11
>-PLIST_FILES=	bin/xroach man/man6/xroach.6.gz
>+BINOWN=		bin
>+BINDIR=		${LOCALBASE}/bin
>+BINMODE=	755
> 
>-WRKSRC=		${WRKDIR}/pub/bsd-sources/4.4BSD-Lite/usr/src/games/xroach
>+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}/xroach.6 ${STAGEDIR}${MAN6PREFIX}/man/man6
>+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.man ${STAGEDIR}${MAN6PREFIX}/man/man6/${PORTNAME}.6
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 448602)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (xroach.tar.gz) = 88a4e436b7d93d34b062e548366af1eda62a1402518793b14339e9f5fde4b0da
>-SIZE (xroach.tar.gz) = 15404
>+SHA256 (xroach.tar.gz) = 819ee19f8c333d9adaa4ab58829445112e1865b85a6ca82296d66399af344e07
>+SIZE (xroach.tar.gz) = 21694
>Index: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(revision 448602)
>+++ files/patch-Makefile	(nonexistent)
>@@ -1,24 +0,0 @@
>---- 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>
>
>Property changes on: files/patch-Makefile
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-xroach.c
>===================================================================
>--- files/patch-xroach.c	(revision 448602)
>+++ files/patch-xroach.c	(nonexistent)
>@@ -1,58 +0,0 @@
>---- 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;
>
>Property changes on: files/patch-xroach.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 225867: 190583 | 190584 | 190586 | 190594 | 190595