[pkgsrc/trunk]: pkgsrc/x11/ssystem Needs libXmu no longer exposed by Mesa. Fi...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c298cfbb4f68
branches:  trunk
changeset: 419513:c298cfbb4f68
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Dec 20 00:03:11 2019 +0000

description:
Needs libXmu no longer exposed by Mesa. Fix concurrent build.

diffstat:

 x11/ssystem/Makefile         |   5 ++---
 x11/ssystem/distinfo         |   4 ++--
 x11/ssystem/patches/patch-aa |  16 ++++++++++++----
 3 files changed, 16 insertions(+), 9 deletions(-)

diffs (67 lines):

diff -r e8f8f03378b6 -r c298cfbb4f68 x11/ssystem/Makefile
--- a/x11/ssystem/Makefile      Fri Dec 20 00:02:25 2019 +0000
+++ b/x11/ssystem/Makefile      Fri Dec 20 00:03:11 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2019/08/30 18:08:59 nia Exp $
+# $NetBSD: Makefile,v 1.32 2019/12/20 00:03:11 joerg Exp $
 #
 
 DISTNAME=      ssystem-1.6
@@ -10,8 +10,6 @@
 #HOMEPAGE=     http://www1.las.es/~amil/ssystem/
 COMMENT=       Solar System Flyby Simulator
 
-MAKE_JOBS_SAFE=                no
-
 USE_TOOLS+=    flex bison
 
 MAKE_FILE=     Makefile.FreeBSD
@@ -32,4 +30,5 @@
 .include "../../graphics/freeglut/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e8f8f03378b6 -r c298cfbb4f68 x11/ssystem/distinfo
--- a/x11/ssystem/distinfo      Fri Dec 20 00:02:25 2019 +0000
+++ b/x11/ssystem/distinfo      Fri Dec 20 00:03:11 2019 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2015/11/04 03:28:54 agc Exp $
+$NetBSD: distinfo,v 1.6 2019/12/20 00:03:11 joerg Exp $
 
 SHA1 (ssystem-1.6.tar.gz) = b22f766159c8e9c861c23aa6ca47f374294a847a
 RMD160 (ssystem-1.6.tar.gz) = 33b9e84fbd1f0ce22c25931effe21fce589fb1e1
 SHA512 (ssystem-1.6.tar.gz) = c09397464916faeae8fdc6bfc253318112ba90e818155a814f9fdddc33b95cd96214fd3e90cdac295f408a2bd8a04f84d1370d7700c7b9c76e7b77ada01b6b72
 Size (ssystem-1.6.tar.gz) = 1037947 bytes
-SHA1 (patch-aa) = f44692941d5b001d6b3017a5a8af8c0e0aab00b7
+SHA1 (patch-aa) = 52438ca58f517c94ed18932fec82dc38052c42f1
 SHA1 (patch-ab) = 5851d684371ae46124041e2275dadb4e61a5f547
 SHA1 (patch-ac) = ea9736f69be4ea552bb2d73faf697c0cb314eede
diff -r e8f8f03378b6 -r c298cfbb4f68 x11/ssystem/patches/patch-aa
--- a/x11/ssystem/patches/patch-aa      Fri Dec 20 00:02:25 2019 +0000
+++ b/x11/ssystem/patches/patch-aa      Fri Dec 20 00:03:11 2019 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/26 07:08:59 fredb Exp $
+$NetBSD: patch-aa,v 1.2 2019/12/20 00:03:11 joerg Exp $
 
---- Makefile.FreeBSD.orig      Thu Feb 25 05:48:53 1999
-+++ Makefile.FreeBSD   Sun Mar 25 23:28:12 2001
-@@ -28,8 +28,8 @@
+--- Makefile.FreeBSD.orig      1999-02-25 11:48:53.000000000 +0000
++++ Makefile.FreeBSD
+@@ -28,8 +28,8 @@ JPEGDIR?= $(LOCALBASE)
  
  CFLAGS+= -I$(X11BASE)/include -I$(MESADIR)/include -I$(JPEGDIR)/include -DSDATADIR=\"${SDATADIR}\"
  
@@ -13,3 +13,11 @@
  
  # FreeBSD specific
  .ifdef PORTOBJFORMAT
+@@ -55,6 +55,7 @@ ssystem: $(OBJ)
+ lex.cfg.c: cfglex.l cfgparse.tab.c
+       flex -i -Pcfg cfglex.l
+ 
++cfgparse.tab.h: cfgparse.tab.c
+ cfgparse.tab.c: cfgparse.y
+       bison -d -v -p cfg cfgparse.y
+