[gentoo-commits] gentoo-x86 commit in games-fps/sauerbraten/files: sauerbraten.init sauerbraten.conf sauerbraten-2010.07.28-system-enet.patch

[Michael Sterrett (mr_bones_)]

mr_bones_    12/02/08 02:01:39

  Added:                sauerbraten.init sauerbraten.conf
                        sauerbraten-2010.07.28-system-enet.patch
  Log:
  version bump (bug #366321) with contributions from at least Jon Severinsson, Petr Pisar, Tomáš Chvátal, and Paul Hartman (bug #111566)
  
  (Portage version: 2.1.10.44/cvs/Linux i686)

Revision  Changes    Path
1.1                  games-fps/sauerbraten/files/sauerbraten.init

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/sauerbraten/files/sauerbraten.init?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/sauerbraten/files/sauerbraten.init?rev=1.1&content-type=text/plain

Index: sauerbraten.init
===================================================================
#!/sbin/runscript

depend() {
	use net
}

start() {
	[ $(echo ${RUNMASTER} | tr '[:upper:]' '[:lower:]') = "yes" ] && start_master
	[ $(echo ${RUNSERVER} | tr '[:upper:]' '[:lower:]') = "yes" ] && start_server
	true
}

start_server() {
	ebegin "Starting Sauerbraten dedicated server"

	# Make sure necessary parameters are set
	SERVERCONFIG="${SERVERCONFIG:-%SYSCONFDIR%}"

	if [ ! -d ${SERVERCONFIG} ]; then
		einfo "No ${SERVERCONFIG} around. Creating new..."
		mkdir ${SERVERCONFIG}
		chown ${USER}:${GROUP} ${SERVERCONFIG}
	fi

	start-stop-daemon \
		--quiet --start --chuid ${USER}:${GROUP} --chdir ${SERVERCONFIG} \
		--make-pidfile --pidfile %GAMES_STATEDIR%/run/sauerbraten/server.pid \
		--background --exec %LIBEXECDIR%/sauer_server -- ${SERVERARGS}
	eend $?
}

start_master() {
	ebegin "Starting Sauerbraten master server"

	# Make sure necessary parameters are set
	MASTERCONFIG="${MASTERCONFIG:-%SYSCONFDIR%}"
	[ -n "${MASTERIP}" ] && MASTERPORT="${MASTERPORT:-28787}"
	MASTERARGS="${MASTERCONFIG}/ ${MASTERPORT} ${MASTERIP}"

	if [ ! -d ${MASTERCONFIG} ]; then
		einfo "No ${MASTERCONFIG} around. Creating new..."
		mkdir ${MASTERCONFIG}
		chown ${USER}:${GROUP} ${MASTERCONFIG}
	fi

	start-stop-daemon \
		--quiet --start --chuid ${USER}:${GROUP} \
		--make-pidfile --pidfile %GAMES_STATEDIR%/run/sauerbraten/master.pid \
		--background --exec %LIBEXECDIR%/sauer_master -- ${MASTERARGS}
	eend $?
}

stop() {
	[ $(echo ${RUNSERVER} | tr '[:upper:]' '[:lower:]') = "yes" ] && stop_server
	[ $(echo ${RUNMASTER} | tr '[:upper:]' '[:lower:]') = "yes" ] && stop_master
	true
}

stop_server() {
	ebegin "Stopping Sauerbraten dedicated server"
	start-stop-daemon --stop --retry 3 --pidfile %GAMES_STATEDIR%/run/sauerbraten/server.pid
	eend $?
}

stop_master() {
	ebegin "Stopping Sauerbraten master server"
	start-stop-daemon --stop --retry 3 --pidfile %GAMES_STATEDIR%/run/sauerbraten/master.pid
	eend $?
}

restart() {
	svc_stop
	svc_start
}



1.1                  games-fps/sauerbraten/files/sauerbraten.conf

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/sauerbraten/files/sauerbraten.conf?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/sauerbraten/files/sauerbraten.conf?rev=1.1&content-type=text/plain

Index: sauerbraten.conf
===================================================================
# Config file for /etc/init.d/sauerbraten

# Owner of Sauerbraten server processes (must be existing)
USER="%GAMES_USER_DED%"
GROUP="%GAMES_GROUP%"


# Whether to run the dedicated server
RUNSERVER="Yes"

# Location of the dedicated server config directory
SERVERCONFIG="%SYSCONFDIR%"

# Additional command line arguments to the dedicated server
SERVERARGS=""


# Whether to run the master server
RUNMASTER="No"

# Location of the master server config directory
MASTERCONFIG="%SYSCONFDIR%"

# What port should the masterserver use
MASTERPORT="28787"

# What ip should the masterserver bind to
MASTERIP=""



1.1                  games-fps/sauerbraten/files/sauerbraten-2010.07.28-system-enet.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/sauerbraten/files/sauerbraten-2010.07.28-system-enet.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/sauerbraten/files/sauerbraten-2010.07.28-system-enet.patch?rev=1.1&content-type=text/plain

Index: sauerbraten-2010.07.28-system-enet.patch
===================================================================
--- sauerbraten/src/Makefile
+++ sauerbraten/src/Makefile
@@ -4,7 +4,7 @@ override CXXFLAGS+= -Wall -fsigned-char
 PLATFORM= $(shell uname -s)
 PLATFORM_PREFIX= native
 
-INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include
+INCLUDES= -Ishared -Iengine -Ifpsgame
 
 STRIP=
 ifeq (,$(findstring -g,$(CXXFLAGS)))
@@ -20,8 +20,8 @@ WINDRES= windres
 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`
+CLIENT_LIBS= -lenet `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
 endif
 ifeq ($(PLATFORM),Linux)
 CLIENT_LIBS+= -lrt
@@ -91,7 +91,7 @@ SERVER_INCLUDES= -DSTANDALONE $(INCLUDES
 SERVER_LIBS= -Llib -lzdll -lenet -lws2_32 -lwinmm
 else
 SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
-SERVER_LIBS= -Lenet/.libs -lenet -lz
+SERVER_LIBS= -lenet -lz
 endif
 SERVER_OBJS= \
 	shared/crypto-standalone.o \
@@ -116,15 +116,6 @@ default: all
 
 all: client server
 
-enet/Makefile:
-	cd enet; ./configure --enable-shared=no --enable-static=yes
-	
-libenet: enet/Makefile
-	$(MAKE)	-C enet/ all
-
-clean-enet: enet/Makefile
-	$(MAKE) -C enet/ clean
-
 clean:
 	-$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_OBJS) $(MASTER_OBJS) sauer_client sauer_server sauer_master
 
@@ -159,13 +150,13 @@ master: $(MASTER_OBJS)
 
 install: all
 else
-client:	libenet $(CLIENT_OBJS)
+client:	$(CLIENT_OBJS)
 	$(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS)
 
-server:	libenet $(SERVER_OBJS)
+server:	$(SERVER_OBJS)
 	$(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)  
 	
-master: libenet $(MASTER_OBJS)
+master: $(MASTER_OBJS)
 	$(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(SERVER_LIBS)  
 
 install: all