From nobody@FreeBSD.org  Sat Jan  5 05:02:25 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id F2890724
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  5 Jan 2013 05:02:25 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id D99EF98A
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  5 Jan 2013 05:02:25 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r0552ONX045713
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 5 Jan 2013 05:02:24 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id r0552Oqr045712;
	Sat, 5 Jan 2013 05:02:24 GMT
	(envelope-from nobody)
Message-Id: <201301050502.r0552Oqr045712@red.freebsd.org>
Date: Sat, 5 Jan 2013 05:02:24 GMT
From: Sender Ghost <lightside@safebox.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] games/sauerbraten: Update to 20130104
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         174989
>Category:       ports
>Synopsis:       [PATCH] games/sauerbraten: Update to 20130104
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    acm
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 05 05:10:00 UTC 2013
>Closed-Date:    Sun Mar 24 19:12:15 UTC 2013
>Last-Modified:  Sun Mar 24 19:20:00 UTC 2013
>Originator:     Sender Ghost
>Release:        FreeBSD 9.1-RELEASE
>Organization:
>Environment:
>Description:
Patch to update games/sauerbraten port from "Justice Edition" (20100728) to "Collect Edition" (20130104).

Look following link for changes:
http://sauerbraten.org/docs/history.html#_2013_01_04_collect_edition

Also the patch adds license information and desktop entry.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN sauerbraten.orig/Makefile sauerbraten/Makefile
--- sauerbraten.orig/Makefile	2012-11-17 09:57:51.000000000 +0400
+++ sauerbraten/Makefile	2013-01-05 08:09:57.000000000 +0400
@@ -6,15 +6,18 @@
 #
 
 PORTNAME=	sauerbraten
-PORTVERSION=	20100728
-PORTREVISION=	2
+PORTVERSION=	20130104
+PORTREVISION=	0
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2010_07_19
-DISTNAME=	${PORTNAME}_2010_07_28_justice_edition_linux
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2013_01_04
+DISTNAME=	${PORTNAME}_2013_01_04_collect_edition_linux
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	First person shooter based on Cube
 
+LICENSE_COMB=	multi
+LICENSE=	MIT ZLIB
+
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
@@ -48,6 +51,10 @@
 USE_SDL=	image mixer sdl
 ALL_TARGET+=	client
 SAUER_BIN+=	client
+
+DESKTOP_ENTRIES="Sauerbraten" "${COMMENT}" \
+		"${PREFIX}/share/${PORTNAME}/data/cube.png" "sauer_client" \
+		"Application;Game;" ${FALSE}
 .endif
 
 .if !defined(WITHOUT_DEDICATED)
diff -ruN sauerbraten.orig/distinfo sauerbraten/distinfo
--- sauerbraten.orig/distinfo	2011-01-20 18:37:46.000000000 +0300
+++ sauerbraten/distinfo	2013-01-05 04:46:44.000000000 +0400
@@ -1,2 +1,2 @@
-SHA256 (sauerbraten_2010_07_28_justice_edition_linux.tar.bz2) = 185e5dbf41a4426af5f692e49afa69237e23976ef3b368f43ec6aa19fb3cc86c
-SIZE (sauerbraten_2010_07_28_justice_edition_linux.tar.bz2) = 464652953
+SHA256 (sauerbraten_2013_01_04_collect_edition_linux.tar.bz2) = 043721c640261174166eb8f32a5d953abe3312da99e0e1c049747dcc1b7f0353
+SIZE (sauerbraten_2013_01_04_collect_edition_linux.tar.bz2) = 589950837
diff -ruN sauerbraten.orig/files/patch-src_Makefile sauerbraten/files/patch-src_Makefile
--- sauerbraten.orig/files/patch-src_Makefile	2011-01-20 18:37:47.000000000 +0300
+++ sauerbraten/files/patch-src_Makefile	2013-01-05 04:43:11.000000000 +0400
@@ -1,8 +1,8 @@
---- src/Makefile.orig	2010-05-14 01:30:28.000000000 +0700
-+++ src/Makefile	2010-09-24 18:44:00.000000000 +0700
+--- src/Makefile.orig	2012-08-28 09:30:07.000000000 +0400
++++ src/Makefile	2013-01-05 04:42:38.000000000 +0400
 @@ -1,8 +1,7 @@
 -CXXFLAGS= -O3 -fomit-frame-pointer
- override CXXFLAGS+= -Wall -fsigned-char
+ override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
  
  PLATFORM= $(shell uname -s)
 -PLATFORM_PREFIX= native
@@ -10,25 +10,25 @@
  
  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
+@@ -36,8 +35,8 @@
+ endif
+ CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -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_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `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
+@@ -105,8 +104,8 @@
+ SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
+ MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -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
+ MASTER_LIBS= $(SERVER_LIBS)
  endif
  SERVER_OBJS= \
- 	shared/crypto-standalone.o \


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->acm 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Jan 5 05:10:31 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=174989 

From: Sender Ghost <lightside@gmx.com>
To: bug-followup@FreeBSD.org
Cc: acm@FreeBSD.org
Subject: Re: ports/174989: [PATCH] games/sauerbraten: Update to 20130104
Date: Mon, 07 Jan 2013 18:12:38 +0400

 This is a multi-part message in MIME format.
 --------------030009040807060904000306
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 There is new update for "Collect Edition" release (20130107), which 
 fixes bugs.
 
 Also the patch converts Makefile to OptionsNG framework.
 
 P.S.:
 I changed e-mail address, because of b.barracudacentral.org for previous 
 SMTP server.
 
 --------------030009040807060904000306
 Content-Type: text/plain; charset=UTF-8;
  name="patch.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="patch.txt"
 
 diff -ruN sauerbraten.orig/Makefile sauerbraten/Makefile
 --- sauerbraten.orig/Makefile	2012-11-17 09:57:51.000000000 +0400
 +++ sauerbraten/Makefile	2013-01-07 13:54:04.000000000 +0400
 @@ -6,15 +6,18 @@
  #
  
  PORTNAME=	sauerbraten
 -PORTVERSION=	20100728
 -PORTREVISION=	2
 +PORTVERSION=	20130107
 +PORTREVISION=	0
  CATEGORIES=	games
 -MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2010_07_19
 -DISTNAME=	${PORTNAME}_2010_07_28_justice_edition_linux
 +MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2013_01_04
 +DISTNAME=	${PORTNAME}_2013_01_07_collect_edition_linux
  
  MAINTAINER=	acm@FreeBSD.org
  COMMENT=	First person shooter based on Cube
  
 +LICENSE_COMB=	multi
 +LICENSE=	MIT ZLIB
 +
  USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
  USE_BZIP2=	yes
 @@ -31,31 +34,37 @@
  PORTDATA=	data packages
  PORTDOCS=	*
  
 -OPTIONS=	CLIENT "Build client" on \
 -		DEDICATED "Build dedicated server" on \
 -		MASTER "Build master server" off
 +OPTIONS_DEFINE=	CLIENT DEDICATED DOCS MASTER
 +OPTIONS_DEFAULT=	CLIENT DEDICATED
 +CLIENT_DESC=	Build client
 +DEDICATED_DESC=	Build dedicated server
 +MASTER_DESC=	Build master server
  
  SUB_FILES=	sauer_client sauer_master sauer_server pkg-message
  
 -.include <bsd.port.pre.mk>
 +.include <bsd.port.options.mk>
  
 -.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED) && defined(WITHOUT_MASTER)
 +.if !${PORT_OPTIONS:MCLIENT} && !${PORT_OPTIONS:MDEDICATED} && !${PORT_OPTIONS:MMASTER}
  IGNORE=		needs at least one executable (CLIENT, DEDICATED or MASTER)
  .endif
  
 -.if !defined(WITHOUT_CLIENT)
 +.if ${PORT_OPTIONS:MCLIENT}
  USE_GL=		yes
  USE_SDL=	image mixer sdl
  ALL_TARGET+=	client
  SAUER_BIN+=	client
 +
 +DESKTOP_ENTRIES="Sauerbraten" "${COMMENT}" \
 +		"${PREFIX}/share/${PORTNAME}/data/cube.png" "sauer_client" \
 +		"Application;Game;" ${FALSE}
  .endif
  
 -.if !defined(WITHOUT_DEDICATED)
 +.if ${PORT_OPTIONS:MDEDICATED}
  ALL_TARGET+=	server
  SAUER_BIN+=	server
  .endif
  
 -.if !defined(WITHOUT_MASTER)
 +.if ${PORT_OPTIONS:MMASTER}
  ALL_TARGET+=	master
  SAUER_BIN+=	master
  .endif
 @@ -77,7 +86,7 @@
  	${MKDIR} ${DATADIR}
  	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${DATADIR}
  .endif
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	${MKDIR} ${DOCSDIR}
  	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
  .endif
 @@ -91,4 +100,4 @@
  	@${CAT} ${PKGMESSAGE}
  	@${ECHO_CMD}
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 diff -ruN sauerbraten.orig/distinfo sauerbraten/distinfo
 --- sauerbraten.orig/distinfo	2011-01-20 18:37:46.000000000 +0300
 +++ sauerbraten/distinfo	2013-01-07 14:09:14.000000000 +0400
 @@ -1,2 +1,2 @@
 -SHA256 (sauerbraten_2010_07_28_justice_edition_linux.tar.bz2) = 185e5dbf41a4426af5f692e49afa69237e23976ef3b368f43ec6aa19fb3cc86c
 -SIZE (sauerbraten_2010_07_28_justice_edition_linux.tar.bz2) = 464652953
 +SHA256 (sauerbraten_2013_01_07_collect_edition_linux.tar.bz2) = 0d84bd0f56936521337929660197dbc12c631523494365d2248e2676eb116fef
 +SIZE (sauerbraten_2013_01_07_collect_edition_linux.tar.bz2) = 589899304
 diff -ruN sauerbraten.orig/files/patch-src_Makefile sauerbraten/files/patch-src_Makefile
 --- sauerbraten.orig/files/patch-src_Makefile	2011-01-20 18:37:47.000000000 +0300
 +++ sauerbraten/files/patch-src_Makefile	2013-01-05 04:43:11.000000000 +0400
 @@ -1,8 +1,8 @@
 ---- src/Makefile.orig	2010-05-14 01:30:28.000000000 +0700
 -+++ src/Makefile	2010-09-24 18:44:00.000000000 +0700
 +--- src/Makefile.orig	2012-08-28 09:30:07.000000000 +0400
 ++++ src/Makefile	2013-01-05 04:42:38.000000000 +0400
  @@ -1,8 +1,7 @@
  -CXXFLAGS= -O3 -fomit-frame-pointer
 - override CXXFLAGS+= -Wall -fsigned-char
 + override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
   
   PLATFORM= $(shell uname -s)
  -PLATFORM_PREFIX= native
 @@ -10,25 +10,25 @@
   
   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
 +@@ -36,8 +35,8 @@
 + endif
 + CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -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_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `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
 +@@ -105,8 +104,8 @@
 + SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
 + MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -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
 + MASTER_LIBS= $(SERVER_LIBS)
   endif
   SERVER_OBJS= \
 - 	shared/crypto-standalone.o \
 
 --------------030009040807060904000306--

From: Sender Ghost <lightside@gmx.com>
To: bug-followup@FreeBSD.org
Cc: acm@FreeBSD.org
Subject: Re: ports/174989: [PATCH] games/sauerbraten: Update to 20130104
Date: Sat, 12 Jan 2013 23:58:15 +0400

 This is a multi-part message in MIME format.
 --------------050704040809090404010506
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Raphael Kubo da Costa suggested to use OPTIONS_MULTI on ports/175092:
 "in order to get rid of the `IGNORE' block at the beginning."
 
 Also, Max Brazhnikov suggested some changes for DESKTOP_ENTRIES.
 
 Therefore, there is new patch with these changes.
 
 --------------050704040809090404010506
 Content-Type: text/plain; charset=UTF-8;
  name="patch.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="patch.txt"
 
 diff -ruN sauerbraten.orig/Makefile sauerbraten/Makefile
 --- sauerbraten.orig/Makefile	2012-11-17 09:57:51.000000000 +0400
 +++ sauerbraten/Makefile	2013-01-12 23:43:45.000000000 +0400
 @@ -6,15 +6,18 @@
  #
  
  PORTNAME=	sauerbraten
 -PORTVERSION=	20100728
 -PORTREVISION=	2
 +PORTVERSION=	20130107
 +PORTREVISION=	0
  CATEGORIES=	games
 -MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2010_07_19
 -DISTNAME=	${PORTNAME}_2010_07_28_justice_edition_linux
 +MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2013_01_04
 +DISTNAME=	${PORTNAME}_2013_01_07_collect_edition_linux
  
  MAINTAINER=	acm@FreeBSD.org
  COMMENT=	First person shooter based on Cube
  
 +LICENSE_COMB=	multi
 +LICENSE=	MIT ZLIB
 +
  USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
  USE_BZIP2=	yes
 @@ -31,31 +34,35 @@
  PORTDATA=	data packages
  PORTDOCS=	*
  
 -OPTIONS=	CLIENT "Build client" on \
 -		DEDICATED "Build dedicated server" on \
 -		MASTER "Build master server" off
 +OPTIONS_DEFINE=	DOCS
 +OPTIONS_MULTI=	BUILD
 +OPTIONS_MULTI_BUILD=	CLIENT DEDICATED MASTER
 +OPTIONS_DEFAULT=	CLIENT DEDICATED
 +CLIENT_DESC=	Build client
 +DEDICATED_DESC=	Build dedicated server
 +MASTER_DESC=	Build master server
  
  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
 +.include <bsd.port.options.mk>
  
 -.if !defined(WITHOUT_CLIENT)
 +.if ${PORT_OPTIONS:MCLIENT}
  USE_GL=		yes
  USE_SDL=	image mixer sdl
  ALL_TARGET+=	client
  SAUER_BIN+=	client
 +
 +DESKTOP_ENTRIES="Sauerbraten" "${COMMENT}" \
 +		"${PREFIX}/share/${PORTNAME}/data/cube.png" "sauer_client" \
 +		"Game;" false
  .endif
  
 -.if !defined(WITHOUT_DEDICATED)
 +.if ${PORT_OPTIONS:MDEDICATED}
  ALL_TARGET+=	server
  SAUER_BIN+=	server
  .endif
  
 -.if !defined(WITHOUT_MASTER)
 +.if ${PORT_OPTIONS:MMASTER}
  ALL_TARGET+=	master
  SAUER_BIN+=	master
  .endif
 @@ -77,7 +84,7 @@
  	${MKDIR} ${DATADIR}
  	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${DATADIR}
  .endif
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	${MKDIR} ${DOCSDIR}
  	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
  .endif
 @@ -91,4 +98,4 @@
  	@${CAT} ${PKGMESSAGE}
  	@${ECHO_CMD}
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 diff -ruN sauerbraten.orig/distinfo sauerbraten/distinfo
 --- sauerbraten.orig/distinfo	2011-01-20 18:37:46.000000000 +0300
 +++ sauerbraten/distinfo	2013-01-07 14:09:14.000000000 +0400
 @@ -1,2 +1,2 @@
 -SHA256 (sauerbraten_2010_07_28_justice_edition_linux.tar.bz2) = 185e5dbf41a4426af5f692e49afa69237e23976ef3b368f43ec6aa19fb3cc86c
 -SIZE (sauerbraten_2010_07_28_justice_edition_linux.tar.bz2) = 464652953
 +SHA256 (sauerbraten_2013_01_07_collect_edition_linux.tar.bz2) = 0d84bd0f56936521337929660197dbc12c631523494365d2248e2676eb116fef
 +SIZE (sauerbraten_2013_01_07_collect_edition_linux.tar.bz2) = 589899304
 diff -ruN sauerbraten.orig/files/patch-src_Makefile sauerbraten/files/patch-src_Makefile
 --- sauerbraten.orig/files/patch-src_Makefile	2011-01-20 18:37:47.000000000 +0300
 +++ sauerbraten/files/patch-src_Makefile	2013-01-05 04:43:11.000000000 +0400
 @@ -1,8 +1,8 @@
 ---- src/Makefile.orig	2010-05-14 01:30:28.000000000 +0700
 -+++ src/Makefile	2010-09-24 18:44:00.000000000 +0700
 +--- src/Makefile.orig	2012-08-28 09:30:07.000000000 +0400
 ++++ src/Makefile	2013-01-05 04:42:38.000000000 +0400
  @@ -1,8 +1,7 @@
  -CXXFLAGS= -O3 -fomit-frame-pointer
 - override CXXFLAGS+= -Wall -fsigned-char
 + override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
   
   PLATFORM= $(shell uname -s)
  -PLATFORM_PREFIX= native
 @@ -10,25 +10,25 @@
   
   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
 +@@ -36,8 +35,8 @@
 + endif
 + CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -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_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `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
 +@@ -105,8 +104,8 @@
 + SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
 + MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -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
 + MASTER_LIBS= $(SERVER_LIBS)
   endif
   SERVER_OBJS= \
 - 	shared/crypto-standalone.o \
 
 --------------050704040809090404010506--

From: Sender Ghost <lightside@gmx.com>
To: bug-followup@FreeBSD.org
Cc: acm@FreeBSD.org
Subject: Re: ports/174989: [PATCH] games/sauerbraten: Update to 20130104
Date: Thu, 17 Jan 2013 05:28:37 +0400

 This is a multi-part message in MIME format.
 --------------000205020605040307090900
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 There is new update for "Collect Edition" release (20130114).
 
 --------------000205020605040307090900
 Content-Type: text/plain; charset=UTF-8;
  name="patch.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="patch.txt"
 
 diff -ruN sauerbraten.orig/Makefile sauerbraten/Makefile
 --- sauerbraten.orig/Makefile	2012-11-17 09:57:51.000000000 +0400
 +++ sauerbraten/Makefile	2013-01-17 05:11:55.000000000 +0400
 @@ -6,15 +6,18 @@
  #
  
  PORTNAME=	sauerbraten
 -PORTVERSION=	20100728
 -PORTREVISION=	2
 +PORTVERSION=	20130114
 +PORTREVISION=	0
  CATEGORIES=	games
 -MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2010_07_19
 -DISTNAME=	${PORTNAME}_2010_07_28_justice_edition_linux
 +MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2013_01_04
 +DISTNAME=	${PORTNAME}_2013_01_14_collect_edition_linux
  
  MAINTAINER=	acm@FreeBSD.org
  COMMENT=	First person shooter based on Cube
  
 +LICENSE_COMB=	multi
 +LICENSE=	MIT ZLIB
 +
  USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
  USE_BZIP2=	yes
 @@ -31,31 +34,35 @@
  PORTDATA=	data packages
  PORTDOCS=	*
  
 -OPTIONS=	CLIENT "Build client" on \
 -		DEDICATED "Build dedicated server" on \
 -		MASTER "Build master server" off
 +OPTIONS_DEFINE=	DOCS
 +OPTIONS_MULTI=	BUILD
 +OPTIONS_MULTI_BUILD=	CLIENT DEDICATED MASTER
 +OPTIONS_DEFAULT=	CLIENT DEDICATED
 +CLIENT_DESC=	Build client
 +DEDICATED_DESC=	Build dedicated server
 +MASTER_DESC=	Build master server
  
  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
 +.include <bsd.port.options.mk>
  
 -.if !defined(WITHOUT_CLIENT)
 +.if ${PORT_OPTIONS:MCLIENT}
  USE_GL=		yes
  USE_SDL=	image mixer sdl
  ALL_TARGET+=	client
  SAUER_BIN+=	client
 +
 +DESKTOP_ENTRIES="Sauerbraten" "${COMMENT}" \
 +		"${PREFIX}/share/${PORTNAME}/data/cube.png" "sauer_client" \
 +		"Game;" false
  .endif
  
 -.if !defined(WITHOUT_DEDICATED)
 +.if ${PORT_OPTIONS:MDEDICATED}
  ALL_TARGET+=	server
  SAUER_BIN+=	server
  .endif
  
 -.if !defined(WITHOUT_MASTER)
 +.if ${PORT_OPTIONS:MMASTER}
  ALL_TARGET+=	master
  SAUER_BIN+=	master
  .endif
 @@ -77,7 +84,7 @@
  	${MKDIR} ${DATADIR}
  	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${DATADIR}
  .endif
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	${MKDIR} ${DOCSDIR}
  	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
  .endif
 @@ -91,4 +98,4 @@
  	@${CAT} ${PKGMESSAGE}
  	@${ECHO_CMD}
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 diff -ruN sauerbraten.orig/distinfo sauerbraten/distinfo
 --- sauerbraten.orig/distinfo	2011-01-20 18:37:46.000000000 +0300
 +++ sauerbraten/distinfo	2013-01-17 05:15:41.000000000 +0400
 @@ -1,2 +1,2 @@
 -SHA256 (sauerbraten_2010_07_28_justice_edition_linux.tar.bz2) = 185e5dbf41a4426af5f692e49afa69237e23976ef3b368f43ec6aa19fb3cc86c
 -SIZE (sauerbraten_2010_07_28_justice_edition_linux.tar.bz2) = 464652953
 +SHA256 (sauerbraten_2013_01_14_collect_edition_linux.tar.bz2) = f81c7f14eeb5b9078229cf9fde6834b27a0bf3864cfc77804a4909a83dcc57bc
 +SIZE (sauerbraten_2013_01_14_collect_edition_linux.tar.bz2) = 589918883
 diff -ruN sauerbraten.orig/files/patch-src_Makefile sauerbraten/files/patch-src_Makefile
 --- sauerbraten.orig/files/patch-src_Makefile	2011-01-20 18:37:47.000000000 +0300
 +++ sauerbraten/files/patch-src_Makefile	2013-01-05 04:43:11.000000000 +0400
 @@ -1,8 +1,8 @@
 ---- src/Makefile.orig	2010-05-14 01:30:28.000000000 +0700
 -+++ src/Makefile	2010-09-24 18:44:00.000000000 +0700
 +--- src/Makefile.orig	2012-08-28 09:30:07.000000000 +0400
 ++++ src/Makefile	2013-01-05 04:42:38.000000000 +0400
  @@ -1,8 +1,7 @@
  -CXXFLAGS= -O3 -fomit-frame-pointer
 - override CXXFLAGS+= -Wall -fsigned-char
 + override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
   
   PLATFORM= $(shell uname -s)
  -PLATFORM_PREFIX= native
 @@ -10,25 +10,25 @@
   
   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
 +@@ -36,8 +35,8 @@
 + endif
 + CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -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_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `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
 +@@ -105,8 +104,8 @@
 + SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
 + MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -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
 + MASTER_LIBS= $(SERVER_LIBS)
   endif
   SERVER_OBJS= \
 - 	shared/crypto-standalone.o \
 
 --------------000205020605040307090900--

From: Sender Ghost <lightside@gmx.com>
To: bug-followup@FreeBSD.org
Cc: acm@FreeBSD.org
Subject: Re: ports/174989: [PATCH] games/sauerbraten: Update to 20130104
Date: Thu, 24 Jan 2013 19:33:39 +0400

 This is a multi-part message in MIME format.
 --------------040500060304090401090800
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 There is new update for "Collect Edition" release (20130120).
 
 This time I changed launcher scripts and removed the need to create 
 symlinks for data files (as games/redeclipse port's maintainer did).
 
 --------------040500060304090401090800
 Content-Type: text/plain; charset=UTF-8;
  name="patch.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="patch.txt"
 
 diff -ruN sauerbraten.orig/Makefile sauerbraten/Makefile
 --- sauerbraten.orig/Makefile	2012-11-17 09:57:51.000000000 +0400
 +++ sauerbraten/Makefile	2013-01-24 18:58:28.000000000 +0400
 @@ -6,15 +6,18 @@
  #
  
  PORTNAME=	sauerbraten
 -PORTVERSION=	20100728
 -PORTREVISION=	2
 +PORTVERSION=	20130120
 +PORTREVISION=	0
  CATEGORIES=	games
 -MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2010_07_19
 -DISTNAME=	${PORTNAME}_2010_07_28_justice_edition_linux
 +MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2013_01_04
 +DISTNAME=	${PORTNAME}_2013_01_20_collect_edition_linux
  
  MAINTAINER=	acm@FreeBSD.org
  COMMENT=	First person shooter based on Cube
  
 +LICENSE_COMB=	multi
 +LICENSE=	MIT ZLIB
 +
  USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
  USE_BZIP2=	yes
 @@ -31,31 +34,35 @@
  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
 +OPTIONS_DEFINE=	DOCS
 +OPTIONS_MULTI=	BUILD
 +OPTIONS_MULTI_BUILD=	CLIENT DEDICATED MASTER
 +OPTIONS_DEFAULT=	CLIENT DEDICATED
 +CLIENT_DESC=	Build client
 +DEDICATED_DESC=	Build dedicated server
 +MASTER_DESC=	Build master server
  
 -.include <bsd.port.pre.mk>
 +SUB_FILES=	sauer_client sauer_master sauer_server
  
 -.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED) && defined(WITHOUT_MASTER)
 -IGNORE=		needs at least one executable (CLIENT, DEDICATED or MASTER)
 -.endif
 +.include <bsd.port.options.mk>
  
 -.if !defined(WITHOUT_CLIENT)
 +.if ${PORT_OPTIONS:MCLIENT}
  USE_GL=		yes
  USE_SDL=	image mixer sdl
  ALL_TARGET+=	client
  SAUER_BIN+=	client
 +
 +DESKTOP_ENTRIES="Sauerbraten" "${COMMENT}" \
 +		"${PREFIX}/share/${PORTNAME}/data/cube.png" "sauer_client" \
 +		"Game;" false
  .endif
  
 -.if !defined(WITHOUT_DEDICATED)
 +.if ${PORT_OPTIONS:MDEDICATED}
  ALL_TARGET+=	server
  SAUER_BIN+=	server
  .endif
  
 -.if !defined(WITHOUT_MASTER)
 +.if ${PORT_OPTIONS:MMASTER}
  ALL_TARGET+=	master
  SAUER_BIN+=	master
  .endif
 @@ -77,7 +84,7 @@
  	${MKDIR} ${DATADIR}
  	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${DATADIR}
  .endif
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	${MKDIR} ${DOCSDIR}
  	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
  .endif
 @@ -87,8 +94,5 @@
  	@${ECHO_CMD} bin/sauer_${f} >> ${TMPPLIST}
  	@${ECHO_CMD} libexec/sauer_${f} >> ${TMPPLIST}
  .endfor
 -	@${ECHO_CMD}
 -	@${CAT} ${PKGMESSAGE}
 -	@${ECHO_CMD}
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 diff -ruN sauerbraten.orig/distinfo sauerbraten/distinfo
 --- sauerbraten.orig/distinfo	2011-01-20 18:37:46.000000000 +0300
 +++ sauerbraten/distinfo	2013-01-24 19:09:21.000000000 +0400
 @@ -1,2 +1,2 @@
 -SHA256 (sauerbraten_2010_07_28_justice_edition_linux.tar.bz2) = 185e5dbf41a4426af5f692e49afa69237e23976ef3b368f43ec6aa19fb3cc86c
 -SIZE (sauerbraten_2010_07_28_justice_edition_linux.tar.bz2) = 464652953
 +SHA256 (sauerbraten_2013_01_20_collect_edition_linux.tar.bz2) = 21888b13fbd80c3c0cb98a8969f9729dc5da2a3aa03e43e089bf3ba89579288a
 +SIZE (sauerbraten_2013_01_20_collect_edition_linux.tar.bz2) = 589911310
 diff -ruN sauerbraten.orig/files/patch-src_Makefile sauerbraten/files/patch-src_Makefile
 --- sauerbraten.orig/files/patch-src_Makefile	2011-01-20 18:37:47.000000000 +0300
 +++ sauerbraten/files/patch-src_Makefile	2013-01-24 18:55:35.000000000 +0400
 @@ -1,8 +1,8 @@
 ---- src/Makefile.orig	2010-05-14 01:30:28.000000000 +0700
 -+++ src/Makefile	2010-09-24 18:44:00.000000000 +0700
 +--- src/Makefile.orig	2012-08-28 09:30:07.000000000 +0400
 ++++ src/Makefile	2013-01-05 04:42:38.000000000 +0400
  @@ -1,8 +1,7 @@
  -CXXFLAGS= -O3 -fomit-frame-pointer
 - override CXXFLAGS+= -Wall -fsigned-char
 + override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
   
   PLATFORM= $(shell uname -s)
  -PLATFORM_PREFIX= native
 @@ -10,25 +10,25 @@
   
   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
 +@@ -36,8 +35,8 @@
 + endif
 + CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -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_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `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
 ++CLIENT_LIBS= -Lenet/.libs -lenet -L${LOCALBASE}/lib -lX11 `${SDL_CONFIG} --libs` -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
 +@@ -105,8 +104,8 @@
 + SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
 + MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -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
 + MASTER_LIBS= $(SERVER_LIBS)
   endif
   SERVER_OBJS= \
 - 	shared/crypto-standalone.o \
 diff -ruN sauerbraten.orig/files/pkg-message.in sauerbraten/files/pkg-message.in
 --- sauerbraten.orig/files/pkg-message.in	2006-12-29 21:22:15.000000000 +0300
 +++ sauerbraten/files/pkg-message.in	1970-01-01 03:00:00.000000000 +0300
 @@ -1,11 +0,0 @@
 -###############################################################################
 -
 -1) First time, sauerbraten creates a ~/.sauerbraten directory with symlinks.
 -2) Config files are in the ~/.sauerbraten directory.
 -3) If you want add new bindings into ~/.sauerbraten/config.cfg, see
 -
 -   %%DATADIR%%/data/keymap.cfg.
 -
 -4) Enjoy it ;)
 -
 -###############################################################################
 diff -ruN sauerbraten.orig/files/sauer_client.in sauerbraten/files/sauer_client.in
 --- sauerbraten.orig/files/sauer_client.in	2006-08-14 19:29:20.000000000 +0400
 +++ sauerbraten/files/sauer_client.in	2013-01-24 19:22:02.000000000 +0400
 @@ -1,18 +1,4 @@
  #!/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_client "$@"
 +SAUER_OPTIONS="-q${HOME}/.sauerbraten"
 +cd %%DATADIR%% && exec %%PREFIX%%/libexec/sauer_client ${SAUER_OPTIONS} "$@"
 diff -ruN sauerbraten.orig/files/sauer_master.in sauerbraten/files/sauer_master.in
 --- sauerbraten.orig/files/sauer_master.in	2011-01-20 18:37:47.000000000 +0300
 +++ sauerbraten/files/sauer_master.in	2013-01-24 19:22:36.000000000 +0400
 @@ -1,18 +1,4 @@
  #!/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 "$@"
 +SAUER_OPTIONS="-q${HOME}/.sauerbraten"
 +cd %%DATADIR%% && exec %%PREFIX%%/libexec/sauer_master ${SAUER_OPTIONS} "$@"
 diff -ruN sauerbraten.orig/files/sauer_server.in sauerbraten/files/sauer_server.in
 --- sauerbraten.orig/files/sauer_server.in	2006-08-14 19:29:20.000000000 +0400
 +++ sauerbraten/files/sauer_server.in	2013-01-24 19:22:38.000000000 +0400
 @@ -1,18 +1,4 @@
  #!/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_server "$@"
 +SAUER_OPTIONS="-q${HOME}/.sauerbraten"
 +cd %%DATADIR%% && exec %%PREFIX%%/libexec/sauer_server ${SAUER_OPTIONS} "$@"
 
 --------------040500060304090401090800--

From: Sender Ghost <lightside@gmx.com>
To: bug-followup@FreeBSD.org
Cc: acm@FreeBSD.org
Subject: Re: ports/174989: [PATCH] games/sauerbraten: Update to 20130104
Date: Tue, 29 Jan 2013 08:55:01 +0400

 This is a multi-part message in MIME format.
 --------------090206060709080207090307
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 There is new update for "Collect Edition" release (20130126).
 
 --------------090206060709080207090307
 Content-Type: text/plain; charset=UTF-8;
  name="patch.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="patch.txt"
 
 diff -ruN sauerbraten.orig/Makefile sauerbraten/Makefile
 --- sauerbraten.orig/Makefile	2012-11-17 09:57:51.000000000 +0400
 +++ sauerbraten/Makefile	2013-01-29 08:42:09.000000000 +0400
 @@ -6,15 +6,18 @@
  #
  
  PORTNAME=	sauerbraten
 -PORTVERSION=	20100728
 -PORTREVISION=	2
 +PORTVERSION=	20130126
 +PORTREVISION=	0
  CATEGORIES=	games
 -MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2010_07_19
 -DISTNAME=	${PORTNAME}_2010_07_28_justice_edition_linux
 +MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2013_01_04
 +DISTNAME=	${PORTNAME}_2013_01_26_collect_edition_linux
  
  MAINTAINER=	acm@FreeBSD.org
  COMMENT=	First person shooter based on Cube
  
 +LICENSE_COMB=	multi
 +LICENSE=	MIT ZLIB
 +
  USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
  USE_BZIP2=	yes
 @@ -31,31 +34,35 @@
  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
 +OPTIONS_DEFINE=	DOCS
 +OPTIONS_MULTI=	BUILD
 +OPTIONS_MULTI_BUILD=	CLIENT DEDICATED MASTER
 +OPTIONS_DEFAULT=	CLIENT DEDICATED
 +CLIENT_DESC=	Build client
 +DEDICATED_DESC=	Build dedicated server
 +MASTER_DESC=	Build master server
  
 -.include <bsd.port.pre.mk>
 +SUB_FILES=	sauer_client sauer_master sauer_server
  
 -.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED) && defined(WITHOUT_MASTER)
 -IGNORE=		needs at least one executable (CLIENT, DEDICATED or MASTER)
 -.endif
 +.include <bsd.port.options.mk>
  
 -.if !defined(WITHOUT_CLIENT)
 +.if ${PORT_OPTIONS:MCLIENT}
  USE_GL=		yes
  USE_SDL=	image mixer sdl
  ALL_TARGET+=	client
  SAUER_BIN+=	client
 +
 +DESKTOP_ENTRIES="Sauerbraten" "${COMMENT}" \
 +		"${PREFIX}/share/${PORTNAME}/data/cube.png" "sauer_client" \
 +		"Game;" false
  .endif
  
 -.if !defined(WITHOUT_DEDICATED)
 +.if ${PORT_OPTIONS:MDEDICATED}
  ALL_TARGET+=	server
  SAUER_BIN+=	server
  .endif
  
 -.if !defined(WITHOUT_MASTER)
 +.if ${PORT_OPTIONS:MMASTER}
  ALL_TARGET+=	master
  SAUER_BIN+=	master
  .endif
 @@ -77,7 +84,7 @@
  	${MKDIR} ${DATADIR}
  	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${DATADIR}
  .endif
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	${MKDIR} ${DOCSDIR}
  	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
  .endif
 @@ -87,8 +94,5 @@
  	@${ECHO_CMD} bin/sauer_${f} >> ${TMPPLIST}
  	@${ECHO_CMD} libexec/sauer_${f} >> ${TMPPLIST}
  .endfor
 -	@${ECHO_CMD}
 -	@${CAT} ${PKGMESSAGE}
 -	@${ECHO_CMD}
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 diff -ruN sauerbraten.orig/distinfo sauerbraten/distinfo
 --- sauerbraten.orig/distinfo	2011-01-20 18:37:46.000000000 +0300
 +++ sauerbraten/distinfo	2013-01-29 08:45:59.000000000 +0400
 @@ -1,2 +1,2 @@
 -SHA256 (sauerbraten_2010_07_28_justice_edition_linux.tar.bz2) = 185e5dbf41a4426af5f692e49afa69237e23976ef3b368f43ec6aa19fb3cc86c
 -SIZE (sauerbraten_2010_07_28_justice_edition_linux.tar.bz2) = 464652953
 +SHA256 (sauerbraten_2013_01_26_collect_edition_linux.tar.bz2) = 5d30558fe5c99079f837c34e6e2ecbe446293dadb2b5724bc9b749c4d0b3618e
 +SIZE (sauerbraten_2013_01_26_collect_edition_linux.tar.bz2) = 589937718
 diff -ruN sauerbraten.orig/files/patch-src_Makefile sauerbraten/files/patch-src_Makefile
 --- sauerbraten.orig/files/patch-src_Makefile	2011-01-20 18:37:47.000000000 +0300
 +++ sauerbraten/files/patch-src_Makefile	2013-01-24 18:55:35.000000000 +0400
 @@ -1,8 +1,8 @@
 ---- src/Makefile.orig	2010-05-14 01:30:28.000000000 +0700
 -+++ src/Makefile	2010-09-24 18:44:00.000000000 +0700
 +--- src/Makefile.orig	2012-08-28 09:30:07.000000000 +0400
 ++++ src/Makefile	2013-01-05 04:42:38.000000000 +0400
  @@ -1,8 +1,7 @@
  -CXXFLAGS= -O3 -fomit-frame-pointer
 - override CXXFLAGS+= -Wall -fsigned-char
 + override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
   
   PLATFORM= $(shell uname -s)
  -PLATFORM_PREFIX= native
 @@ -10,25 +10,25 @@
   
   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
 +@@ -36,8 +35,8 @@
 + endif
 + CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -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_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `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
 ++CLIENT_LIBS= -Lenet/.libs -lenet -L${LOCALBASE}/lib -lX11 `${SDL_CONFIG} --libs` -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
 +@@ -105,8 +104,8 @@
 + SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
 + MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -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
 + MASTER_LIBS= $(SERVER_LIBS)
   endif
   SERVER_OBJS= \
 - 	shared/crypto-standalone.o \
 diff -ruN sauerbraten.orig/files/pkg-message.in sauerbraten/files/pkg-message.in
 --- sauerbraten.orig/files/pkg-message.in	2006-12-29 21:22:15.000000000 +0300
 +++ sauerbraten/files/pkg-message.in	1970-01-01 03:00:00.000000000 +0300
 @@ -1,11 +0,0 @@
 -###############################################################################
 -
 -1) First time, sauerbraten creates a ~/.sauerbraten directory with symlinks.
 -2) Config files are in the ~/.sauerbraten directory.
 -3) If you want add new bindings into ~/.sauerbraten/config.cfg, see
 -
 -   %%DATADIR%%/data/keymap.cfg.
 -
 -4) Enjoy it ;)
 -
 -###############################################################################
 diff -ruN sauerbraten.orig/files/sauer_client.in sauerbraten/files/sauer_client.in
 --- sauerbraten.orig/files/sauer_client.in	2006-08-14 19:29:20.000000000 +0400
 +++ sauerbraten/files/sauer_client.in	2013-01-24 19:22:02.000000000 +0400
 @@ -1,18 +1,4 @@
  #!/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_client "$@"
 +SAUER_OPTIONS="-q${HOME}/.sauerbraten"
 +cd %%DATADIR%% && exec %%PREFIX%%/libexec/sauer_client ${SAUER_OPTIONS} "$@"
 diff -ruN sauerbraten.orig/files/sauer_master.in sauerbraten/files/sauer_master.in
 --- sauerbraten.orig/files/sauer_master.in	2011-01-20 18:37:47.000000000 +0300
 +++ sauerbraten/files/sauer_master.in	2013-01-24 19:22:36.000000000 +0400
 @@ -1,18 +1,4 @@
  #!/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 "$@"
 +SAUER_OPTIONS="-q${HOME}/.sauerbraten"
 +cd %%DATADIR%% && exec %%PREFIX%%/libexec/sauer_master ${SAUER_OPTIONS} "$@"
 diff -ruN sauerbraten.orig/files/sauer_server.in sauerbraten/files/sauer_server.in
 --- sauerbraten.orig/files/sauer_server.in	2006-08-14 19:29:20.000000000 +0400
 +++ sauerbraten/files/sauer_server.in	2013-01-24 19:22:38.000000000 +0400
 @@ -1,18 +1,4 @@
  #!/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_server "$@"
 +SAUER_OPTIONS="-q${HOME}/.sauerbraten"
 +cd %%DATADIR%% && exec %%PREFIX%%/libexec/sauer_server ${SAUER_OPTIONS} "$@"
 
 --------------090206060709080207090307--

From: Sender Ghost <lightside@gmx.com>
To: bug-followup@FreeBSD.org
Cc: acm@FreeBSD.org
Subject: Re: ports/174989: [PATCH] games/sauerbraten: Update to 20130104
Date: Mon, 04 Feb 2013 11:37:52 +0400

 This is a multi-part message in MIME format.
 --------------060001020004080707020702
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 There is new update for "Collect Edition" release (20130203).
 
 --------------060001020004080707020702
 Content-Type: text/plain; charset=UTF-8;
  name="patch.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="patch.txt"
 
 diff -ruN sauerbraten.orig/Makefile sauerbraten/Makefile
 --- sauerbraten.orig/Makefile	2012-11-17 09:57:51.000000000 +0400
 +++ sauerbraten/Makefile	2013-02-04 11:27:11.000000000 +0400
 @@ -6,15 +6,18 @@
  #
  
  PORTNAME=	sauerbraten
 -PORTVERSION=	20100728
 -PORTREVISION=	2
 +PORTVERSION=	20130203
 +PORTREVISION=	0
  CATEGORIES=	games
 -MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2010_07_19
 -DISTNAME=	${PORTNAME}_2010_07_28_justice_edition_linux
 +MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2013_01_04
 +DISTNAME=	${PORTNAME}_2013_02_03_collect_edition_linux
  
  MAINTAINER=	acm@FreeBSD.org
  COMMENT=	First person shooter based on Cube
  
 +LICENSE_COMB=	multi
 +LICENSE=	MIT ZLIB
 +
  USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
  USE_BZIP2=	yes
 @@ -31,31 +34,35 @@
  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
 +OPTIONS_DEFINE=	DOCS
 +OPTIONS_MULTI=	BUILD
 +OPTIONS_MULTI_BUILD=	CLIENT DEDICATED MASTER
 +OPTIONS_DEFAULT=	CLIENT DEDICATED
 +CLIENT_DESC=	Build client
 +DEDICATED_DESC=	Build dedicated server
 +MASTER_DESC=	Build master server
  
 -.include <bsd.port.pre.mk>
 +SUB_FILES=	sauer_client sauer_master sauer_server
  
 -.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED) && defined(WITHOUT_MASTER)
 -IGNORE=		needs at least one executable (CLIENT, DEDICATED or MASTER)
 -.endif
 +.include <bsd.port.options.mk>
  
 -.if !defined(WITHOUT_CLIENT)
 +.if ${PORT_OPTIONS:MCLIENT}
  USE_GL=		yes
  USE_SDL=	image mixer sdl
  ALL_TARGET+=	client
  SAUER_BIN+=	client
 +
 +DESKTOP_ENTRIES="Sauerbraten" "${COMMENT}" \
 +		"${PREFIX}/share/${PORTNAME}/data/cube.png" "sauer_client" \
 +		"Game;" false
  .endif
  
 -.if !defined(WITHOUT_DEDICATED)
 +.if ${PORT_OPTIONS:MDEDICATED}
  ALL_TARGET+=	server
  SAUER_BIN+=	server
  .endif
  
 -.if !defined(WITHOUT_MASTER)
 +.if ${PORT_OPTIONS:MMASTER}
  ALL_TARGET+=	master
  SAUER_BIN+=	master
  .endif
 @@ -77,7 +84,7 @@
  	${MKDIR} ${DATADIR}
  	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${DATADIR}
  .endif
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	${MKDIR} ${DOCSDIR}
  	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
  .endif
 @@ -87,8 +94,5 @@
  	@${ECHO_CMD} bin/sauer_${f} >> ${TMPPLIST}
  	@${ECHO_CMD} libexec/sauer_${f} >> ${TMPPLIST}
  .endfor
 -	@${ECHO_CMD}
 -	@${CAT} ${PKGMESSAGE}
 -	@${ECHO_CMD}
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 diff -ruN sauerbraten.orig/distinfo sauerbraten/distinfo
 --- sauerbraten.orig/distinfo	2011-01-20 18:37:46.000000000 +0300
 +++ sauerbraten/distinfo	2013-02-04 11:31:20.000000000 +0400
 @@ -1,2 +1,2 @@
 -SHA256 (sauerbraten_2010_07_28_justice_edition_linux.tar.bz2) = 185e5dbf41a4426af5f692e49afa69237e23976ef3b368f43ec6aa19fb3cc86c
 -SIZE (sauerbraten_2010_07_28_justice_edition_linux.tar.bz2) = 464652953
 +SHA256 (sauerbraten_2013_02_03_collect_edition_linux.tar.bz2) = 45c20521e3e56374490b2d9112a211538e801cf0161197f35476b30b7b58a78e
 +SIZE (sauerbraten_2013_02_03_collect_edition_linux.tar.bz2) = 589941180
 diff -ruN sauerbraten.orig/files/patch-src_Makefile sauerbraten/files/patch-src_Makefile
 --- sauerbraten.orig/files/patch-src_Makefile	2011-01-20 18:37:47.000000000 +0300
 +++ sauerbraten/files/patch-src_Makefile	2013-01-24 18:55:35.000000000 +0400
 @@ -1,8 +1,8 @@
 ---- src/Makefile.orig	2010-05-14 01:30:28.000000000 +0700
 -+++ src/Makefile	2010-09-24 18:44:00.000000000 +0700
 +--- src/Makefile.orig	2012-08-28 09:30:07.000000000 +0400
 ++++ src/Makefile	2013-01-05 04:42:38.000000000 +0400
  @@ -1,8 +1,7 @@
  -CXXFLAGS= -O3 -fomit-frame-pointer
 - override CXXFLAGS+= -Wall -fsigned-char
 + override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
   
   PLATFORM= $(shell uname -s)
  -PLATFORM_PREFIX= native
 @@ -10,25 +10,25 @@
   
   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
 +@@ -36,8 +35,8 @@
 + endif
 + CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -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_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `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
 ++CLIENT_LIBS= -Lenet/.libs -lenet -L${LOCALBASE}/lib -lX11 `${SDL_CONFIG} --libs` -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
 +@@ -105,8 +104,8 @@
 + SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
 + MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -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
 + MASTER_LIBS= $(SERVER_LIBS)
   endif
   SERVER_OBJS= \
 - 	shared/crypto-standalone.o \
 diff -ruN sauerbraten.orig/files/pkg-message.in sauerbraten/files/pkg-message.in
 --- sauerbraten.orig/files/pkg-message.in	2006-12-29 21:22:15.000000000 +0300
 +++ sauerbraten/files/pkg-message.in	1970-01-01 03:00:00.000000000 +0300
 @@ -1,11 +0,0 @@
 -###############################################################################
 -
 -1) First time, sauerbraten creates a ~/.sauerbraten directory with symlinks.
 -2) Config files are in the ~/.sauerbraten directory.
 -3) If you want add new bindings into ~/.sauerbraten/config.cfg, see
 -
 -   %%DATADIR%%/data/keymap.cfg.
 -
 -4) Enjoy it ;)
 -
 -###############################################################################
 diff -ruN sauerbraten.orig/files/sauer_client.in sauerbraten/files/sauer_client.in
 --- sauerbraten.orig/files/sauer_client.in	2006-08-14 19:29:20.000000000 +0400
 +++ sauerbraten/files/sauer_client.in	2013-01-24 19:22:02.000000000 +0400
 @@ -1,18 +1,4 @@
  #!/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_client "$@"
 +SAUER_OPTIONS="-q${HOME}/.sauerbraten"
 +cd %%DATADIR%% && exec %%PREFIX%%/libexec/sauer_client ${SAUER_OPTIONS} "$@"
 diff -ruN sauerbraten.orig/files/sauer_master.in sauerbraten/files/sauer_master.in
 --- sauerbraten.orig/files/sauer_master.in	2011-01-20 18:37:47.000000000 +0300
 +++ sauerbraten/files/sauer_master.in	2013-01-24 19:22:36.000000000 +0400
 @@ -1,18 +1,4 @@
  #!/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 "$@"
 +SAUER_OPTIONS="-q${HOME}/.sauerbraten"
 +cd %%DATADIR%% && exec %%PREFIX%%/libexec/sauer_master ${SAUER_OPTIONS} "$@"
 diff -ruN sauerbraten.orig/files/sauer_server.in sauerbraten/files/sauer_server.in
 --- sauerbraten.orig/files/sauer_server.in	2006-08-14 19:29:20.000000000 +0400
 +++ sauerbraten/files/sauer_server.in	2013-01-24 19:22:38.000000000 +0400
 @@ -1,18 +1,4 @@
  #!/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_server "$@"
 +SAUER_OPTIONS="-q${HOME}/.sauerbraten"
 +cd %%DATADIR%% && exec %%PREFIX%%/libexec/sauer_server ${SAUER_OPTIONS} "$@"
 
 --------------060001020004080707020702--
State-Changed-From-To: open->closed 
State-Changed-By: acm 
State-Changed-When: Sun Mar 24 19:11:54 UTC 2013 
State-Changed-Why:  
- Committed with few modifications, thanks!! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=174989 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/174989: commit references a PR
Date: Sun, 24 Mar 2013 19:11:54 +0000 (UTC)

 Author: acm
 Date: Sun Mar 24 19:11:38 2013
 New Revision: 315151
 URL: http://svnweb.freebsd.org/changeset/ports/315151
 
 Log:
   - Update to 20130203
   - Add LICENSE info
   - Add DESKTOP_ENTRIES
   - OptionsNG
   
   PR:		174989
   Submitted by:	Sender Ghost <lightside  at  safebox.ru>
 
 Modified:
   head/games/sauerbraten/Makefile
   head/games/sauerbraten/distinfo
   head/games/sauerbraten/files/patch-src_Makefile
   head/games/sauerbraten/files/pkg-message.in
   head/games/sauerbraten/files/sauer_client.in
   head/games/sauerbraten/files/sauer_master.in
   head/games/sauerbraten/files/sauer_server.in
 
 Modified: head/games/sauerbraten/Makefile
 ==============================================================================
 --- head/games/sauerbraten/Makefile	Sun Mar 24 17:43:23 2013	(r315150)
 +++ head/games/sauerbraten/Makefile	Sun Mar 24 19:11:38 2013	(r315151)
 @@ -6,15 +6,18 @@
  #
  
  PORTNAME=	sauerbraten
 -PORTVERSION=	20100728
 -PORTREVISION=	2
 +PORTVERSION=	20130203
 +PORTREVISION=	0
  CATEGORIES=	games
 -MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2010_07_19
 -DISTNAME=	${PORTNAME}_2010_07_28_justice_edition_linux
 +MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2013_01_04
 +DISTNAME=	${PORTNAME}_2013_02_03_collect_edition_linux
  
  MAINTAINER=	acm@FreeBSD.org
  COMMENT=	First person shooter based on Cube
  
 +LICENSE_COMB=	multi
 +LICENSE=	MIT ZLIB
 +
  USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
  USE_BZIP2=	yes
 @@ -31,31 +34,34 @@ MANUAL_PACKAGE_BUILD=	distfile exceeds p
  PORTDATA=	data packages
  PORTDOCS=	*
  
 -OPTIONS=	CLIENT "Build client" on \
 -		DEDICATED "Build dedicated server" on \
 -		MASTER "Build master server" off
 +OPTIONS_MULTI=	BUILD
 +OPTIONS_MULTI_BUILD=	CLIENT DEDICATED MASTER
 +OPTIONS_DEFAULT=	CLIENT DEDICATED
 +CLIENT_DESC=	Build client
 +DEDICATED_DESC=	Build dedicated server
 +MASTER_DESC=	Build master server
  
  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
 +.include <bsd.port.options.mk>
  
 -.if !defined(WITHOUT_CLIENT)
 +.if ${PORT_OPTIONS:MCLIENT}
  USE_GL=		yes
  USE_SDL=	image mixer sdl
  ALL_TARGET+=	client
  SAUER_BIN+=	client
 +
 +DESKTOP_ENTRIES="Sauerbraten" "${COMMENT}" \
 +			"${PREFIX}/share/${PORTNAME}/data/cube.png" "sauer_client" \
 +				"Game;" false
  .endif
  
 -.if !defined(WITHOUT_DEDICATED)
 +.if ${PORT_OPTIONS:MDEDICATED}
  ALL_TARGET+=	server
  SAUER_BIN+=	server
  .endif
  
 -.if !defined(WITHOUT_MASTER)
 +.if ${PORT_OPTIONS:MMASTER}
  ALL_TARGET+=	master
  SAUER_BIN+=	master
  .endif
 @@ -77,7 +83,7 @@ do-install:
  	${MKDIR} ${DATADIR}
  	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${DATADIR}
  .endif
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	${MKDIR} ${DOCSDIR}
  	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
  .endif
 @@ -91,4 +97,4 @@ post-install:
  	@${CAT} ${PKGMESSAGE}
  	@${ECHO_CMD}
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 
 Modified: head/games/sauerbraten/distinfo
 ==============================================================================
 --- head/games/sauerbraten/distinfo	Sun Mar 24 17:43:23 2013	(r315150)
 +++ head/games/sauerbraten/distinfo	Sun Mar 24 19:11:38 2013	(r315151)
 @@ -1,2 +1,2 @@
 -SHA256 (sauerbraten_2010_07_28_justice_edition_linux.tar.bz2) = 185e5dbf41a4426af5f692e49afa69237e23976ef3b368f43ec6aa19fb3cc86c
 -SIZE (sauerbraten_2010_07_28_justice_edition_linux.tar.bz2) = 464652953
 +SHA256 (sauerbraten_2013_02_03_collect_edition_linux.tar.bz2) = 45c20521e3e56374490b2d9112a211538e801cf0161197f35476b30b7b58a78e
 +SIZE (sauerbraten_2013_02_03_collect_edition_linux.tar.bz2) = 589941180
 
 Modified: head/games/sauerbraten/files/patch-src_Makefile
 ==============================================================================
 --- head/games/sauerbraten/files/patch-src_Makefile	Sun Mar 24 17:43:23 2013	(r315150)
 +++ head/games/sauerbraten/files/patch-src_Makefile	Sun Mar 24 19:11:38 2013	(r315151)
 @@ -1,8 +1,8 @@
 ---- src/Makefile.orig	2010-05-14 01:30:28.000000000 +0700
 -+++ src/Makefile	2010-09-24 18:44:00.000000000 +0700
 +--- src/Makefile	2012-08-28 00:30:07.000000000 -0500
 ++++ src/Makefile	2013-03-24 00:38:04.000000000 -0500
  @@ -1,8 +1,7 @@
  -CXXFLAGS= -O3 -fomit-frame-pointer
 - override CXXFLAGS+= -Wall -fsigned-char
 + override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
   
   PLATFORM= $(shell uname -s)
  -PLATFORM_PREFIX= native
 @@ -10,25 +10,25 @@
   
   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
 +@@ -36,8 +35,8 @@
 + endif
 + CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -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_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `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
 +@@ -105,8 +104,8 @@
 + SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
 + MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -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
 + MASTER_LIBS= $(SERVER_LIBS)
   endif
   SERVER_OBJS= \
 - 	shared/crypto-standalone.o \
 
 Modified: head/games/sauerbraten/files/pkg-message.in
 ==============================================================================
 --- head/games/sauerbraten/files/pkg-message.in	Sun Mar 24 17:43:23 2013	(r315150)
 +++ head/games/sauerbraten/files/pkg-message.in	Sun Mar 24 19:11:38 2013	(r315151)
 @@ -1,11 +1,10 @@
  ###############################################################################
  
 -1) First time, sauerbraten creates a ~/.sauerbraten directory with symlinks.
 -2) Config files are in the ~/.sauerbraten directory.
 -3) If you want add new bindings into ~/.sauerbraten/config.cfg, see
 +1) Config files are in the ~/.sauerbraten directory.
 +2) If you want add new bindings into ~/.sauerbraten/config.cfg, see
  
     %%DATADIR%%/data/keymap.cfg.
  
 -4) Enjoy it ;)
 +3) Enjoy it ;)
  
  ###############################################################################
 
 Modified: head/games/sauerbraten/files/sauer_client.in
 ==============================================================================
 --- head/games/sauerbraten/files/sauer_client.in	Sun Mar 24 17:43:23 2013	(r315150)
 +++ head/games/sauerbraten/files/sauer_client.in	Sun Mar 24 19:11:38 2013	(r315151)
 @@ -1,18 +1,4 @@
  #!/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_client "$@"
 +SAUER_OPTIONS="-q${HOME}/.sauerbraten"
 +cd %%DATADIR%% && exec %%PREFIX%%/libexec/sauer_client ${SAUER_OPTIONS} "$@"
 
 Modified: head/games/sauerbraten/files/sauer_master.in
 ==============================================================================
 --- head/games/sauerbraten/files/sauer_master.in	Sun Mar 24 17:43:23 2013	(r315150)
 +++ head/games/sauerbraten/files/sauer_master.in	Sun Mar 24 19:11:38 2013	(r315151)
 @@ -1,18 +1,4 @@
  #!/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 "$@"
 +SAUER_OPTIONS="-q${HOME}/.sauerbraten"
 +cd %%DATADIR%% && exec %%PREFIX%%/libexec/sauer_master ${SAUER_OPTIONS} "$@"
 
 Modified: head/games/sauerbraten/files/sauer_server.in
 ==============================================================================
 --- head/games/sauerbraten/files/sauer_server.in	Sun Mar 24 17:43:23 2013	(r315150)
 +++ head/games/sauerbraten/files/sauer_server.in	Sun Mar 24 19:11:38 2013	(r315151)
 @@ -1,18 +1,4 @@
  #!/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_server "$@"
 +SAUER_OPTIONS="-q${HOME}/.sauerbraten"
 +cd %%DATADIR%% && exec %%PREFIX%%/libexec/sauer_server ${SAUER_OPTIONS} "$@"
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
