6 files changed, 17 insertions, 230 deletions

diff --git a/archivers/sharutils/Makefile b/archivers/sharutils/Makefile
index 8a73bca2f1d8..d2ef4d1a5a45 100644
--- a/archivers/sharutils/Makefile
+++ b/archivers/sharutils/Makefile
@@ -6,20 +6,29 @@
 #
 
 PORTNAME=	sharutils
-PORTVERSION=	4.2.1
-PORTREVISION=	2
+PORTVERSION=	4.3.77
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	sharutils
+MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sylvioc@gmail.com
 COMMENT=	Pack, send and unpack shell archives; synchronize via e-mail
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-prefix=g --disable-uucode --disable-nls
+CONFIGURE_ARGS=	--program-prefix=g --disable-uucode
 INSTALL_TARGET=	install install-man
 MAN1=		gshar.1 gunshar.1
-INFO=		remsync sharutils
+INFO=		sharutils
 PLIST_FILES=	bin/gmail-files bin/gmailshar bin/gremsync bin/gshar bin/gunshar
 
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=--disable-nls
+.else
+USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--with-libintl-prefix="${LOCALBASE}"
+.for l in ca cs da de el es fr gl hu ja nb nl nn pt ru sv tr zh_TW
+PLIST_FILES+=	share/locale/${l}/LC_MESSAGES/sharutils.mo
+.endfor
+.endif
+
 .include <bsd.port.mk>
diff --git a/archivers/sharutils/distinfo b/archivers/sharutils/distinfo
index 8c36266ab986..d84d08feb9c8 100644
--- a/archivers/sharutils/distinfo
+++ b/archivers/sharutils/distinfo
@@ -1,2 +1,2 @@
-MD5 (sharutils-4.2.1.tar.gz) = b8ba1d409f07edcb335ff72a27bd9828
-SIZE (sharutils-4.2.1.tar.gz) = 306022
+MD5 (sharutils-4.3.77.tar.gz) = 813e7d2d119fc807286b1e01448cf450
+SIZE (sharutils-4.3.77.tar.gz) = 686211
diff --git a/archivers/sharutils/files/patch-aa b/archivers/sharutils/files/patch-aa
deleted file mode 100644
index 079f71e29f08..000000000000
--- a/archivers/sharutils/files/patch-aa
+++ /dev/null
@@ -1,90 +0,0 @@
---- doc/remsync.texi.orig	Sun Jun  8 22:59:35 1997
-+++ doc/remsync.texi	Sun Jun  8 23:02:50 1997
-@@ -2,6 +2,11 @@
- @c %**start of header
- @setfilename remsync.info
- @settitle @code{remsync} reference manual
-+@dircategory File transfer and archiving tools
-+@direntry
-+* remsync: (remsync).                           Synchronize remote directory
-+                                                trees using email.
-+@end direntry
- @finalout
- @setchapternewpage odd
- @c %**end of header
---- doc/sharutils.texi.orig	Sun Jun  8 22:59:41 1997
-+++ doc/sharutils.texi	Sun Jun  8 23:10:37 1997
-@@ -2,6 +2,16 @@
- @c %**start of header
- @setfilename sharutils.info
- @settitle GNU @code{shar} utilities
-+@dircategory File transfer and archiving tools
-+@direntry
-+* Shar utilities: (sharutils).                  GNU shar utilities.
-+* mail-files: (sharutils)mail-files invocation. Send files to remote site.
-+* mailshar: (sharutils)mailshar invocation.     Make and send a shell archive.
-+* shar: (sharutils)shar invocation.             Make a shell archive.
-+* unshar: (sharutils)unshar invocation.         Explode a shell archive.
-+* uudecode: (sharutils)uudecode invocation.     Restore file from 7-bits.
-+* uuencode: (sharutils)uuencode invocation.     Force binary file to 7-bits.
-+@end direntry
- @finalout
- @c %**end of header
- 
-@@ -15,21 +26,6 @@
- @end tex
- 
- @ifinfo
--@format
--START-INFO-DIR-ENTRY
--* Shar utilities: (sharutils).          GNU shar utilities.
--* mail-files: (sharutils)mail-files invocation. Send files to remote site.
--* mailshar: (sharutils)mailshar invocation.     Make and send a shell archive.
--* remsync: (sharutils)remsync invocation.       Synchronize remote files.
--* shar: (sharutils)shar invocation.             Make a shell archive.
--* unshar: (sharutils)unshar invocation.         Explode a shell archive.
--* uudecode: (sharutils)uudecode invocation.     Restore file from 7-bits.
--* uuencode: (sharutils)uuencode invocation.     Force binary file to 7-bits.
--END-INFO-DIR-ENTRY
--@end format
--@end ifinfo
--
--@ifinfo
- This file documents the GNU set of shar utilities.
- 
- Copyright (C) 1994 Free Software Foundation, Inc.
-@@ -157,8 +153,8 @@
- The format of the @code{shar} command is one of:
- 
- @example
--shar [ @var{option} ] @dots{} @var{file} @dots{}
--shar -S [ @var{option} ] @dots{}
-+gshar [ @var{option} ] @dots{} @var{file} @dots{}
-+gshar -S [ @var{option} ] @dots{}
- @end example
- 
- In the first form, the file list is given as command arguments.  In the
-@@ -548,7 +544,7 @@
- The format of the @code{unshar} command is:
- 
- @example
--unshar [ @var{option} ] @dots{} [ @var{file} @dots{} ]
-+gunshar [ @var{option} ] @dots{} [ @var{file} @dots{} ]
- @end example
- 
- Each @var{file} is processed in turn, as a shell archive or a
-@@ -635,10 +631,10 @@
- Let us conclude by a showing a few examples of @code{shar} usage:
- 
- @example
--shar *.c > cprog.shar
--shar -Q *.[ch] > cprog.shar
--shar -B -l28 -oarc.sh. *.arc
--shar -f /lcl/src/u*.c > u.sh
-+gshar *.c > cprog.shar
-+gshar -Q *.[ch] > cprog.shar
-+gshar -B -l28 -oarc.sh. *.arc
-+gshar -f /lcl/src/u*.c > u.sh
- @end example
- 
- @noindent
diff --git a/archivers/sharutils/files/patch-ac b/archivers/sharutils/files/patch-ac
deleted file mode 100644
index ae683ed43e9c..000000000000
--- a/archivers/sharutils/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/shar.c.orig	Sun Jun  8 22:47:22 1997
-+++ src/shar.c	Sun Jun  8 22:47:37 1997
-@@ -688,7 +688,7 @@
-      const char *local_name;
-      const char *restore_name;
- {
--  fprintf (output, "# %6ld %s %s\n", struct_stat.st_size,
-+  fprintf (output, "# %6ld %s %s\n", (long)struct_stat.st_size,
- 	   mode_string (struct_stat.st_mode), restore_name);
-   return 0;
- }
diff --git a/archivers/sharutils/files/patch-buffer-check b/archivers/sharutils/files/patch-buffer-check
deleted file mode 100644
index 46cf35e8a7f4..000000000000
--- a/archivers/sharutils/files/patch-buffer-check
+++ /dev/null
@@ -1,98 +0,0 @@
-Index: src/shar.c
-===================================================================
-RCS file: /home/ke/cvsroot/sharutils/src/shar.c,v
-retrieving revision 1.22
-diff -u -r1.22 shar.c
---- src/shar.c	2 Dec 2002 20:52:10 -0000	1.22
-+++ src/shar.c	15 May 2004 09:13:16 -0000
-@@ -255,11 +255,11 @@
- /* Position for first file in the shar file.  */
- static off_t first_file_position;
- 
--/* Base for output filename.  FIXME: No fix limit in GNU... */
--static char output_base_name[50];
-+/* Base for output filename.  */
-+static char *output_base_name;
- 
--/* Actual output filename.  FIXME: No fix limit in GNU... */
--static char output_filename[50];
-+/* Actual output filename.  */
-+static char *output_filename;
- 
- static char *submitter_address = NULL;
- 
-@@ -1727,7 +1727,12 @@
- static void
- open_output ()
- {
--  sprintf (output_filename, output_base_name, ++part_number);
-+  size_t l;
-+  l = strlen(output_base_name) + 128;
-+  if (output_filename)
-+    free(output_filename);
-+  output_filename = xmalloc(l);
-+  snprintf(output_filename, l, output_base_name, ++part_number);
-   output = fopen (output_filename, "w");
-   if (!output)
-     error (EXIT_FAILURE, errno, _("Opening `%s'"), output_filename);
-@@ -1907,6 +1912,42 @@
-     file_size_limit = lim;
- }
- 
-+
-+char *parse_output_base_name(char *arg)
-+{
-+  int c;
-+  int hadarg = 0;
-+  char *fmt, *p;
-+
-+  for (p = arg ; (c = *p++) != 0; )
-+    {
-+      if (c != '%')
-+	continue;
-+      c = *p++;
-+      if (c == '%')
-+	continue;
-+      if (hadarg)
-+	return 0;
-+      while (c != 0 && strchr("#0+- 'I", c) != 0)
-+	c = *p++;
-+      while (c != 0 && c >= '0' && c <= '9')
-+	c = *p++;
-+      if (c == '.')
-+	c = *p++;
-+      while (c != 0 && c >= '0' && c <= '9')
-+	c = *p++;
-+      if (c == 0 || strchr("diouxX", c) == 0)
-+	return 0;
-+      hadarg = 1;
-+    }
-+  fmt = xmalloc(strlen(arg) + (hadarg ? 1 : 6));
-+  strcpy(fmt, arg);
-+  if (!hadarg)
-+    strcat(fmt, ".%02d");
-+  return fmt;
-+}
-+
-+
- /*---.
- | ?  |
- `---*/
-@@ -2047,9 +2088,14 @@
- 	break;
- 
-       case 'o':
--	strcpy (output_base_name, optarg);
--	if (!strchr (output_base_name, '%'))
--	  strcat (output_base_name, ".%02d");
-+	if (output_base_name)
-+	  free (output_base_name);
-+        output_base_name = parse_output_base_name(optarg);
-+        if (!output_base_name)
-+	  {
-+	    fprintf (stderr, _("illegal output prefix\n"));
-+	    exit (EXIT_FAILURE);
-+	  }
- 	part_number = 0;
- 	open_output ();
- 	break;
diff --git a/archivers/sharutils/files/patch-buffer-limits b/archivers/sharutils/files/patch-src_unshar.c
index bbcb8b552126..9180a07812dc 100644
--- a/archivers/sharutils/files/patch-buffer-limits
+++ b/archivers/sharutils/files/patch-src_unshar.c
@@ -1,26 +1,3 @@
---- src/shar.c.orig	1999-09-10 21:20:41.000000000 +0200
-+++ src/shar.c	2004-09-29 15:09:40.790061000 +0200
-@@ -1571,7 +1571,7 @@
- 	  sprintf (command, "%s '%s'", CHARACTER_COUNT_COMMAND, local_name);
- 	  if (pfp = popen (command, "r"), pfp)
- 	    {
--	      char wc[BUFSIZ];
-+		char wc[BUFSIZ], tempform[50];      
- 	      const char *prefix = "";
- 
- 	      if (did_md5)
-@@ -1579,8 +1579,8 @@
- 		  fputs ("  else\n", output);
- 		  prefix = "  ";
- 		}
--
--	      fscanf (pfp, "%s", wc);
-+	sprintf (tempform, "%%%ds", BUFSIZ - 1);
-+	fscanf (pfp, tempform, wc);
- 	      fprintf (output, "\
- %s  shar_count=\"`%s '%s'`\"\n\
- %s  test %s -eq \"$shar_count\" ||\n\
-diff -Naur ./sharutils-4.2.1/src/unshar.c ./sharutils-4.2.1_new/src/unshar.c
 --- src/unshar.c.orig	1995-11-21 17:22:14.000000000 +0100
 +++ src/unshar.c	2004-09-29 15:09:44.682469264 +0200
 @@ -346,8 +346,8 @@