[pkgsrc/trunk]: pkgsrc/multimedia/vls Fix build on AMD64. Mark as DESTDIR safe.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f40be8c85550
branches:  trunk
changeset: 547766:f40be8c85550
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Oct 02 13:52:02 2008 +0000

description:
Fix build on AMD64. Mark as DESTDIR safe.

diffstat:

 multimedia/vls/Makefile         |   4 ++-
 multimedia/vls/distinfo         |   4 ++-
 multimedia/vls/patches/patch-ak |  43 +++++++++++++++++++++++++++++++++++++++++
 multimedia/vls/patches/patch-al |  13 ++++++++++++
 4 files changed, 62 insertions(+), 2 deletions(-)

diffs (97 lines):

diff -r 97b1fcbd79fa -r f40be8c85550 multimedia/vls/Makefile
--- a/multimedia/vls/Makefile   Thu Oct 02 13:35:02 2008 +0000
+++ b/multimedia/vls/Makefile   Thu Oct 02 13:52:02 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/08/06 05:16:51 kristerw Exp $
+# $NetBSD: Makefile,v 1.13 2008/10/02 13:52:02 joerg Exp $
 #
 
 DISTNAME=              vls-0.5.6
@@ -10,6 +10,8 @@
 HOMEPAGE=              http://www.videolan.org/
 COMMENT=               VideoLAN Server
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake
 GNU_CONFIGURE=         yes
diff -r 97b1fcbd79fa -r f40be8c85550 multimedia/vls/distinfo
--- a/multimedia/vls/distinfo   Thu Oct 02 13:35:02 2008 +0000
+++ b/multimedia/vls/distinfo   Thu Oct 02 13:52:02 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2006/06/26 11:30:05 rillig Exp $
+$NetBSD: distinfo,v 1.8 2008/10/02 13:52:02 joerg Exp $
 
 SHA1 (vls-0.5.6/vls-0.5.6.tar.gz) = f61acab2d1b9093677de516b63aef534b0cd81b7
 RMD160 (vls-0.5.6/vls-0.5.6.tar.gz) = 5fdcd718db4caa624ad092c4cdddca2fc62b0d15
@@ -13,3 +13,5 @@
 SHA1 (patch-ah) = e3936ced3b16e97a242102f525dfb0bbfd11d33f
 SHA1 (patch-ai) = 4fdebf473eb5be7937ef8e5ac7d63e474b9418b3
 SHA1 (patch-aj) = 9e8255f4c45c74a241333511358ca8f14898f2da
+SHA1 (patch-ak) = 979c146119af5372eba02d9624e1a10b17474f88
+SHA1 (patch-al) = b07580dfe5c0314bfe6baa26cfef455fca5102fa
diff -r 97b1fcbd79fa -r f40be8c85550 multimedia/vls/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/vls/patches/patch-ak   Thu Oct 02 13:52:02 2008 +0000
@@ -0,0 +1,43 @@
+$NetBSD: patch-ak,v 1.1 2008/10/02 13:52:02 joerg Exp $
+
+--- src/core/common.h.orig     2008-10-02 15:44:20.000000000 +0200
++++ src/core/common.h
+@@ -71,28 +71,6 @@
+ #include <stl_config.h>
+ #endif
+ 
+-// Basic types definitions
+-typedef signed char         s8;
+-typedef signed short        s16;
+-typedef signed int          s32;
+-#ifdef _WIN32
+-typedef __int64             s64;
+-#else
+-typedef signed long long    s64;
+-#endif
+-
+-typedef unsigned char       u8;
+-typedef unsigned short      u16;
+-typedef unsigned int        u32;
+-#ifdef _WIN32
+-typedef unsigned __int64    u64;
+-#else
+-typedef unsigned long long  u64;
+-#endif
+-
+-// Byte type
+-typedef u8                  byte;
+- 
+ // Handles
+ typedef void*               handle;
+ 
+@@ -131,6 +109,9 @@ typedef unsigned long       count;
+ #   endif
+ #endif
+ 
++// Byte type
++typedef u8                  byte;
++ 
+ #if defined( WIN32)
+ typedef int                    ssize_t;
+ #endif
diff -r 97b1fcbd79fa -r f40be8c85550 multimedia/vls/patches/patch-al
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/vls/patches/patch-al   Thu Oct 02 13:52:02 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2008/10/02 13:52:02 joerg Exp $
+
+--- src/core/hashtable.cpp.orig        2008-10-02 15:45:19.000000000 +0200
++++ src/core/hashtable.cpp
+@@ -97,7 +97,7 @@ u32 C_HashMethod<u16>::Hash(u16 iKey) co
+ 
+ u32 C_HashMethod<handle>::Hash(handle hKey) const
+ {
+-  return (u32)hKey % m_uiMaxHash;
++  return (u32)(size_t)hKey % m_uiMaxHash;
+ }
+ 
+