Index: head/sysutils/coreutils/Makefile
===================================================================
--- head/sysutils/coreutils/Makefile	(revision 119069)
+++ head/sysutils/coreutils/Makefile	(revision 119070)
@@ -1,60 +1,70 @@
 # New ports collection makefile for:	coreutils
 # Date created:				18 November 2003
 # Whom:					Jason Harris <jharris@widomaker.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	coreutils
 PORTVERSION=	5.2.1
 CATEGORIES=	sysutils textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	jharris@widomaker.com
 COMMENT=	The Free Software Foundation's core utilities
 
-CONFLICTS=	sh-utils-* fileutils-* textutils-* id-utils-*
+CONFLICTS=	sh-utils-[0-9]* fileutils-[0-9]* textutils-[0-9]* id-utils-[0-9]*
 
 USE_GPG?=	yes
 SIG_FILES=	${DISTNAME}${EXTRACT_SUFX}.sig
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--program-prefix=g
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
 
 USE_GMAKE=	yes
 
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
+
 INFO=		coreutils
 
 MAN1=	gbasename.1 gcat.1 gchgrp.1 gchmod.1 gchown.1 gchroot.1 gcksum.1 \
 	gcomm.1 gcp.1 gcsplit.1 gcut.1 gdate.1 gdd.1 gdf.1 gdir.1 \
 	gdircolors.1 gdirname.1 gdu.1 gecho.1 genv.1 gexpand.1 gexpr.1 \
 	gfactor.1 gfalse.1 gfmt.1 gfold.1 ggroups.1 ghead.1 ghostid.1 \
 	ghostname.1 gid.1 ginstall.1 gjoin.1 gkill.1 glink.1 gln.1 \
 	glogname.1 gls.1 gmd5sum.1 gmkdir.1 gmkfifo.1 gmknod.1 gmv.1 \
 	gnice.1 gnl.1 gnohup.1 god.1 gpaste.1 gpathchk.1 gpinky.1 \
 	gpr.1 gprintenv.1 gprintf.1 gptx.1 gpwd.1 greadlink.1 grm.1 \
 	grmdir.1 gseq.1 gsha1sum.1 gshred.1 gsleep.1 gsort.1 gsplit.1 \
 	gstat.1 gstty.1 gsu.1 gsum.1 gsync.1 gtac.1 gtail.1 gtee.1 \
 	gtest.1 gtouch.1 gtr.1 gtrue.1 gtsort.1 gtty.1 guname.1 \
 	gunexpand.1 guniq.1 gunlink.1 guptime.1 gusers.1 gvdir.1 \
 	gwc.1 gwho.1 gwhoami.1 gyes.1
 
 INSTALL_INFO?=	install-info
 
 post-patch:
 .if !defined(WITH_SUID)
 	@${REINPLACE_CMD} -e "s/u\+s/u\+w/g" ${WRKSRC}/src/Makefile.in
 .endif
+
+post-build:
+	@${REINPLACE_CMD} -e "s/ lib / /g" ${WRKSRC}/Makefile
 
 post-install: install-info
 
 install-info:
 	@${INSTALL_INFO} ${PREFIX}/info/${PORTNAME}.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>

Property changes on: head/sysutils/coreutils/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/sysutils/coreutils/pkg-plist
===================================================================
--- head/sysutils/coreutils/pkg-plist	(revision 119069)
+++ head/sysutils/coreutils/pkg-plist	(revision 119070)
@@ -1,154 +1,194 @@
 bin/g[
 bin/gbasename
 bin/gcat
 bin/gchgrp
 bin/gchmod
 bin/gchown
 bin/gchroot
 bin/gcksum
 bin/gcomm
 bin/gcp
 bin/gcsplit
 bin/gcut
 bin/gdate
 bin/gdd
 bin/gdf
 bin/gdir
 bin/gdircolors
 bin/gdirname
 bin/gdu
 bin/gecho
 bin/genv
 bin/gexpand
 bin/gexpr
 bin/gfactor
 bin/gfalse
 bin/gfmt
 bin/gfold
 bin/ggroups
 bin/ghead
 bin/ghostid
 bin/ghostname
 bin/gid
 bin/ginstall
 bin/gjoin
 bin/gkill
 bin/glink
 bin/gln
 bin/glogname
 bin/gls
 bin/gmd5sum
 bin/gmkdir
 bin/gmkfifo
 bin/gmknod
 bin/gmv
 bin/gnice
 bin/gnl
 bin/gnohup
 bin/god
 bin/gpaste
 bin/gpathchk
 bin/gpinky
 bin/gpr
 bin/gprintenv
 bin/gprintf
 bin/gptx
 bin/gpwd
 bin/greadlink
 bin/grm
 bin/grmdir
 bin/gseq
 bin/gsha1sum
 bin/gshred
 bin/gsleep
 bin/gsort
 bin/gsplit
 bin/gstat
 bin/gstty
 bin/gsu
 bin/gsum
 bin/gsync
 bin/gtac
 bin/gtail
 bin/gtee
 bin/gtest
 bin/gtouch
 bin/gtr
 bin/gtrue
 bin/gtsort
 bin/gtty
 bin/guname
 bin/gunexpand
 bin/guniq
 bin/gunlink
 bin/guptime
 bin/gusers
 bin/gvdir
 bin/gwc
 bin/gwho
 bin/gwhoami
 bin/gyes
-share/locale/af/LC_MESSAGES/coreutils.mo
-share/locale/af/LC_TIME/coreutils.mo
-share/locale/be/LC_MESSAGES/coreutils.mo
-share/locale/be/LC_TIME/coreutils.mo
-share/locale/ca/LC_MESSAGES/coreutils.mo
-share/locale/ca/LC_TIME/coreutils.mo
-share/locale/cs/LC_MESSAGES/coreutils.mo
-share/locale/cs/LC_TIME/coreutils.mo
-share/locale/da/LC_MESSAGES/coreutils.mo
-share/locale/da/LC_TIME/coreutils.mo
-share/locale/de/LC_MESSAGES/coreutils.mo
-share/locale/de/LC_TIME/coreutils.mo
-share/locale/el/LC_MESSAGES/coreutils.mo
-share/locale/el/LC_TIME/coreutils.mo
-share/locale/es/LC_MESSAGES/coreutils.mo
-share/locale/es/LC_TIME/coreutils.mo
-share/locale/et/LC_MESSAGES/coreutils.mo
-share/locale/et/LC_TIME/coreutils.mo
-share/locale/fi/LC_MESSAGES/coreutils.mo
-share/locale/fi/LC_TIME/coreutils.mo
-share/locale/fr/LC_MESSAGES/coreutils.mo
-share/locale/fr/LC_TIME/coreutils.mo
-share/locale/ga/LC_MESSAGES/coreutils.mo
-share/locale/ga/LC_TIME/coreutils.mo
-share/locale/gl/LC_MESSAGES/coreutils.mo
-share/locale/gl/LC_TIME/coreutils.mo
-share/locale/hu/LC_MESSAGES/coreutils.mo
-share/locale/hu/LC_TIME/coreutils.mo
-share/locale/it/LC_MESSAGES/coreutils.mo
-share/locale/it/LC_TIME/coreutils.mo
-share/locale/ja/LC_MESSAGES/coreutils.mo
-share/locale/ja/LC_TIME/coreutils.mo
-share/locale/ko/LC_MESSAGES/coreutils.mo
-share/locale/ko/LC_TIME/coreutils.mo
-share/locale/lg/LC_MESSAGES/coreutils.mo
-share/locale/lg/LC_TIME/coreutils.mo
-share/locale/ms/LC_MESSAGES/coreutils.mo
-share/locale/ms/LC_TIME/coreutils.mo
-share/locale/nb/LC_MESSAGES/coreutils.mo
-share/locale/nb/LC_TIME/coreutils.mo
-share/locale/nl/LC_MESSAGES/coreutils.mo
-share/locale/nl/LC_TIME/coreutils.mo
-share/locale/no/LC_MESSAGES/coreutils.mo
-share/locale/no/LC_TIME/coreutils.mo
-share/locale/pl/LC_MESSAGES/coreutils.mo
-share/locale/pl/LC_TIME/coreutils.mo
-share/locale/pt/LC_MESSAGES/coreutils.mo
-share/locale/pt/LC_TIME/coreutils.mo
-share/locale/pt_BR/LC_MESSAGES/coreutils.mo
-share/locale/pt_BR/LC_TIME/coreutils.mo
-share/locale/ru/LC_MESSAGES/coreutils.mo
-share/locale/ru/LC_TIME/coreutils.mo
-share/locale/sk/LC_MESSAGES/coreutils.mo
-share/locale/sk/LC_TIME/coreutils.mo
-share/locale/sl/LC_MESSAGES/coreutils.mo
-share/locale/sl/LC_TIME/coreutils.mo
-share/locale/sv/LC_MESSAGES/coreutils.mo
-share/locale/sv/LC_TIME/coreutils.mo
-share/locale/tr/LC_MESSAGES/coreutils.mo
-share/locale/tr/LC_TIME/coreutils.mo
-share/locale/zh_CN/LC_MESSAGES/coreutils.mo
-share/locale/zh_CN/LC_TIME/coreutils.mo
-share/locale/zh_TW/LC_MESSAGES/coreutils.mo
-share/locale/zh_TW/LC_TIME/coreutils.mo
+%%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/ca/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/ca/LC_TIME/coreutils.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/cs/LC_TIME/coreutils.mo
+%%NLS%%share/locale/da/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/da/LC_TIME/coreutils.mo
+%%NLS%%share/locale/de/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/de/LC_TIME/coreutils.mo
+%%NLS%%share/locale/el/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/el/LC_TIME/coreutils.mo
+%%NLS%%share/locale/es/LC_MESSAGES/coreutils.mo
+%%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/fi/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/fi/LC_TIME/coreutils.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/fr/LC_TIME/coreutils.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/ga/LC_TIME/coreutils.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/gl/LC_TIME/coreutils.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/hu/LC_TIME/coreutils.mo
+%%NLS%%share/locale/it/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/it/LC_TIME/coreutils.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/ja/LC_TIME/coreutils.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/ko/LC_TIME/coreutils.mo
+%%NLS%%share/locale/lg/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/lg/LC_TIME/coreutils.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/ms/LC_TIME/coreutils.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/nb/LC_TIME/coreutils.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/nl/LC_TIME/coreutils.mo
+%%NLS%%share/locale/no/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/no/LC_TIME/coreutils.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/pl/LC_TIME/coreutils.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/pt/LC_TIME/coreutils.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/coreutils.mo
+%%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/sk/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/sk/LC_TIME/coreutils.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/sl/LC_TIME/coreutils.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/sv/LC_TIME/coreutils.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/coreutils.mo
+%%NLS%%share/locale/tr/LC_TIME/coreutils.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/coreutils.mo
+%%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%%@unexec rmdir %D/share/locale/zh_TW/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/zh_CN/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/tr/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/sv/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/sl/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/sk/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/pt_BR/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/pt/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/pl/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/no/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/nl/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/nb/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/nb/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ms/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ms/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/lg/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/lg/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/lg 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ko/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ja/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/it/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/hu/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/gl/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ga/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ga/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ga 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/fr/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/fi/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/et/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/es/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/el/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/de/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/da/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/cs/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ca/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/be/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/af/LC_TIME 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/af/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/af 2>/dev/null || true

Property changes on: head/sysutils/coreutils/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property