-
Notifications
You must be signed in to change notification settings - Fork 163
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Also use CMAKE_INSTALL_MANDIR so the man page gets installed properly.
- Loading branch information
Showing
5 changed files
with
67 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,8 @@ | ||
$NetBSD: distinfo,v 1.5 2021/10/26 11:25:10 nia Exp $ | ||
$NetBSD: distinfo,v 1.6 2022/09/06 09:26:27 nia Exp $ | ||
|
||
BLAKE2s (bmpanel2-2.1pre1.tar.gz) = d476b095b853c2c75ea7d82ee8919f28a1b164dc14987d9eb1741066c7a57670 | ||
SHA512 (bmpanel2-2.1pre1.tar.gz) = 8c1a4c64b25c04c6858407e8887f35f54d8b9e8e8b5b5c633258467afee77598157dfe3ef957ab7e5358b4a4bb0360032e711aa6cdb825a6e42ea2e5d97f97ef | ||
Size (bmpanel2-2.1pre1.tar.gz) = 386297 bytes | ||
SHA1 (patch-extra_py_bmpanel2.py) = 335bb0fe65930f82efdb7759d06ffa9f2cd0bf61 | ||
SHA1 (patch-man_CMakeLists.txt) = a95f82aebf42d31311e5d7bf42d9367253b246e2 | ||
SHA1 (patch-widget-utils.c) = 00ee1d8bb3c5a7c5b8fc6e7994472ce26e318285 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
$NetBSD: patch-extra_py_bmpanel2.py,v 1.1 2022/09/06 09:26:27 nia Exp $ | ||
|
||
Python 3 fix. | ||
|
||
https://github.com/SpartanJ/bmpanel2/commit/9d67757d915c7b707cc48a50c8cf97aa7c7a3513 | ||
|
||
--- extra/py/bmpanel2.py.orig 2022-09-06 08:51:15.418160728 +0000 | ||
+++ extra/py/bmpanel2.py | ||
@@ -140,7 +140,7 @@ class ConfigNode: | ||
for c in self.children: | ||
if c.name == item: | ||
return c | ||
- raise KeyError, item | ||
+ raise KeyError | ||
|
||
#---------------------------------------------------------------------- | ||
# ConfigFormat |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
$NetBSD: patch-man_CMakeLists.txt,v 1.1 2022/09/06 09:26:27 nia Exp $ | ||
|
||
Install man page to CMAKE_INSTALL_MANDIR. | ||
Do not use gzip. | ||
|
||
--- man/CMakeLists.txt.orig 2009-11-01 05:50:26.000000000 +0000 | ||
+++ man/CMakeLists.txt | ||
@@ -1,18 +1,17 @@ | ||
IF(BMPANEL2_FEATURE_MANPAGE) | ||
+ INCLUDE(GNUInstallDirs) | ||
FIND_PROGRAM(A2X a2x) | ||
- FIND_PROGRAM(GZIP gzip) | ||
- IF(A2X AND GZIP) | ||
+ IF(A2X) | ||
SET(ASCIIDOC_OPTS -f ${CMAKE_CURRENT_SOURCE_DIR}/asciidoc.conf -a man_version="${BMPANEL_VERSION}") | ||
SET(A2X_OPTS -D ${CMAKE_CURRENT_BINARY_DIR} -d manpage -f manpage) | ||
SET(MAN_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/bmpanel2.txt) | ||
ADD_CUSTOM_COMMAND( | ||
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/bmpanel2.1.gz | ||
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/bmpanel2.1 | ||
COMMAND ${A2X} ${A2X_OPTS} --asciidoc-opts="${ASCIIDOC_OPTS}" ${MAN_SOURCE} | ||
- COMMAND ${GZIP} -f ${CMAKE_CURRENT_BINARY_DIR}/bmpanel2.1 | ||
DEPENDS asciidoc.conf bmpanel2.txt | ||
) | ||
- ADD_CUSTOM_TARGET(manpage ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bmpanel2.1.gz) | ||
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/bmpanel2.1.gz | ||
- DESTINATION share/man/man1) | ||
- ENDIF(A2X AND GZIP) | ||
+ ADD_CUSTOM_TARGET(manpage ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bmpanel2.1) | ||
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/bmpanel2.1 | ||
+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) | ||
+ ENDIF(A2X) | ||
ENDIF(BMPANEL2_FEATURE_MANPAGE) |