using webapps.eclass.

5 files changed, 260 insertions, 4 deletions

diff --git a/net-www/phpwebsite/ChangeLog b/net-www/phpwebsite/ChangeLog
index 5f6fc1f01e36..8d38ad69d168 100644
--- a/net-www/phpwebsite/ChangeLog
+++ b/net-www/phpwebsite/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/phpwebsite
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/phpwebsite/ChangeLog,v 1.4 2003/09/01 15:13:08 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/phpwebsite/ChangeLog,v 1.5 2003/11/02 16:16:51 mholzer Exp $
+
+*phpwebsite-0.9.3_p1-r1 (02 Nov 2003)
+
+  02 Nov 2003; Martin Holzer <mholzer@gentoo.org>
+  phpwebsite-0.9.3_p1-r1.ebuild, files/phpwebsite-0.9.3-1-supplemental.patch:
+  using webapps.eclass. Submitted by Don Seiler <don@seiler.us> in #32395.
 
 *phpwebsite-0.9.3 (01 Sep 2003)
 
diff --git a/net-www/phpwebsite/Manifest b/net-www/phpwebsite/Manifest
index 9808620106e0..87f6d9f324f2 100644
--- a/net-www/phpwebsite/Manifest
+++ b/net-www/phpwebsite/Manifest
@@ -1,11 +1,11 @@
-MD5 d61ae05e30538eafe2cb75e404378af7 ChangeLog 723
+MD5 f26342f451713016b7880fc429764006 ChangeLog 969
 MD5 59381aa8a487218a2e4bd9920b7df931 phpwebsite-0.9.2_p1.ebuild 1675
 MD5 6eda883812c4c03fa69d669f459b316b phpwebsite-0.9.3.ebuild 1700
 MD5 1c22d7ae59ec219b6f3e5f696b43186f phpwebsite-0.9.3_p1.ebuild 1737
-MD5 c32b1e3a6a58888f9eb30a1ee927f6f2 phpwebsite-0.9.3_p1-r1.ebuild 1969
-MD5 53c7d343b2737e5f560cfdb643eea736 attachment.cgi?id=20032 6521
+MD5 efa072da5e1072d9e8e23453a6abe96f phpwebsite-0.9.3_p1-r1.ebuild 1971
 MD5 f0ab7279c69a8f1522e8a4eb3ac7cc18 files/digest-phpwebsite-0.9.2_p1 76
 MD5 48b9aff37ab682ee582b5bc49d0f8af3 files/digest-phpwebsite-0.9.3 74
 MD5 cfee6010162e807cab7db166192cc4d0 files/digest-phpwebsite-0.9.3_p1 76
 MD5 a7257ff9063723778a81865e8ff9aba2 files/update.php-0.9.3_p1 7892
 MD5 cfee6010162e807cab7db166192cc4d0 files/digest-phpwebsite-0.9.3_p1-r1 76
+MD5 c9e31613b0f4572e934ee68c1dcc94c5 files/phpwebsite-0.9.3-1-supplemental.patch 6581
diff --git a/net-www/phpwebsite/files/digest-phpwebsite-0.9.3_p1-r1 b/net-www/phpwebsite/files/digest-phpwebsite-0.9.3_p1-r1
new file mode 100644
index 000000000000..836436e68bbd
--- /dev/null
+++ b/net-www/phpwebsite/files/digest-phpwebsite-0.9.3_p1-r1
@@ -0,0 +1 @@
+MD5 6932620b038ccaf837e9a798488fedb4 phpwebsite-0.9.3-1-full.tar.gz 2854621
diff --git a/net-www/phpwebsite/files/phpwebsite-0.9.3-1-supplemental.patch b/net-www/phpwebsite/files/phpwebsite-0.9.3-1-supplemental.patch
new file mode 100644
index 000000000000..028e774099c9
--- /dev/null
+++ b/net-www/phpwebsite/files/phpwebsite-0.9.3-1-supplemental.patch
@@ -0,0 +1,185 @@
+diff -ruN phpwebsite-0.9.3-1-full-orig/core/EZform.php phpwebsite-0.9.3-1-full/core/EZform.php
+--- phpwebsite-0.9.3-1-full-orig/core/EZform.php	2003-08-19 14:16:28.000000000 -0500
++++ phpwebsite-0.9.3-1-full/core/EZform.php	2003-10-22 12:44:41.000000000 -0500
+@@ -11,6 +11,7 @@
+ define("MAX_IMAGE_SIZE", 80000);
+ 
+ require_once PHPWS_SOURCE_DIR . "core/EZelement.php";
++require_once("Date.php");
+ 
+ /**
+  * Creates HTML form elements and/or an entire form
+@@ -34,7 +35,7 @@
+  *
+  * For many form elements, that may be all you need.
+  *
+- * @version $Id: phpwebsite-0.9.3-1-supplemental.patch,v 1.1 2003/11/02 16:16:51 mholzer Exp $
++ * @version $Id: phpwebsite-0.9.3-1-supplemental.patch,v 1.1 2003/11/02 16:16:51 mholzer Exp $
+  * @author Matthew McNaney <matt@NOSPAM.tux.appstate.edu>
+  * @author Don Seiler <don@NOSPAM.seiler.us>
+  * @package Core
+@@ -410,7 +411,6 @@
+    * @param string name         Name of element to set the type
+    */
+   function reindexValue($name){
+-    //    echo phpws_debug::testobject($this);
+     if (!$this->testName($name)
+ 	|| ($this->_elements[$name]->type != "multiple" && $this->_elements[$name]->type != "select")
+ 	|| !is_array($this->_elements[$name]->value))
+@@ -540,9 +540,9 @@
+ 
+     if (is_array($element)){
+       foreach ($element as $data)
+-	$formElement .= $data;
+-      return $formElements;
+-    } else
++	$formElements[] = $data;
++      return implode("", $formElements);
++    } else 
+       return $element;
+   }
+ 
+@@ -886,20 +886,23 @@
+         $match_m = NULL;
+         $match_d = NULL;
+         if (is_null($match) && !$useBlanks) {
+-            $match = time();
+-            $match_y = date("Y", $match);
+-            $match_m = date("n", $match);
+-            $match_d = date("j", $match);
++            $mdate = new Date();
++            $match_y = $mdate->format("%Y");
++            $match_m = $mdate->format("%m");
++            $match_d = $mdate->format("%d");
+         } elseif (is_null($match) && $useBlanks) {
+             $match_y = NULL;
+             $match_m = NULL;
+             $match_d = NULL;
+         } else {
+             if(empty($match))
+-                $match = time();
+-            $match_y = date("Y", $match);
+-            $match_m = date("n", $match);
+-            $match_d = date("j", $match);
++                $mdate = new Date();
++            else
++                $mdate = new Date($match);
++
++            $match_y = $mdate->format("%Y");
++            $match_m = $mdate->format("%m");
++            $match_d = $mdate->format("%d");
+         }
+ 
+         if(!$textYear) {
+@@ -1000,16 +1003,17 @@
+         $match_h = NULL;
+         $match_m = NULL;
+         $match_ampm = NULL;
+-        if (is_null($match) || empty($match)) {
+-            $match = time();
+-        }
++        if(empty($match))
++            $mtime = new Date();
++        else
++            $mtime = new Date($match);
+ 
+         if($military)
+-            $match_h = date("G", $match);
++            $match_h = $mtime->format("%H");
+         else
+-            $match_h = date("g", $match);
+-        $match_m = date("i", $match);
+-        $match_ampm = date("A", $match);
++            $match_h = $mtime->format("%I");
++        $match_m = $mtime->format("%M");
++        $match_ampm = $mtime->format("%P");
+ 
+         $ampm = array(0=>"AM", 1=>"PM");
+         if($match_ampm == "AM")
+diff -ruN phpwebsite-0.9.3-1-full-orig/core/Template.php phpwebsite-0.9.3-1-full/core/Template.php
+--- phpwebsite-0.9.3-1-full-orig/core/Template.php	2003-05-01 08:29:08.000000000 -0500
++++ phpwebsite-0.9.3-1-full/core/Template.php	2003-10-29 10:08:00.000000000 -0600
+@@ -155,7 +155,7 @@
+     /* If var $template is a string process the string as the template */
+     /* var $template is a filename, so get path to the file */
+     if ($defaultDir){
+-      $templateDir = $this->getTemplateDir($module, $template);
++      $templateDir = PHPWS_Template::getTemplateDir($module, $template);
+       if($templateDir) {
+ 	$tpl = new HTML_Template_IT($templateDir);
+ 	$tpl->loadTemplatefile($template, TRUE, TRUE);
+diff -ruN phpwebsite-0.9.3-1-full-orig/js/check_all.php phpwebsite-0.9.3-1-full/js/check_all.php
+--- phpwebsite-0.9.3-1-full-orig/js/check_all.php	2003-05-08 14:41:52.000000000 -0500
++++ phpwebsite-0.9.3-1-full/js/check_all.php	2003-10-31 14:01:40.000000000 -0600
+@@ -1,7 +1,7 @@
+ <?php
+ //Code from SquirrelMail
+ 
+-$this->js_func[] = "
++$GLOBALS["core"]->js_func[] = "
+ function CheckAll() {
+    for (var i = 0; i < document.$form_name.elements.length; i++) {
+        if( document.$form_name.elements[i].type == 'checkbox' ) {
+@@ -13,4 +13,4 @@
+ 
+ $js = "<a href=\"#\" onclick=\"CheckAll()\" >Toggle All</a>";
+ 
+-?>
+\ No newline at end of file
++?>
+diff -ruN phpwebsite-0.9.3-1-full-orig/js/confirm.php phpwebsite-0.9.3-1-full/js/confirm.php
+--- phpwebsite-0.9.3-1-full-orig/js/confirm.php	2003-02-04 10:10:47.000000000 -0600
++++ phpwebsite-0.9.3-1-full/js/confirm.php	2003-10-31 14:01:53.000000000 -0600
+@@ -1,7 +1,7 @@
+ <?php
+ 
+ 
+-$this->js_func[] = "
++$GLOBALS["core"]->js_func[] = "
+ function confirmData_" . $section_name . "()
+ {
+ 	if (confirm(\"$message\\nOK = YES, CANCEL = NO\"))
+@@ -10,4 +10,4 @@
+ 
+ $js = $this->formButton($name, $value, "confirmData_" . $section_name . "();");
+ 
+-?>
+\ No newline at end of file
++?>
+diff -ruN phpwebsite-0.9.3-1-full-orig/js/wysiwyg.php phpwebsite-0.9.3-1-full/js/wysiwyg.php
+--- phpwebsite-0.9.3-1-full-orig/js/wysiwyg.php	2003-03-17 14:57:33.000000000 -0600
++++ phpwebsite-0.9.3-1-full/js/wysiwyg.php	2003-10-31 13:58:26.000000000 -0600
+@@ -1,6 +1,6 @@
+ <?php
+ 
+-$this->js_func[] = "
++$GLOBALS["core"]->js_func[] = "
+ 
+ var body=0;
+ var opcode='';
+@@ -73,4 +73,4 @@
+ $js .= "<a href=\"#".$section_name."\" onclick=\"".$section_name."_addLink()\">" . phpws_text::imageTag($this->source_http ."js/wysiwyg/link.gif", "Link", 21, 20) . "</a>\n";
+ $js .= "<a href=\"#".$section_name."\" onclick=\"".$section_name."_addBreak()\">" . phpws_text::imageTag($this->source_http ."js/wysiwyg/break.gif", "Break", 20, 20) . "</a><br />\n";
+ 
+-?>
+\ No newline at end of file
++?>
+diff -ruN phpwebsite-0.9.3-1-full-orig/mod/calendar/class/Display.php phpwebsite-0.9.3-1-full/mod/calendar/class/Display.php
+--- phpwebsite-0.9.3-1-full-orig/mod/calendar/class/Display.php	2003-07-01 12:52:07.000000000 -0500
++++ phpwebsite-0.9.3-1-full/mod/calendar/class/Display.php	2003-10-22 12:45:41.000000000 -0500
+@@ -1,7 +1,7 @@
+ <?php
+ 
+ define("VIEW_TTL", 300);
+-require ("Date.php");
++require_once("Date.php");
+ class PHPWS_Calendar_Display{
+ 
+   var $startDate;
+@@ -843,4 +843,4 @@
+ 
+ }
+ 
+-?>
+\ No newline at end of file
++?>
diff --git a/net-www/phpwebsite/phpwebsite-0.9.3_p1-r1.ebuild b/net-www/phpwebsite/phpwebsite-0.9.3_p1-r1.ebuild
new file mode 100644
index 000000000000..2e27de36491e
--- /dev/null
+++ b/net-www/phpwebsite/phpwebsite-0.9.3_p1-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# Maintainer: Don Seiler <rizzo@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-www/phpwebsite/phpwebsite-0.9.3_p1-r1.ebuild,v 1.1 2003/11/02 16:16:51 mholzer Exp $
+
+inherit webapp-apache
+
+MY_PV="${PV/_p/-}"
+S="${WORKDIR}/${PN}-${MY_PV}-full"
+DESCRIPTION="phpWebSite provides a complete web site content management system. Web-based administration allows for easy maintenance of interactive, community-driven web sites."
+HOMEPAGE="http://phpwebsite.appstate.edu"
+SRC_URI="mirror://sourceforge/phpwebsite/${PN}-${MY_PV}-full.tar.gz"
+RESTRICT="nomirror"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+
+DEPEND="virtual/php"
+
+webapp-detect || NO_WEBSERVER=1
+
+pkg_setup() {
+	webapp-pkg_setup "${NO_WEBSERVER}"
+	einfo "Installing for ${WEBAPP_SERVER}"
+}
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/phpwebsite-${MY_PV}-supplemental.patch
+	cd ${S}/setup
+	cp ${FILESDIR}/update.php-${PV} .
+}
+
+src_install() {
+	dodir "${HTTPD_ROOT}/phpwebsite"
+	cp -a * "${D}/${HTTPD_ROOT}/phpwebsite"
+	dodoc ${S}/docs/*
+
+	#cd "${D}/${HTTPD_ROOT}"
+	chown -R "${HTTPD_USER}.${HTTPD_GROUP}" "${D}/${HTTPD_ROOT}/phpwebsite"
+	chmod 0775 "${D}/${HTTPD_ROOT}/phpwebsite"
+	find "${D}/${HTTPD_ROOT}/phpwebsite/" -type d | xargs chmod 2775
+	find "${D}/${HTTPD_ROOT}/phpwebsite/" -type f | xargs chmod 0664
+	chmod 0555 "${D}/${HTTPD_ROOT}/phpwebsite/setup/*.sh"
+}
+
+pkg_postinst() {
+	einfo
+	einfo "You will need to create a database for phpWebSite"
+	einfo "on your own before starting setup."
+	einfo
+	#einfo "cd ${HTTPD_ROOT}/phpwebsite/setup"
+	#einfo "./secure_setup.sh setup"
+	#einfo
+	einfo "Once you have a database ready proceed to"
+	einfo "http://$HOSTNAME/phpwebsite to continue installation."
+	einfo
+	einfo "Once you are done with installation you need to run"
+	einfo
+	einfo "cd ${HTTPD_ROOT}/phpwebsite/setup"
+	einfo "./secure_phpws.sh run apache users"
+	einfo
+}