Index: head/x11-wm/herbstluftwm/Makefile =================================================================== --- head/x11-wm/herbstluftwm/Makefile (revision 566037) +++ head/x11-wm/herbstluftwm/Makefile (revision 566038) @@ -1,40 +1,44 @@ # $FreeBSD$ PORTNAME= herbstluftwm DISTVERSIONPREFIX= v -DISTVERSION= 0.9.1 +DISTVERSION= 0.9.2 CATEGORIES= x11-wm MAINTAINER= uzsolt@uzsolt.hu COMMENT= Manual tiling window manager for X11 LICENSE= BSD2CLAUSE BUILD_DEPENDS= asciidoc:textproc/asciidoc +LIB_DEPENDS+= libfreetype.so:print/freetype2 -USES= cmake compiler:c++11-lang gnome pkgconfig shebangfix xorg +USES= cmake compiler:c++11-lang gnome \ + localbase:ldflags pkgconfig shebangfix xorg USE_GITHUB= yes USE_GNOME= glib20 -USE_XORG= x11 xext xinerama xrandr +USE_XORG= x11 xext xft xinerama xrandr SHEBANG_FILES= doc/gendoc.py scripts/*.sh share/*.sh +SUB_FILES= pkg-message + OPTIONS_DEFINE= DOCS EXAMPLES +OPTIONS_SUB= yes DOCS_USES+= python:3.5+,build DOCS_CMAKE_BOOL+= WITH_DOCUMENTATION -OPTIONS_SUB= yes -SUB_FILES= pkg-message +DOCS_VARS= binary_alias=python3=${PYTHON_CMD} .include post-patch-EXAMPLES-on: @${REINPLACE_CMD} -e 's,$${DOCDIR}/examples,${EXAMPLESDIR},' ${WRKSRC}/CMakeLists.txt post-patch-EXAMPLES-off: @${REINPLACE_CMD} -e '\@$${DOCDIR}/examples@d' ${WRKSRC}/CMakeLists.txt post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/herbst* .include Index: head/x11-wm/herbstluftwm/distinfo =================================================================== --- head/x11-wm/herbstluftwm/distinfo (revision 566037) +++ head/x11-wm/herbstluftwm/distinfo (revision 566038) @@ -1,3 +1,3 @@ -TIMESTAMP = 1609227561 -SHA256 (herbstluftwm-herbstluftwm-v0.9.1_GH0.tar.gz) = 91014db4a6411fd1bb6cff55a2b952b9ac88cbcd9c11db504b69f814c317b5b0 -SIZE (herbstluftwm-herbstluftwm-v0.9.1_GH0.tar.gz) = 364218 +TIMESTAMP = 1613566681 +SHA256 (herbstluftwm-herbstluftwm-v0.9.2_GH0.tar.gz) = 0f9cca8dd5215a8682692fe98608926090597ca578012950932ef785fd52d188 +SIZE (herbstluftwm-herbstluftwm-v0.9.2_GH0.tar.gz) = 377875 Index: head/x11-wm/herbstluftwm/files/patch-CMakeLists.txt =================================================================== --- head/x11-wm/herbstluftwm/files/patch-CMakeLists.txt (revision 566037) +++ head/x11-wm/herbstluftwm/files/patch-CMakeLists.txt (revision 566038) @@ -1,35 +1,36 @@ ---- CMakeLists.txt.orig 2020-04-20 22:03:58 UTC +--- CMakeLists.txt.orig 2021-02-17 10:06:29 UTC +++ CMakeLists.txt @@ -20,13 +20,13 @@ include(ccache) ## set install variables # prefix for systemwide configuration, accompanies CMAKE_INSTALL_PREFIX -set(CMAKE_INSTALL_SYSCONF_PREFIX "/etc" CACHE PATH +set(CMAKE_INSTALL_SYSCONF_PREFIX "${CMAKE_INSTALL_PREFIX}/etc" CACHE PATH "Top-level install path for configuration files. May be given relative to CMAKE_INSTALL_PREFIX.") set(CONFIGDIR "${CMAKE_INSTALL_SYSCONF_PREFIX}/xdg/herbstluftwm") set(BINDIR bin) set(DATADIR share) -set(MANDIR ${DATADIR}/man) +set(MANDIR ${CMAKE_INSTALL_PREFIX}/man) set(DOCDIR ${DATADIR}/doc/herbstluftwm) set(LICENSEDIR ${DOCDIR} CACHE PATH "Install path for license file") @@ -36,7 +36,7 @@ set(ZSHCOMPLETIONDIR ${DATADIR}/zsh/site-functions CACHE PATH "Install path for zsh completions file") set(FISHCOMPLETIONDIR ${DATADIR}/fish/vendor_completions.d CACHE PATH "Install path for fish completions file") -set(BASHCOMPLETIONDIR ${DATADIR}/bash-completion/completions +set(BASHCOMPLETIONDIR ${CMAKE_INSTALL_PREFIX}/etc/bash_completion.d CACHE PATH "Install path for bash completions file") ## do the actual work @@ -47,7 +47,6 @@ add_subdirectory(share) ## install everything that was not installed from subdirectories - install(FILES BUGS NEWS DESTINATION ${DOCDIR}) + install(FILES NEWS DESTINATION ${DOCDIR}) -install(FILES LICENSE DESTINATION ${LICENSEDIR}) - install(DIRECTORY scripts/ DESTINATION ${DOCDIR}/examples USE_SOURCE_PERMISSIONS) +-install(DIRECTORY scripts/ DESTINATION ${DOCDIR}/examples USE_SOURCE_PERMISSIONS) ++install(DIRECTORY scripts/ DESTINATION /usr/local/share/examples/herbstluftwm USE_SOURCE_PERMISSIONS) # vim: et:ts=4:sw=4 Index: head/x11-wm/herbstluftwm/pkg-plist =================================================================== --- head/x11-wm/herbstluftwm/pkg-plist (revision 566037) +++ head/x11-wm/herbstluftwm/pkg-plist (revision 566038) @@ -1,39 +1,38 @@ bin/herbstclient bin/herbstluftwm etc/bash_completion.d/herbstclient etc/xdg/herbstluftwm/autostart etc/xdg/herbstluftwm/dmenu_run_hlwm etc/xdg/herbstluftwm/panel.sh etc/xdg/herbstluftwm/restartpanels.sh share/fish/vendor_completions.d/herbstclient.fish share/xsessions/herbstluftwm.desktop share/zsh/site-functions/_herbstclient %%PORTDOCS%%man/man1/herbstclient.1.gz %%PORTDOCS%%man/man1/herbstluftwm.1.gz %%PORTDOCS%%man/man7/herbstluftwm-tutorial.7.gz -%%PORTDOCS%%%%DOCSDIR%%/BUGS %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/herbstclient.html %%PORTDOCS%%%%DOCSDIR%%/herbstluftwm-tutorial.html %%PORTDOCS%%%%DOCSDIR%%/herbstluftwm.html %%PORTDOCS%%%%DOCSDIR%%/hlwm-doc.json %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dmenu.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dumpbeautify.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/exec_on_tag.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/execwith.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/float-maximize.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/floatmon.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/herbstcommander.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/keychain.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lasttag.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/layout.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/loadstate.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/maximize.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/perclient_kb_layout.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/q3terminal.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/savestate.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/scratchpad.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/toggledualhead.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/windowmenu.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/wselect.sh