CVS commit: pkgsrc/net/chrony

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Mar 10 19:16:46 UTC 2019

Modified Files:
        pkgsrc/net/chrony: Makefile
Added Files:
        pkgsrc/net/chrony: options.mk

Log Message:
chrony: update to 3.4nb1.

Add default-on nettle option.
Requested by Fabien in PR 54042, ok hannken@


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/net/chrony/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/net/chrony/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/chrony/Makefile
diff -u pkgsrc/net/chrony/Makefile:1.36 pkgsrc/net/chrony/Makefile:1.37
--- pkgsrc/net/chrony/Makefile:1.36     Mon Oct  1 15:53:58 2018
+++ pkgsrc/net/chrony/Makefile  Sun Mar 10 19:16:46 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2018/10/01 15:53:58 nia Exp $
+# $NetBSD: Makefile,v 1.37 2019/03/10 19:16:46 wiz Exp $
 
 DISTNAME=      chrony-3.4
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  http://download.tuxfamily.org/chrony/
 
@@ -27,8 +28,8 @@ RCD_SCRIPTS=          chronyd
 
 SUBST_CLASSES+=                paths
 SUBST_FILES.paths=     ${EGFILES:S/^/examples\//} conf.c
-SUBST_SED.paths+=      -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+=      -e 's,@VARBASE@,${VARBASE},g'
+SUBST_VARS.paths+=     PKG_SYSCONFDIR
+SUBST_VARS.paths+=     VARBASE
 SUBST_STAGE.paths=     pre-configure
 
 post-install:
@@ -37,5 +38,7 @@ post-install:
        ${INSTALL_DATA} "${WRKSRC}/examples/chrony.keys.example" \
            "${DESTDIR}${EGDIR}/chrony.keys.example";
 
+.include "options.mk"
+
 .include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/net/chrony/options.mk
diff -u /dev/null pkgsrc/net/chrony/options.mk:1.1
--- /dev/null   Sun Mar 10 19:16:46 2019
+++ pkgsrc/net/chrony/options.mk        Sun Mar 10 19:16:46 2019
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2019/03/10 19:16:46 wiz Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.chrony
+PKG_SUPPORTED_OPTIONS= nettle
+PKG_SUGGESTED_OPTIONS= nettle
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mnettle)
+USE_TOOLS+=    pkg-config
+.include "../../security/nettle/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-nettle
+.endif