- Update cagibi to 0.2.0.

- Update hupnp to 1.0.0.
- Update kio-upnp-ms to 1.0.0.git20110808.

10 files changed, 75 insertions, 82 deletions

diff --git a/net/cagibi/Makefile b/net/cagibi/Makefile
index b237d1326267..5718d3b7b9f1 100644
--- a/net/cagibi/Makefile
+++ b/net/cagibi/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	cagibi
-PORTVERSION=	0.1.1
+PORTVERSION=	0.2.0
 CATEGORIES=	net devel
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/cagibi
@@ -20,14 +20,4 @@ USE_QT_VER=	4
 QT_COMPONENTS=	corelib network xml dbus \
 		qmake_build moc_build rcc_build uic_build
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700042
-CMAKE_USE_PTHREAD=	yes
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e '/pkgconfig/ s/$${LIB_SUFFIX}/data/' \
-		${WRKSRC}/daemon/CMakeLists.txt
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/cagibi/distinfo b/net/cagibi/distinfo
index f8fbf104ac87..86c418d1677b 100644
--- a/net/cagibi/distinfo
+++ b/net/cagibi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cagibi-0.1.1.tar.bz2) = dc7db00b22ef42a6d4ab073f505199d6951744b9f1a354da951ea7cd6ffc2696
-SIZE (cagibi-0.1.1.tar.bz2) = 26260
+SHA256 (cagibi-0.2.0.tar.bz2) = 77f9ec1eff5a5e0db90708a789a7cb82ff3780069f9e6f21b03a23813258b24b
+SIZE (cagibi-0.2.0.tar.bz2) = 28959
diff --git a/net/cagibi/pkg-plist b/net/cagibi/pkg-plist
index ebdf4df976d3..3dc7f53c1134 100644
--- a/net/cagibi/pkg-plist
+++ b/net/cagibi/pkg-plist
@@ -1,3 +1,6 @@
 bin/cagibid
-libdata/pkgconfig/cagibi.pc
-share/dbus-1/services/org.kde.Cagibi.service
+etc/cagibid.conf
+etc/dbus-1/system.d/org.kde.Cagibi.conf
+share/dbus-1/interfaces/org.kde.Cagibi.Control.xml
+share/dbus-1/interfaces/org.kde.Cagibi.DeviceList.xml
+share/dbus-1/system-services/org.kde.Cagibi.service
diff --git a/net/hupnp/Makefile b/net/hupnp/Makefile
index 17084f11e2a9..3c4ce8dac1b4 100644
--- a/net/hupnp/Makefile
+++ b/net/hupnp/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	hupnp
-PORTVERSION=	0.7.0
+PORTVERSION=	1.0.0
 CATEGORIES=	net devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 DISTNAME=	herqq-${PORTVERSION}
@@ -23,16 +23,4 @@ QMAKE_ARGS=	PREFIX=${PREFIX} herqq.pro
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS}
 
-post-install:
-	cd ${WRKSRC}/hupnp/include && ${COPYTREE_SHARE} \* ${PREFIX}/include
-	cd ${WRKSRC}/hupnp/deploy/include && ${COPYTREE_SHARE} H\* ${PREFIX}/include
-	${INSTALL_LIB} ${WRKSRC}/hupnp/bin/libHUpnp.so.1.0.0 \
-		${PREFIX}/lib/libHUpnp.so.1 && \
-		${LN} -s ${PREFIX}/lib/libHUpnp.so.1 \
-		${PREFIX}/lib/libHUpnp.so
-	${INSTALL_LIB} ${WRKSRC}/hupnp/bin/libQtSolutions_SOAP-2.7.so.1.0.0 \
-		${PREFIX}/lib/libQtSolutions_SOAP-2.7.so.1 && \
-		${LN} -s ${PREFIX}/lib/libQtSolutions_SOAP-2.7.so.1 \
-		${PREFIX}/lib/libQtSolutions_SOAP-2.7.so
-
 .include <bsd.port.mk>
diff --git a/net/hupnp/distinfo b/net/hupnp/distinfo
index 6cb4f10c4902..bffec8e561ec 100644
--- a/net/hupnp/distinfo
+++ b/net/hupnp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (herqq-0.7.0.zip) = 1fd717d9bba05d562c9c1309a0332c8882a2efb66946f8d52952d8a996e2e68f
-SIZE (herqq-0.7.0.zip) = 1060518
+SHA256 (herqq-1.0.0.zip) = cbcfc76f72d561d822a7ff5374b97e80d1731b610a5c257edbf5c013bfe6748e
+SIZE (herqq-1.0.0.zip) = 1070813
diff --git a/net/hupnp/files/patch-herqq.pro b/net/hupnp/files/patch-herqq.pro
index 6b5400cd0aed..7f87fd81a6e5 100644
--- a/net/hupnp/files/patch-herqq.pro
+++ b/net/hupnp/files/patch-herqq.pro
@@ -1,9 +1,7 @@
---- ./herqq.pro.orig	2010-12-29 18:14:34.330078044 +1000
-+++ ./herqq.pro	2010-10-06 22:12:40.000000000 +1100
-@@ -2,5 +2,4 @@
- CONFIG  += ordered

- SUBDIRS  = \

-     hupnp/lib/qtsoap-2.7-opensource/buildlib \

--    hupnp \

--    apps/simple_test-app

-+    hupnp 

+--- ./herqq.pro.orig	2011-03-28 00:42:32.000000000 +1100
++++ ./herqq.pro	2011-08-08 12:10:55.831627096 +1100
+@@ -18,4 +18,3 @@
+ }

+ 

+ !CONFIG(DISABLE_CORE) : SUBDIRS += hupnp

+-!CONFIG(DISABLE_TESTAPP) : SUBDIRS += apps/simple_test-app

diff --git a/net/hupnp/files/patch-hmulticast_socket.cpp b/net/hupnp/files/patch-hmulticast_socket.cpp
index bfc3e0659015..49152aa5d75a 100644
--- a/net/hupnp/files/patch-hmulticast_socket.cpp
+++ b/net/hupnp/files/patch-hmulticast_socket.cpp
@@ -1,11 +1,11 @@
---- ./hupnp/src/hupnp_core/socket/hmulticast_socket.cpp.orig	2010-12-29 14:08:26.000000000 +1000
-+++ ./hupnp/src/hupnp_core/socket/hmulticast_socket.cpp	2010-12-29 14:10:00.000000000 +1000
+--- ./hupnp/src/socket/hmulticast_socket.cpp.orig	2011-03-28 00:42:32.000000000 +1100
++++ ./hupnp/src/socket/hmulticast_socket.cpp	2011-08-08 11:59:59.868629425 +1100
 @@ -27,6 +27,8 @@
- #include <ws2tcpip.h>

- #else

- #include <arpa/inet.h>

-+#include <netinet/in.h>

-+#include <sys/socket.h>

- #endif

- 

- #include <QtNetwork/QNetworkProxy>

+ #include <ws2tcpip.h>
+ #else
+ #include <arpa/inet.h>
++#include <netinet/in.h>
++#include <sys/socket.h>
+ #endif
+ 
+ #include <QtNetwork/QNetworkProxy>
diff --git a/net/hupnp/pkg-plist b/net/hupnp/pkg-plist
index 8f0141d59121..41844b24c270 100644
--- a/net/hupnp/pkg-plist
+++ b/net/hupnp/pkg-plist
@@ -1,4 +1,3 @@
-include/HUpnpCore/HAction
 include/HUpnpCore/HActionArgument
 include/HUpnpCore/HActionArguments
 include/HUpnpCore/HActionInfo
@@ -7,19 +6,23 @@ include/HUpnpCore/HActionInvokeCallback
 include/HUpnpCore/HActionSetup
 include/HUpnpCore/HActionsSetupData
 include/HUpnpCore/HAsyncOp
+include/HUpnpCore/HClientAction
+include/HUpnpCore/HClientActionOp
+include/HUpnpCore/HClientDevice
+include/HUpnpCore/HClientService
+include/HUpnpCore/HClientStateVariable
 include/HUpnpCore/HClonable
 include/HUpnpCore/HControlPoint
 include/HUpnpCore/HControlPointConfiguration
-include/HUpnpCore/HDevice
 include/HUpnpCore/HDeviceConfiguration
-include/HUpnpCore/HDeviceCreator
 include/HUpnpCore/HDeviceHost
 include/HUpnpCore/HDeviceHostConfiguration
 include/HUpnpCore/HDeviceHostRuntimeStatus
 include/HUpnpCore/HDeviceInfo
-include/HUpnpCore/HDeviceProxy
-include/HUpnpCore/HDeviceProxyCreator
+include/HUpnpCore/HDeviceModelCreator
+include/HUpnpCore/HDeviceModelInfoProvider
 include/HUpnpCore/HDeviceSetup
+include/HUpnpCore/HDeviceStatus
 include/HUpnpCore/HDevicesSetupData
 include/HUpnpCore/HDiscoveryRequest
 include/HUpnpCore/HDiscoveryResponse
@@ -30,67 +33,69 @@ include/HUpnpCore/HFunctor
 include/HUpnpCore/HMulticastSocket
 include/HUpnpCore/HProductToken
 include/HUpnpCore/HProductTokens
-include/HUpnpCore/HReadableStateVariable
 include/HUpnpCore/HResourceAvailable
 include/HUpnpCore/HResourceType
 include/HUpnpCore/HResourceUnavailable
 include/HUpnpCore/HResourceUpdate
-include/HUpnpCore/HService
+include/HUpnpCore/HServerAction
+include/HUpnpCore/HServerDevice
+include/HUpnpCore/HServerService
+include/HUpnpCore/HServerStateVariable
 include/HUpnpCore/HServiceId
 include/HUpnpCore/HServiceInfo
-include/HUpnpCore/HServiceProxy
 include/HUpnpCore/HServiceSetup
 include/HUpnpCore/HServicesSetupData
 include/HUpnpCore/HSsdp
-include/HUpnpCore/HStateVariable
+include/HUpnpCore/HStateVariableEvent
 include/HUpnpCore/HStateVariableInfo
-include/HUpnpCore/HStateVariableLocker
 include/HUpnpCore/HStateVariablesSetupData
 include/HUpnpCore/HUdn
 include/HUpnpCore/HUpnp
 include/HUpnpCore/HUpnpDataTypes
-include/HUpnpCore/HWritableStateVariable
+include/HUpnpCore/HUpnpInfo
 include/HUpnpCore/private/hdevice_p.h
-include/HUpnpCore/private/hdeviceproxy_p.h
+include/HUpnpCore/private/hserverdevice_p.h
+include/HUpnpCore/private/hserverservice_p.h
 include/HUpnpCore/private/hservice_p.h
-include/HUpnpCore/private/hserviceproxy_p.h
-include/HUpnpCore/private/hstatevariable_p.h
-include/HUpnpCore/public/haction.h
 include/HUpnpCore/public/hactionarguments.h
 include/HUpnpCore/public/hactioninfo.h
 include/HUpnpCore/public/hactioninvoke.h
 include/HUpnpCore/public/hactioninvoke_callback.h
 include/HUpnpCore/public/hactions_setupdata.h
 include/HUpnpCore/public/hasyncop.h
+include/HUpnpCore/public/hclientaction.h
+include/HUpnpCore/public/hclientactionop.h
+include/HUpnpCore/public/hclientdevice.h
+include/HUpnpCore/public/hclientservice.h
+include/HUpnpCore/public/hclientstatevariable.h
 include/HUpnpCore/public/hclonable.h
 include/HUpnpCore/public/hcontrolpoint.h
 include/HUpnpCore/public/hcontrolpoint_configuration.h
-include/HUpnpCore/public/hdevice.h
-include/HUpnpCore/public/hdevicecreator.h
 include/HUpnpCore/public/hdevicehost.h
 include/HUpnpCore/public/hdevicehost_configuration.h
 include/HUpnpCore/public/hdeviceinfo.h
-include/HUpnpCore/public/hdeviceproxy.h
-include/HUpnpCore/public/hdeviceproxy_creator.h
+include/HUpnpCore/public/hdevicemodel_infoprovider.h
+include/HUpnpCore/public/hdevicemodelcreator.h
 include/HUpnpCore/public/hdevices_setupdata.h
+include/HUpnpCore/public/hdevicestatus.h
 include/HUpnpCore/public/hdiscovery_messages.h
 include/HUpnpCore/public/hdiscoverytype.h
 include/HUpnpCore/public/hendpoint.h
-include/HUpnpCore/public/hevent_connectors.h
 include/HUpnpCore/public/hexecargs.h
 include/HUpnpCore/public/hfunctor.h
 include/HUpnpCore/public/hglobal.h
 include/HUpnpCore/public/hmulticast_socket.h
 include/HUpnpCore/public/hproduct_tokens.h
-include/HUpnpCore/public/hreadable_statevariable.h
 include/HUpnpCore/public/hresourcetype.h
-include/HUpnpCore/public/hservice.h
+include/HUpnpCore/public/hserveraction.h
+include/HUpnpCore/public/hserverdevice.h
+include/HUpnpCore/public/hserverservice.h
+include/HUpnpCore/public/hserverstatevariable.h
 include/HUpnpCore/public/hserviceid.h
 include/HUpnpCore/public/hserviceinfo.h
-include/HUpnpCore/public/hserviceproxy.h
 include/HUpnpCore/public/hservices_setupdata.h
 include/HUpnpCore/public/hssdp.h
-include/HUpnpCore/public/hstatevariable.h
+include/HUpnpCore/public/hstatevariable_event.h
 include/HUpnpCore/public/hstatevariableinfo.h
 include/HUpnpCore/public/hstatevariables_setupdata.h
 include/HUpnpCore/public/hudn.h
@@ -98,11 +103,15 @@ include/HUpnpCore/public/hupnp_datatypes.h
 include/HUpnpCore/public/hupnp_defs.h
 include/HUpnpCore/public/hupnp_fwd.h
 include/HUpnpCore/public/hupnp_global.h
-include/HUpnpCore/public/hwritable_statevariable.h
+include/HUpnpCore/public/hupnpinfo.h
 lib/libHUpnp.so
 lib/libHUpnp.so.1
+lib/libHUpnp.so.1.0
+lib/libHUpnp.so.1.0.0
 lib/libQtSolutions_SOAP-2.7.so
 lib/libQtSolutions_SOAP-2.7.so.1
+lib/libQtSolutions_SOAP-2.7.so.1.0
+lib/libQtSolutions_SOAP-2.7.so.1.0.0
 @dirrm include/HUpnpCore/public
 @dirrm include/HUpnpCore/private
 @dirrm include/HUpnpCore
diff --git a/net/kio-upnp-ms/Makefile b/net/kio-upnp-ms/Makefile
index c59aabe3336a..0d29a2eef0bb 100644
--- a/net/kio-upnp-ms/Makefile
+++ b/net/kio-upnp-ms/Makefile
@@ -5,24 +5,29 @@
 # $FreeBSD$
 
 PORTNAME=	kio-upnp-ms
-PORTVERSION=	0.8.0
-PORTREVISION=	1
+DISTVERSION=	1.0.0.git20110808
 CATEGORIES=	net devel
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
+#MASTER_SITES=	${MASTER_SITE_KDE}
+#MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	fluffy
+
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KIO slave to access UPnP MediaServers
 
 LIB_DEPENDS=	HUpnp.1:${PORTSDIR}/net/hupnp
 
+USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_KDE4=	automoc4 kdehier kdeprefix kdelibs
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib network xml dbus gui \
 		qmake_build moc_build rcc_build uic_build
 
-PLIST_FILES=	include/kio/upnptypes.h \
+WRKSRC=		${WRKDIR}/${DISTNAME:C/.[^.]*$//}
+
+PLIST_FILES=	include/kio/upnp-ms-types.h \
 		lib/kde4/kio_upnp_ms.so \
 		share/kde4/services/kio_upnp_ms.protocol
 
diff --git a/net/kio-upnp-ms/distinfo b/net/kio-upnp-ms/distinfo
index 3446f15ae27c..0252321612cb 100644
--- a/net/kio-upnp-ms/distinfo
+++ b/net/kio-upnp-ms/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kio-upnp-ms-0.8.0.tar.gz) = 6fba4246ea83aec2a78b33d154ffce9be4055a76b93f10bb1b53d38a2c5e2d9c
-SIZE (kio-upnp-ms-0.8.0.tar.gz) = 31461
+SHA256 (kio-upnp-ms-1.0.0.git20110808.tar.bz2) = 47b7507c737ebc56ca55501ce4c04934108d99de2e4445b0f08900722814fcd0
+SIZE (kio-upnp-ms-1.0.0.git20110808.tar.bz2) = 28861