From ca672183cc96c845d972d46d5f6b4240971d7913 Mon Sep 17 00:00:00 2001 From: Cedric Girard Date: Fri, 12 Jun 2015 17:46:42 +0200 Subject: [PATCH] moved cacti-spine to AUR and submodule --- .gitmodules | 4 ++++ pkgbuild/cacti-spine | 1 + pkgbuild/cacti-spine/PKGBUILD | 40 --------------------------------- pkgbuild/cacti-spine/make.patch | 40 --------------------------------- 4 files changed, 5 insertions(+), 80 deletions(-) create mode 160000 pkgbuild/cacti-spine delete mode 100644 pkgbuild/cacti-spine/PKGBUILD delete mode 100644 pkgbuild/cacti-spine/make.patch diff --git a/.gitmodules b/.gitmodules index c43413f..b0792a4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,3 +14,7 @@ path = pkgbuild/gmpc-plugins url = https://aur@aur4.archlinux.org/gmpc-plugins.git pushurl = ssh+git://aur@aur4.archlinux.org/gmpc-plugins.git +[submodule "pkgbuild/cacti-spine"] + path = pkgbuild/cacti-spine + url = https://aur@aur4.archlinux.org/cacti-spine.git + pushurl = ssh+git://aur@aur4.archlinux.org/cacti-spine.git diff --git a/pkgbuild/cacti-spine b/pkgbuild/cacti-spine new file mode 160000 index 0000000..5589897 --- /dev/null +++ b/pkgbuild/cacti-spine @@ -0,0 +1 @@ +Subproject commit 5589897ef3e9e5f7ef7eecb298eba46a7a854c05 diff --git a/pkgbuild/cacti-spine/PKGBUILD b/pkgbuild/cacti-spine/PKGBUILD deleted file mode 100644 index 28c1d24..0000000 --- a/pkgbuild/cacti-spine/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Cedric Girard -# Contributor: Tom -pkgname=cacti-spine -pkgver=0.8.8_d -pkgrel=2 -pkgdesc="Faster poller for Cacti." -arch=('i686' 'x86_64') -url="http://cacti.net/spine_info.php" -license=('GPL') -depends=('libmariadbclient' 'net-snmp' "cacti=${pkgver}") -backup=('etc/spine.conf') -source=("make.patch" "http://www.cacti.net/downloads/spine/${pkgname}-${pkgver/_/}.tar.gz") -md5sums=('c36d7a35a9b9760fb6a8c53a007f06a7' - '7724218aff3695369a20f05d2aeb993b') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver/_/}" - - patch -p1 -i ../make.patch - - /usr/bin/aclocal - /usr/bin/libtoolize --force --copy - /usr/bin/autoheader - /usr/bin/autoconf - /usr/bin/automake --add-missing --copy --force-missing -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver/_/}" - export CFLAGS="$CFLAGS -lpthread -lm" - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver/_/}" - make DESTDIR="${pkgdir}" install - mv "${pkgdir}"/etc/spine.conf.dist "${pkgdir}"/etc/spine.conf -} - diff --git a/pkgbuild/cacti-spine/make.patch b/pkgbuild/cacti-spine/make.patch deleted file mode 100644 index 434e2d9..0000000 --- a/pkgbuild/cacti-spine/make.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Naur cacti-spine-0.8.8d/configure.ac cacti-spine-0.8.8d-patched/configure.ac ---- cacti-spine-0.8.8d/configure.ac 2015-06-08 20:26:02.000000000 +0200 -+++ cacti-spine-0.8.8d-patched/configure.ac 2015-06-12 16:41:21.401118417 +0200 -@@ -9,8 +9,8 @@ - AC_PREFIX_DEFAULT(/usr/local/spine) - AC_LANG(C) - --AM_INIT_AUTOMAKE(spine, 0.8.8d) --AM_CONFIG_HEADER(config/config.h) -+AM_INIT_AUTOMAKE -+AC_CONFIG_HEADER(config/config.h) - - # static libraries - AC_ARG_WITH(static, -@@ -272,7 +272,12 @@ - ) - AC_DEFINE_UNQUOTED(SNMP_LOCALNAME, $havelocalname, If snmp localname session structure member exists) - --AC_CHECK_LIB(netsnmp, snmp_timeout) -+AC_CHECK_LIB(netsnmp, snmp_timeout, -+ [ LIBS="-lnetsnmp $LIBS" -+ AC_DEFINE(USE_NET_SNMP, 1, New Net SNMP Version) -+ ], -+ AC_MSG_RESULT(Cannot find NET-SNMP libraries(snmp)) -+) - - # ****************** Spine Result Buffer Check *********************** - # Check for the default spine output buffer size -diff -Naur cacti-spine-0.8.8d/Makefile.am cacti-spine-0.8.8d-patched/Makefile.am ---- cacti-spine-0.8.8d/Makefile.am 2015-06-08 20:26:02.000000000 +0200 -+++ cacti-spine-0.8.8d-patched/Makefile.am 2015-06-12 16:41:39.961073148 +0200 -@@ -5,4 +5,6 @@ - configdir = $(sysconfdir) - config_DATA = spine.conf.dist - --bin_PROGRAMS = spine -\ No newline at end of file -+bin_PROGRAMS = spine -+ -+ACLOCAL_AMFLAGS = -I m4