- Update to 20100728

PR:		ports/152316
Submitted by:	Sender Ghost <lightside@safebox.ru>
Approved by:	maintainer timeout (acm; 2 months)
Feature safe:	yes

games/sauerbraten/Makefile

@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	sauerbraten
-PORTVERSION=	20090504
-PORTREVISION=	4
+PORTVERSION=	20100728
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2009_05_04
-DISTNAME=	${PORTNAME}_2009_05_04_trooper_edition_linux
+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
@@ -20,40 +19,42 @@ GNU_CONFIGURE=	yes
 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
+		DEDICATED "Build dedicated server" on \
+		MASTER "Build master server" off
 
-SUB_FILES=	sauer_client sauer_server pkg-message
+SUB_FILES=	sauer_client sauer_master sauer_server pkg-message
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED)
-IGNORE=		needs at least one executable (CLIENT or DEDICATED)
+.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
-.else
-PLIST_SUB+=	DEDICATED="@comment "
+.endif
+
+.if !defined(WITHOUT_MASTER)
+ALL_TARGET+=	master
+SAUER_BIN+=	master
 .endif
 
 post-extract:
@@ -69,14 +70,20 @@ do-install:
 	${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} "packages data" ${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}

games/sauerbraten/distinfo

@@ -1,3 +1,2 @@
-MD5 (sauerbraten_2009_05_04_trooper_edition_linux.tar.bz2) = 47a37d1989a0c666e07235a88b4891aa
-SHA256 (sauerbraten_2009_05_04_trooper_edition_linux.tar.bz2) = 92cf9e2a1711626d2d31fccbf501e36805cefe40374b9b026491768209e593cc
-SIZE (sauerbraten_2009_05_04_trooper_edition_linux.tar.bz2) = 360896105
+SHA256 (sauerbraten_2010_07_28_justice_edition_linux.tar.bz2) = 185e5dbf41a4426af5f692e49afa69237e23976ef3b368f43ec6aa19fb3cc86c
+SIZE (sauerbraten_2010_07_28_justice_edition_linux.tar.bz2) = 464652953

games/sauerbraten/files/patch-src-shared-tools.h

@@ -1,15 +0,0 @@
---- src/shared/tools.h.orig	2009-04-26 00:14:34.000000000 +0400
-+++ src/shared/tools.h	2009-05-07 19:45:42.000000000 +0400
-@@ -764,6 +764,12 @@
- template<class T> inline void bigswap(T *buf, int len) { if(*(const uchar *)&islittleendian) endianswap(buf, len); }
- #endif
- 
-+#ifdef getchar
-+#undef getchar
-+#endif
-+#ifdef putchar
-+#undef putchar
-+#endif
- struct stream
- {
-     virtual ~stream() {}

games/sauerbraten/files/patch-src_Makefile

@@ -1,5 +1,5 @@
---- src/Makefile.orig	2009-04-22 21:47:44.000000000 +0400
-+++ src/Makefile	2009-05-07 19:07:39.000000000 +0400
+--- 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
@@ -10,25 +10,25 @@
  
  INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include
  
-@@ -18,8 +17,8 @@
+@@ -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 -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
+-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 -lenet `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lSDL_image -lSDL_mixer -lz -lGL
++CLIENT_LIBS= -Lenet/.libs -lenet `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lSDL_image -lSDL_mixer -lz -lGL
  endif
  ifeq ($(PLATFORM),Linux)
  CLIENT_LIBS+= -lrt
-@@ -88,8 +87,8 @@
+@@ -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 -lenet -lz
+-SERVER_LIBS= -Lenet/.libs -lenet -lz
 +SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I${LOCALBASE}/include
-+SERVER_LIBS= -Lenet -lenet -lz -L${LOCALBASE}/lib
++SERVER_LIBS= -Lenet/.libs -lenet -lz -L${LOCALBASE}/lib
  endif
  SERVER_OBJS= \
  	shared/crypto-standalone.o \

games/sauerbraten/files/sauer_master.in

@@ -0,0 +1,18 @@
+#!/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 "$@"