From def74eb832b3c057c74ca645418e0a8c60db82cc Mon Sep 17 00:00:00 2001 From: danfe Date: Mon, 5 Jun 2017 14:10:14 +0000 Subject: - Introduce MANPAGES option to control whether manual pages are built (make/leave it on by default) - Remove DBUS_CMAKE_ON=-DWITH_DBUS=ON: it's already ON by default (set in awesomeConfig.cmake) so it's not needed and just raises questions - DBUS_CMAKE_OFF: specify variable type (BOOL) as done everywhere else in the ports Approved by: garga (maintainer) --- x11-wm/awesome/Makefile | 18 ++++++++++-------- x11-wm/awesome/pkg-plist | 36 ++++++++++++++++++------------------ 2 files changed, 28 insertions(+), 26 deletions(-) (limited to 'x11-wm') diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile index 074a8f49d643..0a455bac4360 100644 --- a/x11-wm/awesome/Makefile +++ b/x11-wm/awesome/Makefile @@ -13,9 +13,7 @@ COMMENT= Highly configurable, next generation framework window manager LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= asciidoc:textproc/asciidoc \ - convert:graphics/ImageMagick \ - xmlto:textproc/xmlto \ +BUILD_DEPENDS= convert:graphics/ImageMagick \ xproto>=7.0.15:x11/xproto \ ${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi RUN_DEPENDS= ${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi \ @@ -38,19 +36,23 @@ USE_GITHUB= yes GH_ACCOUNT= awesomewm USES= cmake:outsource execinfo gettext iconv pkgconfig lua shebangfix SHEBANG_FILES= utils/awesome-client -CMAKE_ARGS+= -DSYSCONFDIR=${PREFIX}/etc \ +CMAKE_ARGS= -DSYSCONFDIR=${PREFIX}/etc \ -DAWESOME_MAN_PATH=${MANPREFIX}/man \ -DGENERATE_DOC=OFF USE_GNOME= glib20 pango gdkpixbuf2 USE_XORG= pixman x11 xau xcb xdmcp xext xft xinerama xrandr xrender \ xproto -OPTIONS_DEFINE= DBUS DOCS -OPTIONS_DEFAULT=DBUS +OPTIONS_DEFINE= DBUS DOCS MANPAGES +OPTIONS_DEFAULT=DBUS MANPAGES +OPTIONS_SUB= yes DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus -DBUS_CMAKE_ON= -DWITH_DBUS=ON -DBUS_CMAKE_OFF= -DWITH_DBUS=OFF +DBUS_CMAKE_OFF= -DWITH_DBUS:BOOL=OFF + +MANPAGES_BUILD_DEPENDS= asciidoc:textproc/asciidoc \ + xmlto:textproc/xmlto +MANPAGES_CMAKE_OFF= -DGENERATE_MANPAGES:BOOL=OFF .include diff --git a/x11-wm/awesome/pkg-plist b/x11-wm/awesome/pkg-plist index 1b9596d66747..b4ddd5eb4cce 100644 --- a/x11-wm/awesome/pkg-plist +++ b/x11-wm/awesome/pkg-plist @@ -1,24 +1,24 @@ bin/awesome bin/awesome-client etc/xdg/awesome/rc.lua -man/de/man1/awesome-client.1.gz -man/de/man1/awesome.1.gz -man/de/man5/awesomerc.5.gz -man/es/man1/awesome-client.1.gz -man/es/man1/awesome.1.gz -man/es/man5/awesomerc.5.gz -man/fr/man1/awesome-client.1.gz -man/fr/man1/awesome.1.gz -man/fr/man5/awesomerc.5.gz -man/it/man1/awesome-client.1.gz -man/it/man1/awesome.1.gz -man/it/man5/awesomerc.5.gz -man/man1/awesome-client.1.gz -man/man1/awesome.1.gz -man/man5/awesomerc.5.gz -man/ru/man1/awesome-client.1.gz -man/ru/man1/awesome.1.gz -man/ru/man5/awesomerc.5.gz +%%MANPAGES%%man/de/man1/awesome-client.1.gz +%%MANPAGES%%man/de/man1/awesome.1.gz +%%MANPAGES%%man/de/man5/awesomerc.5.gz +%%MANPAGES%%man/es/man1/awesome-client.1.gz +%%MANPAGES%%man/es/man1/awesome.1.gz +%%MANPAGES%%man/es/man5/awesomerc.5.gz +%%MANPAGES%%man/fr/man1/awesome-client.1.gz +%%MANPAGES%%man/fr/man1/awesome.1.gz +%%MANPAGES%%man/fr/man5/awesomerc.5.gz +%%MANPAGES%%man/it/man1/awesome-client.1.gz +%%MANPAGES%%man/it/man1/awesome.1.gz +%%MANPAGES%%man/it/man5/awesomerc.5.gz +%%MANPAGES%%man/man1/awesome-client.1.gz +%%MANPAGES%%man/man1/awesome.1.gz +%%MANPAGES%%man/man5/awesomerc.5.gz +%%MANPAGES%%man/ru/man1/awesome-client.1.gz +%%MANPAGES%%man/ru/man1/awesome.1.gz +%%MANPAGES%%man/ru/man5/awesomerc.5.gz %%DATADIR%%/icons/awesome16.png %%DATADIR%%/icons/awesome32.png %%DATADIR%%/icons/awesome48.png -- cgit