Fri Dec 20 00:03:11 2019 UTC ()
Needs libXmu no longer exposed by Mesa. Fix concurrent build.


(joerg)
diff -r1.31 -r1.32 pkgsrc/x11/ssystem/Makefile
diff -r1.5 -r1.6 pkgsrc/x11/ssystem/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/x11/ssystem/patches/patch-aa
cvs diff -r1.31 -r1.32 pkgsrc/x11/ssystem/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/ssystem/Makefile 2019/08/30 18:08:59 1.31
+++ pkgsrc/x11/ssystem/Makefile 2019/12/20 00:03:11 1.32
@@ -1,35 +1,34 @@ @@ -1,35 +1,34 @@
1# $NetBSD: Makefile,v 1.31 2019/08/30 18:08:59 nia Exp $ 1# $NetBSD: Makefile,v 1.32 2019/12/20 00:03:11 joerg Exp $
2# 2#
3 3
4DISTNAME= ssystem-1.6 4DISTNAME= ssystem-1.6
5PKGREVISION= 6 5PKGREVISION= 6
6CATEGORIES= x11 graphics 6CATEGORIES= x11 graphics
7MASTER_SITES= ${MASTER_SITE_LOCAL} 7MASTER_SITES= ${MASTER_SITE_LOCAL}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10#HOMEPAGE= http://www1.las.es/~amil/ssystem/ 10#HOMEPAGE= http://www1.las.es/~amil/ssystem/
11COMMENT= Solar System Flyby Simulator 11COMMENT= Solar System Flyby Simulator
12 12
13MAKE_JOBS_SAFE= no 
14 
15USE_TOOLS+= flex bison 13USE_TOOLS+= flex bison
16 14
17MAKE_FILE= Makefile.FreeBSD 15MAKE_FILE= Makefile.FreeBSD
18 16
19DATA_FILES= *.jpg *.dat ssystem.conf 17DATA_FILES= *.jpg *.dat ssystem.conf
20DOC_FILES= LICENSE README 18DOC_FILES= LICENSE README
21 19
22INSTALLATION_DIRS= bin share/ssystem/hires share/doc/ssystem 20INSTALLATION_DIRS= bin share/ssystem/hires share/doc/ssystem
23 21
24do-install: 22do-install:
25 cd ${WRKSRC} && \ 23 cd ${WRKSRC} && \
26 ${INSTALL_PROGRAM} ssystem ${DESTDIR}${PREFIX}/bin; \ 24 ${INSTALL_PROGRAM} ssystem ${DESTDIR}${PREFIX}/bin; \
27 ${INSTALL_DATA} ${DATA_FILES} ${DESTDIR}${PREFIX}/share/ssystem; \ 25 ${INSTALL_DATA} ${DATA_FILES} ${DESTDIR}${PREFIX}/share/ssystem; \
28 ${INSTALL_DATA} ${DOC_FILES} ${DESTDIR}${PREFIX}/share/doc/ssystem; \ 26 ${INSTALL_DATA} ${DOC_FILES} ${DESTDIR}${PREFIX}/share/doc/ssystem; \
29 ${INSTALL_DATA} hires/README ${DESTDIR}${PREFIX}/share/ssystem/hires 27 ${INSTALL_DATA} hires/README ${DESTDIR}${PREFIX}/share/ssystem/hires
30 28
31.include "../../graphics/MesaLib/buildlink3.mk" 29.include "../../graphics/MesaLib/buildlink3.mk"
32.include "../../graphics/freeglut/buildlink3.mk" 30.include "../../graphics/freeglut/buildlink3.mk"
33.include "../../graphics/glu/buildlink3.mk" 31.include "../../graphics/glu/buildlink3.mk"
34.include "../../mk/jpeg.buildlink3.mk" 32.include "../../mk/jpeg.buildlink3.mk"
 33.include "../../x11/libXmu/buildlink3.mk"
35.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/x11/ssystem/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/ssystem/distinfo 2015/11/04 03:28:54 1.5
+++ pkgsrc/x11/ssystem/distinfo 2019/12/20 00:03:11 1.6
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.5 2015/11/04 03:28:54 agc Exp $ 1$NetBSD: distinfo,v 1.6 2019/12/20 00:03:11 joerg Exp $
2 2
3SHA1 (ssystem-1.6.tar.gz) = b22f766159c8e9c861c23aa6ca47f374294a847a 3SHA1 (ssystem-1.6.tar.gz) = b22f766159c8e9c861c23aa6ca47f374294a847a
4RMD160 (ssystem-1.6.tar.gz) = 33b9e84fbd1f0ce22c25931effe21fce589fb1e1 4RMD160 (ssystem-1.6.tar.gz) = 33b9e84fbd1f0ce22c25931effe21fce589fb1e1
5SHA512 (ssystem-1.6.tar.gz) = c09397464916faeae8fdc6bfc253318112ba90e818155a814f9fdddc33b95cd96214fd3e90cdac295f408a2bd8a04f84d1370d7700c7b9c76e7b77ada01b6b72 5SHA512 (ssystem-1.6.tar.gz) = c09397464916faeae8fdc6bfc253318112ba90e818155a814f9fdddc33b95cd96214fd3e90cdac295f408a2bd8a04f84d1370d7700c7b9c76e7b77ada01b6b72
6Size (ssystem-1.6.tar.gz) = 1037947 bytes 6Size (ssystem-1.6.tar.gz) = 1037947 bytes
7SHA1 (patch-aa) = f44692941d5b001d6b3017a5a8af8c0e0aab00b7 7SHA1 (patch-aa) = 52438ca58f517c94ed18932fec82dc38052c42f1
8SHA1 (patch-ab) = 5851d684371ae46124041e2275dadb4e61a5f547 8SHA1 (patch-ab) = 5851d684371ae46124041e2275dadb4e61a5f547
9SHA1 (patch-ac) = ea9736f69be4ea552bb2d73faf697c0cb314eede 9SHA1 (patch-ac) = ea9736f69be4ea552bb2d73faf697c0cb314eede
cvs diff -r1.1.1.1 -r1.2 pkgsrc/x11/ssystem/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/x11/ssystem/patches/patch-aa 2001/03/26 07:08:59 1.1.1.1
+++ pkgsrc/x11/ssystem/patches/patch-aa 2019/12/20 00:03:11 1.2
@@ -1,15 +1,23 @@ @@ -1,15 +1,23 @@
1$NetBSD: patch-aa,v 1.1.1.1 2001/03/26 07:08:59 fredb Exp $ 1$NetBSD: patch-aa,v 1.2 2019/12/20 00:03:11 joerg Exp $
2 2
3--- Makefile.FreeBSD.orig Thu Feb 25 05:48:53 1999 3--- Makefile.FreeBSD.orig 1999-02-25 11:48:53.000000000 +0000
4+++ Makefile.FreeBSD Sun Mar 25 23:28:12 2001 4+++ Makefile.FreeBSD
5@@ -28,8 +28,8 @@ 5@@ -28,8 +28,8 @@ JPEGDIR?= $(LOCALBASE)
6  6
7 CFLAGS+= -I$(X11BASE)/include -I$(MESADIR)/include -I$(JPEGDIR)/include -DSDATADIR=\"${SDATADIR}\" 7 CFLAGS+= -I$(X11BASE)/include -I$(MESADIR)/include -I$(JPEGDIR)/include -DSDATADIR=\"${SDATADIR}\"
8  8
9-LDFLAGS= -L$(X11BASE)/lib -L$(MESADIR)/lib -L${JPEGDIR}/lib \ 9-LDFLAGS= -L$(X11BASE)/lib -L$(MESADIR)/lib -L${JPEGDIR}/lib \
10- -ljpeg -lglut -lMesaGLU -lMesaGL -lXext -lXmu -lX11 -lXi -lm 10- -ljpeg -lglut -lMesaGLU -lMesaGL -lXext -lXmu -lX11 -lXi -lm
11+LDFLAGS= -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib -L${JPEGDIR}/lib -Wl,-R${JPEGDIR}/lib \ 11+LDFLAGS= -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib -L${JPEGDIR}/lib -Wl,-R${JPEGDIR}/lib \
12+ -ljpeg -lglut -lGLU -lGL -lXext -lXmu -lX11 -lXi -lm 12+ -ljpeg -lglut -lGLU -lGL -lXext -lXmu -lX11 -lXi -lm
13  13
14 # FreeBSD specific 14 # FreeBSD specific
15 .ifdef PORTOBJFORMAT 15 .ifdef PORTOBJFORMAT
 16@@ -55,6 +55,7 @@ ssystem: $(OBJ)
 17 lex.cfg.c: cfglex.l cfgparse.tab.c
 18 flex -i -Pcfg cfglex.l
 19
 20+cfgparse.tab.h: cfgparse.tab.c
 21 cfgparse.tab.c: cfgparse.y
 22 bison -d -v -p cfg cfgparse.y
 23