From 3a43be3d904c0ce8ffda63a9b8fee24ada64b281 Mon Sep 17 00:00:00 2001 From: ben Date: Thu, 15 Apr 2004 19:43:12 +0000 Subject: Make falcons-eye build in Linux. --- games/falcons-eye/Makefile | 29 ++++++++++++------ games/falcons-eye/distinfo | 3 +- games/falcons-eye/patches/patch-af | 60 -------------------------------------- 3 files changed, 21 insertions(+), 71 deletions(-) delete mode 100644 games/falcons-eye/patches/patch-af (limited to 'games/falcons-eye') diff --git a/games/falcons-eye/Makefile b/games/falcons-eye/Makefile index a114fdf8239..202c32fba05 100644 --- a/games/falcons-eye/Makefile +++ b/games/falcons-eye/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/03/07 17:13:49 snj Exp $ +# $NetBSD: Makefile,v 1.14 2004/04/15 19:43:12 ben Exp $ # DISTNAME= nethack_source_331_jtp_193 @@ -20,16 +20,27 @@ WRKSRC= ${WRKDIR} USE_BUILDLINK3= yes USE_X11= yes -post-patch: - @${MV} ${WRKSRC}/include/config.h ${WRKSRC}/config.h-pre - @${SED} -e 's@XXXPREFIXXXX@${PREFIX}@g' \ - -e 's|@GZIP_PROGRAM@|'`${ECHO} ${GZIP_CMD} | ${AWK} '{ print $$1 }'`'|g' \ - < ${WRKSRC}/config.h-pre > ${WRKSRC}/include/config.h - @${RM} -f ${WRKSRC}/config.h-pre - @${SED} 's@XXXPREFIXXXX@${PREFIX}@g' \ - <${WRKSRC}/src/fe-config.in >${WRKSRC}/src/fe-config +SUBST_CLASSES+= paths +SUBST_MESSAGE.paths= "Configuring program paths." +SUBST_STAGE.paths= post-patch +SUBST_FILES.paths= include/config.h src/fe-config.in +SUBST_SED.paths= -e "s,XXXPREFIXXXX,${PREFIX},g" \ + -e "s,@GZIP_PROGRAM@,${GZIP_CMD:M*gzip},g" + +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "NetBSD" +SUBST_CLASSES+= unixconf +SUBST_MESSAGE.unixconf= "Configuring to use NetBSD pre-sets." +SUBST_STAGE.unixconf= post-patch +SUBST_FILES.unixconf= include/unixconf.h +SUBST_SED.unixconf= -e 's,^\/\* \#define BSD 1 \*\/,\#define BSD 1,' \ + -e 's,^\#define SYSV,\/\* \#define SYSV \*\/,' \ + -e 's,^\#define LINUX,\/\* \#define LINUX \*\/,' +.endif pre-configure: + ${CP} ${WRKSRC}/src/fe-config.in ${WRKSRC}/src/fe-config @${CHMOD} 755 ${WRKSRC}/sys/unix/setup.sh pre-install: diff --git a/games/falcons-eye/distinfo b/games/falcons-eye/distinfo index bd2a9e0983d..2a6c8924c46 100644 --- a/games/falcons-eye/distinfo +++ b/games/falcons-eye/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2003/12/20 16:51:38 ben Exp $ +$NetBSD: distinfo,v 1.4 2004/04/15 19:43:12 ben Exp $ SHA1 (nethack_source_331_jtp_193.zip) = 8e002c7f7ca039de875b3c797b2584a517aad6ce Size (nethack_source_331_jtp_193.zip) = 8405675 bytes @@ -7,7 +7,6 @@ SHA1 (patch-ab) = 4ab97753aacedfbfd6823600723f01d55043855f SHA1 (patch-ac) = 3a88954c950854350938fbec1fef195baaacb2cf SHA1 (patch-ad) = dc8de40956abdea203814868c4344b7676dee82d SHA1 (patch-ae) = b6d0cca1e3d781a2a1f1d4b244e944eaedfec716 -SHA1 (patch-af) = 0f2fa223ee26c5c3c5e1ae92b65d86af636f5ec5 SHA1 (patch-ag) = 6aeae6bde079b9c9081f6e32523687010c9bc674 SHA1 (patch-ba) = 8fb7c3ad5fdc5f35e34b1ac87bc60e1a22a91c03 SHA1 (patch-bb) = 899a966ec39b749618cad9c6e420cfd865eb7d5e diff --git a/games/falcons-eye/patches/patch-af b/games/falcons-eye/patches/patch-af deleted file mode 100644 index 458fe1f7e68..00000000000 --- a/games/falcons-eye/patches/patch-af +++ /dev/null @@ -1,60 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2002/01/21 11:56:17 pooka Exp $ - ---- include/unixconf.h.orig Sun Jun 24 18:57:16 2001 -+++ include/unixconf.h -@@ -19,25 +19,25 @@ - */ - - /* define exactly one of the following four choices */ --/* #define BSD 1 */ /* define for 4.n BSD */ -+#define BSD 1 /* define for 4.n BSD */ - /* also for relatives like SunOS 4.x, DG/UX, and */ - /* older versions of Linux */ - /* #define ULTRIX */ /* define for Ultrix v3.0 or higher (but not lower) */ - /* Use BSD for < v3.0 */ - /* "ULTRIX" not to be confused with "ultrix" */ --#define SYSV /* define for System V, Solaris 2.x, newer versions */ -+/* #define SYSV /* define for System V, Solaris 2.x, newer versions */ - /* of Linux */ - /* #define HPUX */ /* Hewlett-Packard's Unix, version 6.5 or higher */ - /* use SYSV for < v6.5 */ - - - /* define any of the following that are appropriate */ --#define SVR4 /* use in addition to SYSV for System V Release 4 */ -+/* #define SVR4 /* use in addition to SYSV for System V Release 4 */ - /* including Solaris 2+ */ - #define NETWORK /* if running on a networked system */ - /* e.g. Suns sharing a playground through NFS */ - /* #define SUNOS4 */ /* SunOS 4.x */ --#define LINUX /* Another Unix clone */ -+/* #define LINUX */ /* Another Unix clone */ - /* #define CYGWIN32 */ /* Unix on Win32 -- use with case sensitive defines */ - /* #define GENIX */ /* Yet Another Unix Clone */ - /* #define HISX */ /* Bull Unix for XPS Machines */ -@@ -47,7 +47,7 @@ - * job control (note that AIX is SYSV otherwise) - * Also define this for AIX 3.2 */ - --#define TERMINFO /* uses terminfo rather than termcap */ -+/* #define TERMINFO /* uses terminfo rather than termcap */ - /* Should be defined for most SYSV, SVR4 (including - * Solaris 2+), HPUX, and Linux systems. In - * particular, it should NOT be defined for the UNIXPC -@@ -168,11 +168,15 @@ - - #ifdef MAIL - # if defined(BSD) || defined(ULTRIX) -+# ifdef __NetBSD__ -+#define DEF_MAILREADER "/usr/bin/mail" -+# else - # ifdef AMS - #define AMS_MAILBOX "/Mailbox" - # else - #define DEF_MAILREADER "/usr/ucb/Mail" --# endif -+# endif -+# endif - #else - # if defined(SYSV) || defined(DGUX) || defined(HPUX) - # if defined(M_XENIX) || defined(__FreeBSD__) -- cgit v1.2.3