micropolis: fix package

[Thomas Klausner <tk%giga.or.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Tue Aug 21 07:19:18 2018 +0200
Changeset:	524be616c725c3c67f0769a92d7bd4c2192da997

Modified Files:
	micropolis/Makefile
	micropolis/distinfo
	micropolis/patches/patch-src_sim_makefile

Log Message:
micropolis: fix package

Add missing libXpm dependency.
Honor LDFLAGS in sim, fixing RELRO builds.
Replace bash path in shell script, and depend on it.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=524be616c725c3c67f0769a92d7bd4c2192da997

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 micropolis/Makefile                       |  5 ++++-
 micropolis/distinfo                       |  2 +-
 micropolis/patches/patch-src_sim_makefile | 11 +++++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diffs:
diff --git a/micropolis/Makefile b/micropolis/Makefile
index 14cf54ef47..6242745cec 100644
--- a/micropolis/Makefile
+++ b/micropolis/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.donhopkins.com/home/micropolis/
 COMMENT=	City-building simulation
 LICENSE=	gnu-gpl-v3
 
-USE_TOOLS+=	pkg-config
+USE_TOOLS+=	bash:run pkg-config
 
 PATCH_SITES=	http://git.zerfleddert.de/micropolis/patches/
 PATCHFILES=	micropolis_git-1530263971-cc31822e4ebe54c0109623ac0c5cdf0e3acad755.patch
@@ -33,7 +33,10 @@ SUBST_MESSAGE.fix-x11-ldflags=	Fixing X11 ldflags.
 SUBST_FILES.fix-x11-ldflags=	src/sim/makefile src/tclx/config.mk src/tk/makefile
 SUBST_SED.fix-x11-ldflags=	-e 's|-L/usr/X11R6/lib|${X11_LDFLAGS}|g'
 
+REPLACE_BASH=	res/sounds/player
+
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/micropolis/distinfo b/micropolis/distinfo
index 545597d7c1..16e03a5c4c 100644
--- a/micropolis/distinfo
+++ b/micropolis/distinfo
@@ -8,4 +8,4 @@ SHA1 (micropolis_git-1530263971-cc31822e4ebe54c0109623ac0c5cdf0e3acad755.patch)
 RMD160 (micropolis_git-1530263971-cc31822e4ebe54c0109623ac0c5cdf0e3acad755.patch) = 4f39b9e60efb102eb4f265d1545e70037a09e3d8
 SHA512 (micropolis_git-1530263971-cc31822e4ebe54c0109623ac0c5cdf0e3acad755.patch) = c5dc083c90cfaf0bf351de8908ae8582d24776c995a0f81472dece5bcb76f270b8c8347563e3f116bbc691c6d2764b7ef005387a0437d144fc2e096e1dfdf550
 Size (micropolis_git-1530263971-cc31822e4ebe54c0109623ac0c5cdf0e3acad755.patch) = 1137456 bytes
-SHA1 (patch-src_sim_makefile) = d8172fe735021ab19bb9ea67f5a113c7c02ee38f
+SHA1 (patch-src_sim_makefile) = 9e9db123cfbed546753f3e8842fb468c67558d4b
diff --git a/micropolis/patches/patch-src_sim_makefile b/micropolis/patches/patch-src_sim_makefile
index bfbd8b79c6..9df8821ae3 100644
--- a/micropolis/patches/patch-src_sim_makefile
+++ b/micropolis/patches/patch-src_sim_makefile
@@ -2,7 +2,7 @@ $NetBSD$
 
 configure SDL_mixer and remove undefined include
 
---- src/sim/makefile.orig	2018-07-27 06:20:19.363556471 +0000
+--- src/sim/makefile.orig	2018-08-21 05:12:24.952808425 +0000
 +++ src/sim/makefile
 @@ -5,8 +5,8 @@ TCLXHOME = ../tclx
  TCLLIBRARY = /usr/local/lib/tcl
@@ -15,7 +15,14 @@ configure SDL_mixer and remove undefined include
  
  CC = gcc
  
-@@ -31,7 +31,6 @@ INSTALL = install -s
+@@ -25,13 +25,12 @@ DEFINES = -DIS_LINUX -DORIGINAL_MONSTER_
+ CFLAGS += $(OPTFLAGS) $(DEFINES) -Wall
+ 
+ #LDFLAGS = -Bstatic
+-LDFLAGS=-L/usr/X11/lib -L/usr/X11R6/lib
++LDFLAGS+=-L/usr/X11/lib -L/usr/X11R6/lib
+ 
+ INSTALL = install -s
  
  INCLUDES = \
  	-Iheaders \