sysutils/bbcp: 20120520 -> 20150113

Change maintainer

Other Changes: See section "New Features" and "Backward Compatibility" at
http://www.slac.stanford.edu/~abh/bbcp/#_Toc392015164

- The new -ptime option forces bbcp to preserve only source file's
  access and modification time at the destination; leaving the group
  and mode unchanged.
- The new -gross option forces bbcp to copy empty directory structures
  in recursive mode.
- The new -mkdir option creates the destination directory for a
  recursive copy should it not exist.
- The new -symlinks option specifies how symbolic links are to be
  handled during a recursive copy.
-  Dual stack IPv6 mode is fully functional and is the default mode
  of operation. The new -ipv4 option forces bbcp to use the IPv4 TCP
  stack.
- The new -license option prints the license under which bbcp is
  distributed.
- The new -version option displays bbcp's version number installed
  on the current host.
- The BBCP_ALLOWPP environmental variable may be used to restrict
  program pipes to a specified set of programs or disable the feature
  altogether.
- The new -Z option allows you to specify the port range to be used
  for incoming connections on the command line instead of relying on
  /etc/services to contain those values.

Notes:
- Older version will fail if any of the new option:  -ptime  is specified.
- Older version will fail if any of the new options:  -gross, --mkdir, or
  --symlinks is specified.
- Older version will fail if the new -ipv4 option is specified.
  Older versions always use the IPv4 TCP stack, making the option
  generally unnecessary.
- Older versions will fail if the new -Z option is specified.

PR:		196746
Submitted by:	Chris Hutchinson <portmaster@bsdforge.com>
Approved by:	John Hein <jhein@symmetricom.com> (maintainer)
Requested from:	Freddie Cash <fjwcash@gmail.com>

8 files changed, 53 insertions, 23 deletions

diff --git a/sysutils/bbcp/Makefile b/sysutils/bbcp/Makefile
index 72af748e5fc2..274c20f1a776 100644
--- a/sysutils/bbcp/Makefile
+++ b/sysutils/bbcp/Makefile
@@ -2,16 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	bbcp
-PORTVERSION=	20120520
+PORTVERSION=	20150113
 CATEGORIES=	sysutils net
-MASTER_SITES=	https://bitbucket.org/jhein/bbcp/downloads/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}-20100818.pdf
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	http://BSDforge.com/projects/source/sysutils/bbcp/
 
-MAINTAINER=	jhein@symmetricom.com
-COMMENT=	Secure and fast copy utility
+MAINTAINER=	portmaster@BSDforge.com
+COMMENT=	Secure, fast, and IPv6 capable Copy utility
 
-LICENSE=	BSD2CLAUSE
+LICENSE=	LGPL20
 
 USES=		tar:xz
 
@@ -29,7 +27,7 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/FreeBSD/bbcp ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DISTDIR}/${PORTNAME}-20100818.pdf \
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.pdf \
 		${STAGEDIR}${DOCSDIR}/${PORTNAME}.pdf
 
 .include <bsd.port.mk>
diff --git a/sysutils/bbcp/distinfo b/sysutils/bbcp/distinfo
index 9d462fee5c0a..5e24f8eb5f48 100644
--- a/sysutils/bbcp/distinfo
+++ b/sysutils/bbcp/distinfo
@@ -1,4 +1,2 @@
-SHA256 (bbcp-20120520.tar.xz) = 9d4c59ca08b6a40b96b4240ee836c09ccae4407149c21eb259d6ecd0ddf599e2
-SIZE (bbcp-20120520.tar.xz) = 109104
-SHA256 (bbcp-20100818.pdf) = c5910d9a75eefea639f6d88282709d8882d68927137babd5ec851e1c17dcbeae
-SIZE (bbcp-20100818.pdf) = 889566
+SHA256 (bbcp-20150113.tar.xz) = 7e46d28515871f83525a6f0d91aafd439df1b4ae71e565e64907059559f0a561
+SIZE (bbcp-20150113.tar.xz) = 991860
diff --git a/sysutils/bbcp/files/patch-src__bbcp.C b/sysutils/bbcp/files/patch-src__bbcp.C
deleted file mode 100644
index 22e2531d6cfa..000000000000
--- a/sysutils/bbcp/files/patch-src__bbcp.C
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/bbcp.C.orig	2012-05-03 21:57:39.000000000 +0200
-+++ ./src/bbcp.C	2014-04-12 13:19:42.914184967 +0200
-@@ -58,6 +58,7 @@
- /*                                  m a i n                                   */
- /******************************************************************************/
-   
-+int
- main(int argc, char *argv[], char *envp[])
- {
-    bbcp_Node     *Source, *Sink;
diff --git a/sysutils/bbcp/files/patch-src__bbcp_BuffPool.C b/sysutils/bbcp/files/patch-src__bbcp_BuffPool.C
new file mode 100644
index 000000000000..273803963e57
--- /dev/null
+++ b/sysutils/bbcp/files/patch-src__bbcp_BuffPool.C
@@ -0,0 +1,11 @@
+--- src/bbcp_BuffPool.C.orig	2015-01-14 12:12:20.000000000 -0800
++++ src/bbcp_BuffPool.C	2015-01-14 12:24:14.000000000 -0800
+@@ -32,7 +32,7 @@
+ #include <inttypes.h>
+ #include <sys/mman.h>
+ 
+-#if defined(MACOS) || defined(AIX)
++#if defined(MACOS) || defined(FREEBSD)
+ #define memalign(pgsz,amt) valloc(amt)
+ #else
+ #include <malloc.h>
diff --git a/sysutils/bbcp/files/patch-src__bbcp_File.C b/sysutils/bbcp/files/patch-src__bbcp_File.C
new file mode 100644
index 000000000000..1fe402b14e05
--- /dev/null
+++ b/sysutils/bbcp/files/patch-src__bbcp_File.C
@@ -0,0 +1,11 @@
+--- src/bbcp_File.C.orig	2015-01-14 12:12:57.000000000 -0800
++++ src/bbcp_File.C	2015-01-14 12:24:35.000000000 -0800
+@@ -44,7 +44,7 @@
+ 
+ #ifdef FREEBSD
+ #undef ENODATA
+-#define ENODATA ENOATTRR
++#define ENODATA ENOATTR
+ #endif
+ 
+ /******************************************************************************/
diff --git a/sysutils/bbcp/files/patch-src__bbcp_NetAddr.C b/sysutils/bbcp/files/patch-src__bbcp_NetAddr.C
new file mode 100644
index 000000000000..d01bbf499f25
--- /dev/null
+++ b/sysutils/bbcp/files/patch-src__bbcp_NetAddr.C
@@ -0,0 +1,11 @@
+--- src/bbcp_NetAddr.C.orig	2015-01-14 12:13:30.000000000 -0800
++++ src/bbcp_NetAddr.C	2015-01-14 12:25:34.000000000 -0800
+@@ -49,7 +49,7 @@
+ #ifndef s6_addr32
+ #if   defined(SUN)
+ #define s6_addr32 _S6_un._S6_u32
+-#elif defined(MACOS)
++#elif defined(MACOS) || defined(FREEBSD)
+ #define s6_addr32 __u6_addr.__u6_addr32
+ #endif
+ #endif
diff --git a/sysutils/bbcp/files/patch-src__bbcp_NetAddrInfo.C b/sysutils/bbcp/files/patch-src__bbcp_NetAddrInfo.C
new file mode 100644
index 000000000000..d9df50d4a194
--- /dev/null
+++ b/sysutils/bbcp/files/patch-src__bbcp_NetAddrInfo.C
@@ -0,0 +1,11 @@
+--- src/bbcp_NetAddrInfo.C.orig	2015-01-14 12:14:07.000000000 -0800
++++ src/bbcp_NetAddrInfo.C	2015-01-14 12:26:37.000000000 -0800
+@@ -67,7 +67,7 @@
+ #ifndef s6_addr32
+ #if   defined(SUN)
+ #define s6_addr32 _S6_un._S6_u32
+-#elif defined(MACOS)
++#elif defined(MACOS) || defined(FREEBSD)
+ #define s6_addr32 __u6_addr.__u6_addr32
+ #endif
+ #endif
diff --git a/sysutils/bbcp/pkg-descr b/sysutils/bbcp/pkg-descr
index b1e0447baf9b..df0bc4d846c0 100644
--- a/sysutils/bbcp/pkg-descr
+++ b/sysutils/bbcp/pkg-descr
@@ -1,3 +1,3 @@
-Securely and quickly copy data from source to target.
+Securely, and quickly copy data from Source to Target, also over IPv6.
 
 WWW: http://www.slac.stanford.edu/~abh/bbcp/