pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

zoneminder; Move MESSAGE to a README



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Mon Sep 26 19:42:01 2022 -0400
Changeset:	efc4ddf12c56036697cf18acf183a0ea7823cbc2

Modified Files:
	zoneminder/Makefile
	zoneminder/PLIST
Added Files:
	zoneminder/files/README-pkgsrc.md
Removed Files:
	zoneminder/MESSAGE

Log Message:
zoneminder; Move MESSAGE to a README

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=efc4ddf12c56036697cf18acf183a0ea7823cbc2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 zoneminder/MESSAGE                | 44 ---------------------------------------
 zoneminder/Makefile               |  8 +++++--
 zoneminder/PLIST                  |  1 +
 zoneminder/files/README-pkgsrc.md | 44 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 51 insertions(+), 46 deletions(-)

diffs:
diff --git a/zoneminder/MESSAGE b/zoneminder/MESSAGE
deleted file mode 100644
index db47d940f6..0000000000
--- a/zoneminder/MESSAGE
+++ /dev/null
@@ -1,44 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.5 2021/12/31 12:07:55 dsainty Exp $
-
-Performance:
-
-  ZoneMinder benefits dramatically from using libjpeg-turbo.  Consider
-  building from Pkgsrc with:
-
-  JPEG_DEFAULT=libjpeg-turbo
-
-
-To get ZoneMinder started a MySQL database is required.
-
-First, create a MySQL user "zmuser":
-
-echo "create user 'zmuser'@'localhost' identified by 'zmpass';" | mysql -u root
-
-The default password is "zmpass".  You may change this to something else, and
-update ZM_DB_PASS in ${PKG_SYSCONFDIR}/zm.conf.
-
-
-Create the initial database via:
-
-  mysql -u root < ${PREFIX}/share/zoneminder/db/zm_create.sql
-
-
-Assign rights to the "zmuser" user via:
-
-  echo "grant all on * to 'zmuser';" | mysql -u root zm
-
-
-Upgrade a database from an older version of ZoneMinder via:
-
-  zmupdate.pl -u root [-p <password>]
-
-
-To enable the web interface via Apache, add the following line to httpd.conf:
-
-  Include ${PREFIX}/share/examples/zoneminder/apache/zoneminder.conf
-
-PHP may log warnings if the PHP date.timezone configuration is not set.
-Consider assigning a default system time zone to date.timezone in
-${PKG_SYSCONFDIR}/php.ini.
-===========================================================================
diff --git a/zoneminder/Makefile b/zoneminder/Makefile
index 9409d04b23..312236e350 100644
--- a/zoneminder/Makefile
+++ b/zoneminder/Makefile
@@ -2,7 +2,7 @@
 
 #VERSION=	1.36.7
 VERSION=	1.30.5
-PKGREVISION=	1
+PKGREVISION=	2
 # Sometimes the distfile unpacks to ZoneMinder and sometimes zoneminder.
 NAME_DIST=	ZoneMinder
 NAME_LOWER=	zoneminder
@@ -102,6 +102,8 @@ CMAKE_ARGS+=		-DPOLKIT_LIBRARIES=" " -DPOLKIT_INCLUDE_DIR=" "
 PTHREAD_AUTO_VARS=	yes
 .include "../../mk/pthread.buildlink3.mk"
 
+# This should probably be ffmpeg4 at least, and zm seems to have
+# trouble with ffmpeg2.  Defer until up-to-date.
 .include "../../multimedia/ffmpeg2/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-ffmpeg=${BUILDLINK_PREFIX.ffmpeg2}
 CONFIGURE_ENV+=		PATH_FFMPEG=${BUILDLINK_PREFIX.ffmpeg2}/bin/ffmpeg2
@@ -294,9 +296,11 @@ PERL5_REQD+=		5.6.0
 #post-configure: perl5-configure
 
 EGDIR=			share/examples/${PKGBASE}
+DOCDIR=			share/doc/${PKGBASE}
 INSTALLATION_DIRS+=	${EGDIR} ${EGDIR}/config ${EGDIR}/apache
 CONF_FILES+=		${PREFIX}/${EGDIR}/config/zm.conf ${PKG_SYSCONFDIR}/zm.conf
 INSTALLATION_DIRS+=	bin share/examples/rc.d share/zoneminder/db
+INSTALLATION_DIRS+=	${DOCDIR}
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/zoneminder.conf ${DESTDIR}${PREFIX}/${EGDIR}/apache/zoneminder.conf
 	${INSTALL_DATA} ${WRKSRC}/zm.conf ${DESTDIR}${PREFIX}/${EGDIR}/config/zm.conf
@@ -309,7 +313,7 @@ post-install:
 	${LN} -s ${ZM_CACHE}/temp ${DESTDIR}${PREFIX}/${ZM_HTTPD_ROOT:Q}/temp
 	${LN} -s ${ZM_CACHE}/events ${DESTDIR}${PREFIX}/${ZM_HTTPD_ROOT:Q}/events
 	${LN} -s ${ZM_CACHE}/images ${DESTDIR}${PREFIX}/${ZM_HTTPD_ROOT:Q}/images
-
+	${INSTALL_DATA} files/README-pkgsrc.md ${DESTDIR}${PREFIX}/${DOCDIR}
 
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
diff --git a/zoneminder/PLIST b/zoneminder/PLIST
index f6ae1c8aed..aa681aa930 100644
--- a/zoneminder/PLIST
+++ b/zoneminder/PLIST
@@ -7654,3 +7654,4 @@ ${ZM_HTTPD_ROOT}/tools/mootools/mootools-core.js
 ${ZM_HTTPD_ROOT}/tools/mootools/mootools-more-1.5.1.js
 ${ZM_HTTPD_ROOT}/tools/mootools/mootools-more.js
 ${ZM_HTTPD_ROOT}/views/image.php
+share/doc/zoneminder/README-pkgsrc.md
diff --git a/zoneminder/files/README-pkgsrc.md b/zoneminder/files/README-pkgsrc.md
new file mode 100644
index 0000000000..db47d940f6
--- /dev/null
+++ b/zoneminder/files/README-pkgsrc.md
@@ -0,0 +1,44 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.5 2021/12/31 12:07:55 dsainty Exp $
+
+Performance:
+
+  ZoneMinder benefits dramatically from using libjpeg-turbo.  Consider
+  building from Pkgsrc with:
+
+  JPEG_DEFAULT=libjpeg-turbo
+
+
+To get ZoneMinder started a MySQL database is required.
+
+First, create a MySQL user "zmuser":
+
+echo "create user 'zmuser'@'localhost' identified by 'zmpass';" | mysql -u root
+
+The default password is "zmpass".  You may change this to something else, and
+update ZM_DB_PASS in ${PKG_SYSCONFDIR}/zm.conf.
+
+
+Create the initial database via:
+
+  mysql -u root < ${PREFIX}/share/zoneminder/db/zm_create.sql
+
+
+Assign rights to the "zmuser" user via:
+
+  echo "grant all on * to 'zmuser';" | mysql -u root zm
+
+
+Upgrade a database from an older version of ZoneMinder via:
+
+  zmupdate.pl -u root [-p <password>]
+
+
+To enable the web interface via Apache, add the following line to httpd.conf:
+
+  Include ${PREFIX}/share/examples/zoneminder/apache/zoneminder.conf
+
+PHP may log warnings if the PHP date.timezone configuration is not set.
+Consider assigning a default system time zone to date.timezone in
+${PKG_SYSCONFDIR}/php.ini.
+===========================================================================


Home | Main Index | Thread Index | Old Index