- Add USES=libtool to devel/upnp and bump dependent ports

- Add USES=pathfix and INSTALL_TARGET=install-strip
- Add a patch to fix definitions of ITHREAD_MUTEX_*

Approved by:	portmgr (implicit, bump unstaged port)

11 files changed, 33 insertions, 17 deletions

diff --git a/devel/upnp/Makefile b/devel/upnp/Makefile
index 465649c7d89a..9e4f77ce48ab 100644
--- a/devel/upnp/Makefile
+++ b/devel/upnp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	upnp
 PORTVERSION=	1.6.19
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/p${PORTNAME}/p${PORTNAME}/libUPnP%20${PORTVERSION}
@@ -14,8 +15,9 @@ COMMENT=	Universal Plug and Play Software Development Kit
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		tar:bzip2
 GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+USES=		libtool pathfix tar:bzip2
 USE_LDCONFIG=	yes
 
 PORTDOCS=	*
@@ -26,8 +28,4 @@ DEBUG_CONFIGURE_ON=	--enable-debug
 DOCS_CONFIGURE_ON=	--with-documentation=${DOCSDIR}
 DOCS_CONFIGURE_OFF=	--without-documentation
 
-post-patch:	.SILENT
-	${REINPLACE_CMD} '/^pkgconfigexecdir/s|$$(libdir)|$$(prefix)/libdata|' \
-		${WRKSRC}/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/devel/upnp/files/patch-threadutil__inc__ithread.h b/devel/upnp/files/patch-threadutil__inc__ithread.h
new file mode 100644
index 000000000000..445f35c941e9
--- /dev/null
+++ b/devel/upnp/files/patch-threadutil__inc__ithread.h
@@ -0,0 +1,16 @@
+--- threadutil/inc/ithread.h.orig
++++ threadutil/inc/ithread.h
+@@ -50,12 +50,9 @@
+ 
+ #include <pthread.h>
+ 
+-#if defined(BSD) && !defined(__GNU__)
+-	#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
+-#endif
+ 
+ 
+-#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
++#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__) || defined(__FreeBSD__)
+ 	/* This system has SuS2-compliant mutex attributes.
+ 	 * E.g. on Cygwin, where we don't have the old nonportable (NP) symbols
+ 	 */
diff --git a/devel/upnp/pkg-plist b/devel/upnp/pkg-plist
index fd47214b2268..69cf97821eae 100644
--- a/devel/upnp/pkg-plist
+++ b/devel/upnp/pkg-plist
@@ -16,16 +16,16 @@ include/upnp/upnpdebug.h
 include/upnp/UpnpString.h
 include/upnp/upnptools.h
 lib/libixml.a
-lib/libixml.la
 lib/libixml.so
 lib/libixml.so.2
+lib/libixml.so.2.0.8
 lib/libthreadutil.a
-lib/libthreadutil.la
 lib/libthreadutil.so
 lib/libthreadutil.so.6
+lib/libthreadutil.so.6.0.4
 lib/libupnp.a
-lib/libupnp.la
 lib/libupnp.so
-lib/libupnp.so.9
+lib/libupnp.so.6
+lib/libupnp.so.6.3.3
 libdata/pkgconfig/libupnp.pc
 @dirrm include/upnp
diff --git a/multimedia/vdr-plugin-upnp/Makefile b/multimedia/vdr-plugin-upnp/Makefile
index 33174d5615d1..50d5b80fca0d 100644
--- a/multimedia/vdr-plugin-upnp/Makefile
+++ b/multimedia/vdr-plugin-upnp/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vdr-plugin-upnp
 PORTVERSION=	0.0.2a2
-PORTREVISION=	24
+PORTREVISION=	25
 CATEGORIES=	multimedia
 MASTER_SITES=	http://projects.vdr-developer.org/attachments/download/177/
 DISTNAME=	${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION:S/a/-alpha/}${DISTVERSIONSUFFIX}
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 5c118e17e9e7..f4e90450f9d0 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	2.1.4
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	4
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index 1aa06e15b87a..344d5eb9d07c 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	amule
 PORTVERSION=	10834
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://amule.sourceforge.net/tarballs/
 PKGNAMESUFFIX=	-devel
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index 72d7c7b9f7f2..c73101fa0d6d 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	amule
 PORTVERSION=	2.3.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/${PORTNAME}/aMule/${PORTVERSION}
 DISTNAME=	aMule-${PORTVERSION}
diff --git a/net-p2p/retroshare/Makefile b/net-p2p/retroshare/Makefile
index 286a73222506..53ad91b31d5d 100644
--- a/net-p2p/retroshare/Makefile
+++ b/net-p2p/retroshare/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	retroshare
 PORTVERSION=	0.5.5c
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=${PORTNAME}/${BINARY}/${PORTVERSION}
diff --git a/net/linuxigd/Makefile b/net/linuxigd/Makefile
index 5089b429b969..68267769b3ac 100644
--- a/net/linuxigd/Makefile
+++ b/net/linuxigd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	linuxigd
 PORTVERSION=	1.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	net
 MASTER_SITES=	SF/linux-igd/linux-igd/${PORTNAME}-${PORTVERSION}
 
diff --git a/net/ushare/Makefile b/net/ushare/Makefile
index 98e49de4adfe..0e9d74f927c3 100644
--- a/net/ushare/Makefile
+++ b/net/ushare/Makefile
@@ -3,14 +3,14 @@
 
 PORTNAME=	ushare
 PORTVERSION=	1.1a
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	net
 MASTER_SITES=	http://ushare.geexbox.org/releases/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lightweight UPnP (TM) A/V Media Server
 
-LIB_DEPENDS=	upnp.9:${PORTSDIR}/devel/upnp
+LIB_DEPENDS=	libupnp.so:${PORTSDIR}/devel/upnp
 
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
@@ -28,7 +28,7 @@ NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLIBDLNA}
-LIB_DEPENDS+=	dlna:${PORTSDIR}/devel/libdlna
+LIB_DEPENDS+=	libdlna.so:${PORTSDIR}/devel/libdlna
 CONFIGURE_ARGS=	--enable-dlna
 .endif
 
diff --git a/sysutils/djmount/Makefile b/sysutils/djmount/Makefile
index 18f934c0a1a3..d52cdb8a0eb3 100644
--- a/sysutils/djmount/Makefile
+++ b/sysutils/djmount/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	djmount
 PORTVERSION=	0.71
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	sysutils
 MASTER_SITES=	SF