Attachment 137763 Details for Bug 183449 – file.diff

[patch] file.diff

file.diff (text/plain), 3.88 KB, created by lightside on 2013-10-29 16:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2013-10-29 16:30:00 UTC

Size: 3.88 KB

patch

obsolete

>diff -ruN assaultcube.orig/Makefile assaultcube/Makefile
>--- assaultcube.orig/Makefile	2013-10-12 06:24:14.000000000 +0400
>+++ assaultcube/Makefile	2013-10-29 19:29:16.000000000 +0400
>@@ -2,7 +2,7 @@
> # $FreeBSD: games/assaultcube/Makefile 330111 2013-10-12 02:24:14Z danilo $
> 
> PORTNAME=	assaultcube
>-PORTVERSION=	1.2.0.0
>+PORTVERSION=	1.2.0.1
> CATEGORIES=	games
> MASTER_SITES=	SF/actiongame/AssaultCube%20Version%20${PORTVERSION}
> DISTNAME=	AssaultCube_v${PORTVERSION}
>@@ -32,7 +32,7 @@
> CONFIGURE_WRKSRC=	${WRKSRC}/source/enet
> BUILD_WRKSRC=	${WRKSRC}/source/src
> 
>-PORTDATA=	config demos packages
>+PORTDATA=	config packages scripts
> PORTDOCS=	*
> 
> OPTIONS_DEFINE=	DOCS
>@@ -55,7 +55,7 @@
> ACUBE_BIN+=	client
> 
> DESKTOP_ENTRIES="AssaultCube" "${COMMENT}" \
>-	"${DATADIR}/packages/misc/startscreen.png" "${PORTNAME}_client" \
>+	"${PREFIX}/share/pixmaps/${PORTNAME}.png" "${PORTNAME}_client" \
> 	"Game;" false
> .endif
> 
>@@ -71,6 +71,13 @@
> ACUBE_BIN+=	master
> .endif
> 
>+pre-install: .SILENT
>+.if !defined(NOPORTDATA)
>+	# 	Current STAGEDIR doesn't create empty directories for package,
>+	# in case of dynamically generated TMPPLIST, where these directories exist
>+	${RMDIR} ${WRKSRC}/packages/maps/servermaps/incoming
>+.endif
>+
> do-install:
> .for f in ${ACUBE_BIN}
> 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}_${f} ${STAGEDIR}${PREFIX}/bin
>@@ -84,11 +91,17 @@
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
> .endif
>+.if ${PORT_OPTIONS:MCLIENT}
>+	${INSTALL_DATA} ${WRKSRC}/docs/images/icon.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
>+.endif
> 
> post-install:
> .for f in ${ACUBE_BIN}
> 	@${ECHO_CMD} bin/${PORTNAME}_${f} >> ${TMPPLIST}
> 	@${ECHO_CMD} libexec/${PORTNAME}_${f} >> ${TMPPLIST}
> .endfor
>+.if ${PORT_OPTIONS:MCLIENT}
>+	@${ECHO_CMD} share/pixmaps/${PORTNAME}.png >> ${TMPPLIST}
>+.endif
> 
> .include <bsd.port.mk>
>diff -ruN assaultcube.orig/distinfo assaultcube/distinfo
>--- assaultcube.orig/distinfo	2013-10-12 06:24:14.000000000 +0400
>+++ assaultcube/distinfo	2013-10-29 17:08:13.000000000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (AssaultCube_v1.2.0.0.tar.bz2) = 90b4a7278645d3297f3031b77f9ce3d9a059c2edd6b465fe4c9b0d7514b06a61
>-SIZE (AssaultCube_v1.2.0.0.tar.bz2) = 52756452
>+SHA256 (AssaultCube_v1.2.0.1.tar.bz2) = 76862193ff61291f4125f9a12130cfda1163afff56624156853ba12b83ebf65d
>+SIZE (AssaultCube_v1.2.0.1.tar.bz2) = 53144394
>diff -ruN assaultcube.orig/files/patch-source_src_Makefile assaultcube/files/patch-source_src_Makefile
>--- assaultcube.orig/files/patch-source_src_Makefile	2013-10-12 06:24:14.000000000 +0400
>+++ assaultcube/files/patch-source_src_Makefile	2013-10-29 17:01:29.000000000 +0400
>@@ -1,7 +1,8 @@
>---- source/src/Makefile.orig	2013-10-09 23:35:27.000000000 +0400
>-+++ source/src/Makefile	2013-10-11 02:18:50.000000000 +0400
>-@@ -1,8 +1,7 @@
>+--- source/src/Makefile.orig	2013-10-29 13:20:58.000000000 +0400
>++++ source/src/Makefile	2013-10-29 17:00:06.000000000 +0400
>+@@ -1,9 +1,7 @@
> -CXXFLAGS= -O3 -fomit-frame-pointer
>+-CXX=clang++	# Use clang++, as g++ optimizations cause crashes...
>  override CXXFLAGS+= -Wall -fsigned-char
>  
>  PLATFORM= $(shell uname -s)
>@@ -10,10 +11,10 @@
>  
>  INCLUDES= -I. -Ibot -I../enet/include
>  
>-@@ -21,8 +20,8 @@
>+@@ -22,8 +20,8 @@
>  else
>  USRLIB=$(shell if [ -e /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi)
>- override CXXFLAGS+= -rdynamic
>+ # override CXXFLAGS+= -rdynamic		# clang++ doesn't use this...
> -CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl-config --cflags` -idirafter ../include
> -CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) -lX11 `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl
> +CLIENT_INCLUDES= $(INCLUDES) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags` -idirafter ../include
>@@ -21,7 +22,7 @@
>  endif
>  
>  CLIENT_OBJS= \
>-@@ -86,8 +85,8 @@
>+@@ -87,8 +85,8 @@
>  SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I../include
>  SERVER_LIBS= -L../lib -lzdll -lenet -llibintl -lws2_32 -lwinmm
>  else

Actions: View | Diff

Attachments on bug 183449: 137763