summaryrefslogtreecommitdiff
path: root/games/craft
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2001-12-19 10:51:19 +0000
committertron <tron@pkgsrc.org>2001-12-19 10:51:19 +0000
commit51284d5551fd4e0bb010255af2d2a2d7ffb41c46 (patch)
tree6493f2029b39e39d1a3e0177ee8cc55280d2189d /games/craft
parent982ca559013f2a73c09c1d687a12f0177bede9ab (diff)
downloadpkgsrc-51284d5551fd4e0bb010255af2d2a2d7ffb41c46.tar.gz
Copy defaults file from correct location when starting "craft" on systems
where "xpkwedge" is installed. Fixes PR pkg/14861 by Robert Elz.
Diffstat (limited to 'games/craft')
-rw-r--r--games/craft/distinfo4
-rw-r--r--games/craft/files/Makefile12
-rw-r--r--games/craft/patches/patch-ab6
3 files changed, 12 insertions, 10 deletions
diff --git a/games/craft/distinfo b/games/craft/distinfo
index 97b952154c8..84f66dd10ea 100644
--- a/games/craft/distinfo
+++ b/games/craft/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/12/19 10:26:47 tron Exp $
+$NetBSD: distinfo,v 1.4 2001/12/19 10:51:19 tron Exp $
SHA1 (craftcc35.tar.Z) = 8862b9001aa7d752a597033ef45d38ebfcee533f
Size (craftcc35.tar.Z) = 3123677 bytes
-SHA1 (patch-ab) = 7ee09365ce9571c65c5350e3dc8d410003d9ea20
+SHA1 (patch-ab) = 32f77d3208af98a26b4a505f51011b33c106b21d
SHA1 (patch-ac) = 93eeef71231abbb5f5210cb7a4d9dac8d476b719
SHA1 (patch-ad) = 096eb8db33986f115efb810f9768661917661fd8
SHA1 (patch-ae) = a891a2a2d80ae37eb0dcc5c218fbc8d8f9e6d2b0
diff --git a/games/craft/files/Makefile b/games/craft/files/Makefile
index c62d9898f9e..bd18d7d778c 100644
--- a/games/craft/files/Makefile
+++ b/games/craft/files/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.1 1999/08/11 22:20:57 tron Exp $
+# $NetBSD: Makefile,v 1.2 2001/12/19 10:51:19 tron Exp $
#
#---------------------------------------------------------------------
#
# The following assigns must be changed according to your system
#
-GCC=gcc
-GPP=g++
+GCC= ${CC}
+GPP= ${CXX}
XLIB=${X11BASE}/lib
-CPPFLAGS=-I${X11BASE}/include -DCRAFT_DIR=\"${PREFIX}/share/craft/\"
+CPPFLAGS=-I${X11BASE}/include -DCRAFT_DIR=\\\"${PREFIX}/share/craft/\\\"
#
#--------------------------------------------------------------------
@@ -21,7 +21,6 @@ OBJ= xtimer.o option_menu.o setupedit.o robot.o land.o ship.o building.o \
objects.o xstring.o id_handler.o color_trans.o masks.o buttons.o lru.o scroller.o \
selector.o cmap_selector.o getline.o file_selector.o history.o craft.o
-CFLAGS=-O2 -fexpensive-optimizations -finline-functions
HCC=hcc/hcc
CMP=${HCC} -compiler ${GCC} ${CPPFLAGS} ${CFLAGS} -c
@@ -40,6 +39,9 @@ craft: ${OBJ}
${OBJ}: hcc/hcc
+hcc/hcc: hcc/hcc.cc
+ ${GPP} ${CFLAGS} $< -o hcc/hcc
+
install: craft
${BSD_INSTALL_PROGRAM} craft ${PREFIX}/bin
${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/craft
diff --git a/games/craft/patches/patch-ab b/games/craft/patches/patch-ab
index a4f5b7f2130..b3cc0701041 100644
--- a/games/craft/patches/patch-ab
+++ b/games/craft/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2001/12/19 10:26:47 tron Exp $
+$NetBSD: patch-ab,v 1.3 2001/12/19 10:51:19 tron Exp $
--- win.hc.orig Wed Mar 19 07:21:21 1997
+++ win.hc Thu Sep 24 11:48:49 1998
@@ -8,8 +8,8 @@ $NetBSD: patch-ab,v 1.2 2001/12/19 10:26:47 tron Exp $
{win_handler_init = true;
- if (! f_exists (".windefaults.params"))
- system ("cp /home/hua/craft/.windefaults.params .");
-+ if (! f_exists ("~/.windefaults.params"))
-+ system ("cp /usr/X11R6/share/craft/.windefaults.params ~/.windefaults.params");
++ if (! f_exists (".windefaults.params"))
++ system ("cp " CRAFT_DIR ".windefaults.params .windefaults.params");
win_defaults = new paramreader (".windefaults");
}.