[arch-commits] Commit in cacti/repos/community-any (4 files)

[Sergej Pupykin]

    Date: Monday, November 24, 2014 @ 14:45:10
  Author: spupykin
Revision: 123058

archrelease: copy trunk to community-any

Added:
  cacti/repos/community-any/PKGBUILD
    (from rev 123057, cacti/trunk/PKGBUILD)
  cacti/repos/community-any/cacti.install
    (from rev 123057, cacti/trunk/cacti.install)
Deleted:
  cacti/repos/community-any/PKGBUILD
  cacti/repos/community-any/cacti.install

---------------+
 PKGBUILD      |   77 ++++++++++++++++++++++++++------------------------------
 cacti.install |   14 +++++-----
 2 files changed, 44 insertions(+), 47 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-24 13:45:02 UTC (rev 123057)
+++ PKGBUILD	2014-11-24 13:45:10 UTC (rev 123058)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: tuxbubling <tuxbubling at jabber.fr>
-
-pkgname=cacti
-pkgver=0.8.8_b
-pkgrel=4
-pkgdesc="complete network graphing solution designed to harness the power of RRDTool's data storage and graphing functionality"
-arch=(any)
-url="http://www.cacti.net"
-license=('GPL')
-depends=('rrdtool' 'mariadb' 'php' 'php-gd' 'net-snmp' 'xorg-fonts-100dpi')
-backup=('etc/webapps/cacti/.htaccess')
-install=cacti.install
-source=("http://www.cacti.net/downloads/$pkgname-${pkgver/_/}.tar.gz"
-	"FS#36838.patch::https://bugs.archlinux.org/task/36838?getfile=10962")
-md5sums=('acb40deae073ca22e5c01a8e3ba389fb'
-         '23b87b88285efb9c9e16472879fa2a3b')
-
-prepare() {
-  cd $srcdir/$pkgname-${pkgver/_/}
-  patch -p0 <"$srcdir/FS#36838.patch"
-}
-
-package() {
-  mkdir -p $pkgdir/usr/share/webapps/cacti $pkgdir/etc/webapps/cacti
-  mv $srcdir/$pkgname-${pkgver/_/}/* $pkgdir/usr/share/webapps/cacti
-  echo "Require all denied" >> $pkgdir/etc/webapps/cacti/.htaccess
-  mv $pkgdir/usr/share/webapps/cacti/include/config.php $pkgdir/etc/webapps/cacti
-  ln -s /etc/webapps/cacti/.htaccess $pkgdir/usr/share/webapps/cacti/.htaccess
-  ln -s /etc/webapps/cacti/config.php $pkgdir/usr/share/webapps/cacti/include/config.php
-
-  install -dm0755 $pkgdir/var/log/ $pkgdir/var/lib/cacti/
-
-  mv $pkgdir/usr/share/webapps/cacti/rra $pkgdir/var/lib/cacti/rra
-  ln -s /var/lib/cacti/rra $pkgdir/usr/share/webapps/cacti/rra
-
-  mv $pkgdir/usr/share/webapps/cacti/log $pkgdir/var/log/cacti
-  ln -s /var/log/cacti $pkgdir/usr/share/webapps/cacti/log
-}

Copied: cacti/repos/community-any/PKGBUILD (from rev 123057, cacti/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-11-24 13:45:10 UTC (rev 123058)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: tuxbubling <tuxbubling at jabber.fr>
+
+pkgname=cacti
+pkgver=0.8.8_c
+pkgrel=1
+pkgdesc="complete network graphing solution designed to harness the power of RRDTool's data storage and graphing functionality"
+arch=(any)
+url="http://www.cacti.net"
+license=('GPL')
+depends=('rrdtool' 'mariadb' 'php' 'php-gd' 'net-snmp' 'xorg-fonts-100dpi')
+backup=('etc/webapps/cacti/.htaccess')
+install=cacti.install
+source=("http://www.cacti.net/downloads/$pkgname-${pkgver/_/}.tar.gz")
+md5sums=('11e3955c9ea494879967e19aa935e682')
+
+prepare() {
+  cd $srcdir/$pkgname-${pkgver/_/}
+}
+
+package() {
+  mkdir -p $pkgdir/usr/share/webapps/cacti $pkgdir/etc/webapps/cacti
+  mv $srcdir/$pkgname-${pkgver/_/}/* $pkgdir/usr/share/webapps/cacti
+  echo "Require all denied" >> $pkgdir/etc/webapps/cacti/.htaccess
+  mv $pkgdir/usr/share/webapps/cacti/include/config.php $pkgdir/etc/webapps/cacti
+  ln -s /etc/webapps/cacti/.htaccess $pkgdir/usr/share/webapps/cacti/.htaccess
+  ln -s /etc/webapps/cacti/config.php $pkgdir/usr/share/webapps/cacti/include/config.php
+
+  install -dm0755 $pkgdir/var/log/ $pkgdir/var/lib/cacti/
+
+  mv $pkgdir/usr/share/webapps/cacti/rra $pkgdir/var/lib/cacti/rra
+  ln -s /var/lib/cacti/rra $pkgdir/usr/share/webapps/cacti/rra
+
+  mv $pkgdir/usr/share/webapps/cacti/log $pkgdir/var/log/cacti
+  ln -s /var/log/cacti $pkgdir/usr/share/webapps/cacti/log
+}

Deleted: cacti.install
===================================================================
--- cacti.install	2014-11-24 13:45:02 UTC (rev 123057)
+++ cacti.install	2014-11-24 13:45:10 UTC (rev 123058)
@@ -1,7 +0,0 @@
-post_upgrade() {
-  post_install
-}
-
-post_install() {
-  chown -R http:http var/log/cacti var/lib/cacti/rra
-}

Copied: cacti/repos/community-any/cacti.install (from rev 123057, cacti/trunk/cacti.install)
===================================================================
--- cacti.install	                        (rev 0)
+++ cacti.install	2014-11-24 13:45:10 UTC (rev 123058)
@@ -0,0 +1,7 @@
+post_upgrade() {
+  post_install
+}
+
+post_install() {
+  chown -R http:http var/log/cacti var/lib/cacti/rra
+}