Update to 4.1.

PR:		ports/30394
Submitted by:	Cyrille Lefevre <clefevre@citeweb.net> (MAINTAINER)

5 files changed, 55 insertions, 42 deletions

diff --git a/sysutils/fileutils/Makefile b/sysutils/fileutils/Makefile
index 550b2bf133bd..0b64ca21743e 100644
--- a/sysutils/fileutils/Makefile
+++ b/sysutils/fileutils/Makefile
@@ -6,31 +6,30 @@
 #
 
 PORTNAME=	fileutils
-PORTVERSION=	4.0
+PORTVERSION=	4.1
 CATEGORIES=	sysutils
 MASTER_SITES=   ${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	fileutils
 
 MAINTAINER=	clefevre@citeweb.net
 
-#
 # Global variables
 #
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-prefix=g
+LIB_DEPEND=	intl.1:${PORTSDIR}/devel/gettext
+
+USE_PERL5=	yes
+USE_LIBTOOL=	yes
+USE_GMAKE=	yes
+# --program-prefix=g is broken
+CONFIGURE_ARGS=	--program-transform-name=s,^,g,
+CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
+		LDFLAGS=-L${LOCALBASE}/lib
+# PREFIX isn't honored. force it w/ prefix.
+MAKE_ARGS=	prefix=${PREFIX}
 
 MAN1=		gchgrp.1 gchmod.1 gchown.1 gcp.1 gdd.1 gdf.1 gdir.1 \
 		gdircolors.1 gdu.1 ginstall.1 gln.1 gls.1 gmkdir.1 gmkfifo.1 \
-		gmknod.1 gmv.1 grm.1 grmdir.1 gsync.1 gtouch.1 gvdir.1
-
-#
-# Local variables
-#
-
-INSTALL_INFO?=	install-info
-
-post-install:
-	@${INSTALL_INFO} ${PREFIX}/info/${PORTNAME}.info ${PREFIX}/info/dir
+		gmknod.1 gmv.1 grm.1 grmdir.1 gshred.1 gsync.1 gtouch.1 gvdir.1
 
 .include <bsd.port.mk>
diff --git a/sysutils/fileutils/distinfo b/sysutils/fileutils/distinfo
index db4e26da04bc..2d1a300b2806 100644
--- a/sysutils/fileutils/distinfo
+++ b/sysutils/fileutils/distinfo
@@ -1 +1 @@
-MD5 (fileutils-4.0.tar.gz) = 082ab37b7f37c00e768b04e37bc736be
+MD5 (fileutils-4.1.tar.gz) = 2fa04ceee87e962ddf72f32a2d6b906d
diff --git a/sysutils/fileutils/files/patch-aa b/sysutils/fileutils/files/patch-aa
deleted file mode 100644
index 835385c33043..000000000000
--- a/sysutils/fileutils/files/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
---- doc/Makefile.in.orig	Sat Nov 14 16:46:10 1998
-+++ doc/Makefile.in	Thu Feb 10 16:08:46 2000
-@@ -211,23 +211,8 @@
- 	    else : ; fi; \
- 	  done; \
- 	done
--	@$(POST_INSTALL)
--	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
--	  for file in $(INFO_DEPS); do \
--	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
--	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
--	  done; \
--	else : ; fi
- 
- uninstall-info:
--	$(PRE_UNINSTALL)
--	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
--	  ii=yes; \
--	else ii=; fi; \
--	for file in $(INFO_DEPS); do \
--	  test -z "$ii" \
--	    || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
--	done
- 	@$(NORMAL_UNINSTALL)
- 	for file in $(INFO_DEPS); do \
- 	  (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \
diff --git a/sysutils/fileutils/pkg-descr b/sysutils/fileutils/pkg-descr
index 690c0726b571..ea13f52642ab 100644
--- a/sysutils/fileutils/pkg-descr
+++ b/sysutils/fileutils/pkg-descr
@@ -1,7 +1,7 @@
 The Free Software Foundation's "file" utilities, including "chgrp",
 "chmod", "chown", "cp", "dd", "df", "dir", "dircolors", "du",
 "install", "ln", "ls", "mkdir", "mkfifo", "mknod", "mv", "rm",
-"rmdir", "sync", "touch", "vdir".
+"rmdir", "shred", "sync", "touch", "vdir".
 
 These utilities exist in the FreeBSD base collection, but the GNU
 versions have added functionality that is sometimes useful.
diff --git a/sysutils/fileutils/pkg-plist b/sysutils/fileutils/pkg-plist
index f85902d66298..d795bfd7c6be 100644
--- a/sysutils/fileutils/pkg-plist
+++ b/sysutils/fileutils/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/gchgrp
 bin/gchmod
 bin/gchown
@@ -16,28 +17,57 @@ bin/gmknod
 bin/gmv
 bin/grm
 bin/grmdir
+bin/gshred
 bin/gsync
 bin/gtouch
 bin/gvdir
 @unexec install-info --quiet --delete %D/info/fileutils.info %D/info/dir
 info/fileutils.info
 @exec install-info %D/info/fileutils.info %D/info/dir
+share/locale/cs/LC_TIME
 share/locale/cs/LC_MESSAGES/fileutils.mo
+share/locale/da/LC_TIME
+share/locale/da/LC_MESSAGES/fileutils.mo
+share/locale/de/LC_TIME
 share/locale/de/LC_MESSAGES/fileutils.mo
+share/locale/el/LC_TIME
 share/locale/el/LC_MESSAGES/fileutils.mo
+share/locale/es/LC_TIME
 share/locale/es/LC_MESSAGES/fileutils.mo
+share/locale/fr/LC_TIME
 share/locale/fr/LC_MESSAGES/fileutils.mo
+share/locale/gl/LC_TIME
+share/locale/gl/LC_MESSAGES/fileutils.mo
+share/locale/it/LC_TIME
+share/locale/it/LC_MESSAGES/fileutils.mo
+share/locale/ja/LC_TIME
+share/locale/ja/LC_MESSAGES/fileutils.mo
+share/locale/ko/LC_TIME
 share/locale/ko/LC_MESSAGES/fileutils.mo
+share/locale/nl/LC_TIME
 share/locale/nl/LC_MESSAGES/fileutils.mo
+share/locale/no/LC_TIME
 share/locale/no/LC_MESSAGES/fileutils.mo
+share/locale/pl/LC_TIME
 share/locale/pl/LC_MESSAGES/fileutils.mo
+share/locale/pt/LC_TIME
 share/locale/pt/LC_MESSAGES/fileutils.mo
+share/locale/pt_BR/LC_TIME
+share/locale/pt_BR/LC_MESSAGES/fileutils.mo
+share/locale/ru/LC_TIME
 share/locale/ru/LC_MESSAGES/fileutils.mo
+share/locale/sk/LC_TIME
 share/locale/sk/LC_MESSAGES/fileutils.mo
+share/locale/sl/LC_TIME
 share/locale/sl/LC_MESSAGES/fileutils.mo
+share/locale/sv/LC_TIME
 share/locale/sv/LC_MESSAGES/fileutils.mo
+share/locale/zh/LC_TIME
+share/locale/zh/LC_MESSAGES/fileutils.mo
 @unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/cs 2>/dev/null || true
+@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/da 2>/dev/null || true
 @unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/de 2>/dev/null || true
 @unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
@@ -46,6 +76,12 @@ share/locale/sv/LC_MESSAGES/fileutils.mo
 @unexec rmdir %D/share/locale/es 2>/dev/null || true
 @unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/fr 2>/dev/null || true
+@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/gl 2>/dev/null || true
+@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/it 2>/dev/null || true
+@unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ja 2>/dev/null || true
 @unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/ko 2>/dev/null || true
 @unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
@@ -56,6 +92,8 @@ share/locale/sv/LC_MESSAGES/fileutils.mo
 @unexec rmdir %D/share/locale/pl 2>/dev/null || true
 @unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/pt 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
 @unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/ru 2>/dev/null || true
 @unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
@@ -64,4 +102,6 @@ share/locale/sv/LC_MESSAGES/fileutils.mo
 @unexec rmdir %D/share/locale/sl 2>/dev/null || true
 @unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/sv 2>/dev/null || true
+@unexec rmdir %D/share/locale/zh/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/zh 2>/dev/null || true
 @unexec rmdir %D/share/locale 2>/dev/null || true