diff --git a/misc/fileutils/Makefile b/misc/fileutils/Makefile
deleted file mode 100644
index 61d751014e0..00000000000
--- a/misc/fileutils/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $OpenBSD: Makefile,v 1.28 2012/03/29 13:38:40 sthen Exp $
-
-COMMENT-main= 		GNU versions of common file management utilities
-COMMENT-ls=		colorized GNU 'ls'
-
-V=			4.1
-DISTNAME=		fileutils-$V
-CATEGORIES=		misc
-
-PKGNAME-main=		${DISTNAME}
-REVISION-main =		5
-PKGNAME-ls=		gnuls-$V
-REVISION-ls =		2
-
-HOMEPAGE=		http://www.gnu.org/software/fileutils/
-
-# GPLv2
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
-
-WANTLIB=		c
-
-MASTER_SITES=		http://distfiles.nl/ \
-			${MASTER_SITE_GNU:=fileutils/}
-
-MODULES=		devel/gettext
-
-SEPARATE_BUILD=		Yes
-USE_GMAKE=		Yes
-USE_GROFF =		Yes
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-			CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-			LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
-CONFIGURE_ARGS=		--program-prefix=g
-
-MULTI_PACKAGES=		-main -ls
-
-.include <bsd.port.mk>
diff --git a/misc/fileutils/distinfo b/misc/fileutils/distinfo
deleted file mode 100644
index fb6dc1361ee..00000000000
--- a/misc/fileutils/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 (fileutils-4.1.tar.gz) = L6BM7uh+li3fcvMqLWuQbQ==
-RMD160 (fileutils-4.1.tar.gz) = WAphcUhisV/b5tSzkny3RhWzFJY=
-SHA1 (fileutils-4.1.tar.gz) = 106C9u2ufECz0HXFow3CfHn5N/8=
-SHA256 (fileutils-4.1.tar.gz) = MBxgeVsBHmPwNM/fezJ7YPH492kJM3pTC5A7tpeTcYg=
-SIZE (fileutils-4.1.tar.gz) = 1812537
diff --git a/misc/fileutils/patches/patch-configure b/misc/fileutils/patches/patch-configure
deleted file mode 100644
index ae737701d86..00000000000
--- a/misc/fileutils/patches/patch-configure
+++ /dev/null
@@ -1,30 +0,0 @@
-$OpenBSD: patch-configure,v 1.2 2010/11/03 06:56:37 jasper Exp $
---- configure.orig	Sun Apr 29 10:26:09 2001
-+++ configure	Wed Nov  3 07:55:57 2010
-@@ -22370,7 +22370,7 @@ if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; 
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lintl  $LIBS"
-+LIBS="-lintl -liconv $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line 22375 "configure"
- #include "confdefs.h"
-@@ -22421,7 +22421,7 @@ if test "${ac_cv_lib_intl_gettext+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lintl  $LIBS"
-+LIBS="-lintl -liconv $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line 22426 "configure"
- #include "confdefs.h"
-@@ -22469,7 +22469,7 @@ if test $ac_cv_lib_intl_gettext = yes; then
- #define HAVE_LIBINTL 1
- EOF
- 
--  LIBS="-lintl $LIBS"
-+  LIBS="-lintl -liconv $LIBS"
- 
- fi
- 
diff --git a/misc/fileutils/patches/patch-lib_Makefile_in b/misc/fileutils/patches/patch-lib_Makefile_in
deleted file mode 100644
index 8bc1ff88123..00000000000
--- a/misc/fileutils/patches/patch-lib_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-lib_Makefile_in,v 1.1 2005/02/20 01:51:43 alek Exp $
---- lib/Makefile.in.orig	Sat Feb 19 22:58:54 2005
-+++ lib/Makefile.in	Sat Feb 19 22:58:59 2005
-@@ -123,7 +123,7 @@ AUTOMAKE_OPTIONS = ../src/ansi2knr
- 
- noinst_LIBRARIES = libfetish.a
- 
--INCLUDES = -I.. -I$(srcdir) -I../intl
-+INCLUDES = -I.. -I$(srcdir)
- DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
- 
- libfetish_a_SOURCES = \
diff --git a/misc/fileutils/patches/patch-src_Makefile_in b/misc/fileutils/patches/patch-src_Makefile_in
deleted file mode 100644
index 4356fd1a433..00000000000
--- a/misc/fileutils/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,30 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.4 2010/11/03 06:56:37 jasper Exp $
---- src/Makefile.in.orig	Sun Apr 29 13:40:37 2001
-+++ src/Makefile.in	Wed Nov  3 07:55:57 2010
-@@ -135,7 +135,7 @@ noinst_HEADERS = \
- 
- EXTRA_DIST = dcgen dircolors.hin
- 
--INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../intl
-+INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib
- DEFS = -DLOCALEDIR=\"$(localedir)\" -DSHAREDIR=\"$(datadir)\" @DEFS@
- LDADD = @INTLLIBS@ ../lib/libfetish.a
- 
-@@ -338,7 +338,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-+	    f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform)s/$$/$(EXEEXT)/'`; \
- 	   echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
- 	   $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
- 	  else :; fi; \
-@@ -347,7 +347,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
- uninstall-binPROGRAMS:
- 	@$(NORMAL_UNINSTALL)
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
--	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform)s/$$/$(EXEEXT)/'`; \
- 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
- 	  rm -f $(DESTDIR)$(bindir)/$$f; \
- 	done
diff --git a/misc/fileutils/patches/patch-src_dircolors_c b/misc/fileutils/patches/patch-src_dircolors_c
deleted file mode 100644
index 7e7b410009c..00000000000
--- a/misc/fileutils/patches/patch-src_dircolors_c
+++ /dev/null
@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_dircolors_c,v 1.4 2010/11/03 06:56:37 jasper Exp $
---- src/dircolors.c.orig	Mon Aug  7 12:46:16 2000
-+++ src/dircolors.c	Mon Feb 24 23:18:38 2003
-@@ -69,13 +69,15 @@ static const char *const slack_codes[] =
-   "NORMAL", "NORM", "FILE", "DIR", "LNK", "LINK",
-   "SYMLINK", "ORPHAN", "MISSING", "FIFO", "PIPE", "SOCK", "BLK", "BLOCK",
-   "CHR", "CHAR", "DOOR", "EXEC", "LEFT", "LEFTCODE", "RIGHT", "RIGHTCODE",
--  "END", "ENDCODE", NULL
-+  "END", "ENDCODE", "SUID", "SETUID", "SGID", "SETGID", "WRO", "WRITEOTHERS",
-+  "WT", "WROT", "WRITEOTHERSSTICKY", NULL
- };
- 
- static const char *const ls_codes[] =
- {
-   "no", "no", "fi", "di", "ln", "ln", "ln", "or", "mi", "pi", "pi",
-   "so", "bd", "bd", "cd", "cd", "do", "ex", "lc", "lc", "rc", "rc", "ec", "ec"
-+  "su", "su", "sg", "sg", "wo", "wo", "wo", "wt", "wt", "wt", NULL
- };
- 
- static struct option const long_options[] =
diff --git a/misc/fileutils/patches/patch-src_ls_c b/misc/fileutils/patches/patch-src_ls_c
deleted file mode 100644
index f3c25d0e2c9..00000000000
--- a/misc/fileutils/patches/patch-src_ls_c
+++ /dev/null
@@ -1,63 +0,0 @@
-$OpenBSD: patch-src_ls_c,v 1.4 2010/11/03 06:56:37 jasper Exp $
---- src/ls.c.orig	Sun Apr 29 11:42:47 2001
-+++ src/ls.c	Wed Nov  3 07:55:57 2010
-@@ -510,13 +510,13 @@ enum color_type
- enum indicator_no
-   {
-     C_LEFT, C_RIGHT, C_END, C_NORM, C_FILE, C_DIR, C_LINK, C_FIFO, C_SOCK,
--    C_BLK, C_CHR, C_MISSING, C_ORPHAN, C_EXEC, C_DOOR
-+    C_BLK, C_CHR, C_MISSING, C_ORPHAN, C_EXEC, C_DOOR, C_UID, C_GID, C_WRO, C_WT
-   };
- 
- static const char *const indicator_name[]=
-   {
-     "lc", "rc", "ec", "no", "fi", "di", "ln", "pi", "so",
--    "bd", "cd", "mi", "or", "ex", "do", NULL
-+    "bd", "cd", "mi", "or", "ex", "do", "su", "sg", "wo", "wt", NULL
-   };
- 
- struct color_ext_type
-@@ -542,7 +542,11 @@ static struct bin_str color_indicator[] =
-     { 0, NULL },			/* mi: Missing file: undefined */
-     { 0, NULL },			/* or: Orphanned symlink: undefined */
-     { LEN_STR_PAIR ("01;32") },		/* ex: Executable: bright green */
--    { LEN_STR_PAIR ("01;35") }		/* do: Door: bright magenta */
-+    { LEN_STR_PAIR ("01;35") },		/* do: Door: bright magenta */
-+    { LEN_STR_PAIR ("37;41") },         /* su: setuid: white on red */
-+    { LEN_STR_PAIR ("30;43") },         /* sg: setgid: black on yellow */
-+    { LEN_STR_PAIR ("37;44") },         /* wo: writeable-other:white on blue */
-+    { LEN_STR_PAIR ("37;42") },         /* wt: wo w/ sticky: white on green */
-   };
- 
- /* FIXME: comment  */
-@@ -2883,7 +2887,14 @@ print_color_indicator (const char *name, unsigned int 
-   else
-     {
-       if (S_ISDIR (mode))
--	type = C_DIR;
-+        {
-+          if ((mode && MODE_WT) == MODE_WT)
-+            type = C_WT;
-+          else if ((mode && MODE_WRO) == MODE_WRO)
-+            type = C_WRO;
-+          else
-+            type = C_DIR;
-+        }
-       else if (S_ISLNK (mode))
- 	type = ((!linkok && color_indicator[C_ORPHAN].string)
- 		? C_ORPHAN : C_LINK);
-@@ -2898,7 +2909,13 @@ print_color_indicator (const char *name, unsigned int 
-       else if (S_ISDOOR (mode))
- 	type = C_DOOR;
- 
--      if (type == C_FILE && (mode & S_IXUGO) != 0)
-+      if ((type == C_FILE) && ((mode & S_ISUID) != 0))
-+        type = C_UID;
-+
-+      else if ((type == C_FILE) && ((mode & S_ISGID) != 0))
-+        type = C_GID;
-+
-+      else if (type == C_FILE && (mode & S_IXUGO) != 0)
- 	type = C_EXEC;
- 
-       /* Check the file's suffix only if still classified as C_FILE.  */
diff --git a/misc/fileutils/patches/patch-src_ls_h b/misc/fileutils/patches/patch-src_ls_h
deleted file mode 100644
index 0a330713756..00000000000
--- a/misc/fileutils/patches/patch-src_ls_h
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_ls_h,v 1.3 2010/11/03 06:56:37 jasper Exp $
---- src/ls.h.orig	Mon Feb 15 17:27:12 1999
-+++ src/ls.h	Fri Jul 20 21:03:51 2001
-@@ -7,4 +7,7 @@
- /* This is for the `vdir' program.  */
- #define LS_LONG_FORMAT 3
- 
-+#define MODE_WT 01002
-+#define MODE_WRO 02
-+
- extern int ls_mode;
diff --git a/misc/fileutils/patches/patch-src_mv_c b/misc/fileutils/patches/patch-src_mv_c
deleted file mode 100644
index df806d666b5..00000000000
--- a/misc/fileutils/patches/patch-src_mv_c
+++ /dev/null
@@ -1,40 +0,0 @@
-$OpenBSD: patch-src_mv_c,v 1.2 2010/11/03 06:56:37 jasper Exp $
---- src/mv.c.orig	Sat Feb  3 17:48:34 2001
-+++ src/mv.c	Wed Nov  3 07:55:57 2010
-@@ -1,5 +1,5 @@
- /* mv -- move or rename files
--   Copyright (C) 86, 89, 90, 91, 1995-2001 Free Software Foundation, Inc.
-+   Copyright (C) 86, 89, 90, 91, 1995-2002 Free Software Foundation, Inc.
- 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -235,7 +235,20 @@ do_move (const char *source, const char *dest, const s
- 	  struct rm_options rm_options;
- 	  struct File_spec fs;
- 	  enum RM_status status;
-+         static int first_rm = 1;
-+         static struct dev_ino cwd_dev_ino;
- 
-+         if (first_rm)
-+           {
-+             struct stat cwd_sb;
-+             if (lstat (".", &cwd_sb))
-+               error (EXIT_FAILURE, errno, _("cannot lstat `.'"));
-+
-+             first_rm = 0;
-+             cwd_dev_ino.st_dev = cwd_sb.st_dev;
-+             cwd_dev_ino.st_ino = cwd_sb.st_ino;
-+           }
-+
- 	  rm_option_init (&rm_options);
- 	  rm_options.verbose = x->verbose;
- 
-@@ -247,7 +260,7 @@ do_move (const char *source, const char *dest, const s
- 	     took the else branch of movefile.  */
- 	  strip_trailing_slashes_2 (fs.filename);
- 
--	  status = rm (&fs, 1, &rm_options);
-+	  status = rm (&fs, 1, &rm_options, &cwd_dev_ino);
- 	  assert (VALID_STATUS (status));
- 	  if (status == RM_ERROR)
- 	    fail = 1;
diff --git a/misc/fileutils/patches/patch-src_remove_c b/misc/fileutils/patches/patch-src_remove_c
deleted file mode 100644
index 8f734cdd63a..00000000000
--- a/misc/fileutils/patches/patch-src_remove_c
+++ /dev/null
@@ -1,127 +0,0 @@
-$OpenBSD: patch-src_remove_c,v 1.2 2010/11/03 06:56:37 jasper Exp $
---- src/remove.c.orig	Sun Feb 18 17:17:32 2001
-+++ src/remove.c	Wed Nov  3 07:55:57 2010
-@@ -433,10 +433,13 @@ same_file (const char *file_1, const char *file_2)
- 
- 
- /* Recursively remove all of the entries in the current directory.
--   Return an indication of the success of the operation.  */
-+   Return an indication of the success of the operation.
-+   CWD_DEV_INO must store the device and inode numbers of the
-+   current working directory.  */
- 
- static enum RM_status
--remove_cwd_entries (const struct rm_options *x)
-+remove_cwd_entries (const struct rm_options *x,
-+                   struct dev_ino const *cwd_dev_ino)
- {
-   /* NOTE: this is static.  */
-   static DIR *dirp = NULL;
-@@ -549,7 +552,7 @@ remove_cwd_entries (const struct rm_options *x)
- 	  /* CAUTION: after this call to rm, DP may not be valid --
- 	     it may have been freed due to a close in a recursive call
- 	     (through rm and remove_dir) to this function.  */
--	  tmp_status = rm (&fs, 0, x);
-+         tmp_status = rm (&fs, 0, x, cwd_dev_ino);
- 
- 	  /* Update status.  */
- 	  if (tmp_status > status)
-@@ -664,12 +667,14 @@ remove_file (struct File_spec *fs, const struct rm_opt
-    FIXME: describe need_save_cwd parameter.  */
- 
- static enum RM_status
--remove_dir (struct File_spec *fs, int need_save_cwd, const struct rm_options *x)
-+remove_dir (struct File_spec *fs, int need_save_cwd,
-+           struct rm_options const *x, struct dev_ino const *cwd_dev_ino)
- {
-   enum RM_status status;
-   struct saved_cwd cwd;
-   char *dir_name = fs->filename;
-   const char *fmt = NULL;
-+  struct dev_ino tmp_cwd_dev_ino;
- 
-   if (!x->recursive)
-     {
-@@ -738,6 +743,9 @@ was replaced with either another directory or a link t
- 	       (unsigned long)(sb.st_dev),
- 	       (unsigned long)(sb.st_ino));
-       }
-+
-+    tmp_cwd_dev_ino.st_dev = sb.st_dev;
-+    tmp_cwd_dev_ino.st_ino = sb.st_ino;
-   }
- 
-   push_dir (dir_name);
-@@ -747,7 +755,7 @@ was replaced with either another directory or a link t
-      remove_cwd_entries may close the directory.  */
-   ASSIGN_STRDUPA (dir_name, dir_name);
- 
--  status = remove_cwd_entries (x);
-+  status = remove_cwd_entries (x, &tmp_cwd_dev_ino);
- 
-   pop_dir ();
- 
-@@ -761,11 +769,34 @@ was replaced with either another directory or a link t
- 	}
-       free_cwd (&cwd);
-     }
--  else if (chdir ("..") < 0)
-+  else
-     {
--      error (0, errno, _("cannot change back to directory %s via `..'"),
--	     quote (full_filename (dir_name)));
--      return RM_ERROR;
-+      struct stat sb;
-+      if (chdir ("..") < 0)
-+       {
-+         error (0, errno, _("cannot change back to directory %s via `..'"),
-+                quote (full_filename (dir_name)));
-+         return RM_ERROR;
-+       }
-+
-+      if (lstat (".", &sb))
-+       error (EXIT_FAILURE, errno,
-+              _("cannot lstat `.' in %s"), quote (full_filename (".")));
-+
-+      if (!SAME_INODE (sb, *cwd_dev_ino))
-+       {
-+         error (EXIT_FAILURE, 0,
-+              _("ERROR: the directory %s initially had device/inode\n\
-+numbers %lu/%lu, but now (after changing into at least one subdirectory\n\
-+and changing back via `..'), the numbers for `.' are %lu/%lu.\n\
-+That means that while rm was running, a partially-removed subdirectory\n\
-+was moved to a different position in the file system hierarchy."),
-+                quote (full_filename (".")),
-+                (unsigned long)(cwd_dev_ino->st_dev),
-+                (unsigned long)(cwd_dev_ino->st_ino),
-+                (unsigned long)(sb.st_dev),
-+                (unsigned long)(sb.st_ino));
-+       }
-     }
- 
-   if (x->interactive)
-@@ -814,10 +845,13 @@ was replaced with either another directory or a link t
-    things.  Return RM_OK if it is removed, and RM_ERROR or RM_USER_DECLINED
-    if not.  If USER_SPECIFIED_NAME is non-zero, then the name part of FS may
-    be `.', `..', or may contain slashes.  Otherwise, it must be a simple file
--   name (and hence must specify a file in the current directory).  */
-+   name (and hence must specify a file in the current directory).
-+   CWD_DEV_INO must store the device and inode numbers of the
-+   current working directory.  */
- 
- enum RM_status
--rm (struct File_spec *fs, int user_specified_name, const struct rm_options *x)
-+rm (struct File_spec *fs, int user_specified_name,
-+    struct rm_options const *x, struct dev_ino const *cwd_dev_ino)
- {
-   mode_t filetype_mode;
- 
-@@ -899,7 +933,7 @@ The following two directories have the same inode numb
-       if (need_save_cwd)
- 	need_save_cwd = (strchr (fs->filename, '/') != NULL);
- 
--      status = remove_dir (fs, need_save_cwd, x);
-+      status = remove_dir (fs, need_save_cwd, x, cwd_dev_ino);
- 
- #ifdef ENABLE_CYCLE_CHECK
-       {
diff --git a/misc/fileutils/patches/patch-src_remove_h b/misc/fileutils/patches/patch-src_remove_h
deleted file mode 100644
index 28ab5839195..00000000000
--- a/misc/fileutils/patches/patch-src_remove_h
+++ /dev/null
@@ -1,22 +0,0 @@
-$OpenBSD: patch-src_remove_h,v 1.1 2003/02/25 14:35:43 brad Exp $
---- src/remove.h.orig	Mon Oct 16 10:32:03 2000
-+++ src/remove.h	Mon Feb 24 23:21:17 2003
-@@ -44,8 +44,16 @@ struct File_spec
-   dev_t st_dev;
- };
- 
--enum RM_status rm PARAMS ((struct File_spec *fs, int user_specified_name,
--			   const struct rm_options *x));
-+struct dev_ino
-+{
-+  ino_t st_ino;
-+  dev_t st_dev;
-+};
-+
-+enum RM_status rm PARAMS ((struct File_spec *fs,
-+                          int user_specified_name,
-+                          struct rm_options const *x,
-+                          struct dev_ino const *cwd_dev_ino));
- void fspec_init_file PARAMS ((struct File_spec *fs, const char *filename));
- void remove_init PARAMS ((void));
- void remove_fini PARAMS ((void));
diff --git a/misc/fileutils/patches/patch-src_rm_c b/misc/fileutils/patches/patch-src_rm_c
deleted file mode 100644
index 016aaab3f40..00000000000
--- a/misc/fileutils/patches/patch-src_rm_c
+++ /dev/null
@@ -1,58 +0,0 @@
-$OpenBSD: patch-src_rm_c,v 1.2 2010/11/03 06:56:37 jasper Exp $
---- src/rm.c.orig	Sun Apr 29 08:56:24 2001
-+++ src/rm.c	Wed Nov  3 07:55:57 2010
-@@ -1,5 +1,5 @@
- /* `rm' file deletion utility for GNU.
--   Copyright (C) 88, 90, 91, 1994-2001 Free Software Foundation, Inc.
-+   Copyright (C) 88, 90, 91, 1994-2002 Free Software Foundation, Inc.
- 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -184,20 +184,34 @@ main (int argc, char **argv)
- 
-   remove_init ();
- 
--  for (; optind < argc; optind++)
--    {
--      struct File_spec fs;
--      enum RM_status status;
-+  {
-+    struct stat cwd_sb;
-+    struct dev_ino cwd_dev_ino;
- 
--      /* Stripping slashes is harmless for rmdir;
--	 if the arg is not a directory, it will fail with ENOTDIR.  */
--      strip_trailing_slashes (argv[optind]);
--      fspec_init_file (&fs, argv[optind]);
--      status = rm (&fs, 1, &x);
--      assert (VALID_STATUS (status));
--      if (status == RM_ERROR)
--	fail = 1;
--    }
-+    /* FIXME: this lstat is not always necessary -- e.g., if there are no
-+       directories, or if all directories arguments are specified via
-+       absolute names.  */
-+    if (lstat (".", &cwd_sb))
-+      error (EXIT_FAILURE, errno, _("cannot lstat `.'"));
-+
-+    cwd_dev_ino.st_dev = cwd_sb.st_dev;
-+    cwd_dev_ino.st_ino = cwd_sb.st_ino;
-+
-+    for (; optind < argc; optind++)
-+      {
-+        struct File_spec fs;
-+        enum RM_status status;
-+
-+        /* Stripping slashes is harmless for rmdir;
-+	   if the arg is not a directory, it will fail with ENOTDIR.  */
-+        strip_trailing_slashes (argv[optind]);
-+        fspec_init_file (&fs, argv[optind]);
-+        status = rm (&fs, 1, &x, &cwd_dev_ino);
-+        assert (VALID_STATUS (status));
-+        if (status == RM_ERROR)
-+	  fail = 1;
-+      }
-+  }
- 
-   remove_fini ();
- 
diff --git a/misc/fileutils/pkg/DESCR-ls b/misc/fileutils/pkg/DESCR-ls
deleted file mode 100644
index a3ce24e2fe1..00000000000
--- a/misc/fileutils/pkg/DESCR-ls
+++ /dev/null
@@ -1,6 +0,0 @@
-The fileutils package includes a number of GNU versions of common and
-popular file management utilities.  This subpackage includes only the ls,
-dir and dircolors binaries.
-
-All the binaries are prefixed by the letter g to differentiate them
-with the standard applications with the same name.
diff --git a/misc/fileutils/pkg/DESCR-main b/misc/fileutils/pkg/DESCR-main
deleted file mode 100644
index 55a8b5817d8..00000000000
--- a/misc/fileutils/pkg/DESCR-main
+++ /dev/null
@@ -1,16 +0,0 @@
-The fileutils package includes a number of GNU versions of common and
-popular file management utilities.  Fileutils includes the following
-tools: chgrp (changes a file's group ownership), chown (changes a
-file's ownership), chmod (changes a file's permissions), cp (copies
-files), dd (copies and converts files), df (shows a filesystem's disk
-usage), dir (gives a brief directory listing), dircolors (the setup
-program for the color version of the ls command), du (shows disk
-usage), install (copies files and sets permissions), ln (creates file
-links), ls (lists directory contents), mkdir (creates directories),
-mkfifo (creates FIFOs or named pipes), mknod (creates special files),
-mv (renames files), rm (removes/deletes files), rmdir (removes empty
-directories), sync (synchronizes memory and disk), touch (changes file
-timestamps), and vdir (provides long directory listings).
-
-All the binaries are prefixed by the letter g to differentiate them
-with the standard applications with the same name.
diff --git a/misc/fileutils/pkg/PLIST-ls b/misc/fileutils/pkg/PLIST-ls
deleted file mode 100644
index 7c4a5396c89..00000000000
--- a/misc/fileutils/pkg/PLIST-ls
+++ /dev/null
@@ -1,30 +0,0 @@
-@comment $OpenBSD: PLIST-ls,v 1.6 2009/04/08 16:27:12 ajacoutot Exp $
-@conflict fileutils-*
-@bin bin/gdir
-@bin bin/gdircolors
-@bin bin/gls
-@bin bin/gvdir
-@man man/man1/gdir.1
-@man man/man1/gdircolors.1
-@man man/man1/gls.1
-@man man/man1/gvdir.1
-share/locale/cs/LC_MESSAGES/fileutils.mo
-share/locale/da/LC_MESSAGES/fileutils.mo
-share/locale/de/LC_MESSAGES/fileutils.mo
-share/locale/el/LC_MESSAGES/fileutils.mo
-share/locale/es/LC_MESSAGES/fileutils.mo
-share/locale/fr/LC_MESSAGES/fileutils.mo
-share/locale/gl/LC_MESSAGES/fileutils.mo
-share/locale/it/LC_MESSAGES/fileutils.mo
-share/locale/ja/LC_MESSAGES/fileutils.mo
-share/locale/ko/LC_MESSAGES/fileutils.mo
-share/locale/nl/LC_MESSAGES/fileutils.mo
-share/locale/no/LC_MESSAGES/fileutils.mo
-share/locale/pl/LC_MESSAGES/fileutils.mo
-share/locale/pt/LC_MESSAGES/fileutils.mo
-share/locale/pt_BR/LC_MESSAGES/fileutils.mo
-share/locale/ru/LC_MESSAGES/fileutils.mo
-share/locale/sk/LC_MESSAGES/fileutils.mo
-share/locale/sl/LC_MESSAGES/fileutils.mo
-share/locale/sv/LC_MESSAGES/fileutils.mo
-share/locale/zh/LC_MESSAGES/fileutils.mo
diff --git a/misc/fileutils/pkg/PLIST-main b/misc/fileutils/pkg/PLIST-main
deleted file mode 100644
index 73a0547b04d..00000000000
--- a/misc/fileutils/pkg/PLIST-main
+++ /dev/null
@@ -1,91 +0,0 @@
-@comment $OpenBSD: PLIST-main,v 1.2 2009/04/08 16:27:12 ajacoutot Exp $
-@conflict gnuls-*
-@pkgpath misc/fileutils
-@bin bin/gchgrp
-@bin bin/gchmod
-@bin bin/gchown
-@bin bin/gcp
-@bin bin/gdd
-@bin bin/gdf
-@bin bin/gdir
-@bin bin/gdircolors
-@bin bin/gdu
-@bin bin/ginstall
-@bin bin/gln
-@bin bin/gls
-@bin bin/gmkdir
-@bin bin/gmkfifo
-@bin bin/gmknod
-@bin bin/gmv
-@bin bin/grm
-@bin bin/grmdir
-@bin bin/gshred
-@bin bin/gsync
-@bin bin/gtouch
-@bin bin/gvdir
-@info info/fileutils.info
-@comment lib/charset.alias
-@man man/man1/gchgrp.1
-@man man/man1/gchmod.1
-@man man/man1/gchown.1
-@man man/man1/gcp.1
-@man man/man1/gdd.1
-@man man/man1/gdf.1
-@man man/man1/gdir.1
-@man man/man1/gdircolors.1
-@man man/man1/gdu.1
-@man man/man1/ginstall.1
-@man man/man1/gln.1
-@man man/man1/gls.1
-@man man/man1/gmkdir.1
-@man man/man1/gmkfifo.1
-@man man/man1/gmknod.1
-@man man/man1/gmv.1
-@man man/man1/grm.1
-@man man/man1/grmdir.1
-@man man/man1/gshred.1
-@man man/man1/gsync.1
-@man man/man1/gtouch.1
-@man man/man1/gvdir.1
-share/locale/cs/LC_MESSAGES/fileutils.mo
-share/locale/cs/LC_TIME
-share/locale/da/LC_MESSAGES/fileutils.mo
-share/locale/da/LC_TIME
-share/locale/de/LC_MESSAGES/fileutils.mo
-share/locale/de/LC_TIME
-share/locale/el/LC_MESSAGES/fileutils.mo
-share/locale/el/LC_TIME
-share/locale/es/LC_MESSAGES/fileutils.mo
-share/locale/es/LC_TIME
-share/locale/fr/LC_MESSAGES/fileutils.mo
-share/locale/fr/LC_TIME
-share/locale/gl/LC_MESSAGES/fileutils.mo
-share/locale/gl/LC_TIME
-share/locale/it/LC_MESSAGES/fileutils.mo
-share/locale/it/LC_TIME
-share/locale/ja/LC_MESSAGES/fileutils.mo
-share/locale/ja/LC_TIME
-share/locale/ko/LC_MESSAGES/fileutils.mo
-share/locale/ko/LC_TIME
-share/locale/nl/LC_MESSAGES/fileutils.mo
-share/locale/nl/LC_TIME
-share/locale/no/LC_MESSAGES/fileutils.mo
-share/locale/no/LC_TIME
-share/locale/pl/LC_MESSAGES/fileutils.mo
-share/locale/pl/LC_TIME
-share/locale/pt/LC_MESSAGES/fileutils.mo
-share/locale/pt/LC_TIME
-share/locale/pt_BR/LC_MESSAGES/fileutils.mo
-share/locale/pt_BR/LC_TIME
-share/locale/ru/LC_MESSAGES/fileutils.mo
-share/locale/ru/LC_TIME
-share/locale/sk/LC_MESSAGES/fileutils.mo
-share/locale/sk/LC_TIME
-share/locale/sl/LC_MESSAGES/fileutils.mo
-share/locale/sl/LC_TIME
-share/locale/sv/LC_MESSAGES/fileutils.mo
-share/locale/sv/LC_TIME
-share/locale/zh/
-share/locale/zh/LC_MESSAGES/
-share/locale/zh/LC_MESSAGES/fileutils.mo
-share/locale/zh/LC_TIME
diff --git a/misc/sh-utils/Makefile b/misc/sh-utils/Makefile
deleted file mode 100644
index b11c6bf88e6..00000000000
--- a/misc/sh-utils/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $OpenBSD: Makefile,v 1.17 2012/03/29 13:38:40 sthen Exp $
-
-COMMENT=		GNU command line utilities
-
-DISTNAME=		sh-utils-2.0
-REVISION=		0
-CATEGORIES=		misc
-
-# GPL
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
-
-WANTLIB=		c m
-
-MASTER_SITES=		${MASTER_SITE_GNU:=sh-utils/}
-
-MODULES=		devel/gettext
-
-SEPARATE_BUILD=		Yes
-USE_GMAKE=		Yes
-USE_GROFF =		Yes
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS=		--program-prefix="g"
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
-
-# since we got a conflict with id-utils regarding the name gid, rename that
-# binary to ggid.
-
-post-install:
-	@[ -x ${PREFIX}/bin/gid ] && mv ${PREFIX}/bin/gid ${PREFIX}/bin/ggid
-	@[ -f ${PREFIX}/man/man1/gid.1 ] && mv ${PREFIX}/man/man1/gid.1 \
-					       ${PREFIX}/man/man1/ggid.1
-	
-.include <bsd.port.mk>
diff --git a/misc/sh-utils/distinfo b/misc/sh-utils/distinfo
deleted file mode 100644
index 60f8afcb64d..00000000000
--- a/misc/sh-utils/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 (sh-utils-2.0.tar.gz) = XnjR1IylY8p36WsiQGxKrw==
-RMD160 (sh-utils-2.0.tar.gz) = 4BQCxRizT3FqW07qOK/N/M6sgqE=
-SHA1 (sh-utils-2.0.tar.gz) = opcLto6vxLNfROgSE5CttEQJBnw=
-SHA256 (sh-utils-2.0.tar.gz) = ERJFs8nrqlvxlQTlMXN96EZcEwb9d91ZunN66Erlg/E=
-SIZE (sh-utils-2.0.tar.gz) = 1243391
diff --git a/misc/sh-utils/patches/patch-Makefile_in b/misc/sh-utils/patches/patch-Makefile_in
deleted file mode 100644
index b22a9be9b81..00000000000
--- a/misc/sh-utils/patches/patch-Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2005/11/19 01:23:42 alek Exp $
---- Makefile.in.orig	Sat Nov 19 01:11:37 2005
-+++ Makefile.in	Sat Nov 19 01:11:45 2005
-@@ -107,7 +107,7 @@ l = @l@
- 
- AUTOMAKE_OPTIONS = gnits 1.2h
- 
--SUBDIRS = lib intl src doc man m4 po tests
-+SUBDIRS = lib src doc man m4 po tests
- EXTRA_DIST = ChangeLog.0 Makefile.maint
- 
- # Remove this file here (it is created via configure), not from within intl.
diff --git a/misc/sh-utils/patches/patch-configure b/misc/sh-utils/patches/patch-configure
deleted file mode 100644
index fb54b9cd271..00000000000
--- a/misc/sh-utils/patches/patch-configure
+++ /dev/null
@@ -1,30 +0,0 @@
-$OpenBSD: patch-configure,v 1.2 2010/05/22 13:26:59 espie Exp $
---- configure.orig	Sat Aug 14 14:51:35 1999
-+++ configure	Sat May 22 15:20:21 2010
-@@ -11036,7 +11036,7 @@ if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lintl  $LIBS"
-+LIBS="-lintl -liconv  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 11042 "configure"
- #include "confdefs.h"
-@@ -11071,7 +11071,7 @@ if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lintl  $LIBS"
-+LIBS="-lintl -liconv  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 11077 "configure"
- #include "confdefs.h"
-@@ -11105,7 +11105,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = ye
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lintl $LIBS"
-+  LIBS="-lintl -liconv $LIBS"
- 
- else
-   echo "$ac_t""no" 1>&6
diff --git a/misc/sh-utils/patches/patch-lib_Makefile_in b/misc/sh-utils/patches/patch-lib_Makefile_in
deleted file mode 100644
index 6d688be3c44..00000000000
--- a/misc/sh-utils/patches/patch-lib_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-lib_Makefile_in,v 1.1 2005/11/19 01:23:42 alek Exp $
---- lib/Makefile.in.orig	Sat Nov 19 01:40:25 2005
-+++ lib/Makefile.in	Sat Nov 19 01:40:34 2005
-@@ -109,7 +109,7 @@ AUTOMAKE_OPTIONS = ../src/ansi2knr
- 
- noinst_LIBRARIES = libsu.a
- 
--INCLUDES = -I.. -I$(srcdir) -I../intl
-+INCLUDES = -I.. -I$(srcdir)
- 
- libsu_a_SOURCES = getdate.y posixtm.c readtokens.c \
-   argmatch.c basename.c canon-host.c closeout.c full-write.c \
diff --git a/misc/sh-utils/patches/patch-src_Makefile_am b/misc/sh-utils/patches/patch-src_Makefile_am
deleted file mode 100644
index 943cf758fcc..00000000000
--- a/misc/sh-utils/patches/patch-src_Makefile_am
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_Makefile_am,v 1.1 2001/03/15 17:15:04 brad Exp $
---- src/Makefile.am.orig	Thu Mar 15 11:19:32 2001
-+++ src/Makefile.am	Thu Mar 15 11:22:45 2001
-@@ -58,7 +58,7 @@ SUFFIXES = .sh
- 
- all-local: su
- 
--installed_su = $(bindir)/`echo su|sed '$(transform)'`
-+installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'`
- 
- setuid_root_mode = a=rx,u+s
- 
-@@ -75,7 +75,7 @@ install-root: su
- 	@$(INSTALL_SU)
- 
- install-exec-local: su
--	@TMPFILE=$(bindir)/.su-$$$$; \
-+	@TMPFILE=$(DESTDIR)$(bindir)/.su-$$$$; \
- 	rm -f $$TMPFILE; \
- 	echo > $$TMPFILE; \
- ## See if we can create a setuid root executable in $(bindir).
diff --git a/misc/sh-utils/patches/patch-src_Makefile_in b/misc/sh-utils/patches/patch-src_Makefile_in
deleted file mode 100644
index f54bb1260dd..00000000000
--- a/misc/sh-utils/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,30 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.3 2005/11/19 01:23:42 alek Exp $
---- src/Makefile.in.orig	Sat Aug 14 17:42:37 1999
-+++ src/Makefile.in	Sat Nov 19 01:19:38 2005
-@@ -126,7 +126,7 @@ EXTRA_DIST = ansi2knr.1 ansi2knr.c \
- 
- CLEANFILES = $(SCRIPTS) su
- 
--INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../intl
-+INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib
- DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
- LDADD = @INTLLIBS@ ../lib/libsu.a
- 
-@@ -150,7 +150,7 @@ su_DEPENDENCIES = $(LDADD)
- 
- SUFFIXES = .sh
- 
--installed_su = $(bindir)/`echo su|sed '$(transform)'`
-+installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'`
- 
- setuid_root_mode = a=rx,u+s
- 
-@@ -893,7 +893,7 @@ install-root: su
- 	@$(INSTALL_SU)
- 
- install-exec-local: su
--	@TMPFILE=$(bindir)/.su-$$$$; \
-+	@TMPFILE=$(DESTDIR)$(bindir)/.su-$$$$; \
- 	rm -f $$TMPFILE; \
- 	echo > $$TMPFILE; \
- 	can_create_suid_root_executable=no; \
diff --git a/misc/sh-utils/patches/patch-src_sys2_h b/misc/sh-utils/patches/patch-src_sys2_h
deleted file mode 100644
index fc8e1898aa8..00000000000
--- a/misc/sh-utils/patches/patch-src_sys2_h
+++ /dev/null
@@ -1,40 +0,0 @@
-$OpenBSD: patch-src_sys2_h,v 1.1 2010/05/22 13:26:59 espie Exp $
---- src/sys2.h.orig	Sat May 22 15:23:31 2010
-+++ src/sys2.h	Sat May 22 15:24:44 2010
-@@ -131,34 +131,13 @@ char *alloca ();
- 
- #define STREQ(a, b) (strcmp ((a), (b)) == 0)
- 
--#ifndef HAVE_DECL_FREE
--void free ();
--#endif
-+#include <string.h>
-+#include <stdlib.h>
- 
--#ifndef HAVE_DECL_MALLOC
--char *malloc ();
--#endif
--
--#ifndef HAVE_DECL_MEMCHR
--char *memchr ();
--#endif
--
--#ifndef HAVE_DECL_REALLOC
--char *realloc ();
--#endif
--
- #ifndef HAVE_DECL_STPCPY
- # ifndef stpcpy
- char *stpcpy ();
- # endif
--#endif
--
--#ifndef HAVE_DECL_STRSTR
--char *strstr ();
--#endif
--
--#ifndef HAVE_DECL_GETENV
--char *getenv ();
- #endif
- 
- #ifndef HAVE_DECL_LSEEK
diff --git a/misc/sh-utils/pkg/DESCR b/misc/sh-utils/pkg/DESCR
deleted file mode 100644
index 87149caa9b9..00000000000
--- a/misc/sh-utils/pkg/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-sh-utils is a package of small shell programming utilities. They
-are mostly compliant with POSIX.2, where applicable. The programs
-that can be built with this package are basename, chroot, date,
-dirname, echo, env, expr, factor, false, groups, hostname, id,
-logname, nice, nohup, pathchk, printenv, printf, pwd, seq, sleep,
-stty, tee, test, true, tty, uname, users, who, whoami, and yes.
-
-su is not installed with this package.
-
-All the binaries are prefixed by the letter g to differentiate them
-with the standard applications with the same name.  `id' is prefixed
-by two g (ggid) in other to avoid a conflict with gid in id-utils.
diff --git a/misc/sh-utils/pkg/PLIST b/misc/sh-utils/pkg/PLIST
deleted file mode 100644
index b3f0e20ddcd..00000000000
--- a/misc/sh-utils/pkg/PLIST
+++ /dev/null
@@ -1,85 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.7 2005/11/19 01:23:42 alek Exp $
-bin/gbasename
-bin/gchroot
-bin/gdate
-bin/gdirname
-bin/gecho
-bin/genv
-bin/gexpr
-bin/gfactor
-bin/gfalse
-bin/ggid
-bin/ggroups
-bin/ghostid
-bin/ghostname
-bin/glogname
-bin/gnice
-bin/gnohup
-bin/gpathchk
-bin/gpinky
-bin/gprintenv
-bin/gprintf
-bin/gpwd
-bin/gseq
-bin/gsleep
-bin/gstty
-@comment bin/gsu
-bin/gtee
-bin/gtest
-bin/gtrue
-bin/gtty
-bin/guname
-bin/gusers
-bin/gwho
-bin/gwhoami
-bin/gyes
-@info info/sh-utils.info
-@man man/man1/gbasename.1
-@man man/man1/gchroot.1
-@man man/man1/gdate.1
-@man man/man1/gdirname.1
-@man man/man1/gecho.1
-@man man/man1/genv.1
-@man man/man1/gexpr.1
-@man man/man1/gfalse.1
-@man man/man1/ggid.1
-@man man/man1/ggroups.1
-@man man/man1/ghostid.1
-@man man/man1/ghostname.1
-@man man/man1/glogname.1
-@man man/man1/gnice.1
-@man man/man1/gnohup.1
-@man man/man1/gpathchk.1
-@man man/man1/gpinky.1
-@man man/man1/gprintenv.1
-@man man/man1/gprintf.1
-@man man/man1/gpwd.1
-@man man/man1/gsleep.1
-@man man/man1/gstty.1
-@man man/man1/gsu.1
-@man man/man1/gtee.1
-@man man/man1/gtest.1
-@man man/man1/gtrue.1
-@man man/man1/gtty.1
-@man man/man1/guname.1
-@man man/man1/gusers.1
-@man man/man1/gwho.1
-@man man/man1/gwhoami.1
-@man man/man1/gyes.1
-share/locale/cs/LC_MESSAGES/sh-utils.mo
-share/locale/de/LC_MESSAGES/sh-utils.mo
-share/locale/el/LC_MESSAGES/sh-utils.mo
-share/locale/es/LC_MESSAGES/sh-utils.mo
-share/locale/fr/LC_MESSAGES/sh-utils.mo
-share/locale/it/LC_MESSAGES/sh-utils.mo
-share/locale/nl/LC_MESSAGES/sh-utils.mo
-share/locale/no/LC_MESSAGES/sh-utils.mo
-share/locale/pl/LC_MESSAGES/sh-utils.mo
-share/locale/pt/LC_MESSAGES/sh-utils.mo
-share/locale/pt_BR/LC_MESSAGES/sh-utils.mo
-share/locale/ru/LC_MESSAGES/sh-utils.mo
-share/locale/sk/LC_MESSAGES/sh-utils.mo
-share/locale/sv/LC_MESSAGES/sh-utils.mo
-share/locale/zh/
-share/locale/zh/LC_MESSAGES/
-share/locale/zh/LC_MESSAGES/sh-utils.mo
diff --git a/textproc/textutils/Makefile b/textproc/textutils/Makefile
deleted file mode 100644
index 5dbc3dd626f..00000000000
--- a/textproc/textutils/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $OpenBSD: Makefile,v 1.13 2010/11/20 19:56:52 espie Exp $
-
-COMMENT=		GNU text utilities
-
-DISTNAME=		textutils-2.0
-REVISION =		0
-CATEGORIES=		textproc
-
-# GPL
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c 
-
-MASTER_SITES=		${MASTER_SITE_GNU:=textutils/}
-
-MODULES=		devel/gettext
-
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS=		--program-prefix="g"
-USE_GROFF =		Yes
-
-# gpr -> ggpr to fix a conflict with graphviz
-# god -> ggod to fix a conflict with god
-
-post-install:
-	@[ -x ${PREFIX}/bin/god ] && mv ${PREFIX}/bin/god ${PREFIX}/bin/ggod
-	@[ -x ${PREFIX}/bin/gpr ] && mv ${PREFIX}/bin/gpr ${PREFIX}/bin/ggpr
-	@[ -f ${PREFIX}/man/man1/gpr.1 ] && mv ${PREFIX}/man/man1/gpr.1 \
-		${PREFIX}/man/man1/ggpr.1
-	@[ -f ${PREFIX}/man/man1/god.1 ] && mv ${PREFIX}/man/man1/god.1 \
-		${PREFIX}/man/man1/ggod.1
-
-.include <bsd.port.mk>
diff --git a/textproc/textutils/distinfo b/textproc/textutils/distinfo
deleted file mode 100644
index 7fa04c0f574..00000000000
--- a/textproc/textutils/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 (textutils-2.0.tar.gz) = YeDusJvglAaRgmMjNfcbGw==
-RMD160 (textutils-2.0.tar.gz) = VIbhlWvVvPuMlK9qNunw6HDa/fA=
-SHA1 (textutils-2.0.tar.gz) = w24393usQSxuJF5bpB/Csvntdaw=
-SHA256 (textutils-2.0.tar.gz) = lm37Def0wPOj/3/lTz3Gb800kzALnFGEudyOKQkMDlE=
-SIZE (textutils-2.0.tar.gz) = 1532425
diff --git a/textproc/textutils/patches/patch-src_tac_c b/textproc/textutils/patches/patch-src_tac_c
deleted file mode 100644
index 4aee343266a..00000000000
--- a/textproc/textutils/patches/patch-src_tac_c
+++ /dev/null
@@ -1,47 +0,0 @@
-$OpenBSD: patch-src_tac_c,v 1.1.1.1 2001/04/14 00:46:07 lebel Exp $
---- src/tac.c.orig	Sun Jul  4 05:59:25 1999
-+++ src/tac.c	Wed Apr  4 09:34:31 2001
-@@ -426,22 +426,19 @@ save_stdin (FILE **g_tmp, char **g_tempf
-       template = xmalloc (strlen (tempdir) + 11);
-     }
-   sprintf (template, "%s/tacXXXXXX", tempdir);
--  tempfile = mktemp (template);
-+  fd = mkstemp (template);
- 
--  /*  Open temporary file exclusively, to foil a common
--      denial-of-service attack.  */
--  fd = open (tempfile, O_RDWR | O_CREAT | O_TRUNC | O_EXCL, 0600);
-   if (fd == -1)
--    error (EXIT_FAILURE, errno, "%s", tempfile);
-+    error (EXIT_FAILURE, errno, "%s", template);
- 
-   tmp = fdopen (fd, "w+");
-   if (tmp == NULL)
--    error (EXIT_FAILURE, errno, "%s", tempfile);
-+    error (EXIT_FAILURE, errno, "%s", template);
- 
- #if DONT_UNLINK_WHILE_OPEN
--  record_tempfile (tempfile, tmp);
-+  record_tempfile (template, tmp);
- #else
--  unlink (tempfile);
-+  unlink (template);
- #endif
- 
-   while (1)
-@@ -457,13 +454,13 @@ save_stdin (FILE **g_tmp, char **g_tempf
-     }
- 
-   if (ferror (tmp) || fflush (tmp) == EOF)
--    error (EXIT_FAILURE, errno, "%s", tempfile);
-+    error (EXIT_FAILURE, errno, "%s", template);
- 
-   rewind (tmp);
- 
-   SET_BINARY (fileno (tmp));
-   *g_tmp = tmp;
--  *g_tempfile = tempfile;
-+  *g_tempfile = template;
- }
- 
- /* Print the standard input in reverse, saving it to temporary
diff --git a/textproc/textutils/pkg/DESCR b/textproc/textutils/pkg/DESCR
deleted file mode 100644
index 456a8ec5fec..00000000000
--- a/textproc/textutils/pkg/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-The Free Software Foundation's text processing utilities, for rearranging,
-reformatting and generally mangling text.
- 
-Many of the utilities exist in the OpenBSD base collection, but the GNU
-versions have added functionality, which is sometimes useful.
-
-All the binaries are prefixed by the letter g to differentiate them
-with the standard applications with the same name.
-
-Note that this port will install these utilities with a 'g' prefix,
-e.g. gtar, but the texinfo documentation will refer to them without
-the 'g' prefix.
diff --git a/textproc/textutils/pkg/PLIST b/textproc/textutils/pkg/PLIST
deleted file mode 100644
index 42101567992..00000000000
--- a/textproc/textutils/pkg/PLIST
+++ /dev/null
@@ -1,67 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.5 2009/06/25 00:23:39 jolan Exp $
-@bin bin/gcat
-@bin bin/gcksum
-@bin bin/gcomm
-@bin bin/gcsplit
-@bin bin/gcut
-@bin bin/gexpand
-@bin bin/gfmt
-@bin bin/gfold
-@bin bin/ggod
-@bin bin/ggpr
-@bin bin/ghead
-@bin bin/gjoin
-@bin bin/gmd5sum
-@bin bin/gnl
-@bin bin/gpaste
-@bin bin/gptx
-@bin bin/gsort
-@bin bin/gsplit
-@bin bin/gsum
-@bin bin/gtac
-@bin bin/gtail
-@bin bin/gtr
-@bin bin/gtsort
-@bin bin/gunexpand
-@bin bin/guniq
-@bin bin/gwc
-@info info/textutils.info
-@man man/man1/gcat.1
-@man man/man1/gcksum.1
-@man man/man1/gcomm.1
-@man man/man1/gcsplit.1
-@man man/man1/gcut.1
-@man man/man1/gexpand.1
-@man man/man1/gfmt.1
-@man man/man1/gfold.1
-@man man/man1/ggod.1
-@man man/man1/ggpr.1
-@man man/man1/ghead.1
-@man man/man1/gjoin.1
-@man man/man1/gmd5sum.1
-@man man/man1/gnl.1
-@man man/man1/gpaste.1
-@man man/man1/gptx.1
-@man man/man1/gsort.1
-@man man/man1/gsplit.1
-@man man/man1/gsum.1
-@man man/man1/gtac.1
-@man man/man1/gtail.1
-@man man/man1/gtr.1
-@man man/man1/gtsort.1
-@man man/man1/gunexpand.1
-@man man/man1/guniq.1
-@man man/man1/gwc.1
-share/locale/cs/LC_MESSAGES/textutils.mo
-share/locale/de/LC_MESSAGES/textutils.mo
-share/locale/el/LC_MESSAGES/textutils.mo
-share/locale/es/LC_MESSAGES/textutils.mo
-share/locale/fr/LC_MESSAGES/textutils.mo
-share/locale/ko/LC_MESSAGES/textutils.mo
-share/locale/nl/LC_MESSAGES/textutils.mo
-share/locale/no/LC_MESSAGES/textutils.mo
-share/locale/pl/LC_MESSAGES/textutils.mo
-share/locale/ru/LC_MESSAGES/textutils.mo
-share/locale/sk/LC_MESSAGES/textutils.mo
-share/locale/sv/LC_MESSAGES/textutils.mo
-share/locale/zh/LC_MESSAGES/textutils.mo