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

["Andreas Hüttel" <dilfridge@gentoo.org>]

commit:     07b388fddbfab0af99255f5d40d4043f2a3d6702
Author:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 25 10:10:19 2014 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Apr 25 10:10:19 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=07b388fd

[www-misc/zoneminder] fix perl location, extra README file

Package-Manager: portage-2.2.8-r1

---
 www-misc/zoneminder/files/README.gentoo      | 26 +++++++++++++++++++
 www-misc/zoneminder/zoneminder-1.26.5.ebuild | 37 ++++------------------------
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/www-misc/zoneminder/files/README.gentoo b/www-misc/zoneminder/files/README.gentoo
new file mode 100644
index 0000000..b942043
--- /dev/null
+++ b/www-misc/zoneminder/files/README.gentoo
@@ -0,0 +1,26 @@
+1. If this is a new installation, you will need to create a MySQL
+   database for zoneminder to use
+   (see https://wiki.gentoo.org/wiki/MySQL/Startup_Guide).
+   E.g., when logged into mysql as root,
+     mysql> CREATE DATABASE \`zm\`;
+     mysql> GRANT ALL ON zm.* TO 'zmuser'@'localhost' IDENTIFIED BY 'topsecretpassword';
+   Once you completed that you should execute the following:
+     cd /usr/share/zoneminder
+     mysql -u zmuser -p < db/zm_create.sql
+
+2. Set your database settings in /etc/zm.conf, including above topsecretpassword
+
+3. Check /etc/apache2/vhosts.d/10_zoneminder.conf
+
+4.  Enable PHP in your webserver configuration, 
+    enable short_open_tags in php.ini,
+    set the time zone in php.ini, 
+    and restart/reload the webserver.
+
+5.  Start the zoneminder daemon:
+      /etc/init.d/zoneminder start
+
+6. Finally point your browser to http://localhost/zoneminder
+
+If you are upgrading, you will need to run the zmupdate.pl script:
+      /usr/bin/zmupdate.pl --version=oldversionnumber [--user=zmuser --pass=topsecretpassword]

diff --git a/www-misc/zoneminder/zoneminder-1.26.5.ebuild b/www-misc/zoneminder/zoneminder-1.26.5.ebuild
index 7bd7ee3..df6b509 100644
--- a/www-misc/zoneminder/zoneminder-1.26.5.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.26.5.ebuild
@@ -21,7 +21,9 @@
 
 EAPI=5
 
-inherit readme.gentoo eutils base cmake-utils depend.php depend.apache multilib flag-o-matic
+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"
 
@@ -78,10 +80,10 @@ pkg_setup() {
 
 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
@@ -119,34 +121,5 @@ src_install() {
 #	    dodir /var/www/zoneminder/htdocs/${DIR}
 #	done
 
-	DOC_CONTENTS="
-1. If this is a new installation, you will need to create a MySQL\n
-   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> 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, including above topsecretpassword\n
-\n
-3. Check /etc/apache2/vhosts.d/10_zoneminder.conf\n
-\n
-4.  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
-5.  Start the ${PN} daemon:\n
-  /etc/init.d/${PN} start\n
-\n
-6. 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
 }