ports/155525: [MAINTAINER] games/assaultcube: fixes and additions

[Sender Ghost]

>Number:         155525
>Category:       ports
>Synopsis:       [MAINTAINER] games/assaultcube: fixes and additions
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 13 13:20:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Sender Ghost
>Release:        FreeBSD 8.1-RELEASE
>Organization:
>Environment:
>Description:
- Added licenses (note: MIT for included enet library).
- Added desktop entries for client.
- Added explicit USE_GETTEXT for client, because it depends from intl library (e.g. ${BUILD_WRKSRC}/platform.h:66).
- Fixed home directory for client executable script.
- Removed unneeded defines and option (e.g. the CXXOPTFLAGS define don't exist for current sources).
>How-To-Repeat:

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

Patch attached with submission follows:

diff -ruN assaultcube.orig/Makefile assaultcube/Makefile
--- assaultcube.orig/Makefile	2011-01-21 15:07:22.000000000 +0600
+++ assaultcube/Makefile	2011-03-13 16:38:33.000000000 +0600
@@ -7,6 +7,7 @@
 
 PORTNAME=	assaultcube
 PORTVERSION=	1.1.0.4
+PORTREVISION?=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/actiongame/AssaultCube%20Version%20${PORTVERSION}
 DISTFILES=	AssaultCube_v${PORTVERSION}_source${EXTRACT_SUFX} \
@@ -15,6 +16,18 @@
 MAINTAINER=	lightside at safebox.ru
 COMMENT=	Total conversion of the FPS game called Cube
 
+LICENSE_COMB=	multi
+LICENSE=	ACUBE CUBE MIT OTHER
+LICENSE_NAME_ACUBE=	AssaultCube ZLIB-like license with additions
+LICENSE_FILE_ACUBE=	${WRKSRC}/source/README.txt
+LICENSE_PERMS_ACUBE=	${_LICENSE_PERMS_DEFAULT}
+LICENSE_NAME_CUBE=	Cube game engine ZLIB-like license with additions
+LICENSE_FILE_CUBE=	${WRKSRC}/source/README_CUBEENGINE.txt
+LICENSE_PERMS_CUBE=	${_LICENSE_PERMS_DEFAULT}
+LICENSE_NAME_OTHER=	various package licences
+LICENSE_FILE_OTHER=	${WRKSRC}/docs/package_copyrights.txt
+LICENSE_PERMS_OTHER=	dist-mirror pkg-mirror auto-accept
+
 USE_BZIP2=	yes
 USE_OPENAL=	al
 USE_GMAKE=	yes
@@ -29,12 +42,9 @@
 PORTDATA=	config demos packages
 PORTDOCS=	*
 
-CFLAGS+=	-DFREEBSD
-
 OPTIONS=	CLIENT "Build client" on \
 		DEDICATED "Build dedicated server" on \
-		MASTER "Build master server" off \
-		OPTIMIZED_CFLAGS "Enable compilation optimizations" on
+		MASTER "Build master server" off
 
 .include <bsd.port.pre.mk>
 
@@ -43,11 +53,16 @@
 .endif
 
 .if !defined(WITHOUT_CLIENT)
+USE_GETTEXT=	yes
 USE_GL=		yes
 USE_SDL=	image mixer sdl
 ALL_TARGET+=	client
 SUB_FILES+=	${PORTNAME}_client
 ACUBE_BIN+=	client
+
+DESKTOP_ENTRIES="AssaultCube" "${COMMENT}" \
+	"${DATADIR}/packages/misc/startscreen.png" "${PORTNAME}_client" \
+	"Application;Game;" ${FALSE}
 .endif
 
 .if !defined(WITHOUT_DEDICATED)
@@ -62,11 +77,6 @@
 ACUBE_BIN+=	master
 .endif
 
-.if defined(WITHOUT_OPTIMIZED_CFLAGS)
-post-patch:
-	@${REINPLACE_CMD} -e 's|$$(CXXOPTFLAGS)||' ${WRKSRC}/source/src/Makefile
-.endif
-
 do-install:
 .for f in ${ACUBE_BIN}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}_${f} ${PREFIX}/bin
diff -ruN assaultcube.orig/files/assaultcube_client.in assaultcube/files/assaultcube_client.in
--- assaultcube.orig/files/assaultcube_client.in	2011-01-20 21:14:31.000000000 +0600
+++ assaultcube/files/assaultcube_client.in	2011-03-13 14:53:32.000000000 +0600
@@ -6,7 +6,7 @@
 # are copied, and write permission for the user is added to them.
 
 APPNAME="assaultcube"
-CUBE_OPTIONS="--home=~/.${APPNAME} --init"
+CUBE_OPTIONS="--home=${HOME}/.${APPNAME} --init"
 
 if [ -d ~/.$APPNAME ]
 then


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