svn commit: r510383 - head/games/linux-dwarffortress

[Adriaan de Groot]

Author: adridg
Date: Sat Aug 31 12:56:42 2019
New Revision: 510383
URL: https://svnweb.freebsd.org/changeset/ports/510383

Log:
  Massage build of linux-dwarffortress
  
   - change back from c6 to the default (c7 now)
   - don't install the bundled libc++, because it requires glibc 2.18
     which c7 doesn't have
   - avoid a runtime error message about sound-not-loading by switching
     off sound in the shipped config files. These are copied to the
     user's ~/.dwarffortress directory and can be edited there if needed.
  
  PR:		240063

Modified:
  head/games/linux-dwarffortress/Makefile
  head/games/linux-dwarffortress/distinfo
  head/games/linux-dwarffortress/pkg-plist

Modified: head/games/linux-dwarffortress/Makefile
==============================================================================
--- head/games/linux-dwarffortress/Makefile	Sat Aug 31 12:03:20 2019	(r510382)
+++ head/games/linux-dwarffortress/Makefile	Sat Aug 31 12:56:42 2019	(r510383)
@@ -3,11 +3,12 @@
 
 PORTNAME=	dwarffortress
 DISTVERSION=	0.44.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games linux
 MASTER_SITES=	http://www.bay12games.com/dwarves/
 PKGNAMEPREFIX=	linux-
-DISTNAME=	df_${DISTVERSION:S|0.||:S|.|_|}_linux32
+DISTNAME_amd64=	df_${DISTVERSION:S|0.||:S|.|_|}_linux
+DISTNAME_i386=	df_${DISTVERSION:S|0.||:S|.|_|}_linux32
 
 MAINTAINER=	adridg at FreeBSD.org
 COMMENT=	Dwarven fortress building game with ASCII graphics (Linux version)
@@ -29,7 +30,7 @@ LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
 RUN_DEPENDS=	linux-${linux_ARGS}-sdl_ttf>0:graphics/linux-${linux_ARGS}-sdl_ttf
 
-USES=		linux:c6 tar:bzip2
+USES=		linux tar:bzip2
 USE_LINUX=	dri gtk2 libsndfile openal-soft sdlimage xorglibs
 
 SUB_FILES=	dwarffortress
@@ -53,12 +54,15 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/libs/Dwarf_Fortress \
 		${STAGEDIR}${PREFIX}/libexec/dwarffortress
 	(cd ${WRKSRC}/libs && ${INSTALL_LIB} libgcc_s.so.1 libgraphics.so \
-		libstdc++.so.6 ${STAGEDIR}${PREFIX}/libexec/dwarffortress)
+		${STAGEDIR}${PREFIX}/libexec/dwarffortress)
 	@${MKDIR} ${STAGEDIR}${DATADIR}/data
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} raw ${STAGEDIR}${DATADIR})
 	(cd ${WRKSRC}/data && ${COPYTREE_SHARE} "announcement art dipscript \
 		help index init initial_movies movies shader.fs shader.vs \
 		sound speech" ${STAGEDIR}${DATADIR}/data)
+	# Switch off SOUND since it doesn't work with c7
+	${REINPLACE_CMD} -e 's/SOUND:ON/SOUND:OFF/' \
+		${STAGEDIR}${DATADIR}/data/init/init.txt
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Modified: head/games/linux-dwarffortress/distinfo
==============================================================================
--- head/games/linux-dwarffortress/distinfo	Sat Aug 31 12:03:20 2019	(r510382)
+++ head/games/linux-dwarffortress/distinfo	Sat Aug 31 12:56:42 2019	(r510383)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1558903592
+TIMESTAMP = 1567250756
+SHA256 (df_44_12_linux.tar.bz2) = 5a2d15730d21b41a68da09ce3c3b70c3e2a6fd15b95c6cbfb68578ed2d2db979
+SIZE (df_44_12_linux.tar.bz2) = 12081683
 SHA256 (df_44_12_linux32.tar.bz2) = 06642ed3ee50992a9b2a6a1bd9fb61b9d2e4e72bd6dd05b40870d5a96343b93a
 SIZE (df_44_12_linux32.tar.bz2) = 12686340

Modified: head/games/linux-dwarffortress/pkg-plist
==============================================================================
--- head/games/linux-dwarffortress/pkg-plist	Sat Aug 31 12:03:20 2019	(r510382)
+++ head/games/linux-dwarffortress/pkg-plist	Sat Aug 31 12:56:42 2019	(r510383)
@@ -2,7 +2,6 @@
 libexec/dwarffortress/Dwarf_Fortress
 libexec/dwarffortress/libgcc_s.so.1
 libexec/dwarffortress/libgraphics.so
-libexec/dwarffortress/libstdc++.so.6
 %%DATADIR%%/data/announcement/diplomatrebuffed
 %%DATADIR%%/data/announcement/end2
 %%DATADIR%%/data/announcement/end3