svn commit: r307122 - in head/sysutils/cpdup: . files

[Guido Falsi]

Author: madpilot
Date: Wed Nov  7 08:25:42 2012
New Revision: 307122
URL: http://svnweb.freebsd.org/changeset/ports/307122

Log:
  - Don't pass -T option to ssh process, this allows use of the "null"
    cipher if requested [1]
  - Fix build with clang
  - Trim Makefile headers
  
  Submitted by:	Oliver Fromme <olli at grabthar.secnetix.de> [1]
  Approved by:	Gianmarco Giovannelli <gmarco at gufi.org> (maintainer)
  Feature safe:	yes

Added:
  head/sysutils/cpdup/files/patch-Makefile   (contents, props changed)
Modified:
  head/sysutils/cpdup/Makefile   (contents, props changed)
  head/sysutils/cpdup/files/patch-hclink.c   (contents, props changed)

Modified: head/sysutils/cpdup/Makefile
==============================================================================
--- head/sysutils/cpdup/Makefile	Wed Nov  7 08:17:31 2012	(r307121)
+++ head/sysutils/cpdup/Makefile	Wed Nov  7 08:25:42 2012	(r307122)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:    cpdup
-# Date created:         28 Oct 1999
-# Whom:                 dillon
-#
+# Created by: Matthew Dillon <dillon at backplane.com>
 # $FreeBSD$
-#
 
 PORTNAME=	cpdup
 PORTVERSION=	1.17
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://apollo.backplane.com/FreeSrc/ \
 		http://utenti.gufi.org/~gmarco/files/distfiles/

Added: head/sysutils/cpdup/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/cpdup/files/patch-Makefile	Wed Nov  7 08:25:42 2012	(r307122)
@@ -0,0 +1,10 @@
+--- Makefile.orig	2010-07-05 20:02:07.000000000 +0200
++++ Makefile	2012-11-05 13:35:55.997489741 +0100
+@@ -6,6 +6,7 @@
+ 
+ .if defined(.FreeBSD)
+ CFLAGS += -D_ST_FLAGS_PRESENT_=1
++NO_WERROR = true
+ WARNS?=	6
+ .endif
+ 

Modified: head/sysutils/cpdup/files/patch-hclink.c
==============================================================================
--- head/sysutils/cpdup/files/patch-hclink.c	Wed Nov  7 08:17:31 2012	(r307121)
+++ head/sysutils/cpdup/files/patch-hclink.c	Wed Nov  7 08:25:42 2012	(r307122)
@@ -1,5 +1,14 @@
---- ./hclink.c.orig	2010-09-25 18:01:27.989863475 -0400
-+++ ./hclink.c	2010-09-25 18:01:46.138176079 -0400
+--- hclink.c.orig	2010-07-19 21:01:56.000000000 +0200
++++ hclink.c	2012-11-05 13:16:09.731500043 +0100
+@@ -49,7 +49,7 @@
+ 	    av[n++] = "-C";
+ 	for (m = 0; m < ssh_argc; m++)
+ 	    av[n++] = ssh_argv[m];
+-	av[n++] = "-T";
++	av[n++] = "--";
+ 	av[n++] = hc->host;
+ 	av[n++] = "cpdup";
+ 	av[n++] = (readonly ? "-RS" : "-S");
 @@ -388,7 +388,7 @@
  hcc_check_space(hctransaction_t trans, struct HCHead *head, int n, int size)
  {