- Remove DEPRECATED and update to 2.22

- Update MASTER_SITES

PR:		ports/172252 (based on)
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
Feature safe:	yes

3 files changed, 23 insertions, 68 deletions

diff --git a/sysutils/linrename/files/patch-lib__nls.h b/sysutils/linrename/files/patch-lib__nls.h
deleted file mode 100644
index e8ef01d418ce..000000000000
--- a/sysutils/linrename/files/patch-lib__nls.h
+++ /dev/null
@@ -1,42 +0,0 @@
---- ./lib/nls.h.orig	Thu Jul  4 23:03:26 2002
-+++ ./lib/nls.h	Mon Dec 25 14:54:11 2006
-@@ -1,7 +1,5 @@
- int main(int argc, char *argv[]);
- 
--#include "../defines.h"		/* for HAVE_locale_h */
--
- #ifndef PACKAGE
- #define PACKAGE	"util-linux"
- #endif
-@@ -10,25 +8,12 @@
- #define LOCALEDIR "/usr/share/locale"
- #endif
- 
--#ifdef HAVE_locale_h
--# include <locale.h>
--#endif
-+#include <locale.h>
- 
--#if defined MAY_ENABLE_NLS && !defined DISABLE_NLS
--# include <libintl.h>
--# define _(Text) gettext (Text)
--# ifdef gettext_noop
--#  define N_(String) gettext_noop (String)
--# else
--#  define N_(String) (String)
--# endif
-+#include <libintl.h>
-+#define _(Text) gettext (Text)
-+#ifdef gettext_noop
-+# define N_(String) gettext_noop (String)
- #else
--# undef bindtextdomain
--# define bindtextdomain(Domain, Directory) /* empty */
--# undef textdomain
--# define textdomain(Domain) /* empty */
--# define _(Text) (Text)
--# define N_(Text) (Text)
-+# define N_(String) (String)
- #endif
--
--
diff --git a/sysutils/linrename/files/patch-misc-utils__rename.1 b/sysutils/linrename/files/patch-misc-utils__rename.1
index 58de31e772ea..e5cf9be39591 100644
--- a/sysutils/linrename/files/patch-misc-utils__rename.1
+++ b/sysutils/linrename/files/patch-misc-utils__rename.1
@@ -1,37 +1,45 @@
---- ./misc-utils/rename.1.orig	Sun Aug 22 17:14:45 2004
-+++ ./misc-utils/rename.1	Mon Dec 25 14:54:11 2006
-@@ -3,11 +3,11 @@
+--- misc-utils/rename.1.orig	2012-06-11 19:06:53.730196000 +0900
++++ misc-utils/rename.1	2012-09-28 00:43:17.000000000 +0900
+@@ -3,12 +3,12 @@
  .\"
- .TH RENAME 1 "1 January 2000" "" "Linux Programmer's Manual"
+ .TH RENAME 1 "June 2011" "util-linux" "User Commands"
  .SH NAME
--rename \- Rename files
-+linrename \- Rename files
+-rename \- rename files
++linrename \- rename files
  .SH SYNOPSIS
--.BI rename " from to file..."
-+.BI linrename " from to file..."
+-.B rename
++.B linrename
+ .RI [ options ] " expression replacement file" ...
  .SH DESCRIPTION
 -.B rename
 +.B linrename
  will rename the specified files by replacing the first occurrence of
- .I from
+ .I expression
  in their name by
-@@ -19,8 +19,8 @@
- 
+@@ -30,8 +30,8 @@
  .RS
+ .PP
  .nf
 -rename foo foo0 foo?
 -rename foo foo0 foo??
 +linrename foo foo0 foo?
 +linrename foo foo0 foo??
  .fi
+ .PP
  .RE
- 
-@@ -30,7 +30,7 @@
- And
+@@ -41,7 +41,7 @@
  .RS
+ .PP
  .nf
 -rename .htm .html *.htm
 +linrename .htm .html *.htm
  .fi
+ .PP
  .RE
- 
+@@ -56,5 +56,5 @@
+ .BR mmv (1),
+ .BR mv (1)
+ .SH AVAILABILITY
+-The rename command is part of the util-linux package and is available from
++The linrename command is part of the util-linux package and is available from
+ ftp://ftp.kernel.org/pub/linux/utils/util-linux/.
diff --git a/sysutils/linrename/files/patch-misc-utils__rename.c b/sysutils/linrename/files/patch-misc-utils__rename.c
deleted file mode 100644
index de69e27ecd23..000000000000
--- a/sysutils/linrename/files/patch-misc-utils__rename.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./misc-utils/rename.c.orig	Tue May  9 23:39:03 2000
-+++ ./misc-utils/rename.c	Mon Dec 25 14:54:11 2006
-@@ -19,6 +19,8 @@
- #include <errno.h>
- #include "nls.h"
- 
-+#define util_linux_version "util-linux-2.12r"
-+
- static char *progname;
- 
- static int