4 files changed, 24 insertions, 34 deletions

diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index 42220f35d444..d994afdf6e82 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	coreutils
-PORTVERSION=	6.7
-PORTREVISION=	1
+PORTVERSION=	6.9
 CATEGORIES=	sysutils textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,6 +20,7 @@ CONFLICTS=	fileutils-[0-9]* id-utils-[0-9]* linux-gid-[0-9]* \
 USE_GCC=	3.4+
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--program-prefix=g --infodir=${PREFIX}/info --mandir=${PREFIX}/man
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
 
diff --git a/sysutils/coreutils/distinfo b/sysutils/coreutils/distinfo
index 2836586f2f3d..256a793a1e3f 100644
--- a/sysutils/coreutils/distinfo
+++ b/sysutils/coreutils/distinfo
@@ -1,5 +1,3 @@
-MD5 (coreutils-6.7.tar.bz2) = a16465d0856cd011a1acc1c21040b7f4
-SHA1 (coreutils-6.7.tar.bz2) = 55a6037365f749a4ebb9e88a92132a4f938ac90e
-RMD160 (coreutils-6.7.tar.bz2) = 593acd266431db1777505bd181a7ffe095774beb
-SHA256 (coreutils-6.7.tar.bz2) = 4d7027cc803682decdadf850095dce7e22cc08eba2b1283e16d0fb7a675ac1f0
-SIZE (coreutils-6.7.tar.bz2) = 5315342
+MD5 (coreutils-6.9.tar.bz2) = c9607d8495f16e98906e7ed2d9751a06
+SHA256 (coreutils-6.9.tar.bz2) = 89c2895ad157de50e53298b22d91db116ee4e1dd3fdf4019260254e2e31497b0
+SIZE (coreutils-6.9.tar.bz2) = 5384378
diff --git a/sysutils/coreutils/files/patch-configure b/sysutils/coreutils/files/patch-configure
index 16c046e69904..e917eb275ec7 100644
--- a/sysutils/coreutils/files/patch-configure
+++ b/sysutils/coreutils/files/patch-configure
@@ -1,10 +1,6 @@
-===================================================================
-RCS file: configure,v
-retrieving revision 1.1
-diff -u -r1.1 configure
---- configure	2006/12/13 01:35:51	1.1
-+++ configure	2006/12/13 01:36:59
-@@ -2257,13 +2257,13 @@
+--- configure.orig	Thu Mar 22 14:20:28 2007
++++ configure
+@@ -2415,13 +2415,13 @@
    for ac_prog in mkdir gmkdir; do
  	 for ac_exec_ext in '' $ac_executable_extensions; do
  	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
diff --git a/sysutils/coreutils/pkg-plist b/sysutils/coreutils/pkg-plist
index ceee63b7b287..1b54e2ce7a33 100644
--- a/sysutils/coreutils/pkg-plist
+++ b/sysutils/coreutils/pkg-plist
@@ -1,4 +1,5 @@
 bin/g[
+bin/gbase64
 bin/gbasename
 bin/gcat
 bin/gchgrp
@@ -59,7 +60,12 @@ bin/grm
 bin/grmdir
 bin/gseq
 bin/gsha1sum
+bin/gsha224sum
+bin/gsha256sum
+bin/gsha384sum
+bin/gsha512sum
 bin/gshred
+bin/gshuf
 bin/gsleep
 bin/gsort
 bin/gsplit
@@ -88,16 +94,12 @@ bin/gwc
 bin/gwho
 bin/gwhoami
 bin/gyes
-bin/gsha224sum
-bin/gsha256sum
-bin/gsha384sum
-bin/gsha512sum
-bin/gshuf
-bin/gbase64
 %%NLS%%share/locale/af/LC_MESSAGES/coreutils.mo
 %%NLS%%share/locale/af/LC_TIME/coreutils.mo
 %%NLS%%share/locale/be/LC_MESSAGES/coreutils.mo
 %%NLS%%share/locale/be/LC_TIME/coreutils.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/bg/LC_TIME/coreutils.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/coreutils.mo
 %%NLS%%share/locale/ca/LC_TIME/coreutils.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/coreutils.mo
@@ -112,6 +114,8 @@ bin/gbase64
 %%NLS%%share/locale/es/LC_TIME/coreutils.mo
 %%NLS%%share/locale/et/LC_MESSAGES/coreutils.mo
 %%NLS%%share/locale/et/LC_TIME/coreutils.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/eu/LC_TIME/coreutils.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/coreutils.mo
 %%NLS%%share/locale/fi/LC_TIME/coreutils.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/coreutils.mo
@@ -144,6 +148,8 @@ bin/gbase64
 %%NLS%%share/locale/pt_BR/LC_TIME/coreutils.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/coreutils.mo
 %%NLS%%share/locale/ru/LC_TIME/coreutils.mo
+%%NLS%%share/locale/rw/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/rw/LC_TIME/coreutils.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/coreutils.mo
 %%NLS%%share/locale/sk/LC_TIME/coreutils.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/coreutils.mo
@@ -156,18 +162,14 @@ bin/gbase64
 %%NLS%%share/locale/zh_CN/LC_TIME/coreutils.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/coreutils.mo
 %%NLS%%share/locale/zh_TW/LC_TIME/coreutils.mo
-%%NLS%%share/locale/bg/LC_MESSAGES/coreutils.mo
-%%NLS%%share/locale/bg/LC_TIME/coreutils.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/coreutils.mo
-%%NLS%%share/locale/eu/LC_TIME/coreutils.mo
-%%NLS%%share/locale/rw/LC_MESSAGES/coreutils.mo
-%%NLS%%share/locale/rw/LC_TIME/coreutils.mo
 %%NLS%%@dirrmtry share/locale/zh_TW/LC_TIME
 %%NLS%%@dirrmtry share/locale/zh_CN/LC_TIME
 %%NLS%%@dirrmtry share/locale/tr/LC_TIME
 %%NLS%%@dirrmtry share/locale/sv/LC_TIME
 %%NLS%%@dirrmtry share/locale/sl/LC_TIME
 %%NLS%%@dirrmtry share/locale/sk/LC_TIME
+%%NLS%%@dirrmtry share/locale/rw/LC_TIME
+%%NLS%%@dirrmtry share/locale/rw
 %%NLS%%@dirrmtry share/locale/ru/LC_TIME
 %%NLS%%@dirrmtry share/locale/pt_BR/LC_TIME
 %%NLS%%@dirrmtry share/locale/pt/LC_TIME
@@ -176,9 +178,6 @@ bin/gbase64
 %%NLS%%@dirrmtry share/locale/nl/LC_TIME
 %%NLS%%@dirrmtry share/locale/nb/LC_TIME
 %%NLS%%@dirrmtry share/locale/ms/LC_TIME
-%%NLS%%@dirrmtry share/locale/lg/LC_TIME
-%%NLS%%@dirrmtry share/locale/lg/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/lg
 %%NLS%%@dirrmtry share/locale/ko/LC_TIME
 %%NLS%%@dirrmtry share/locale/ja/LC_TIME
 %%NLS%%@dirrmtry share/locale/it/LC_TIME
@@ -187,6 +186,7 @@ bin/gbase64
 %%NLS%%@dirrmtry share/locale/ga/LC_TIME
 %%NLS%%@dirrmtry share/locale/fr/LC_TIME
 %%NLS%%@dirrmtry share/locale/fi/LC_TIME
+%%NLS%%@dirrmtry share/locale/eu/LC_TIME
 %%NLS%%@dirrmtry share/locale/et/LC_TIME
 %%NLS%%@dirrmtry share/locale/es/LC_TIME
 %%NLS%%@dirrmtry share/locale/el/LC_TIME
@@ -194,10 +194,6 @@ bin/gbase64
 %%NLS%%@dirrmtry share/locale/da/LC_TIME
 %%NLS%%@dirrmtry share/locale/cs/LC_TIME
 %%NLS%%@dirrmtry share/locale/ca/LC_TIME
+%%NLS%%@dirrmtry share/locale/bg/LC_TIME
 %%NLS%%@dirrmtry share/locale/be/LC_TIME
 %%NLS%%@dirrmtry share/locale/af/LC_TIME
-%%NLS%%@dirrmtry share/locale/bg/LC_TIME
-%%NLS%%@dirrmtry share/locale/eu/LC_TIME
-%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/rw/LC_TIME
-%%NLS%%@dirrmtry share/locale/rw