ports/174137: [patch] security/ccrypt: Update to 1.10 and misc edits

[Oliver Heesakkers]

>Number:         174137
>Category:       ports
>Synopsis:       [patch] security/ccrypt: Update to 1.10 and misc edits
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 05 01:30:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Oliver Heesakkers
>Release:        FreeBSD 9.1-RELEASE #3 r243795
>Organization:
>Environment:
FreeBSD 9.1-RELEASE #3 r243795: Sun Dec  2 23:25:28 CET 2012 /usr/obj/usr/src/sys/pcoliver9  amd64
>Description:
With thanks to the new portscout effort (the SF RSS feed let me down here), the attached patch does for security/ccrypt:
- Update to 1.10
- Convert to optionsNG
- Trim Makefile header
- General cleanup of Makefile and plist
>How-To-Repeat:

>Fix:
See attached

Patch attached with submission follows:

diff -ruN ccrypt.orig/Makefile ccrypt/Makefile
--- ccrypt.orig/Makefile	2012-11-17 07:01:01.000000000 +0100
+++ ccrypt/Makefile	2012-12-05 02:12:02.000000000 +0100
@@ -1,15 +1,8 @@
-# ex:ts=8
-# Ports collection makefile for:	ccrypt
-# Date created:			Feb 7, 2002
-# Whom:				ijliao
-#
-
+# Created by:			ijliao
 # $FreeBSD: ports/security/ccrypt/Makefile,v 1.20 2012/11/17 06:01:01 svnexp Exp $
-#
 
 PORTNAME=	ccrypt
-PORTVERSION=	1.9
-PORTREVISION=	1
+PORTVERSION=	1.10
 CATEGORIES=	security
 MASTER_SITES=	SF \
 		http://www.mathstat.dal.ca/~selinger/ccrypt/download/
@@ -17,31 +10,34 @@
 MAINTAINER=	dev2 at heesakkers.info
 COMMENT=	A command-line utility for encrypting and decrypting files and streams
 
-.if !defined(WITHOUT_NLS)
-USE_GNOME=	intltool
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.else
-USE_PERL5_BUILD=	yes
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
-.endif
-
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 
 MAN1=	ccrypt.1
 MLINKS=	ccrypt.1 ccencrypt.1 \
 	ccrypt.1 ccdecrypt.1 \
 	ccrypt.1 ccat.1
 
+.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
+.endif
+
 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 -ruN ccrypt.orig/distinfo ccrypt/distinfo
--- ccrypt.orig/distinfo	2011-07-03 16:02:34.000000000 +0200
+++ ccrypt/distinfo	2012-12-05 00:56:49.000000000 +0100
@@ -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 -ruN ccrypt.orig/pkg-plist ccrypt/pkg-plist
--- ccrypt.orig/pkg-plist	2009-09-09 14:54:01.000000000 +0200
+++ ccrypt/pkg-plist	2012-12-05 01:38:29.000000000 +0100
@@ -4,7 +4,7 @@
 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%%


>Release-Note:
>Audit-Trail:
>Unformatted: