On 2022/12/28 21:58, Volker Schlecht wrote:
Your BUILD_DEPENDS line looks off with the commented backslash.
Ugh. Yes, a leftover from me building it with i3-gaps installed and running
instead of i3. Fix attached.
Also, in your post-install, the rm shouldn’t be needed if you can override the
installation directory
with FAKE_FLAGS so that it’ll be installed into the correct location right away.
As far as I can tell:
https://github.com/polybar/polybar/blob/edf37385cb2e0e4d3c848d188473e48df618ed1a/doc/CMakeLists.txt#L64
This installs the example config into ${CMAKE_INSTALL_DOCDIR}/examples.
Since I don't want to override CMAKE_INSTALL_DOCDIR, I figured I could
either patch doc/CMakeLists.txt or do a bit of post-install juggling.
Is there a way to handle this with FAKE_FLAGS?
Not usually for cmake ports. For simplicity I would probably just mv the
directory post-install. How about this? Also shortens the existing long
line while there, and @samples into /etc/polybar (see "Polybar now ships
a default config that is installed to `/etc/polybar/config.ini`" in the
3.6.0 changelog entry)
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/polybar/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile 13 Nov 2022 15:30:23 -0000 1.25
+++ Makefile 3 Jan 2023 12:35:38 -0000
@@ -1,8 +1,7 @@
COMMENT = fast and easy-to-use status bar
-V = 3.5.7
+V = 3.6.3
DISTNAME = polybar-$V
CATEGORIES = x11
-REVISION = 3
HOMEPAGE = https://polybar.github.io/
MAINTAINER = Jasper Lievisse Adriaanse <jas...@openbsd.org>
@@ -13,7 +12,7 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} lib/inotify/inotify
WANTLIB += c cairo curl fontconfig freetype intl m mpdclient
WANTLIB += pulse xcb xcb-composite xcb-cursor xcb-ewmh xcb-icccm
-WANTLIB += xcb-image xcb-randr xcb-util xcb-xkb xcb-xrm z jsoncpp
+WANTLIB += xcb-image xcb-randr xcb-util xcb-xkb xcb-xrm z jsoncpp uv
MASTER_SITES = https://github.com/polybar/polybar/releases/download/$V/
EXTRACT_SUFX = .tar.gz
@@ -35,28 +34,23 @@ LIB_DEPENDS = audio/libmpdclient \
devel/jsoncpp \
devel/libinotify \
graphics/cairo \
- net/curl
+ net/curl \
+ devel/libuv
RUN_DEPENDS = x11/py-xcbgen${MODPY_FLAVOR} \
fonts/siji \
fonts/unifont
-MODCMAKE_LDFLAGS = -L${X11BASE}/lib -L${LOCALBASE}/lib -lintl -L${LOCALBASE}/lib/inotify -linotify -Wl,-rpath,${LOCALBASE}/lib/inotify
+MODCMAKE_LDFLAGS = -L${X11BASE}/lib -L${LOCALBASE}/lib -lintl \
+ -L${LOCALBASE}/lib/inotify -linotify \
+ -Wl,-rpath,${LOCALBASE}/lib/inotify
CONFIGURE_ARGS = -DENABLE_CCACHE=OFF \
-DENABLE_I3=ON
NO_TEST = Yes
-WRKDIST = ${WRKDIR}/polybar-$V
-
-pre-configure:
- ${SUBST_CMD} ${WRKSRC}/cmake/02-opts.cmake \
- ${WRKSRC}/doc/CMakeLists.txt \
- ${WRKSRC}/lib/i3ipcpp/CMakeLists.txt
-
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/polybar
- ${INSTALL_DATA} ${WRKSRC}/config ${PREFIX}/share/examples/polybar
+ mv ${PREFIX}/share/doc/polybar/examples ${PREFIX}/share/examples/polybar
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/polybar/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo 27 Oct 2021 14:55:04 -0000 1.8
+++ distinfo 3 Jan 2023 12:35:38 -0000
@@ -1,2 +1,2 @@
-SHA256 (polybar-3.5.7.tar.gz) = cyEObXQhesuVOyU5kLQwI0O3tqeHD+HamhhV2qRBI9s=
-SIZE (polybar-3.5.7.tar.gz) = 411318
+SHA256 (polybar-3.6.3.tar.gz) = 8ldYVzVnII/HtvTUEVphF6hzicvMCUz2BdB5d1vpX6U=
+SIZE (polybar-3.6.3.tar.gz) = 439838
Index: patches/patch-cmake_03-libs_cmake
===================================================================
RCS file: patches/patch-cmake_03-libs_cmake
diff -N patches/patch-cmake_03-libs_cmake
--- patches/patch-cmake_03-libs_cmake 11 Mar 2022 20:16:56 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-Detect libinotify using pkg-config.
-
-Index: cmake/03-libs.cmake
---- cmake/03-libs.cmake.orig
-+++ cmake/03-libs.cmake
-@@ -25,6 +25,6 @@ querylib(WITH_XRM "pkg-config" xcb-xrm libs dirs)
- querylib(WITH_XCURSOR "pkg-config" xcb-cursor libs dirs)
-
- # FreeBSD Support
--if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL
"OpenBSD")
- querylib(TRUE "pkg-config" libinotify libs dirs)
- endif()
Index: patches/patch-cmake_libpoly_cmake
===================================================================
RCS file: patches/patch-cmake_libpoly_cmake
diff -N patches/patch-cmake_libpoly_cmake
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-cmake_libpoly_cmake 3 Jan 2023 12:35:38 -0000
@@ -0,0 +1,13 @@
+Index: cmake/libpoly.cmake
+--- cmake/libpoly.cmake.orig
++++ cmake/libpoly.cmake
+@@ -100,7 +100,7 @@ endif()
+ find_package(Xcb ${XRANDR_VERSION} REQUIRED COMPONENTS RANDR)
+ find_package(Xcb REQUIRED COMPONENTS ${XORG_EXTENSIONS})
+
+-# FreeBSD Support
+-if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++# FreeBSD and OpenBSD Support
++if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL
"OpenBSD")
+ find_package(LibInotify REQUIRED)
+ endif()
Index: patches/patch-include_modules_cpu_hpp
===================================================================
RCS file: /cvs/ports/x11/polybar/patches/patch-include_modules_cpu_hpp,v
retrieving revision 1.3
diff -u -p -r1.3 patch-include_modules_cpu_hpp
--- patches/patch-include_modules_cpu_hpp 11 Mar 2022 20:16:56 -0000
1.3
+++ patches/patch-include_modules_cpu_hpp 3 Jan 2023 12:35:38 -0000
@@ -1,7 +1,7 @@
Index: include/modules/cpu.hpp
--- include/modules/cpu.hpp.orig
+++ include/modules/cpu.hpp
-@@ -9,7 +9,13 @@ namespace modules {
+@@ -10,7 +10,13 @@ namespace modules {
struct cpu_time {
unsigned long long user;
unsigned long long nice;
Index: patches/patch-src_modules_cpu_cpp
===================================================================
RCS file: /cvs/ports/x11/polybar/patches/patch-src_modules_cpu_cpp,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_modules_cpu_cpp
--- patches/patch-src_modules_cpu_cpp 11 Mar 2022 20:16:56 -0000 1.3
+++ patches/patch-src_modules_cpu_cpp 3 Jan 2023 12:35:38 -0000
@@ -1,7 +1,7 @@
Index: src/modules/cpu.cpp
--- src/modules/cpu.cpp.orig
+++ src/modules/cpu.cpp
-@@ -1,6 +1,12 @@
+@@ -3,6 +3,12 @@
#include <fstream>
#include <istream>
@@ -11,10 +11,10 @@ Index: src/modules/cpu.cpp
+#include <sys/sysctl.h>
+#endif /* __OpenBSD__ */
+
- #include "modules/cpu.hpp"
-
#include "drawtypes/label.hpp"
-@@ -106,6 +112,35 @@ namespace modules {
+ #include "drawtypes/progressbar.hpp"
+ #include "drawtypes/ramp.hpp"
+@@ -127,6 +133,35 @@ namespace modules {
m_cputimes_prev.swap(m_cputimes);
m_cputimes.clear();
@@ -50,7 +50,7 @@ Index: src/modules/cpu.cpp
try {
std::ifstream in(PATH_CPU_INFO);
string str;
-@@ -130,7 +165,7 @@ namespace modules {
+@@ -151,7 +186,7 @@ namespace modules {
} catch (const std::ios_base::failure& e) {
m_log.err("Failed to read CPU values (what: %s)", e.what());
}
Index: patches/patch-src_modules_temperature_cpp
===================================================================
RCS file: /cvs/ports/x11/polybar/patches/patch-src_modules_temperature_cpp,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_modules_temperature_cpp
--- patches/patch-src_modules_temperature_cpp 11 Mar 2022 20:16:56 -0000
1.4
+++ patches/patch-src_modules_temperature_cpp 3 Jan 2023 12:35:38 -0000
@@ -84,6 +84,6 @@ Index: src/modules/temperature.cpp
+#endif
+
+ temp_f = floor(((1.8 * m_temp) + 32) + 0.5);
- m_perc = math_util::unbounded_percentage(m_temp, m_tempbase, m_tempwarn);
string temp_c_string = to_string(m_temp);
+ string temp_f_string = to_string(temp_f);
Index: patches/patch-src_utils_file_cpp
===================================================================
RCS file: patches/patch-src_utils_file_cpp
diff -N patches/patch-src_utils_file_cpp
--- patches/patch-src_utils_file_cpp 11 Mar 2022 20:16:56 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Don't use the CPP define for fileno in stdio.h
-It causes clang++ to blow up.
-
-Index: src/utils/file.cpp
---- src/utils/file.cpp.orig
-+++ src/utils/file.cpp
-@@ -46,6 +46,7 @@ file_ptr::operator int() {
- return static_cast<const file_ptr&>(*this);
- }
- file_ptr::operator int() const {
-+#undef fileno
- return fileno(*this);
- }
-
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/polybar/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 31 Oct 2022 08:47:48 -0000 1.9
+++ pkg/PLIST 3 Jan 2023 12:35:38 -0000
@@ -1,25 +1,29 @@
@bin bin/polybar
@bin bin/polybar-msg
+@man man/man1/polybar-msg.1
@man man/man1/polybar.1
@man man/man5/polybar.5
share/bash-completion/completions/polybar
share/doc/polybar/
-share/doc/polybar/.buildinfo
+share/doc/polybar/CHANGELOG.md
share/doc/polybar/_sources/
share/doc/polybar/_sources/dev/
share/doc/polybar/_sources/dev/packaging.rst.txt
share/doc/polybar/_sources/dev/release-workflow.rst.txt
share/doc/polybar/_sources/index.rst.txt
share/doc/polybar/_sources/man/
+share/doc/polybar/_sources/man/polybar-msg.1.rst.txt
share/doc/polybar/_sources/man/polybar.1.rst.txt
share/doc/polybar/_sources/man/polybar.5.rst.txt
share/doc/polybar/_sources/user/
share/doc/polybar/_sources/user/actions.rst.txt
+share/doc/polybar/_sources/user/ipc.rst.txt
share/doc/polybar/_static/
share/doc/polybar/_static/_sphinx_javascript_frameworks_compat.js
share/doc/polybar/_static/alabaster.css
share/doc/polybar/_static/basic.css
share/doc/polybar/_static/custom.css
+share/doc/polybar/_static/default.png
share/doc/polybar/_static/doctools.js
share/doc/polybar/_static/documentation_options.js
share/doc/polybar/_static/file.png
@@ -33,13 +37,13 @@ share/doc/polybar/_static/searchtools.js
share/doc/polybar/_static/sphinx_highlight.js
share/doc/polybar/_static/underscore-1.13.1.js
share/doc/polybar/_static/underscore.js
-share/doc/polybar/config
share/doc/polybar/dev/
share/doc/polybar/dev/packaging.html
share/doc/polybar/dev/release-workflow.html
share/doc/polybar/genindex.html
share/doc/polybar/index.html
share/doc/polybar/man/
+share/doc/polybar/man/polybar-msg.1.html
share/doc/polybar/man/polybar.1.html
share/doc/polybar/man/polybar.5.html
share/doc/polybar/objects.inv
@@ -47,7 +51,10 @@ share/doc/polybar/search.html
share/doc/polybar/searchindex.js
share/doc/polybar/user/
share/doc/polybar/user/actions.html
+share/doc/polybar/user/ipc.html
share/examples/polybar/
-share/examples/polybar/config
+share/examples/polybar/config.ini
+@sample ${SYSCONFDIR}/polybar/
+@sample ${SYSCONFDIR}/polybar/config.ini
share/zsh/site-functions/_polybar
share/zsh/site-functions/_polybar_msg
