Version bump

(Portage version: 2.1_pre3-r1)

9 files changed, 174 insertions, 11 deletions

diff --git a/www-misc/zoneminder/ChangeLog b/www-misc/zoneminder/ChangeLog
index a069ad9cb3b9..66994dcbf471 100644
--- a/www-misc/zoneminder/ChangeLog
+++ b/www-misc/zoneminder/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-misc/zoneminder
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v 1.11 2006/02/06 21:51:24 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/ChangeLog,v 1.12 2006/02/06 22:02:52 rl03 Exp $
+
+*zoneminder-1.22.0 (06 Feb 2006)
+
+  06 Feb 2006; Renat Lumpau <rl03@gentoo.org> +files/postinstall-2.txt,
+  +files/Makefile.am.patch, +files/conf.d, +files/init.d,
+  +files/postupgrade.txt, +zoneminder-1.22.0.ebuild:
+  Version bump
 
   06 Feb 2006; Renat Lumpau <rl03@gentoo.org> -zoneminder-0.9.12.ebuild,
   -zoneminder-1.21.2.ebuild, -zoneminder-1.21.3.ebuild:
diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index a6be3c67f539..85a27db227ca 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -1,16 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 7d8dcdebc5f1bdcd3b2b653d41faeca2 ChangeLog 2411
+MD5 1aecf82bff0009b04884bd618cb742ab files/Makefile.am.patch 833
+MD5 847b42fb080bd720da8854ef46ebcf52 files/conf.d 138
 MD5 cbf3094fef30cb6fa1375e47d61e1cc7 files/digest-zoneminder-1.21.4 61
+MD5 6cc9b00d8f0665504e2bdebb23f9563c files/digest-zoneminder-1.22.0 70
+MD5 6bc3153592b64e0e4e600c63c46f6d30 files/init.d 319
+MD5 cc506f3ccbbdd0b4043c0cdb78d2479d files/postinstall-2.txt 596
 MD5 f1bbdbaae143812aebe236c421c4fba9 files/postinstall.txt 627
+MD5 5e67f0dba87a29d34e960b90ceb2b6e8 files/postupgrade.txt 398
 MD5 8c805069c0e1f5731ba4326e5cc3aec6 files/zmconfig-gentoo.txt 505
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
 MD5 38805a5c2234a1b7dd1f0569f5093851 zoneminder-1.21.4.ebuild 1706
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD58TmEzitwsaoONoRAlFiAKCj9OgOIJ2OKI5GOmCBW/UslT6QDQCgs3lB
-h+43tD2Dm/lbFGXxgM0EJTA=
-=Sf2i
------END PGP SIGNATURE-----
+MD5 2667ce9ef6ed55606f099dd7455736f1 zoneminder-1.22.0.ebuild 2077
diff --git a/www-misc/zoneminder/files/Makefile.am.patch b/www-misc/zoneminder/files/Makefile.am.patch
new file mode 100644
index 000000000000..f8fe519889a5
--- /dev/null
+++ b/www-misc/zoneminder/files/Makefile.am.patch
@@ -0,0 +1,13 @@
+--- Makefile.am	2005-12-21 06:59:46.000000000 -0500
++++ Makefile.am.patched	2006-01-17 09:28:15.000000000 -0500
+@@ -22,8 +22,8 @@ EXTRA_DIST = \
+ # Yes, you are correct. This is a HACK!
+ install-data-hook:
+ 	( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )
+-	-( if ! test -e $(RUNDIR); then mkdir $(RUNDIR); fi )
+-	( if ! test -e $(ZM_RUNDIR); then mkdir $(ZM_RUNDIR); fi; chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR) )
++	-( if ! test -e $(DESTDIR)$(RUNDIR); then mkdir $(DESTDIR)$(RUNDIR); fi )
++	( if ! test -e $(DESTDIR)$(ZM_RUNDIR); then mkdir $(DESTDIR)$(ZM_RUNDIR); fi; chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_RUNDIR); chmod u+w $(DESTDIR)$(ZM_RUNDIR) )
+ 
+ uninstall-hook:
+ 	@-( cd $(DESTDIR)$(webdir); rm -rf events graphics images sounds temp )
diff --git a/www-misc/zoneminder/files/conf.d b/www-misc/zoneminder/files/conf.d
new file mode 100644
index 000000000000..d2e03363867a
--- /dev/null
+++ b/www-misc/zoneminder/files/conf.d
@@ -0,0 +1,6 @@
+ZM_SCRIPT=/usr/bin/zmpkg.pl
+
+# Commands for starting and stopping the server
+
+CMD_START="${ZM_SCRIPT} start"
+CMD_STOP="${ZM_SCRIPT} stop"
diff --git a/www-misc/zoneminder/files/digest-zoneminder-1.22.0 b/www-misc/zoneminder/files/digest-zoneminder-1.22.0
new file mode 100644
index 000000000000..e3b0380efc2b
--- /dev/null
+++ b/www-misc/zoneminder/files/digest-zoneminder-1.22.0
@@ -0,0 +1 @@
+MD5 f5f9e029f1b7c96bcfe93c49697a60c3 ZoneMinder-1.22.0.tar.gz 1178414
diff --git a/www-misc/zoneminder/files/init.d b/www-misc/zoneminder/files/init.d
new file mode 100644
index 000000000000..d0cbb53ca925
--- /dev/null
+++ b/www-misc/zoneminder/files/init.d
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/files/init.d,v 1.1 2006/02/06 22:02:52 rl03 Exp $
+
+depend() {
+    need mysql
+    use net
+}
+
+start() {
+	ebegin "Starting zoneminder"
+	eval ${CMD_START}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping zoneminder"
+	eval ${CMD_STOP}
+	eend $?
+}
diff --git a/www-misc/zoneminder/files/postinstall-2.txt b/www-misc/zoneminder/files/postinstall-2.txt
new file mode 100644
index 000000000000..b41d8ddb558a
--- /dev/null
+++ b/www-misc/zoneminder/files/postinstall-2.txt
@@ -0,0 +1,20 @@
+1. If this is a new installation, you will need to create a database for ZM to
+   use. Execute the following:
+
+ cd /usr/share/${PN}
+ mysql mysql < db/zm_create.sql
+ mysql mysql
+  > grant select,insert,update,delete on <your database name>.* to '<username>'@localhost identified by '<password>';
+  > quit
+ mysqladmin reload
+
+2.  Edit /etc/zm.conf:
+  ZM_PATH_BUILD => /usr/share/${PN}
+  ZM_PATH_WEB   => ${MY_INSTALLDIR}
+  ZM_PATH_CGI   => ${VHOST_CGIBINDIR}
+
+  Also set your database settings.
+
+3. Login: http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/zm.php
+
+Default username/password are admin/admin.
diff --git a/www-misc/zoneminder/files/postupgrade.txt b/www-misc/zoneminder/files/postupgrade.txt
new file mode 100644
index 000000000000..35a4f27d3f84
--- /dev/null
+++ b/www-misc/zoneminder/files/postupgrade.txt
@@ -0,0 +1,12 @@
+1. If you are upgrading, you will need to run the zmupdate.pl script:
+
+  /usr/bin/zmupdate.pl version=<from version> [--user=<database user> --pass=<database password>]
+
+2.  Edit /etc/zm.conf:
+  ZM_PATH_BUILD => /usr/share/${PN}
+  ZM_PATH_WEB   => ${MY_INSTALLDIR}
+  ZM_PATH_CGI   => ${VHOST_CGIBINDIR}
+
+  Also set your database settings.
+
+3. Login: http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/zm.php
diff --git a/www-misc/zoneminder/zoneminder-1.22.0.ebuild b/www-misc/zoneminder/zoneminder-1.22.0.ebuild
new file mode 100644
index 000000000000..564c208d47da
--- /dev/null
+++ b/www-misc/zoneminder/zoneminder-1.22.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/zoneminder-1.22.0.ebuild,v 1.1 2006/02/06 22:02:52 rl03 Exp $
+
+inherit eutils webapp
+
+WEBAPP_MANUAL_SLOT="yes"
+SLOT="0"
+MY_PV=${PV/_/-}
+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="http://www.zoneminder.com/downloads/${MY_PN}-${MY_PV}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+IUSE="mpeg mysql"
+
+DEPEND="mysql? ( >=dev-db/mysql-3 )
+	>=media-libs/jpeg-6b
+	>=net-www/apache-1.3.27-r3
+	>=dev-lang/perl-5.6.0
+	dev-perl/DBI
+	dev-perl/DBD-mysql
+	perl-core/Getopt-Long
+	perl-core/Time-HiRes
+	dev-perl/DateManip
+	dev-perl/libwww-perl
+	dev-perl/Device-SerialPort
+	perl-core/libnet
+	dev-perl/Archive-Tar
+	dev-perl/Archive-Zip
+	dev-perl/MIME-Lite
+	dev-perl/MIME-tools
+	|| ( perl-core/Sys-Syslog >=dev-lang/perl-5.8.8 )
+	dev-perl/X10
+"
+
+RDEPEND="mpeg? ( media-video/ffmpeg )
+	virtual/php
+	media-libs/netpbm
+	dev-perl/DBD-mysql"
+
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/Makefile.am.patch
+}
+
+src_compile() {
+	autoreconf
+	econf \
+		--with-mysql=/usr \
+		--with-webdir=${MY_HTDOCSDIR} \
+		--with-cgidir=${MY_CGIBINDIR} \
+		$(use_with mpeg ffmpeg)=/usr \
+		--with-webuser=apache \
+		--with-webgroup=apache || die "./configure failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodir /var/run/zm
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc AUTHORS ChangeLog INSTALL NEWS README README.[prt]* TODO
+	dohtml README.html
+
+	dodir /usr/share/${PN}/db
+	cp db/zm_u* db/zm_create.sql ${D}/usr/share/${PN}/db
+
+	keepdir /var/log/${PN}
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall.txt
+	webapp_postupgrade_txt en ${FILESDIR}/postupgrade.txt
+	webapp_src_install
+	fperms 0644 /etc/zm.conf
+	fowners apache:apache /var/log/${PN}
+
+	newinitd ${FILESDIR}/init.d zoneminder
+	newconfd ${FILESDIR}/conf.d zoneminder
+}