Attachment 146752 Details for Bug 190969 – Proposed patch (since 361986 revision)

[patch] Proposed patch (since 361986 revision)

warsow_1.5,1-1.51.diff (text/plain), 3.12 KB, created by lightside on 2014-09-03 21:00:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2014-09-03 21:00:07 UTC

Size: 3.12 KB

patch

obsolete

>diff -ruN warsow.orig/Makefile warsow/Makefile
>--- warsow.orig/Makefile	2014-07-15 21:37:38.000000000 +0400
>+++ warsow/Makefile	2014-09-03 23:22:38.000000000 +0400
>@@ -2,12 +2,11 @@
> # $FreeBSD: head/games/warsow/Makefile 361986 2014-07-15 17:37:38Z adamw $
> 
> PORTNAME=	warsow
>-PORTVERSION=	1.5
>-PORTREVISION=	1
>+PORTVERSION=	1.51
> CATEGORIES=	games
>-MASTER_SITES=	SF/warsow.mirror/Warsow%20${PORTVERSION} \
>-		http://www.warsow.net:1337/~warsow/${PORTVERSION}/
>-DISTNAME=	${PORTNAME}_${PORTVERSION:S/.//}_sdk
>+MASTER_SITES=	SF/warsow.mirror/Warsow%20${PORTVERSION}
>+DISTNAME=	${PORTNAME}_${PORTVERSION}_sdk
>+EXTRACT_SUFX=	.tar.gz.1
> DIST_SUBDIR=	${PORTNAME}
> 
> MAINTAINER=	games@FreeBSD.org
>@@ -16,6 +15,7 @@
> LICENSE=	GPLv2
> 
> LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
>+RUN_DEPENDS=	${DATADIR}/basewsw/data1_15.pk3:${PORTSDIR}/games/warsow-data
> 
> ONLY_FOR_ARCHS=	i386 amd64
> 
>@@ -28,7 +28,7 @@
> 
> PLIST_FILES=	%%DATADIR%%/basewsw/game_${ARCH}.so \
> 		%%DATADIR%%/libs/angelwrap_${ARCH}.so
>-PLIST_DIRS=	%%DATADIR%%/basewsw %%DATADIR%%/libs %%DATADIR%%
>+PLIST_DIRS=	%%DATADIR%%/libs
> 
> OPTIONS_DEFINE=	CLIENT SERVER FTLIB REF_GL QF OPENAL IRC CIN TV_SRV DOCS
> OPTIONS_DEFAULT=	CLIENT SERVER FTLIB REF_GL QF OPENAL IRC CIN TV_SRV
>@@ -57,7 +57,7 @@
> 
> DESKTOP_ENTRIES="Warsow" "${COMMENT}" \
> 	"${PREFIX}/share/pixmaps/warsow128x128.xpm" "${PORTNAME}" \
>-	"Game;Shooter;" ""
>+	"Game;Shooter;" false
> 
> . if ${PORT_OPTIONS:MFTLIB} || ${PORT_OPTIONS:MREF_GL}
> LIB_DEPENDS+=	libpng15.so:${PORTSDIR}/graphics/png
>@@ -142,8 +142,6 @@
> 	${INSTALL_DATA} ${WRKSRC}/unix/warsow128x128.xpm \
> 		${STAGEDIR}${PREFIX}/share/pixmaps
> .endif
>-
>-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/../../docs/|} ${STAGEDIR}${DOCSDIR}
>+	cd ${WRKDIR}/docs && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}
> 
> .include <bsd.port.mk>
>diff -ruN warsow.orig/distinfo warsow/distinfo
>--- warsow.orig/distinfo	2014-06-04 21:50:43.000000000 +0400
>+++ warsow/distinfo	2014-06-12 17:24:19.000000000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (warsow/warsow_15_sdk.tar.gz) = 277bbe87744352ee02476dc1bf9258ed5b204345b1b8eb394442dcec6a956949
>-SIZE (warsow/warsow_15_sdk.tar.gz) = 89175325
>+SHA256 (warsow/warsow_1.51_sdk.tar.gz.1) = ac635c654e088566d30d53e8fab21abd2d40762d7f4ab0e09faa827aac5c4f97
>+SIZE (warsow/warsow_1.51_sdk.tar.gz.1) = 89191554
>diff -ruN warsow.orig/files/patch-Makefile warsow/files/patch-Makefile
>--- warsow.orig/files/patch-Makefile	2014-06-04 21:50:43.000000000 +0400
>+++ warsow/files/patch-Makefile	2014-06-12 17:45:08.000000000 +0400
>@@ -1,5 +1,5 @@
>---- Makefile.orig	2014-05-02 01:12:05.000000000 +0400
>-+++ Makefile	2014-05-07 12:00:03.000000000 +0400
>+--- Makefile.orig	2014-06-08 16:08:05.000000000 +0400
>++++ Makefile	2014-06-12 17:44:20.000000000 +0400
> @@ -54,21 +54,13 @@
>  else
>  CC?=gcc
>@@ -37,7 +37,7 @@
>  else
>  LDFLAGS_COMMON+= -L$(LOCALBASE)/lib -lm -ldl -O1 -Wl,--as-needed
>  endif
>-@@ -358,12 +351,9 @@
>+@@ -357,12 +350,9 @@
>  ######################################################################################################
>  # Helper functions
>  ######################################################################################################

Actions: View | Diff

Attachments on bug 190969: 143710 | 144866 | 146752 | 146753 | 147343 | 147711