Attachment 126210 Details for Bug 169949 – fping.update.diff

[patch] fping.update.diff

fping.update.diff (text/x-patch), 19.00 KB, created by Niclas Zeising on 2012-07-18 21:05:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Niclas Zeising

Created: 2012-07-18 21:05:31 UTC

Size: 19.00 KB

patch

obsolete

>Index: head/net/fping/pkg-descr
>===================================================================
>--- head/net/fping/pkg-descr	(revision 301103)
>+++ head/net/fping/pkg-descr	(working copy)
>@@ -13,4 +13,4 @@
>      Unlike ping, fping is meant to be used in scripts and its
>      output is easy to parse.
> 
>-WWW: http://www.fping.com/
>+WWW: http://www.fping.org/
>\ No newline at end of file
>Index: head/net/fping/distinfo
>===================================================================
>--- head/net/fping/distinfo	(revision 301103)
>+++ head/net/fping/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (fping-2.4b2_to-ipv6.tar.gz) = 77e1a90af4fff4a5ffc4b70542c6ff44130558357e7d549f99a9eff23108d172
>-SIZE (fping-2.4b2_to-ipv6.tar.gz) = 63333
>+SHA256 (fping-3.2.tar.gz) = b26739a1fa3471775ff1958a1e3d7597f12c9eb56429c29cf956e52f5046e2c1
>+SIZE (fping-3.2.tar.gz) = 137967
>Index: head/net/fping/files/patch-03
>===================================================================
>--- head/net/fping/files/patch-03	(revision 301103)
>+++ head/net/fping/files/patch-03	(working copy)
>@@ -1,32 +0,0 @@
>---- fping.8.orig	Mon Jan 21 01:05:48 2002
>-+++ fping.8	Sun Jul  7 22:03:43 2002
>-@@ -1,4 +1,4 @@
>--.TH fping l
>-+.TH fping 8
>- .SH NAME
>- fping \- send ICMP ECHO_REQUEST packets to network hosts
>- .SH SYNOPSIS
>-@@ -152,12 +152,12 @@
>- example none the less. 
>- .nf
>- 
>--#!/usr/local/bin/perl
>-+#!/usr/bin/perl
>- require 'open2.pl';
>- 
>- $MAILTO = "root";
>- 
>--$pid = &open2("OUTPUT","INPUT","/usr/local/bin/fping -u");
>-+$pid = &open2("OUTPUT","INPUT","/usr/local/sbin/fping -u");
>- 
>- @check=("slapshot","foo","foobar");
>- 
>-@@ -178,7 +178,7 @@
>- that are currently reachable.
>- .nf
>- 
>--#!/usr/local/bin/perl
>-+#!/usr/bin/perl
>- 
>- $hosts_to_backup = `cat /etc/hosts.backup | fping -a`;
>- 
>Index: head/net/fping/files/patch-src_Makefile.in
>===================================================================
>--- head/net/fping/files/patch-src_Makefile.in	(revision 0)
>+++ head/net/fping/files/patch-src_Makefile.in	(working copy)
>@@ -0,0 +1,96 @@
>+--- src/Makefile.in.orig	2012-07-18 21:51:51.000000000 +0200
>++++ src/Makefile.in	2012-07-18 21:51:10.000000000 +0200
>+@@ -35,7 +35,9 @@
>+ build_triplet = @build@
>+ host_triplet = @host@
>+ target_triplet = @target@
>+-sbin_PROGRAMS = fping$(EXEEXT)
>++@IPV4_TRUE@am__append_1 = fping
>++@IPV6_TRUE@am__append_2 = fping6
>++sbin_PROGRAMS = $(am__EXEEXT_3)
>+ subdir = src
>+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
>+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
>+@@ -46,11 +48,19 @@
>+ CONFIG_HEADER = $(top_builddir)/config.h
>+ CONFIG_CLEAN_FILES =
>+ CONFIG_CLEAN_VPATH_FILES =
>++@IPV4_TRUE@am__EXEEXT_1 = fping$(EXEEXT)
>++@IPV6_TRUE@am__EXEEXT_2 = fping6$(EXEEXT)
>++am__EXEEXT_3 = $(am__EXEEXT_1) $(am__EXEEXT_2)
>+ am__installdirs = "$(DESTDIR)$(sbindir)"
>+ PROGRAMS = $(sbin_PROGRAMS)
>+ am_fping_OBJECTS = fping.$(OBJEXT)
>+ fping_OBJECTS = $(am_fping_OBJECTS)
>+ fping_LDADD = $(LDADD)
>++am_fping6_OBJECTS = fping6-fping.$(OBJEXT)
>++fping6_OBJECTS = $(am_fping6_OBJECTS)
>++fping6_LDADD = $(LDADD)
>++fping6_LINK = $(CCLD) $(fping6_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
>++	$(LDFLAGS) -o $@
>+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
>+ depcomp = $(SHELL) $(top_srcdir)/depcomp
>+ am__depfiles_maybe = depfiles
>+@@ -59,8 +69,8 @@
>+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
>+ CCLD = $(CC)
>+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
>+-SOURCES = $(fping_SOURCES)
>+-DIST_SOURCES = $(fping_SOURCES)
>++SOURCES = $(fping_SOURCES) $(fping6_SOURCES)
>++DIST_SOURCES = $(fping_SOURCES) $(fping6_SOURCES)
>+ ETAGS = etags
>+ CTAGS = ctags
>+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
>+@@ -163,8 +173,12 @@
>+ top_build_prefix = @top_build_prefix@
>+ top_builddir = @top_builddir@
>+ top_srcdir = @top_srcdir@
>++prog = $(am__append_1) $(am__append_2)
>+ fping_SOURCES = fping.c options.h
>+ fping_DEPENDENCIES = ../config.h
>++fping6_SOURCES = fping.c options.h
>++fping6_DEPENDENCIES = ../config.h
>++fping6_CFLAGS = $(AM_CFLAGS) -DIPV6
>+ all: all-am
>+ 
>+ .SUFFIXES:
>+@@ -239,6 +253,9 @@
>+ fping$(EXEEXT): $(fping_OBJECTS) $(fping_DEPENDENCIES) 
>+ 	@rm -f fping$(EXEEXT)
>+ 	$(LINK) $(fping_OBJECTS) $(fping_LDADD) $(LIBS)
>++fping6$(EXEEXT): $(fping6_OBJECTS) $(fping6_DEPENDENCIES) 
>++	@rm -f fping6$(EXEEXT)
>++	$(fping6_LINK) $(fping6_OBJECTS) $(fping6_LDADD) $(LIBS)
>+ 
>+ mostlyclean-compile:
>+ 	-rm -f *.$(OBJEXT)
>+@@ -247,6 +264,7 @@
>+ 	-rm -f *.tab.c
>+ 
>+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fping.Po@am__quote@
>++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fping6-fping.Po@am__quote@
>+ 
>+ .c.o:
>+ @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
>+@@ -262,6 +280,20 @@
>+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>+ @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
>+ 
>++fping6-fping.o: fping.c
>++@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fping6_CFLAGS) $(CFLAGS) -MT fping6-fping.o -MD -MP -MF $(DEPDIR)/fping6-fping.Tpo -c -o fping6-fping.o `test -f 'fping.c' || echo '$(srcdir)/'`fping.c
>++@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/fping6-fping.Tpo $(DEPDIR)/fping6-fping.Po
>++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fping.c' object='fping6-fping.o' libtool=no @AMDEPBACKSLASH@
>++@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fping6_CFLAGS) $(CFLAGS) -c -o fping6-fping.o `test -f 'fping.c' || echo '$(srcdir)/'`fping.c
>++
>++fping6-fping.obj: fping.c
>++@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fping6_CFLAGS) $(CFLAGS) -MT fping6-fping.obj -MD -MP -MF $(DEPDIR)/fping6-fping.Tpo -c -o fping6-fping.obj `if test -f 'fping.c'; then $(CYGPATH_W) 'fping.c'; else $(CYGPATH_W) '$(srcdir)/fping.c'; fi`
>++@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/fping6-fping.Tpo $(DEPDIR)/fping6-fping.Po
>++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fping.c' object='fping6-fping.obj' libtool=no @AMDEPBACKSLASH@
>++@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fping6_CFLAGS) $(CFLAGS) -c -o fping6-fping.obj `if test -f 'fping.c'; then $(CYGPATH_W) 'fping.c'; else $(CYGPATH_W) '$(srcdir)/fping.c'; fi`
>++
>+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
>+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
>+ 	unique=`for i in $$list; do \
>
>Property changes on: head/net/fping/files/patch-src_Makefile.in
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: head/net/fping/files/patch-sourceaddr
>===================================================================
>--- head/net/fping/files/patch-sourceaddr	(revision 301103)
>+++ head/net/fping/files/patch-sourceaddr	(working copy)
>@@ -1,88 +0,0 @@
>-diff -ru ../fping-2.4b2_to-ipv6-orig/fping.c ./fping.c
>---- ../fping-2.4b2_to-ipv6-orig/fping.c	Sun Jan 20 19:06:30 2002
>-+++ ./fping.c	Fri Apr 13 14:36:02 2007
>-@@ -283,6 +283,12 @@
>- u_int count = 1;
>- u_int trials;
>- u_int report_interval = 0;
>-+int src_addr_present = 0;
>-+#ifndef IPV6
>-+struct in_addr src_addr;
>-+#else
>-+struct in6_addr src_addr;
>-+#endif
>- 
>- /* global stats */
>- long max_reply = 0;
>-@@ -408,6 +414,11 @@
>- 	struct protoent *proto;
>- 	char *buf;
>- 	uid_t uid;
>-+#ifndef IPV6
>-+	struct sockaddr_in sa;
>-+#else
>-+	struct sockaddr_in6 sa;
>-+#endif
>- 	/* check if we are root */
>- 
>- 	if( geteuid() )
>-@@ -491,7 +502,7 @@
>- 
>- 	/* get command line options */
>- 
>--	while( ( c = getopt( argc, argv, "gedhlmnqusaAvz:t:i:p:f:r:c:b:C:Q:B:" ) ) != EOF )
>-+	while( ( c = getopt( argc, argv, "gedhlmnqusaAvz:t:i:p:f:r:c:b:C:Q:B:S:" ) ) != EOF )
>- 	{
>- 		switch( c )
>- 		{
>-@@ -639,6 +650,16 @@
>- 			generate_flag = 1;
>- 			break;
>- 
>-+		case 'S':
>-+#ifndef IPV6
>-+			if( ! inet_pton( AF_INET, optarg, &src_addr ) )
>-+#else
>-+			if( ! inet_pton( AF_INET6, optarg, &src_addr ) )
>-+#endif
>-+				usage();
>-+			src_addr_present = 1;
>-+			break;
>-+
>- 		default:
>- 			usage();
>- 			break;
>-@@ -962,6 +983,22 @@
>- 	if( !num_hosts )
>- 		exit( 2 );
>- 
>-+	/* set the source address */
>-+
>-+	if( src_addr_present )
>-+	{
>-+		memset( &sa, 0, sizeof( sa ) );
>-+#ifndef IPV6
>-+		sa.sin_family = AF_INET;
>-+		sa.sin_addr = src_addr;
>-+#else
>-+		sa.sin6_family = AF_INET6;
>-+		sa.sin6_addr = src_addr;
>-+#endif
>-+		if ( bind( s, (struct sockaddr *)&sa, sizeof( sa ) ) < 0 )
>-+			errno_crash_and_burn( "cannot bind source address" );
>-+	}
>-+
>- 	/* allocate array to hold outstanding ping requests */
>- 
>- 	table = ( HOST_ENTRY** )malloc( sizeof( HOST_ENTRY* ) * num_hosts );
>-@@ -2732,6 +2769,7 @@
>- 	fprintf( stderr, "   -Q n       same as -q, but show summary every n seconds\n" );
>- 	fprintf( stderr, "   -r n       number of retries (default %d)\n", retry );
>- 	fprintf( stderr, "   -s         print final stats\n" );
>-+	fprintf( stderr, "   -S addr    set source address\n" );
>- 	fprintf( stderr, "   -t n       individual target initial timeout (in millisec) (default %d)\n", timeout / 100 );
>- 	fprintf( stderr, "   -u         show targets that are unreachable\n" );
>- 	fprintf( stderr, "   -v         show version\n" );
>-
>-
>-
>Index: head/net/fping/files/patch-02
>===================================================================
>--- head/net/fping/files/patch-02	(revision 301103)
>+++ head/net/fping/files/patch-02	(working copy)
>@@ -1,146 +0,0 @@
>---- fping.c.orig	Mon Jan 21 02:06:30 2002
>-+++ fping.c	Tue Jul 12 18:11:30 2005
>-@@ -42,7 +42,6 @@
>-  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
>-  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
>-  */
>--#define IPV6 1						/* This should be a compiler option, or even better be done from the Makefile... ;) */
>- 
>- #ifndef _NO_PROTO
>- #if !__STDC__ && !defined( __cplusplus ) && !defined( FUNCPROTO ) \
>-@@ -67,7 +66,7 @@
>- 
>- /*** autoconf includes ***/
>- 
>--
>-+#include <sys/types.h>
>- #include <stdio.h>
>- #include <errno.h>
>- #include <time.h>
>-@@ -88,7 +87,6 @@
>- #include <string.h>
>- #include <stddef.h>
>- 
>--#include <sys/types.h>
>- #include <sys/time.h>
>- #include <sys/socket.h>
>- 
>-@@ -112,6 +110,10 @@
>- #include <arpa/inet.h>
>- #include <netdb.h>
>- 
>-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
>-+#include <sys/param.h>
>-+#endif
>-+
>- /* RS6000 has sys/select.h */
>- #ifdef HAVE_SYS_SELECT_H
>- #include <sys/select.h>
>-@@ -246,13 +248,13 @@
>-      struct timeval       last_send_time;     /* time of last packet sent */
>-      int                  num_sent;           /* number of ping packets sent */
>-      int                  num_recv;           /* number of pings received */
>--     int                  max_reply;          /* longest response time */
>--     int                  min_reply;          /* shortest response time */
>-+     long                 max_reply;          /* longest response time */
>-+     long                 min_reply;          /* shortest response time */
>-      int                  total_time;         /* sum of response times */
>-      int                  num_sent_i;         /* number of ping packets sent */
>-      int                  num_recv_i;         /* number of pings received */
>--     int                  max_reply_i;        /* longest response time */
>--     int                  min_reply_i;        /* shortest response time */
>-+     long                 max_reply_i;        /* longest response time */
>-+     long                 min_reply_i;        /* shortest response time */
>-      int                  total_time_i;       /* sum of response times */
>-      int                  *resp_times;        /* individual response times */
>- #if defined( DEBUG ) || defined( _DEBUG )
>-@@ -482,7 +484,7 @@
>- 
>- 	}/* IF */
>- 
>--	prog = argv[0];
>-+	prog = (prog = strrchr(argv[0], '/')) ? prog + 1 : argv[0];
>- 	ident = getpid() & 0xFFFF;
>- 
>- 	verbose_flag = 1;
>-@@ -502,8 +504,8 @@
>- 			break;
>- 		
>- 		case 'r':
>--			if( !( retry = ( u_int )atoi( optarg ) ) )
>--				usage();
>-+			retry = ( u_int )atoi( optarg );
>-+
>- 
>- 			break;
>- 		
>-@@ -823,6 +825,7 @@
>- 
>- 		while( fgets( line, 132, ping_file ) )
>- 		{
>-+			line[132-1] = '\0';
>- 			if( sscanf( line, "%s", host ) != 1 )
>- 				continue;
>- 			
>-@@ -1503,7 +1506,6 @@
>- 	memset( buffer, 0, ping_pkt_size * sizeof( char ) );
>- 	icp = ( FPING_ICMPHDR* )buffer;
>- 
>--	gettimeofday( &h->last_send_time, &tz );
>- #ifndef IPV6
>- 	icp->icmp_type = ICMP_ECHO;
>- 	icp->icmp_code = 0;
>-@@ -1512,6 +1514,8 @@
>- 	icp->icmp_id = ident;
>- 
>- 	pdp = ( PING_DATA* )( buffer + SIZE_ICMP_HDR );
>-+	/* set the time at the very last possible point */
>-+	gettimeofday(&h->last_send_time,&tz);
>- 	pdp->ping_ts = h->last_send_time;
>- 	pdp->ping_count = h->num_sent;
>- 
>-@@ -1523,6 +1527,8 @@
>- 	icp->icmp6_id = ident;
>- 
>- 	pdp = ( PING_DATA* )( buffer + SIZE_ICMP_HDR );
>-+	/* set the time at the very last possible point */
>-+	gettimeofday(&h->last_send_time,&tz);
>- 	pdp->ping_ts = h->last_send_time;
>- 	pdp->ping_count = h->num_sent;
>- 
>-@@ -1611,6 +1617,9 @@
>- 
>- 	result = recvfrom_wto( s, buffer, sizeof(buffer), &response_addr, select_time );
>- 
>-+	/* get time of receipt as close to the real time as possible */
>-+	gettimeofday(&current_time,&tz);
>-+
>- 	if( result < 0 )
>- 		return 0;	/* timeout */
>-   
>-@@ -1625,7 +1634,7 @@
>- 
>- 	ip = ( struct ip* )buffer;
>- #ifndef IPV6
>--#if defined( __alpha__ ) && __STDC__ && !defined( __GLIBC__ )
>-+#if defined( __alpha__ ) && defined(__osf1__) && __STDC__ && !defined( __GLIBC__ )
>- 	/* The alpha headers are decidedly broken.
>- 	 * Using an ANSI compiler, it provides ip_vhl instead of ip_hl and
>- 	 * ip_v.  So, to get ip_hl, we mask off the bottom four bits.
>-@@ -1633,7 +1642,7 @@
>- 	hlen = ( ip->ip_vhl & 0x0F ) << 2;
>- #else
>- 	hlen = ip->ip_hl << 2;
>--#endif /* defined(__alpha__) && __STDC__ */
>-+#endif /* defined(__alpha__) && defined(__osf1__) && __STDC__ */
>- 	if( result < hlen + ICMP_MINLEN )
>- #else
>- 	if( result < sizeof(FPING_ICMPHDR) )
>-@@ -1690,7 +1699,6 @@
>- 	h = table[n];
>- 
>- 	/* received ping is cool, so process it */
>--	gettimeofday( &current_time, &tz );
>- 	h->waiting = 0;
>- 	h->timeout = timeout;
>- 	h->num_recv++;
>Index: head/net/fping/files/patch-configure
>===================================================================
>--- head/net/fping/files/patch-configure	(revision 0)
>+++ head/net/fping/files/patch-configure	(working copy)
>@@ -0,0 +1,97 @@
>+--- configure.orig	2012-07-18 21:49:41.000000000 +0200
>++++ configure	2012-07-18 21:49:47.000000000 +0200
>+@@ -651,6 +651,10 @@
>+ build_vendor
>+ build_cpu
>+ build
>++IPV6_FALSE
>++IPV6_TRUE
>++IPV4_FALSE
>++IPV4_TRUE
>+ target_alias
>+ host_alias
>+ build_alias
>+@@ -692,6 +696,8 @@
>+ ac_subst_files=''
>+ ac_user_opts='
>+ enable_option_checking
>++enable_ipv4
>++enable_ipv6
>+ enable_maintainer_mode
>+ enable_dependency_tracking
>+ '
>+@@ -1325,6 +1331,8 @@
>+   --disable-option-checking  ignore unrecognized --enable/--with options
>+   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
>+   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
>++  --enable-ipv4    Build IPv4 capable fping
>++  --enable-ipv6    Build IPv6 capable fping6
>+   --enable-maintainer-mode  enable make rules and dependencies not useful
>+ 			  (and sometimes confusing) to the casual installer
>+   --disable-dependency-tracking  speeds up one-time build
>+@@ -2120,6 +2128,50 @@
>+ 
>+ 
>+ 
>++# Check whether --enable-ipv4 was given.
>++if test "${enable_ipv4+set}" = set; then :
>++  enableval=$enable_ipv4; case "${enableval}" in
>++   yes)	ipv4=true ;;
>++   no)	ipv4=false ;;
>++   *)	as_fn_error $? "bad value ${enableval} for --enable-ipv4" "$LINENO" 5  ;;
>++   esac
>++else
>++  ipv4=true
>++fi
>++
>++   if test x$ipv4 = xtrue; then
>++  IPV4_TRUE=
>++  IPV4_FALSE='#'
>++else
>++  IPV4_TRUE='#'
>++  IPV4_FALSE=
>++fi
>++
>++
>++# Check whether --enable-ipv6 was given.
>++if test "${enable_ipv6+set}" = set; then :
>++  enableval=$enable_ipv6; case "${enableval}" in
>++   yes)	ipv6=true ;;
>++   no)	ipv6=false ;;
>++   *)	as_fn_error $? "bad value ${enableval} for --enable-ipv6" "$LINENO" 5  ;;
>++   esac
>++else
>++  ipv6=false
>++fi
>++
>++   if test x$ipv6 = xtrue; then
>++  IPV6_TRUE=
>++  IPV6_FALSE='#'
>++else
>++  IPV6_TRUE='#'
>++  IPV6_FALSE=
>++fi
>++
>++
>++if test x$ipv4 = xfalse && test x$ipv6 = xfalse; then
>++  as_fn_error $? "You must enable at least one of IPv4 and IPv6." "$LINENO" 5
>++fi
>++
>+ ac_aux_dir=
>+ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
>+   if test -f "$ac_dir/install-sh"; then
>+@@ -4369,6 +4421,14 @@
>+ LTLIBOBJS=$ac_ltlibobjs
>+ 
>+ 
>++if test -z "${IPV4_TRUE}" && test -z "${IPV4_FALSE}"; then
>++  as_fn_error $? "conditional \"IPV4\" was never defined.
>++Usually this means the macro was only invoked conditionally." "$LINENO" 5
>++fi
>++if test -z "${IPV6_TRUE}" && test -z "${IPV6_FALSE}"; then
>++  as_fn_error $? "conditional \"IPV6\" was never defined.
>++Usually this means the macro was only invoked conditionally." "$LINENO" 5
>++fi
>+  if test -n "$EXEEXT"; then
>+   am__EXEEXT_TRUE=
>+   am__EXEEXT_FALSE='#'
>
>Property changes on: head/net/fping/files/patch-configure
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: head/net/fping/Makefile
>===================================================================
>--- head/net/fping/Makefile	(revision 301103)
>+++ head/net/fping/Makefile	(working copy)
>@@ -7,33 +7,47 @@
> #
> 
> PORTNAME=	fping
>-PORTVERSION=	2.4b2
>-PORTREVISION=	1
>+PORTVERSION=	3.2
> CATEGORIES=	net ipv6
>-MASTER_SITES=	http://keyserver.kjsl.com/~jharris/distfiles/
>-#MASTER_SITES=	http://www.fping.com/download/
>-DISTNAME=	${PORTNAME}-${PORTVERSION}_to-ipv6
>+MASTER_SITES=   http://fping.org/dist/
> 
>-MAINTAINER=	jharris@widomaker.com
>+MAINTAINER=	rodrigo@bebik.net
> COMMENT=	Quickly ping N hosts w/o flooding the network
> 
>-PLIST_FILES=	sbin/fping
>+OPTIONS_MULTI=		NET
>+OPTIONS_MULTI_NET=	IPV4 IPV6
>+OPTIONS_DEFAULT=	IPV4
> 
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--bindir="${PREFIX}/sbin"
>+
> MAN8=		fping.8
> 
>-.if defined(WITH_IPV6)
>-# IPv6 not enabled by default, as it does not work together with IPv4.
>-CFLAGS+=	-DIPV6
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MIPV4}
>+CONFIGURE_ARGS+=--enable-ipv4
>+PLIST_FILES+=sbin/fping
>+.else
>+CONFIGURE_ARGS+=--disable-ipv4
> .endif
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's/fping@/${MAINTAINER:S/@/\\@/g} or fping@/g' \
>-		${WRKSRC}/fping.c
>+.if ${PORT_OPTIONS:MIPV6}
>+CONFIGURE_ARGS+=--enable-ipv6
>+PLIST_FILES+=sbin/fping6
>+MLINKS=	fping.8	fping6.8
>+.else
>+CONFIGURE_ARGS+=--disable-ipv6
>+.endif
> 
> post-install:
>+.if ${PORT_OPTIONS:MIPV4}
> 	@${STRIP_CMD} ${PREFIX}/sbin/fping
> 	@${CHMOD} 4555 ${PREFIX}/sbin/fping
>+.endif
>+.if ${PORT_OPTIONS:MIPV6}
>+	@${STRIP_CMD} ${PREFIX}/sbin/fping6
>+	@${CHMOD} 4555 ${PREFIX}/sbin/fping6
>+.endif
> 
> .include <bsd.port.mk>

Actions: View | Diff

Attachments on bug 169949: 126209 | 126210 | 126211