[arch-commits] Commit in collectd/repos (16 files)

Gaetan Bisson bisson at nymeria.archlinux.org
Mon May 20 10:50:52 EDT 2013


    Date: Monday, May 20, 2013 @ 16:50:52
  Author: bisson
Revision: 91248

db-move: moved collectd from [community-testing] to [community] (i686, x86_64)

Added:
  collectd/repos/community-i686/PKGBUILD
    (from rev 91247, collectd/repos/community-testing-i686/PKGBUILD)
  collectd/repos/community-i686/libperl.patch
    (from rev 91247, collectd/repos/community-testing-i686/libperl.patch)
  collectd/repos/community-i686/service
    (from rev 91247, collectd/repos/community-testing-i686/service)
  collectd/repos/community-x86_64/PKGBUILD
    (from rev 91247, collectd/repos/community-testing-x86_64/PKGBUILD)
  collectd/repos/community-x86_64/libperl.patch
    (from rev 91247, collectd/repos/community-testing-x86_64/libperl.patch)
  collectd/repos/community-x86_64/service
    (from rev 91247, collectd/repos/community-testing-x86_64/service)
Deleted:
  collectd/repos/community-i686/PKGBUILD
  collectd/repos/community-i686/libperl.patch
  collectd/repos/community-i686/rc.d
  collectd/repos/community-i686/service
  collectd/repos/community-testing-i686/
  collectd/repos/community-testing-x86_64/
  collectd/repos/community-x86_64/PKGBUILD
  collectd/repos/community-x86_64/libperl.patch
  collectd/repos/community-x86_64/rc.d
  collectd/repos/community-x86_64/service

--------------------------------+
 /PKGBUILD                      |  152 +++++++++++++++++++++++++++++++++++++++
 /libperl.patch                 |   58 ++++++++++++++
 /service                       |   26 ++++++
 community-i686/PKGBUILD        |   78 --------------------
 community-i686/libperl.patch   |   29 -------
 community-i686/rc.d            |   39 ----------
 community-i686/service         |   13 ---
 community-x86_64/PKGBUILD      |   78 --------------------
 community-x86_64/libperl.patch |   29 -------
 community-x86_64/rc.d          |   39 ----------
 community-x86_64/service       |   13 ---
 11 files changed, 236 insertions(+), 318 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-05-20 14:50:41 UTC (rev 91247)
+++ community-i686/PKGBUILD	2013-05-20 14:50:52 UTC (rev 91248)
@@ -1,78 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Gerhard Brauer <gerhard.brauer at web.de>
-
-pkgname=collectd
-pkgver=5.3.0
-pkgrel=1
-pkgdesc='Daemon which collects system performance statistics periodically'
-url='http://collectd.org/'
-arch=('i686' 'x86_64')
-license=('GPL')
-
-optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins'
-            'libdbi: dbi plugin'
-            'libesmtp: notify_email plugin'
-            'libgcrypt: encryption and authentication for network plugin'
-            'libmemcached: memcachec plugin'
-            'libmariadbclient: mysql plugin'
-            'iproute2: netlink plugin'
-            'net-snmp: snmp plugin'
-            'libnotify: notify_desktop plugin'
-            'liboping: ping plugin'
-            'libpcap: dns plugin'
-            'perl: perl plugin'
-            'postgresql-libs: postgresql plugin'
-            'python2: python plugin'
-            'rrdtool: rrdtool and rrdcached plugins'
-            'lm_sensors: lm_sensors and sensors plugins'
-            'libvirt: libvirt plugin'
-            'libxml2: ascent and libvirt plugins'
-            'xmms: xmms plugin'
-            'yajl: curl_json plugin')
-
-makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'libmemcached'
-             'libmariadbclient' 'iproute2' 'net-snmp' 'libnotify' 'liboping'
-             'libpcap' 'postgresql-libs' 'python2' 'rrdtool' 'lm_sensors'
-             'libvirt' 'libxml2' 'xmms' 'yajl')
-
-depends=('libltdl' 'iptables')
-
-source=("${url}files/${pkgname}-${pkgver}.tar.gz"
-        'libperl.patch'
-        'service'
-        'rc.d')
-sha1sums=('53879095aa51b7dd0b30882b0c9b6ce8c93a8539'
-          '245c098d121a4a05594553583310953b3a2f6461'
-          'b56907f532b9174e1b6995aadb518228d7464d3b'
-          '0f441718d5519cb043b1130e5a1d0379078adbcc')
-
-backup=('etc/collectd.conf')
-options=('!libtool')
-
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../libperl.patch
-	autoconf
-	sed 's/-Werror//g' -i src/Makefile.in
-}
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--enable-static=no \
-		--with-python=/usr/bin/python2
-	make all
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	rmdir "${pkgdir}/var/run" # FS#30201
-	install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
-	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/collectd.service
-	install -Dm644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl
-}

Copied: collectd/repos/community-i686/PKGBUILD (from rev 91247, collectd/repos/community-testing-i686/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-05-20 14:50:52 UTC (rev 91248)
@@ -0,0 +1,76 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Gerhard Brauer <gerhard.brauer at web.de>
+
+pkgname=collectd
+pkgver=5.3.0
+pkgrel=2
+pkgdesc='Daemon which collects system performance statistics periodically'
+url='http://collectd.org/'
+arch=('i686' 'x86_64')
+license=('GPL')
+
+optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins'
+            'libdbi: dbi plugin'
+            'libesmtp: notify_email plugin'
+            'libgcrypt: encryption and authentication for network plugin'
+            'libmemcached: memcachec plugin'
+            'libmariadbclient: mysql plugin'
+            'iproute2: netlink plugin'
+            'net-snmp: snmp plugin'
+            'libnotify: notify_desktop plugin'
+            'liboping: ping plugin'
+            'libpcap: dns plugin'
+            'perl: perl plugin'
+            'postgresql-libs: postgresql plugin'
+            'python2: python plugin'
+            'rrdtool: rrdtool and rrdcached plugins'
+            'lm_sensors: lm_sensors and sensors plugins'
+            'libvirt: libvirt plugin'
+            'libxml2: ascent and libvirt plugins'
+            'xmms: xmms plugin'
+            'yajl: curl_json plugin')
+
+makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'libmemcached'
+             'libmariadbclient' 'iproute2' 'net-snmp' 'libnotify' 'liboping'
+             'libpcap' 'postgresql-libs' 'python2' 'rrdtool' 'lm_sensors'
+             'libvirt' 'libxml2' 'xmms' 'yajl')
+
+depends=('libltdl' 'iptables')
+
+source=("${url}files/${pkgname}-${pkgver}.tar.gz"
+        'libperl.patch'
+        'service')
+sha1sums=('53879095aa51b7dd0b30882b0c9b6ce8c93a8539'
+          '245c098d121a4a05594553583310953b3a2f6461'
+          '04f676d0b76c34df0bbf94629813e035b1febe04')
+
+backup=('etc/collectd.conf')
+options=('!libtool')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../libperl.patch
+	autoconf
+	sed 's/-Werror//g' -i src/Makefile.in
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--sbindir=/usr/bin \
+		--disable-static \
+		--with-python=/usr/bin/python2
+	make all
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	rmdir "${pkgdir}/var/run" # FS#30201
+	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/collectd.service
+	install -Dm644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl
+}

Deleted: community-i686/libperl.patch
===================================================================
--- community-i686/libperl.patch	2013-05-20 14:50:41 UTC (rev 91247)
+++ community-i686/libperl.patch	2013-05-20 14:50:52 UTC (rev 91248)
@@ -1,29 +0,0 @@
-diff -aur old/configure.in new/configure.in
---- old/configure.in	2011-09-29 20:38:56.725672831 +1000
-+++ new/configure.in	2011-09-29 20:39:07.975658829 +1000
-@@ -2810,11 +2810,13 @@
- then
-   SAVE_CFLAGS="$CFLAGS"
-   SAVE_LDFLAGS="$LDFLAGS"
-+  SAVE_LIBS="$LIBS"
- dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string)
-   PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts`
-   PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts`
-   CFLAGS="$CFLAGS $PERL_CFLAGS"
-   LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
-+  LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl $PERL_LDFLAGS"
- 
-   AC_CACHE_CHECK([for libperl],
-     [c_cv_have_libperl],
-@@ -2833,7 +2835,10 @@
- 			 Nullsv);
-       ]]),
-       [c_cv_have_libperl="yes"],
--      [c_cv_have_libperl="no"]
-+      [ 
-+        c_cv_have_libperl="no" 
-+        LIBS="$SAVE_LIBS"
-+      ]
-     )
-   )
- 

Copied: collectd/repos/community-i686/libperl.patch (from rev 91247, collectd/repos/community-testing-i686/libperl.patch)
===================================================================
--- community-i686/libperl.patch	                        (rev 0)
+++ community-i686/libperl.patch	2013-05-20 14:50:52 UTC (rev 91248)
@@ -0,0 +1,29 @@
+diff -aur old/configure.in new/configure.in
+--- old/configure.in	2011-09-29 20:38:56.725672831 +1000
++++ new/configure.in	2011-09-29 20:39:07.975658829 +1000
+@@ -2810,11 +2810,13 @@
+ then
+   SAVE_CFLAGS="$CFLAGS"
+   SAVE_LDFLAGS="$LDFLAGS"
++  SAVE_LIBS="$LIBS"
+ dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string)
+   PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts`
+   PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts`
+   CFLAGS="$CFLAGS $PERL_CFLAGS"
+   LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
++  LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl $PERL_LDFLAGS"
+ 
+   AC_CACHE_CHECK([for libperl],
+     [c_cv_have_libperl],
+@@ -2833,7 +2835,10 @@
+ 			 Nullsv);
+       ]]),
+       [c_cv_have_libperl="yes"],
+-      [c_cv_have_libperl="no"]
++      [ 
++        c_cv_have_libperl="no" 
++        LIBS="$SAVE_LIBS"
++      ]
+     )
+   )
+ 

Deleted: community-i686/rc.d
===================================================================
--- community-i686/rc.d	2013-05-20 14:50:41 UTC (rev 91247)
+++ community-i686/rc.d	2013-05-20 14:50:52 UTC (rev 91248)
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=collectd
-prog="/usr/sbin/collectdmon"
-
-PID=$(pidof -o %PPID $prog)
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	[[ -z "$PID" ]] && $prog \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	[[ -n "$PID" ]] && kill $PID &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 2
-	$0 start
-	;;
-reload)
-	stat_busy "Sending SIGHUP to $name daemon"
-	[[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \
-	&& { stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-*)
-	echo "usage: $0 {start|stop|restart|reload}"
-	exit 1
-	;;
-esac

Deleted: community-i686/service
===================================================================
--- community-i686/service	2013-05-20 14:50:41 UTC (rev 91247)
+++ community-i686/service	2013-05-20 14:50:52 UTC (rev 91248)
@@ -1,13 +0,0 @@
-[Unit]
-Description=System statistics collection daemon
-After=local-fs.target network.target
-
-[Service]
-Type=forking
-PIDFile=/run/collectdmon.pid
-ExecStart=/usr/sbin/collectdmon
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=always
-
-[Install]
-WantedBy=multi-user.target

Copied: collectd/repos/community-i686/service (from rev 91247, collectd/repos/community-testing-i686/service)
===================================================================
--- community-i686/service	                        (rev 0)
+++ community-i686/service	2013-05-20 14:50:52 UTC (rev 91248)
@@ -0,0 +1,13 @@
+[Unit]
+Description=System statistics collection daemon
+After=local-fs.target network.target
+
+[Service]
+Type=forking
+PIDFile=/run/collectdmon.pid
+ExecStart=/usr/bin/collectdmon
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-05-20 14:50:41 UTC (rev 91247)
+++ community-x86_64/PKGBUILD	2013-05-20 14:50:52 UTC (rev 91248)
@@ -1,78 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Gerhard Brauer <gerhard.brauer at web.de>
-
-pkgname=collectd
-pkgver=5.3.0
-pkgrel=1
-pkgdesc='Daemon which collects system performance statistics periodically'
-url='http://collectd.org/'
-arch=('i686' 'x86_64')
-license=('GPL')
-
-optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins'
-            'libdbi: dbi plugin'
-            'libesmtp: notify_email plugin'
-            'libgcrypt: encryption and authentication for network plugin'
-            'libmemcached: memcachec plugin'
-            'libmariadbclient: mysql plugin'
-            'iproute2: netlink plugin'
-            'net-snmp: snmp plugin'
-            'libnotify: notify_desktop plugin'
-            'liboping: ping plugin'
-            'libpcap: dns plugin'
-            'perl: perl plugin'
-            'postgresql-libs: postgresql plugin'
-            'python2: python plugin'
-            'rrdtool: rrdtool and rrdcached plugins'
-            'lm_sensors: lm_sensors and sensors plugins'
-            'libvirt: libvirt plugin'
-            'libxml2: ascent and libvirt plugins'
-            'xmms: xmms plugin'
-            'yajl: curl_json plugin')
-
-makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'libmemcached'
-             'libmariadbclient' 'iproute2' 'net-snmp' 'libnotify' 'liboping'
-             'libpcap' 'postgresql-libs' 'python2' 'rrdtool' 'lm_sensors'
-             'libvirt' 'libxml2' 'xmms' 'yajl')
-
-depends=('libltdl' 'iptables')
-
-source=("${url}files/${pkgname}-${pkgver}.tar.gz"
-        'libperl.patch'
-        'service'
-        'rc.d')
-sha1sums=('53879095aa51b7dd0b30882b0c9b6ce8c93a8539'
-          '245c098d121a4a05594553583310953b3a2f6461'
-          'b56907f532b9174e1b6995aadb518228d7464d3b'
-          '0f441718d5519cb043b1130e5a1d0379078adbcc')
-
-backup=('etc/collectd.conf')
-options=('!libtool')
-
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../libperl.patch
-	autoconf
-	sed 's/-Werror//g' -i src/Makefile.in
-}
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--enable-static=no \
-		--with-python=/usr/bin/python2
-	make all
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	rmdir "${pkgdir}/var/run" # FS#30201
-	install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
-	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/collectd.service
-	install -Dm644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl
-}

Copied: collectd/repos/community-x86_64/PKGBUILD (from rev 91247, collectd/repos/community-testing-x86_64/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-05-20 14:50:52 UTC (rev 91248)
@@ -0,0 +1,76 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Gerhard Brauer <gerhard.brauer at web.de>
+
+pkgname=collectd
+pkgver=5.3.0
+pkgrel=2
+pkgdesc='Daemon which collects system performance statistics periodically'
+url='http://collectd.org/'
+arch=('i686' 'x86_64')
+license=('GPL')
+
+optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins'
+            'libdbi: dbi plugin'
+            'libesmtp: notify_email plugin'
+            'libgcrypt: encryption and authentication for network plugin'
+            'libmemcached: memcachec plugin'
+            'libmariadbclient: mysql plugin'
+            'iproute2: netlink plugin'
+            'net-snmp: snmp plugin'
+            'libnotify: notify_desktop plugin'
+            'liboping: ping plugin'
+            'libpcap: dns plugin'
+            'perl: perl plugin'
+            'postgresql-libs: postgresql plugin'
+            'python2: python plugin'
+            'rrdtool: rrdtool and rrdcached plugins'
+            'lm_sensors: lm_sensors and sensors plugins'
+            'libvirt: libvirt plugin'
+            'libxml2: ascent and libvirt plugins'
+            'xmms: xmms plugin'
+            'yajl: curl_json plugin')
+
+makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'libmemcached'
+             'libmariadbclient' 'iproute2' 'net-snmp' 'libnotify' 'liboping'
+             'libpcap' 'postgresql-libs' 'python2' 'rrdtool' 'lm_sensors'
+             'libvirt' 'libxml2' 'xmms' 'yajl')
+
+depends=('libltdl' 'iptables')
+
+source=("${url}files/${pkgname}-${pkgver}.tar.gz"
+        'libperl.patch'
+        'service')
+sha1sums=('53879095aa51b7dd0b30882b0c9b6ce8c93a8539'
+          '245c098d121a4a05594553583310953b3a2f6461'
+          '04f676d0b76c34df0bbf94629813e035b1febe04')
+
+backup=('etc/collectd.conf')
+options=('!libtool')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../libperl.patch
+	autoconf
+	sed 's/-Werror//g' -i src/Makefile.in
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--sbindir=/usr/bin \
+		--disable-static \
+		--with-python=/usr/bin/python2
+	make all
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	rmdir "${pkgdir}/var/run" # FS#30201
+	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/collectd.service
+	install -Dm644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl
+}

Deleted: community-x86_64/libperl.patch
===================================================================
--- community-x86_64/libperl.patch	2013-05-20 14:50:41 UTC (rev 91247)
+++ community-x86_64/libperl.patch	2013-05-20 14:50:52 UTC (rev 91248)
@@ -1,29 +0,0 @@
-diff -aur old/configure.in new/configure.in
---- old/configure.in	2011-09-29 20:38:56.725672831 +1000
-+++ new/configure.in	2011-09-29 20:39:07.975658829 +1000
-@@ -2810,11 +2810,13 @@
- then
-   SAVE_CFLAGS="$CFLAGS"
-   SAVE_LDFLAGS="$LDFLAGS"
-+  SAVE_LIBS="$LIBS"
- dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string)
-   PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts`
-   PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts`
-   CFLAGS="$CFLAGS $PERL_CFLAGS"
-   LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
-+  LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl $PERL_LDFLAGS"
- 
-   AC_CACHE_CHECK([for libperl],
-     [c_cv_have_libperl],
-@@ -2833,7 +2835,10 @@
- 			 Nullsv);
-       ]]),
-       [c_cv_have_libperl="yes"],
--      [c_cv_have_libperl="no"]
-+      [ 
-+        c_cv_have_libperl="no" 
-+        LIBS="$SAVE_LIBS"
-+      ]
-     )
-   )
- 

Copied: collectd/repos/community-x86_64/libperl.patch (from rev 91247, collectd/repos/community-testing-x86_64/libperl.patch)
===================================================================
--- community-x86_64/libperl.patch	                        (rev 0)
+++ community-x86_64/libperl.patch	2013-05-20 14:50:52 UTC (rev 91248)
@@ -0,0 +1,29 @@
+diff -aur old/configure.in new/configure.in
+--- old/configure.in	2011-09-29 20:38:56.725672831 +1000
++++ new/configure.in	2011-09-29 20:39:07.975658829 +1000
+@@ -2810,11 +2810,13 @@
+ then
+   SAVE_CFLAGS="$CFLAGS"
+   SAVE_LDFLAGS="$LDFLAGS"
++  SAVE_LIBS="$LIBS"
+ dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string)
+   PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts`
+   PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts`
+   CFLAGS="$CFLAGS $PERL_CFLAGS"
+   LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
++  LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl $PERL_LDFLAGS"
+ 
+   AC_CACHE_CHECK([for libperl],
+     [c_cv_have_libperl],
+@@ -2833,7 +2835,10 @@
+ 			 Nullsv);
+       ]]),
+       [c_cv_have_libperl="yes"],
+-      [c_cv_have_libperl="no"]
++      [ 
++        c_cv_have_libperl="no" 
++        LIBS="$SAVE_LIBS"
++      ]
+     )
+   )
+ 

Deleted: community-x86_64/rc.d
===================================================================
--- community-x86_64/rc.d	2013-05-20 14:50:41 UTC (rev 91247)
+++ community-x86_64/rc.d	2013-05-20 14:50:52 UTC (rev 91248)
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=collectd
-prog="/usr/sbin/collectdmon"
-
-PID=$(pidof -o %PPID $prog)
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	[[ -z "$PID" ]] && $prog \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	[[ -n "$PID" ]] && kill $PID &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 2
-	$0 start
-	;;
-reload)
-	stat_busy "Sending SIGHUP to $name daemon"
-	[[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \
-	&& { stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-*)
-	echo "usage: $0 {start|stop|restart|reload}"
-	exit 1
-	;;
-esac

Deleted: community-x86_64/service
===================================================================
--- community-x86_64/service	2013-05-20 14:50:41 UTC (rev 91247)
+++ community-x86_64/service	2013-05-20 14:50:52 UTC (rev 91248)
@@ -1,13 +0,0 @@
-[Unit]
-Description=System statistics collection daemon
-After=local-fs.target network.target
-
-[Service]
-Type=forking
-PIDFile=/run/collectdmon.pid
-ExecStart=/usr/sbin/collectdmon
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=always
-
-[Install]
-WantedBy=multi-user.target

Copied: collectd/repos/community-x86_64/service (from rev 91247, collectd/repos/community-testing-x86_64/service)
===================================================================
--- community-x86_64/service	                        (rev 0)
+++ community-x86_64/service	2013-05-20 14:50:52 UTC (rev 91248)
@@ -0,0 +1,13 @@
+[Unit]
+Description=System statistics collection daemon
+After=local-fs.target network.target
+
+[Service]
+Type=forking
+PIDFile=/run/collectdmon.pid
+ExecStart=/usr/bin/collectdmon
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=always
+
+[Install]
+WantedBy=multi-user.target



More information about the arch-commits mailing list