pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
zoneminder: Minor cleanups
Module Name: pkgsrc-wip
Committed By: Greg Troxel <gdt%lexort.com@localhost>
Pushed By: gdt
Date: Thu Jan 20 13:53:06 2022 -0500
Changeset: e4f20efbfefab1a422717d5067bbfaf6a6727344
Modified Files:
zoneminder/MESSAGE
zoneminder/Makefile
zoneminder/PLIST
zoneminder/TODO
zoneminder/distinfo
Added Files:
zoneminder/patches/patch-cmake_Modules_Pod2Man.cmake
Log Message:
zoneminder: Minor cleanups
- put man pages in man/ not share/man/
- shrink TODO based on progress
- trim MESSAGE of upstream doc pointer (it's HOMEPAGE)
- tweak spacing per pkglint
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e4f20efbfefab1a422717d5067bbfaf6a6727344
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
zoneminder/MESSAGE | 5 ---
zoneminder/Makefile | 3 +-
zoneminder/PLIST | 36 +++++++++++-----------
zoneminder/TODO | 2 +-
zoneminder/distinfo | 1 +
.../patches/patch-cmake_Modules_Pod2Man.cmake | 19 ++++++++++++
6 files changed, 41 insertions(+), 25 deletions(-)
diffs:
diff --git a/zoneminder/MESSAGE b/zoneminder/MESSAGE
index 044c9f7b62..db47d940f6 100644
--- a/zoneminder/MESSAGE
+++ b/zoneminder/MESSAGE
@@ -1,11 +1,6 @@
===========================================================================
$NetBSD: MESSAGE,v 1.5 2021/12/31 12:07:55 dsainty Exp $
-All documentation for ZoneMinder is now online at:
-
- https://www.zoneminder.com
-
-
Performance:
ZoneMinder benefits dramatically from using libjpeg-turbo. Consider
diff --git a/zoneminder/Makefile b/zoneminder/Makefile
index d9201f7b35..8d654abe2d 100644
--- a/zoneminder/Makefile
+++ b/zoneminder/Makefile
@@ -2,6 +2,7 @@
#VERSION= 1.36.7
VERSION= 1.30.5
+PKGREVISION= 1
# Sometimes the distfile unpacks to ZoneMinder and sometimes zoneminder.
NAME_DIST= ZoneMinder
NAME_LOWER= zoneminder
@@ -278,7 +279,7 @@ PERL5_REQD+= 5.6.0
#PERL5_CONFIGURE_DIRS= ${WRKSRC}/scripts/ZoneMinder
#PERL5_CONFIGURE_DIRS+= ${WRKSRC}/onvif/proxy
#PERL5_CONFIGURE_DIRS+= ${WRKSRC}/onvif/modules
-#PERL5_PACKLIST= auto/ZoneMinder/.packlist
+#PERL5_PACKLIST= auto/ZoneMinder/.packlist
#PERL5_PACKLIST+= auto/ONVIF/.packlist
#CMAKE_ARGS+= -DZM_PERL_MM_PARMS="INSTALLDIRS=vendor"
#.include "../../lang/perl5/module.mk"
diff --git a/zoneminder/PLIST b/zoneminder/PLIST
index 2e71e8b677..f6ae1c8aed 100644
--- a/zoneminder/PLIST
+++ b/zoneminder/PLIST
@@ -6013,27 +6013,27 @@ ${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Trigger::Connection.3
${PERL5_SUB_INSTALLVENDORMAN3DIR}/ZoneMinder::Trigger::Connection::Example.3
${ZM_HTTPD_CGIBIN}/nph-zms
${ZM_HTTPD_CGIBIN}/zms
+man/man8/zoneminder-zma.8
+man/man8/zoneminder-zmaudit.pl.8
+man/man8/zoneminder-zmc.8
+man/man8/zoneminder-zmcamtool.pl.8
+man/man8/zoneminder-zmcontrol.pl.8
+man/man8/zoneminder-zmdc.pl.8
+man/man8/zoneminder-zmf.8
+man/man8/zoneminder-zmfilter.pl.8
+man/man8/zoneminder-zmpkg.pl.8
+man/man8/zoneminder-zmsystemctl.pl.8
+man/man8/zoneminder-zmtelemetry.pl.8
+man/man8/zoneminder-zmtrack.pl.8
+man/man8/zoneminder-zmtrigger.pl.8
+man/man8/zoneminder-zmu.8
+man/man8/zoneminder-zmupdate.pl.8
+man/man8/zoneminder-zmvideo.pl.8
+man/man8/zoneminder-zmwatch.pl.8
+man/man8/zoneminder-zmx10.pl.8
${PLIST.rcd}share/examples/rc.d/zoneminder
share/examples/zoneminder/apache/zoneminder.conf
share/examples/zoneminder/config/zm.conf
-share/man/man8/zoneminder-zma.8
-share/man/man8/zoneminder-zmaudit.pl.8
-share/man/man8/zoneminder-zmc.8
-share/man/man8/zoneminder-zmcamtool.pl.8
-share/man/man8/zoneminder-zmcontrol.pl.8
-share/man/man8/zoneminder-zmdc.pl.8
-share/man/man8/zoneminder-zmf.8
-share/man/man8/zoneminder-zmfilter.pl.8
-share/man/man8/zoneminder-zmpkg.pl.8
-share/man/man8/zoneminder-zmsystemctl.pl.8
-share/man/man8/zoneminder-zmtelemetry.pl.8
-share/man/man8/zoneminder-zmtrack.pl.8
-share/man/man8/zoneminder-zmtrigger.pl.8
-share/man/man8/zoneminder-zmu.8
-share/man/man8/zoneminder-zmupdate.pl.8
-share/man/man8/zoneminder-zmvideo.pl.8
-share/man/man8/zoneminder-zmwatch.pl.8
-share/man/man8/zoneminder-zmx10.pl.8
share/zoneminder/db/test.monitor.sql
share/zoneminder/db/zm_create.sql
share/zoneminder/db/zm_update-0.0.1.sql
diff --git a/zoneminder/TODO b/zoneminder/TODO
index 6a64c8d64a..251da8aef0 100644
--- a/zoneminder/TODO
+++ b/zoneminder/TODO
@@ -3,7 +3,7 @@ just delete if it's duplicative with upstream docs.
for (some subset of final point releases):
- update to newer upstream, which requires cmake
+ update to newer upstream
validate that it actually runs
diff --git a/zoneminder/distinfo b/zoneminder/distinfo
index 67e582508b..f8eb827aea 100644
--- a/zoneminder/distinfo
+++ b/zoneminder/distinfo
@@ -7,6 +7,7 @@ BLAKE2s (ZoneMinder-1.30.5.tar.gz) = eae68bdd260feaf529154de3173805dd318c7bc22ca
SHA512 (ZoneMinder-1.30.5.tar.gz) = f423b79726357c277814c9346445b695fc1b0f9cff61847003d6286bc36f92aab8ab35689e1a3552fb60394793c478fefb4c8fa3861a1dd06a2655b018c6a52a
Size (ZoneMinder-1.30.5.tar.gz) = 9936584 bytes
SHA1 (patch-CMakeLists.txt) = 4cf38ed2818c2000863c4b6587c5b5f64b0c1127
+SHA1 (patch-cmake_Modules_Pod2Man.cmake) = f0a1462037fc63fa9f35d0595f4f50946f5518e7
SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm) = bded373e318cd074b92853165d5ca38d23bdea5f
SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_Memory_Shared.pm) = b97c104f6ac102fc4510eb0977169375cdd97197
SHA1 (patch-scripts_zm_in) = a05727261bb8be6b707e9a14ae4ff52ea3770d51
diff --git a/zoneminder/patches/patch-cmake_Modules_Pod2Man.cmake b/zoneminder/patches/patch-cmake_Modules_Pod2Man.cmake
new file mode 100644
index 0000000000..d31827f8a4
--- /dev/null
+++ b/zoneminder/patches/patch-cmake_Modules_Pod2Man.cmake
@@ -0,0 +1,19 @@
+$NetBSD$
+
+Change man install path to pkgsrc norms.
+
+Not reported upstream until we are caught up. Then, the bug is not
+the value, but that it isn't configurable via a cmake command-line
+argument.
+
+--- cmake/Modules/Pod2Man.cmake.orig 2019-02-22 15:38:47.000000000 +0000
++++ cmake/Modules/Pod2Man.cmake
+@@ -58,7 +58,7 @@ MACRO(POD2MAN PODFILE MANFILE SECTION)
+
+ INSTALL(
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz
+- DESTINATION share/man/man${SECTION}
++ DESTINATION man/man${SECTION}
+ )
+ ENDMACRO(POD2MAN PODFILE MANFILE SECTION)
+
Home |
Main Index |
Thread Index |
Old Index