svn commit: r408006 - in head/games/lgeneral: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Thu Feb  4 00:03:30 2016
New Revision: 408006
URL: https://svnweb.freebsd.org/changeset/ports/408006

Log:
  - Generate missing data files to fix runtime crash [1]
  
  While here:
  - Fix build with NLS disabled
  - Fix LICENSE
  - Switch to USES=localbase
  - Switch to options helpers
  - Don't try to use X11 during build
  
  PR:		206831 [1]
  Submitted by:	cmangin at arobas.net [1]
  MFH:		2016Q1 (blanket)

Added:
  head/games/lgeneral/files/patch-util_localize.h   (contents, props changed)
Modified:
  head/games/lgeneral/Makefile
  head/games/lgeneral/pkg-plist

Modified: head/games/lgeneral/Makefile
==============================================================================
--- head/games/lgeneral/Makefile	Wed Feb  3 23:11:17 2016	(r408005)
+++ head/games/lgeneral/Makefile	Thu Feb  4 00:03:30 2016	(r408006)
@@ -3,6 +3,7 @@
 
 PORTNAME=	lgeneral
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME} \
 		SF/${PORTNAME}/${PORTNAME}-data:data
@@ -12,20 +13,17 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:DE
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Turn-based strategy engine inspired by Panzer General
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gmake
+BROKEN_powerpc=	does not install
+BROKEN_sparc64=	does not install
+
+USES=		gmake localbase
 USE_CSTD=	gnu89
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-BROKEN_powerpc=	Does not install on ${ARCH}
-BROKEN_sparc64=	Does not install on ${ARCH}
-
 OPTIONS_DEFINE=		DOCS NLS SOUND
 OPTIONS_DEFAULT=	SOUND
 OPTIONS_SUB=		yes
@@ -44,9 +42,13 @@ post-install:
 .for i in flags terrain units
 	@${MKDIR} ${STAGEDIR}${DATADIR}/gfx/${i}
 .endfor
-	(${STAGEDIR}${PREFIX}/bin/lgc-pg -s ${WRKDIR}/pg-data \
-		-d ${STAGEDIR}${DATADIR})
+	${SETENV} DISPLAY= \
+		${STAGEDIR}${PREFIX}/bin/lgc-pg --separate-bridges \
+		-s ${WRKDIR}/pg-data \
+		-d ${STAGEDIR}${DATADIR}
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} README.* ${STAGEDIR}${DOCSDIR})
+	${INSTALL_DATA} ${WRKSRC}/README.* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Added: head/games/lgeneral/files/patch-util_localize.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/lgeneral/files/patch-util_localize.h	Thu Feb  4 00:03:30 2016	(r408006)
@@ -0,0 +1,14 @@
+--- util/localize.h.orig	2013-05-03 17:17:37 UTC
++++ util/localize.h
+@@ -31,9 +31,10 @@
+ #  include <config.h>
+ #endif
+ 
++#ifdef ENABLE_NLS
++
+ #include <libintl.h>
+ 
+-#ifdef ENABLE_NLS
+ /** shorthand for fetching translation of default domain */
+ #  define tr(s) gettext (s)
+ /** shorthand for fetching translation of specified domain */

Modified: head/games/lgeneral/pkg-plist
==============================================================================
--- head/games/lgeneral/pkg-plist	Wed Feb  3 23:11:17 2016	(r408005)
+++ head/games/lgeneral/pkg-plist	Thu Feb  4 00:03:30 2016	(r408006)
@@ -35,6 +35,9 @@ share/applications/lgeneral.desktop
 %%DATADIR%%/gfx/terrain/pg/airfield.bmp
 %%DATADIR%%/gfx/terrain/pg/airfield_rain.bmp
 %%DATADIR%%/gfx/terrain/pg/airfield_snow.bmp
+%%DATADIR%%/gfx/terrain/pg/bridge.bmp
+%%DATADIR%%/gfx/terrain/pg/bridge_rain.bmp
+%%DATADIR%%/gfx/terrain/pg/bridge_snow.bmp
 %%DATADIR%%/gfx/terrain/pg/clear.bmp
 %%DATADIR%%/gfx/terrain/pg/clear_rain.bmp
 %%DATADIR%%/gfx/terrain/pg/clear_snow.bmp