Thu Aug 21 11:47:17 2014 UTC ()
Fix build on SunOS (needs socket libs, use BSD_INSTALL).


(jperkin)
diff -r1.26 -r1.27 pkgsrc/games/maelstrom-x11/Makefile
diff -r1.9 -r1.10 pkgsrc/games/maelstrom-x11/distinfo
diff -r1.3 -r1.4 pkgsrc/games/maelstrom-x11/patches/patch-aa
cvs diff -r1.26 -r1.27 pkgsrc/games/maelstrom-x11/Makefile (expand / switch to unified diff)

--- pkgsrc/games/maelstrom-x11/Makefile 2012/10/23 10:24:04 1.26
+++ pkgsrc/games/maelstrom-x11/Makefile 2014/08/21 11:47:17 1.27
@@ -1,41 +1,42 @@ @@ -1,41 +1,42 @@
1# $NetBSD: Makefile,v 1.26 2012/10/23 10:24:04 wiz Exp $ 1# $NetBSD: Makefile,v 1.27 2014/08/21 11:47:17 jperkin Exp $
2 2
3DISTNAME= Maelstrom-1.4.3-L2.0.6-src.tar.gz 3DISTNAME= Maelstrom-1.4.3-L2.0.6-src.tar.gz
4PKGNAME= maelstrom-x11-2.0.6 4PKGNAME= maelstrom-x11-2.0.6
5PKGREVISION= 4 5PKGREVISION= 4
6CATEGORIES= games x11 6CATEGORIES= games x11
7MASTER_SITES+= ftp://ftp.devolution.com/pub/maelstrom/ 7MASTER_SITES+= ftp://ftp.devolution.com/pub/maelstrom/
8MASTER_SITES+= ftp://ftp.devolution.com/pub/maelstrom/Maelstrom-binaries/ 8MASTER_SITES+= ftp://ftp.devolution.com/pub/maelstrom/Maelstrom-binaries/
9MASTER_SITES+= ftp://ftp.devolution.com/pub/maelstrom/Add-Ons/ 9MASTER_SITES+= ftp://ftp.devolution.com/pub/maelstrom/Add-Ons/
10DISTFILES= ${DISTNAME} ${STREK} ${SWARS} ${ESOUND} 10DISTFILES= ${DISTNAME} ${STREK} ${SWARS} ${ESOUND}
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://www.ambrosiasw.com/Products/Maelstrom.html 13HOMEPAGE= http://www.ambrosiasw.com/Products/Maelstrom.html
14COMMENT= High resolution graphics version of Asteroids (X11 version) 14COMMENT= High resolution graphics version of Asteroids (X11 version)
15 15
16ESOUND= Maelstrom-Sounds-L2.0.0.tar.gz 16ESOUND= Maelstrom-Sounds-L2.0.0.tar.gz
17STREK= Star_Trek.tar.gz 17STREK= Star_Trek.tar.gz
18SWARS= Star_Wars.tar.gz 18SWARS= Star_Wars.tar.gz
19 19
20CONFLICTS= maelstrom-[0-9]* maelstrom-sdl-[0-9]* 20CONFLICTS= maelstrom-[0-9]* maelstrom-sdl-[0-9]*
21 21
22EXTRACT_ONLY= ${DISTNAME} 22EXTRACT_ONLY= ${DISTNAME}
23 23
24WRKSRC= ${WRKDIR}/Maelstrom 24WRKSRC= ${WRKDIR}/Maelstrom
25USE_LANGUAGES= c c++ 25USE_LANGUAGES= c c++
26USE_TOOLS+= pax 26USE_TOOLS+= pax
27USE_X11BASE= YES 27USE_X11BASE= YES
28LIBS.SunOS+= -lsocket 28LDFLAGS.SunOS+= -lsocket -lnsl
 29LIBS.SunOS+= -lsocket -lnsl
29MAKE_FLAGS+= EXTRALIBS=${LIBS:Q} 30MAKE_FLAGS+= EXTRALIBS=${LIBS:Q}
30MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} XPMDIR=${BUILDLINK_PREFIX.libXpm} 31MAKE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} XPMDIR=${BUILDLINK_PREFIX.libXpm}
31MAKE_ENV+= GAMEOWN=${GAMEOWN} GAMEGRP=${GAMEGRP} 32MAKE_ENV+= GAMEOWN=${GAMEOWN} GAMEGRP=${GAMEGRP}
32MAKE_ENV+= GAMEMODE=${GAMEMODE} GAMEDATAMODE=${GAMEDATAMODE} 33MAKE_ENV+= GAMEMODE=${GAMEMODE} GAMEDATAMODE=${GAMEDATAMODE}
33MAKE_ENV+= VARBASE=${VARBASE} 34MAKE_ENV+= VARBASE=${VARBASE}
34 35
35USE_GAMESGROUP= yes 36USE_GAMESGROUP= yes
36SCOREDIR= ${VARBASE}/games 37SCOREDIR= ${VARBASE}/games
37SCOREFILE= ${SCOREDIR}/Maelstrom-Scores 38SCOREFILE= ${SCOREDIR}/Maelstrom-Scores
38ORIGSCOREFILE= ${PREFIX}/share/maelstrom/Maelstrom-Scores 39ORIGSCOREFILE= ${PREFIX}/share/maelstrom/Maelstrom-Scores
39MAKE_DIRS_PERMS+= ${SCOREDIR} ${GAMEDIR_PERMS} 40MAKE_DIRS_PERMS+= ${SCOREDIR} ${GAMEDIR_PERMS}
40REQD_FILES_PERMS+= ${ORIGSCOREFILE} ${SCOREFILE} ${GAMEDATA_PERMS} 41REQD_FILES_PERMS+= ${ORIGSCOREFILE} ${SCOREFILE} ${GAMEDATA_PERMS}
41BUILD_DEFS+= VARBASE SCOREFILE 42BUILD_DEFS+= VARBASE SCOREFILE
cvs diff -r1.9 -r1.10 pkgsrc/games/maelstrom-x11/distinfo (expand / switch to unified diff)

--- pkgsrc/games/maelstrom-x11/distinfo 2012/04/13 04:43:23 1.9
+++ pkgsrc/games/maelstrom-x11/distinfo 2014/08/21 11:47:17 1.10
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1$NetBSD: distinfo,v 1.9 2012/04/13 04:43:23 dholland Exp $ 1$NetBSD: distinfo,v 1.10 2014/08/21 11:47:17 jperkin Exp $
2 2
3SHA1 (Maelstrom-1.4.3-L2.0.6-src.tar.gz) = 66c81365104bfab9985919f0cba5a6d955727d79 3SHA1 (Maelstrom-1.4.3-L2.0.6-src.tar.gz) = 66c81365104bfab9985919f0cba5a6d955727d79
4RMD160 (Maelstrom-1.4.3-L2.0.6-src.tar.gz) = 071b36ecd31830f3b62e4b6e2f64b7f7d87b1386 4RMD160 (Maelstrom-1.4.3-L2.0.6-src.tar.gz) = 071b36ecd31830f3b62e4b6e2f64b7f7d87b1386
5Size (Maelstrom-1.4.3-L2.0.6-src.tar.gz) = 1463130 bytes 5Size (Maelstrom-1.4.3-L2.0.6-src.tar.gz) = 1463130 bytes
6SHA1 (Star_Trek.tar.gz) = c66dbb40edf6424ff6c4d1b9c1800fdcb731f1a6 6SHA1 (Star_Trek.tar.gz) = c66dbb40edf6424ff6c4d1b9c1800fdcb731f1a6
7RMD160 (Star_Trek.tar.gz) = 1c23f43450e19f0ec7a55cc1d0af54d528b1b66b 7RMD160 (Star_Trek.tar.gz) = 1c23f43450e19f0ec7a55cc1d0af54d528b1b66b
8Size (Star_Trek.tar.gz) = 1207676 bytes 8Size (Star_Trek.tar.gz) = 1207676 bytes
9SHA1 (Star_Wars.tar.gz) = 6ea6fcf2e43943d6a2781e35eb03db54855622d2 9SHA1 (Star_Wars.tar.gz) = 6ea6fcf2e43943d6a2781e35eb03db54855622d2
10RMD160 (Star_Wars.tar.gz) = 4f4c7e375c08d3c8c66d1e9506688484cf651f6b 10RMD160 (Star_Wars.tar.gz) = 4f4c7e375c08d3c8c66d1e9506688484cf651f6b
11Size (Star_Wars.tar.gz) = 723225 bytes 11Size (Star_Wars.tar.gz) = 723225 bytes
12SHA1 (Maelstrom-Sounds-L2.0.0.tar.gz) = 26f1fb329576fd95d7cd99d5a8b75a85654225b6 12SHA1 (Maelstrom-Sounds-L2.0.0.tar.gz) = 26f1fb329576fd95d7cd99d5a8b75a85654225b6
13RMD160 (Maelstrom-Sounds-L2.0.0.tar.gz) = ee11301b5acd54497b14642969d6abacbdc6ffd0 13RMD160 (Maelstrom-Sounds-L2.0.0.tar.gz) = ee11301b5acd54497b14642969d6abacbdc6ffd0
14Size (Maelstrom-Sounds-L2.0.0.tar.gz) = 1706928 bytes 14Size (Maelstrom-Sounds-L2.0.0.tar.gz) = 1706928 bytes
15SHA1 (patch-aa) = bf6a9c5394b5ac491a1b92d62d7dc716013ece23 15SHA1 (patch-aa) = 6841bfb443b550d311c222f98d1c4cdb9e4f4081
16SHA1 (patch-ab) = d767d9646f98f1d8b7ce5f471a8a789ed29d0e75 16SHA1 (patch-ab) = d767d9646f98f1d8b7ce5f471a8a789ed29d0e75
17SHA1 (patch-ac) = 81ae36f64ea8db22ba81be8911e05f6c66459edc 17SHA1 (patch-ac) = 81ae36f64ea8db22ba81be8911e05f6c66459edc
18SHA1 (patch-ad) = d5405b696f839c4965fb8e299108aff1b689399a 18SHA1 (patch-ad) = d5405b696f839c4965fb8e299108aff1b689399a
19SHA1 (patch-ae) = 1e63b3f3ebe9e98b19c6fb08d6b4ea608a500fb4 19SHA1 (patch-ae) = 1e63b3f3ebe9e98b19c6fb08d6b4ea608a500fb4
20SHA1 (patch-af) = 46b5ab4cfe3e20401fc5feaa9319c093b025ca1d 20SHA1 (patch-af) = 46b5ab4cfe3e20401fc5feaa9319c093b025ca1d
21SHA1 (patch-ag) = 0accbc0a198e66a1cc2e86b62f32656e213d8de1 21SHA1 (patch-ag) = 0accbc0a198e66a1cc2e86b62f32656e213d8de1
22SHA1 (patch-ah) = b39ccc02f3e27e655d5169bb843554b7bdb323a9 22SHA1 (patch-ah) = b39ccc02f3e27e655d5169bb843554b7bdb323a9
23SHA1 (patch-ai) = 153db1c1860e5d336a51aac2d86f753fc3858d31 23SHA1 (patch-ai) = 153db1c1860e5d336a51aac2d86f753fc3858d31
24SHA1 (patch-aj) = 5135031fbbfa06eb11d24859bb1589361b025ba4 24SHA1 (patch-aj) = 5135031fbbfa06eb11d24859bb1589361b025ba4
25SHA1 (patch-ak) = 40a94611f4051824f72e757a13a3cb03e141d1ac 25SHA1 (patch-ak) = 40a94611f4051824f72e757a13a3cb03e141d1ac
26SHA1 (patch-macres_cpp) = bc9d2519da4332b4fc8dd03d0dfeedfeb9d95e7c 26SHA1 (patch-macres_cpp) = bc9d2519da4332b4fc8dd03d0dfeedfeb9d95e7c
27SHA1 (patch-maelstrom_sound_cpp) = 6fcade9c4f816ba0560f34843b5b9982bc575c4e 27SHA1 (patch-maelstrom_sound_cpp) = 6fcade9c4f816ba0560f34843b5b9982bc575c4e
28SHA1 (patch-netplayd_netplayd_c) = 2cdfd28c1dd9b813277e46ec673ee05893304443 28SHA1 (patch-netplayd_netplayd_c) = 2cdfd28c1dd9b813277e46ec673ee05893304443
cvs diff -r1.3 -r1.4 pkgsrc/games/maelstrom-x11/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/games/maelstrom-x11/patches/patch-aa 2006/06/26 08:56:37 1.3
+++ pkgsrc/games/maelstrom-x11/patches/patch-aa 2014/08/21 11:47:17 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.3 2006/06/26 08:56:37 rillig Exp $ 1$NetBSD: patch-aa,v 1.4 2014/08/21 11:47:17 jperkin Exp $
2 2
3--- Makeflags.orig Mon Jul 14 14:32:13 1997 3--- Makeflags.orig Mon Jul 14 14:32:13 1997
4+++ Makeflags Sun Jul 30 01:32:07 2000 4+++ Makeflags Sun Jul 30 01:32:07 2000
5@@ -1,12 +1,42 @@ 5@@ -1,12 +1,42 @@
6+# This file contains the template for Makeflags 6+# This file contains the template for Makeflags
7  7
8-# Some sensible defaults 8-# Some sensible defaults
9-BINDIR = /usr/local/bin 9-BINDIR = /usr/local/bin
10-LIBDIR = /usr/local/lib/Maelstrom 10-LIBDIR = /usr/local/lib/Maelstrom
11+SYSTEM = 11+SYSTEM =
12+FEATURES = -DAUDIO_16BIT -DASYNCHRONOUS_IO -DUSE_POSIX_SIGNALS -DVARBASE=\"${VARBASE}\" 12+FEATURES = -DAUDIO_16BIT -DASYNCHRONOUS_IO -DUSE_POSIX_SIGNALS -DVARBASE=\"${VARBASE}\"
13  13
14-INSTALL = install 14-INSTALL = install
@@ -33,20 +33,20 @@ $NetBSD: patch-aa,v 1.3 2006/06/26 08:56 @@ -33,20 +33,20 @@ $NetBSD: patch-aa,v 1.3 2006/06/26 08:56
33+#CXX = c++ 33+#CXX = c++
34+OPTIMIZE = -O2 34+OPTIMIZE = -O2
35+X11INCLUDE = -I$(X11BASE)/include 35+X11INCLUDE = -I$(X11BASE)/include
36+INCLUDES = -I$(LOGIC) $(X11INCLUDE) $(XPMINCLUDE) 36+INCLUDES = -I$(LOGIC) $(X11INCLUDE) $(XPMINCLUDE)
37+CFLAGS = $(OPTIMIZE) $(INCLUDES) $(FEATURES) \ 37+CFLAGS = $(OPTIMIZE) $(INCLUDES) $(FEATURES) \
38+ -DSYSTEM=\"$(SYSTEM)\" -DLIBDIR=\"$(LIBDIR)\" 38+ -DSYSTEM=\"$(SYSTEM)\" -DLIBDIR=\"$(LIBDIR)\"
39+EXTRALIBS = 39+EXTRALIBS =
40+X11LINKDIR = -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib 40+X11LINKDIR = -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib
41+X11LIBS = -lX11 -lXext -lXpm 41+X11LIBS = -lX11 -lXext -lXpm
42+CSUMLIB = 42+CSUMLIB =
43+LIBS = $(EXTRALIBS) $(XPMLINKDIR) $(X11LINKDIR) $(X11LIBS) $(CSUMLIB) 43+LIBS = $(EXTRALIBS) $(XPMLINKDIR) $(X11LINKDIR) $(X11LIBS) $(CSUMLIB)
44+SOUNDLIBS = ${LIBOSSAUDIO} 44+SOUNDLIBS = ${LIBOSSAUDIO}
45+ 45+
46+INSTALL = /usr/bin/install 46+INSTALL = $(BSD_INSTALL)
47+ 47+
48+all: $(MAELSTROM) netplayd/netplayd 48+all: $(MAELSTROM) netplayd/netplayd
49+ 49+
50+netplayd: 50+netplayd:
51+ cd netplayd && make 51+ cd netplayd && make
52  52