7 files changed, 1 insertions, 148 deletions

diff --git a/archivers/Makefile b/archivers/Makefile
index 88509048daac..4e107f77eeb3 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -15,7 +15,6 @@
     SUBDIR += fastjar
     SUBDIR += fileroller
     SUBDIR += freeze
-    SUBDIR += gshar+gunshar
     SUBDIR += gtar
     SUBDIR += gzip
     SUBDIR += ha
@@ -58,6 +57,7 @@
     SUBDIR += ruby-zip
     SUBDIR += rvm
     SUBDIR += sectar
+    SUBDIR += sharutils
     SUBDIR += squsq
     SUBDIR += star
     SUBDIR += stuffit
diff --git a/archivers/gshar+gunshar/Makefile b/archivers/gshar+gunshar/Makefile
deleted file mode 100644
index 9e695d87f3c3..000000000000
--- a/archivers/gshar+gunshar/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# New ports collection makefile for:	gshar+gunshar
-# Date created:		28 Dec 1994
-# Whom:			ache
-#
-# $FreeBSD$
-#
-
-PORTNAME=	sharutils
-PORTVERSION=	4.2.1
-PORTREVISION=	1
-CATEGORIES=	archivers
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	sharutils
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Allow packing and unpacking of shell archives
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-prefix=g --disable-uucode --disable-nls
-INSTALL_TARGET=	install install-man
-MAN1=		gshar.1 gunshar.1
-INFO=		remsync sharutils
-
-post-install:
-.for info in remsync.info sharutils.info
-	install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
-.endfor
-
-.include <bsd.port.mk>
diff --git a/archivers/gshar+gunshar/distinfo b/archivers/gshar+gunshar/distinfo
deleted file mode 100644
index 8c36266ab986..000000000000
--- a/archivers/gshar+gunshar/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (sharutils-4.2.1.tar.gz) = b8ba1d409f07edcb335ff72a27bd9828
-SIZE (sharutils-4.2.1.tar.gz) = 306022
diff --git a/archivers/gshar+gunshar/files/patch-aa b/archivers/gshar+gunshar/files/patch-aa
deleted file mode 100644
index 079f71e29f08..000000000000
--- a/archivers/gshar+gunshar/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/gshar+gunshar/files/patch-ac b/archivers/gshar+gunshar/files/patch-ac
deleted file mode 100644
index ae683ed43e9c..000000000000
--- a/archivers/gshar+gunshar/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/gshar+gunshar/pkg-descr b/archivers/gshar+gunshar/pkg-descr
deleted file mode 100644
index f1eb3d9904d4..000000000000
--- a/archivers/gshar+gunshar/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-This is the set of GNU shar utilities.
-
-`shar' makes so-called shell archives out of many files, preparing
-them for transmission by electronic mail services.  `unshar' helps
-unpacking shell archives after reception.  The core of both programs
-is initially derived from public domain.  Some modules and other
-code sections are freely borrowed from other GNU distributions,
-bringing `shar' under the terms of the GNU General Public License.
-
-WWW: http://www.gnu.org/software/sharutils/sharutils.html
diff --git a/archivers/gshar+gunshar/pkg-plist b/archivers/gshar+gunshar/pkg-plist
deleted file mode 100644
index 5955e2a73a1c..000000000000
--- a/archivers/gshar+gunshar/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/gmail-files
-bin/gmailshar
-bin/gremsync
-bin/gshar
-bin/gunshar