pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/wm/3ddesktop Fix build on LP64 systems. DESTDIR support.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4ebb50e14fdd
branches:  trunk
changeset: 554437:4ebb50e14fdd
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Feb 14 18:45:12 2009 +0000

description:
Fix build on LP64 systems. DESTDIR support.

diffstat:

 wm/3ddesktop/Makefile         |   8 +++++---
 wm/3ddesktop/distinfo         |   3 ++-
 wm/3ddesktop/patches/patch-ab |  13 +++++++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)

diffs (60 lines):

diff -r 1a5a759ece1b -r 4ebb50e14fdd wm/3ddesktop/Makefile
--- a/wm/3ddesktop/Makefile     Sat Feb 14 18:33:06 2009 +0000
+++ b/wm/3ddesktop/Makefile     Sat Feb 14 18:45:12 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2007/08/06 18:58:29 xtraeme Exp $
+# $NetBSD: Makefile,v 1.21 2009/02/14 18:45:12 joerg Exp $
 #
 
 DISTNAME=              3ddesktop-0.2.9
@@ -9,16 +9,18 @@
 HOMEPAGE=              http://desk3d.sourceforge.net/
 COMMENT=               3D Virtual Desktop Switcher
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE=         yes
 
 USE_LANGUAGES=         c c++
 
 EGDIR=                 ${PREFIX}/share/examples/3ddesktop
 CONF_FILES=            ${EGDIR}/3ddesktop.conf ${PKG_SYSCONFDIR}/3ddesktop.conf
+INSTALLATION_DIRS=     ${EGDIR}
 
 pre-install:
-       ${INSTALL_DATA_DIR} ${EGDIR}
-       ${INSTALL_DATA} ${WRKSRC}/3ddesktop.conf ${EGDIR}
+       ${INSTALL_DATA} ${WRKSRC}/3ddesktop.conf ${DESTDIR}${EGDIR}
 
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
diff -r 1a5a759ece1b -r 4ebb50e14fdd wm/3ddesktop/distinfo
--- a/wm/3ddesktop/distinfo     Sat Feb 14 18:33:06 2009 +0000
+++ b/wm/3ddesktop/distinfo     Sat Feb 14 18:45:12 2009 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2007/08/06 18:58:29 xtraeme Exp $
+$NetBSD: distinfo,v 1.6 2009/02/14 18:45:12 joerg Exp $
 
 SHA1 (3ddesktop-0.2.9.tar.gz) = 33ff86b559d0c0407ef4c6c989a9fcbf804f7e5f
 RMD160 (3ddesktop-0.2.9.tar.gz) = 86ca9d9df57a83d2f4719ce45708e129bdc75fb4
 Size (3ddesktop-0.2.9.tar.gz) = 182278 bytes
 SHA1 (patch-aa) = bf6d06462cb2b0e48f15296a7238980dec0e8e17
+SHA1 (patch-ab) = e078b55d2a0fc7344f59dcbddd25644b31f8f201
 SHA1 (patch-ad) = 3e24c98b58b27e2e7384bb96ece20cb604dd900f
diff -r 1a5a759ece1b -r 4ebb50e14fdd wm/3ddesktop/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/3ddesktop/patches/patch-ab     Sat Feb 14 18:45:12 2009 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2009/02/14 18:45:13 joerg Exp $
+
+--- event.hpp.orig     2004-12-06 03:57:32.000000000 +0100
++++ event.hpp
+@@ -74,7 +74,7 @@ public:
+         list<Event *>::iterator k;
+         for (k = events.begin(); k != events.end(); ++k) {
+             Event *e = *k;
+-            printf(":: Event %d  0x%x\n", e->type, (unsigned int)(e->function));
++            printf(":: Event %d  %p\n", e->type, e->function);
+         }
+     }
+ 



Home | Main Index | Thread Index | Old Index