Index: deskutils/note/Makefile
===================================================================
--- deskutils/note/Makefile
+++ deskutils/note/Makefile
@@ -1,20 +1,56 @@
 # $FreeBSD$
 
 PORTNAME=	note
-PORTVERSION=	1.3.18
-PORTREVISION=	2
+DISTVERSION=	1.3.22
 CATEGORIES=	deskutils perl5
 MASTER_SITES=	http://www.daemon.de/idisk/Apps/note/
 
-MAINTAINER=	idefix@fechner.net
+MAINTAINER=	lebarondemerde@privacychain.ch
 COMMENT=	Console based tool to handle encrypted notes
 
 LICENSE=	GPLv1
 
 RUN_DEPENDS=	p5-YAML>=0.1:textproc/p5-YAML \
-		p5-Crypt-IDEA>=1.0:security/p5-Crypt-IDEA
+		p5-Config-General>0:devel/p5-Config-General
 
 USES=		perl5
 USE_PERL5=	configure
 
+OPTIONS_DEFINE=		MYSQL PWSAFE3
+OPTIONS_DEFAULT=	BLOWFISH DES IDEA MYSQL PWSAFE3
+
+MYSQL_RUN_DEPENDS=	p5-DBD-mysql>0:databases/p5-DBD-mysql \
+			p5-DBI>0:databases/p5-DBI
+
+PWSAFE3_DESC=		Password Safe v3 backend
+PWSAFE3_RUN_DEPENDS=	p5-Crypt-PWSafe3>0:security/p5-Crypt-PWSafe3
+
+OPTIONS_GROUP=		CRYPTO
+OPTIONS_GROUP_CRYPTO=	DES IDEA BLOWFISH
+
+CRYPTO_DESC=		Encryption support
+CRYPTO_RUN_DEPENDS=	p5-Crypt-CBC>0:security/p5-Crypt-CBC \
+			p5-Crypt-Rijndael>0:security/p5-Crypt-Rijndael
+
+BLOWFISH_DESC=		BlowFish block cipher support
+BLOWFISH_RUN_DEPENDS=	p5-Crypt-Blowfish>0:security/p5-Crypt-Blowfish \
+			${CRYPTO_RUN_DEPENDS}
+
+
+DES_DESC=		DES block cipher support
+DES_RUN_DEPENDS=	p5-Crypt-DES>0:security/p5-Crypt-DES \
+			${CRYPTO_RUN_DEPENDS}
+
+IDEA_DESC=		IDEA block cipher support
+IDEA_RUN_DEPENDS=	p5-Crypt-IDEA>0:security/p5-Crypt-IDEA \
+			${CRYPTO_RUN_DEPENDS}
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|{{(|{\\{(|g' \
+		${WRKSRC}/bin/note
+
+post-install:
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC}/config && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
+
 .include <bsd.port.mk>
Index: deskutils/note/distinfo
===================================================================
--- deskutils/note/distinfo
+++ deskutils/note/distinfo
@@ -1,2 +1,3 @@
-SHA256 (note-1.3.18.tar.gz) = ba3b4db2709ce4e662b205254dfc83a27ff6912316e80a8ed1e3b52a14847071
-SIZE (note-1.3.18.tar.gz) = 52108
+TIMESTAMP = 1522908300
+SHA256 (note-1.3.22.tar.gz) = d8821168ca6266c443d01a286ba3f410c8330d55abf9f9a993ea8950eeb31478
+SIZE (note-1.3.22.tar.gz) = 52827
Index: deskutils/note/pkg-descr
===================================================================
--- deskutils/note/pkg-descr
+++ deskutils/note/pkg-descr
@@ -1,5 +1,6 @@
-This is a small console program written in
-perl, which allows you to manage notes similar
-to programs like "knotes" from commandline.
+Console based tool to handle encrypted notes
 
+This is a small console program written in perl, which allows you to manage
+notes similar to programs like "knotes" from command line.
+
 WWW: http://www.daemon.de/NOTE
Index: deskutils/note/pkg-plist
===================================================================
--- deskutils/note/pkg-plist
+++ deskutils/note/pkg-plist
@@ -1,12 +1,4 @@
 bin/note
-%%PERL5_MAN3%%/NOTEDB::binary.3.gz
-%%PERL5_MAN3%%/NOTEDB::dbm.3.gz
-%%PERL5_MAN3%%/NOTEDB::dumper.3.gz
-%%PERL5_MAN3%%/NOTEDB::general.3.gz
-%%PERL5_MAN3%%/NOTEDB::mysql.3.gz
-%%PERL5_MAN3%%/NOTEDB::pwsafe3.3.gz
-%%PERL5_MAN3%%/NOTEDB::text.3.gz
-%%PERL5_MAN3%%/note.3.gz
 %%SITE_PERL%%/NOTEDB.pm
 %%SITE_PERL%%/NOTEDB/README
 %%SITE_PERL%%/NOTEDB/binary.pm
@@ -16,4 +8,14 @@
 %%SITE_PERL%%/NOTEDB/mysql.pm
 %%SITE_PERL%%/NOTEDB/pwsafe3.pm
 %%SITE_PERL%%/NOTEDB/text.pm
+%%PERL5_MAN3%%/NOTEDB::binary.3.gz
+%%PERL5_MAN3%%/NOTEDB::dbm.3.gz
+%%PERL5_MAN3%%/NOTEDB::dumper.3.gz
+%%PERL5_MAN3%%/NOTEDB::general.3.gz
+%%PERL5_MAN3%%/NOTEDB::mysql.3.gz
+%%PERL5_MAN3%%/NOTEDB::pwsafe3.3.gz
+%%PERL5_MAN3%%/NOTEDB::text.3.gz
+%%PERL5_MAN3%%/note.3.gz
 %%SITE_PERL%%/note.pod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/noterc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rc