--- Makefile	(revision 435754)
+++ Makefile	(working copy)
@@ -20,11 +20,9 @@ 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--chronyvardir=/var/db/${PORTNAME} \
-		--infodir=${PREFIX}/info \
 		--sysconfdir=${PREFIX}/etc --mandir=${MANPREFIX}/man \
 		--datarootdir=${DATADIR} --docdir=${DOCSDIR} \
-		--with-user=chronyd
-LDFLAGS+=	-L${LOCALBASE}/lib
+		--with-user=chronyd --without-tomcrypt
 USE_RC_SUBR=	chronyd
 
 ALL_TARGET=	all
@@ -34,14 +32,17 @@ 
 		chrony.conf.example3 chrony.keys.example
 
 # XXX: there are also other potentially useful options worth looking into:
-#  --without-nss        Don't use NSS even if it is available
-#  --without-tomcrypt   Don't use libtomcrypt even if it is available
 #  --disable-pps        Disable PPS API support
-OPTIONS_DEFINE=		IPV6
+OPTIONS_DEFINE=		IPV6 NSS
+OPTIONS_DEFAULT=	NSS
 
 IPV6_CATEGORIES=	ipv6
 IPV6_CONFIGURE_OFF=	--disable-ipv6
 
+NSS_DESC=		Add support for more hashing algorithms
+NSS_CONFIGURE_OFF=	--without-nss
+NSS_USES=		pkgconfig
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chronyc
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/chronyd
--- files/chronyd.in	(revision 435754)
+++ files/chronyd.in	(working copy)
@@ -11,6 +11,7 @@ 
 name=chronyd
 rcvar=chronyd_enable
 command=%%PREFIX%%/sbin/${name}
+rc_flags="${chronyd_flags}"
 
 load_rc_config ${name}
 
--- files/patch-examples_chrony.conf.example2	(revision 435754)
+++ files/patch-examples_chrony.conf.example2	(working copy)
@@ -17,7 +17,7 @@ 
  
  # Specify file containing keys for NTP authentication.
 -#keyfile /etc/chrony.keys
-+#keyfile /usr/local/etc/chrony.keys
++#keyfile %%PREFIX%%/etc/chrony.keys
  
  # Specify directory for log files.
  logdir /var/log/chrony
--- files/patch-examples_chrony.conf.example3	(revision 435754)
+++ files/patch-examples_chrony.conf.example3	(working copy)
@@ -5,7 +5,7 @@ 
  #
  # This is an example chrony configuration file.  You should copy it to
 -# /etc/chrony.conf after uncommenting and editing the options that you
-+# /usr/local/etc/chrony.conf after uncommenting and editing the options that you
++# %%PREFIX%%/etc/chrony.conf after uncommenting and editing the options that you
  # want to enable.  The more obscure options are not included.  Refer
  # to the documentation for these.
  #
@@ -31,7 +31,7 @@ 
  # to uncomment the following line and edit the file to set up the keys.
  
 -! keyfile /etc/chrony.keys
-+! keyfile /usr/local/etc/chrony.keys
++! keyfile %%PREFIX%%/etc/chrony.keys
  
  # chronyd can save the measurement history for the servers to files when
  # it it exits.  This is useful in 2 situations: