svn commit: r353889 - in head/devel/libstatgrab: . files

Tim Bishop tdb at FreeBSD.org
Mon May 12 20:02:00 UTC 2014 

Author: tdb
Date: Mon May 12 20:01:59 2014
New Revision: 353889
URL: http://svnweb.freebsd.org/changeset/ports/353889
QAT: https://qat.redports.org/buildarchive/r353889/

Log:
  - Update to 0.90
  - Remove duplicate MASTER_SITES keeping http in preference to ftp
  - Drop separate DIST_SUBDIR, it's not needed
  - Implement USES=libtool
  - Convert -DWITHOUT_X to options framework
  - The tools need perl, so add dependency when that option is chosen
  
  Note that this version has an API that is different enough to the
  previous version that dependent ports will need fixing to work with
  this updated libstatgrab library. I'll take care of that.

Modified:
  head/devel/libstatgrab/Makefile
  head/devel/libstatgrab/distinfo
  head/devel/libstatgrab/files/patch-configure
  head/devel/libstatgrab/pkg-plist

Modified: head/devel/libstatgrab/Makefile
==============================================================================
--- head/devel/libstatgrab/Makefile	Mon May 12 19:26:14 2014	(r353888)
+++ head/devel/libstatgrab/Makefile	Mon May 12 20:01:59 2014	(r353889)
@@ -2,37 +2,36 @@
 # $FreeBSD$
 
 PORTNAME=	libstatgrab
-PORTVERSION=	0.17
+PORTVERSION=	0.90
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.uk.i-scream.org/pub/i-scream/%SUBDIR%/ \
-		http://ftp.uk.i-scream.org/pub/i-scream/%SUBDIR%/ \
-		http://dl.ambiweb.de/mirrors/ftp.i-scream.org/%SUBDIR%/ \
-		ftp://ftp.i-scream.org/pub/i-scream/%SUBDIR%/ \
-		http://ftp.i-scream.org/pub/i-scream/%SUBDIR%/
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://ftp.uk.i-scream.org/pub/i-scream/libstatgrab/ \
+		http://dl.ambiweb.de/mirrors/ftp.i-scream.org/libstatgrab/ \
+		http://ftp.i-scream.org/pub/i-scream/libstatgrab/
 
 MAINTAINER=	tdb at FreeBSD.org
 COMMENT=	Provides a useful interface to system statistics
 
-DIST_SUBDIR=	i-scream
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USES=		pathfix pkgconfig
+USES=		pathfix pkgconfig libtool
 
-CONFIGURE_ARGS+=	--disable-examples
+CONFIGURE_ARGS=	--disable-examples
 
-.ifdef(WITHOUT_STATGRAB)
-CONFIGURE_ARGS+=	--disable-statgrab
-PLIST_SUB+=		STATGRAB="@comment "
-.else
-PLIST_SUB+=		STATGRAB=""
-.endif
+OPTIONS_DEFINE=	TOOLS
+OPTIONS_DEFAULT=	TOOLS
+
+TOOLS_DESC=	Build and install statgrab and saidar
+
+OPTIONS_SUB=	yes
+
+.include <bsd.port.options.mk>
 
-.ifdef(WITHOUT_SAIDAR)
-CONFIGURE_ARGS+=	--disable-saidar
-PLIST_SUB+=		SAIDAR="@comment "
+.if ${PORT_OPTIONS:MTOOLS}
+USES+=		shebangfix perl5
+SHEBANG_FILES=	src/statgrab/statgrab-make-mrtg-config.in \
+		src/statgrab/statgrab-make-mrtg-index.in
 .else
-PLIST_SUB+=		SAIDAR=""
+CONFIGURE_ARGS+=	--disable-statgrab --disable-saidar
 .endif
 
 .include <bsd.port.mk>

Modified: head/devel/libstatgrab/distinfo
==============================================================================
--- head/devel/libstatgrab/distinfo	Mon May 12 19:26:14 2014	(r353888)
+++ head/devel/libstatgrab/distinfo	Mon May 12 20:01:59 2014	(r353889)
@@ -1,2 +1,2 @@
-SHA256 (i-scream/libstatgrab-0.17.tar.gz) = bbaa88c6bde8bd3cf2720b81a26528cc055a7e83e4ea3bdb1d0a3c4287cceb88
-SIZE (i-scream/libstatgrab-0.17.tar.gz) = 463224
+SHA256 (libstatgrab-0.90.tar.gz) = f614daf8d79bc3466ce62e871ed674f4fb549e26c8b3273fd53ba35a37b2cd70
+SIZE (libstatgrab-0.90.tar.gz) = 755785

Modified: head/devel/libstatgrab/files/patch-configure
==============================================================================
--- head/devel/libstatgrab/files/patch-configure	Mon May 12 19:26:14 2014	(r353888)
+++ head/devel/libstatgrab/files/patch-configure	Mon May 12 20:01:59 2014	(r353889)
@@ -1,11 +1,11 @@
---- ./configure.orig	2011-11-11 14:14:46.000000000 +0000
-+++ ./configure	2011-11-11 14:17:28.000000000 +0000
-@@ -21740,7 +21740,7 @@
- 	BIN_PERM="2755"
- 	LINKFLAGS="-lkvm -ldevstat"
- 	;;
--freebsd[5-9].*)
-+freebsd[5-9].*|freebsd1[0-9].*)
+--- ./configure.orig	2013-11-22 17:43:59.703104875 +0000
++++ ./configure	2013-11-22 17:45:20.136104432 +0000
+@@ -10874,7 +10874,7 @@
+ $as_echo "#define FREEBSD /**/" >>confdefs.h
  
- cat >>confdefs.h <<\_ACEOF
- #define ALLBSD
+ 	 ;; #(
+-  freebsd[5-9].*|freebsd10.*) :
++  freebsd[5-9].*|freebsd1[0-9].*) :
+ 
+ 
+ $as_echo "#define FREEBSD /**/" >>confdefs.h

Modified: head/devel/libstatgrab/pkg-plist
==============================================================================
--- head/devel/libstatgrab/pkg-plist	Mon May 12 19:26:14 2014	(r353888)
+++ head/devel/libstatgrab/pkg-plist	Mon May 12 20:01:59 2014	(r353889)
@@ -1,34 +1,117 @@
-%%SAIDAR%%bin/saidar
-%%STATGRAB%%bin/statgrab
-%%STATGRAB%%bin/statgrab-make-mrtg-config
-%%STATGRAB%%bin/statgrab-make-mrtg-index
+%%TOOLS%%bin/saidar
+%%TOOLS%%bin/statgrab
+%%TOOLS%%bin/statgrab-make-mrtg-config
+%%TOOLS%%bin/statgrab-make-mrtg-index
 include/statgrab.h
-include/statgrab_deprecated.h
 lib/libstatgrab.a
-lib/libstatgrab.la
 lib/libstatgrab.so
-lib/libstatgrab.so.8
+lib/libstatgrab.so.9
+lib/libstatgrab.so.9.0.0
 libdata/pkgconfig/libstatgrab.pc
-man/man1/saidar.1.gz
-man/man1/statgrab-make-mrtg-config.1.gz
-man/man1/statgrab-make-mrtg-index.1.gz
-man/man1/statgrab.1.gz
+%%TOOLS%%man/man1/saidar.1.gz
+%%TOOLS%%man/man1/statgrab-make-mrtg-config.1.gz
+%%TOOLS%%man/man1/statgrab-make-mrtg-index.1.gz
+%%TOOLS%%man/man1/statgrab.1.gz
+man/man3/libstatgrab.3.gz
+man/man3/sg_clear_error.3.gz
+man/man3/sg_comp_destroy.3.gz
+man/man3/sg_comp_get_tls.3.gz
+man/man3/sg_comp_init.3.gz
+man/man3/sg_disk_io_compare_name.3.gz
+man/man3/sg_disk_io_compare_traffic.3.gz
+man/man3/sg_drop_privileges.3.gz
+man/man3/sg_free_cpu_stats.3.gz
+man/man3/sg_free_disk_io_stats.3.gz
+man/man3/sg_free_fs_stats.3.gz
+man/man3/sg_free_host_info.3.gz
+man/man3/sg_free_load_stats.3.gz
+man/man3/sg_free_mem_stats.3.gz
+man/man3/sg_free_network_iface_stats.3.gz
+man/man3/sg_free_network_io_stats.3.gz
+man/man3/sg_free_page_stats.3.gz
+man/man3/sg_free_process_count.3.gz
+man/man3/sg_free_stats_buf.3.gz
+man/man3/sg_free_swap_stats.3.gz
+man/man3/sg_free_user_stats.3.gz
+man/man3/sg_fs_compare_device_name.3.gz
+man/man3/sg_fs_compare_mnt_point.3.gz
 man/man3/sg_get_cpu_percents.3.gz
+man/man3/sg_get_cpu_percents_of.3.gz
+man/man3/sg_get_cpu_percents_r.3.gz
 man/man3/sg_get_cpu_stats.3.gz
 man/man3/sg_get_cpu_stats_diff.3.gz
+man/man3/sg_get_cpu_stats_diff_between.3.gz
+man/man3/sg_get_cpu_stats_r.3.gz
 man/man3/sg_get_disk_io_stats.3.gz
 man/man3/sg_get_disk_io_stats_diff.3.gz
+man/man3/sg_get_disk_io_stats_diff_between.3.gz
+man/man3/sg_get_disk_io_stats_r.3.gz
+man/man3/sg_get_error.3.gz
+man/man3/sg_get_error_arg.3.gz
+man/man3/sg_get_error_details.3.gz
+man/man3/sg_get_error_errno.3.gz
 man/man3/sg_get_fs_stats.3.gz
+man/man3/sg_get_fs_stats_diff.3.gz
+man/man3/sg_get_fs_stats_diff_between.3.gz
+man/man3/sg_get_fs_stats_r.3.gz
 man/man3/sg_get_host_info.3.gz
+man/man3/sg_get_host_info_r.3.gz
 man/man3/sg_get_load_stats.3.gz
+man/man3/sg_get_load_stats_r.3.gz
 man/man3/sg_get_mem_stats.3.gz
+man/man3/sg_get_mem_stats_r.3.gz
+man/man3/sg_get_nelements.3.gz
 man/man3/sg_get_network_iface_stats.3.gz
+man/man3/sg_get_network_iface_stats_r.3.gz
 man/man3/sg_get_network_io_stats.3.gz
 man/man3/sg_get_network_io_stats_diff.3.gz
+man/man3/sg_get_network_io_stats_diff_between.3.gz
+man/man3/sg_get_network_io_stats_r.3.gz
 man/man3/sg_get_page_stats.3.gz
 man/man3/sg_get_page_stats_diff.3.gz
+man/man3/sg_get_page_stats_diff_between.3.gz
+man/man3/sg_get_page_stats_r.3.gz
 man/man3/sg_get_process_count.3.gz
+man/man3/sg_get_process_count_of.3.gz
+man/man3/sg_get_process_count_r.3.gz
 man/man3/sg_get_process_stats.3.gz
+man/man3/sg_get_process_stats_r.3.gz
 man/man3/sg_get_swap_stats.3.gz
+man/man3/sg_get_swap_stats_r.3.gz
 man/man3/sg_get_user_stats.3.gz
+man/man3/sg_get_user_stats_r.3.gz
+man/man3/sg_get_valid_filesystems.3.gz
+man/man3/sg_global_lock.3.gz
+man/man3/sg_global_unlock.3.gz
+man/man3/sg_init.3.gz
+man/man3/sg_internal-intro.3.gz
+man/man3/sg_intro.3.gz
+man/man3/sg_lock_mutex.3.gz
+man/man3/sg_network_iface_compare_name.3.gz
+man/man3/sg_network_io_compare_name.3.gz
+man/man3/sg_process_compare_cpu.3.gz
+man/man3/sg_process_compare_gid.3.gz
+man/man3/sg_process_compare_name.3.gz
+man/man3/sg_process_compare_pid.3.gz
+man/man3/sg_process_compare_res.3.gz
+man/man3/sg_process_compare_size.3.gz
+man/man3/sg_process_compare_time.3.gz
+man/man3/sg_process_compare_uid.3.gz
+man/man3/sg_prove_vector.3.gz
+man/man3/sg_set_error.3.gz
+man/man3/sg_set_error_with_errno.3.gz
+man/man3/sg_set_error_with_errno_code.3.gz
+man/man3/sg_set_valid_filesystems.3.gz
+man/man3/sg_shutdown.3.gz
+man/man3/sg_snapshot.3.gz
+man/man3/sg_str_error.3.gz
+man/man3/sg_strperror.3.gz
+man/man3/sg_unlock_mutex.3.gz
+man/man3/sg_vector_clear.3.gz
+man/man3/sg_vector_clone.3.gz
+man/man3/sg_vector_clone_into.3.gz
+man/man3/sg_vector_compute_diff.3.gz
+man/man3/sg_vector_create.3.gz
+man/man3/sg_vector_free.3.gz
+man/man3/sg_vector_resize.3.gz
 man/man3/statgrab.3.gz

More information about the svn-ports-head mailing list