- Update grantlee to 0.2.0-rc1.

- Update libdbusmenu-qt to 0.9.0 and add option to install docs.

7 files changed, 56 insertions, 18 deletions

diff --git a/devel/grantlee/Makefile b/devel/grantlee/Makefile
index 78d341710438..baf574bb0bfb 100644
--- a/devel/grantlee/Makefile
+++ b/devel/grantlee/Makefile
@@ -5,7 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	grantlee
-PORTVERSION=	0.1.8
+DISTVERSION=	0.2.0-rc1
+CATEGORIES=	net-im
+MASTER_SITES=	GOOGLE_CODE
+
 CATEGORIES=	devel
 MASTER_SITES=	http://www.loegria.net/${PORTNAME}/ \
 		http://downloads.${PORTNAME}.org/
@@ -20,8 +23,8 @@ USE_CMAKE=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib gui network webkit sql phonon \
 		qmake_build moc_build rcc_build uic_build
-CMAKE_OUTSOURCE=	yes
 CMAKE_ARGS+=	-DBUILD_TESTS:BOOL=FALSE
+CMAKE_OUTSOURCE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS=	DOCS "Install API documentation" off
diff --git a/devel/grantlee/distinfo b/devel/grantlee/distinfo
index bfcc371f8c8d..7d444273bb90 100644
--- a/devel/grantlee/distinfo
+++ b/devel/grantlee/distinfo
@@ -1,2 +1,2 @@
-SHA256 (grantlee-0.1.8.tar.gz) = d7d530419960e90c6253358c5a951ca344c2174752a431b4d81d1fd378927a7c
-SIZE (grantlee-0.1.8.tar.gz) = 669703
+SHA256 (grantlee-0.2.0-rc1.tar.gz) = e0ccb61c39be15fd0827183063c7711f18fbb4e8c28a8d293f193eca26bbb898
+SIZE (grantlee-0.2.0-rc1.tar.gz) = 1127268
diff --git a/devel/grantlee/pkg-plist b/devel/grantlee/pkg-plist
index fd72db5f071c..ac977dab1d4f 100644
--- a/devel/grantlee/pkg-plist
+++ b/devel/grantlee/pkg-plist
@@ -31,19 +31,23 @@ include/grantlee/util.h
 include/grantlee/variable.h
 include/grantlee_core.h
 include/grantlee_templates.h
-lib/grantlee/0.1/GrantleeUse.cmake
-lib/grantlee/0.1/grantlee_defaultfilters.so
-lib/grantlee/0.1/grantlee_defaulttags.so
-lib/grantlee/0.1/grantlee_i18ntags.so
-lib/grantlee/0.1/grantlee_loadertags.so
-lib/grantlee/GrantleeConfig.cmake
-lib/grantlee/GrantleeConfigVersion.cmake
+lib/cmake/grantlee/GrantleeConfig.cmake
+lib/cmake/grantlee/GrantleeConfigVersion.cmake
+lib/cmake/grantlee/GrantleeTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/grantlee/GrantleeTargets.cmake
+lib/cmake/grantlee/GrantleeUse.cmake
+lib/grantlee/0.2/grantlee_defaultfilters.so
+lib/grantlee/0.2/grantlee_defaulttags.so
+lib/grantlee/0.2/grantlee_i18ntags.so
+lib/grantlee/0.2/grantlee_loadertags.so
 lib/libgrantlee_core.so
 lib/libgrantlee_core.so.0
-lib/libgrantlee_core.so.0.1.8
+lib/libgrantlee_core.so.0.2.0
 lib/libgrantlee_gui.so
 lib/libgrantlee_gui.so.0
-lib/libgrantlee_gui.so.0.1.8
-@dirrm lib/grantlee/0.1
+lib/libgrantlee_gui.so.0.2.0
+@dirrm lib/grantlee/0.2
 @dirrm lib/grantlee
+@dirrm lib/cmake/grantlee
+@dirrmtry lib/cmake
 @dirrm include/grantlee
diff --git a/devel/libdbusmenu-qt/Makefile b/devel/libdbusmenu-qt/Makefile
index 5428760cbf76..9e1e970494ec 100644
--- a/devel/libdbusmenu-qt/Makefile
+++ b/devel/libdbusmenu-qt/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libdbusmenu-qt
-PORTVERSION=	0.8.0
+PORTVERSION=	0.9.0
 CATEGORIES=	devel
 MASTER_SITES=	http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
 
@@ -27,6 +27,18 @@ USE_LDCONFIG=	yes
 CMAKE_OUTSOURCE=	yes
 MAKE_JOBS_SAFE=	yes
 
+OPTIONS=	DOCS "Install API documentation (requires Doxygen)" off
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_DOCS)
+BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+PORTDOCS=	*
+CMAKE_ARGS+=	-DDOC_INSTALL_DIR:PATH="${DOCSDIR_REL}"
+.else
+CMAKE_ARGS+=	-DWITH_DOC:BOOL=OFF
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e '/pkgconfig/ s/$${LIB_SUFFIX}/data/' \
 		-e '/tests/ d' -e '/tools/ d' \
diff --git a/devel/libdbusmenu-qt/distinfo b/devel/libdbusmenu-qt/distinfo
index e91df91f711e..8caac0d66d9e 100644
--- a/devel/libdbusmenu-qt/distinfo
+++ b/devel/libdbusmenu-qt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libdbusmenu-qt-0.8.0.tar.bz2) = f35a14a9263a6a718eec7654f1e19965ba80b362fb64901b78811b03f5060530
-SIZE (libdbusmenu-qt-0.8.0.tar.bz2) = 32424
+SHA256 (libdbusmenu-qt-0.9.0.tar.bz2) = 071d8215c17999cdef8f8361964b45e135edf96c955d6618f4ebf1eac662b175
+SIZE (libdbusmenu-qt-0.9.0.tar.bz2) = 37153
diff --git a/devel/libdbusmenu-qt/files/patch-CMakeLists.txt b/devel/libdbusmenu-qt/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..7cceebad8c39
--- /dev/null
+++ b/devel/libdbusmenu-qt/files/patch-CMakeLists.txt
@@ -0,0 +1,19 @@
+--- CMakeLists.txt~     2011-09-01 14:05:32.000000000 -0300
++++ CMakeLists.txt      2011-09-01 14:08:06.000000000 -0300
+@@ -64,6 +64,8 @@
+ add_subdirectory(tools)
+ 
+ if(WITH_DOC)
++    set(DOC_INSTALL_DIR "share/doc/dbusmenu-qt" CACHE PATH "Directory where to install the documentation")
++
+     configure_file(Doxyfile.in ${CMAKE_BINARY_DIR}/Doxyfile @ONLY)
+ 
+     add_custom_target(doc ALL doxygen
+@@ -71,6 +73,6 @@
+         )
+ 
+     install(DIRECTORY ${CMAKE_BINARY_DIR}/html/
+-        DESTINATION share/doc/dbusmenu-qt
++        DESTINATION ${DOC_INSTALL_DIR}
+         )
+ endif(WITH_DOC)
diff --git a/devel/libdbusmenu-qt/pkg-plist b/devel/libdbusmenu-qt/pkg-plist
index 05b502bdb7d4..a6ae3007a935 100644
--- a/devel/libdbusmenu-qt/pkg-plist
+++ b/devel/libdbusmenu-qt/pkg-plist
@@ -4,6 +4,6 @@ include/dbusmenu-qt/dbusmenuexporter.h
 include/dbusmenu-qt/dbusmenuimporter.h
 lib/libdbusmenu-qt.so
 lib/libdbusmenu-qt.so.2
-lib/libdbusmenu-qt.so.2.5.0
+lib/libdbusmenu-qt.so.2.6.0
 libdata/pkgconfig/dbusmenu-qt.pc
 @dirrm include/dbusmenu-qt