Hi all and especially Stuart,
On Tue, May 07, 2019 at 11:47:35PM +0100, Stuart Henderson wrote:
>
> Please mention the flavour in pkg/DESCR (also it's a good idea to include
> productivity/Makefile in your diff to add the line to build it ..
> makes it harder to forget :)
Thanks for the pointer. I've now added a blurb. I've also added a line
to the productivity/Makefile.
> Please use the standard "# uses pledge()" line next to WANTLIB for this.
> (Maybe it's worth retiring this now that pledge is not so much in a state
> of flux, but if we do that it would be a sweep across the tree rather
> than piecemeal).
OK, thanks, I didn't know we were "tracking" this explicitly this way.
Many thanks!
Tim
Here's the diff.
Index: productivity/Makefile
===================================================================
RCS file: /cvs/ports/productivity/Makefile,v
retrieving revision 1.84
diff -u -p -r1.84 Makefile
--- productivity/Makefile 2 May 2019 15:54:06 -0000 1.84
+++ productivity/Makefile 8 May 2019 02:50:38 -0000
@@ -28,6 +28,7 @@
SUBDIR += libkgapi
SUBDIR += librcps
SUBDIR += mcds
+ SUBDIR += mcds,no_gpgme
SUBDIR += osmo
SUBDIR += p5-Business-Tax-VAT-Validation
SUBDIR += projectlibre
Index: productivity/mcds/Makefile
===================================================================
RCS file: /cvs/ports/productivity/mcds/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- productivity/mcds/Makefile 2 May 2019 15:52:58 -0000 1.1.1.1
+++ productivity/mcds/Makefile 8 May 2019 02:50:38 -0000
@@ -2,7 +2,7 @@
COMMENT = tty-based carddav search tool
-V = 0.9
+V = 1.2
DISTNAME = mcds-${V}
CATEGORIES = productivity
@@ -11,6 +11,7 @@ MAINTAINER = Timothy Brown <tbrown@free
# GPLv3+
PERMIT_PACKAGE_CDROM = Yes
+# uses pledge()
WANTLIB = c curl iconv intl xml2
MASTER_SITES = https://github.com/t-brown/mcds/releases/download/v${V}/
@@ -22,5 +23,15 @@ LIB_DEPENDS = devel/gettext \
CONFIGURE_STYLE = gnu
NO_TEST = Yes
+
+FLAVORS = no_gpgme
+FLAVOR ?=
+
+.if ${FLAVOR:L:Mno_gpgme}
+CONFIGURE_ARGS += --disable-gpgme
+.else
+WANTLIB += assuan gpg-error gpgme
+LIB_DEPENDS += security/gpgme
+.endif
.include <bsd.port.mk>
Index: productivity/mcds/distinfo
===================================================================
RCS file: /cvs/ports/productivity/mcds/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- productivity/mcds/distinfo 2 May 2019 15:52:58 -0000 1.1.1.1
+++ productivity/mcds/distinfo 8 May 2019 02:50:38 -0000
@@ -1,2 +1,2 @@
-SHA256 (mcds-0.9.tar.gz) = p+H8Q94kiHDDo/pV570uCXZki5YnyC41tUDx8HgARKc=
-SIZE (mcds-0.9.tar.gz) = 194620
+SHA256 (mcds-1.2.tar.gz) = XvOuh5IgjdWF1BPE/mowwCv8BKY4l/nvmnzZEK4Pbx4=
+SIZE (mcds-1.2.tar.gz) = 201027
Index: productivity/mcds/pkg/DESCR
===================================================================
RCS file: /cvs/ports/productivity/mcds/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- productivity/mcds/pkg/DESCR 2 May 2019 15:52:58 -0000 1.1.1.1
+++ productivity/mcds/pkg/DESCR 8 May 2019 02:50:38 -0000
@@ -1,2 +1,8 @@
Mcds is a command line tool primarily used as a search query plugin for mutt
-to query a carddav server.
+to query a CardDav server.
+
+Flavors:
+ no_gpgme - build with-out GPGME support. By default it will build
+ with GPGME support for encrypted password files, so you
+ do not have to store your password in cleartext in your
+ .netrc file.
