From owner-svn-ports-all@freebsd.org Thu Feb 4 00:03:32 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 73A0AA9ABA6; Thu, 4 Feb 2016 00:03:32 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4AFBF18E3; Thu, 4 Feb 2016 00:03:32 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1403VxU046347; Thu, 4 Feb 2016 00:03:31 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1403Vi9046344; Thu, 4 Feb 2016 00:03:31 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201602040003.u1403Vi9046344@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 4 Feb 2016 00:03:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408006 - in head/games/lgeneral: . 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.20 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: Thu, 04 Feb 2016 00:03:32 -0000 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@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@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 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 + #endif + ++#ifdef ENABLE_NLS ++ + #include + +-#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