CVS commit: pkgsrc/x11/ssystem

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Dec 20 00:03:11 UTC 2019

Modified Files:
        pkgsrc/x11/ssystem: Makefile distinfo
        pkgsrc/x11/ssystem/patches: patch-aa

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


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/x11/ssystem/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/ssystem/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/x11/ssystem/patches/patch-aa

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

Modified files:

Index: pkgsrc/x11/ssystem/Makefile
diff -u pkgsrc/x11/ssystem/Makefile:1.31 pkgsrc/x11/ssystem/Makefile:1.32
--- pkgsrc/x11/ssystem/Makefile:1.31    Fri Aug 30 18:08:59 2019
+++ pkgsrc/x11/ssystem/Makefile Fri Dec 20 00:03:11 2019
@@ -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 @@ MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
 #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 @@ do-install:
 .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"

Index: pkgsrc/x11/ssystem/distinfo
diff -u pkgsrc/x11/ssystem/distinfo:1.5 pkgsrc/x11/ssystem/distinfo:1.6
--- pkgsrc/x11/ssystem/distinfo:1.5     Wed Nov  4 03:28:54 2015
+++ pkgsrc/x11/ssystem/distinfo Fri Dec 20 00:03:11 2019
@@ -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

Index: pkgsrc/x11/ssystem/patches/patch-aa
diff -u pkgsrc/x11/ssystem/patches/patch-aa:1.1.1.1 pkgsrc/x11/ssystem/patches/patch-aa:1.2
--- pkgsrc/x11/ssystem/patches/patch-aa:1.1.1.1 Mon Mar 26 07:08:59 2001
+++ pkgsrc/x11/ssystem/patches/patch-aa Fri Dec 20 00:03:11 2019
@@ -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 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/26 0
  
  # 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
+