[gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/
@ 2011-09-17  8:54 Andreas Hüttel
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Hüttel @ 2011-09-17  8:54 UTC (permalink / raw
  To: gentoo-commits

commit:     d1b6f4db36be7f960971b955b0403528f1cb69df
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 18:29:17 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 18:29:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=d1b6f4db

Sort out patches

(Portage version: 2.1.10.17/git/Linux x86_64, signed Manifest commit with key 7887F787)

---
 www-misc/zoneminder/ChangeLog                |    4 +++
 www-misc/zoneminder/Manifest                 |   30 +++++++++++++-------------
 www-misc/zoneminder/zoneminder-1.25.0.ebuild |    4 ---
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/www-misc/zoneminder/ChangeLog b/www-misc/zoneminder/ChangeLog
index cf71c0c..a4e65a6 100644
--- a/www-misc/zoneminder/ChangeLog
+++ b/www-misc/zoneminder/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/Attic/ChangeLog,v 1.41 2011/04/04 12:11:35 scarabeus Exp $
 
+  16 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  zoneminder-1.25.0.ebuild:
+  Sort out patches
+
 *zoneminder-1.25.0 (01 Sep 2011)
 
   01 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>

diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index 615747c..94cd9e6 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -12,23 +12,23 @@ AUX 10_zoneminder.conf 462 RMD160 d032813c63f4676e06658da3668c50f88886efab SHA1
 AUX conf.d 138 RMD160 e7c71690bac83c1bee63c6b602b15910d3a8967c SHA1 719a2cb400a0a107accb28be3bd17f6269d41f76 SHA256 65e935cb63bf3d072b9317842944d808550ef3f933d834bb95aaacf3253bd85c
 AUX init.d 398 RMD160 d124ef1c1e6f5b0a9e4535d96620e46de71457c4 SHA1 5afc09eb838d9ebb28e9e91ffa0f482830862396 SHA256 b5dd459ddd0a331f625b5fa0b9441b9236f676ad2e6f6ea2da896ed4056cb0c6
 DIST ZoneMinder-1.25.0.tar.gz 1119091 RMD160 32a4f503770103e55bfe592864c1cab82e7395a6 SHA1 a93a976a5cd82f1e197f4d7bd626d3f0387c4231 SHA256 ec63ef47d8f4cb8af21a3bc84ff1de6968805146682dd7f10982bde975d9bb5d
-EBUILD zoneminder-1.25.0.ebuild 3916 RMD160 41445ccf66dd51bcf9065bf0a729dea6fe84e970 SHA1 4a116c4af0559e7b9aae9178725d49cb798dff0b SHA256 9b435a1fd7a867314ee6ad8c7400796ea09d573ce3875b49c681c92dfa406b7c
-MISC ChangeLog 7832 RMD160 6ee9be50b5925df5ad39347aa7e4c477808096fc SHA1 20aa4fb2abf94e250e608ce32f42bf8a4eb5a063 SHA256 0c42075e7a943aaa795ec73e0f978e53e84cb26cc39c80f4fa097d16e9898345
+EBUILD zoneminder-1.25.0.ebuild 3744 RMD160 cec4c041827a40d758339d4a1c563cf48f85bff3 SHA1 1236263a108490467d05df8b3003327b3920e660 SHA256 d6d16bba96ea005a0cb5304bbc32e2390b7f1783a520fc9df77095010a0e45c1
+MISC ChangeLog 7937 RMD160 4f8bb4a5dd76074ca455f1dfb70db4c6bd36fb5f SHA1 fd6449368a28a3663cc7bd82f5cb5b19d111f92b SHA256 71c7d6b4fe28a1df01aca33c828f330c89bcd5d0c2f487c18a89c9ca207c3d32
 MISC metadata.xml 262 RMD160 24e1a7cfcbca1e2f41e8c062c448d9150f6320b8 SHA1 951224aa9eb92e898209936836a18e844ae1f169 SHA256 7e8dde52c550f9cfc6d74b78c19f6900a8cc241f2bf136610a4fc3b0aa95f3f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOX/H6AAoJENwGBM22xffehgsP/RXqKFmBqdtHV7hBVgofOTpS
-0xw24nn9SL0sI48HFpmt4kp/F2yalrZoHG7/N5cyUV0ho+6lGdn4ZrRM/WyRKrQM
-B5jnGIPIHLftrRgM2XAh8lyavTkpq5x18MUtbBVx0oSs2g+Z+teBf95BMa6mQHCC
-8eQX1ZR6GOItkLrL/z0IWXmp83wWepOjQlg0HxK8NRkw9PMFYChp/SklJatdcNZh
-KliwKr0RUUAh6NnKhpwimdTyFg7maB3EN9BYiGh6LrklfW5BR4zFdWVviQ/oktQb
-vxZiHNhGl5uUKFtMGy13M5/RR6d6G7LnFXbgANlZV1xHW6H1TkU3XiLGgDnVIdli
-veDnV8OlwAr8J/nqQupLaXu0xuskqXvuUuX4de20njGO6+jQpoewAEpl68pRoIVq
-y54E5UUrMEiUJNW2y0J4D6hqiByFz7W6x+NBCBeTTBV9YESu2T5Yu6g8eLBVGkNB
-9Oe+kib0AZxzxO/LR6lpxyUINJSBW/Soz8zUjf/XAT6+ZipwhJgIuIlKqxmv9F8y
-Ne7Vp0hz9a4TW3YoL0Azg/Se/LCOjkkURUfikXPaBD6WfEFIbJEKKiS+Dah5MS3Q
-1gP4LK6ruZe0WQ1bvOtsDFzVQjVvz3SW9KZ0LgHSxKAYNLgvZUvTEx/Ca4IgQCnX
-3wE/Rd5hLLNbHIhPKLE6
-=jxHs
+iQIcBAEBCgAGBQJOc5V9AAoJEEb+UGWnxTyH/OEP/jLWnwWqsn1W1nDmeiaxKzxd
+GVypnavElZTevQ5ybbQlWllfPIGKXAf8Z6pji65Vpj1V4aXItStevbpkEZNP8Tp4
+gNX4BhbTiSHVo0zrOTeq05NJ/ZSrDodIhsFJAnQam28H2jCVZxdLNusRV9QGocR2
+sYci98OMpDtq436Cctl+IKDZGgWmh8eRxBmHus6653xzCalmMSQFrZG20smwcPxM
+YoxI1o1fe92jcPsjM9oMRh1IjQvC76yLYgSdcaWYmpyDyXKCB9sO/OqM9ShIEMLf
+QyBwU5d+v4HAl4eegf4c0LxOCb1GnBkke3AT9J7DADxHVuWPORsOwarCJuPfXNYm
+fzpkXBeWS4bcfA3B+dCgOlLLYKzJShQ0nzwO3ZcjEhj+w72ghbT3RHxw5LXzK8HN
+BNQcOAqHTx5SpcLkfMtHi0DkBtqyve9FEU8fYst0gkj9a+zqV2zCIg+Nmzd7daa/
+q+WqBukDw+l0yVr3gAvXmfXO6Ah8BdrE/47SKbEIgX4zx7J5CIvaGEXfF2amxqzW
+IyPJSs2l6I6lU0L/PvetTrlyWo1sSLy2m59p8mEbQDlRB1xeVG5YOZ7kLH5WLocm
+tPQwnuvoDfCBg7ZMYkhs93Ng7y9rte21SLwctIzn50F2BwBOQF1Ivom6S3+cSwLM
+/87uZ2rYrzWLU4dbtvym
+=AtWc
 -----END PGP SIGNATURE-----

diff --git a/www-misc/zoneminder/zoneminder-1.25.0.ebuild b/www-misc/zoneminder/zoneminder-1.25.0.ebuild
index b95fa0b..47b2ddb 100644
--- a/www-misc/zoneminder/zoneminder-1.25.0.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.25.0.ebuild
@@ -51,11 +51,7 @@ S=${WORKDIR}/${MY_PN}-${PV}
 
 PATCHES=(
 	"${FILESDIR}"/1.25.0/Makefile.am.patch
-	"${FILESDIR}"/1.24.2/zm_create.sql.in.patch
-	"${FILESDIR}"/1.24.2/zm_remote_camera_http.patch
 	"${FILESDIR}"/1.24.2/db_upgrade_script_location.patch
-	"${FILESDIR}"/1.24.2/zm_jpeg.patch
-	"${FILESDIR}"/1.24.2/zm_build_fix.patch
 )
 
 pkg_setup() {



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/
@ 2011-09-17  8:54 Andreas Hüttel
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Hüttel @ 2011-09-17  8:54 UTC (permalink / raw
  To: gentoo-commits

commit:     41309d5cb140d6ef5bde246159469a64a8c87b83
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 17 08:55:13 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 08:55:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=41309d5c

Builds but does not install yet

(Portage version: 2.1.10.17/git/Linux x86_64, signed Manifest commit with key 7887F787)

---
 www-misc/zoneminder/ChangeLog                |    4 +++
 www-misc/zoneminder/Manifest                 |   30 +++++++++++++-------------
 www-misc/zoneminder/zoneminder-1.25.0.ebuild |   23 +++++++++++--------
 3 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/www-misc/zoneminder/ChangeLog b/www-misc/zoneminder/ChangeLog
index a4e65a6..b9c44c3 100644
--- a/www-misc/zoneminder/ChangeLog
+++ b/www-misc/zoneminder/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/Attic/ChangeLog,v 1.41 2011/04/04 12:11:35 scarabeus Exp $
 
+  17 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  zoneminder-1.25.0.ebuild:
+  Builds but does not install yet
+
   16 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   zoneminder-1.25.0.ebuild:
   Sort out patches

diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index 94cd9e6..9ca672b 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -12,23 +12,23 @@ AUX 10_zoneminder.conf 462 RMD160 d032813c63f4676e06658da3668c50f88886efab SHA1
 AUX conf.d 138 RMD160 e7c71690bac83c1bee63c6b602b15910d3a8967c SHA1 719a2cb400a0a107accb28be3bd17f6269d41f76 SHA256 65e935cb63bf3d072b9317842944d808550ef3f933d834bb95aaacf3253bd85c
 AUX init.d 398 RMD160 d124ef1c1e6f5b0a9e4535d96620e46de71457c4 SHA1 5afc09eb838d9ebb28e9e91ffa0f482830862396 SHA256 b5dd459ddd0a331f625b5fa0b9441b9236f676ad2e6f6ea2da896ed4056cb0c6
 DIST ZoneMinder-1.25.0.tar.gz 1119091 RMD160 32a4f503770103e55bfe592864c1cab82e7395a6 SHA1 a93a976a5cd82f1e197f4d7bd626d3f0387c4231 SHA256 ec63ef47d8f4cb8af21a3bc84ff1de6968805146682dd7f10982bde975d9bb5d
-EBUILD zoneminder-1.25.0.ebuild 3744 RMD160 cec4c041827a40d758339d4a1c563cf48f85bff3 SHA1 1236263a108490467d05df8b3003327b3920e660 SHA256 d6d16bba96ea005a0cb5304bbc32e2390b7f1783a520fc9df77095010a0e45c1
-MISC ChangeLog 7937 RMD160 4f8bb4a5dd76074ca455f1dfb70db4c6bd36fb5f SHA1 fd6449368a28a3663cc7bd82f5cb5b19d111f92b SHA256 71c7d6b4fe28a1df01aca33c828f330c89bcd5d0c2f487c18a89c9ca207c3d32
+EBUILD zoneminder-1.25.0.ebuild 3722 RMD160 dfa31404e10c8fe0d2a989ea522608b7d29074d3 SHA1 c3dc455ee1384341199fcfafecab0a2ded159a3a SHA256 0459249406ff666463760928e29a74d2022f9ce96f141a5b2edbe341939deda5
+MISC ChangeLog 8057 RMD160 2b8b1f255e0ca05fc8beb78a6cd7e87d020e0f0e SHA1 e0ab433b58bb7c37e904ebe52e264a8396b6da48 SHA256 d2206ee6f60f7fd28720a4da2cd7a5bd7d09ac810264ddd7c628512afeeb5256
 MISC metadata.xml 262 RMD160 24e1a7cfcbca1e2f41e8c062c448d9150f6320b8 SHA1 951224aa9eb92e898209936836a18e844ae1f169 SHA256 7e8dde52c550f9cfc6d74b78c19f6900a8cc241f2bf136610a4fc3b0aa95f3f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOc5V9AAoJEEb+UGWnxTyH/OEP/jLWnwWqsn1W1nDmeiaxKzxd
-GVypnavElZTevQ5ybbQlWllfPIGKXAf8Z6pji65Vpj1V4aXItStevbpkEZNP8Tp4
-gNX4BhbTiSHVo0zrOTeq05NJ/ZSrDodIhsFJAnQam28H2jCVZxdLNusRV9QGocR2
-sYci98OMpDtq436Cctl+IKDZGgWmh8eRxBmHus6653xzCalmMSQFrZG20smwcPxM
-YoxI1o1fe92jcPsjM9oMRh1IjQvC76yLYgSdcaWYmpyDyXKCB9sO/OqM9ShIEMLf
-QyBwU5d+v4HAl4eegf4c0LxOCb1GnBkke3AT9J7DADxHVuWPORsOwarCJuPfXNYm
-fzpkXBeWS4bcfA3B+dCgOlLLYKzJShQ0nzwO3ZcjEhj+w72ghbT3RHxw5LXzK8HN
-BNQcOAqHTx5SpcLkfMtHi0DkBtqyve9FEU8fYst0gkj9a+zqV2zCIg+Nmzd7daa/
-q+WqBukDw+l0yVr3gAvXmfXO6Ah8BdrE/47SKbEIgX4zx7J5CIvaGEXfF2amxqzW
-IyPJSs2l6I6lU0L/PvetTrlyWo1sSLy2m59p8mEbQDlRB1xeVG5YOZ7kLH5WLocm
-tPQwnuvoDfCBg7ZMYkhs93Ng7y9rte21SLwctIzn50F2BwBOQF1Ivom6S3+cSwLM
-/87uZ2rYrzWLU4dbtvym
-=AtWc
+iQIcBAEBCgAGBQJOdGBxAAoJEEb+UGWnxTyHlxIP/ivYJkxhYyD+QNwqhUotIEBN
+mr+UL0T2Kz3Iltv4qNsx7M35yhtLVkdXEzbPSyQZjRLakwapoEv1lyEIzZkdC4OQ
+c7LS2xQytVsUFKbhtavDG7bGRX/Cnu049YG41ca2FZTHqKA/7bkmBgDXd7Q5ZMzT
+THoxNPGp16M/g8LR8QrDWSWMb1zEhRCgMS9PltURGwZCcivaTHcq+74QnFAbIxsp
+BdrN00JwBMAIEYK5FY8SSQLezqWYf1ejtT9z303pOsN3vrkAn+HP+TsotNlNHv/t
+fcmpittHBEe+j6w2/EJSUCFOXR1533gp87fzqKjKVOObJatuk9Zur0ciS9DXbwwd
+xuCN40wHVZv4Q8tC+O2O/S2auH2Nid+td6QdYvW734f5B/RTN028/AI1nYO5gMac
+Z43VTzZ/ZocAZBdDus8KQ//mu9ekkooyNBrRHzA6aZHMMW57zpzf7JLTsn/pMKpn
+baWsgpvqewR/tjF+nh23g2jK2X8HDlMYJUw4k8Bd5t0fkvfoayvu2ii88ZaG7AiE
+TTFiWHJ5A7PRTfNQ5H3WkbOx4quyjOg0oeYOBlvnWtld8zGkJ2aeFpi/QkFBn57u
+eu/ATB6A3Rr7doN6WWpuXDP0a4dhiyx8mRn0Z/yaIISkaBWP3VX6VHq6E+gc8I20
+CIK7tWsa5XKMjAiQiiUr
+=tH9X
 -----END PGP SIGNATURE-----

diff --git a/www-misc/zoneminder/zoneminder-1.25.0.ebuild b/www-misc/zoneminder/zoneminder-1.25.0.ebuild
index 47b2ddb..d9c056a 100644
--- a/www-misc/zoneminder/zoneminder-1.25.0.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.25.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit eutils base autotools depend.php depend.apache multilib
+inherit eutils base autotools depend.php depend.apache multilib flag-o-matic
 
 MY_PN="ZoneMinder"
 
@@ -14,12 +14,13 @@ SRC_URI="http://www.zoneminder.com/downloads/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS=""
-IUSE="debug ffmpeg"
+IUSE="debug ffmpeg mmap"
 SLOT="0"
 
 DEPEND="app-admin/sudo
 	dev-libs/libpcre
 	virtual/jpeg
+	>=media-video/ffmpeg-0.8
 	net-libs/gnutls
 	>=dev-lang/perl-5.6.0
 	virtual/perl-Archive-Tar
@@ -36,7 +37,9 @@ DEPEND="app-admin/sudo
 	virtual/perl-libnet
 	virtual/perl-Module-Load
 	virtual/perl-Sys-Syslog
-	virtual/perl-Time-HiRes"
+	virtual/perl-Time-HiRes
+	mmap? ( dev-perl/Sys-Mmap )
+"
 
 RDEPEND="dev-perl/DBD-mysql
 	ffmpeg? ( virtual/ffmpeg )
@@ -64,15 +67,15 @@ src_prepare() {
 }
 
 src_configure() {
+	append-cxxflags -D__STDC_CONSTANT_MACROS
+
 	local myconf
 
-# To enable mmap support we need a dependancy of Sys::Mmap
-# It installs fine via g-cpan, but there's no ebuild currently in portage.
-#	if use mmap; then
-#		myconf="${myconf} --enable-mmap=yes"
-#	else
-#		myconf="${myconf} --enable-mmap=no"
-#	fi
+	if use mmap; then
+		myconf="${myconf} --enable-mmap=yes"
+	else
+		myconf="${myconf} --enable-mmap=no"
+	fi
 
 	if use debug; then
 		myconf="${myconf} --enable-debug=yes --enable-crashtrace=yes"



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/
@ 2011-09-17 19:31 Andreas Hüttel
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Hüttel @ 2011-09-17 19:31 UTC (permalink / raw
  To: gentoo-commits

commit:     60490563690364e8d9010f822a4ef381b1bd1d1f
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 17 19:31:31 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 19:31:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=60490563

Build against openssl because of bug 285151

(Portage version: 2.1.10.17/git/Linux x86_64, signed Manifest commit with key 7887F787)

---
 www-misc/zoneminder/ChangeLog                |    4 +++
 www-misc/zoneminder/Manifest                 |   30 +++++++++++++-------------
 www-misc/zoneminder/zoneminder-1.25.0.ebuild |    6 ++--
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/www-misc/zoneminder/ChangeLog b/www-misc/zoneminder/ChangeLog
index b9c44c3..ecce77a 100644
--- a/www-misc/zoneminder/ChangeLog
+++ b/www-misc/zoneminder/ChangeLog
@@ -4,6 +4,10 @@
 
   17 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   zoneminder-1.25.0.ebuild:
+  Build against openssl because of bug 285151
+
+  17 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  zoneminder-1.25.0.ebuild:
   Builds but does not install yet
 
   16 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>

diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index 9ca672b..7efc1fc 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -12,23 +12,23 @@ AUX 10_zoneminder.conf 462 RMD160 d032813c63f4676e06658da3668c50f88886efab SHA1
 AUX conf.d 138 RMD160 e7c71690bac83c1bee63c6b602b15910d3a8967c SHA1 719a2cb400a0a107accb28be3bd17f6269d41f76 SHA256 65e935cb63bf3d072b9317842944d808550ef3f933d834bb95aaacf3253bd85c
 AUX init.d 398 RMD160 d124ef1c1e6f5b0a9e4535d96620e46de71457c4 SHA1 5afc09eb838d9ebb28e9e91ffa0f482830862396 SHA256 b5dd459ddd0a331f625b5fa0b9441b9236f676ad2e6f6ea2da896ed4056cb0c6
 DIST ZoneMinder-1.25.0.tar.gz 1119091 RMD160 32a4f503770103e55bfe592864c1cab82e7395a6 SHA1 a93a976a5cd82f1e197f4d7bd626d3f0387c4231 SHA256 ec63ef47d8f4cb8af21a3bc84ff1de6968805146682dd7f10982bde975d9bb5d
-EBUILD zoneminder-1.25.0.ebuild 3722 RMD160 dfa31404e10c8fe0d2a989ea522608b7d29074d3 SHA1 c3dc455ee1384341199fcfafecab0a2ded159a3a SHA256 0459249406ff666463760928e29a74d2022f9ce96f141a5b2edbe341939deda5
-MISC ChangeLog 8057 RMD160 2b8b1f255e0ca05fc8beb78a6cd7e87d020e0f0e SHA1 e0ab433b58bb7c37e904ebe52e264a8396b6da48 SHA256 d2206ee6f60f7fd28720a4da2cd7a5bd7d09ac810264ddd7c628512afeeb5256
+EBUILD zoneminder-1.25.0.ebuild 3740 RMD160 a34e4113557c71714058c9f009bf10f8591cd55e SHA1 ecfbdcdf73cafdc3682d5dfc736ccbd73fc032d4 SHA256 46be64af8217eb5c2dc1f0ba0d18bf66646cb06ec33efdfc45b7ba220ece2f7d
+MISC ChangeLog 8189 RMD160 70acc9696ca523a464eda66c47d691b9be49f736 SHA1 4665360b519a4a6ec5172665cd765f222d511459 SHA256 f9fbbb1ab3ef931b40bb986e88ce665fce5f778ce7a0f5ae5071d8b8151bcc15
 MISC metadata.xml 262 RMD160 24e1a7cfcbca1e2f41e8c062c448d9150f6320b8 SHA1 951224aa9eb92e898209936836a18e844ae1f169 SHA256 7e8dde52c550f9cfc6d74b78c19f6900a8cc241f2bf136610a4fc3b0aa95f3f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOdGBxAAoJEEb+UGWnxTyHlxIP/ivYJkxhYyD+QNwqhUotIEBN
-mr+UL0T2Kz3Iltv4qNsx7M35yhtLVkdXEzbPSyQZjRLakwapoEv1lyEIzZkdC4OQ
-c7LS2xQytVsUFKbhtavDG7bGRX/Cnu049YG41ca2FZTHqKA/7bkmBgDXd7Q5ZMzT
-THoxNPGp16M/g8LR8QrDWSWMb1zEhRCgMS9PltURGwZCcivaTHcq+74QnFAbIxsp
-BdrN00JwBMAIEYK5FY8SSQLezqWYf1ejtT9z303pOsN3vrkAn+HP+TsotNlNHv/t
-fcmpittHBEe+j6w2/EJSUCFOXR1533gp87fzqKjKVOObJatuk9Zur0ciS9DXbwwd
-xuCN40wHVZv4Q8tC+O2O/S2auH2Nid+td6QdYvW734f5B/RTN028/AI1nYO5gMac
-Z43VTzZ/ZocAZBdDus8KQ//mu9ekkooyNBrRHzA6aZHMMW57zpzf7JLTsn/pMKpn
-baWsgpvqewR/tjF+nh23g2jK2X8HDlMYJUw4k8Bd5t0fkvfoayvu2ii88ZaG7AiE
-TTFiWHJ5A7PRTfNQ5H3WkbOx4quyjOg0oeYOBlvnWtld8zGkJ2aeFpi/QkFBn57u
-eu/ATB6A3Rr7doN6WWpuXDP0a4dhiyx8mRn0Z/yaIISkaBWP3VX6VHq6E+gc8I20
-CIK7tWsa5XKMjAiQiiUr
-=tH9X
+iQIcBAEBCgAGBQJOdPWTAAoJEEb+UGWnxTyHnzcQAKOpkfeROBEP3O2iZ5M80E4P
+mPCbjXK10N8qNC4SgC2q63T7E8KJYL1r0s9hgwuTo65ChSUJ9zrK3wU0wicsyInh
+UML/MBKtn60XwGrzxoQiZfZ27Xdo9fwRGdyaCVBYJZ6nzRAicNBD5DwsaneLg1yL
+tYrG0xit54ZR1BIXyRNSXMEQDj6uTj4Y5uTI4mQQRv43T2zzTr5qUSF4luIepiwm
+8s4sstN0Pu23V3cBKpIzhUn7TemM6wuIRKtF7AMUkH0Sq9BsSbyLDpefLWdA2/xj
+FWwPoUx2ildWRIj8PBI2Pp6khaYL0j05vLBjV+P+tm1caVdbCCDpWFXEvcWGCqcB
+z8Mvs+HRBtGVEFfD3Dih1iWb8SWG8owEz3z77QZowahtNnyAGt/Nmg3UnLwZoCKN
+oAIMiMy5sfe97h4GwjKel9KLHsjuk2Smo/E9Gg28AZ6MAytNIaa6ZLOZ14TaucRV
+wWSmgkRxU1fD/rjuqzbMkRxkNYTY0qmYHVgTsFuj6z59enWFh8eiuSmqFgb9wLP/
+NRx9VLles6FnQXdVkFcLLD66qqiMjCqsTmvEgnrgvW0ir7/aFZuaKSM8Tx1JNXzu
+DLy2UYlXHB5tSUXNnaByCD+Hy2Yl7bINP3lFZWW2RJMrWyS6/LjfMTWPxAzCQhCw
+2USPrtscGHOQtRRnlhSz
+=KHzS
 -----END PGP SIGNATURE-----

diff --git a/www-misc/zoneminder/zoneminder-1.25.0.ebuild b/www-misc/zoneminder/zoneminder-1.25.0.ebuild
index d9c056a..ff23382 100644
--- a/www-misc/zoneminder/zoneminder-1.25.0.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.25.0.ebuild
@@ -20,8 +20,8 @@ SLOT="0"
 DEPEND="app-admin/sudo
 	dev-libs/libpcre
 	virtual/jpeg
-	>=media-video/ffmpeg-0.8
-	net-libs/gnutls
+	>=media-video/ffmpeg-0.7
+	dev-libs/openssl
 	>=dev-lang/perl-5.6.0
 	virtual/perl-Archive-Tar
 	dev-perl/Archive-Zip
@@ -83,7 +83,7 @@ src_configure() {
 		myconf="${myconf} --enable-debug=no --enable-crashtrace=no"
 	fi
 
-	econf   --with-libarch=$(get_libdir) \
+	ZM_SSL_LIB=openssl econf --with-libarch=$(get_libdir) \
 		--with-mysql=/usr \
 		$(use_with ffmpeg) \
 		--with-webdir="${ROOT}var/www/zoneminder/htdocs" \



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/
@ 2011-09-18  9:01 Andreas Hüttel
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Hüttel @ 2011-09-18  9:01 UTC (permalink / raw
  To: gentoo-commits

commit:     946d116374e32e49d31aa95bd30bf9db9d9cfe06
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 09:01:40 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 09:01:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=946d1163

Cleanups

(Portage version: 2.1.10.17/git/Linux x86_64, signed Manifest commit with key 7887F787)

---
 www-misc/zoneminder/ChangeLog                |    4 +++
 www-misc/zoneminder/Manifest                 |   30 +++++++++++++-------------
 www-misc/zoneminder/zoneminder-1.25.0.ebuild |   26 ++++++++++++----------
 3 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/www-misc/zoneminder/ChangeLog b/www-misc/zoneminder/ChangeLog
index 5c754bb..5843028 100644
--- a/www-misc/zoneminder/ChangeLog
+++ b/www-misc/zoneminder/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/Attic/ChangeLog,v 1.41 2011/04/04 12:11:35 scarabeus Exp $
 
+  18 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  zoneminder-1.25.0.ebuild:
+  Cleanups
+
   17 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   +files/1.25.0/Makefile.am.2.patch, files/1.25.0/Makefile.am.patch,
   zoneminder-1.25.0.ebuild:

diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index 90d5d94..d6c6edc 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -13,23 +13,23 @@ AUX 10_zoneminder.conf 462 RMD160 d032813c63f4676e06658da3668c50f88886efab SHA1
 AUX conf.d 138 RMD160 e7c71690bac83c1bee63c6b602b15910d3a8967c SHA1 719a2cb400a0a107accb28be3bd17f6269d41f76 SHA256 65e935cb63bf3d072b9317842944d808550ef3f933d834bb95aaacf3253bd85c
 AUX init.d 398 RMD160 d124ef1c1e6f5b0a9e4535d96620e46de71457c4 SHA1 5afc09eb838d9ebb28e9e91ffa0f482830862396 SHA256 b5dd459ddd0a331f625b5fa0b9441b9236f676ad2e6f6ea2da896ed4056cb0c6
 DIST ZoneMinder-1.25.0.tar.gz 1119091 RMD160 32a4f503770103e55bfe592864c1cab82e7395a6 SHA1 a93a976a5cd82f1e197f4d7bd626d3f0387c4231 SHA256 ec63ef47d8f4cb8af21a3bc84ff1de6968805146682dd7f10982bde975d9bb5d
-EBUILD zoneminder-1.25.0.ebuild 3782 RMD160 946a6519eb58ab827bc7a4a6b64a7e420822624c SHA1 06fb3487002b0846bc194b5d90dbef5e4b250838 SHA256 904b0d5c9f7cac6b52b4052ed0d199869795cfc21ed00dee618f3ab8d7fe8999
-MISC ChangeLog 8381 RMD160 571a60fba206623f4fe400388ae9468e5eb39f78 SHA1 cfe6c2272ec5ac149cca92ce3646fafc092f5eb2 SHA256 71878be30cbb65303516b368dcbfbad0f77e04b0482b3fc96b7a37e81927aca6
+EBUILD zoneminder-1.25.0.ebuild 3772 RMD160 6bdc04574faa36b3372d3c68035f7c288ed055e2 SHA1 1abae8a63557070bba1ae49c26858d4b1c155974 SHA256 a640995c0307c6496c27ba74e45fe6acc767e7b6bd168415740f8fd4f0372eb6
+MISC ChangeLog 8478 RMD160 d479defb002aa7e36a645c0466741090282f8fc7 SHA1 8eeef884ade80e1af44b8b2a560c71546beebec3 SHA256 5cb3ffcf9cd2aef441b17a0311f12aae16d82eb1e8726a6ab44918c980ea8905
 MISC metadata.xml 262 RMD160 24e1a7cfcbca1e2f41e8c062c448d9150f6320b8 SHA1 951224aa9eb92e898209936836a18e844ae1f169 SHA256 7e8dde52c550f9cfc6d74b78c19f6900a8cc241f2bf136610a4fc3b0aa95f3f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOdR+aAAoJEEb+UGWnxTyH6GgQALjUwrGzu8BIh4vqIwsla4rn
-ZEA4EWejTgXYrC36N04Wm27/2goG7pQIfCR6PSjpKHIBT0qmd/0aripz3vYKD73z
-Ra8Qj+OJIWxrbzt9LXEqOqqH7/74PKcXXGuY9ykE4k5/OItAK5ZWiMVLKdE5e1JI
-6CTrTUc8NQVmi01n9MM48mX706EzpjeLrqTju6qW2ERBLKGYVc3jJPRR/qb7LHHY
-fr0r82clLkfushcMj3NrXs0z+RtzGSpsMdiTAiTpVysuIbLfxMr4LGdNDHz2KBs5
-6AfYzvYNyQv0C/LQHvaVc3tSRpUw5xheSm6deFuSQqmoR8xv9F5xAIsBl/tayIQ2
-NqheUO7EsAXFEGVMN03J1lxTdJhfdBNxsD0XgnUh0erYbO+ZIk2VcZtTO3c63aUd
-LQbn4EFZQ+5KeefuE/llsp5iKasGt86qZxbU4t38VSQPOu9KDUVxkfJ++AeHuFDG
-AOMskhLnHj6lhzWwInjShRS6gn19z65iyKIP80tXRtvyTKIU7Fg3asWSeglOBE5F
-jmGc0EL8g9fyKjPeXoaJTJInaDyr4OF75rwHfLU4j9Y2s+RV0fc34timo/LvvlkO
-s2DWoHYPieBjXqJygUrb26CQsUGFjCaLn0/RT5q1x+jGG0Y9aNwnSX2v8MkVv8b0
-AiCHqER4M2JJDFtceNfv
-=555t
+iQIcBAEBCgAGBQJOdbN0AAoJEEb+UGWnxTyHIVkQAI7YT8JE/IVNE6yiMf9G82uT
+pr8giBstDMcUJtsMRhdvi7QbGnncRi46YF1UcwHC5fYWMoeNLOcBFKfVAz4GGAdV
+Hcaju+Vm6z69Vl5NVNn7VJw0iC5yb3mimV7fvEFy9yYDdwRsNRdmk/Uv/gC+rAWC
+6ACYmJmUQKh1OoG1UOpQkyoyTApchLirbGbetfJtH/qJ20iPN8V8tueFHLdxl+Pj
+HHEDcg3p4wVmtp7olktoWe5evTZKwY0Vpd4qi8ZqWZ5NuEL5gNjvZ+ghG4DVcyo7
+ravdMx4YHEvcHZF8fzqo8gBATaA3/eC1JZFWa8IWJzaYx3BAjFI/Xz+7RiDXyDLw
+uj94eJCK4SUTbG+0kdyLySrH9rqM8CQWUp0IVM9bHcNRqBq3rjS9Sjm5Bywcvwii
+4Mv1Zg5pwq9SLW0YMpDeM8vFaglRgFprUwrVV84zQho90Dwlnj4/cI+vZTLt1q0J
+MnKLQZ9HZcG05lTOt8ITsPfIkXvatRSDi/ccD3JWt2/KIPSH2FHffDESHUJ6+i/b
+EMyqhX+vWKhcInbxgvO3BTqtiq0BdkkcXH2M2/2rC3iUmoxxBpb7msej1ilED0ul
+4jcskIgdI6/Td+dAVFyC+1g/DrYTC49XbV3D01PQkunptBqPV4RbobnpEJGilJNr
+ckJvQyzb38El9mJV7XIy
+=iXFp
 -----END PGP SIGNATURE-----

diff --git a/www-misc/zoneminder/zoneminder-1.25.0.ebuild b/www-misc/zoneminder/zoneminder-1.25.0.ebuild
index 646197b..9f855ba 100644
--- a/www-misc/zoneminder/zoneminder-1.25.0.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.25.0.ebuild
@@ -17,13 +17,11 @@ KEYWORDS=""
 IUSE="debug ffmpeg mmap"
 SLOT="0"
 
-DEPEND="app-admin/sudo
+DEPEND="
+	app-admin/sudo
+	dev-lang/perl
 	dev-libs/libpcre
-	virtual/jpeg
-	>=media-video/ffmpeg-0.7
 	dev-libs/openssl
-	>=dev-lang/perl-5.6.0
-	virtual/perl-Archive-Tar
 	dev-perl/Archive-Zip
 	dev-perl/DateManip
 	dev-perl/DBD-mysql
@@ -33,6 +31,9 @@ DEPEND="app-admin/sudo
 	dev-perl/MIME-Lite
 	dev-perl/MIME-tools
 	dev-perl/PHP-Serialization
+	media-video/ffmpeg
+	virtual/jpeg
+	virtual/perl-Archive-Tar
 	virtual/perl-Getopt-Long
 	virtual/perl-libnet
 	virtual/perl-Module-Load
@@ -41,9 +42,12 @@ DEPEND="app-admin/sudo
 	mmap? ( dev-perl/Sys-Mmap )
 "
 
-RDEPEND="dev-perl/DBD-mysql
+RDEPEND="
+	dev-perl/DBD-mysql
 	ffmpeg? ( virtual/ffmpeg )
-	media-libs/netpbm"
+	media-libs/netpbm
+"
+# ^ huh? not include DEPEND???
 
 # we cannot use need_httpd_cgi here, since we need to setup permissions for the
 # webserver in global scope (/etc/zm.conf etc), so we hardcode apache here.
@@ -101,12 +105,13 @@ src_compile() {
 
 src_install() {
 	keepdir /var/run/zm
+	keepdir /var/log/zm
+
 	emake -j1 DESTDIR="${D}" install
 
 	fperms 0640 /etc/zm.conf
 
-	keepdir /var/log/${PN}
-	fowners apache:apache /var/log/${PN}
+	fowners apache:apache /var/log/zm
 	fowners apache:apache /var/run/zm
 
 	newinitd "${FILESDIR}"/init.d zoneminder
@@ -137,14 +142,11 @@ pkg_postinst() {
 	elog "1.  Set your database settings in /etc/zm.conf"
 	elog ""
 	elog "2.  Start the ${PN} daemon:"
-	elog ""
 	elog "  /etc/init.d/${PN} start"
 	elog ""
 	elog "3. Finally point your browser to http://localhost/${PN}"
 	elog ""
-	elog ""
 	elog "If you are upgrading, you will need to run the zmupdate.pl script:"
-	elog ""
 	elog " /usr/bin/zmupdate.pl version=<from version> [--user=<my_database_user> --pass=<my_database_pass>]"
 	elog ""
 }



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/
@ 2011-09-18 15:38 Andreas Hüttel
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Hüttel @ 2011-09-18 15:38 UTC (permalink / raw
  To: gentoo-commits

commit:     92fc1cb5d82e04d4596772cc5d585a319e337420
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 15:38:46 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 15:38:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=92fc1cb5

Added todos

(Portage version: 2.1.10.18/git/Linux x86_64, signed Manifest commit with key 7887F787)

---
 www-misc/zoneminder/ChangeLog |    3 +++
 www-misc/zoneminder/Manifest  |   29 +++++++++++++++--------------
 www-misc/zoneminder/todo.txt  |   15 +++++++++++++++
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/www-misc/zoneminder/ChangeLog b/www-misc/zoneminder/ChangeLog
index 5843028..4d4b2bc 100644
--- a/www-misc/zoneminder/ChangeLog
+++ b/www-misc/zoneminder/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/Attic/ChangeLog,v 1.41 2011/04/04 12:11:35 scarabeus Exp $
 
+  18 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> +todo.txt:
+  Added todos
+
   18 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   zoneminder-1.25.0.ebuild:
   Cleanups

diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index d6c6edc..04219f0 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -14,22 +14,23 @@ AUX conf.d 138 RMD160 e7c71690bac83c1bee63c6b602b15910d3a8967c SHA1 719a2cb400a0
 AUX init.d 398 RMD160 d124ef1c1e6f5b0a9e4535d96620e46de71457c4 SHA1 5afc09eb838d9ebb28e9e91ffa0f482830862396 SHA256 b5dd459ddd0a331f625b5fa0b9441b9236f676ad2e6f6ea2da896ed4056cb0c6
 DIST ZoneMinder-1.25.0.tar.gz 1119091 RMD160 32a4f503770103e55bfe592864c1cab82e7395a6 SHA1 a93a976a5cd82f1e197f4d7bd626d3f0387c4231 SHA256 ec63ef47d8f4cb8af21a3bc84ff1de6968805146682dd7f10982bde975d9bb5d
 EBUILD zoneminder-1.25.0.ebuild 3772 RMD160 6bdc04574faa36b3372d3c68035f7c288ed055e2 SHA1 1abae8a63557070bba1ae49c26858d4b1c155974 SHA256 a640995c0307c6496c27ba74e45fe6acc767e7b6bd168415740f8fd4f0372eb6
-MISC ChangeLog 8478 RMD160 d479defb002aa7e36a645c0466741090282f8fc7 SHA1 8eeef884ade80e1af44b8b2a560c71546beebec3 SHA256 5cb3ffcf9cd2aef441b17a0311f12aae16d82eb1e8726a6ab44918c980ea8905
+MISC ChangeLog 8561 RMD160 7a35939cd3d4c158ddd4c47a09bc3666a7479003 SHA1 ab367b62a118d5cc4771ebe4071dcf0536fbd02c SHA256 d364b2a2ebb99570016b56c36a52d314f239f4ec433ce9cc2244bed0caa812a6
 MISC metadata.xml 262 RMD160 24e1a7cfcbca1e2f41e8c062c448d9150f6320b8 SHA1 951224aa9eb92e898209936836a18e844ae1f169 SHA256 7e8dde52c550f9cfc6d74b78c19f6900a8cc241f2bf136610a4fc3b0aa95f3f5
+MISC todo.txt 598 RMD160 4b33ec5906a9407b0a2a79d10a7f8ca3113ca7a5 SHA1 191031cc1481ca6f0811f395caf60a0456e73960 SHA256 f3038a663f14d78e7b6ddf2098ac4b6ed2b4070409d94365af5526014c04d8d4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOdbN0AAoJEEb+UGWnxTyHIVkQAI7YT8JE/IVNE6yiMf9G82uT
-pr8giBstDMcUJtsMRhdvi7QbGnncRi46YF1UcwHC5fYWMoeNLOcBFKfVAz4GGAdV
-Hcaju+Vm6z69Vl5NVNn7VJw0iC5yb3mimV7fvEFy9yYDdwRsNRdmk/Uv/gC+rAWC
-6ACYmJmUQKh1OoG1UOpQkyoyTApchLirbGbetfJtH/qJ20iPN8V8tueFHLdxl+Pj
-HHEDcg3p4wVmtp7olktoWe5evTZKwY0Vpd4qi8ZqWZ5NuEL5gNjvZ+ghG4DVcyo7
-ravdMx4YHEvcHZF8fzqo8gBATaA3/eC1JZFWa8IWJzaYx3BAjFI/Xz+7RiDXyDLw
-uj94eJCK4SUTbG+0kdyLySrH9rqM8CQWUp0IVM9bHcNRqBq3rjS9Sjm5Bywcvwii
-4Mv1Zg5pwq9SLW0YMpDeM8vFaglRgFprUwrVV84zQho90Dwlnj4/cI+vZTLt1q0J
-MnKLQZ9HZcG05lTOt8ITsPfIkXvatRSDi/ccD3JWt2/KIPSH2FHffDESHUJ6+i/b
-EMyqhX+vWKhcInbxgvO3BTqtiq0BdkkcXH2M2/2rC3iUmoxxBpb7msej1ilED0ul
-4jcskIgdI6/Td+dAVFyC+1g/DrYTC49XbV3D01PQkunptBqPV4RbobnpEJGilJNr
-ckJvQyzb38El9mJV7XIy
-=iXFp
+iQIcBAEBCgAGBQJOdhCGAAoJEEb+UGWnxTyHCPQP/099fL17O9MS6CUH/mMFT4Q7
+0GMQDnE8zuVy6O3eIQR3C3NExxboMqCC7v7MIt/lErn66veX38AGoJELYc3KqYJH
+Gyhi/lED2Qs6SuT4ZuK9jDjLFw5y5toxeIvVWgsqlbnfhWF3+v4Xq+vgCdIePYkI
+XTNqzCDz8EhM9pjBpsVrD7LKnITRMXRB8vyQgbCNro0OniY9abXq6f0fUhvwe4ZA
+FNzaj9bXfv0QasCBrw4ovivMFGSN02E8nzO/APLki4+tlrJr3aeCZPMAl1XYSlDt
+lggnz0zUrUh5emQvIfqOZZl72k1eqeZBnPA4oAkPftuuTr9iknuFxQcKnn+S+sO5
+NEEQm/2m26i4ZLtpbnFs1e0UpFhloMZg5edpIlcEBt78aH0O3HixQcraTablMDaU
+/pKhwf0pnPEP3K80nJDq6X4Qp21I3eil7YOtKUhh9mC/nhX5aGGj5zCef0sAihOi
+CInWeP9bhAvfVWJyvItomRrNOckeBX1NZsUDCRjBT7BDdHhwRa6gdwTjlkxkkSZy
+VRgGfX6tDBe/+j2pmS1W0l30iVL6f0TMad7kxtZRjuYmf+Ixn0jgS4rBjuxWkfJP
+TkF4PLIQzAEbw/lAZe+opcuP4zzGGBZz5jjHLY6AJ7fQjQfGbHLy7Sj7HxST4sRU
+bdyKYDA2Nteex4r/pwhk
+=hVU/
 -----END PGP SIGNATURE-----

diff --git a/www-misc/zoneminder/todo.txt b/www-misc/zoneminder/todo.txt
new file mode 100644
index 0000000..0723897
--- /dev/null
+++ b/www-misc/zoneminder/todo.txt
@@ -0,0 +1,15 @@
+
+* permissions on /tmp/zm, or use alternate directory
+
+* enable php in webserver
+
+* enable short_open_tags in php.ini
+
+* set timezone in php.ini
+Warning: date() [function.date]: It is not safe to rely on the system's timezone 
+settings. You are *required* to use the date.timezone setting or the 
+date_default_timezone_set() function. In case you used any of those methods and 
+you are still getting this warning, you most likely misspelled the timezone 
+identifier. We selected 'Europe/Berlin' for 'CEST/2.0/DST' instead in
+ /var/www/zoneminder/htdocs/skins/classic/views/console.php on line 186
+



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/
@ 2011-09-18 20:35 Andreas Hüttel
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Hüttel @ 2011-09-18 20:35 UTC (permalink / raw
  To: gentoo-commits

commit:     d2ce3d0f5d3c8f8c6f493b9680c2bad88eaf1c6c
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Sep 18 20:35:37 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 20:35:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=d2ce3d0f

Improve postinstall message, bug 347890

(Portage version: 2.1.10.18/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 www-misc/zoneminder/ChangeLog                |    4 +++
 www-misc/zoneminder/Manifest                 |   32 +++++++++++++-------------
 www-misc/zoneminder/todo.txt                 |   13 ----------
 www-misc/zoneminder/zoneminder-1.25.0.ebuild |    8 ++++--
 4 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/www-misc/zoneminder/ChangeLog b/www-misc/zoneminder/ChangeLog
index 4d4b2bc..2bebb14 100644
--- a/www-misc/zoneminder/ChangeLog
+++ b/www-misc/zoneminder/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/Attic/ChangeLog,v 1.41 2011/04/04 12:11:35 scarabeus Exp $
 
+  18 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  zoneminder-1.25.0.ebuild, todo.txt:
+  Improve postinstall message, bug 347890
+
   18 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> +todo.txt:
   Added todos
 

diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index 04219f0..444f220 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -13,24 +13,24 @@ AUX 10_zoneminder.conf 462 RMD160 d032813c63f4676e06658da3668c50f88886efab SHA1
 AUX conf.d 138 RMD160 e7c71690bac83c1bee63c6b602b15910d3a8967c SHA1 719a2cb400a0a107accb28be3bd17f6269d41f76 SHA256 65e935cb63bf3d072b9317842944d808550ef3f933d834bb95aaacf3253bd85c
 AUX init.d 398 RMD160 d124ef1c1e6f5b0a9e4535d96620e46de71457c4 SHA1 5afc09eb838d9ebb28e9e91ffa0f482830862396 SHA256 b5dd459ddd0a331f625b5fa0b9441b9236f676ad2e6f6ea2da896ed4056cb0c6
 DIST ZoneMinder-1.25.0.tar.gz 1119091 RMD160 32a4f503770103e55bfe592864c1cab82e7395a6 SHA1 a93a976a5cd82f1e197f4d7bd626d3f0387c4231 SHA256 ec63ef47d8f4cb8af21a3bc84ff1de6968805146682dd7f10982bde975d9bb5d
-EBUILD zoneminder-1.25.0.ebuild 3772 RMD160 6bdc04574faa36b3372d3c68035f7c288ed055e2 SHA1 1abae8a63557070bba1ae49c26858d4b1c155974 SHA256 a640995c0307c6496c27ba74e45fe6acc767e7b6bd168415740f8fd4f0372eb6
-MISC ChangeLog 8561 RMD160 7a35939cd3d4c158ddd4c47a09bc3666a7479003 SHA1 ab367b62a118d5cc4771ebe4071dcf0536fbd02c SHA256 d364b2a2ebb99570016b56c36a52d314f239f4ec433ce9cc2244bed0caa812a6
+EBUILD zoneminder-1.25.0.ebuild 3938 RMD160 48e3438dc3957f515d2b3eee122e4cb7d1187f87 SHA1 470f3326d44d3d882a4bafa3829d9c6b916a9655 SHA256 5af20660770319dfbd5ff3dc75319b34e8ab67932d33424a00937f81e0537e99
+MISC ChangeLog 8699 RMD160 724d8c4577b846e3f00ac12f87954d1ba9b8e486 SHA1 081045739edb85cdd41360c2dd70f21580288aa0 SHA256 940765521bc7f47cee23b82f4c2d4dee79789aabfb56e3b572189873ad0d44df
 MISC metadata.xml 262 RMD160 24e1a7cfcbca1e2f41e8c062c448d9150f6320b8 SHA1 951224aa9eb92e898209936836a18e844ae1f169 SHA256 7e8dde52c550f9cfc6d74b78c19f6900a8cc241f2bf136610a4fc3b0aa95f3f5
-MISC todo.txt 598 RMD160 4b33ec5906a9407b0a2a79d10a7f8ca3113ca7a5 SHA1 191031cc1481ca6f0811f395caf60a0456e73960 SHA256 f3038a663f14d78e7b6ddf2098ac4b6ed2b4070409d94365af5526014c04d8d4
+MISC todo.txt 54 RMD160 299f967aceee631738eb7f98065cc6b9800d8a4e SHA1 decfd0d06576f2f7960c31ae9fd44266f15e520f SHA256 c0d390b686d5e36c490c54f9eda41edc9328311b3b41eaaa29091ea48dd0cae5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOdhCGAAoJEEb+UGWnxTyHCPQP/099fL17O9MS6CUH/mMFT4Q7
-0GMQDnE8zuVy6O3eIQR3C3NExxboMqCC7v7MIt/lErn66veX38AGoJELYc3KqYJH
-Gyhi/lED2Qs6SuT4ZuK9jDjLFw5y5toxeIvVWgsqlbnfhWF3+v4Xq+vgCdIePYkI
-XTNqzCDz8EhM9pjBpsVrD7LKnITRMXRB8vyQgbCNro0OniY9abXq6f0fUhvwe4ZA
-FNzaj9bXfv0QasCBrw4ovivMFGSN02E8nzO/APLki4+tlrJr3aeCZPMAl1XYSlDt
-lggnz0zUrUh5emQvIfqOZZl72k1eqeZBnPA4oAkPftuuTr9iknuFxQcKnn+S+sO5
-NEEQm/2m26i4ZLtpbnFs1e0UpFhloMZg5edpIlcEBt78aH0O3HixQcraTablMDaU
-/pKhwf0pnPEP3K80nJDq6X4Qp21I3eil7YOtKUhh9mC/nhX5aGGj5zCef0sAihOi
-CInWeP9bhAvfVWJyvItomRrNOckeBX1NZsUDCRjBT7BDdHhwRa6gdwTjlkxkkSZy
-VRgGfX6tDBe/+j2pmS1W0l30iVL6f0TMad7kxtZRjuYmf+Ixn0jgS4rBjuxWkfJP
-TkF4PLIQzAEbw/lAZe+opcuP4zzGGBZz5jjHLY6AJ7fQjQfGbHLy7Sj7HxST4sRU
-bdyKYDA2Nteex4r/pwhk
-=hVU/
+iQIcBAEBCgAGBQJOdlYZAAoJENwGBM22xffeurQP/2rmLNUhU5dzgsvVooX1beNY
+sU+oN33IXeGFWMmi7SfFUdyqfVIPDJHYSgyoFAAm6RGKqPj7p216fXOlNlZimkcJ
+azz0NKtHZGlLYJ5nVkgHkJAEpG+Z9qmNzgdoZn7B5o/zOesM7uIjwq1R+1frBrfz
+jWD9WWYGlT09VcKCSepgjBUHsgZCaRDgRKyRU6SRAYg3blY6Q8D0z6too+0Kdofu
+/mpjBCo9yUMRN7zYHhA3UDaIipbichoWXnSppAk0cyqjBaNoFpcFTjb1vFzD+mFT
+iD4vJ5kB9bYxXG9XJL7YV5pz+ACrSmWB4rig0mzW6QzbHDMoGLdqtuGeGhl9bu2c
+lU/c7zIQecQHstbTQunxQ+xeCxNnf883DA/AKVi9vs6Qa/7L2iYB1tYRM/6ZJHjZ
+Fm++bFdhcBysSOZ+BZLvpIdHRNjBAxyKX0FKHvvwq6ygS9qP/lSQfjJSP6r/c4jT
+gTkz8N1FeSDufUsn0ylC9oNEi3I9wGHgDFz2Mx+HJ+x6Gu4G8Ox9dhp70VoY+0eo
+QC+11U+k65yc4gluT4t9cQFGRkuSePDiYWCjsE68Pj3VlWSHxBDdttd4sd+jiRI6
+BawSCt0IIV0dGN0fVw44CrwjINO1TIzlRsY9qBwK1wH/raih6GwZIn+MEVCtknrf
+NtDmV36nHrdBnHCKsSQD
+=AvU6
 -----END PGP SIGNATURE-----

diff --git a/www-misc/zoneminder/todo.txt b/www-misc/zoneminder/todo.txt
index 0723897..ed0e8cf 100644
--- a/www-misc/zoneminder/todo.txt
+++ b/www-misc/zoneminder/todo.txt
@@ -1,15 +1,2 @@
 
 * permissions on /tmp/zm, or use alternate directory
-
-* enable php in webserver
-
-* enable short_open_tags in php.ini
-
-* set timezone in php.ini
-Warning: date() [function.date]: It is not safe to rely on the system's timezone 
-settings. You are *required* to use the date.timezone setting or the 
-date_default_timezone_set() function. In case you used any of those methods and 
-you are still getting this warning, you most likely misspelled the timezone 
-identifier. We selected 'Europe/Berlin' for 'CEST/2.0/DST' instead in
- /var/www/zoneminder/htdocs/skins/classic/views/console.php on line 186
-

diff --git a/www-misc/zoneminder/zoneminder-1.25.0.ebuild b/www-misc/zoneminder/zoneminder-1.25.0.ebuild
index 9f855ba..f91dd90 100644
--- a/www-misc/zoneminder/zoneminder-1.25.0.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.25.0.ebuild
@@ -135,16 +135,18 @@ pkg_postinst() {
 	elog "0. If this is a new installation, you will need to create a MySQL database"
 	elog "   for ${PN} to use. (see http://www.gentoo.org/doc/en/mysql-howto.xml)."
 	elog "   Once you completed that you should execute the following:"
-	elog ""
 	elog " cd /usr/share/${PN}"
 	elog " mysql -u <my_database_user> -p<my_database_pass> <my_zoneminder_db> < db/zm_create.sql"
 	elog ""
 	elog "1.  Set your database settings in /etc/zm.conf"
 	elog ""
-	elog "2.  Start the ${PN} daemon:"
+	elog "2.  Enable PHP in your webserver configuration, enable short_open_tags in php.ini,"
+	elog "    set the time zone in php.ini, and restart/reload the webserver"
+	elog ""
+	elog "3.  Start the ${PN} daemon:"
 	elog "  /etc/init.d/${PN} start"
 	elog ""
-	elog "3. Finally point your browser to http://localhost/${PN}"
+	elog "4. Finally point your browser to http://localhost/${PN}"
 	elog ""
 	elog "If you are upgrading, you will need to run the zmupdate.pl script:"
 	elog " /usr/bin/zmupdate.pl version=<from version> [--user=<my_database_user> --pass=<my_database_pass>]"



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/
@ 2013-12-24 17:46 Andreas Hüttel
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Hüttel @ 2013-12-24 17:46 UTC (permalink / raw
  To: gentoo-commits

commit:     7cb1ff4a1f8d01aa3c985d9ded460b925ffd3e8b
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 24 17:48:13 2013 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Dec 24 17:48:13 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=7cb1ff4a

[www-misc/zoneminder] more work in progress

---
 www-misc/zoneminder/todo.txt                 |  2 -
 www-misc/zoneminder/zoneminder-1.26.5.ebuild | 76 +++++++++++++---------------
 2 files changed, 35 insertions(+), 43 deletions(-)

diff --git a/www-misc/zoneminder/todo.txt b/www-misc/zoneminder/todo.txt
deleted file mode 100644
index ed0e8cf..0000000
--- a/www-misc/zoneminder/todo.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-
-* permissions on /tmp/zm, or use alternate directory

diff --git a/www-misc/zoneminder/zoneminder-1.26.5.ebuild b/www-misc/zoneminder/zoneminder-1.26.5.ebuild
index 80a9020..6679b40 100644
--- a/www-misc/zoneminder/zoneminder-1.26.5.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.26.5.ebuild
@@ -2,6 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+# TO DO:
+# permissions on /tmp/zm, or use alternate directory
+
 EAPI=5
 
 inherit eutils base cmake-utils depend.php depend.apache multilib flag-o-matic
@@ -14,41 +17,14 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 KEYWORDS=""
-IUSE="gcrypt gnutls x10 openssl pcre zlib debug ffmpeg mmap"
+IUSE="gcrypt gnutls +openssl debug ffmpeg mmap vlc"
 SLOT="0"
 
+REQUIRED_USE="
+	|| ( openssl gnutls )
+"
+
 DEPEND="
-	app-admin/sudo
-	dev-lang/perl
-	dev-libs/libpcre
-	dev-libs/openssl
-	dev-perl/Archive-Zip
-	dev-perl/DateManip
-	dev-perl/DBD-mysql
-	dev-perl/DBI
-	dev-perl/Device-SerialPort
-	dev-perl/libwww-perl
-	dev-perl/MIME-Lite
-	dev-perl/MIME-tools
-	dev-perl/PHP-Serialization
-	media-video/ffmpeg
-	virtual/jpeg
-	virtual/perl-Archive-Tar
-	virtual/perl-Getopt-Long
-	virtual/perl-libnet
-	virtual/perl-Module-Load
-	virtual/perl-Sys-Syslog
-	virtual/perl-Time-HiRes
-	mmap? ( dev-perl/Sys-Mmap )
-	zlib? ( sys-libs/zlib )
-	virtual/jpeg
-	openssl? ( dev-libs/openssl )
-	dev-lang/perl
-	pcre? ( dev-libs/libpcre )
-	virtual/mysql
-	gcrypt? ( dev-libs/libgcrypt )
-	gnutls? ( net-libs/gnutls )
-	ffmpeg? ( virtual/ffmpeg )
 	virtual/perl-Sys-Syslog
 	dev-perl/DBI
 	dev-perl/DBD-mysql
@@ -57,14 +33,31 @@ DEPEND="
 	dev-perl/DateManip
 	dev-perl/libwww-perl
 	virtual/perl-ExtUtils-MakeMaker
+	virtual/mysql
+	dev-lang/perl
+	dev-libs/libpcre
+	sys-libs/zlib
+	virtual/jpeg
+	gcrypt? ( dev-libs/libgcrypt )
+	gnutls? ( net-libs/gnutls )
+	openssl? ( dev-libs/openssl )
+	ffmpeg? ( virtual/ffmpeg )
 	mmap? ( dev-perl/Sys-Mmap )
+	vlc? ( media-video/vlc )
 "
 
-RDEPEND="
-	${DEPEND}
-	dev-perl/DBD-mysql
-	media-libs/netpbm
-"
+RDEPEND="${DEPEND}"
+
+# dependencies of unknown status:
+# 	app-admin/sudo
+# 	dev-perl/Archive-Zip
+# 	dev-perl/Device-SerialPort
+# 	dev-perl/MIME-Lite
+# 	dev-perl/MIME-tools
+# 	dev-perl/PHP-Serialization
+# 	virtual/perl-Archive-Tar
+# 	virtual/perl-libnet
+# 	virtual/perl-Module-Load
 
 # we cannot use need_httpd_cgi here, since we need to setup permissions for the
 # webserver in global scope (/etc/zm.conf etc), so we hardcode apache here.
@@ -72,7 +65,6 @@ need_apache
 need_php_httpd
 
 S=${WORKDIR}/${MY_PN}-${PV}
-CMAKE_IN_SOURCE_BUILD="ON"
 
 PATCHES=(
 	"${FILESDIR}"/1.24.2/db_upgrade_script_location.patch
@@ -86,13 +78,15 @@ src_configure() {
 	append-cxxflags -D__STDC_CONSTANT_MACROS
 
 	mycmakeargs=(
-		-DZM_WEBDIR=/var/www/zoneminder/htdocs
-		-DZM_CGIDIR=/var/www/zoneminder/cgi-bin
+		-DZM_WEBDIR=/var/www/zm/htdocs
+		-DZM_CGIDIR=/var/www/zm/cgi-bin
+		-DZM_CONTENTDIR=/var/lib/zm
 		-DZM_WEB_USER=apache
 		-DZM_WEB_GROUP=apache
 		$(cmake-utils_useno mmap ZM_NO_MMAP)
-		$(cmake-utils_useno x10 ZM_NO_X10)
+		-DZM_NO_X10=OFF
 		$(cmake-utils_useno ffmpeg ZM_NO_FFMPEG)
+		$(cmake-utils_useno vlc ZM_NO_VLC)
 	)
 
 	cmake-utils_src_configure


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/
@ 2013-12-25 14:23 Andreas Hüttel
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Hüttel @ 2013-12-25 14:23 UTC (permalink / raw
  To: gentoo-commits

commit:     44fb72b3d51b63a99be307c5c61471581f1a304f
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 25 14:25:15 2013 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Dec 25 14:25:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=44fb72b3

[www-misc/zoneminder] port to readme.gentoo, remove nonfunctional patch

---
 www-misc/zoneminder/metadata.xml             |  2 +-
 www-misc/zoneminder/zoneminder-1.26.5.ebuild | 61 ++++++++++++++--------------
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/www-misc/zoneminder/metadata.xml b/www-misc/zoneminder/metadata.xml
index bd96259..bd56d97 100644
--- a/www-misc/zoneminder/metadata.xml
+++ b/www-misc/zoneminder/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="gcrypt">...</flag>
-		<flag name="x10">...</flag>
+		<flag name="vlc">...</flag>
 		<flag name="openssl">...</flag>
 	</use>
 </pkgmetadata>

diff --git a/www-misc/zoneminder/zoneminder-1.26.5.ebuild b/www-misc/zoneminder/zoneminder-1.26.5.ebuild
index 6679b40..a6693fd 100644
--- a/www-misc/zoneminder/zoneminder-1.26.5.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.26.5.ebuild
@@ -7,7 +7,7 @@
 
 EAPI=5
 
-inherit eutils base cmake-utils depend.php depend.apache multilib flag-o-matic
+inherit readme.gentoo eutils base cmake-utils depend.php depend.apache multilib flag-o-matic
 
 MY_PN="ZoneMinder"
 
@@ -66,9 +66,8 @@ need_php_httpd
 
 S=${WORKDIR}/${MY_PN}-${PV}
 
-PATCHES=(
-	"${FILESDIR}"/1.24.2/db_upgrade_script_location.patch
-)
+#PATCHES=(
+#)
 
 pkg_setup() {
 	require_php_with_use mysql sockets apache2
@@ -106,36 +105,36 @@ src_install() {
 
 	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README.md TODO
 
-	insinto /usr/share/${PN}/db
-	doins db/zm_u* db/zm_create.sql
-
-	#insinto /etc/apache2/vhosts.d
-	#doins "${FILESDIR}"/10_zoneminder.conf
+	insinto /etc/apache2/vhosts.d
+	doins "${FILESDIR}"/10_zoneminder.conf
 
 	for DIR in events images sound; do
 	    dodir /var/www/zoneminder/htdocs/${DIR}
 	done
-}
 
-pkg_postinst() {
-	elog ""
-	elog "0. If this is a new installation, you will need to create a MySQL database"
-	elog "   for ${PN} to use. (see http://www.gentoo.org/doc/en/mysql-howto.xml)."
-	elog "   Once you completed that you should execute the following:"
-	elog " cd /usr/share/${PN}"
-	elog " mysql -u  -p  < db/zm_create.sql"
-	elog ""
-	elog "1.  Set your database settings in /etc/zm.conf"
-	elog ""
-	elog "2.  Enable PHP in your webserver configuration, enable short_open_tags in php.ini,"
-	elog "    set the time zone in php.ini, and restart/reload the webserver"
-	elog ""
-	elog "3.  Start the ${PN} daemon:"
-	elog "  /etc/init.d/${PN} start"
-	elog ""
-	elog "4. Finally point your browser to http://localhost/${PN}"
-	elog ""
-	elog "If you are upgrading, you will need to run the zmupdate.pl script:"
-	elog " /usr/bin/zmupdate.pl version= [--user= --pass=]"
-	elog ""
+	DOC_CONTENTS="
+0. If this is a new installation, you will need to create a MySQL\n
+   database for ${PN} to use\n
+   (see http://www.gentoo.org/doc/en/mysql-howto.xml).\n
+   Once you completed that you should execute the following:\n
+ cd /usr/share/${PN}\n
+ mysql -u  -p  < db/zm_create.sql\n
+\n
+1.  Set your database settings in /etc/zm.conf\n
+\n
+2.  Enable PHP in your webserver configuration, \n
+    enable short_open_tags in php.ini,\n
+    set the time zone in php.ini, \n
+    and restart/reload the webserver.\n
+\n
+3.  Start the ${PN} daemon:\n
+  /etc/init.d/${PN} start\n
+\n
+4. Finally point your browser to http://localhost/${PN}\n
+\n
+If you are upgrading, you will need to run the zmupdate.pl script:\n
+ /usr/bin/zmupdate.pl version= [--user= --pass=]\n
+"
+
+	readme.gentoo_src_install
 }


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/
@ 2014-04-24 20:29 Andreas Hüttel
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Hüttel @ 2014-04-24 20:29 UTC (permalink / raw
  To: gentoo-commits

commit:     529d9b2e8fdf2a751501e24cf81c30b55a552cb6
Author:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 24 20:28:36 2014 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Apr 24 20:28:36 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=529d9b2e

[www-misc/zoneminder] defaultify

Package-Manager: portage-2.2.8-r1

---
 www-misc/zoneminder/zoneminder-1.26.5.ebuild | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/www-misc/zoneminder/zoneminder-1.26.5.ebuild b/www-misc/zoneminder/zoneminder-1.26.5.ebuild
index aae3093..80c5052 100644
--- a/www-misc/zoneminder/zoneminder-1.26.5.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.26.5.ebuild
@@ -76,10 +76,9 @@ pkg_setup() {
 src_configure() {
 	append-cxxflags -D__STDC_CONSTANT_MACROS
 
+
+
 	mycmakeargs=(
-		-DZM_WEBDIR=/var/www/zm/htdocs
-		-DZM_CGIDIR=/var/www/zm/cgi-bin
-		-DZM_CONTENTDIR=/var/lib/zm
 		-DZM_TMPDIR=/var/tmp/zm
 		-DZM_WEB_USER=apache
 		-DZM_WEB_GROUP=apache
@@ -110,12 +109,12 @@ src_install() {
 
 	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README.md TODO
 
-	insinto /etc/apache2/vhosts.d
-	doins "${FILESDIR}"/10_zoneminder.conf
-
-	for DIR in events images sound; do
-	    dodir /var/www/zoneminder/htdocs/${DIR}
-	done
+#	insinto /etc/apache2/vhosts.d
+#	doins "${FILESDIR}"/10_zoneminder.conf
+#
+#	for DIR in events images sound; do
+#	    dodir /var/www/zoneminder/htdocs/${DIR}
+#	done
 
 	DOC_CONTENTS="
 1. If this is a new installation, you will need to create a MySQL\n


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/
@ 2014-04-24 21:13 Andreas Hüttel
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Hüttel @ 2014-04-24 21:13 UTC (permalink / raw
  To: gentoo-commits

commit:     813ce5615a831460d99cf841080ca498d752cce3
Author:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 24 21:13:18 2014 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Apr 24 21:13:18 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=813ce561

[www-misc/zoneminder] minor cleanups

Package-Manager: portage-2.2.8-r1

---
 www-misc/zoneminder/zoneminder-1.26.5.ebuild | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/www-misc/zoneminder/zoneminder-1.26.5.ebuild b/www-misc/zoneminder/zoneminder-1.26.5.ebuild
index 80c5052..7bd7ee3 100644
--- a/www-misc/zoneminder/zoneminder-1.26.5.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.26.5.ebuild
@@ -15,6 +15,9 @@
 # 	virtual/perl-Archive-Tar
 # 	virtual/perl-libnet
 # 	virtual/perl-Module-Load
+# * apache integration
+# * installation of files into real webdir
+# * the perl modules go into weird places atm
 
 EAPI=5
 
@@ -36,7 +39,7 @@ REQUIRED_USE="
 "
 
 DEPEND="
-	dev-lang/perl
+	dev-lang/perl:=
 	dev-libs/libpcre
 	dev-perl/DateManip
 	dev-perl/DBD-mysql
@@ -121,13 +124,13 @@ src_install() {
    database for ${PN} to use\n
    (see https://wiki.gentoo.org/wiki/MySQL/Startup_Guide).\n
    E.g., when logged into mysql as root,\n
-     mysql> CREATE DATABASE 'zm';\n
+     mysql> CREATE DATABASE \`zm\`;\n
      mysql> GRANT ALL ON zm.* TO 'zmuser'@'localhost' IDENTIFIED BY 'topsecretpassword';\n
    Once you completed that you should execute the following:\n
      cd /usr/share/${PN}\n
      mysql -u zmuser -p < db/zm_create.sql\n
 \n
-2.  Set your database settings in /etc/zm.conf\n
+2.  Set your database settings in /etc/zm.conf, including above topsecretpassword\n
 \n
 3. Check /etc/apache2/vhosts.d/10_zoneminder.conf\n
 \n


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/
@ 2014-04-25 13:04 Andreas Hüttel
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Hüttel @ 2014-04-25 13:04 UTC (permalink / raw
  To: gentoo-commits

commit:     8eb6346ac0dfd1a8dcde695002933cb09095b84c
Author:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 25 13:04:01 2014 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Apr 25 13:04:01 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=8eb6346a

[www-misc/zoneminder] version bump

Package-Manager: portage-2.2.8-r1

---
 www-misc/zoneminder/Manifest                 |   1 +
 www-misc/zoneminder/zoneminder-1.27.0.ebuild | 129 +++++++++++++++++++++++++++
 2 files changed, 130 insertions(+)

diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index bc92f30..adad46c 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -1 +1,2 @@
 DIST zoneminder-1.26.5.tar.gz 1107153 SHA256 a10acfea5066bd2fbcdcb40f2ddfa81a00f1eaf9123b6090aca69d3318281eec SHA512 0cd63d9271f8a8284597db41f52d8ba764bd3644c54be50a03c8b72695347104266ed14e1a399949d986af370a15885aceec833980f4cdc4f7b953ee74d44cce WHIRLPOOL b1510c873d7a9262276a08392ca5e598563183946db7e2acf270067e29b9241c4d1ae39ee63bd2998948b76448311af7adf8d0e51c546345f130a9f191e5aac3
+DIST zoneminder-1.27.0.tar.gz 1262653 SHA256 2f31c10e6c5930aedfa9f08edfa074ef1b168e5bdffb77a147d4e631bfb03ef2 SHA512 8a349558399381a9062365ddc8bd8f815e3800929914096b2e4ea63e4d6dd12054f7b849fab5bea4bcfc87ea60739479a55734c7075a74aab0622d35f1d2bb14 WHIRLPOOL 869811e289e11343ff0cd0bd078a477db3511ed3cc96574d71163e1ab9eaf703e26f7c526841164a41f8d1e1aae47eb7f198831999b0c39f2729199fe81f43c0

diff --git a/www-misc/zoneminder/zoneminder-1.27.0.ebuild b/www-misc/zoneminder/zoneminder-1.27.0.ebuild
new file mode 100644
index 0000000..64670f0
--- /dev/null
+++ b/www-misc/zoneminder/zoneminder-1.27.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# TO DO:
+# * ffmpeg support can be disabled in CMakeLists.txt but it does not build then 
+#		$(cmake-utils_useno ffmpeg ZM_NO_FFMPEG)
+# * dependencies of unknown status:
+# 	dev-perl/Archive-Zip
+# 	dev-perl/Device-SerialPort
+# 	dev-perl/MIME-Lite
+# 	dev-perl/MIME-tools
+# 	dev-perl/PHP-Serialization
+# 	virtual/perl-Archive-Tar
+# 	virtual/perl-libnet
+# 	virtual/perl-Module-Load
+
+EAPI=5
+
+PERL_EXPORT_PHASE_FUNCTIONS=no
+
+inherit perl-module readme.gentoo eutils base cmake-utils depend.php depend.apache multilib flag-o-matic
+
+MY_PN="ZoneMinder"
+
+DESCRIPTION="ZoneMinder allows you to capture, analyse, record and monitor any cameras attached to your system."
+HOMEPAGE="http://www.zoneminder.com/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS=""
+IUSE="gcrypt gnutls mmap +openssl vlc"
+SLOT="0"
+
+REQUIRED_USE="
+	|| ( openssl gnutls )
+"
+
+DEPEND="
+	dev-lang/perl:=
+	dev-libs/libpcre
+	dev-perl/DateManip
+	dev-perl/DBD-mysql
+	dev-perl/DBI
+	dev-perl/libwww-perl
+	sys-libs/zlib
+	virtual/ffmpeg
+	virtual/jpeg
+	virtual/mysql
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/perl-Getopt-Long
+	virtual/perl-Sys-Syslog
+	virtual/perl-Time-HiRes
+	gcrypt? ( dev-libs/libgcrypt )
+	gnutls? ( net-libs/gnutls )
+	mmap? ( dev-perl/Sys-Mmap )
+	openssl? ( dev-libs/openssl )
+	vlc? ( media-video/vlc )
+"
+RDEPEND="${DEPEND}"
+
+# we cannot use need_httpd_cgi here, since we need to setup permissions for the
+# webserver in global scope (/etc/zm.conf etc), so we hardcode apache here.
+need_apache
+need_php_httpd
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.26.5"-automagic.patch
+)
+
+MY_ZM_WEBDIR=/usr/share/zoneminder/www
+
+pkg_setup() {
+	require_php_with_use mysql sockets apache2
+}
+
+src_configure() {
+	append-cxxflags -D__STDC_CONSTANT_MACROS
+	perl_set_version
+
+	mycmakeargs=(
+		-DZM_PERL_SUBPREFIX=${VENDOR_LIB}
+		-DZM_TMPDIR=/var/tmp/zm
+		-DZM_WEB_USER=apache
+		-DZM_WEB_GROUP=apache
+		-DZM_WEBDIR=${MY_ZM_WEBDIR}
+		$(cmake-utils_useno mmap ZM_NO_MMAP)
+		-DZM_NO_X10=OFF
+		-DZM_NO_FFMPEG=OFF
+		$(cmake-utils_useno vlc ZM_NO_VLC)
+		$(cmake-utils_useno openssl CMAKE_DISABLE_FIND_PACKAGE_OpenSSL)
+		$(cmake-utils_use_has gnutls)
+		$(cmake-utils_use_has gcrypt)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# the log directory
+	keepdir /var/log/zm
+	fowners apache:apache /var/log/zm
+
+	# now we duplicate the work of zmlinkcontent.sh
+	dodir /var/lib/zoneminder /var/lib/zoneminder/images /var/lib/zoneminder/events
+	fperms -R 0775 /var/lib/zoneminder
+	fowners -R apache:apache /var/lib/zoneminder
+	dosym /var/lib/zoneminder/images ${MY_ZM_WEBDIR}/images
+	dosym /var/lib/zoneminder/events ${MY_ZM_WEBDIR}/events
+
+	# the configuration file
+	fperms 0640 /etc/zm.conf
+	fowners root:apache /etc/zm.conf
+
+	# init scripts etc
+	newinitd "${FILESDIR}"/init.d zoneminder
+	newconfd "${FILESDIR}"/conf.d zoneminder
+
+	cp "${FILESDIR}"/10_zoneminder.conf "${T}"/10_zoneminder.conf
+	sed -i "${T}"/10_zoneminder.conf -e "s:%ZM_WEBDIR%:${MY_ZM_WEBDIR}:g"
+
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README.md TODO "${T}"/10_zoneminder.conf
+
+	readme.gentoo_src_install
+}


^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2014-04-25 13:04 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-17  8:54 [gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/ Andreas Hüttel
  -- strict thread matches above, loose matches on Subject: below --
2014-04-25 13:04 Andreas Hüttel
2014-04-24 21:13 Andreas Hüttel
2014-04-24 20:29 Andreas Hüttel
2013-12-25 14:23 Andreas Hüttel
2013-12-24 17:46 Andreas Hüttel
2011-09-18 20:35 Andreas Hüttel
2011-09-18 15:38 Andreas Hüttel
2011-09-18  9:01 Andreas Hüttel
2011-09-17 19:31 Andreas Hüttel
2011-09-17  8:54 Andreas Hüttel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox