From 6c6e9fa7e5e59729a23b3f1856a5c5e9dbb02819 Mon Sep 17 00:00:00 2001
From: bcallah <bcallah@openbsd.org>
Date: Tue, 28 Aug 2018 18:49:11 +0000
Subject: [PATCH] Maintenance update ccrypt to 1.11, sync pkg/DESCR while here
 to no longer reference an emacs FLAVOR that we haven't been building for a
 while.

From new MAINTAINER Charlene Wendling -- thanks!
---
 security/ccrypt/Makefile  | 15 ++++++++++-----
 security/ccrypt/distinfo  |  4 ++--
 security/ccrypt/pkg/DESCR |  3 ---
 security/ccrypt/pkg/PLIST |  5 ++++-
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/security/ccrypt/Makefile b/security/ccrypt/Makefile
index d4227b27177..31ed36b8aff 100644
--- a/security/ccrypt/Makefile
+++ b/security/ccrypt/Makefile
@@ -1,19 +1,21 @@
-# $OpenBSD: Makefile,v 1.22 2017/11/21 00:13:03 naddy Exp $
+# $OpenBSD: Makefile,v 1.23 2018/08/28 18:49:11 bcallah Exp $
 
 COMMENT=	encrypt and decrypt AES files and streams
 
-DISTNAME=	ccrypt-1.10
+V=		1.11
+DISTNAME=	ccrypt-${V}
 CATEGORIES=	security
-REVISION =	1
 
 HOMEPAGE=	http://ccrypt.sourceforge.net/
 
+MAINTAINER=	Charlene Wendling <julianaito@posteo.jp>
+
 # GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=  c iconv intl
 
-MASTER_SITES=	${HOMEPAGE}/download/ \
+MASTER_SITES=	${HOMEPAGE}/download/${V}/ \
 		${MASTER_SITE_SOURCEFORGE:=ccrypt/}
 
 MODULES=	textproc/intltool
@@ -21,6 +23,9 @@ MODULES=	textproc/intltool
 LIB_DEPENDS=	devel/gettext
 
 CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=	--disable-emacs
+# XXX We need to use the upstream provided getopt or tests fail. This
+# configuration option should be zapped as of v1.12 as it's fixed upstream.
+CONFIGURE_ARGS=	--disable-emacs \
+		--with-included-getopt
 
 .include <bsd.port.mk>
diff --git a/security/ccrypt/distinfo b/security/ccrypt/distinfo
index f0a7006d312..b868b6a5d60 100644
--- a/security/ccrypt/distinfo
+++ b/security/ccrypt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ccrypt-1.10.tar.gz) = h9ZtohcPrKv28vwHNYauLHMg1GiZgM/KQVx0aI5Jm6A=
-SIZE (ccrypt-1.10.tar.gz) = 669491
+SHA256 (ccrypt-1.11.tar.gz) = sZxHUAqW7l+9gg9wTJEvbvzEK2OMCmqnpOPcCmtRpE8=
+SIZE (ccrypt-1.11.tar.gz) = 834575
diff --git a/security/ccrypt/pkg/DESCR b/security/ccrypt/pkg/DESCR
index ae8110feb5a..7cbe6e19ca6 100644
--- a/security/ccrypt/pkg/DESCR
+++ b/security/ccrypt/pkg/DESCR
@@ -4,6 +4,3 @@ notorious for using a very weak encryption algorithm. ccrypt is based on
 the Rijndael cipher, which is the U.S. government's chosen candidate for
 the Advanced Encryption Standard. This cipher is believed to provide
 very strong security.
-
-Flavors:
-        emacs - emacs-mode for editing encrypted text files
diff --git a/security/ccrypt/pkg/PLIST b/security/ccrypt/pkg/PLIST
index 98f5b7ee4af..4ba0244dd83 100644
--- a/security/ccrypt/pkg/PLIST
+++ b/security/ccrypt/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2013/01/20 20:03:44 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.6 2018/08/28 18:49:11 bcallah Exp $
 bin/ccat
 bin/ccdecrypt
 bin/ccencrypt
@@ -9,3 +9,6 @@ bin/ccencrypt
 @man man/man1/ccencrypt.1
 @man man/man1/ccguess.1
 @man man/man1/ccrypt.1
+share/locale/de/LC_MESSAGES/ccrypt.mo
+share/locale/et/LC_MESSAGES/ccrypt.mo
+share/locale/fr/LC_MESSAGES/ccrypt.mo