Attachment 215269 Details for Bug 246507 – Patch

[patch] Patch

patch-netrek.diff (text/plain), 3.46 KB, created by Kevin Zheng on 2020-06-05 17:50:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Zheng

Created: 2020-06-05 17:50:07 UTC

Size: 3.46 KB

patch

obsolete

>commit ae1ebd19d1d19d844bb9b4e9e409aa658edff830
>Author: Kevin Zheng <kevinz5000@gmail.com>
>Date:   Sat May 16 09:35:08 2020 -0700
>
>    games/netrek-client-cow: Update to 3.3.2
>
>diff --git a/games/netrek-client-cow/Makefile b/games/netrek-client-cow/Makefile
>index 7cf0c453e6ac..9ad1a385864b 100644
>--- a/games/netrek-client-cow/Makefile
>+++ b/games/netrek-client-cow/Makefile
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	netrek-client-cow
>-PORTVERSION=	3.3.1
>-PORTREVISION=	5
>+PORTVERSION=	3.3.2
> CATEGORIES=	games
> MASTER_SITES=	http://www.netrek.org/files/COW/ \
> 		http://quozl.us.netrek.org/netrek/
>@@ -13,19 +12,14 @@ COMMENT=	Multi-player battle simulation with a Star Trek theme
> 
> LIB_DEPENDS=	libImlib2.so:graphics/imlib2
> 
>-LICENSE_FILE=	${WRKSRC}/COPYING
>-
> GNU_CONFIGURE=	yes
> USES=		gmake sdl
>+USE_XORG=	x11 xcb xau xdmcp xext xpm xxf86vm xcb
> USE_SDL=	sdl mixer
> 
>-CONFIGURE_ARGS+=	NORSA='\#'
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
> post-patch:
>-	${REINPLACE_CMD} -e 's|ushort  damage|unsigned short damage|' \
>-		${WRKSRC}/short.c
>-	${REINPLACE_CMD} -e 's|inline void|void|' \
>-		${WRKSRC}/local.[ch]
> 	${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' \
> 		${WRKSRC}/netrek-client-cow.desktop \
> 		${WRKSRC}/sound.c \
>@@ -35,4 +29,7 @@ post-patch:
> 	${REINPLACE_CMD} -e 's|games|bin|' \
> 		${WRKSRC}/netrek-client-cow.desktop
> 
>+post-install:
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/netrek-client-cow
>+
> .include <bsd.port.mk>
>diff --git a/games/netrek-client-cow/distinfo b/games/netrek-client-cow/distinfo
>index 29732713c04b..a04b3c7dfe2d 100644
>--- a/games/netrek-client-cow/distinfo
>+++ b/games/netrek-client-cow/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (netrek-client-cow-3.3.1.tar.gz) = a9e969bc5aa2a884481f81e8997e725ca18eedba01c018d7e7d383e85f183ae2
>-SIZE (netrek-client-cow-3.3.1.tar.gz) = 1793481
>+TIMESTAMP = 1589646417
>+SHA256 (netrek-client-cow-3.3.2.tar.gz) = cac219248d71033b62098c3da1ca6b4408974b22996da39eaba213b2253e6da3
>+SIZE (netrek-client-cow-3.3.2.tar.gz) = 1791293
>diff --git a/games/netrek-client-cow/files/patch-parsemeta.c b/games/netrek-client-cow/files/patch-parsemeta.c
>deleted file mode 100644
>index 2f08b9b62898..000000000000
>--- a/games/netrek-client-cow/files/patch-parsemeta.c
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- ./parsemeta.c.orig	2011-10-18 05:35:34.000000000 -0500
>-+++ ./parsemeta.c	2012-04-27 15:57:56.000000000 -0500
>-@@ -20,6 +20,7 @@
>- #include <arpa/inet.h>
>- #include <netdb.h>
>- #include <errno.h>
>-+#include <signal.h>
>- 
>- #include "Wlib.h"
>- #include "defs.h"
>diff --git a/games/netrek-client-cow/files/patch-system.mk.in b/games/netrek-client-cow/files/patch-system.mk.in
>index 908cb97acfa9..c612e0ff039d 100644
>--- a/games/netrek-client-cow/files/patch-system.mk.in
>+++ b/games/netrek-client-cow/files/patch-system.mk.in
>@@ -1,21 +1,11 @@
>---- ./system.mk.in.orig	2011-10-18 05:35:35.000000000 -0500
>-+++ ./system.mk.in	2012-04-27 15:59:00.000000000 -0500
>-@@ -9,8 +9,7 @@
>+--- system.mk.in.orig	2020-05-16 16:32:14 UTC
>++++ system.mk.in
>+@@ -9,7 +9,7 @@ exec_prefix=@exec_prefix@
>  datarootdir=@datarootdir@
>  
>  DESTDIR=
> -BINDIR=${prefix}/games
>--DOCDIR=${datarootdir}/doc/${PACKAGE}
> +BINDIR=${prefix}/bin
>  PIXMAPDIR=${datarootdir}/pixmaps/${PACKAGE}
>  APPDIR=${datarootdir}/applications
>  
>-@@ -200,8 +199,6 @@
>- install: netrek-client-cow
>- 	mkdir -p $(DESTDIR)$(BINDIR)
>- 	install netrek-client-cow $(DESTDIR)$(BINDIR)
>--	mkdir -p $(DESTDIR)$(DOCDIR)
>--	cp $(KEYFILE) $(DESTDIR)$(DOCDIR)
>- 	mkdir -p $(DESTDIR)$(PIXMAPDIR)
>- 	cp -pr pixmaps/* $(DESTDIR)$(PIXMAPDIR)/
>- 	mkdir -p $(DESTDIR)$(APPDIR)

Flags:

kevinz5000: maintainer-approval+

Actions: View | Diff

Attachments on bug 246507: 214556 | 215269