summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz>2002-07-17 18:22:23 +0000
committerwiz <wiz>2002-07-17 18:22:23 +0000
commit2d482bee2c4d32a6e14de92cdd90358c4762c2eb (patch)
tree8b3dc79c59e7d6e97ed20d1a751708f5844ac98d
parent74eab108ab3d5b591bf2f9e9cad30309fb00dc5d (diff)
downloadpkgsrc-2d482bee2c4d32a6e14de92cdd90358c4762c2eb.tar.gz
Give this a chance of working on xpkgwedged systems.
Not on 1.6 or -current, though, since it has C++ bugs that need fixing.
-rw-r--r--games/wormz/Makefile5
-rw-r--r--games/wormz/distinfo4
-rw-r--r--games/wormz/patches/patch-aa8
3 files changed, 9 insertions, 8 deletions
diff --git a/games/wormz/Makefile b/games/wormz/Makefile
index 0c64af08b89..522e8f2bfe2 100644
--- a/games/wormz/Makefile
+++ b/games/wormz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 15:10:59 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2002/07/17 18:22:23 wiz Exp $
#
DISTNAME= Wormz-1.0b5
@@ -12,7 +12,7 @@ COMMENT= Networked game for X11
WRKSRC= ${WRKDIR}/Wormz
USE_GMAKE= yes
-USE_X11BASE= yes
+USE_BUILD_LINK_ONLY= yes
post-extract:
${MKDIR} ${WRKSRC}/NetBSD
@@ -21,4 +21,5 @@ post-extract:
do-configure:
(cd ${WRKSRC} && ${GMAKE} ${MAKE_ENV} depend)
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/wormz/distinfo b/games/wormz/distinfo
index 2fbcb22f451..59319082ac1 100644
--- a/games/wormz/distinfo
+++ b/games/wormz/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 02:08:36 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/07/17 18:22:24 wiz Exp $
SHA1 (Wormz-1.0b5.tar.gz) = a5e45e90fcc0eb4d188508bdffe71220ddcd20a4
Size (Wormz-1.0b5.tar.gz) = 436954 bytes
-SHA1 (patch-aa) = a7500b29491fa9b209f195b31ed62760514af21e
+SHA1 (patch-aa) = d662af7e771fe1cec709bc09dbc9df5d9e634adf
SHA1 (patch-ab) = 44c938189653de05b48a3ea8ec01442a1c5f22f6
SHA1 (patch-ac) = 7a7764b24bd5c1c6f5121508b9bf618a71cdc8de
diff --git a/games/wormz/patches/patch-aa b/games/wormz/patches/patch-aa
index 0dbe9a67ee2..c24b66047ba 100644
--- a/games/wormz/patches/patch-aa
+++ b/games/wormz/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 1998/11/05 08:24:12 garbled Exp $
+$NetBSD: patch-aa,v 1.2 2002/07/17 18:22:24 wiz Exp $
--- Makefile.orig Tue Jul 14 06:41:40 1998
+++ Makefile Wed Nov 4 21:36:13 1998
@@ -3,8 +3,8 @@
@@ -49,8 +49,8 @@ $NetBSD: patch-aa,v 1.1.1.1 1998/11/05 08:24:12 garbled Exp $
#-Wshadow
-X11INCLUDE=-I/usr/openwin/share/include/
-STDINCLUDE=-I/usr/local/lib/g++-include/ -I/usr/include/g++/
-+X11INCLUDE=-I${PREFIX}/include
-+STDINCLUDE=-I${LOCALBASE}/include
++X11INCLUDE=-I${X11BASE}/include
++STDINCLUDE=
INCLUDE=-I./include -I. $(X11INCLUDE) $(STDINCLUDE)
@@ -59,7 +59,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1998/11/05 08:24:12 garbled Exp $
SrcsClient=$(SrcsClientND) $(SrcsClientDD)
ObjsClient=$(ObjsClientND) $(ObjsClientDD)
-LibsClient=-L/usr/X11R6/lib/ -L/usr/local/lib/ -lX11 -lXext $(EXTRALIBS) $(EXTRAGGILIBS)
-+LibsClient=${LDFLAGS} -L${LOCALBASE}/lib -L${PREFIX}/lib -lX11 -lXext $(EXTRALIBS) $(EXTRAGGILIBS)
++LibsClient=${LDFLAGS} -L${X11BASE}/lib -lX11 -lXext $(EXTRALIBS) $(EXTRAGGILIBS)
SrcsServer=$(foreach dir,$(DirsServer),$(wildcard $(dir)/*.cc))
SrcsServerNotDir=$(notdir $(SrcsServer))