Add DragonFly support. Fix compilation with GCC 3.4: Publically declaring

a private type doesn't work.

3 files changed, 43 insertions, 2 deletions

diff --git a/net/liblive/Makefile b/net/liblive/Makefile
index ba1ab50bfc6..8821265fcfd 100644
--- a/net/liblive/Makefile
+++ b/net/liblive/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:30:20 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/03/22 22:51:52 joerg Exp $
 #
 
 DISTNAME=	live.2003.04.04
@@ -18,6 +18,7 @@ INSTALLATION_DIRS=	bin lib
 
 do-configure:
 	${CP} ${FILESDIR}/config.netbsd ${WRKSRC}
+	${CP} ${FILESDIR}/config.netbsd ${WRKSRC}/config.dragonfly
 	cd ${WRKSRC} && ${SH} ./genMakefiles ${LOWER_OPSYS}
 	${RM} -f ${WRKSRC}/testProgs/qtParse
 
diff --git a/net/liblive/distinfo b/net/liblive/distinfo
index 3afcdb9c510..5751402f0e8 100644
--- a/net/liblive/distinfo
+++ b/net/liblive/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 12:13:52 agc Exp $
+$NetBSD: distinfo,v 1.4 2006/03/22 22:51:52 joerg Exp $
 
 SHA1 (live.2003.04.04.tar.gz) = f5c7cffd92f5811c004c30e2b1f889f817539afb
 RMD160 (live.2003.04.04.tar.gz) = 645840b7c371609b4265005091d4d14e7bc995af
@@ -6,3 +6,4 @@ Size (live.2003.04.04.tar.gz) = 276978 bytes
 SHA1 (patch-aa) = dd4a99f255200d89b3bc9c6e709c53d8e4817e5c
 SHA1 (patch-ab) = c1db6185f37f61bf1645d122fbd480c2f9502c79
 SHA1 (patch-ac) = 61b890142c0d8870a245de0d50a3762266419e8c
+SHA1 (patch-ad) = 791a7100cf383e9ad96445419157c9a8073be5a6
diff --git a/net/liblive/patches/patch-ad b/net/liblive/patches/patch-ad
new file mode 100644
index 00000000000..1a04296642f
--- /dev/null
+++ b/net/liblive/patches/patch-ad
@@ -0,0 +1,39 @@
+$NetBSD: patch-ad,v 1.1 2006/03/22 22:51:52 joerg Exp $
+
+--- BasicUsageEnvironment/include/BasicHashTable.hh.orig	2006-03-22 22:39:07.000000000 +0000
++++ BasicUsageEnvironment/include/BasicHashTable.hh
+@@ -33,8 +33,16 @@ class BasicHashTable: public HashTable {
+ public:
+   BasicHashTable(int keyType);
+   virtual ~BasicHashTable();
+-  class TableEntry; // forward
+-  
++
++private:
++  class TableEntry {
++  public:
++    TableEntry* fNext;
++    char const* key;
++    void* value;
++  };
++
++public:
+   // Used to iterate through the members of the table:
+   class Iterator: public HashTable::Iterator {
+   public:
+@@ -57,14 +65,8 @@ private: // implementation of inherited 
+   // Returns 0 if not found
+   virtual Boolean IsEmpty() const;
+   
+-private:
+-  class TableEntry {
+-  public:
+-    TableEntry* fNext;
+-    char const* key;
+-    void* value;
+-  };
+ 
++private:
+   TableEntry* lookupKey(char const* key, unsigned& index) const;
+     // returns entry matching "key", or NULL if none
+   Boolean keyMatches(char const* key1, char const* key2) const;