pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/nqc Fix LP64 build. Add DESTDIR support



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6224404aee26
branches:  trunk
changeset: 554661:6224404aee26
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Feb 17 19:13:46 2009 +0000

description:
Fix LP64 build. Add DESTDIR support

diffstat:

 devel/nqc/Makefile         |   7 ++++++-
 devel/nqc/distinfo         |   4 +++-
 devel/nqc/patches/patch-ab |  22 ++++++++++++++++++++++
 devel/nqc/patches/patch-ac |  13 +++++++++++++
 4 files changed, 44 insertions(+), 2 deletions(-)

diffs (78 lines):

diff -r f32ff20ee073 -r 6224404aee26 devel/nqc/Makefile
--- a/devel/nqc/Makefile        Tue Feb 17 19:13:42 2009 +0000
+++ b/devel/nqc/Makefile        Tue Feb 17 19:13:46 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/10/04 21:35:59 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2009/02/17 19:13:46 joerg Exp $
 #
 
 DISTNAME=              nqc-2.3.r1
@@ -10,7 +10,12 @@
 HOMEPAGE=              http://bricxcc.sourceforge.net/nqc/
 COMMENT=               Development system for the Lego Mindstorms RCX embedded computer
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_LANGUAGES=         c++
 USE_TOOLS+=            flex yacc
 
+INSTALL_MAKE_FLAGS+=   BINDIR=${DESTDIR}${PREFIX}/bin \
+                       MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+
 .include "../../mk/bsd.pkg.mk"
diff -r f32ff20ee073 -r 6224404aee26 devel/nqc/distinfo
--- a/devel/nqc/distinfo        Tue Feb 17 19:13:42 2009 +0000
+++ b/devel/nqc/distinfo        Tue Feb 17 19:13:46 2009 +0000
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 22:24:22 agc Exp $
+$NetBSD: distinfo,v 1.5 2009/02/17 19:13:46 joerg Exp $
 
 SHA1 (nqc-2.3.r1.tar.gz) = 40adcd87c12fc23c600899a6a704620ef2208488
 RMD160 (nqc-2.3.r1.tar.gz) = 2f7a435a99cb207814a8f357b701b1cc1fee2964
 Size (nqc-2.3.r1.tar.gz) = 193028 bytes
 SHA1 (patch-aa) = 0682d30f8c98e6b152e7227d5526a79bff91707b
+SHA1 (patch-ab) = 6fbe6b629ac170475cfeffb8848ba8337d4a13cd
+SHA1 (patch-ac) = d189cbbae24c2aba43aab100c4bb19c2ee24b89f
diff -r f32ff20ee073 -r 6224404aee26 devel/nqc/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nqc/patches/patch-ab        Tue Feb 17 19:13:46 2009 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.1 2009/02/17 19:13:46 joerg Exp $
+
+--- compiler/Error.h.orig      2009-02-17 20:01:36.000000000 +0100
++++ compiler/Error.h
+@@ -89,7 +89,7 @@ public:
+       };
+       
+                       Error(ErrorCode code, int data=0) : fCode(code), fData(data) {}
+-                      Error(ErrorCode code, const char *s) : fCode(code), fData((int)s) {}
++                      Error(ErrorCode code, const char *s) : fCode(code), fData((size_t)s) {}
+ 
+       // raising errors
+       void    Raise(const LexLocation *loc) const;    // raise error at specified location
+@@ -104,7 +104,7 @@ public:
+       
+ private:
+       ErrorCode       fCode;
+-      int                     fData;
++      size_t                  fData;
+ };
+ 
+ 
diff -r f32ff20ee073 -r 6224404aee26 devel/nqc/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/nqc/patches/patch-ac        Tue Feb 17 19:13:46 2009 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2009/02/17 19:13:46 joerg Exp $
+
+--- compiler/Error.cpp.orig    2001-04-16 02:56:29.000000000 +0200
++++ compiler/Error.cpp
+@@ -129,7 +129,7 @@ bool Error::IsDeprecated() const
+ void Error::SPrint(char *str) const
+ {
+       if (fCode < 0 || fCode >= (ErrorCode)(sizeof(sErrorText) / sizeof(const char *)))
+-              sprintf(str, "internal error #%d", fCode);
++              sprintf(str, "internal error #%d", (int)fCode);
+       else
+               sprintf(str, sErrorText[fCode], fData);
+ }



Home | Main Index | Thread Index | Old Index