svn commit: r416858 - in head/sysutils/rdiff-backup-devel: . files

[Kurt Jaeger]

Author: pi
Date: Mon Jun 13 19:05:31 2016
New Revision: 416858
URL: https://svnweb.freebsd.org/changeset/ports/416858

Log:
  sysutils/rdiff-backup-devel: Fix build, change dependency to librsync1
  
  - rdiff-backup-devel fails with:
    _librsyncmodule.c:63:17:
    error: use of undeclared identifier 'RS_DEFAULT_STRONG_LEN'
  - found working patch here:
    http://pkgs.fedoraproject.org/cgit/rpms/rdiff-backup.git/tree/rdiff-backup-1.2.8-librsync-1.0.0.patch
  - change dependency to librsync1
  
  PR:		210239
  Submitted by:	Walter Schwarzenfeld <w.schwarzenfeld at utanet.at>

Added:
  head/sysutils/rdiff-backup-devel/files/patch-librsyncmodule.c   (contents, props changed)
Modified:
  head/sysutils/rdiff-backup-devel/Makefile

Modified: head/sysutils/rdiff-backup-devel/Makefile
==============================================================================
--- head/sysutils/rdiff-backup-devel/Makefile	Mon Jun 13 18:55:23 2016	(r416857)
+++ head/sysutils/rdiff-backup-devel/Makefile	Mon Jun 13 19:05:31 2016	(r416858)
@@ -3,7 +3,7 @@
 
 PORTNAME=	rdiff-backup
 PORTVERSION=	1.3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	SAVANNAH \
 		LOCAL/vd/${PORTNAME}${PKGNAMESUFFIX}
@@ -15,7 +15,7 @@ COMMENT=	Local/remote mirroring+incremen
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	librsync.so:net/librsync
+LIB_DEPENDS=	librsync.so:net/librsync1
 
 CONFLICTS=	rdiff-backup-[0-9]*
 

Added: head/sysutils/rdiff-backup-devel/files/patch-librsyncmodule.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/rdiff-backup-devel/files/patch-librsyncmodule.c	Mon Jun 13 19:05:31 2016	(r416858)
@@ -0,0 +1,15 @@
+--- _librsyncmodule.c			2009-03-16 15:36:21.000000000 +0100
++++ _librsyncmodule.c.librsync-1.0.0		2015-03-02 00:54:24.000000000 +0100
+@@ -59,8 +59,13 @@
+   if (sm == NULL) return NULL;
+   sm->x_attr = NULL;
+ 
++#ifdef RS_DEFAULT_STRONG_LEN
+   sm->sig_job = rs_sig_begin((size_t)blocklen,
+ 							 (size_t)RS_DEFAULT_STRONG_LEN);
++#else
++  sm->sig_job = rs_sig_begin((size_t)blocklen,
++							 (size_t)8, RS_MD4_SIG_MAGIC);
++#endif
+   return (PyObject*)sm;
+ }