From 511e990ef3d9c0c3e135d632a659484edba278a8 Mon Sep 17 00:00:00 2001
From: Jason Helfman <jgh@FreeBSD.org>
Date: Wed, 5 Dec 2012 18:26:50 +0000
Subject: [PATCH] - update to 1.10, trim historical header - adopt optionsNG
 and general cleanup

PR:             174137 (based on)
Submitted by:   maintainer, dev2@heesakkers.info
Approved by:    maintainer
Feature safe:	yes
---
 security/ccrypt/Makefile  | 32 ++++++++++++++------------------
 security/ccrypt/distinfo  |  4 ++--
 security/ccrypt/pkg-plist |  9 +++++----
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/security/ccrypt/Makefile b/security/ccrypt/Makefile
index 04fc72938866..200d29575b0a 100644
--- a/security/ccrypt/Makefile
+++ b/security/ccrypt/Makefile
@@ -1,35 +1,30 @@
-# ex:ts=8
-# Ports collection makefile for:	ccrypt
-# Date created:			Feb 7, 2002
-# Whom:				ijliao
-#
-
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	ccrypt
-PORTVERSION=	1.9
-PORTREVISION=	1
+PORTVERSION=	1.10
 CATEGORIES=	security
 MASTER_SITES=	SF \
 		http://www.mathstat.dal.ca/~selinger/ccrypt/download/
 
 MAINTAINER=	dev2@heesakkers.info
-COMMENT=	A command-line utility for encrypting and decrypting files and streams
+COMMENT=	Command-line utility for encrypting and decrypting files and streams
 
-.if !defined(WITHOUT_NLS)
-USE_GNOME=	intltool
-USE_GETTEXT=	yes
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 PLIST_SUB+=	NLS=""
+USE_GETTEXT=	yes
 .else
+PLIST_SUB+=	NLS="@comment "
 USE_PERL5_BUILD=	yes
 CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
 .endif
 
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 
-MAN1=	ccrypt.1
+MAN1=	ccrypt.1 ccguess.1
 MLINKS=	ccrypt.1 ccencrypt.1 \
 	ccrypt.1 ccdecrypt.1 \
 	ccrypt.1 ccat.1
@@ -38,10 +33,11 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|gtar|tar|g' ${WRKSRC}/configure
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-.for i in README doc/ccrypt.html doc/cypfaq01.txt
-	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+.for i in ccrypt.html cypfaq01.txt
+	${INSTALL_DATA} ${WRKSRC}/doc/$i ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/security/ccrypt/distinfo b/security/ccrypt/distinfo
index 2932a947643f..20f38d766437 100644
--- a/security/ccrypt/distinfo
+++ b/security/ccrypt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ccrypt-1.9.tar.gz) = 6538cb75f7f45faf20f912c7b0d284831b0afced9fc61984b8d45a990276ebaf
-SIZE (ccrypt-1.9.tar.gz) = 667059
+SHA256 (ccrypt-1.10.tar.gz) = 87d66da2170facabf6f2fc073586ae2c7320d4689980cfca415c74688e499ba0
+SIZE (ccrypt-1.10.tar.gz) = 669491
diff --git a/security/ccrypt/pkg-plist b/security/ccrypt/pkg-plist
index b89038ef82da..66c2de9479cf 100644
--- a/security/ccrypt/pkg-plist
+++ b/security/ccrypt/pkg-plist
@@ -1,10 +1,11 @@
 bin/ccat
 bin/ccdecrypt
 bin/ccencrypt
+bin/ccguess
 bin/ccrypt
 %%NLS%%share/locale/de/LC_MESSAGES/ccrypt.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/ccrypt.mo
-%%PORTDOCS%%share/doc/ccrypt/README
-%%PORTDOCS%%share/doc/ccrypt/ccrypt.html
-%%PORTDOCS%%share/doc/ccrypt/cypfaq01.txt
-%%PORTDOCS%%@dirrm share/doc/ccrypt
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/ccrypt.html
+%%PORTDOCS%%%%DOCSDIR%%/cypfaq01.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%