Update ports/net/fping+ipv6 -> 3.2 Fix: -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 NotDashEscaped: You need GnuPG to verify this message cvs diff: Diffing . iJ0EARECAF0FAlAF0LxWGGh0dHA6Ly9rZXlzZXJ2ZXIua2pzbC5jb206MTEzNzEv cGtzL2xvb2t1cD9vcD1nZXQmc2VhcmNoPTB4RDM5REEwRTMmd2VoYXZleW91bm93 PXRydWUACgkQSypIl9OdoOPulgCfe2HlbLWCKQrehES43Ot191MgOgEAnRWVh3dx ZFNx6yhwHjDIG2QsVpua =ZjVl -----END PGP SIGNATURE-------3gRik72U49mKY5SpGPEzjXhd5waK7Q3Vx7HZi8p6TlNwdTva Content-Type: text/plain; name="file.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.diff" Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/fping+ipv6/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- Makefile 28 Sep 2007 12:26:52 -0000 1.1 +++ Makefile 17 Jul 2012 20:48:25 -0000 @@ -7,12 +7,10 @@ # PORTNAME= fping -PORTVERSION= 2.4b2 +PORTVERSION= 3.2 CATEGORIES= net ipv6 -MASTER_SITES= http://keyserver.kjsl.com/~jharris/distfiles/ -#MASTER_SITES= http://www.fping.com/download/ +MASTER_SITES= http://fping.org/dist/ PKGNAMESUFFIX= +ipv6 -DISTNAME= ${PORTNAME}-${PORTVERSION}_to-ipv6 MAINTAINER= jharris@widomaker.com COMMENT= Quickly ping N hosts w/o flooding the network - IPv6 version @@ -21,19 +19,18 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --bindir="${PREFIX}/sbin" -MAN8= fping.8 -USE_DOS2UNIX= fping.8 +MAN8= fping6.8 # IPv6 enabled since it is a IPv6 only version CFLAGS+= -DIPV6 post-patch: - @${REINPLACE_CMD} -e 's/fping@/${MAINTAINER:S/@/\\@/g} or fping@/g' \ - ${WRKSRC}/fping.c + @${REINPLACE_CMD} -e 's/fping/fping6/g' ${WRKSRC}/doc/fping.8 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/fping ${PREFIX}/sbin/fping6 + ${INSTALL_PROGRAM} ${WRKSRC}/src/fping ${PREFIX}/sbin/fping6 + @${STRIP_CMD} ${PREFIX}/sbin/fping @${CHMOD} 4555 ${PREFIX}/sbin/fping6 - ${INSTALL_MAN} ${WRKSRC}/fping.8 ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/doc/fping.8 ${PREFIX}/man/man8/fping6.8 .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/ncvs/ports/net/fping+ipv6/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- distinfo 2 Jun 2011 08:28:36 -0000 1.3 +++ distinfo 17 Jul 2012 20:48:25 -0000 @@ -1,2 +1,5 @@ -SHA256 (fping-2.4b2_to-ipv6.tar.gz) = 77e1a90af4fff4a5ffc4b70542c6ff44130558357e7d549f99a9eff23108d172 -SIZE (fping-2.4b2_to-ipv6.tar.gz) = 63333 +MD5 (fping-3.2.tar.gz) = efc86557e9b54e5c3becb598a50684a0 +SHA1 (fping-3.2.tar.gz) = a1f8e00ecc6d5e7089748e2587713b07c7335fc1 +RMD160 (fping-3.2.tar.gz) = ad8fe15f22820e9223b9679d5e491eeac41fbf3c +SHA256 (fping-3.2.tar.gz) = b26739a1fa3471775ff1958a1e3d7597f12c9eb56429c29cf956e52f5046e2c1 +SIZE (fping-3.2.tar.gz) = 137967 Index: pkg-descr =================================================================== RCS file: /home/ncvs/ports/net/fping+ipv6/pkg-descr,v retrieving revision 1.1 diff -u -r1.1 pkg-descr --- pkg-descr 28 Sep 2007 12:26:52 -0000 1.1 +++ pkg-descr 17 Jul 2012 20:48:26 -0000 @@ -14,4 +14,4 @@ output is easy to parse. This is an IPv6 only version. -WWW: http://www.fping.com/ +WWW: http://www.fping.org/ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (FreeBSD) How-To-Repeat: Apply patch below, and: %cvs remove files/patch-*
Responsible Changed From-To: freebsd-ports-bugs->zeising Grab, since I'm working on a similar ports/169949
Author: zeising Date: Mon Sep 24 09:15:59 2012 New Revision: 304773 URL: http://svn.freebsd.org/changeset/ports/304773 Log: Update net/fping to version 3.4 and point to the new home. Merge IPv4 and IPv6 support into net/fping, selectable via options. Remove the now un-needed net/fping+ipv6 Add common description for IPV4 option, analogous to the IPV6 option PR: ports/169949 [1], ports/169950 [2] Submitted by: Rodrigo OSORIO <rodrigo@bebik.net> [1] Jason Harris <jharris@widomaker.com> [2] zeising (final patch version) Approved by: maintainer, kwm (mentor) Deleted: head/net/fping+ipv6/ head/net/fping/files/ Modified: head/MOVED head/Mk/bsd.options.desc.mk head/net/Makefile head/net/fping/Makefile head/net/fping/distinfo head/net/fping/pkg-descr Modified: head/MOVED ============================================================================== --- head/MOVED Mon Sep 24 08:38:44 2012 (r304772) +++ head/MOVED Mon Sep 24 09:15:59 2012 (r304773) @@ -3712,3 +3712,4 @@ print/pips-spr300_310||2012-09-22|Remove print/pips930||2012-09-22|Removed print/pips770||2012-09-22|Removed www/linuxpluginwrapper||2012-09-22|Has expired: doesn't support ELF symbol versioning, yet. +net/fping+ipv6|net/fping|2012-09-24|IPv6 support has been merged Modified: head/Mk/bsd.options.desc.mk ============================================================================== --- head/Mk/bsd.options.desc.mk Mon Sep 24 08:38:44 2012 (r304772) +++ head/Mk/bsd.options.desc.mk Mon Sep 24 09:15:59 2012 (r304773) @@ -127,6 +127,7 @@ IMAGEMAGICK_DESC?= ImageMagick support IMLIB_DESC?= imlib image library support IMLIB2_DESC?= imlib2 image library support IODBC_DESC?= ODBC backend via iODBC +IPV4_DESC?= IPv4 protocol support IPV6_DESC?= IPv6 protocol support JABBER_DESC?= Jabber support JACK_DESC?= JACK audio server support Modified: head/net/Makefile ============================================================================== --- head/net/Makefile Mon Sep 24 08:38:44 2012 (r304772) +++ head/net/Makefile Mon Sep 24 09:15:59 2012 (r304773) @@ -140,7 +140,6 @@ SUBDIR += fpc-ldap SUBDIR += fpc-pcap SUBDIR += fping - SUBDIR += fping+ipv6 SUBDIR += freebsd-tftp SUBDIR += freebsd-uucp SUBDIR += freedbd Modified: head/net/fping/Makefile ============================================================================== --- head/net/fping/Makefile Mon Sep 24 08:38:44 2012 (r304772) +++ head/net/fping/Makefile Mon Sep 24 09:15:59 2012 (r304773) @@ -7,33 +7,46 @@ # PORTNAME= fping -PORTVERSION= 2.4b2 -PORTREVISION= 1 +PORTVERSION= 3.4 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 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 +MAN8+= fping.8 +.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 +MAN8+= 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> Modified: head/net/fping/distinfo ============================================================================== --- head/net/fping/distinfo Mon Sep 24 08:38:44 2012 (r304772) +++ head/net/fping/distinfo Mon Sep 24 09:15:59 2012 (r304773) @@ -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.4.tar.gz) = d42528af4931f16a8e3438bd4a45cfdd72163ad8835a3c95351c336a26e56afe +SIZE (fping-3.4.tar.gz) = 142986 Modified: head/net/fping/pkg-descr ============================================================================== --- head/net/fping/pkg-descr Mon Sep 24 08:38:44 2012 (r304772) +++ head/net/fping/pkg-descr Mon Sep 24 09:15:59 2012 (r304773) @@ -13,4 +13,4 @@ without flooding the network. 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/ _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Port functionality merged to net/fping, port removed. Thanks for submission!