From owner-svn-ports-head@FreeBSD.ORG Mon Apr 27 20:09:11 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9A2BF139; Mon, 27 Apr 2015 20:09:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 8818C162A; Mon, 27 Apr 2015 20:09:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3RK9BIQ064387; Mon, 27 Apr 2015 20:09:11 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3RK9AqZ064383; Mon, 27 Apr 2015 20:09:10 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201504272009.t3RK9AqZ064383@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Mon, 27 Apr 2015 20:09:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384869 - head/games/lgeneral X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Apr 2015 20:09:11 -0000 Author: lme Date: Mon Apr 27 20:09:10 2015 New Revision: 384869 URL: https://svnweb.freebsd.org/changeset/ports/384869 Log: - Update to 1.2.6 - Mark broken on powerpc and sparc64 - Simplify OPTIONS PR: 197433 Submitted by: tkato432@yahoo.com Modified: head/games/lgeneral/Makefile head/games/lgeneral/distinfo head/games/lgeneral/pkg-plist Modified: head/games/lgeneral/Makefile ============================================================================== --- head/games/lgeneral/Makefile Mon Apr 27 20:04:18 2015 (r384868) +++ head/games/lgeneral/Makefile Mon Apr 27 20:09:10 2015 (r384869) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= lgeneral -PORTVERSION= 1.2.5 +PORTVERSION= 1.2.6 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME} \ SF/${PORTNAME}/${PORTNAME}-data:data @@ -12,55 +12,39 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:DE MAINTAINER= ports@FreeBSD.org COMMENT= Turn-based strategy engine inspired by Panzer General -LICENSE= GPLv2 # or later -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE= GPLv2 -USE_SDL= sdl USES= gmake -GNU_CONFIGURE= yes USE_CSTD= gnu89 +USE_SDL= sdl +GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= SOUND NLS DOCS -OPTIONS_DEFAULT= SOUND -SOUND_DESC= Enable sound support +BROKEN_powerpc= Does not install on ${ARCH} +BROKEN_sparc64= Does not install on ${ARCH} -.include +OPTIONS_DEFINE= DOCS NLS SOUND +OPTIONS_DEFAULT= SOUND +OPTIONS_SUB= yes -.if ${PORT_OPTIONS:MSOUND} -USE_SDL+= mixer -.else -CONFIGURE_ARGS+=--disable-sound -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ENV+= am_cv_func_iconv=no -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif - -.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" -BROKEN= Does not install on ia64, powerpc, or sparc64 -.endif +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls +NLS_CONFIGURE_ENV_OFF= am_cv_func_iconv=no +SOUND_USE= sdl=mixer +SOUND_CONFIGURE_ENABLE= sound post-patch: - @${REINPLACE_CMD} -e 's|/icons|/pixmaps|' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|/icons.*|/pixmaps|' ${WRKSRC}/Makefile.in post-install: - ${MKDIR} ${STAGEDIR}${DATADIR}/gfx/flags - ${MKDIR} ${STAGEDIR}${DATADIR}/gfx/units/ - ${MKDIR} ${STAGEDIR}${DATADIR}/gfx/terrain/pg/ - ${STAGEDIR}${PREFIX}/bin/lgc-pg -s ${WRKDIR}/pg-data -d ${STAGEDIR}${DATADIR} - @${FIND} ${STAGEDIR}${DATADIR} -type d | ${XARGS} ${CHMOD} a+rx - @${FIND} ${STAGEDIR}${DATADIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE} -.if ${PORT_OPTIONS:MDOCS} +.for i in flags terrain units + @${MKDIR} ${STAGEDIR}${DATADIR}/gfx/${i} +.endfor + (${STAGEDIR}${PREFIX}/bin/lgc-pg -s ${WRKDIR}/pg-data \ + -d ${STAGEDIR}${DATADIR}) @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.* ${STAGEDIR}${DOCSDIR} -.endif + (cd ${WRKSRC} && ${INSTALL_DATA} README.* ${STAGEDIR}${DOCSDIR}) .include Modified: head/games/lgeneral/distinfo ============================================================================== --- head/games/lgeneral/distinfo Mon Apr 27 20:04:18 2015 (r384868) +++ head/games/lgeneral/distinfo Mon Apr 27 20:09:10 2015 (r384869) @@ -1,4 +1,4 @@ -SHA256 (lgeneral-1.2.5.tar.gz) = 1df5a730820699a3244b626e51ef1d84f7fa3e3868a202da83b21dd8c1c6c90d -SIZE (lgeneral-1.2.5.tar.gz) = 1684984 +SHA256 (lgeneral-1.2.6.tar.gz) = be85d63b718475dfc2ff48ac30e70fa020cac169e8b11bbd229cd2f4fe2570b4 +SIZE (lgeneral-1.2.6.tar.gz) = 1676266 SHA256 (pg-data.tar.gz) = cc6fa5d263d1d5824d706517958b1bb09b405ba0ed21e63e4a4d38e2727d7a04 SIZE (pg-data.tar.gz) = 410476 Modified: head/games/lgeneral/pkg-plist ============================================================================== --- head/games/lgeneral/pkg-plist Mon Apr 27 20:04:18 2015 (r384868) +++ head/games/lgeneral/pkg-plist Mon Apr 27 20:09:10 2015 (r384869) @@ -21,7 +21,6 @@ share/applications/lgeneral.desktop %%DATADIR%%/convdata/grid.bmp %%DATADIR%%/convdata/guard.bmp %%DATADIR%%/convdata/leg.wav -%%DATADIR%%/convdata/mapnames %%DATADIR%%/convdata/move.bmp %%DATADIR%%/convdata/reinf %%DATADIR%%/convdata/sea.wav @@ -217,7 +216,7 @@ share/applications/lgeneral.desktop %%NLS%%share/locale/de/LC_MESSAGES/pg.mo %%NLS%%share/locale/en/LC_MESSAGES/lgeneral.mo %%NLS%%share/locale/en/LC_MESSAGES/pg.mo -share/pixmaps/lgeneral48.png -@dir %%DATADIR%%/ai_modules -@dir %%DATADIR%%/music +share/pixmaps/lgeneral.png @dir %%DATADIR%%/terrain +@dir %%DATADIR%%/music +@dir %%DATADIR%%/ai_modules