View | Details | Raw Unified | Return to bug 211613
Collapse All | Expand All

(-)net-mgmt/collectd5/Makefile (-2 / +1 lines)
Lines 2-9 Link Here
2 
# $FreeBSD$
 2 
# $FreeBSD$
3 

          3
          

        

        

          4
          
PORTNAME=	collectd

          4
          
PORTNAME=	collectd

        

          
            

              5
              
PORTVERSION=	5.5.1


              5
              
PORTVERSION=	5.5.2

            

            

              6
              
PORTREVISION=	4


              
              
            

        

          7
          
CATEGORIES=	net-mgmt

          6
          
CATEGORIES=	net-mgmt

        

        

          8
          
MASTER_SITES=	https://collectd.org/files/ \

          7
          
MASTER_SITES=	https://collectd.org/files/ \

        

        

          9
          
		http://collectd.org/files/

          8
          
		http://collectd.org/files/

        



(-)net-mgmt/collectd5/distinfo
      (-2 / +3 lines)




  

    
      
            Lines 1-2
          
      
      
        Link Here
      
    
  

          
            

              1
              
SHA256 (collectd-5.5.1.tar.bz2) = f9c5d526e1f0429a7db1ccd90bdf9e23923a2fd43b7285cfda8f0341e5c0bc3f


              1
              
TIMESTAMP = 1469564676

            

            

              2
              
SIZE (collectd-5.5.1.tar.bz2) = 1797852


              2
              
SHA256 (collectd-5.5.2.tar.bz2) = 017f3a4062187e594d8ab6af685655fb82a8a942dc574668e68242bdb8ba820f

            

            

              
              

              3
              
SIZE (collectd-5.5.2.tar.bz2) = 1800476

            



(-)net-mgmt/collectd5/files/patch-src_zfs__arc.c
      (-7 / +6 lines)




  

    
      
            Lines 1-14
          
      
      
        Link Here
      
    
  

          
            

              1
              
--- src/zfs_arc.c.orig	2016-01-22 09:51:17 UTC


              1
              
--- src/zfs_arc.c.orig	2016-07-26 05:57:19 UTC

            

        

          2
          
+++ src/zfs_arc.c

          2
          
+++ src/zfs_arc.c

        

          
            

              3
              
@@ -270,8 +270,11 @@ static int za_read (void)


              3
              
@@ -270,10 +270,6 @@ static int za_read (void)

            

        

          4
          
 	za_read_derive (ksp, "deleted",  "cache_operation", "deleted");

          4
          
 	za_read_derive (ksp, "deleted",  "cache_operation", "deleted");

        

        

          5
          
 #if __FreeBSD__

          5
          
 #if __FreeBSD__

        

        

          6
          
 	za_read_derive (ksp, "allocated","cache_operation", "allocated");

          6
          
 	za_read_derive (ksp, "allocated","cache_operation", "allocated");

        

          
            

              7
              
+#if defined(__FreeBSD_version) && (__FreeBSD_version < 1002501)


              7
              
-#if defined(__FreeBSD_version) && (__FreeBSD_version < 1002501)

            

            

              8
              
+	/* stolen removed from sysctl kstat.zfs.misc.arcstats on FreeBSD 10.2+ */


              8
              
-	/* stolen removed from sysctl kstat.zfs.misc.arcstats on FreeBSD 10.2+ */

            

            

              9
              
 	za_read_derive (ksp, "stolen",   "cache_operation", "stolen");


              9
              
-	za_read_derive (ksp, "stolen",   "cache_operation", "stolen");

            

            

              
              

              10
              
-#endif

            

        

          10
          
 #endif

          11
          
 #endif

        

            

              11
              
+#endif

              
              
            

        

          12
          
 

          12
          
 

        

        

          13
          
 	/* Issue indicators */

          13
          
 	/* Issue indicators */

        

            

              14
              
 	za_read_derive (ksp, "mutex_miss", "mutex_operations", "miss");

              
              
            



(-)net-mgmt/collectd5/files/patch-version-gen.sh
      (-3 / +3 lines)




  

    
      
            Lines 1-9
          
      
      
        Link Here
      
    
  

          
            

              1
              
--- version-gen.sh.orig	2016-01-22 09:51:17 UTC


              1
              
--- version-gen.sh.orig	2016-08-05 21:19:57 UTC

            

        

          2
          
+++ version-gen.sh

          2
          
+++ version-gen.sh

        

        

          3
          
@@ -1,13 +1,3 @@

          3
          
@@ -1,13 +1,3 @@

        

        

          4
          
 #!/bin/sh

          4
          
 #!/bin/sh

        

        

          5
          
 

          5
          
 

        

          
            

              6
              
-DEFAULT_VERSION="5.5.1.git"


              6
              
-DEFAULT_VERSION="5.5.2.git"

            

        

          7
          
-

          7
          
-

        

        

          8
          
-VERSION="`git describe 2> /dev/null | grep collectd | sed -e 's/^collectd-//'`"

          8
          
-VERSION="`git describe 2> /dev/null | grep collectd | sed -e 's/^collectd-//'`"

        

        

          9
          
-

          9
          
-

        

  

    
      
            Lines 14-17
          
      
      
        Link Here
      
    
  

        

          14
          
-VERSION="`echo \"$VERSION\" | sed -e 's/-/./g'`"

          14
          
-VERSION="`echo \"$VERSION\" | sed -e 's/-/./g'`"

        

        

          15
          
-

          15
          
-

        

        

          16
          
-printf "%s" "$VERSION"

          16
          
-printf "%s" "$VERSION"

        

          
            

              17
              
+echo -n "5.5.1.git"


              17
              
+echo -n '5.5.2.git'

            






  

  Return to bug 211613