ports/158308: [PATCH] games/redeclipse

Sun Jun 26 09:40:11 UTC 2011

>Number:         158308
>Category:       ports
>Synopsis:       [PATCH] games/redeclipse
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 26 09:40:02 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Sender Ghost
>Release:        FreeBSD 8.1-RELEASE
>Organization:
>Environment:
>Description:
Patch to update repocopied (ports/156010) games/redeclipse port, based on wrongly closed problem report (ports/155682).

The maintainer is: amdmi3.
>How-To-Repeat:

>Fix:
Use attached diff from /usr/ports/games directory.

Patch attached with submission follows:

diff -ruN redeclipse.orig/Makefile redeclipse/Makefile

--- redeclipse.orig/Makefile	2011-03-29 05:09:37.000000000 +0700
+++ redeclipse/Makefile	2011-04-27 17:52:29.000000000 +0700
@@ -1,41 +1,47 @@
-# New ports collection makefile for:	sauerbraten
-# Date created:		2006-02-01
-# Whom:			Jose Alonso Cardenas Marquez <acardenas at bsd.org.pe>
+# New ports collection makefile for:	redeclipse
+# Date created:		2011-03-18
+# Whom:			Sender Ghost <lightside at safebox.ru>
 #
 # $FreeBSD: ports/games/redeclipse/Makefile,v 1.29 2011/03/28 22:09:37 amdmi3 Exp $
 #
 
-PORTNAME=	bloodfrontier
-DISTVERSION=	B2
-PORTREVISION=	4
+PORTNAME=	redeclipse
+PORTVERSION=	1.0
+PORTREVISION?=	0
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/Blood%20Frontier%20Beta%202
-DISTNAME=	${PORTNAME}-${DISTVERSION}-linux
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}_${PORTVERSION}
+DISTNAME=	${PORTNAME}_${PORTVERSION}_linux
 
 MAINTAINER=	amdmi3 at FreeBSD.org
-COMMENT=	Single- and multi-player first-person shooter based on Cube 2
+COMMENT=	A single-player and multi-player first-person ego-shooter
+
+LICENSE_COMB=	multi
+LICENSE=	MIT ZLIB
+LICENSE_NAME_ZLIB=	zlib license
+LICENSE_FILE_ZLIB=	${WRKSRC}/license.txt
+LICENSE_PERMS_ZLIB=	${_LICENSE_PERMS_DEFAULT}
+LICENSE_GROUPS_ZLIB=	FSF GPL OSI
 
 USE_GMAKE=	yes
 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 ${BINARIES}
+ALL_TARGET=	libenet
 MAKE_JOBS_SAFE=	yes
 
-SUB_FILES=	bfclient bfserver
+PORTDATA=	data redeclipse.ico
+PORTDOCS=	*
 
 OPTIONS=	CLIENT "Build client" on \
-		DEDICATED "Build dedicated server" on \
-		OPTIMIZED_CFLAGS "Enabled additional optimizations" on
+		DEDICATED "Build dedicated server" on
 
-.include <bsd.port.options.mk>
+SUB_FILES=	redeclipse_client redeclipse_server pkg-message
 
-.if ${ARCH} == "sparc64"
-BROKEN=		does not build on sparc64
-.endif
+.include <bsd.port.pre.mk>
 
 .if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED)
 IGNORE=		needs at least one executable (CLIENT or DEDICATED)
@@ -44,32 +50,44 @@
 .if !defined(WITHOUT_CLIENT)
 USE_GL=		yes
 USE_SDL=	image mixer sdl
-PLIST_FILES+=	bin/bfclient libexec/bfclient
-BINARIES+=	client
+ALL_TARGET+=	client
+RE_BIN+=	client
+
+DESKTOP_ENTRIES="Red Eclipse" "${COMMENT}" \
+	"${DATADIR}/redeclipse.ico" "${PORTNAME}_client" \
+	"Application;Game;" ${FALSE}
 .endif
 
 .if !defined(WITHOUT_DEDICATED)
-PLIST_FILES+=	bin/bfserver libexec/bfserver
-BINARIES+=	server
+ALL_TARGET+=	server
+RE_BIN+=	server
 .endif
 
-.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS+=	-O3 -fomit-frame-pointer
-CXXFLAGS+=	-O3 -fomit-frame-pointer
-.endif
+pre-build:
+	@${REINPLACE_CMD} -e '/^CXXFLAGS/d' \
+	-e 's|sdl-config|$${SDL_CONFIG}|' \
+	-e 's|/usr/X11R6|$${LOCALBASE}|' \
+	${BUILD_WRKSRC}/Makefile
+	@${MV} ${BUILD_WRKSRC}/redeclipse.ico ${WRKSRC}
 
 do-install:
-.for f in ${BINARIES}
-	${INSTALL_SCRIPT} ${WRKDIR}/bf${f} ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/bf${f} ${PREFIX}/libexec
+.for f in ${RE_BIN}
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}_${f} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/re${f} ${PREFIX}/libexec/${PORTNAME}_${f}
 .endfor
+.if !defined(NOPORTDATA)
 	${MKDIR} ${DATADIR}
-	cd ${WRKSRC}/data && ${COPYTREE_SHARE} "." ${DATADIR}/
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${DATADIR}
+.endif
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	cd ${BUILD_WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
+.endif
 
 post-install:
-	@${FIND} ${DATADIR} -type f | \
-		${SED} -e 's|^${PREFIX}/||' >> ${TMPPLIST}
-	@${FIND} ${DATADIR} -type d | ${SORT} -r | \
-		${SED} -e 's|^${PREFIX}/|@dirrm |' >> ${TMPPLIST}
+.for f in ${RE_BIN}
+	@${ECHO_CMD} bin/${PORTNAME}_${f} >> ${TMPPLIST}
+	@${ECHO_CMD} libexec/${PORTNAME}_${f} >> ${TMPPLIST}
+.endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN redeclipse.orig/distinfo redeclipse/distinfo
--- redeclipse.orig/distinfo	2009-12-21 15:28:56.000000000 +0600
+++ redeclipse/distinfo	2011-03-19 00:10:46.000000000 +0600
@@ -1,3 +1,2 @@
-MD5 (bloodfrontier-B2-linux.tar.bz2) = 814df812d14714687f44085c83d5b91b
-SHA256 (bloodfrontier-B2-linux.tar.bz2) = e05e7e18661d906fc0685c72704493fe8a8bbd0b803747ceaf4038527f957b58
-SIZE (bloodfrontier-B2-linux.tar.bz2) = 417998023
+SHA256 (redeclipse_1.0_linux.tar.bz2) = 19f80ca14c3898ff166c6708885a6afee7aeb7acbc1133fc25a53faf12a0b874
+SIZE (redeclipse_1.0_linux.tar.bz2) = 443072620
diff -ruN redeclipse.orig/files/bfclient.in redeclipse/files/bfclient.in
--- redeclipse.orig/files/bfclient.in	2011-03-29 05:09:38.000000000 +0700
+++ redeclipse/files/bfclient.in	1970-01-01 06:00:00.000000000 +0600
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-cd %%DATADIR%% && exec %%PREFIX%%/libexec/bfclient "$@"
diff -ruN redeclipse.orig/files/bfserver.in redeclipse/files/bfserver.in
--- redeclipse.orig/files/bfserver.in	2011-03-29 05:09:38.000000000 +0700
+++ redeclipse/files/bfserver.in	1970-01-01 06:00:00.000000000 +0600
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-cd %%DATADIR%% && exec %%PREFIX%%/libexec/bfserver "$@"
diff -ruN redeclipse.orig/files/patch-src_Makefile redeclipse/files/patch-src_Makefile
--- redeclipse.orig/files/patch-src_Makefile	2009-12-21 15:28:56.000000000 +0600
+++ redeclipse/files/patch-src_Makefile	1970-01-01 06:00:00.000000000 +0600
@@ -1,19 +0,0 @@
---- src/Makefile.orig	2009-11-25 14:52:58.000000000 +0300
-+++ src/Makefile	2009-12-17 00:09:47.000000000 +0300
-@@ -1,5 +1,4 @@
- #CXXFLAGS= -ggdb3
--CXXFLAGS= -O3 -fomit-frame-pointer
- override CXXFLAGS+= -Wall -fsigned-char
- 
- PLATFORM= $(shell uname -s)
-@@ -21,8 +20,8 @@
- CLIENT_INCLUDES= -DINTERFACE -DIRC $(INCLUDES) -Iinclude
- CLIENT_LIBS= -mwindows -lmingw32 -Llib -lSDLmain -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm
- else
--CLIENT_INCLUDES= -DINTERFACE -DIRC $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
--CLIENT_LIBS= -Lenet -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
-+CLIENT_INCLUDES= -DINTERFACE -DIRC $(INCLUDES) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags`
-+CLIENT_LIBS= -Lenet -lenet -L${LOCALBASE}/lib `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lz -lGL
- endif
- ifeq ($(PLATFORM),Linux)
- CLIENT_LIBS+= -lrt
diff -ruN redeclipse.orig/files/pkg-message.in redeclipse/files/pkg-message.in
--- redeclipse.orig/files/pkg-message.in	1970-01-01 06:00:00.000000000 +0600
+++ redeclipse/files/pkg-message.in	2011-03-19 02:47:03.000000000 +0600
@@ -0,0 +1,9 @@
+###############################################################################
+
+1) First time, Red Eclipse creates a ~/.redeclipse directory with symlinks.
+2) Config files are in the ~/.redeclipse directory.
+3) If you want to add new bindings into ~/.redeclipse/config.cfg, see
+
+   %%DATADIR%%/data/keymap.cfg.
+
+###############################################################################
diff -ruN redeclipse.orig/files/redeclipse_client.in redeclipse/files/redeclipse_client.in
--- redeclipse.orig/files/redeclipse_client.in	1970-01-01 06:00:00.000000000 +0600
+++ redeclipse/files/redeclipse_client.in	2011-03-19 01:34:52.000000000 +0600
@@ -0,0 +1,20 @@
+#!/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
+# ~/.redeclipse, and create symlinks to the data files.
+
+RE_OPTIONS="-r"
+
+if [ -d ~/.redeclipse ]
+then
+	echo "Using existing ~/.redeclipse directory."
+else
+	echo "Creating ~/.redeclipse directory."
+	cd %%DATADIR%% || exit 1
+	find * -type d -exec mkdir -p ~/.redeclipse/{} \;
+	find * -type f -exec ln -s %%DATADIR%%/{} ~/.redeclipse/{} \; 2>/dev/null
+fi
+
+cd ~/.redeclipse || exit 1
+exec %%PREFIX%%/libexec/redeclipse_client ${RE_OPTIONS} "$@"
diff -ruN redeclipse.orig/files/redeclipse_server.in redeclipse/files/redeclipse_server.in
--- redeclipse.orig/files/redeclipse_server.in	1970-01-01 06:00:00.000000000 +0600
+++ redeclipse/files/redeclipse_server.in	2011-03-19 01:40:58.000000000 +0600
@@ -0,0 +1,20 @@
+#!/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
+# ~/.redeclipse, and create symlinks to the data files.
+
+RE_OPTIONS=
+
+if [ -d ~/.redeclipse ]
+then
+	echo "Using existing ~/.redeclipse directory."
+else
+	echo "Creating ~/.redeclipse directory."
+	cd %%DATADIR%% || exit 1
+	find * -type d -exec mkdir -p ~/.redeclipse/{} \;
+	find * -type f -exec ln -s %%DATADIR%%/{} ~/.redeclipse/{} \; 2>/dev/null
+fi
+
+cd ~/.redeclipse || exit 1
+exec %%PREFIX%%/libexec/redeclipse_server ${RE_OPTIONS} "$@"
diff -ruN redeclipse.orig/pkg-descr redeclipse/pkg-descr
--- redeclipse.orig/pkg-descr	2009-12-21 15:28:56.000000000 +0600
+++ redeclipse/pkg-descr	2011-03-18 23:44:18.000000000 +0600
@@ -1,6 +1,6 @@
-Single-player and multi-player first-person shooter, built as a
-total conversion of Cube Engine 2, which lends itself toward a
-balanced gameplay, completely at the control of map makers, while
-maintaining a general theme of tactics and low gravity.
+Red Eclipse is a single-player and multi-player first-person ego-shooter,
+built as a total conversion of Cube Engine 2, which lends itself toward
+a balanced gameplay, with a general theme of agility in a variety of
+environments.
 
-WWW:	http://www.bloodfrontier.com/
+WWW:	http://www.redeclipse.net/


>Release-Note:
>Audit-Trail:
>Unformatted:

