From: Jo-Philipp Wich Date: Thu, 19 Jan 2012 16:49:29 +0000 (+0000) Subject: [packages] move updated mrtg to the correct location X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=4794234ea43c1988154639b0c6dfe6f4b63dc8bb;p=openwrt%2Fsvn-archive%2Farchive.git [packages] move updated mrtg to the correct location SVN-Revision: 29815 --- diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile new file mode 100644 index 0000000000..ef3d9c9d00 --- /dev/null +++ b/net/mrtg/Makefile @@ -0,0 +1,55 @@ +# +# Copyright (C) 2011-2012 OpenWrt.org +# Copyright (C) 2011 Paolo Pisati +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=mrtg +PKG_VERSION:=2.17.3 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://oss.oetiker.ch/mrtg/pub/ +PKG_MD5SUM:=c803f671d04367ee719039ea71fb5b37 + +PKG_INSTALL:=1 +PKG_FIXUP:=autoreconf + +include $(INCLUDE_DIR)/package.mk + +define Package/mrtg + SECTION:=net + CATEGORY:=Network + DEPENDS:=+libgd +libpng +zlib +perl +perlbase-essential +perlbase-findbin \ + +perlbase-cwd +perlbase-config +perlbase-file +perlbase-getopt \ + +perlbase-math +perlbase-integer +perlbase-xsloader +perlbase-pod \ + +perlbase-universal +perlbase-socket +perlbase-posix +perlbase-autoloader \ + +perlbase-fcntl +perlbase-tie +perlbase-io +perlbase-symbol \ + +perlbase-selectsaver +perlbase-errno + TITLE:=The Multi Router Traffic Grapher + URL:=http://oss.oetiker.ch/mrtg/index.en.html +endef + +define Package/mrtg/description + The Multi Router Traffic Grapher, or just simply MRTG, is free software for + monitoring and measuring the traffic load on network links. It allows the + user to see traffic load on a network over time in graphical form. It was + originally developed by Tobias Oetiker and Dave Rand to monitor router + traffic, but has developed into a tool that can create graphs and statistics + for almost anything. +endef + +define Package/mrtg/install + $(INSTALL_DIR) $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/share + $(CP) $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share/ +endef + +$(eval $(call BuildPackage,mrtg)) diff --git a/net/mrtg/patches/001-rm-printf-longlong-fmt-test.patch b/net/mrtg/patches/001-rm-printf-longlong-fmt-test.patch new file mode 100644 index 0000000000..d6cb0c82ac --- /dev/null +++ b/net/mrtg/patches/001-rm-printf-longlong-fmt-test.patch @@ -0,0 +1,50 @@ +--- mrtg-2.17.3.orig/configure.in 2011-12-25 23:54:18.284584003 +0100 ++++ mrtg-2.17.3/configure.in 2011-12-25 23:54:52.377260252 +0100 +@@ -19,47 +19,6 @@ + + AC_PATH_PROGS(NROFF, groff nroff) + +-dnl Check for long long type (64 bit rateup) +-AC_CHECK_HEADERS(inttypes.h) +-AC_CHECK_TYPE(unsigned long long) +-AC_CHECK_TYPE(long long) +-AC_CHECK_FUNCS(strtoll) +- +-# Taken from libIDL-0.8.2 +-AC_MSG_CHECKING([for printf long long format specifier]) +-AC_CACHE_VAL(long_long_format_specifier,[ +- for format in ll l q I64; do +- AC_TRY_RUN([#include +- int main() +- { +- long long b, a = -0x3AFAFAFAFAFAFAFALL; +- char buffer[1000]; +- sprintf (buffer, "%${format}u", a); +- sscanf (buffer, "%${format}u", &b); +- exit (b!=a); +- } +- ], +- long_long_format_specifier="%${format}d" +- long_long_format="${format}d" +- break) +- done]) +-AC_MSG_RESULT($long_long_format_specifier) +-AC_DEFINE_UNQUOTED(LLD, "$long_long_format_specifier", +- [How to print a long long]) +-AC_DEFINE_UNQUOTED(LLD_FORMAT, "$long_long_format", +- [long long format without % specifier]) +- +-AH_BOTTOM( +-#ifndef HAVE_STRTOLL +-long long int strtoll(const char *str, char **ptr, int base) +-{ +- long long int ll; +- sscanf(str, LLD, &ll); +- return ll; +-} +-#endif +-) +- + dnl Checks for libraries. + AC_CHECK_LIB(m, pow, [ MATHLIBS="-lm" ]) + diff --git a/packages/net/mrtg/Makefile b/packages/net/mrtg/Makefile deleted file mode 100644 index ef3d9c9d00..0000000000 --- a/packages/net/mrtg/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# -# Copyright (C) 2011-2012 OpenWrt.org -# Copyright (C) 2011 Paolo Pisati -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=mrtg -PKG_VERSION:=2.17.3 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://oss.oetiker.ch/mrtg/pub/ -PKG_MD5SUM:=c803f671d04367ee719039ea71fb5b37 - -PKG_INSTALL:=1 -PKG_FIXUP:=autoreconf - -include $(INCLUDE_DIR)/package.mk - -define Package/mrtg - SECTION:=net - CATEGORY:=Network - DEPENDS:=+libgd +libpng +zlib +perl +perlbase-essential +perlbase-findbin \ - +perlbase-cwd +perlbase-config +perlbase-file +perlbase-getopt \ - +perlbase-math +perlbase-integer +perlbase-xsloader +perlbase-pod \ - +perlbase-universal +perlbase-socket +perlbase-posix +perlbase-autoloader \ - +perlbase-fcntl +perlbase-tie +perlbase-io +perlbase-symbol \ - +perlbase-selectsaver +perlbase-errno - TITLE:=The Multi Router Traffic Grapher - URL:=http://oss.oetiker.ch/mrtg/index.en.html -endef - -define Package/mrtg/description - The Multi Router Traffic Grapher, or just simply MRTG, is free software for - monitoring and measuring the traffic load on network links. It allows the - user to see traffic load on a network over time in graphical form. It was - originally developed by Tobias Oetiker and Dave Rand to monitor router - traffic, but has developed into a tool that can create graphs and statistics - for almost anything. -endef - -define Package/mrtg/install - $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/share - $(CP) $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share/ -endef - -$(eval $(call BuildPackage,mrtg)) diff --git a/packages/net/mrtg/patches/001-rm-printf-longlong-fmt-test.patch b/packages/net/mrtg/patches/001-rm-printf-longlong-fmt-test.patch deleted file mode 100644 index d6cb0c82ac..0000000000 --- a/packages/net/mrtg/patches/001-rm-printf-longlong-fmt-test.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- mrtg-2.17.3.orig/configure.in 2011-12-25 23:54:18.284584003 +0100 -+++ mrtg-2.17.3/configure.in 2011-12-25 23:54:52.377260252 +0100 -@@ -19,47 +19,6 @@ - - AC_PATH_PROGS(NROFF, groff nroff) - --dnl Check for long long type (64 bit rateup) --AC_CHECK_HEADERS(inttypes.h) --AC_CHECK_TYPE(unsigned long long) --AC_CHECK_TYPE(long long) --AC_CHECK_FUNCS(strtoll) -- --# Taken from libIDL-0.8.2 --AC_MSG_CHECKING([for printf long long format specifier]) --AC_CACHE_VAL(long_long_format_specifier,[ -- for format in ll l q I64; do -- AC_TRY_RUN([#include -- int main() -- { -- long long b, a = -0x3AFAFAFAFAFAFAFALL; -- char buffer[1000]; -- sprintf (buffer, "%${format}u", a); -- sscanf (buffer, "%${format}u", &b); -- exit (b!=a); -- } -- ], -- long_long_format_specifier="%${format}d" -- long_long_format="${format}d" -- break) -- done]) --AC_MSG_RESULT($long_long_format_specifier) --AC_DEFINE_UNQUOTED(LLD, "$long_long_format_specifier", -- [How to print a long long]) --AC_DEFINE_UNQUOTED(LLD_FORMAT, "$long_long_format", -- [long long format without % specifier]) -- --AH_BOTTOM( --#ifndef HAVE_STRTOLL --long long int strtoll(const char *str, char **ptr, int base) --{ -- long long int ll; -- sscanf(str, LLD, &ll); -- return ll; --} --#endif --) -- - dnl Checks for libraries. - AC_CHECK_LIB(m, pow, [ MATHLIBS="-lm" ]) -