Update to 1.7

PR:		ports/77320
Submitted by:	Roland Smith
Approved by:	maintainer

4 files changed, 23 insertions, 115 deletions

diff --git a/security/ccrypt/files/patch-Makefile.in b/security/ccrypt/files/patch-Makefile.in
index f642d37c7ce2..91ac67716abf 100644
--- a/security/ccrypt/files/patch-Makefile.in
+++ b/security/ccrypt/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Thu Feb  7 09:08:04 2002
-+++ Makefile.in	Thu Feb  7 09:08:12 2002
-@@ -72,7 +72,7 @@
- VERSION = @VERSION@
- lispdir = @lispdir@
- 
+--- Makefile.in.orig	Mon Mar 29 06:58:19 2004
++++ Makefile.in	Sun Jan 23 09:55:14 2005
+@@ -150,7 +150,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
 -SUBDIRS = src emacs doc check
 +SUBDIRS = src doc check
- 
  EXTRA_DIST = README.win
- 
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/security/ccrypt/files/patch-doc::Makefile.in b/security/ccrypt/files/patch-doc::Makefile.in
index 62eef0774cad..6cfb5a16d6df 100644
--- a/security/ccrypt/files/patch-doc::Makefile.in
+++ b/security/ccrypt/files/patch-doc::Makefile.in
@@ -1,20 +1,20 @@
---- doc/Makefile.in.orig	Wed Jan 30 14:15:42 2002
-+++ doc/Makefile.in	Sun Sep 15 09:24:14 2002
-@@ -195,7 +195,7 @@
- install-exec-am:
+--- doc/Makefile.in.orig	Mon Mar 29 06:58:19 2004
++++ doc/Makefile.in	Sun Jan 23 09:59:41 2005
+@@ -274,7 +274,7 @@
+ check: check-am
+ all-am: Makefile $(MANS) $(DATA)
+ installdirs:
+-	$(mkdir_p) $(DESTDIR)$(man1dir) $(DESTDIR)$(htmldir)
++	$(mkdir_p) $(DESTDIR)$(man1dir)
+ install: install-am
  install-exec: install-exec-am
+ install-data: install-data-am
+@@ -316,7 +316,7 @@
+ 
+ info-am:
  
--install-data-am: install-man install-htmlDATA
-+install-data-am: install-man # install-htmlDATA
+-install-data-am: install-htmlDATA install-man
++install-data-am: install-man
  	@$(NORMAL_INSTALL)
  	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- install-data: install-data-am
-@@ -210,7 +210,7 @@
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(htmldir)
-+	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1 # $(DESTDIR)$(htmldir)
- 
  
- mostlyclean-generic:
diff --git a/security/ccrypt/files/patch-src::Makefile.in b/security/ccrypt/files/patch-src::Makefile.in
deleted file mode 100644
index b52490fbd4fb..000000000000
--- a/security/ccrypt/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Wed Jan 30 14:15:42 2002
-+++ src/Makefile.in	Sun Sep 15 09:26:45 2002
-@@ -76,7 +76,7 @@
- VERSION = @VERSION@
- lispdir = @lispdir@
- 
--CFLAGS = -O3
-+CFLAGS = @CFLAGS@
- 
- bin_PROGRAMS = ccrypt
- noinst_PROGRAMS = maketables
diff --git a/security/ccrypt/files/patch-src::main.c b/security/ccrypt/files/patch-src::main.c
deleted file mode 100644
index c92deb72822a..000000000000
--- a/security/ccrypt/files/patch-src::main.c
+++ /dev/null
@@ -1,81 +0,0 @@
---- src/main.c.orig	Wed Oct 15 06:33:06 2003
-+++ src/main.c	Wed Oct 15 06:33:46 2003
-@@ -37,42 +37,42 @@
- 
- void usage(FILE *fout) {
-   fprintf(fout, "\
--"NAME" "VERSION". Secure encryption and decryption of files and streams.
--
--Usage: "NAME" [mode] [options] [file...]
--       "NAMEENCRYPT" [options] [file...]
--       "NAMEDECRYPT" [options] [file...]
--       "NAMECAT" [options] file...
--
--Modes:
--    -e, --encrypt          encrypt
--    -d, --decrypt          decrypt
--    -c, --cat              cat; decrypt files to stdout
--    -x, --keychange        change key
--    -u, --unixcrypt        decrypt old unix crypt files
--
--Options:
--    -h, --help             print this help message and exit
--    -V, --version          print version info and exit
--    -L, --license          print license info and exit
--    -v, --verbose          print progress information to stderr
--    -q, --quiet            run quietly; suppress warnings
--    -f, --force            overwrite existing files without asking
--    -m, --mismatch         allow decryption with non-matching key
--    -E, --envvar var       read keyword from environment variable (unsafe)
--    -K, --key key          give keyword on command line (unsafe)
--    -k, --keyfile file     read keyword(s) as first line(s) from file
--    -P, --prompt prompt    use this prompt instead of default
--    -S, --suffix .suf      use suffix .suf instead of default "SUF"
--    -s, --strictsuffix     refuse to encrypt files which already have suffix
--    -F, --envvar2 var      as -E for second keyword (for keychange mode)
--    -H, --key2 key         as -H for second keyword (for keychange mode)
--    -Q, --prompt2 prompt   as -P for second keyword (for keychange mode)
--    -t, --timid            prompt twice for destructive encryption keys
--    -r, --recursive        recurse through directories
--    -R, --rec-symlinks     follow symbolic links as subdirectories
--    -l, --symlinks         dereference symbolic links
--    --                     end of options, filenames follow
-+"NAME" "VERSION". Secure encryption and decryption of files and streams. \n\
-+ \n\
-+Usage: "NAME" [mode] [options] [file...] \n\
-+       "NAMEENCRYPT" [options] [file...] \n\
-+       "NAMEDECRYPT" [options] [file...] \n\
-+       "NAMECAT" [options] file... \n\
-+ \n\
-+Modes: \n\
-+    -e, --encrypt          encrypt \n\
-+    -d, --decrypt          decrypt \n\
-+    -c, --cat              cat; decrypt files to stdout \n\
-+    -x, --keychange        change key \n\
-+    -u, --unixcrypt        decrypt old unix crypt files \n\
-+\n\
-+Options:\n\
-+    -h, --help             print this help message and exit\n\
-+    -V, --version          print version info and exit\n\
-+    -L, --license          print license info and exit\n\
-+    -v, --verbose          print progress information to stderr\n\
-+    -q, --quiet            run quietly; suppress warnings\n\
-+    -f, --force            overwrite existing files without asking\n\
-+    -m, --mismatch         allow decryption with non-matching key\n\
-+    -E, --envvar var       read keyword from environment variable (unsafe)\n\
-+    -K, --key key          give keyword on command line (unsafe)\n\
-+    -k, --keyfile file     read keyword(s) as first line(s) from file\n\
-+    -P, --prompt prompt    use this prompt instead of default\n\
-+    -S, --suffix .suf      use suffix .suf instead of default "SUF"\n\
-+    -s, --strictsuffix     refuse to encrypt files which already have suffix\n\
-+    -F, --envvar2 var      as -E for second keyword (for keychange mode)\n\
-+    -H, --key2 key         as -H for second keyword (for keychange mode)\n\
-+    -Q, --prompt2 prompt   as -P for second keyword (for keychange mode)\n\
-+    -t, --timid            prompt twice for destructive encryption keys\n\
-+    -r, --recursive        recurse through directories\n\
-+    -R, --rec-symlinks     follow symbolic links as subdirectories\n\
-+    -l, --symlinks         dereference symbolic links\n\
-+    --                     end of options, filenames follow\n\
- ");
- }
-