Attachment #111099 for bug #152316

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




#

PORTNAME=	sauerbraten
PORTVERSION=	20100728
PORTREVISION=	4
CATEGORIES=	games
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2010_07_19
DISTNAME=	${PORTNAME}_2010_07_28_justice_edition_linux

MAINTAINER=	acm@FreeBSD.org
COMMENT=	First person shooter based on Cube

USE_BZIP2=	yes
CONFIGURE_ENV=	ACLOCAL=true AUTOCONF=true AUTOMAKE=true
CONFIGURE_WRKSRC=	${WRKSRC}/src/enet
CONFIGURE_ARGS=	--enable-shared=no --enable-static=yes
BUILD_WRKSRC=	${WRKSRC}/src
WRKSRC=		${WRKDIR}/${PORTNAME}
ALL_TARGET=	libenet
MAKE_JOBS_SAFE=	yes

PORTDATA=	data packages
PORTDOCS=	*

OPTIONS=	CLIENT "Build client" on \
		DEDICATED "Build dedicated server" on \
		MASTER "Build master server" off

SUB_FILES=	sauer_client sauer_master sauer_server pkg-message

.include <bsd.port.pre.mk>

.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED) && defined(WITHOUT_MASTER)
IGNORE=		needs at least one executable (CLIENT, DEDICATED or MASTER)
.endif

.if !defined(WITHOUT_CLIENT)
USE_GL=		yes
USE_SDL=	image mixer sdl
ALL_TARGET+=	client
PLIST_SUB+=	CLIENT=""
SAUER_BIN+=	client
.else
PLIST_SUB+=	CLIENT="@comment "
.endif

.if !defined(WITHOUT_DEDICATED)
ALL_TARGET+=	server
PLIST_SUB+=	DEDICATED=""
SAUER_BIN+=	server
.endif

.if !defined(WITHOUT_MASTER)
ALL_TARGET+=	master
SAUER_BIN+=	master
.endif

post-extract:

	${INSTALL_SCRIPT} ${WRKDIR}/sauer_${f} ${PREFIX}/bin
	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/sauer_${f} ${PREFIX}/libexec
.endfor
.if !defined(NOPORTDATA)
	${MKDIR} ${DATADIR}
	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${DATADIR}
.endif
.if !defined(NOPORTDOCS)
	${MKDIR} ${DOCSDIR}
	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
.endif

post-install:
.for f in ${SAUER_BIN}
	@${ECHO_CMD} bin/sauer_${f} >> ${TMPPLIST}
	@${ECHO_CMD} libexec/sauer_${f} >> ${TMPPLIST}
.endfor
	@${ECHO_CMD}
	@${CAT} ${PKGMESSAGE}
	@${ECHO_CMD}

Lines 1-3 Link Here

(-)sauerbraten/distinfo (-3 / +3 lines)
1	MD5 (sauerbraten_2009_05_04_trooper_edition_linux.tar.bz2) = 47a37d1989a0c666e07235a88b4891aa	1	MD5 (sauerbraten_2010_07_28_justice_edition_linux.tar.bz2) = 0947cb37b628873063270be1fcce27f6
2	SHA256 (sauerbraten_2009_05_04_trooper_edition_linux.tar.bz2) = 92cf9e2a1711626d2d31fccbf501e36805cefe40374b9b026491768209e593cc	2	SHA256 (sauerbraten_2010_07_28_justice_edition_linux.tar.bz2) = 185e5dbf41a4426af5f692e49afa69237e23976ef3b368f43ec6aa19fb3cc86c
3	SIZE (sauerbraten_2009_05_04_trooper_edition_linux.tar.bz2) = 360896105	3	SIZE (sauerbraten_2010_07_28_justice_edition_linux.tar.bz2) = 464652953




--- src/Makefile.orig	2010-05-14 01:30:28.000000000 +0700
+++ src/Makefile	2010-09-24 18:44:00.000000000 +0700
@@ -1,8 +1,7 @@
-CXXFLAGS= -O3 -fomit-frame-pointer
 override CXXFLAGS+= -Wall -fsigned-char

 
 INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include
 
@@ -20,8 +19,8 @@
 CLIENT_INCLUDES= $(INCLUDES) -Iinclude
 CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm
 else	
-CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
-CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
+CLIENT_INCLUDES= $(INCLUDES) `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
+CLIENT_LIBS= -Lenet/.libs -lenet `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lSDL_image -lSDL_mixer -lz -lGL
 endif
 ifeq ($(PLATFORM),Linux)
 CLIENT_LIBS+= -lrt
@@ -90,8 +89,8 @@
 SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -Iinclude
 SERVER_LIBS= -Llib -lzdll -lenet -lws2_32 -lwinmm
 else
-SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
-SERVER_LIBS= -Lenet/.libs -lenet -lz
+SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I${LOCALBASE}/include
+SERVER_LIBS= -Lenet/.libs -lenet -lz -L${LOCALBASE}/lib
 endif
 SERVER_OBJS= \
 	shared/crypto-standalone.o \




#!/bin/sh

# The executable needs to be run from its data directory, and needs to store
# configuration in it. We therefore mirror the data directory hierarchy in
# ~/.sauerbraten, and create symlinks to the data files.

if [ -d ~/.sauerbraten ]
then
	echo "Using existing ~/.sauerbraten directory."
else
	echo "Creating ~/.sauerbraten directory."
	cd %%DATADIR%% || exit 1
	find * -type d -exec mkdir -p ~/.sauerbraten/{} \;
	find * -type f -exec ln -s %%DATADIR%%/{} ~/.sauerbraten/{} \; 2>/dev/null
fi

cd ~/.sauerbraten || exit 1
exec %%PREFIX%%/libexec/sauer_master "$@"

Return to bug 152316

Lines 6-16 Link Here

(-)sauerbraten/Makefile (-15 / +22 lines)
6	#	6	#
7		7
8	PORTNAME= sauerbraten	8	PORTNAME= sauerbraten
9	PORTVERSION= 20090504	9	PORTVERSION= 20100728
10	PORTREVISION= 4
11	CATEGORIES= games	10	CATEGORIES= games
12	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2009_05_04	11	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2010_07_19
13	DISTNAME= ${PORTNAME}_2009_05_04_trooper_edition_linux	12	DISTNAME= ${PORTNAME}_2010_07_28_justice_edition_linux
14		13
15	MAINTAINER= acm@FreeBSD.org	14	MAINTAINER= acm@FreeBSD.org
16	COMMENT= First person shooter based on Cube	15	COMMENT= First person shooter based on Cube
Lines 20-59 Link Here
20	USE_BZIP2= yes	19	USE_BZIP2= yes
21	CONFIGURE_ENV= ACLOCAL=true AUTOCONF=true AUTOMAKE=true	20	CONFIGURE_ENV= ACLOCAL=true AUTOCONF=true AUTOMAKE=true
22	CONFIGURE_WRKSRC= ${WRKSRC}/src/enet	21	CONFIGURE_WRKSRC= ${WRKSRC}/src/enet
		22	CONFIGURE_ARGS= --enable-shared=no --enable-static=yes
23	BUILD_WRKSRC= ${WRKSRC}/src	23	BUILD_WRKSRC= ${WRKSRC}/src
24	WRKSRC= ${WRKDIR}/${PORTNAME}	24	WRKSRC= ${WRKDIR}/${PORTNAME}
25	ALL_TARGET= libenet	25	ALL_TARGET= libenet
26	MAKE_JOBS_SAFE= yes	26	MAKE_JOBS_SAFE= yes
27		27
		28	PORTDATA= data packages
28	PORTDOCS= *	29	PORTDOCS= *
29		30
30	OPTIONS= CLIENT "Build client" on \	31	OPTIONS= CLIENT "Build client" on \
31	DEDICATED "Build dedicated server" on	32	DEDICATED "Build dedicated server" on \
		33	MASTER "Build master server" off
32		34
33	SUB_FILES= sauer_client sauer_server pkg-message	35	SUB_FILES= sauer_client sauer_master sauer_server pkg-message
34		36
35	.include <bsd.port.pre.mk>	37	.include <bsd.port.pre.mk>
36		38
37	.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED)	39	.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED) && defined(WITHOUT_MASTER)
38	IGNORE= needs at least one executable (CLIENT or DEDICATED)	40	IGNORE= needs at least one executable (CLIENT, DEDICATED or MASTER)
39	.endif	41	.endif
40		42
41	.if !defined(WITHOUT_CLIENT)	43	.if !defined(WITHOUT_CLIENT)
42	USE_GL= yes	44	USE_GL= yes
43	USE_SDL= image mixer sdl	45	USE_SDL= image mixer sdl
44	ALL_TARGET+= client	46	ALL_TARGET+= client
45	PLIST_SUB+= CLIENT=""
46	SAUER_BIN+= client	47	SAUER_BIN+= client
47	.else
48	PLIST_SUB+= CLIENT="@comment "
49	.endif	48	.endif
50		49
51	.if !defined(WITHOUT_DEDICATED)	50	.if !defined(WITHOUT_DEDICATED)
52	ALL_TARGET+= server	51	ALL_TARGET+= server
53	PLIST_SUB+= DEDICATED=""
54	SAUER_BIN+= server	52	SAUER_BIN+= server
55	.else	53	.endif
56	PLIST_SUB+= DEDICATED="@comment "	54
		55	.if !defined(WITHOUT_MASTER)
		56	ALL_TARGET+= master
		57	SAUER_BIN+= master
57	.endif	58	.endif
58		59
59	post-extract:	60	post-extract:
Lines 69-82 Link Here
69	${INSTALL_SCRIPT} ${WRKDIR}/sauer_${f} ${PREFIX}/bin	70	${INSTALL_SCRIPT} ${WRKDIR}/sauer_${f} ${PREFIX}/bin
70	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/sauer_${f} ${PREFIX}/libexec	71	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/sauer_${f} ${PREFIX}/libexec
71	.endfor	72	.endfor
		73	.if !defined(NOPORTDATA)
72	${MKDIR} ${DATADIR}	74	${MKDIR} ${DATADIR}
73	cd ${WRKSRC} && ${COPYTREE_SHARE} "packages data" ${DATADIR}/	75	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${DATADIR}
		76	.endif
74	.if !defined(NOPORTDOCS)	77	.if !defined(NOPORTDOCS)
75	${MKDIR} ${DOCSDIR}	78	${MKDIR} ${DOCSDIR}
76	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}	79	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
77	.endif	80	.endif
78		81
79	post-install:	82	post-install:
		83	.for f in ${SAUER_BIN}
		84	@${ECHO_CMD} bin/sauer_${f} >> ${TMPPLIST}
		85	@${ECHO_CMD} libexec/sauer_${f} >> ${TMPPLIST}
		86	.endfor
80	@${ECHO_CMD}	87	@${ECHO_CMD}
81	@${CAT} ${PKGMESSAGE}	88	@${CAT} ${PKGMESSAGE}
82	@${ECHO_CMD}	89	@${ECHO_CMD}

Lines 1-5 Link Here

(-)sauerbraten/files/patch-src_Makefile (-8 / +8 lines)
1	--- src/Makefile.orig 2009-04-22 21:47:44.000000000 +0400	1	--- src/Makefile.orig 2010-05-14 01:30:28.000000000 +0700
2	+++ src/Makefile 2009-05-07 19:07:39.000000000 +0400	2	+++ src/Makefile 2010-09-24 18:44:00.000000000 +0700
3	@@ -1,8 +1,7 @@	3	@@ -1,8 +1,7 @@
4	-CXXFLAGS= -O3 -fomit-frame-pointer	4	-CXXFLAGS= -O3 -fomit-frame-pointer
5	override CXXFLAGS+= -Wall -fsigned-char	5	override CXXFLAGS+= -Wall -fsigned-char
Lines 10-34 Link Here
10		10
11	INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include	11	INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include
12		12
13	@@ -18,8 +17,8 @@	13	@@ -20,8 +19,8 @@
14	CLIENT_INCLUDES= $(INCLUDES) -Iinclude	14	CLIENT_INCLUDES= $(INCLUDES) -Iinclude
15	CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm	15	CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm
16	else	16	else
17	-CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`	17	-CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
18	-CLIENT_LIBS= -Lenet -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL	18	-CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
19	+CLIENT_INCLUDES= $(INCLUDES) `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include	19	+CLIENT_INCLUDES= $(INCLUDES) `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
20	+CLIENT_LIBS= -Lenet -lenet `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lSDL_image -lSDL_mixer -lz -lGL	20	+CLIENT_LIBS= -Lenet/.libs -lenet `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lSDL_image -lSDL_mixer -lz -lGL
21	endif	21	endif
22	ifeq ($(PLATFORM),Linux)	22	ifeq ($(PLATFORM),Linux)
23	CLIENT_LIBS+= -lrt	23	CLIENT_LIBS+= -lrt
24	@@ -88,8 +87,8 @@	24	@@ -90,8 +89,8 @@
25	SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -Iinclude	25	SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -Iinclude
26	SERVER_LIBS= -Llib -lzdll -lenet -lws2_32 -lwinmm	26	SERVER_LIBS= -Llib -lzdll -lenet -lws2_32 -lwinmm
27	else	27	else
28	-SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)	28	-SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
29	-SERVER_LIBS= -Lenet -lenet -lz	29	-SERVER_LIBS= -Lenet/.libs -lenet -lz
30	+SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I${LOCALBASE}/include	30	+SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I${LOCALBASE}/include
31	+SERVER_LIBS= -Lenet -lenet -lz -L${LOCALBASE}/lib	31	+SERVER_LIBS= -Lenet/.libs -lenet -lz -L${LOCALBASE}/lib
32	endif	32	endif
33	SERVER_OBJS= \	33	SERVER_OBJS= \
34	shared/crypto-standalone.o \	34	shared/crypto-standalone.o \

Line 0 Link Here

(-)sauerbraten/files/sauer_master.in (+18 lines)
	1	#!/bin/sh
	2
	3	# The executable needs to be run from its data directory, and needs to store
	4	# configuration in it. We therefore mirror the data directory hierarchy in
	5	# ~/.sauerbraten, and create symlinks to the data files.
	6
	7	if [ -d ~/.sauerbraten ]
	8	then
	9	echo "Using existing ~/.sauerbraten directory."
	10	else
	11	echo "Creating ~/.sauerbraten directory."
	12	cd %%DATADIR%% \|\| exit 1
	13	find * -type d -exec mkdir -p ~/.sauerbraten/{} \;
	14	find * -type f -exec ln -s %%DATADIR%%/{} ~/.sauerbraten/{} \; 2>/dev/null
	15	fi
	16
	17	cd ~/.sauerbraten \|\| exit 1
	18	exec %%PREFIX%%/libexec/sauer_master "$@"