Attachment #137763 for bug #183449

View | Details | Raw Unified | Return to bug 183449
Collapse All | Expand All




# $FreeBSD: games/assaultcube/Makefile 330111 2013-10-12 02:24:14Z danilo $

PORTNAME=	assaultcube
PORTVERSION=	1.2.0.1
CATEGORIES=	games
MASTER_SITES=	SF/actiongame/AssaultCube%20Version%20${PORTVERSION}
DISTNAME=	AssaultCube_v${PORTVERSION}

CONFIGURE_WRKSRC=	${WRKSRC}/source/enet
BUILD_WRKSRC=	${WRKSRC}/source/src

PORTDATA=	config packages scripts
PORTDOCS=	*

OPTIONS_DEFINE=	DOCS

ACUBE_BIN+=	client

DESKTOP_ENTRIES="AssaultCube" "${COMMENT}" \
	"${PREFIX}/share/pixmaps/${PORTNAME}.png" "${PORTNAME}_client" \
	"Game;" false
.endif


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

	${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>

Lines 1-2 Link Here

(-)assaultcube/distinfo (-2 / +2 lines)
1	SHA256 (AssaultCube_v1.2.0.0.tar.bz2) = 90b4a7278645d3297f3031b77f9ce3d9a059c2edd6b465fe4c9b0d7514b06a61	1	SHA256 (AssaultCube_v1.2.0.1.tar.bz2) = 76862193ff61291f4125f9a12130cfda1163afff56624156853ba12b83ebf65d
2	SIZE (AssaultCube_v1.2.0.0.tar.bz2) = 52756452	2	SIZE (AssaultCube_v1.2.0.1.tar.bz2) = 53144394




--- 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)

 
 INCLUDES= -I. -Ibot -I../enet/include
 
@@ -22,8 +20,8 @@
 else
 USRLIB=$(shell if [ -e /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi)
 # 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

 endif
 
 CLIENT_OBJS= \
@@ -87,8 +85,8 @@
 SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I../include
 SERVER_LIBS= -L../lib -lzdll -lenet -llibintl -lws2_32 -lwinmm
 else

Return to bug 183449

Lines 2-8 Link Here

(-)assaultcube/Makefile (-3 / +16 lines)
2	# $FreeBSD: games/assaultcube/Makefile 330111 2013-10-12 02:24:14Z danilo $	2	# $FreeBSD: games/assaultcube/Makefile 330111 2013-10-12 02:24:14Z danilo $
3		3
4	PORTNAME= assaultcube	4	PORTNAME= assaultcube
5	PORTVERSION= 1.2.0.0	5	PORTVERSION= 1.2.0.1
6	CATEGORIES= games	6	CATEGORIES= games
7	MASTER_SITES= SF/actiongame/AssaultCube%20Version%20${PORTVERSION}	7	MASTER_SITES= SF/actiongame/AssaultCube%20Version%20${PORTVERSION}
8	DISTNAME= AssaultCube_v${PORTVERSION}	8	DISTNAME= AssaultCube_v${PORTVERSION}
Lines 32-38 Link Here
32	CONFIGURE_WRKSRC= ${WRKSRC}/source/enet	32	CONFIGURE_WRKSRC= ${WRKSRC}/source/enet
33	BUILD_WRKSRC= ${WRKSRC}/source/src	33	BUILD_WRKSRC= ${WRKSRC}/source/src
34		34
35	PORTDATA= config demos packages	35	PORTDATA= config packages scripts
36	PORTDOCS= *	36	PORTDOCS= *
37		37
38	OPTIONS_DEFINE= DOCS	38	OPTIONS_DEFINE= DOCS
Lines 55-61 Link Here
55	ACUBE_BIN+= client	55	ACUBE_BIN+= client
56		56
57	DESKTOP_ENTRIES="AssaultCube" "${COMMENT}" \	57	DESKTOP_ENTRIES="AssaultCube" "${COMMENT}" \
58	"${DATADIR}/packages/misc/startscreen.png" "${PORTNAME}_client" \	58	"${PREFIX}/share/pixmaps/${PORTNAME}.png" "${PORTNAME}_client" \
59	"Game;" false	59	"Game;" false
60	.endif	60	.endif
61		61
Lines 71-76 Link Here
71	ACUBE_BIN+= master	71	ACUBE_BIN+= master
72	.endif	72	.endif
73		73
		74	pre-install: .SILENT
		75	.if !defined(NOPORTDATA)
		76	# Current STAGEDIR doesn't create empty directories for package,
		77	# in case of dynamically generated TMPPLIST, where these directories exist
		78	${RMDIR} ${WRKSRC}/packages/maps/servermaps/incoming
		79	.endif
		80
74	do-install:	81	do-install:
75	.for f in ${ACUBE_BIN}	82	.for f in ${ACUBE_BIN}
76	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}_${f} ${STAGEDIR}${PREFIX}/bin	83	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}_${f} ${STAGEDIR}${PREFIX}/bin
Lines 84-94 Link Here
84	${MKDIR} ${STAGEDIR}${DOCSDIR}	91	${MKDIR} ${STAGEDIR}${DOCSDIR}
85	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}	92	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
86	.endif	93	.endif
		94	.if ${PORT_OPTIONS:MCLIENT}
		95	${INSTALL_DATA} ${WRKSRC}/docs/images/icon.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
		96	.endif
87		97
88	post-install:	98	post-install:
89	.for f in ${ACUBE_BIN}	99	.for f in ${ACUBE_BIN}
90	@${ECHO_CMD} bin/${PORTNAME}_${f} >> ${TMPPLIST}	100	@${ECHO_CMD} bin/${PORTNAME}_${f} >> ${TMPPLIST}
91	@${ECHO_CMD} libexec/${PORTNAME}_${f} >> ${TMPPLIST}	101	@${ECHO_CMD} libexec/${PORTNAME}_${f} >> ${TMPPLIST}
92	.endfor	102	.endfor
		103	.if ${PORT_OPTIONS:MCLIENT}
		104	@${ECHO_CMD} share/pixmaps/${PORTNAME}.png >> ${TMPPLIST}
		105	.endif
93		106
94	.include <bsd.port.mk>	107	.include <bsd.port.mk>

Lines 1-7 Link Here

(-)assaultcube/files/patch-source_src_Makefile (-6 / +7 lines)
1	--- source/src/Makefile.orig 2013-10-09 23:35:27.000000000 +0400	1	--- source/src/Makefile.orig 2013-10-29 13:20:58.000000000 +0400
2	+++ source/src/Makefile 2013-10-11 02:18:50.000000000 +0400	2	+++ source/src/Makefile 2013-10-29 17:00:06.000000000 +0400
3	@@ -1,8 +1,7 @@	3	@@ -1,9 +1,7 @@
4	-CXXFLAGS= -O3 -fomit-frame-pointer	4	-CXXFLAGS= -O3 -fomit-frame-pointer
		5	-CXX=clang++ # Use clang++, as g++ optimizations cause crashes...
5	override CXXFLAGS+= -Wall -fsigned-char	6	override CXXFLAGS+= -Wall -fsigned-char
6		7
7	PLATFORM= $(shell uname -s)	8	PLATFORM= $(shell uname -s)
Lines 10-19 Link Here
10		11
11	INCLUDES= -I. -Ibot -I../enet/include	12	INCLUDES= -I. -Ibot -I../enet/include
12		13
13	@@ -21,8 +20,8 @@	14	@@ -22,8 +20,8 @@
14	else	15	else
15	USRLIB=$(shell if [ -e /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi)	16	USRLIB=$(shell if [ -e /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi)
16	override CXXFLAGS+= -rdynamic	17	# override CXXFLAGS+= -rdynamic # clang++ doesn't use this...
17	-CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl-config --cflags` -idirafter ../include	18	-CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl-config --cflags` -idirafter ../include
18	-CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) -lX11 `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl	19	-CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) -lX11 `sdl-config --libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile -lcurl
19	+CLIENT_INCLUDES= $(INCLUDES) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags` -idirafter ../include	20	+CLIENT_INCLUDES= $(INCLUDES) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags` -idirafter ../include
Lines 21-27 Link Here
21	endif	22	endif
22		23
23	CLIENT_OBJS= \	24	CLIENT_OBJS= \
24	@@ -86,8 +85,8 @@	25	@@ -87,8 +85,8 @@
25	SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I../include	26	SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I../include
26	SERVER_LIBS= -L../lib -lzdll -lenet -llibintl -lws2_32 -lwinmm	27	SERVER_LIBS= -L../lib -lzdll -lenet -llibintl -lws2_32 -lwinmm
27	else	28	else