archives/gsharutils: Upgrade from version 4.2.1 to 4.11.1

DragonFly couldn't build GNU Sharutils.  Upon inspection, it was seen
that the last version in pkgsrc was at least 11 years old.  This commit
updates the GNU Sharutils to the latest version without patches.
Tested on DragonFly and NetBSD.  The Linux condition dealing with the
glibc gettext workaround was removed with the assumption that this is
no longer needed, but somebody else should test and verify this.

Select changes since 4.2 (according to NEWS):
=============================================
4.3.50: new trans: cs da el es gl ru tr zh_TW
        updated:   de fr ja nl sv
4.3.51: Norwegian split to no/@nynorsk to nb and nn
        Updated library files and m4 macros from fileutils-4.1.9
4.3.52: Fix Y2K bug (shar)
        Fix temp file race (shar)
        (N/A) allow spaces in file names (uudecode)
4.3.60: Better -Z option handling for systems without compress
4.3.61: Unspecified bugs fixes
4.3.70: Update de tr translations
        (N/A) fix uudecode output handling
        Turn off compress link default
4.3.71: Update da de translations
4.3.72: Update fr sv translations
4.3.73: Add support for large files (e.g. > 2 Gib on 32-bit hosts)
4.3.74: Updated fr translation
        Unspecified portabilitity fixes
4.3.75: New translations: ca et hu
        Updated translations: da de ja sv tr zh_TW.
        Add bzip2 support
        Fix unspecified compatiblity issues
4.3.76: Updated translations: de et fr sv tr
4.3.77: Fixed buffer overrun exploit
4.3.78: infrastructure updates
4.3.79: New temporary file handling to avoid buffer overrun exploit and
        theoretical timing hole (unshar)
        Unspecified new translations added + updates
4.3.80: Fix temporary file unlink bug
4.3.81: True64 compatibility fix
4.4:    intmax_t checks added
4.5:    Fix unspecified bug in unshar
        Update usage examples
4.5.1:  Fix memory usage bug in shar
4.5.2:  Fix test and update some translations
4.5.3:  Add unspecified translation, update another
        Move to libtool 1.5.20
4.6:    New Japanese translation
4.6.1:  Translation cleanup, infrastructure changes
4.6.2:  Better output diagnostics
4.6.3:  Recognize "end\r\n" as equal to "end" and "end\n"
        Fix readdir duplicate declaration
4.7.1:  (N/A) uudecode no longer creates output file names with trailing
        white space.
4.9:    Fix shar script shell quoting issues with translations
4.10:   Handle clobber option correctly in generated scripts
4.11:   Remove mailshar because mail-files was broken

14 files changed, 34 insertions, 500 deletions

diff --git a/archivers/gsharutils/Makefile b/archivers/gsharutils/Makefile
index bf3f7a60dea..5da0d890a26 100644
--- a/archivers/gsharutils/Makefile
+++ b/archivers/gsharutils/Makefile
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.44 2011/04/22 13:42:49 obache Exp $
+# $NetBSD: Makefile,v 1.45 2011/11/19 18:59:20 marino Exp $
 
-DISTNAME=	sharutils-4.2.1
+DISTNAME=	sharutils-4.11.1
 PKGNAME=	g${DISTNAME}
-PKGREVISION=	11
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_GNU:=sharutils/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/sharutils/sharutils.html
 COMMENT=	Allow packing and unpacking of shell archives
-
-BROKEN_GETTEXT_DETECTION=	yes
+LICENSE=	gnu-gpl-v3
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -20,35 +18,18 @@ GNU_CONFIGURE=		yes
 
 INSTALL_TARGET=		install install-man
 INFO_FILES=		yes
-USE_TOOLS+=		makeinfo msgfmt sh:run mktemp:run perl:run
-
-REPLACE_PERL=		src/remsync.in
+USE_TOOLS+=		makeinfo msgfmt sh:run
 
 CONFIGURE_ARGS+=	--disable-uucode
 CONFIGURE_ENV+=		SH=${TOOLS_SH:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
-# gettext 0.11+ has renamed internal symbols, and gsharutils is
-# being a very bad neighbor by using them directly.  To fix, force
-# use of gettext >= 0.11, and rename the symbol in gsharutils.  -tv
-#
-.if ${OPSYS} != "Linux"
-# XXX ...but don't do this on Linux, where glibc-internalized gettext
-# always uses the non-prefixed symbols.
-#
-BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.11
-CPPFLAGS+=		-D_nl_default_dirname=libintl_nl_default_dirname
-.endif
-
 .if defined(GNU_PROGRAM_PREFIX)
 CONFIGURE_ARGS+=	--program-prefix=${GNU_PROGRAM_PREFIX:Q}
 .endif
 PLIST_SUBST+=		GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
 BUILD_DEFS+=		GNU_PROGRAM_PREFIX
 
-post-patch:
-	${TOUCH} ${TOUCH_FLAGS} ${WRKSRC}/po/sharutils.pot
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/gsharutils/PLIST b/archivers/gsharutils/PLIST
index a30eccd2ce5..c220e59c4e9 100644
--- a/archivers/gsharutils/PLIST
+++ b/archivers/gsharutils/PLIST
@@ -1,16 +1,36 @@
-@comment $NetBSD: PLIST,v 1.7 2006/04/17 07:07:11 jlam Exp $
-bin/${GNU_PROGRAM_PREFIX}mail-files
-bin/${GNU_PROGRAM_PREFIX}mailshar
-bin/${GNU_PROGRAM_PREFIX}remsync
+@comment $NetBSD: PLIST,v 1.8 2011/11/19 18:59:20 marino Exp $
 bin/${GNU_PROGRAM_PREFIX}shar
 bin/${GNU_PROGRAM_PREFIX}unshar
-info/remsync.info
 info/sharutils.info
 man/man1/${GNU_PROGRAM_PREFIX}shar.1
 man/man1/${GNU_PROGRAM_PREFIX}unshar.1
+share/locale/bg/LC_MESSAGES/sharutils.mo
+share/locale/ca/LC_MESSAGES/sharutils.mo
+share/locale/cs/LC_MESSAGES/sharutils.mo
+share/locale/da/LC_MESSAGES/sharutils.mo
 share/locale/de/LC_MESSAGES/sharutils.mo
+share/locale/el/LC_MESSAGES/sharutils.mo
+share/locale/es/LC_MESSAGES/sharutils.mo
+share/locale/et/LC_MESSAGES/sharutils.mo
+share/locale/fi/LC_MESSAGES/sharutils.mo
 share/locale/fr/LC_MESSAGES/sharutils.mo
-share/locale/ja_JP.EUC/LC_MESSAGES/sharutils.mo
+share/locale/ga/LC_MESSAGES/sharutils.mo
+share/locale/gl/LC_MESSAGES/sharutils.mo
+share/locale/hu/LC_MESSAGES/sharutils.mo
+share/locale/id/LC_MESSAGES/sharutils.mo
+share/locale/it/LC_MESSAGES/sharutils.mo
+share/locale/ja/LC_MESSAGES/sharutils.mo
+share/locale/nb/LC_MESSAGES/sharutils.mo
 share/locale/nl/LC_MESSAGES/sharutils.mo
+share/locale/nn/LC_MESSAGES/sharutils.mo
+share/locale/pl/LC_MESSAGES/sharutils.mo
 share/locale/pt/LC_MESSAGES/sharutils.mo
+share/locale/ru/LC_MESSAGES/sharutils.mo
+share/locale/rw/LC_MESSAGES/sharutils.mo
+share/locale/sr/LC_MESSAGES/sharutils.mo
 share/locale/sv/LC_MESSAGES/sharutils.mo
+share/locale/tr/LC_MESSAGES/sharutils.mo
+share/locale/uk/LC_MESSAGES/sharutils.mo
+share/locale/vi/LC_MESSAGES/sharutils.mo
+share/locale/zh_CN/LC_MESSAGES/sharutils.mo
+share/locale/zh_TW/LC_MESSAGES/sharutils.mo
diff --git a/archivers/gsharutils/distinfo b/archivers/gsharutils/distinfo
index 71622e12b75..2e2c8daba73 100644
--- a/archivers/gsharutils/distinfo
+++ b/archivers/gsharutils/distinfo
@@ -1,16 +1,5 @@
-$NetBSD: distinfo,v 1.16 2009/02/09 23:53:52 joerg Exp $
+$NetBSD: distinfo,v 1.17 2011/11/19 18:59:20 marino Exp $
 
-SHA1 (sharutils-4.2.1.tar.gz) = 3f0c0af31bd429cee1e088eb74867f20f8d399ef
-RMD160 (sharutils-4.2.1.tar.gz) = 06e1629aa8a1c982e6032f194df6f5fe85f85b43
-Size (sharutils-4.2.1.tar.gz) = 306022 bytes
-SHA1 (patch-aa) = 654641dee00efc19771546cf1753d1025c18d9be
-SHA1 (patch-ab) = cc46cfb2ff26861f9c3cd482a31a5c59226a1899
-SHA1 (patch-ac) = 2fbf90458b0a81082db6b1bd343efb5f2062a947
-SHA1 (patch-ad) = df119a05f737628136ed3f43eb23b79b5075e68e
-SHA1 (patch-ae) = 8b88d98af2d1f24ba2623e8d56b36061806f5e12
-SHA1 (patch-af) = 50aee8dc24a33892a0f17f7aeb5cfbae1adcb0c9
-SHA1 (patch-ag) = ffcb66111f8c3ce972249db2b14e1526eb68c47c
-SHA1 (patch-ah) = 90fed62712aa4d02d66098581d5e5602e391663e
-SHA1 (patch-ai) = a95e116d517e5fe536a31d12db1c33daaf2609af
-SHA1 (patch-aj) = 56ee560455a206c6fa5c106f1c759d0a0296dfd7
-SHA1 (patch-ak) = ee7d026caa3fca5ad68f69312b38960fab3f281b
+SHA1 (sharutils-4.11.1.tar.gz) = e73d15384e5bd688a12ff0b48a605170ea13f4d5
+RMD160 (sharutils-4.11.1.tar.gz) = 79b57b8c139cd7845de2c0778f5230261c5331b2
+Size (sharutils-4.11.1.tar.gz) = 1297757 bytes
diff --git a/archivers/gsharutils/patches/patch-aa b/archivers/gsharutils/patches/patch-aa
deleted file mode 100644
index 671780fb06b..00000000000
--- a/archivers/gsharutils/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1999/05/23 20:33:46 tv Exp $
-
---- 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
diff --git a/archivers/gsharutils/patches/patch-ab b/archivers/gsharutils/patches/patch-ab
deleted file mode 100644
index bdbb5e57ced..00000000000
--- a/archivers/gsharutils/patches/patch-ab
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/12/22 01:49:14 wiz Exp $
-
---- 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.
diff --git a/archivers/gsharutils/patches/patch-ac b/archivers/gsharutils/patches/patch-ac
deleted file mode 100644
index 344d456e56d..00000000000
--- a/archivers/gsharutils/patches/patch-ac
+++ /dev/null
@@ -1,124 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/03/31 14:17:05 salo Exp $
-
---- src/shar.c.orig	1999-09-10 21:20:41.000000000 +0200
-+++ src/shar.c	2005-03-31 15:33:03.000000000 +0200
-@@ -211,11 +211,11 @@
- /* Position for first file in the shar file.  */
- static long 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;
- 
-@@ -696,7 +696,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;
- }
-@@ -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\
-@@ -1634,7 +1634,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);
-@@ -1771,6 +1776,42 @@
-   { NULL, 0, NULL, 0 },
- };
- 
-+
-+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;
-+}
-+
-+
- /*---.
- | ?  |
- `---*/
-@@ -1905,9 +1946,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/gsharutils/patches/patch-ad b/archivers/gsharutils/patches/patch-ad
deleted file mode 100644
index 2651aedaa99..00000000000
--- a/archivers/gsharutils/patches/patch-ad
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2009/02/09 23:53:52 joerg Exp $
-
---- doc/Makefile.in.orig	1995-11-25 03:44:35.000000000 +0100
-+++ doc/Makefile.in
-@@ -37,8 +37,8 @@ MAN1PAGES = @MAN1PAGES@
- MAN5PAGES = @MAN5PAGES@
- 
- prefix = @prefix@
--infodir = $(prefix)/info
--mandir = $(prefix)/man
-+infodir = @infodir@
-+mandir = @mandir@
- man1dir = $(mandir)/man1
- man1ext = .1
- man5dir = $(mandir)/man5
-@@ -82,10 +82,10 @@ install install-exec install-data: all
- install: install-exec install-data
- install-exec:
- install-data:
--	$(top_srcdir)/mkinstalldirs $(infodir)
-+	$(top_srcdir)/mkinstalldirs ${DESTDIR}$(infodir)
- 	cd $(srcdir) && \
- 	  for file in sharutils.info* remsync.info*; do \
--	    $(INSTALL_DATA) $$file $(infodir)/$$file; \
-+	    $(INSTALL_DATA) $$file ${DESTDIR}$(infodir)/$$file; \
- 	  done
- 
- uninstall:
-@@ -96,24 +96,24 @@ uninstall:
- # GNU and switch to Info.  The following is for irreductible fellows.
- 
- install-man:
--	$(top_srcdir)/mkinstalldirs $(man1dir)
--	test -z "$(MAN5PAGES)" || $(top_srcdir)/mkinstalldirs $(man5dir)
-+	$(top_srcdir)/mkinstalldirs ${DESTDIR}$(man1dir)
-+	test -z "$(MAN5PAGES)" || $(top_srcdir)/mkinstalldirs ${DESTDIR}$(man5dir)
- 	for name in $(MAN1PAGES); do \
- 	  if test $$name = uudecode; then \
--	    rm -f $(man1dir)/`echo uudecode | sed '$(transform)'`$(man1ext); \
-+	    rm -f ${DESTDIR}$(man1dir)/`echo uudecode | sed '$(transform)'`$(man1ext); \
- 	    man1base=`echo $(man1dir) | sed 's@.*/\(.*\)@&1@'`; \
- 	    echo ".so $$man1base/uuencode$(man1ext)" \
--	      > $(man1dir)/`echo uudecode | sed '$(transform)'`$(man1ext); \
-+	      > ${DESTDIR}$(man1dir)/`echo uudecode | sed '$(transform)'`$(man1ext); \
- 	  else \
- 	    $(INSTALL_DATA) $(srcdir)/$$name.1 \
--		$(man1dir)/`echo $$name | sed '$(transform)'`$(man1ext); \
-+		${DESTDIR}$(man1dir)/`echo $$name | sed '$(transform)'`$(man1ext); \
- 	  fi; \
- 	done
--	test -z "$(MAN5PAGES)" || \
--	  for name in $(MAN5PAGES); do \
-+	for name in "" $(MAN5PAGES); do \
-+	    if [ "X$$name" = "X" ]; then continue; fi; \
- 	    $(INSTALL_DATA) $(srcdir)/$$name.5 \
--		$(man5dir)/`echo $$name | sed '$(transform)'`$(man5ext); \
--	  done
-+		${DESTDIR}$(man5dir)/`echo $$name | sed '$(transform)'`$(man5ext); \
-+	done
- 
- uninstall-man:
- 	for name in $(MAN1PAGES); do \
diff --git a/archivers/gsharutils/patches/patch-ae b/archivers/gsharutils/patches/patch-ae
deleted file mode 100644
index 5bc97ab1d7c..00000000000
--- a/archivers/gsharutils/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2000/11/02 02:35:15 itojun Exp $
-
---- po/nl.po-	Thu Nov  2 11:27:34 2000
-+++ po/nl.po	Thu Nov  2 11:27:39 2000
-@@ -448,7 +448,7 @@
- 
- #: src/shar.c:2121
- msgid "Created %d files\n"
--msgstr "%d bestand(en) aangemaakt"
-+msgstr "%d bestand(en) aangemaakt\n"
- 
- #: src/unshar.c:158
- msgid "Found no shell commands in %s"
diff --git a/archivers/gsharutils/patches/patch-af b/archivers/gsharutils/patches/patch-af
deleted file mode 100644
index 084ef6ea268..00000000000
--- a/archivers/gsharutils/patches/patch-af
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-af,v 1.1 2000/11/02 02:35:15 itojun Exp $
-
---- po/pt.po-	Thu Nov  2 11:27:45 2000
-+++ po/pt.po	Thu Nov  2 11:27:54 2000
-@@ -413,11 +413,11 @@
- 
- #: src/shar.c:1819
- msgid "Hard limit %dk\n"
--msgstr "Limite tipo `hard' de %dk"
-+msgstr "Limite tipo `hard' de %dk\n"
- 
- #: src/shar.c:1886
- msgid "Soft limit %dk\n"
--msgstr "Limite tipo `soft' de %dk"
-+msgstr "Limite tipo `soft' de %dk\n"
- 
- #: src/shar.c:1987
- msgid "WARNING: No user interaction in vanilla mode"
diff --git a/archivers/gsharutils/patches/patch-ag b/archivers/gsharutils/patches/patch-ag
deleted file mode 100644
index 5450d99d685..00000000000
--- a/archivers/gsharutils/patches/patch-ag
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ag,v 1.7 2009/02/09 23:53:52 joerg Exp $
-
---- po/Makefile.in.in.orig	1995-12-04 17:19:48.000000000 +0100
-+++ po/Makefile.in.in
-@@ -120,12 +120,16 @@ install-data: all
- 	catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  if test "`echo $$cat | sed 's/.*\(\..*\)/\1/'`" = ".gmo"; then \
-+	    if test $(gnulocaledir) = $(localedir) -a \
-+		    $(CATOBJEXT) != ".gmo"; then \
-+	      continue; \
-+	    fi; \
- 	    destdir=$(gnulocaledir); \
- 	  else \
- 	    destdir=$(localedir); \
- 	  fi; \
--	  lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
--	  dir=$$destdir/$$lang/LC_MESSAGES; \
-+	  lang=`echo $$cat | sed 's/\(.*\)\.[^\.]*/\1/'`; \
-+	  dir=${DESTDIR}$$destdir/$$lang/LC_MESSAGES; \
- 	  $(top_srcdir)/mkinstalldirs $$dir; \
- 	  if test -r $$cat; then \
- 	    $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
-@@ -144,7 +148,7 @@ install-src: install
- uninstall:
- 	catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
--	  lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
-+	  lang=`echo $$cat | sed 's/\(.*\)\.[^\.]*/\1/'`; \
- 	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- 	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
- 	done
-@@ -180,7 +184,7 @@ update-po: Makefile
- 	cd $(srcdir); \
- 	catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
--	  lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
-+	  lang=`echo $$cat | sed 's/\(.*\)\.[^\.]*/\1/'`; \
- 	  mv $$lang.po $$lang.old.po; \
- 	  if $(TUPDATE) $(PACKAGE).pot $$lang.old.po > $$lang.po; then \
- 	    rm -f $$lang.old.po; \
diff --git a/archivers/gsharutils/patches/patch-ah b/archivers/gsharutils/patches/patch-ah
deleted file mode 100644
index 8d693bcf6c0..00000000000
--- a/archivers/gsharutils/patches/patch-ah
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-ah,v 1.6 2005/04/11 18:44:54 salo Exp $
-
---- src/unshar.c.orig	1995-11-21 17:22:14.000000000 +0100
-+++ src/unshar.c	2005-04-11 20:37:40.000000000 +0200
-@@ -346,8 +346,8 @@
- {
-   size_t size_read;
-   FILE *file;
--  char name_buffer[NAME_BUFFER_SIZE];
--  char copy_buffer[NAME_BUFFER_SIZE];
-+  char name_buffer[NAME_BUFFER_SIZE] = {'\0'};
-+  char copy_buffer[NAME_BUFFER_SIZE] = {'\0'};
-   int optchar;
- 
-   program_name = argv[0];
-@@ -409,13 +409,13 @@
-   if (optind < argc)
-     for (; optind < argc; optind++)
-       {
--	if (argv[optind][0] == '/')
--	  stpcpy (name_buffer, argv[optind]);
--	else
--	  {
--	    char *cp = stpcpy (name_buffer, current_directory);
--	    *cp++ = '/';
--	    stpcpy (cp, argv[optind]);
-+	if (argv[optind][0] == '/') {
-+		strncpy (name_buffer, argv[optind], sizeof(name_buffer));
-+		name_buffer[sizeof(name_buffer)-1] = '\0';
-+	}
-+	else {
-+		snprintf(name_buffer, sizeof(name_buffer),"%s/%s", current_directory, argv[optind]);
-+		name_buffer[sizeof(name_buffer)-1] = '\0';
- 	  }
- 	if (file = fopen (name_buffer, "r"), !file)
- 	  error (EXIT_FAILURE, errno, name_buffer);
-@@ -424,13 +424,15 @@
-       }
-   else
-     {
-+#ifdef __MSDOS__
-       sprintf (name_buffer, "/tmp/unsh.%05d", (int) getpid ());
-       unlink (name_buffer);
- 
-       if (file = fopen (name_buffer, "w+"), !file)
- 	error (EXIT_FAILURE, errno, name_buffer);
--#ifndef __MSDOS__
--      unlink (name_buffer);	/* will be deleted on fclose */
-+#else
-+      if (file = tmpfile(), !file)
-+        error (EXIT_FAILURE, errno, "tmpfile");
- #endif
- 
-       while (size_read = fread (copy_buffer, 1, sizeof (copy_buffer), stdin),
diff --git a/archivers/gsharutils/patches/patch-ai b/archivers/gsharutils/patches/patch-ai
deleted file mode 100644
index 9c434355a7e..00000000000
--- a/archivers/gsharutils/patches/patch-ai
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2005/03/31 14:17:05 salo Exp $
-
---- src/uudecode.c.orig	1995-12-02 04:14:14.000000000 +0100
-+++ src/uudecode.c	2005-03-31 15:51:27.000000000 +0200
-@@ -81,6 +81,9 @@
- /* Single character decode.  */
- #define	DEC(Char) (((Char) - ' ') & 077)
- 
-+#if !defined S_ISLNK && defined S_IFLNK
-+# define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
-+#endif
- 
- static int
- read_stduu (inname)
-@@ -279,6 +282,7 @@
-   char buf[2 * BUFSIZ];
-   char *outname;
-   int do_base64 = 0;
-+  struct stat attr;
- 
-   /* Search for header line.  */
- 
-@@ -337,6 +341,23 @@
- 	}
-     }
- 
-+  /* Check out file if it exists */
-+  if (strcmp (outname, "/dev/stdout") != 0 && strcmp (outname, "-") != 0
-+      && !access(outname, F_OK)) {
-+    if (lstat(outname, &attr) == -1) {
-+      error (0, errno, _("cannot access %s"), outname);
-+      return 1;
-+    }
-+    if (S_ISFIFO(attr.st_mode)){
-+      error (0, errno, _("denied writing FIFO (%s)"), outname);
-+      return 1;
-+    }
-+    if (S_ISLNK(attr.st_mode)) {
-+      error (0, errno, _("not following symlink (%s)"), outname);
-+      return 1;
-+    }
-+  }
-+
-   /* Create output file and set mode.  */
- 
-   if (strcmp (outname, "/dev/stdout") != 0 && strcmp (outname, "-") != 0
diff --git a/archivers/gsharutils/patches/patch-aj b/archivers/gsharutils/patches/patch-aj
deleted file mode 100644
index 6d398d499ac..00000000000
--- a/archivers/gsharutils/patches/patch-aj
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aj,v 1.5 2005/03/31 14:41:48 salo Exp $
-
---- src/mailshar.in.orig	1995-11-26 00:42:47.000000000 +0100
-+++ src/mailshar.in	2005-03-31 15:51:27.000000000 +0200
-@@ -33,7 +33,11 @@
- If none of -MTBzZ are given, -z is automatically selected if *none*
- of the FILEs have an .arc, .exz, .gif, .z, .gz, .Z, .zip or .zoo suffix."
- 
--temp=/usr/tmp/$$.shar
-+temp=`mktemp -q /tmp/${0##*/}.XXXXXX`
-+if [ $? -ne 0 ]; then
-+    echo "$0: Can't create temp file, exiting..."
-+    exit 1
-+fi
- 
- ### Decode the options.
- 
diff --git a/archivers/gsharutils/patches/patch-ak b/archivers/gsharutils/patches/patch-ak
deleted file mode 100644
index b72dd785bc0..00000000000
--- a/archivers/gsharutils/patches/patch-ak
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2009/02/09 23:53:52 joerg Exp $
-
---- src/Makefile.in.orig	2009-02-10 00:48:20.000000000 +0100
-+++ src/Makefile.in
-@@ -87,14 +87,14 @@ $(OBJECTS) $(COMOBJS): ../config.h ../li
- 
- install: install-exec install-data
- install-exec: all
--	$(top_srcdir)/mkinstalldirs $(bindir)
-+	$(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
- 	for name in $(PROGRAMS); do \
- 	  $(INSTALL_PROGRAM) $$name \
--		$(bindir)/`echo $$name | sed '$(transform)'`; \
-+		${DESTDIR}$(bindir)/`echo $$name | sed '$(transform)'`; \
- 	done;
- 	for name in $(SCRIPTS); do \
- 	  $(INSTALL_SCRIPT) $$name \
--		$(bindir)/`echo $$name | sed '$(transform)'`; \
-+		${DESTDIR}$(bindir)/`echo $$name | sed '$(transform)'`; \
- 	done
- install-data:
-