[pkgsrc/trunk]: pkgsrc/games/craft Fixed PR 29378.

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7f199dddb775
branches:  trunk
changeset: 526283:7f199dddb775
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Mar 06 22:57:46 2007 +0000

description:
Fixed PR 29378.

diffstat:

 games/craft/Makefile         |  38 +++++++++++++++++++++-----------------
 games/craft/distinfo         |   3 ++-
 games/craft/patches/patch-aj |  14 ++++++++++++++
 3 files changed, 37 insertions(+), 18 deletions(-)

diffs (88 lines):

diff -r d601a2db9c7e -r 7f199dddb775 games/craft/Makefile
--- a/games/craft/Makefile      Tue Mar 06 22:34:41 2007 +0000
+++ b/games/craft/Makefile      Tue Mar 06 22:57:46 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/02/02 17:36:22 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2007/03/06 22:57:46 rillig Exp $
 
 DISTNAME=      craftcc35
 PKGNAME=       craft-3.5
@@ -16,26 +16,30 @@
 USE_TOOLS+=    gmake
 USE_X11BASE=   yes
 
+SUBST_CLASSES+=                craft
+SUBST_STAGE.craft=     pre-configure
+SUBST_FILES.craft=     win.hc setupedit.hc option_menu.hc craft_def.h
+SUBST_VARS.craft=      PREFIX
+
+SUBST_CLASSES+=                buttons
+SUBST_STAGE.buttons=   pre-configure
+SUBST_FILES.buttons=   .windefaults.params
+SUBST_SED.buttons=     -e 's+buttons+${PREFIX}/share/craft/buttons+'
+
 post-extract:
-       @${FIND} ${WRKSRC} -type f -name '*~' -print | ${XARGS} ${RM} -f
-       @${LN} -fs ${FILESDIR}/Makefile ${WRKSRC}
-       for FILE in `${FIND} ${WRKSRC} -name "*.hc" -type f -print`; do \
-         ${ECHO} >>$$FILE "";                                  \
+       find ${WRKSRC} -type f -name '*~' -print | xargs rm -f
+       ln -fs ${FILESDIR}/Makefile ${WRKSRC}
+       for f in `find ${WRKSRC} -name "*.hc" -type f -print`; do       \
+         ${ECHO} "" >>$$f;                                             \
        done
 
 post-patch:
-       ${RM} -f ${WRKSRC}/hcc/hcc
-       ${CP} ${WRKSRC}/.windefaults.params ${WRKSRC}/foo
-       ${SED} -e 's+buttons+${PREFIX}/share/craft/buttons+' <${WRKSRC}/foo> ${WRKSRC}/.windefaults.params
-       ${CP} ${WRKSRC}/win.hc ${WRKSRC}/foo
-       ${SED} -e 's+@PREFIX@+${PREFIX}+' <${WRKSRC}/foo> ${WRKSRC}/win.hc
-       ${CP} ${WRKSRC}/setupedit.hc ${WRKSRC}/foo
-       ${SED} -e 's+@PREFIX@+${PREFIX}+' <${WRKSRC}/foo> ${WRKSRC}/setupedit.hc
-       ${CP} ${WRKSRC}/option_menu.hc ${WRKSRC}/foo
-       ${SED} -e 's+@PREFIX@+${PREFIX}+' <${WRKSRC}/foo> ${WRKSRC}/option_menu.hc
-       ${CP} ${WRKSRC}/craft_def.h ${WRKSRC}/foo
-       ${SED} -e 's+@PREFIX@+${PREFIX}+' <${WRKSRC}/foo> ${WRKSRC}/craft_def.h
-       ${RM} -f ${WRKSRC}/foo
+       rm -f ${WRKSRC}/hcc/hcc
+
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Linux"
+BUILDLINK_TRANSFORM+=  rm:-lcompat
+.endif
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r d601a2db9c7e -r 7f199dddb775 games/craft/distinfo
--- a/games/craft/distinfo      Tue Mar 06 22:34:41 2007 +0000
+++ b/games/craft/distinfo      Tue Mar 06 22:57:46 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 23:11:55 agc Exp $
+$NetBSD: distinfo,v 1.7 2007/03/06 22:57:46 rillig Exp $
 
 SHA1 (craftcc35.tar.Z) = 8862b9001aa7d752a597033ef45d38ebfcee533f
 RMD160 (craftcc35.tar.Z) = 402a2c2ca37df4d86381b434437395424199859e
@@ -12,3 +12,4 @@
 SHA1 (patch-ag) = 970a96a63c86b16b3b588bc90257c5914e3c35d5
 SHA1 (patch-ah) = 56b09c1fb761e88586cc66de6f1b8079c0f7a785
 SHA1 (patch-ai) = 437500858d90fb24f8fa494269ac83e501630738
+SHA1 (patch-aj) = c9707cfabd88586798a3d77f1ec4ee81d8b67894
diff -r d601a2db9c7e -r 7f199dddb775 games/craft/patches/patch-aj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/craft/patches/patch-aj      Tue Mar 06 22:57:46 2007 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-aj,v 1.1 2007/03/06 22:57:46 rillig Exp $
+
+--- getline.h.orig     1997-02-21 12:50:14.000000000 +0100
++++ getline.h  2007-03-06 23:10:00.692282961 +0100
+@@ -6,6 +6,9 @@
+ #include "buttons.h"
+ #include "bool.h"
+ 
++#include <stdio.h>
++#define getline getline_class
++
+ class getline
+   {public:
+