diff options
author | wiz <wiz> | 2000-05-25 09:07:31 +0000 |
---|---|---|
committer | wiz <wiz> | 2000-05-25 09:07:31 +0000 |
commit | 9edf00ccdabc5f2f8e12ef6a4682e961a754eab9 (patch) | |
tree | 5cfc70218307280ba7c7c6117d001fa7c9ca7466 /games | |
parent | b88f13087b7349125a61d1cc012387bd7da57cb3 (diff) | |
download | pkgsrc-9edf00ccdabc5f2f8e12ef6a4682e961a754eab9.tar.gz |
make it run on -current, fix dependency for rplay, and fix two
scripts' perl path
Diffstat (limited to 'games')
-rw-r--r-- | games/crossfire/Makefile | 16 | ||||
-rw-r--r-- | games/crossfire/files/patch-sum | 4 | ||||
-rw-r--r-- | games/crossfire/patches/patch-an | 13 | ||||
-rw-r--r-- | games/crossfire/patches/patch-ao | 13 |
4 files changed, 43 insertions, 3 deletions
diff --git a/games/crossfire/Makefile b/games/crossfire/Makefile index f05a9674c29..98011152402 100644 --- a/games/crossfire/Makefile +++ b/games/crossfire/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/01/02 03:20:11 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2000/05/25 09:07:31 wiz Exp $ # DISTNAME= crossfire-0.94.2 @@ -9,7 +9,7 @@ DISTFILES= ${CF_SRC} ${CF_MAPS} ${CF_SOUND} MAINTAINER= root@garbled.net HOMEPAGE= http://www.fak14.uni-muenchen.de/~h729ihqu/games/crossfire.html -DEPENDS+= rplay-3.2.0b6:../../audio/rplay +DEPENDS+= rplay>=3.2.0:../../audio/rplay DEPENDS+= xpm-3.4k:../../graphics/xpm EXTRACT_ONLY= ${CF_SRC} @@ -25,6 +25,9 @@ SCRIPTS_ENV+= ${SCRIPTSDIR} INSTALL_FILE= ${WRKDIR}/.INSTALL DEINSTALL_FILE= ${WRKDIR}/.DEINSTALL +# for rplay +MAKE_ENV+= LOCALBASE=${LOCALBASE} + post-patch: @${MV} ${WRKSRC}/config/crosssite.def \ ${WRKSRC}/config/crosssite.def-orig @@ -39,6 +42,14 @@ post-patch: @${SED} -e 's|XXXLOCALBASEXXX|${LOCALBASE}|' \ -e 's|XXXX11BASEXXX|${X11BASE}|' \ ${PKGDIR}/install > ${INSTALL_FILE} + @cd ${WRKSRC}/utils && \ + ${MV} mktable.script mktable.script.orig && \ + ${SED} "s@/usr/local@${LOCALBASE}@" mktable.script.orig > \ + mktable.script + @cd ${WRKSRC}/utils && \ + ${MV} mapconv.script mapconv.script.orig && \ + ${SED} "s@/usr/local@${LOCALBASE}@" mapconv.script.orig > \ + mapconv.script post-install: cd ${X11BASE}/lib/crossfire && \ @@ -55,6 +66,7 @@ post-install: @${CHMOD} 2755 ${X11BASE}/bin/crossfire @${CHOWN} -R root:games ${X11BASE}/lib/crossfire @${CHMOD} 775 ${X11BASE}/lib/crossfire/players + @${CHMOD} 775 ${X11BASE}/lib/crossfire/unique-items @${CHMOD} 775 ${X11BASE}/lib/crossfire @${CHMOD} 664 ${X11BASE}/lib/crossfire/highscore diff --git a/games/crossfire/files/patch-sum b/games/crossfire/files/patch-sum index 057f24b5ac2..7d47c8d6b56 100644 --- a/games/crossfire/files/patch-sum +++ b/games/crossfire/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.2 1999/11/27 21:57:11 rh Exp $ +$NetBSD: patch-sum,v 1.3 2000/05/25 09:07:32 wiz Exp $ MD5 (patch-aa) = 5363f1c35056a3518ca9f38bc019976d MD5 (patch-ab) = 4d67345e8e9458b200277307ec9769f4 @@ -13,3 +13,5 @@ MD5 (patch-aj) = e18072caf69a5e5d77f13fc2042159ba MD5 (patch-ak) = 619ab8cb68f080d74cec6d98aab660a0 MD5 (patch-al) = ba3bc5dd5b1613aeef235a5c96573a28 MD5 (patch-am) = 2c0c502f65c55eb43ad895864810023b +MD5 (patch-an) = ae8c996402bec7e1467fc5c164246252 +MD5 (patch-ao) = 687d263472df7d98aa24f9c9506edf47 diff --git a/games/crossfire/patches/patch-an b/games/crossfire/patches/patch-an new file mode 100644 index 00000000000..ce39c94c5db --- /dev/null +++ b/games/crossfire/patches/patch-an @@ -0,0 +1,13 @@ +$NetBSD: patch-an,v 1.1 2000/05/25 09:07:32 wiz Exp $ + +--- server/Imakefile.orig Sat May 16 05:27:01 1998 ++++ server/Imakefile Thu May 25 10:32:57 2000 +@@ -26,7 +26,7 @@ + INCLUDES = -I../include $(RPLAY_INCDIR) $(EUTL_INCLUDES) + + LOCAL_LIBRARIES = $(DLSYM) $(SOUND_LIBS) $(MALLOC_LIBS) -L../common \ +- -lcross $(XPM_LIBS) $(XLIB) $(EUTL_LIBS) ++ -lcross $(XPM_LIBS) $(XLIB) $(EUTL_LIBS) -Wl,-R${LOCALBASE}/lib + + /* I guess the make on OSF systems can handle constructs where the + * variable is being set to itself? Gnu make and sun make can't seem diff --git a/games/crossfire/patches/patch-ao b/games/crossfire/patches/patch-ao new file mode 100644 index 00000000000..4b6be26a684 --- /dev/null +++ b/games/crossfire/patches/patch-ao @@ -0,0 +1,13 @@ +$NetBSD: patch-ao,v 1.1 2000/05/25 09:07:32 wiz Exp $ + +--- crossedit/Imakefile.orig Sat May 16 05:27:09 1998 ++++ crossedit/Imakefile Thu May 25 10:35:09 2000 +@@ -30,7 +30,7 @@ + + + LOCAL_LIBRARIES = $(DLSYM) -L../common -lcross -L./Cnv -lCnv $(XPM_LIBS) \ +- XawClientLibs $(MALLOC_LIBS) ++ XawClientLibs $(MALLOC_LIBS) -Wl,-R${LOCALBASE}/lib + EXTRA_INCLUDES = -I. -I../include -I./include -I./Cnv $(RPLAY_INCDIR) + DEPENDLIB = ../common/libcross.a ./Cnv/libCnv.a + |