From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Apr 10 22:50:05 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 44AB51065674 for ; Tue, 10 Apr 2012 22:50:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 4C2058FC25 for ; Tue, 10 Apr 2012 22:50:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q3AMo1Aj083447 for ; Tue, 10 Apr 2012 22:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q3AMo14C083446; Tue, 10 Apr 2012 22:50:01 GMT (envelope-from gnats) Resent-Date: Tue, 10 Apr 2012 22:50:01 GMT Resent-Message-Id: <201204102250.q3AMo14C083446@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Mark Felder Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0D1A71065670 for ; Tue, 10 Apr 2012 22:46:57 +0000 (UTC) (envelope-from feld@feld.me) Received: from feld.me (unknown [IPv6:2607:f4e0:100:300::2]) by mx1.freebsd.org (Postfix) with ESMTP id D00CC8FC19 for ; Tue, 10 Apr 2012 22:46:56 +0000 (UTC) Received: from feld by feld.me with local (Exim 4.77 (FreeBSD)) (envelope-from ) id 1SHjpw-000FsB-6M; Tue, 10 Apr 2012 17:46:56 -0500 Message-Id: Date: Tue, 10 Apr 2012 17:46:56 -0500 From: Mark Felder To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: ports@bsdserwis.com Subject: ports/166831: [PATCH] net-mgmt/collectd: add routeros support X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Apr 2012 22:50:05 -0000 >Number: 166831 >Category: ports >Synopsis: [PATCH] net-mgmt/collectd: add routeros support >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Apr 10 22:50:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Mark Felder >Release: FreeBSD 9.0-STABLE amd64 >Organization: >Environment: System: FreeBSD mwi1.coffeenet.org 9.0-STABLE FreeBSD 9.0-STABLE #1 r230267: Tue Jan 17 15:11:44 CST >Description: Add routeros support Port maintainer (ports@bsdserwis.com) is cc'd. Generated with FreeBSD Port Tools 0.99_4 (mode: change, diff: suffix) >How-To-Repeat: >Fix: --- collectd-4.10.4_2.patch begins here --- diff -ruN --exclude=CVS ../collectd.orig/Makefile ./Makefile --- ../collectd.orig/Makefile 2012-02-10 23:21:35.000000000 -0600 +++ ./Makefile 2012-04-10 17:43:45.000000000 -0500 @@ -7,7 +7,7 @@ PORTNAME= collectd PORTVERSION= 4.10.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= http://collectd.org/files/ @@ -41,6 +41,7 @@ PGSQL "Input: PostgreSQL" Off \ PING "Input: Network latency (liboping)" On \ PYTHON "Input: Python plugin" Off \ + ROUTEROS "Input: RouterOS plugin" Off \ SNMP "Input: SNMP" On \ TOKYOTYRANT "Input: Tokyotyrant database" Off \ XMMS "Input: XMMS" Off \ @@ -105,7 +106,6 @@ --disable-perl \ --disable-pinba \ --disable-protocols \ - --disable-routeros \ --disable-sensors \ --disable-serial \ --disable-table \ @@ -333,6 +333,15 @@ PLIST_SUB+= PYTHON="@comment " .endif +.if defined(WITH_ROUTEROS) +LIB_DEPENDS+= routeros:${PORTSDIR}/net/librouteros +CONFIGURE_ARGS+=--enable-routeros --with-librouteros=${LOCALBASE} +PLIST_SUB+= ROUTEROS="" +.else +CONFIGURE_ARGS+=--disable-routeros --without-librouteros +PLIST_SUB+= ROUTEROS="@comment " +.endif + .if defined(WITH_RRDTOOL) LIB_DEPENDS+= rrd:${PORTSDIR}/databases/rrdtool CONFIGURE_ARGS+=--enable-rrdtool diff -ruN --exclude=CVS ../collectd.orig/files/patch-configure.in ./files/patch-configure.in --- ../collectd.orig/files/patch-configure.in 2012-01-09 15:13:47.000000000 -0600 +++ ./files/patch-configure.in 2012-04-10 16:47:38.000000000 -0500 @@ -1,6 +1,15 @@ ---- configure.in.orig 2011-10-14 22:46:13.000000000 +0200 -+++ configure.in 2012-01-08 13:56:06.000000000 +0100 -@@ -1541,9 +1541,6 @@ +--- configure.in.orig 2011-10-14 12:49:49.000000000 -0800 ++++ configure.in 2012-03-20 08:09:25.000000000 -0800 +@@ -98,7 +98,7 @@ + fi + + # Where to install .pc files. +-pkgconfigdir="${libdir}/pkgconfig" ++pkgconfigdir="${prefix}/libdata/pkgconfig" + AC_SUBST(pkgconfigdir) + + # Check for standards compliance mode +@@ -1745,9 +1745,6 @@ [with_libgcrypt="yes"], [with_libgcrypt="no (symbol gcry_md_hash_buffer not found)"]) @@ -10,16 +19,16 @@ fi CPPFLAGS="$SAVE_CPPFLAGS" -@@ -2960,7 +2957,7 @@ +@@ -3165,7 +3162,7 @@ if test "x$with_python" = "xyes" then AC_MSG_CHECKING([for Python LIBS]) - python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" | "$with_python_prog" 2>&1` -+ python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0)+\"/\"+distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" | "$with_python_prog" 2>&1` ++ python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_var(\"LINKFORSHARED\")+\" -L\"+distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0)+\" -l\"+distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0).replace(\"lib\", \"\").replace(\".a\", \"\"))" | "$with_python_prog" 2>&1` python_config_status=$? if test "$python_config_status" -ne 0 || test "x$python_library_flags" = "x" -@@ -2975,7 +2972,7 @@ +@@ -3180,7 +3177,7 @@ if test "x$with_python" = "xyes" then LDFLAGS="-L$python_library_path $LDFLAGS" diff -ruN --exclude=CVS ../collectd.orig/pkg-plist ./pkg-plist --- ../collectd.orig/pkg-plist 2011-12-26 10:33:51.000000000 -0600 +++ ./pkg-plist 2012-04-10 16:46:59.000000000 -0500 @@ -77,6 +77,8 @@ %%PYTHON%%lib/collectd/python.so lib/collectd/processes.so lib/collectd/processes.la +%%ROUTEROS%%lib/collectd/routeros.la +%%ROUTEROS%%lib/collectd/routeros.so %%RRD%%lib/collectd/rrdtool.la %%RRD%%lib/collectd/rrdtool.so %%RRDCACHED%%lib/collectd/rrdcached.la --- collectd-4.10.4_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: