[pkgsrc/trunk]: pkgsrc/cad/qcad Fix DESTDIR build. Fix build on 64bit platforms.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e542beb36293
branches:  trunk
changeset: 540229:e542beb36293
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Apr 03 10:53:46 2008 +0000

description:
Fix DESTDIR build. Fix build on 64bit platforms.

diffstat:

 cad/qcad/Makefile         |   5 +++--
 cad/qcad/distinfo         |   4 +++-
 cad/qcad/patches/patch-ah |  15 +++++++++++++++
 cad/qcad/patches/patch-ai |  13 +++++++++++++
 4 files changed, 34 insertions(+), 3 deletions(-)

diffs (72 lines):

diff -r 026002bdccc0 -r e542beb36293 cad/qcad/Makefile
--- a/cad/qcad/Makefile Thu Apr 03 10:19:17 2008 +0000
+++ b/cad/qcad/Makefile Thu Apr 03 10:53:46 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2008/03/03 01:50:27 jlam Exp $
+# $NetBSD: Makefile,v 1.47 2008/04/03 10:53:46 joerg Exp $
 #
 
 DISTNAME=              qcad-2.0.5.0-1-community.src
@@ -55,9 +55,10 @@
                ${BUILD_MAKE_CMD} prepare;                              \
        done
 
+INSTALLATION_DIRS=     bin share/qcad
+
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/qcad/qcad ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/qcad
        cd ${WRKSRC}/qcad && umask 022 && \
        pax -rwpm data fonts patterns qm ${DESTDIR}${PREFIX}/share/qcad
 
diff -r 026002bdccc0 -r e542beb36293 cad/qcad/distinfo
--- a/cad/qcad/distinfo Thu Apr 03 10:19:17 2008 +0000
+++ b/cad/qcad/distinfo Thu Apr 03 10:53:46 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2007/01/16 17:13:37 dmcmahill Exp $
+$NetBSD: distinfo,v 1.18 2008/04/03 10:53:46 joerg Exp $
 
 SHA1 (qcad-2.0.5.0-1-community.src.tar.gz) = aff563389d1285740f6bf7e28f93b8df0f902e0c
 RMD160 (qcad-2.0.5.0-1-community.src.tar.gz) = 85f0b6d3c1edaa0c19494436413521316e803429
@@ -10,3 +10,5 @@
 SHA1 (patch-ae) = a64cc70c6cf13b87ed1f95ebd1859f5f0319cf2f
 SHA1 (patch-af) = a7716a53b6c61624b5fc538582a701551d30a11d
 SHA1 (patch-ag) = bc9eebab94d5c2ab8dcc7896f0a092f4a21e88e5
+SHA1 (patch-ah) = b675b0cbdc86c6135772b4171d2b4e7f1462fde7
+SHA1 (patch-ai) = 89ae38a4a4ddad3df5d28be16c246d79f51ac92a
diff -r 026002bdccc0 -r e542beb36293 cad/qcad/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/qcad/patches/patch-ah Thu Apr 03 10:53:46 2008 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.1 2008/04/03 10:53:46 joerg Exp $
+
+Don't cast pointers to int for printing.
+
+--- qcadlib/src/engine/rs_entity.cpp.orig      2008-04-03 11:29:18.000000000 +0200
++++ qcadlib/src/engine/rs_entity.cpp
+@@ -861,7 +861,7 @@ std::ostream& operator << (std::ostream&
+         os << " layer: NULL ";
+     } else {
+         os << " layer: " << e.layer->getName().latin1() << " ";
+-        os << " layer address: " << (int)(e.layer) << " ";
++        os << " layer address: " << (e.layer) << " ";
+     }
+ 
+     os << e.pen << "\n";
diff -r 026002bdccc0 -r e542beb36293 cad/qcad/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/qcad/patches/patch-ai Thu Apr 03 10:53:46 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2008/04/03 10:53:46 joerg Exp $
+
+--- qcadlib/src/engine/rs_layer.cpp.orig       2008-04-03 11:32:08.000000000 +0200
++++ qcadlib/src/engine/rs_layer.cpp
+@@ -55,7 +55,7 @@ std::ostream& operator << (std::ostream&
+     os << " name: " << l.getName().latin1()
+     << " pen: " << l.getPen()
+       << " frozen: " << (int)l.isFrozen()
+-      << " address: " << (int)(&l)
++      << " address: " << (&l)
+     << std::endl;
+     return os;
+ }