diff options
| author | joerg <joerg@pkgsrc.org> | 2008-04-03 10:53:46 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2008-04-03 10:53:46 +0000 |
| commit | 31da70e8916a7423cb0eafa2a3ddc73b8ae3e7cb (patch) | |
| tree | cc4f9bb6f0d5acd193174b0265d1aaf3add7d66d | |
| parent | fc44d8296d0364d6d2c75bae4ec8455ebc032775 (diff) | |
| download | pkgsrc-31da70e8916a7423cb0eafa2a3ddc73b8ae3e7cb.tar.gz | |
Fix DESTDIR build. Fix build on 64bit platforms.
| -rw-r--r-- | cad/qcad/Makefile | 5 | ||||
| -rw-r--r-- | cad/qcad/distinfo | 4 | ||||
| -rw-r--r-- | cad/qcad/patches/patch-ah | 15 | ||||
| -rw-r--r-- | cad/qcad/patches/patch-ai | 13 |
4 files changed, 34 insertions, 3 deletions
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index 84adca88dec..02b5fa8c0f7 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -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 @@ pre-build: ${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 --git a/cad/qcad/distinfo b/cad/qcad/distinfo index 854d9852901..0cafea8ad4f 100644 --- a/cad/qcad/distinfo +++ b/cad/qcad/distinfo @@ -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-ad) = 288dee3134e6a33260570d43840712964d21cc2b SHA1 (patch-ae) = a64cc70c6cf13b87ed1f95ebd1859f5f0319cf2f SHA1 (patch-af) = a7716a53b6c61624b5fc538582a701551d30a11d SHA1 (patch-ag) = bc9eebab94d5c2ab8dcc7896f0a092f4a21e88e5 +SHA1 (patch-ah) = b675b0cbdc86c6135772b4171d2b4e7f1462fde7 +SHA1 (patch-ai) = 89ae38a4a4ddad3df5d28be16c246d79f51ac92a diff --git a/cad/qcad/patches/patch-ah b/cad/qcad/patches/patch-ah new file mode 100644 index 00000000000..1c8071e73eb --- /dev/null +++ b/cad/qcad/patches/patch-ah @@ -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 --git a/cad/qcad/patches/patch-ai b/cad/qcad/patches/patch-ai new file mode 100644 index 00000000000..676543a0930 --- /dev/null +++ b/cad/qcad/patches/patch-ai @@ -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; + } |