Packages repo cleanup:

- Drop support for pfSense < 2
- Remove archive/, old files can be reached using git
- Remove old and unused packages
- Move stale files from config subdir to a package subdir

4 files changed, 0 insertions, 632 deletions

diff --git a/config/archive/dspam/pear/Image/Graph/Plot/Smoothed/Area.php b/config/archive/dspam/pear/Image/Graph/Plot/Smoothed/Area.php
deleted file mode 100644
index 8ea469dd..00000000
--- a/config/archive/dspam/pear/Image/Graph/Plot/Smoothed/Area.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Image_Graph - PEAR PHP OO Graph Rendering Utility.
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at your
- * option) any later version. This library is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
- * General Public License for more details. You should have received a copy of
- * the GNU Lesser General Public License along with this library; if not, write
- * to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * @category   Images
- * @package    Image_Graph
- * @subpackage Plot
- * @author     Jesper Veggerby <pear.nosey@veggerby.dk>
- * @copyright  Copyright (C) 2003, 2004 Jesper Veggerby Hansen
- * @license    http://www.gnu.org/copyleft/lesser.html  LGPL License 2.1
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/Image_Graph
- */
-
-/**
- * Include file Image/Graph/Plot/Smoothed/Bezier.php
- */
-require_once 'Image/Graph/Plot/Smoothed/Bezier.php';
-
-/**
- * Bezier smoothed area chart
- *
- * Similar to an {@link Image_Graph_Plot_Area}, but the interconnecting lines
- * between two datapoints are smoothed using a Bezier curve, which enables the
- * chart to appear as a nice curved plot instead of the sharp edges of a
- * conventional {@link Image_Graph_Plot_Area}. Smoothed charts are only supported
- * with non-stacked types
- *
- * @category   Images
- * @package    Image_Graph
- * @subpackage Plot
- * @author     Jesper Veggerby <pear.nosey@veggerby.dk>
- * @copyright  Copyright (C) 2003, 2004 Jesper Veggerby Hansen
- * @license    http://www.gnu.org/copyleft/lesser.html  LGPL License 2.1
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/Image_Graph
- */
-class Image_Graph_Plot_Smoothed_Area extends Image_Graph_Plot_Smoothed_Bezier
-{
-
-    /**
-     * Perform the actual drawing on the legend.
-     *
-     * @param int $x0 The top-left x-coordinate
-     * @param int $y0 The top-left y-coordinate
-     * @param int $x1 The bottom-right x-coordinate
-     * @param int $y1 The bottom-right y-coordinate
-     * @access private
-     */
-    function _drawLegendSample($x0, $y0, $x1, $y1)
-    {
-
-        $this->_canvas->addVertex(array('x' => $x0, 'y' => $y1));
-        $this->_addSamplePoints($x0, $y0, $x1, $y1);
-        $this->_canvas->addVertex(array('x' => $x1, 'y' => $y1));
-        $this->_canvas->polygon(array('connect' => true));
-    }
-
-    /**
-     * Output the Bezier smoothed plot as an Area Chart
-     *
-     * @return bool Was the output 'good' (true) or 'bad' (false).
-     * @access private
-     */
-    function _done()
-    {
-        if (parent::_done() === false) {
-            return false;
-        }
-
-        $this->_canvas->startGroup(get_class($this) . '_' . $this->_title);
-        $this->_clip(true);
-        
-        $keys = array_keys($this->_dataset);
-        foreach ($keys as $key) {
-            $dataset =& $this->_dataset[$key];
-            $dataset->_reset();
-            $first = true;
-            while ($p1 = $dataset->_next()) {
-                $p0 = $dataset->_nearby(-2);
-                $p2 = $dataset->_nearby(0);
-                $p3 = $dataset->_nearby(1);
-                if ($first) {
-                    $p = $p1;
-                    $p['Y'] = '#min_pos#';
-                    $x = $this->_pointX($p);
-                    $y = $this->_pointY($p);
-                    $this->_canvas->addVertex(array('x' => $x, 'y' => $y));
-                }
-
-                if ($p2) {
-                    $cp = $this->_getControlPoints($p1, $p0, $p2, $p3);
-                    $this->_canvas->addSpline(
-                    	array(
-                        	'x' => $cp['X'],
-                        	'y' => $cp['Y'],
-                        	'p1x' => $cp['P1X'],
-                        	'p1y' => $cp['P1Y'],
-                        	'p2x' => $cp['P2X'],
-                        	'p2y' => $cp['P2Y']
-                        )
-                    );
-                } else {
-                    $x = $this->_pointX($p1);
-                    $y = $this->_pointY($p1);
-                    $this->_canvas->addVertex(array('x' => $x, 'y' => $y));
-                }
-                $lastPoint = $p1;
-                $first = false;
-            }
-            $lastPoint['Y'] = '#min_pos#';
-            $x = $this->_pointX($lastPoint);
-            $y = $this->_pointY($lastPoint);
-            $this->_canvas->addVertex(array('x' => $x, 'y' => $y));
-
-            $this->_getFillStyle($key);
-            $this->_getLineStyle($key);
-            $this->_canvas->polygon(array('connect' => true));
-        }
-        unset($keys);
-        $this->_drawMarker();
-        $this->_clip(false);
-        $this->_canvas->endGroup();
-        return true;
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/config/archive/dspam/pear/Image/Graph/Plot/Smoothed/Bezier.php b/config/archive/dspam/pear/Image/Graph/Plot/Smoothed/Bezier.php
deleted file mode 100644
index bc21b4c8..00000000
--- a/config/archive/dspam/pear/Image/Graph/Plot/Smoothed/Bezier.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Image_Graph - PEAR PHP OO Graph Rendering Utility.
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at your
- * option) any later version. This library is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
- * General Public License for more details. You should have received a copy of
- * the GNU Lesser General Public License along with this library; if not, write
- * to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * @category   Images
- * @package    Image_Graph
- * @subpackage Plot
- * @author     Jesper Veggerby <pear.nosey@veggerby.dk>
- * @copyright  Copyright (C) 2003, 2004 Jesper Veggerby Hansen
- * @license    http://www.gnu.org/copyleft/lesser.html  LGPL License 2.1
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/Image_Graph
- */
-
-/**
- * Include file Image/Graph/Plot.php
- */
-require_once 'Image/Graph/Plot.php';
-
-/**
- * Include file Image/Graph/Tool.php
- */
-require_once 'Image/Graph/Tool.php';
-
-/**
- * Bezier smoothed plottype.
- *
- * The framework for calculating the Bezier smoothed curve from the dataset.
- * Used in {@link Image_Graph_Plot_Smoothed_Line} and {@link
- * Image_Graph_Plot_Smoothed_Area}. Smoothed charts are only supported with non-
- * stacked types
- * @link http://homepages.borland.com/efg2lab/Graphics/Jean-
- * YvesQueinecBezierCurves.htm efg computer lab - description of bezier curves
- *
- * @category   Images
- * @package    Image_Graph
- * @subpackage Plot
- * @author     Jesper Veggerby <pear.nosey@veggerby.dk>
- * @copyright  Copyright (C) 2003, 2004 Jesper Veggerby Hansen
- * @license    http://www.gnu.org/copyleft/lesser.html  LGPL License 2.1
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/Image_Graph
- * @abstract
- */
-class Image_Graph_Plot_Smoothed_Bezier extends Image_Graph_Plot
-{
-
-    /**
-     * Image_Graph_Plot_Smoothed_Bezier [Constructor]
-     *
-     * Only 'normal' multitype supported
-     *
-     * @param Dataset $dataset The data set (value containter) to plot
-     * @param string $title The title of the plot (used for legends, {@link
-     *   Image_Graph_Legend})
-     */
-    function Image_Graph_Plot_Smoothed_Bezier(& $dataset, $title = '')
-    {
-        parent::Image_Graph_Plot($dataset, 'normal', $title);
-    }
-
-    /**
-     * Return the minimum Y point
-     *
-     * @return double The minumum Y point
-     * @access private
-     */
-    function _minimumY()
-    {
-        return 1.05 * parent::_minimumY();
-    }
-
-    /**
-     * Return the maximum Y point
-     *
-     * @return double The maximum Y point
-     * @access private
-     */
-    function _maximumY()
-    {
-        return 1.05 * parent::_maximumY();
-    }
-
-    /**
-     * Calculates all Bezier points, for the curve
-     *
-     * @param array $p1 The actual point to calculate control points for
-     * @param array $p0 The point "just before" $p1
-     * @param array $p2 The point "just after" $p1
-     * @param array $p3 The point "just after" $p2
-     * @return array Array of Bezier points
-     * @access private
-     */
-    function _getControlPoints($p1, $p0, $p2, $p3)
-    {
-        $p1 = $this->_pointXY($p1);
-        if ($p2) {
-            $p2 = $this->_pointXY($p2);
-        }
-        if (!$p0) {
-            $p0['X'] = $p1['X'] - abs($p2['X'] - $p1['X']);
-            $p0['Y'] = $p1['Y']; //-($p2['Y']-$p1['Y']);
-        } else {
-            $p0 = $this->_pointXY($p0);
-        }
-        if (!$p3) {
-            $p3['X'] = $p1['X'] + 2*abs($p1['X'] - $p0['X']);
-            $p3['Y'] = $p1['Y'];
-        } else {
-            $p3 = $this->_pointXY($p3);
-        }
-
-        if (!$p2) {
-            $p2['X'] = $p1['X'] + abs($p1['X'] - $p0['X']);
-            $p2['Y'] = $p1['Y'];
-        }
-
-        $pC1['X'] = Image_Graph_Tool::controlPoint($p0['X'], $p1['X'], $p2['X']);
-        $pC1['Y'] = Image_Graph_Tool::controlPoint($p0['Y'], $p1['Y'], $p2['Y']);
-        $pC2['X'] = Image_Graph_Tool::controlPoint($p3['X'], $p2['X'], $p1['X']);
-        $pC2['Y'] = Image_Graph_Tool::controlPoint($p3['Y'], $p2['Y'], $p1['Y']);
-
-        return array(
-            'X' => $p1['X'],
-            'Y' => $p1['Y'],
-            'P1X' => $pC1['X'],
-            'P1Y' => $pC1['Y'],
-            'P2X' => $pC2['X'],
-            'P2Y' => $pC2['Y']
-        );
-    }
-
-    /**
-     * Create legend sample data for the canvas.
-     *
-     * Common for all smoothed plots
-     *
-     * @access private
-     */
-    function _addSamplePoints($x0, $y0, $x1, $y1)
-    {
-        $p = abs($x1 - $x0);
-        $cy = ($y0 + $y1) / 2;
-        $h = abs($y1 - $y0);
-        $dy = $h / 4;
-        $dw = abs($x1 - $x0) / $p;
-        for ($i = 0; $i < $p; $i++) {
-            $v = 2 * pi() * $i / $p;
-            $x = $x0 + $i * $dw;
-            $y = $cy + 2 * $v * sin($v);
-            $this->_canvas->addVertex(array('x' => $x, 'y' => $y));
-        }
-    }
-
-}
-
-?>
\ No newline at end of file
diff --git a/config/archive/dspam/pear/Image/Graph/Plot/Smoothed/Line.php b/config/archive/dspam/pear/Image/Graph/Plot/Smoothed/Line.php
deleted file mode 100644
index 00692839..00000000
--- a/config/archive/dspam/pear/Image/Graph/Plot/Smoothed/Line.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Image_Graph - PEAR PHP OO Graph Rendering Utility.
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at your
- * option) any later version. This library is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
- * General Public License for more details. You should have received a copy of
- * the GNU Lesser General Public License along with this library; if not, write
- * to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * @category   Images
- * @package    Image_Graph
- * @subpackage Plot
- * @author     Jesper Veggerby <pear.nosey@veggerby.dk>
- * @copyright  Copyright (C) 2003, 2004 Jesper Veggerby Hansen
- * @license    http://www.gnu.org/copyleft/lesser.html  LGPL License 2.1
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/Image_Graph
- */
-
-/**
- * Include file Image/Graph/Plot/Smoothed/Bezier.php
- */
-require_once 'Image/Graph/Plot/Smoothed/Bezier.php';
-
-/**
- * Bezier smoothed line chart.
- *
- * Similar to a {@link Image_Graph_Plot_Line}, but the interconnecting lines
- * between two datapoints are smoothed using a Bezier curve, which enables the
- * chart to appear as a nice curved plot instead of the sharp edges of a
- * conventional {@link Image_Graph_Plot_Line}. Smoothed charts are only supported
- * with non-stacked types
- *
- * @category   Images
- * @package    Image_Graph
- * @subpackage Plot
- * @author     Jesper Veggerby <pear.nosey@veggerby.dk>
- * @copyright  Copyright (C) 2003, 2004 Jesper Veggerby Hansen
- * @license    http://www.gnu.org/copyleft/lesser.html  LGPL License 2.1
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/Image_Graph
- */
-class Image_Graph_Plot_Smoothed_Line extends Image_Graph_Plot_Smoothed_Bezier
-{
-
-    /**
-     * Gets the fill style of the element
-     *
-     * @return int A GD filestyle representing the fill style
-     * @see Image_Graph_Fill
-     * @access private
-     */
-    function _getFillStyle($ID = false)
-    {
-        return IMG_COLOR_TRANSPARENT;
-    }
-
-    /**
-     * Perform the actual drawing on the legend.
-     *
-     * @param int $x0 The top-left x-coordinate
-     * @param int $y0 The top-left y-coordinate
-     * @param int $x1 The bottom-right x-coordinate
-     * @param int $y1 The bottom-right y-coordinate
-     * @access private
-     */
-    function _drawLegendSample($x0, $y0, $x1, $y1)
-    {
-        $this->_addSamplePoints($x0, $y0, $x1, $y1);
-        $this->_canvas->polygon(array('connect' => false));
-    }
-
-    /**
-     * Output the Bezier smoothed plot as an Line Chart
-     *
-     * @return bool Was the output 'good' (true) or 'bad' (false).
-     * @access private
-     */
-    function _done()
-    {
-        if (parent::_done() === false) {
-            return false;
-        }
-
-        $this->_canvas->startGroup(get_class($this) . '_' . $this->_title);
-        $this->_clip(true);
-        $keys = array_keys($this->_dataset);
-        foreach ($keys as $key) {
-            $dataset =& $this->_dataset[$key];
-            $dataset->_reset();
-            $numPoints = 0;
-            while ($p1 = $dataset->_next()) {
-                if ($p1['Y'] === null) {
-                    if ($numPoints > 1) {
-                        $this->_getLineStyle($key);
-                        $this->_canvas->polygon(array('connect' => false, 'map_vertices' => true));
-                    }
-                    else {
-                        $this->_canvas->reset();
-                    }
-                    $numPoints = 0;
-                } else {
-                    $p0 = $dataset->_nearby(-2);
-                    $p2 = $dataset->_nearby(0);
-                    $p3 = $dataset->_nearby(1);
-
-                    if (($p0) && ($p0['Y'] === null)) {
-                        $p0 = false;
-                    }
-                    if (($p2) && ($p2['Y'] === null)) {
-                        $p2 = false;
-                    }
-                    if (($p3) && ($p3['Y'] === null)) {
-                        $p3 = false;
-                    }
-
-                    if ($p2) {
-                        $cp = $this->_getControlPoints($p1, $p0, $p2, $p3);
-                        $this->_canvas->addSpline(
-                            $this->_mergeData(
-                                $p1,
-	                    	  array(
-    	                        	'x' => $cp['X'],
-	                               	'y' => $cp['Y'],
-	                            	'p1x' => $cp['P1X'],
-	                            	'p1y' => $cp['P1Y'],
-	                            	'p2x' => $cp['P2X'],
-	                            	'p2y' => $cp['P2Y']
-                                )
-	                        )
-	                    );
-					} else {
-                        $x = $this->_pointX($p1);
-                        $y = $this->_pointY($p1);
-                        $this->_canvas->addVertex(
-                            $this->_mergeData(
-                                $p1,
-                                array('x' => $x, 'y' => $y)
-                            )
-                        );
-                    }
-                    $numPoints++;
-                }
-            }
-            if ($numPoints > 1) {
-                $this->_getLineStyle();
-                $this->_canvas->polygon(array('connect' => false, 'map_vertices' => true));
-            }
-            else {
-                $this->_canvas->reset();
-            }
-        }
-        unset($keys);
-        $this->_drawMarker();
-        $this->_clip(false);
-        $this->_canvas->endGroup();
-        return true;
-    }
-
-}
-?>
\ No newline at end of file
diff --git a/config/archive/dspam/pear/Image/Graph/Plot/Smoothed/Radar.php b/config/archive/dspam/pear/Image/Graph/Plot/Smoothed/Radar.php
deleted file mode 100644
index d505a11f..00000000
--- a/config/archive/dspam/pear/Image/Graph/Plot/Smoothed/Radar.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Image_Graph - PEAR PHP OO Graph Rendering Utility.
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at your
- * option) any later version. This library is distributed in the hope that it
- * will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
- * General Public License for more details. You should have received a copy of
- * the GNU Lesser General Public License along with this library; if not, write
- * to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA
- *
- * @category   Images
- * @package    Image_Graph
- * @subpackage Plot
- * @author     Jesper Veggerby <pear.nosey@veggerby.dk>
- * @copyright  Copyright (C) 2003, 2004 Jesper Veggerby Hansen
- * @license    http://www.gnu.org/copyleft/lesser.html  LGPL License 2.1
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/Image_Graph
- * @since      File available since Release 0.3.0dev2
- */
-
-/**
- * Include file Image/Graph/Plot/Smoothed/Bezier.php
- */
-require_once 'Image/Graph/Plot/Smoothed/Bezier.php';
-
-/**
- * Smoothed radar chart.
- * 
- * @category   Images
- * @package    Image_Graph
- * @subpackage Plot
- * @author     Jesper Veggerby <pear.nosey@veggerby.dk>
- * @copyright  Copyright (C) 2003, 2004 Jesper Veggerby Hansen
- * @license    http://www.gnu.org/copyleft/lesser.html  LGPL License 2.1
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/Image_Graph
- * @since      Class available since Release 0.3.0dev2
- */
-class Image_Graph_Plot_Smoothed_Radar extends Image_Graph_Plot_Smoothed_Bezier
-{
-
-    /**
-     * Output the plot
-     *
-     * @return bool Was the output 'good' (true) or 'bad' (false).
-     * @access private
-     */
-    function _done()
-    {
-        $this->_canvas->startGroup(get_class($this) . '_' . $this->_title);
-        $this->_clip(true);
-        if (is_a($this->_parent, 'Image_Graph_Plotarea_Radar')) {
-            $keys = array_keys($this->_dataset);
-            foreach ($keys as $key) {
-                $dataset =& $this->_dataset[$key];
-                if ($dataset->count() >= 3) {
-                    $dataset->_reset();
-                    $p1_ = $dataset->_next();
-                    $p2_ = $dataset->_next();
-                    $p3_ = $dataset->_next();
-                    $plast_ = false;
-                    if ($p3_) {
-                        while ($p = $dataset->_next()) {
-                            $plast_ = $p;
-                        }
-                    }
-
-                    if ($plast_ === false) {
-                        $plast_ = $p3_;
-                    }
-                    $dataset->_reset();
-                    while ($p1 = $dataset->_next()) {
-                        $p0 = $dataset->_nearby(-2);
-                        $p2 = $dataset->_nearby(0);
-                        $p3 = $dataset->_nearby(1);
-
-                        if ($p0 === false) {
-                            $p0 = $plast_;
-                        }
-
-                        if ($p2 === false) {
-                            $p2 = $p1_;
-                            $p3 = $p2_;
-                        } elseif ($p3 === false) {
-                            $p3 = $p1_;
-                        }
-
-
-                        $cp = $this->_getControlPoints($p1, $p0, $p2, $p3);
-                        $this->_canvas->addSpline(
-	                    	array(
-	                        	'x' => $cp['X'],
-	                        	'y' => $cp['Y'],
-	                        	'p1x' => $cp['P1X'],
-	                        	'p1y' => $cp['P1Y'],
-	                        	'p2x' => $cp['P2X'],
-	                        	'p2y' => $cp['P2Y']
-	                        )
-	                    );
-
-                        $next2last = $p0;
-                        $last = $p1;
-                    }
-
-                    $cp = $this->_getControlPoints($p1_, $plast_, $p2_, $p3_);
-                    $this->_canvas->addSpline(
-                    	array(
-                        	'x' => $cp['X'],
-                        	'y' => $cp['Y'],
-                        	'p1x' => $cp['P1X'],
-                        	'p1y' => $cp['P1Y'],
-                        	'p2x' => $cp['P2X'],
-                        	'p2y' => $cp['P2Y']
-                        )
-                    );
-                    $this->_getFillStyle($key);
-                    $this->_getLineStyle($key);
-                    $this->_canvas->polygon(array('connect' => true));
-                }
-            }
-            unset($keys);
-        }
-        $this->_drawMarker();
-        $this->_clip(false);
-        $this->_canvas->endGroup($this->_title);
-        return parent::_done();
-    }
-
-}
-
-?>
\ No newline at end of file