Fix building with Clang; pkglint complains cleaned-up

6 files changed, 146 insertions, 10 deletions

diff --git a/multimedia/mediatomb/Makefile b/multimedia/mediatomb/Makefile
index df2d271143c..b8816df5c63 100644
--- a/multimedia/mediatomb/Makefile
+++ b/multimedia/mediatomb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2011/01/14 08:22:55 tron Exp $
+# $NetBSD: Makefile,v 1.20 2011/04/14 07:26:34 adam Exp $
 
 DISTNAME=	mediatomb-0.12.1
 PKGREVISION=	2
@@ -12,10 +12,9 @@ LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GNU_CONFIGURE=	yes
-
-USE_LANGUAGES+=	c c++
-USE_TOOLS+=	pkg-config automake autoconf autoreconf
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		automake autoconf autoreconf pkg-config
+GNU_CONFIGURE=		yes
 
 RCD_SCRIPTS=	mediatomb
 
@@ -32,10 +31,10 @@ EGDIR=			${PREFIX}/share/examples/mediatomb
 CONF_FILES_PERMS+=	${EGDIR}/config.xml ${PKG_SYSCONFDIR}/config.xml \
 			${MEDIATOMB_USER} ${MEDIATOMB_GROUP} 0640
 
-FILES_SUBST+=			PKG_HOME=${PKG_HOME.${MEDIATOMB_USER}:Q}
-FILES_SUBST+=			MEDIATOMB_GROUP=${MEDIATOMB_GROUP:Q}
-FILES_SUBST+=			MEDIATOMB_USER=${MEDIATOMB_USER:Q}
-FILES_SUBST+=			PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
+FILES_SUBST+=		PKG_HOME=${PKG_HOME.${MEDIATOMB_USER}:Q}
+FILES_SUBST+=		MEDIATOMB_GROUP=${MEDIATOMB_GROUP}
+FILES_SUBST+=		MEDIATOMB_USER=${MEDIATOMB_USER}
+FILES_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 
 MEDIATOMB_HOME=		${PKG_HOME.${MEDIATOMB_USER}}
 
@@ -72,4 +71,5 @@ PREFER.bind=	pkgsrc	# we need the package for the lwres lib
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mediatomb/distinfo b/multimedia/mediatomb/distinfo
index e68af8e107c..1ffb7d9d18c 100644
--- a/multimedia/mediatomb/distinfo
+++ b/multimedia/mediatomb/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2010/11/27 06:30:24 agc Exp $
+$NetBSD: distinfo,v 1.8 2011/04/14 07:26:34 adam Exp $
 
 SHA1 (mediatomb-0.12.1.tar.gz) = 86e880584cc9c8aaf3926d56048510d1d06e76b4
 RMD160 (mediatomb-0.12.1.tar.gz) = ecb61ca2483f76421beef1036ac442b8f805fa96
@@ -8,3 +8,7 @@ SHA1 (patch-ag) = 4ceebfca5a1f0556b71bee4713cb35726208f27e
 SHA1 (patch-ba) = ff31a77e71b772be945441d3c9219cd199f5ff83
 SHA1 (patch-bb) = 27661c4d0e841b6da8b280a3cbac3c38f581b2df
 SHA1 (patch-bc) = 40ef84ec5802431c5f2a811a5bf53a76d15c3904
+SHA1 (patch-src_hash_dbo_hash.h) = 77ecff9c2cc5ef940c3bc1e3e8b5c0aad7b7f690
+SHA1 (patch-src_hash_dbr_hash.h) = a57f155ffe43ff8615706b76718a835590999375
+SHA1 (patch-src_hash_dso_hash.h) = 50e0ce32e58e9d2122bed4db3509fa1f53c12945
+SHA1 (patch-tombupnp_upnp_src_genlib_net_http_webserver.c) = 671753a05d221370981e9ee6fdc1d896cadf2836
diff --git a/multimedia/mediatomb/patches/patch-src_hash_dbo_hash.h b/multimedia/mediatomb/patches/patch-src_hash_dbo_hash.h
new file mode 100644
index 00000000000..9036999017b
--- /dev/null
+++ b/multimedia/mediatomb/patches/patch-src_hash_dbo_hash.h
@@ -0,0 +1,42 @@
+$NetBSD: patch-src_hash_dbo_hash.h,v 1.1 2011/04/14 07:26:34 adam Exp $
+
+Fix building with Clang.
+
+--- src/hash/dbo_hash.h.orig	2011-04-14 07:15:03.000000000 +0000
++++ src/hash/dbo_hash.h
+@@ -106,7 +106,7 @@ public:
+     inline bool remove(KT key)
+     {
+         struct dbo_hash_slot<KT, VT> *slot;
+-        if (! search(key, &slot))
++        if (! this->search(key, &slot))
+             return false;
+         slot->key = deletedKey;
+         slot->value->release();
+@@ -136,7 +136,7 @@ public:
+     inline void put(KT key, zmm::Ref<VT> value)
+     {
+         struct dbo_hash_slot<KT, VT> *slot;
+-        search(key, &slot);
++        this->search(key, &slot);
+         put(key, (hash_slot_t)slot, value);
+     }
+     void put(KT key, hash_slot_t destSlot, zmm::Ref<VT> value)
+@@ -162,7 +162,7 @@ public:
+     inline zmm::Ref<VT> get(KT key)
+     {
+         struct dbo_hash_slot<KT, VT> *slot;
+-        bool found = search(key, &slot);
++        bool found = this->search(key, &slot);
+         if (found)
+             return zmm::Ref<VT>(slot->value);
+         else
+@@ -174,7 +174,7 @@ public:
+     inline zmm::Ref<VT> get(KT key, hash_slot_t *destSlot)
+     {
+         struct dbo_hash_slot<KT, VT> **slot = (struct dbo_hash_slot<KT, VT> **)destSlot;
+-        bool found = search(key, slot);
++        bool found = this->search(key, slot);
+         if (found)
+             return zmm::Ref<VT>((*slot)->value);
+         else
diff --git a/multimedia/mediatomb/patches/patch-src_hash_dbr_hash.h b/multimedia/mediatomb/patches/patch-src_hash_dbr_hash.h
new file mode 100644
index 00000000000..6929e6758ef
--- /dev/null
+++ b/multimedia/mediatomb/patches/patch-src_hash_dbr_hash.h
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_hash_dbr_hash.h,v 1.1 2011/04/14 07:26:34 adam Exp $
+
+Fix building with Clang.
+
+--- src/hash/dbr_hash.h.orig	2011-04-14 07:11:41.000000000 +0000
++++ src/hash/dbr_hash.h
+@@ -124,7 +124,7 @@ public:
+     inline bool remove(KT key)
+     {
+         struct dbr_hash_slot<KT> *slot;
+-        if (! search(key, &slot))
++        if (! this->search(key, &slot))
+             return false;
+         slot->key = deletedKey;
+         int array_slot = slot->array_slot;
+@@ -134,7 +134,7 @@ public:
+             return true;
+         }
+         data_array[array_slot] = data_array[--this->count];
+-        if (! search(data_array[array_slot], &slot))
++        if (! this->search(data_array[array_slot], &slot))
+         {
+             log_debug("DBR-Hash-Error: (%d; array_slot=%d; count=%d)\n", data_array[array_slot], array_slot, this->count);
+             throw zmm::Exception(_("DBR-Hash-Error: key in data_array not found in hashtable"));
+@@ -146,7 +146,7 @@ public:
+     inline void put(KT key)
+     {
+         struct dbr_hash_slot<KT> *slot;
+-        if (! search(key, &slot))
++        if (! this->search(key, &slot))
+         {
+ #ifdef TOMBDEBUG
+             if (this->count >= realCapacity)
diff --git a/multimedia/mediatomb/patches/patch-src_hash_dso_hash.h b/multimedia/mediatomb/patches/patch-src_hash_dso_hash.h
new file mode 100644
index 00000000000..40a013df378
--- /dev/null
+++ b/multimedia/mediatomb/patches/patch-src_hash_dso_hash.h
@@ -0,0 +1,42 @@
+$NetBSD: patch-src_hash_dso_hash.h,v 1.1 2011/04/14 07:26:34 adam Exp $
+
+Fix building with Clang.
+
+--- src/hash/dso_hash.h.orig	2011-04-14 07:16:11.000000000 +0000
++++ src/hash/dso_hash.h
+@@ -100,7 +100,7 @@ public:
+     inline bool remove(zmm::String key)
+     {
+         struct dso_hash_slot<VT> *slot;
+-        if (! search(key, &slot))
++        if (! this->search(key, &slot))
+             return false;
+         slot->key->release();
+         slot->value->release();
+@@ -112,7 +112,7 @@ public:
+     inline void put(zmm::String key, zmm::Ref<VT> value)
+     {
+         struct dso_hash_slot<VT> *slot;
+-        search(key, &slot);
++        this->search(key, &slot);
+         put(key, (hash_slot_t)slot, value);
+     }
+     void put(zmm::String key, hash_slot_t destSlot, zmm::Ref<VT> value)
+@@ -141,7 +141,7 @@ public:
+     inline zmm::Ref<VT> get(zmm::String key)
+     {
+         struct dso_hash_slot<VT> *slot;
+-        bool found = search(key, &slot);
++        bool found = this->search(key, &slot);
+         if (found)
+             return zmm::Ref<VT>(slot->value);
+         else
+@@ -153,7 +153,7 @@ public:
+     inline zmm::Ref<VT> get(zmm::String key, hash_slot_t *destSlot)
+     {
+         struct dso_hash_slot<VT> **slot = (struct dso_hash_slot<VT> **)destSlot;
+-        bool found = search(key, slot);
++        bool found = this->search(key, slot);
+         if (found)
+             return zmm::Ref<VT>((*slot)->value);
+         else
diff --git a/multimedia/mediatomb/patches/patch-tombupnp_upnp_src_genlib_net_http_webserver.c b/multimedia/mediatomb/patches/patch-tombupnp_upnp_src_genlib_net_http_webserver.c
new file mode 100644
index 00000000000..6bd17a9b234
--- /dev/null
+++ b/multimedia/mediatomb/patches/patch-tombupnp_upnp_src_genlib_net_http_webserver.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-tombupnp_upnp_src_genlib_net_http_webserver.c,v 1.1 2011/04/14 07:26:34 adam Exp $
+
+Fix building with Clang.
+
+--- tombupnp/upnp/src/genlib/net/http/webserver.c.orig	2011-04-14 07:19:15.000000000 +0000
++++ tombupnp/upnp/src/genlib/net/http/webserver.c
+@@ -310,7 +310,7 @@ search_extension( IN const char *extensi
+ *	 0 - On Sucess														
+ *	 UPNP_E_OUTOF_MEMORY - on memory allocation failures				
+ ************************************************************************/
+-XINLINE int
++int
+ get_content_type( IN const char *filename,
+                   OUT DOMString * content_type )
+ {