Re: pkg/51061 (sysutils/duplicity update to 0.7.07)

[Frédéric Fauberteau <triaxx%triaxx.org@localhost>]

The following reply was made to PR pkg/51061; it has been noted by GNATS.

From: =?UTF-8?Q?Fr=C3=A9d=C3=A9ric_Fauberteau?= <triaxx%triaxx.org@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/51061 (sysutils/duplicity update to 0.7.07)
Date: Thu, 26 May 2016 13:58:04 +0200

 Le 2016-05-26 06:15, David Holland a écrit :
 > The following reply was made to PR pkg/51061; it has been noted by 
 > GNATS.
 > 
 > From: David Holland <dholland-pbugs%netbsd.org@localhost>
 > To: gnats-bugs%NetBSD.org@localhost
 > Cc:
 > Subject: Re: pkg/51061 (sysutils/duplicity update to 0.7.07)
 > Date: Thu, 26 May 2016 04:10:11 +0000
 > 
 >  On Tue, May 24, 2016 at 08:40:01PM +0000, Fr?d?ric Fauberteau wrote:
 >   >  Amazon S3 and dropbox dependencies could be parameterized in 
 > options.mk
 >   >  but (1) it just had 5 python packages and (2) neither amazons3 nor
 >   >  dropbox are in mk/default/options.descrition.
 > 
 >  Things can be added to options.description you know :-)
 > 
 >  --
 >  David A. Holland
 >  dholland%netbsd.org@localhost
 
 OK, right !
 
 How about the following patch:
 Index: mk/defaults/options.description
 ===================================================================
 RCS file: /cvsroot/pkgsrc/mk/defaults/options.description,v
 retrieving revision 1.507
 diff -u -u -r1.507 options.description
 --- mk/defaults/options.description	7 Mar 2016 12:05:01 -0000	1.507
 +++ mk/defaults/options.description	26 May 2016 11:38:05 -0000
 @@ -10,6 +10,7 @@
   amanda-fqdn		Use FQDN's in Amanda.
   amanda-smb		Enable SMB backup support.
   amanda-ssh		Enable ssh as a transport.
 +amazons3		Enable Amazon S3 support.
   amtterm-gamt		Build amtterm GUI version (gamt).
   amule-alc		Build aMule LinkCreator GUI version.
   amule-alcc		Build aMule LinkCreator for console.
 @@ -133,6 +134,7 @@
   doxygen			Include doxygen based document.
   drac			Enable DRAC support.
   dri			Enable Direct Rendering support.
 +dropbox			Enable Dropbox support.
   drupal-xmlservices	Enable XML-based services.
   dspam-preferences-extension	Enable preferences extension.
   dspam-verbose-debug	Enable verbose debugging support.
 Index: sysutils/duplicity/Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/sysutils/duplicity/Makefile,v
 retrieving revision 1.34
 diff -u -u -r1.34 Makefile
 --- sysutils/duplicity/Makefile	24 May 2016 19:10:46 -0000	1.34
 +++ sysutils/duplicity/Makefile	26 May 2016 11:39:23 -0000
 @@ -1,6 +1,7 @@
   # $NetBSD: Makefile,v 1.34 2016/05/24 19:10:46 bsiegert Exp $
 
   DISTNAME=	duplicity-0.7.07.1
 +PKGREVISION=	1
   CATEGORIES=	sysutils net
   
 MASTER_SITES=	http://code.launchpad.net/duplicity/0.7-series/${PKGVERSION_NOREV}/+download/
 
 @@ -14,6 +15,7 @@
   .include "options.mk"
 
   DEPENDS+=	${PYPKGPREFIX}-lockfile>=0.9.1:../../devel/py-lockfile
 +DEPENDS+=	${PYPKGPREFIX}-paramiko-[0-9]*:../../security/py-paramiko
 
   REPLACE_PYTHON+=	bin/duplicity \
   			bin/rdiffdir
 Index: sysutils/duplicity/options.mk
 ===================================================================
 RCS file: /cvsroot/pkgsrc/sysutils/duplicity/options.mk,v
 retrieving revision 1.2
 diff -u -u -r1.2 options.mk
 --- sysutils/duplicity/options.mk	24 May 2016 19:10:46 -0000	1.2
 +++ sysutils/duplicity/options.mk	26 May 2016 11:39:24 -0000
 @@ -1,10 +1,19 @@
   # $NetBSD: options.mk,v 1.2 2016/05/24 19:10:46 bsiegert Exp $
 
   PKG_OPTIONS_VAR=	PKG_OPTIONS.duplicity
 -PKG_SUPPORTED_OPTIONS=	gnupg2
 +PKG_SUPPORTED_OPTIONS=	amazons3 dropbox gnupg2
 +PKG_SUGGESTED_OPTIONS=  amazons3 dropbox
 
   .include "../../mk/bsd.options.mk"
 
 +.if !empty(PKG_OPTIONS:Mamazons3)
 +DEPENDS+=	${PYPKGPREFIX}-boto-[0-9]*:../../net/py-boto
 +.endif
 +
 +.if !empty(PKG_OPTIONS:Mdropbox)
 +DEPENDS+=	${PYPKGPREFIX}-dropbox-[0-9]*:../../net/py-dropbox
 +.endif
 +
   .if !empty(PKG_OPTIONS:Mgnupg2)
   DEPENDS+=	gnupg2-[0-9]*:../../security/gnupg2
   GPGPATH=	${PREFIX}/bin/gpg2