Update to 1.9

ok giovanni@
2010-06-30 09:44:07 +00:00 · 2010-06-30 09:44:07 +00:00 · 6428dcc5d2
commit 6428dcc5d2
parent 4707731a17
6 changed files with 39 additions and 52 deletions
--- a/security/ccrypt/Makefile
+++ b/security/ccrypt/Makefile
@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.15 2009/03/16 22:44:19 sthen Exp $
+# $OpenBSD: Makefile,v 1.16 2010/06/30 09:44:07 kevlo Exp $

 COMMENT=	encrypt and decrypt AES files and streams

-DISTNAME=	ccrypt-1.7
-PKGNAME=	${DISTNAME}p2
+DISTNAME=	ccrypt-1.9
 CATEGORIES=	security

 HOMEPAGE=	http://www.mathstat.dal.ca/~selinger/ccrypt/

 MAINTAINER=	Kevin Lo <kevlo@openbsd.org>

+# GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
@ -19,13 +19,10 @@ WANTLIB=		c
 MASTER_SITES=	${HOMEPAGE}/download/ \
 		${MASTER_SITE_SOURCEFORGE:=ccrypt/}

+MODULES=	devel/gettext \
+		textproc/intltool
+BUILD_DEPENDS=	:emacs->=21,<22:editors/emacs21
+
 CONFIGURE_STYLE= gnu

-FLAVORS=	emacs21
-FLAVOR?=
-
-.if ${FLAVOR:L:Memacs21}
-BUILD_DEPENDS=	:emacs->=21,<22:editors/emacs21
-.endif
-
 .include <bsd.port.mk>
--- a/security/ccrypt/distinfo
+++ b/security/ccrypt/distinfo
@ -1,5 +1,5 @@
-MD5 (ccrypt-1.7.tar.gz) = GVJuMafSNOKdVNvMh2YF1Q==
-RMD160 (ccrypt-1.7.tar.gz) = evG5eQC5l/XvTTgBU6cskyNgr+0=
-SHA1 (ccrypt-1.7.tar.gz) = EiSFC/tNWsddSu1dRnPyEB102yA=
-SHA256 (ccrypt-1.7.tar.gz) = G/l0ye5fIDMvARfFuAeEgl9QXxok61ehDIGVw60WVA4=
-SIZE (ccrypt-1.7.tar.gz) = 214189
+MD5 (ccrypt-1.9.tar.gz) = w/eAGdehZt1m8dSxOQxiwg==
+RMD160 (ccrypt-1.9.tar.gz) = Ln7AN9z6uCrWljuGRKUgF6xsAD4=
+SHA1 (ccrypt-1.9.tar.gz) = WtGInHG+kFwwBMgNwBGUjJw1yBQ=
+SHA256 (ccrypt-1.9.tar.gz) = ZTjLdff0X68g+RLHsNKEgxsK/O2fxhmEuNRamQJ2668=
+SIZE (ccrypt-1.9.tar.gz) = 667059
--- a/security/ccrypt/patches/patch-configure
+++ b/security/ccrypt/patches/patch-configure
@ -1,15 +1,21 @@
-$OpenBSD: patch-configure,v 1.1 2006/02/08 07:52:56 steven Exp $
--- configure.orig	Wed Feb  8 08:21:40 2006
-+++ configure	Wed Feb  8 08:21:50 2006
-@@ -2981,9 +2981,9 @@ fi
- 
- if test "$GCC" = "yes"; then
-    if test "$iCFLAGS" = ""; then
-     CFLAGS="-O3 -Wall"
-+     CFLAGS="-Wall"
-    else
-     CFLAGS="$iCFLAGS -O3"
-+     CFLAGS="$iCFLAGS"
-    fi
- fi
- 
+$OpenBSD: patch-configure,v 1.2 2010/06/30 09:44:07 kevlo Exp $
+--- configure.orig	Wed Jun 30 16:07:52 2010
+++ configure	Wed Jun 30 16:09:45 2010
+@@ -28796,7 +28796,7 @@ s,@HAVE_POSIX_PRINTF@,$HAVE_POSIX_PRINTF,;t t
+ s,@HAVE_ASPRINTF@,$HAVE_ASPRINTF,;t t
+ s,@HAVE_SNPRINTF@,$HAVE_SNPRINTF,;t t
+ s,@HAVE_WPRINTF@,$HAVE_WPRINTF,;t t
+-s,@LIBICONV@,$LIBICONV,;t t
+s,@LIBICONV@,$LTLIBICONV,;t t
+ s,@LTLIBICONV@,$LTLIBICONV,;t t
+ s,@INTLBISON@,$INTLBISON,;t t
+ s,@BUILD_INCLUDED_LIBINTL@,$BUILD_INCLUDED_LIBINTL,;t t
+@@ -28808,7 +28808,7 @@ s,@GENCAT@,$GENCAT,;t t
+ s,@INTLOBJS@,$INTLOBJS,;t t
+ s,@INTL_LIBTOOL_SUFFIX_PREFIX@,$INTL_LIBTOOL_SUFFIX_PREFIX,;t t
+ s,@INTLLIBS@,$INTLLIBS,;t t
+-s,@LIBINTL@,$LIBINTL,;t t
+s,@LIBINTL@,$LTLIBINTL,;t t
+ s,@LTLIBINTL@,$LTLIBINTL,;t t
+ s,@POSUB@,$POSUB,;t t
+ s,@INTLTOOL_DESKTOP_RULE@,$INTLTOOL_DESKTOP_RULE,;t t
--- a/security/ccrypt/patches/patch-doc_Makefile_in
+++ b/security/ccrypt/patches/patch-doc_Makefile_in
@ -1,12 +0,0 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.3 2004/03/31 06:08:38 kevlo Exp $
--- doc/Makefile.in.orig	2004-03-29 04:58:19.000000000 +0000
-+++ doc/Makefile.in	2004-03-31 13:15:19.000000000 +0000
-@@ -135,7 +135,7 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- EXTRA_DIST = ccrypt.1.in man2html.sed cypfaq01.txt
-htmldir = $(prefix)/doc/ccrypt
-+htmldir = $(prefix)/share/doc/ccrypt
- DISTCLEANFILES = ccrypt.ps ccrypt.html
- man_MANS = ccrypt.1
- html_DATA = ccrypt.html
--- a/security/ccrypt/pkg/PFRAG.emacs21
+++ b/security/ccrypt/pkg/PFRAG.emacs21
@ -1,3 +0,0 @@
-@comment $OpenBSD: PFRAG.emacs21,v 1.1 2003/01/30 05:11:52 kevlo Exp $
-share/emacs/site-lisp/jka-compr-ccrypt.el
-share/emacs/site-lisp/jka-compr-ccrypt.elc
--- a/security/ccrypt/pkg/PLIST
+++ b/security/ccrypt/pkg/PLIST
@ -1,14 +1,13 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/09/15 18:35:59 espie Exp $
+@comment $OpenBSD: PLIST,v 1.4 2010/06/30 09:44:07 kevlo Exp $
 bin/ccat
 bin/ccdecrypt
 bin/ccencrypt
-bin/ccrypt
+@bin bin/ccrypt
@man man/man1/ccat.1
@man man/man1/ccdecrypt.1
@man man/man1/ccencrypt.1
@man man/man1/ccrypt.1
-share/doc/ccrypt/
-share/doc/ccrypt/ccrypt.html
-share/emacs/
-share/emacs/site-lisp/
-%%emacs21%%
+share/emacs/site-lisp/ps-ccrypt.el
+share/emacs/site-lisp/ps-ccrypt.elc
+share/locale/de/LC_MESSAGES/ccrypt.mo
+share/locale/fr/LC_MESSAGES/ccrypt.mo