From owner-svn-ports-all@FreeBSD.ORG Wed Apr 17 13:46:39 2013 Return-Path: Delivered-To: svn-ports-all@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 306CB361; Wed, 17 Apr 2013 13:46:39 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 21E219FF; Wed, 17 Apr 2013 13:46:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3HDkcXa016941; Wed, 17 Apr 2013 13:46:38 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3HDkbAu016935; Wed, 17 Apr 2013 13:46:37 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201304171346.r3HDkbAu016935@svn.freebsd.org> From: Dmitry Marakasov Date: Wed, 17 Apr 2013 13:46:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315969 - in head/games/redeclipse: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Apr 2013 13:46:39 -0000 Author: amdmi3 Date: Wed Apr 17 13:46:37 2013 New Revision: 315969 URL: http://svnweb.freebsd.org/changeset/ports/315969 Log: - Update to 1.4 Feature safe: yes Added: head/games/redeclipse/files/patch-src-core.mk (contents, props changed) head/games/redeclipse/files/redeclipse.in - copied, changed from r315774, head/games/redeclipse/files/reclient.in head/games/redeclipse/files/redeclipse_server.in - copied, changed from r315774, head/games/redeclipse/files/reserver.in Deleted: head/games/redeclipse/files/patch-src_Makefile head/games/redeclipse/files/reclient.in head/games/redeclipse/files/reserver.in Modified: head/games/redeclipse/Makefile head/games/redeclipse/distinfo Modified: head/games/redeclipse/Makefile ============================================================================== --- head/games/redeclipse/Makefile Wed Apr 17 13:23:25 2013 (r315968) +++ head/games/redeclipse/Makefile Wed Apr 17 13:46:37 2013 (r315969) @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= redeclipse -PORTVERSION= 1.3.1 -PORTREVISION= 1 +PORTVERSION= 1.4 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}_${PORTVERSION:C/^([0-9]+\.[0-9]+)\..*/\1/} -DISTNAME= ${PORTNAME}_${PORTVERSION}_nix_bsd +DISTNAME= ${PORTNAME}_${PORTVERSION}_nix MAINTAINER= amdmi3@FreeBSD.org COMMENT= Single-player and multi-player first-person ego-shooter @@ -21,17 +20,19 @@ GNU_CONFIGURE= yes USE_BZIP2= yes CONFIGURE_WRKSRC= ${WRKSRC}/src/enet CONFIGURE_ARGS= --enable-shared=no --enable-static=yes +USE_AUTOTOOLS= aclocal:env automake:env autoconf:env BUILD_WRKSRC= ${WRKSRC}/src -WRKSRC= ${WRKDIR}/${PORTNAME} +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -ALL_TARGET= libenet ${BINARIES} +ALL_TARGET= libenet MAKE_JOBS_SAFE= yes -SUB_FILES= reclient reserver +SUB_FILES= redeclipse redeclipse_server PORTDATA= * +PORTDOCS= * -OPTIONS_DEFINE= OPTIMIZED_CFLAGS +OPTIONS_DEFINE= OPTIMIZED_CFLAGS DOCS OPTIONS_MULTI= COMPONENTS OPTIONS_MULTI_COMPONENTS=CLIENT DEDICATED OPTIONS_DEFAULT=CLIENT DEDICATED OPTIMIZED_CFLAGS @@ -47,20 +48,22 @@ BROKEN= does not build on sparc64 .if ${PORT_OPTIONS:MCLIENT} USE_GL= yes USE_SDL= image mixer sdl -PLIST_FILES+= bin/reclient libexec/reclient share/pixmaps/redeclipse.ico -BINARIES+= client +PLIST_FILES+= bin/redeclipse libexec/redeclipse share/pixmaps/redeclipse.ico +BINARIES+= redeclipse +ALL_TARGET+= client DESKTOP_ENTRIES="Red Eclipse" \ "${COMMENT}" \ "${PREFIX}/share/pixmaps/redeclipse.ico" \ - "reclient" \ + "redeclipse" \ "Game;" \ false .endif .if ${PORT_OPTIONS:MDEDICATED} -PLIST_FILES+= bin/reserver libexec/reserver -BINARIES+= server +PLIST_FILES+= bin/redeclipse_server libexec/redeclipse_server +BINARIES+= redeclipse_server +ALL_TARGET+= server .endif .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} @@ -70,12 +73,16 @@ CXXFLAGS+= -O3 -fomit-frame-pointer do-install: .for f in ${BINARIES} - ${INSTALL_SCRIPT} ${WRKDIR}/re${f} ${PREFIX}/bin - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/re${f} ${PREFIX}/libexec + ${INSTALL_SCRIPT} ${WRKDIR}/${f} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${f} ${PREFIX}/libexec .endfor +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${DOCSDIR} + cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "*" ${DOCSDIR}/ +.endif .if !defined(NOPORTDATA) ${MKDIR} ${DATADIR} - cd ${WRKSRC}/data && ${COPYTREE_SHARE} "." ${DATADIR}/ + cd ${WRKSRC} && ${COPYTREE_SHARE} "game data" ${DATADIR}/ .endif .if ${PORT_OPTIONS:MCLIENT} ${INSTALL_DATA} ${WRKSRC}/src/redeclipse.ico ${PREFIX}/share/pixmaps/ Modified: head/games/redeclipse/distinfo ============================================================================== --- head/games/redeclipse/distinfo Wed Apr 17 13:23:25 2013 (r315968) +++ head/games/redeclipse/distinfo Wed Apr 17 13:46:37 2013 (r315969) @@ -1,2 +1,2 @@ -SHA256 (redeclipse_1.3.1_nix_bsd.tar.bz2) = e29bc8a148c00b8a62b0e77752b7494f0d36f428cb4f24e9b5dc40cdcd67254e -SIZE (redeclipse_1.3.1_nix_bsd.tar.bz2) = 505092683 +SHA256 (redeclipse_1.4_nix.tar.bz2) = a0dfc527b0f437170a423b55df68a97e1b6e60d8c9fb6c842519b6670c1e69bf +SIZE (redeclipse_1.4_nix.tar.bz2) = 678617164 Added: head/games/redeclipse/files/patch-src-core.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/redeclipse/files/patch-src-core.mk Wed Apr 17 13:46:37 2013 (r315969) @@ -0,0 +1,21 @@ +--- src/core.mk.orig 2013-03-21 23:45:14.000000000 +0400 ++++ src/core.mk 2013-04-16 21:14:33.351621428 +0400 +@@ -3,7 +3,6 @@ + APPSERVER=$(APPNAME)_server + + #CXXFLAGS= -ggdb3 +-CXXFLAGS= -O3 -fomit-frame-pointer + override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti + + PLATFORM= $(shell uname -s) +@@ -65,8 +64,8 @@ + CLIENT_INCLUDES= $(INCLUDES) -Iinclude + 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) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags` ++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 Copied and modified: head/games/redeclipse/files/redeclipse.in (from r315774, head/games/redeclipse/files/reclient.in) ============================================================================== --- head/games/redeclipse/files/reclient.in Tue Apr 9 18:14:37 2013 (r315774, copy source) +++ head/games/redeclipse/files/redeclipse.in Wed Apr 17 13:46:37 2013 (r315969) @@ -1,3 +1,3 @@ #!/bin/sh -cd %%DATADIR%% && exec %%PREFIX%%/libexec/reclient "$@" +cd %%DATADIR%% && exec %%PREFIX%%/libexec/redeclipse "$@" Copied and modified: head/games/redeclipse/files/redeclipse_server.in (from r315774, head/games/redeclipse/files/reserver.in) ============================================================================== --- head/games/redeclipse/files/reserver.in Tue Apr 9 18:14:37 2013 (r315774, copy source) +++ head/games/redeclipse/files/redeclipse_server.in Wed Apr 17 13:46:37 2013 (r315969) @@ -1,3 +1,3 @@ #!/bin/sh -cd %%DATADIR%% && exec %%PREFIX%%/libexec/reserver "$@" +cd %%DATADIR%% && exec %%PREFIX%%/libexec/redeclipse_server "$@"