Date: Tue, 29 Dec 2020 02:14:25 +0000 (UTC) From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r559540 - in head/games/sauerbraten: . files Message-ID: <202012290214.0BT2EP2i084527@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: acm Date: Tue Dec 29 02:14:24 2020 New Revision: 559540 URL: https://svnweb.freebsd.org/changeset/ports/559540 Log: - Update to 20201221 Modified: head/games/sauerbraten/Makefile head/games/sauerbraten/distinfo head/games/sauerbraten/files/patch-src_Makefile Modified: head/games/sauerbraten/Makefile ============================================================================== --- head/games/sauerbraten/Makefile Tue Dec 29 01:51:31 2020 (r559539) +++ head/games/sauerbraten/Makefile Tue Dec 29 02:14:24 2020 (r559540) @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= sauerbraten -PORTVERSION= 20130203 -PORTREVISION= 4 +PORTVERSION= 20201221 CATEGORIES= games -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2013_01_04 -DISTNAME= ${PORTNAME}_2013_02_03_collect_edition_linux +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2020_11_29 +DISTNAME= ${PORTNAME}_2020_12_21_linux MAINTAINER= acm@FreeBSD.org COMMENT= First person shooter based on Cube @@ -15,17 +14,13 @@ LICENSE= MIT ZLIB LICENSE_COMB= multi USES= gmake tar:bzip2 -GNU_CONFIGURE= 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= * -PLIST_DIRS= %%DATADIR%%/packages/brush +PLIST_DIRS= %%DATADIR%%/packages/prefab OPTIONS_MULTI= BUILD OPTIONS_MULTI_BUILD= CLIENT DEDICATED MASTER @@ -37,7 +32,7 @@ OPTIONS_DEFINE= DOCS CLIENT_DESC= Build client CLIENT_USES= gl sdl xorg -CLIENT_USE= GL=gl SDL=image,mixer,sdl XORG=x11 +CLIENT_USE= GL=gl SDL=image2,mixer2,sdl2 XORG=x11 CLIENT_ALL_TARGET= client CLIENT_PLIST_FILES= bin/sauer_client libexec/sauer_client DEDICATED_DESC= Build dedicated server @@ -59,8 +54,7 @@ post-extract: ${XARGS} -0 ${RM} -R post-patch: - @${REINPLACE_CMD} -Ee '/^#define (HAS_GETHOSTBY(NAME|ADDR)_R) 1/d' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} + @${REINPLACE_CMD} '1d' ${WRKSRC}/src/enet/Makefile do-install: .for f in ${PLIST_FILES:Mbin/*} Modified: head/games/sauerbraten/distinfo ============================================================================== --- head/games/sauerbraten/distinfo Tue Dec 29 01:51:31 2020 (r559539) +++ head/games/sauerbraten/distinfo Tue Dec 29 02:14:24 2020 (r559540) @@ -1,2 +1,3 @@ -SHA256 (sauerbraten_2013_02_03_collect_edition_linux.tar.bz2) = 45c20521e3e56374490b2d9112a211538e801cf0161197f35476b30b7b58a78e -SIZE (sauerbraten_2013_02_03_collect_edition_linux.tar.bz2) = 589941180 +TIMESTAMP = 1609130654 +SHA256 (sauerbraten_2020_12_21_linux.tar.bz2) = 3939f60104ac65070c9dce69ff9a44af8a26abb1459280d84ea519c867599c70 +SIZE (sauerbraten_2020_12_21_linux.tar.bz2) = 985568996 Modified: head/games/sauerbraten/files/patch-src_Makefile ============================================================================== --- head/games/sauerbraten/files/patch-src_Makefile Tue Dec 29 01:51:31 2020 (r559539) +++ head/games/sauerbraten/files/patch-src_Makefile Tue Dec 29 02:14:24 2020 (r559540) @@ -1,27 +1,28 @@ ---- src/Makefile.orig 2012-08-28 05:30:07 UTC -+++ src/Makefile +--- src/Makefile 2020-12-04 14:55:54.000000000 -0500 ++++ src/Makefile 2020-12-28 19:53:06.567185000 -0500 @@ -1,8 +1,7 @@ --CXXFLAGS= -O3 -fomit-frame-pointer +-CXXFLAGS= -O3 -fomit-frame-pointer -ffast-math override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti - PLATFORM= $(shell uname -s) +-PLATFORM= $(shell uname -s | tr '[:lower:]' '[:upper:]') -PLATFORM_PREFIX= native ++PLATFORM= $(shell uname -s) +PLATFORM_PREFIX= FreeBSD INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include -@@ -36,8 +35,8 @@ STD_LIBS= -static-libgcc -static-libstdc +@@ -65,8 +64,8 @@ + CLIENT_LIBS+= -framework SDL2_mixer -framework CoreAudio -framework AudioToolbox + CLIENT_LIBS+= -framework AudioUnit -framework OpenGL -framework Cocoa -lz -Lenet -lenet + else +-CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl2-config --cflags` +-CLIENT_LIBS= -Lenet -lenet -L/usr/X11R6/lib -lX11 `sdl2-config --libs` -lSDL2_image -lSDL2_mixer -lz -lGL ++CLIENT_INCLUDES= $(INCLUDES) `${SDL2_CONFIG} --cflags` -I${LOCALBASE}/include ++CLIENT_LIBS= -Lenet -lenet `${SDL2_CONFIG} --libs` -L${LOCALBASE}/lib -lX11 -lSDL2_image -lSDL2_mixer -lz -lGL 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 -lX11 -lSDL_image -lSDL_mixer -lz -lGL endif - ifeq ($(PLATFORM),Linux) - CLIENT_LIBS+= -lrt -@@ -98,15 +97,13 @@ CLIENT_OBJS= \ + ifeq ($(PLATFORM),LINUX) +@@ -133,15 +132,13 @@ fpsgame/waypoint.o \ fpsgame/weapon.o @@ -33,9 +34,9 @@ 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_LIBS= -Lenet -lenet -lz +SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -I${LOCALBASE}/include -+SERVER_LIBS= -Lenet/.libs -lenet -lz -L${LOCALBASE}/lib ++SERVER_LIBS= -Lenet -lenet -lz -L${LOCALBASE}/lib MASTER_LIBS= $(SERVER_LIBS) endif SERVER_OBJS= \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012290214.0BT2EP2i084527>