- Update to 4.6

  * lid -L no longer mishandles open-ended ranges like "..2" and "2.."
  * lid's -d, -o and -x options now work properly

- Remove "LICENSE_FILE", leaving "LICENSE" since it's standard GPLv3

- Fix build on FreeBSD-10

PR:		ports/165340
Submitted by:	Peter Jeremy <peterjeremy@acm.org>

3 files changed, 50 insertions, 24 deletions

diff --git a/devel/idutils/Makefile b/devel/idutils/Makefile
index e0017155b63a..9638684dbb45 100644
--- a/devel/idutils/Makefile
+++ b/devel/idutils/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	idutils
-PORTVERSION=	4.5
+PORTVERSION=	4.6
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
@@ -16,7 +16,6 @@ COMMENT=	The classic Berkeley gid/lid tools for looking up variables in code
 CONFLICTS=	coreutils-[0-9]* linux-gid-[0-9]* sh-utils-[0-9]*
 
 LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/idutils/distinfo b/devel/idutils/distinfo
index d7663313d410..7142fdffdf7e 100644
--- a/devel/idutils/distinfo
+++ b/devel/idutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (idutils-4.5.tar.xz) = 62e15fbd7df43a717c88f0128a5de10f1bd11164cd222327d11285a5918011bf
-SIZE (idutils-4.5.tar.xz) = 885376
+SHA256 (idutils-4.6.tar.xz) = 8181f43a4fb62f6f0ccf3b84dbe9bec71ecabd6dfdcf49c6b5584521c888aac2
+SIZE (idutils-4.6.tar.xz) = 1001496
diff --git a/devel/idutils/files/patch-configure b/devel/idutils/files/patch-configure
index 033b9d7c6aaf..a27ff811d9ad 100644
--- a/devel/idutils/files/patch-configure
+++ b/devel/idutils/files/patch-configure
@@ -1,20 +1,47 @@
---- configure.old	2011-03-28 08:15:17.000000000 +1100
-+++ configure	2011-03-28 08:15:47.000000000 +1100
-@@ -8239,7 +8239,7 @@
-                   || close (fd) != 0
-                   || stat (file, &st1) != 0
-                   || st0.st_atime != st1.st_atime)
--                status |= 64;
-+                status |= 0;
-             }
-             return status;
-   ;
-@@ -14722,8 +14722,6 @@
-            linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a
-                    # closed fd may yield -EBADF instead of -1 / errno=EBADF.
-              gl_cv_func_dup2_works=no;;
--           freebsd*) # on FreeBSD 6.1, dup2(1,1000000) gives EMFILE, not EBADF.
--             gl_cv_func_dup2_works=no;;
-            *) gl_cv_func_dup2_works=yes;;
-          esac
- else
+--- configure.old	2012-02-03 21:41:35.000000000 +1100
++++ configure	2012-02-11 11:08:46.027072843 +1100
+@@ -8935,7 +8935,7 @@
+                                  # Guess yes on glibc systems.
+            *-gnu*)               gl_cv_func_printf_sizes_c99="guessing yes";;
+                                  # Guess yes on FreeBSD >= 5.
+-           freebsd[1-4]*)        gl_cv_func_printf_sizes_c99="guessing no";;
++           freebsd[1-4].*)       gl_cv_func_printf_sizes_c99="guessing no";;
+            freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";;
+                                  # Guess yes on MacOS X >= 10.3.
+            darwin[1-6].*)        gl_cv_func_printf_sizes_c99="guessing no";;
+@@ -9077,7 +9077,7 @@
+                                  # Guess yes on glibc systems.
+            *-gnu*)               gl_cv_func_printf_infinite="guessing yes";;
+                                  # Guess yes on FreeBSD >= 6.
+-           freebsd[1-5]*)        gl_cv_func_printf_infinite="guessing no";;
++           freebsd[1-5].*)       gl_cv_func_printf_infinite="guessing no";;
+            freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";;
+                                  # Guess yes on MacOS X >= 10.3.
+            darwin[1-6].*)        gl_cv_func_printf_infinite="guessing no";;
+@@ -9476,7 +9476,7 @@
+                                          # Guess yes on glibc systems.
+                    *-gnu*)               gl_cv_func_printf_infinite_long_double="guessing yes";;
+                                          # Guess yes on FreeBSD >= 6.
+-                   freebsd[1-5]*)        gl_cv_func_printf_infinite_long_double="guessing no";;
++                   freebsd[1-5].*)       gl_cv_func_printf_infinite_long_double="guessing no";;
+                    freebsd* | kfreebsd*) gl_cv_func_printf_infinite_long_double="guessing yes";;
+                                          # Guess yes on HP-UX >= 11.
+                    hpux[7-9]* | hpux10*) gl_cv_func_printf_infinite_long_double="guessing no";;
+@@ -9904,7 +9904,7 @@
+                                  # Guess yes on glibc systems.
+            *-gnu*)               gl_cv_func_printf_directive_f="guessing yes";;
+                                  # Guess yes on FreeBSD >= 6.
+-           freebsd[1-5]*)        gl_cv_func_printf_directive_f="guessing no";;
++           freebsd[1-5].*)       gl_cv_func_printf_directive_f="guessing no";;
+            freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";;
+                                  # Guess yes on MacOS X >= 10.3.
+            darwin[1-6].*)        gl_cv_func_printf_directive_f="guessing no";;
+@@ -11264,7 +11264,7 @@
+                                  # Guess yes on glibc systems.
+            *-gnu*)               gl_cv_func_snprintf_retval_c99="guessing yes";;
+                                  # Guess yes on FreeBSD >= 5.
+-           freebsd[1-4]*)        gl_cv_func_snprintf_retval_c99="guessing no";;
++           freebsd[1-4].*)       gl_cv_func_snprintf_retval_c99="guessing no";;
+            freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
+                                  # Guess yes on MacOS X >= 10.3.
+            darwin[1-6].*)        gl_cv_func_snprintf_retval_c99="guessing no";;