- Rename DOCS option to GENDOCS, enable it only for package building, and

  use plist instead of PORTDOCS (which is intended for DOCS option)
- Update USE_QT4 components

2 files changed, 106 insertions, 5 deletions

diff --git a/devel/libdbusmenu-qt/Makefile b/devel/libdbusmenu-qt/Makefile
index 5baaceed14ef..18a9809d35cc 100644
--- a/devel/libdbusmenu-qt/Makefile
+++ b/devel/libdbusmenu-qt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libdbusmenu-qt
 PORTVERSION=	0.9.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
 
@@ -12,7 +12,7 @@ COMMENT=	Qt4 implementation of the DBusMenu protocol
 
 LICENSE=	LGPL20
 
-USE_QT4=	dbus gui xml \
+USE_QT4=	corelib dbus gui \
 		moc_build qmake_build rcc_build uic_build
 FETCH_ARGS=	-Fpr
 USE_BZIP2=	yes
@@ -20,16 +20,21 @@ USES=		cmake:outsource
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	DOXYGEN
+OPTIONS_DEFINE=	GENDOCS
+GENDOCS_DESC=	Build documentation (requires doxygen)
+.if defined(PACKAGE_BUILDING)
+OPTIONS_DEFAULT+=	GENDOCS
+.endif
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDOXYGEN}
+.if ${PORT_OPTIONS:MGENDOCS}
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
-PORTDOCS=	*
 CMAKE_ARGS+=	-DDOC_INSTALL_DIR:PATH="${DOCSDIR_REL}"
+PLIST_SUB+=	GENDOCS=""
 .else
 CMAKE_ARGS+=	-DWITH_DOC:BOOL=OFF
+PLIST_SUB+=	GENDOCS="@comment "
 .endif
 
 post-patch:
diff --git a/devel/libdbusmenu-qt/pkg-plist b/devel/libdbusmenu-qt/pkg-plist
index a6ae3007a935..008bb79fba1b 100644
--- a/devel/libdbusmenu-qt/pkg-plist
+++ b/devel/libdbusmenu-qt/pkg-plist
@@ -6,4 +6,100 @@ lib/libdbusmenu-qt.so
 lib/libdbusmenu-qt.so.2
 lib/libdbusmenu-qt.so.2.6.0
 libdata/pkgconfig/dbusmenu-qt.pc
+%%GENDOCS%%%%DOCSDIR%%/annotated.html
+%%GENDOCS%%%%DOCSDIR%%/bc_s.png
+%%GENDOCS%%%%DOCSDIR%%/bdwn.png
+%%GENDOCS%%%%DOCSDIR%%/classDBusMenuExporter-members.html
+%%GENDOCS%%%%DOCSDIR%%/classDBusMenuExporter.html
+%%GENDOCS%%%%DOCSDIR%%/classDBusMenuExporter.png
+%%GENDOCS%%%%DOCSDIR%%/classDBusMenuImporter-members.html
+%%GENDOCS%%%%DOCSDIR%%/classDBusMenuImporter.html
+%%GENDOCS%%%%DOCSDIR%%/classDBusMenuImporter.png
+%%GENDOCS%%%%DOCSDIR%%/classes.html
+%%GENDOCS%%%%DOCSDIR%%/closed.png
+%%GENDOCS%%%%DOCSDIR%%/dbusmenu__export_8h_source.html
+%%GENDOCS%%%%DOCSDIR%%/dbusmenuexporter_8h_source.html
+%%GENDOCS%%%%DOCSDIR%%/dbusmenuimporter_8h_source.html
+%%GENDOCS%%%%DOCSDIR%%/deprecated.html
+%%GENDOCS%%%%DOCSDIR%%/dir_8a61fb69d88b5c30b96e92db617e178e.html
+%%GENDOCS%%%%DOCSDIR%%/dir_f8e7cf548488f82ed4e572e38398555b.html
+%%GENDOCS%%%%DOCSDIR%%/doxygen.css
+%%GENDOCS%%%%DOCSDIR%%/doxygen.png
+%%GENDOCS%%%%DOCSDIR%%/dynsections.js
+%%GENDOCS%%%%DOCSDIR%%/files.html
+%%GENDOCS%%%%DOCSDIR%%/ftv2blank.png
+%%GENDOCS%%%%DOCSDIR%%/ftv2cl.png
+%%GENDOCS%%%%DOCSDIR%%/ftv2doc.png
+%%GENDOCS%%%%DOCSDIR%%/ftv2folderclosed.png
+%%GENDOCS%%%%DOCSDIR%%/ftv2folderopen.png
+%%GENDOCS%%%%DOCSDIR%%/ftv2lastnode.png
+%%GENDOCS%%%%DOCSDIR%%/ftv2link.png
+%%GENDOCS%%%%DOCSDIR%%/ftv2mlastnode.png
+%%GENDOCS%%%%DOCSDIR%%/ftv2mnode.png
+%%GENDOCS%%%%DOCSDIR%%/ftv2mo.png
+%%GENDOCS%%%%DOCSDIR%%/ftv2node.png
+%%GENDOCS%%%%DOCSDIR%%/ftv2ns.png
+%%GENDOCS%%%%DOCSDIR%%/ftv2plastnode.png
+%%GENDOCS%%%%DOCSDIR%%/ftv2pnode.png
+%%GENDOCS%%%%DOCSDIR%%/ftv2splitbar.png
+%%GENDOCS%%%%DOCSDIR%%/ftv2vertline.png
+%%GENDOCS%%%%DOCSDIR%%/functions.html
+%%GENDOCS%%%%DOCSDIR%%/functions_func.html
+%%GENDOCS%%%%DOCSDIR%%/hierarchy.html
+%%GENDOCS%%%%DOCSDIR%%/index.html
+%%GENDOCS%%%%DOCSDIR%%/jquery.js
+%%GENDOCS%%%%DOCSDIR%%/nav_f.png
+%%GENDOCS%%%%DOCSDIR%%/nav_g.png
+%%GENDOCS%%%%DOCSDIR%%/nav_h.png
+%%GENDOCS%%%%DOCSDIR%%/open.png
+%%GENDOCS%%%%DOCSDIR%%/pages.html
+%%GENDOCS%%%%DOCSDIR%%/search/all_61.html
+%%GENDOCS%%%%DOCSDIR%%/search/all_61.js
+%%GENDOCS%%%%DOCSDIR%%/search/all_63.html
+%%GENDOCS%%%%DOCSDIR%%/search/all_63.js
+%%GENDOCS%%%%DOCSDIR%%/search/all_64.html
+%%GENDOCS%%%%DOCSDIR%%/search/all_64.js
+%%GENDOCS%%%%DOCSDIR%%/search/all_69.html
+%%GENDOCS%%%%DOCSDIR%%/search/all_69.js
+%%GENDOCS%%%%DOCSDIR%%/search/all_6d.html
+%%GENDOCS%%%%DOCSDIR%%/search/all_6d.js
+%%GENDOCS%%%%DOCSDIR%%/search/all_73.html
+%%GENDOCS%%%%DOCSDIR%%/search/all_73.js
+%%GENDOCS%%%%DOCSDIR%%/search/all_75.html
+%%GENDOCS%%%%DOCSDIR%%/search/all_75.js
+%%GENDOCS%%%%DOCSDIR%%/search/classes_64.html
+%%GENDOCS%%%%DOCSDIR%%/search/classes_64.js
+%%GENDOCS%%%%DOCSDIR%%/search/close.png
+%%GENDOCS%%%%DOCSDIR%%/search/functions_61.html
+%%GENDOCS%%%%DOCSDIR%%/search/functions_61.js
+%%GENDOCS%%%%DOCSDIR%%/search/functions_63.html
+%%GENDOCS%%%%DOCSDIR%%/search/functions_63.js
+%%GENDOCS%%%%DOCSDIR%%/search/functions_64.html
+%%GENDOCS%%%%DOCSDIR%%/search/functions_64.js
+%%GENDOCS%%%%DOCSDIR%%/search/functions_69.html
+%%GENDOCS%%%%DOCSDIR%%/search/functions_69.js
+%%GENDOCS%%%%DOCSDIR%%/search/functions_6d.html
+%%GENDOCS%%%%DOCSDIR%%/search/functions_6d.js
+%%GENDOCS%%%%DOCSDIR%%/search/functions_73.html
+%%GENDOCS%%%%DOCSDIR%%/search/functions_73.js
+%%GENDOCS%%%%DOCSDIR%%/search/functions_75.html
+%%GENDOCS%%%%DOCSDIR%%/search/functions_75.js
+%%GENDOCS%%%%DOCSDIR%%/search/mag_sel.png
+%%GENDOCS%%%%DOCSDIR%%/search/nomatches.html
+%%GENDOCS%%%%DOCSDIR%%/search/pages_64.html
+%%GENDOCS%%%%DOCSDIR%%/search/pages_64.js
+%%GENDOCS%%%%DOCSDIR%%/search/search.css
+%%GENDOCS%%%%DOCSDIR%%/search/search.js
+%%GENDOCS%%%%DOCSDIR%%/search/search_l.png
+%%GENDOCS%%%%DOCSDIR%%/search/search_m.png
+%%GENDOCS%%%%DOCSDIR%%/search/search_r.png
+%%GENDOCS%%%%DOCSDIR%%/sync_off.png
+%%GENDOCS%%%%DOCSDIR%%/sync_on.png
+%%GENDOCS%%%%DOCSDIR%%/tab_a.png
+%%GENDOCS%%%%DOCSDIR%%/tab_b.png
+%%GENDOCS%%%%DOCSDIR%%/tab_h.png
+%%GENDOCS%%%%DOCSDIR%%/tab_s.png
+%%GENDOCS%%%%DOCSDIR%%/tabs.css
+%%GENDOCS%%@dirrm %%DOCSDIR%%/search
+%%GENDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/dbusmenu-qt