Index: branches/2014Q1/games/sauerbraten/Makefile
===================================================================
--- branches/2014Q1/games/sauerbraten/Makefile	(revision 341129)
+++ branches/2014Q1/games/sauerbraten/Makefile	(revision 341130)
@@ -1,94 +1,94 @@
 # Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
 # $FreeBSD$
 
 PORTNAME=	sauerbraten
 PORTVERSION=	20130203
 PORTREVISION=	0
 CATEGORIES=	games
 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
+USES=		gmake
 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
 
 PORTDATA=	data packages
 PORTDOCS=	*
 
 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
 
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .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 ${PORT_OPTIONS:MDEDICATED}
 ALL_TARGET+=	server
 SAUER_BIN+=	server
 .endif
 
 .if ${PORT_OPTIONS:MMASTER}
 ALL_TARGET+=	master
 SAUER_BIN+=	master
 .endif
 
 post-extract:
 	@${FIND} ${WRKSRC} -type d -name CVS -type d -print0 | \
 		${XARGS} -0 ${RM} -R
 
 post-patch:
 	@${REINPLACE_CMD} -Ee '/^#define (HAS_GETHOSTBY(NAME|ADDR)_R) 1/d' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
 do-install:
 .for f in ${SAUER_BIN}
 	${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 ${PORT_OPTIONS:MDOCS}
 	${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}
 
 .include <bsd.port.mk>
Index: branches/2014Q1/games/sauerbraten/files/patch-src_Makefile
===================================================================
--- branches/2014Q1/games/sauerbraten/files/patch-src_Makefile	(revision 341129)
+++ branches/2014Q1/games/sauerbraten/files/patch-src_Makefile	(revision 341130)
@@ -1,34 +1,34 @@
 --- 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 -fno-exceptions -fno-rtti
  
  PLATFORM= $(shell uname -s)
 -PLATFORM_PREFIX= native
 +PLATFORM_PREFIX= FreeBSD
  
  INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include
  
 @@ -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 -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 `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lX11 -lSDL_image -lSDL_mixer -lz -lGL
  endif
  ifeq ($(PLATFORM),Linux)
  CLIENT_LIBS+= -lrt
 @@ -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= \
Index: branches/2014Q1
===================================================================
--- branches/2014Q1	(revision 341129)
+++ branches/2014Q1	(revision 341130)

Property changes on: branches/2014Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r341119