Update to 4.0

PR:		87992
Submitted by:	Vasil Dimov <vd@datamax.bg>

5 files changed, 6 insertions, 60 deletions

diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile
index 08beff734b4c..1ce373aa9e99 100644
--- a/devel/id-utils/Makefile
+++ b/devel/id-utils/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	id-utils
-PORTVERSION=	3.2d
-PORTREVISION=	4
+PORTVERSION=	4.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU_ALPHA}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,6 +19,7 @@ CONFLICTS=	coreutils-[0-9]* linux-gid-[0-9]* sh-utils-[0-9]*
 USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 INFO=		id-utils
diff --git a/devel/id-utils/distinfo b/devel/id-utils/distinfo
index eebbeda4620f..774d83622bb4 100644
--- a/devel/id-utils/distinfo
+++ b/devel/id-utils/distinfo
@@ -1,2 +1,2 @@
-MD5 (id-utils-3.2d.tar.gz) = 1152902c1fff4fadb8a7827ad91a80b0
-SIZE (id-utils-3.2d.tar.gz) = 357007
+MD5 (id-utils-4.0.tar.gz) = 2053522dab62f2286579eecf2d0252e9
+SIZE (id-utils-4.0.tar.gz) = 643191
diff --git a/devel/id-utils/files/patch-Makefile.in b/devel/id-utils/files/patch-Makefile.in
deleted file mode 100644
index b6864536e1bd..000000000000
--- a/devel/id-utils/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Tue Apr  6 17:28:35 1999
-+++ Makefile.in	Tue Mar 30 20:10:48 2004
-@@ -95,7 +95,7 @@
- 
- AUTOMAKE_OPTIONS = gnits 1.2h
- 
--SUBDIRS = lib libidu intl src lisp m4 po doc testsuite
-+SUBDIRS = lib libidu intl src m4 po doc testsuite
- 
- # Remove this file here (it is created via configure), not from within intl.
- DISTCLEANFILES = intl/libintl.h
diff --git a/devel/id-utils/files/patch-lib::Makefile.in b/devel/id-utils/files/patch-lib::Makefile.in
deleted file mode 100644
index ef4d89db44fd..000000000000
--- a/devel/id-utils/files/patch-lib::Makefile.in
+++ /dev/null
@@ -1,45 +0,0 @@
---- lib/Makefile.in.orig	Tue Apr  6 17:28:36 1999
-+++ lib/Makefile.in	Tue Mar 30 20:20:55 2004
-@@ -100,9 +100,9 @@
- EXTRA_DIST = alloca.c basename.c dirname.c error.c fnmatch.c memcpy.c 	memset.c obstack.c regex.c strcasecmp.c strcspn.c strdup.c 	strndup.c strpbrk.c strspn.c strstr.c strtok.c
- 
- 
--libsys_a_SOURCES = xgetcwd.c xmalloc.c getopt.c getopt1.c
-+libsys_a_SOURCES = xgetcwd.c xmalloc.c
- 
--noinst_HEADERS = ansidecl.h error.h fnmatch.h getopt.h obstack.h 	pathmax.h regex.h xalloca.h xdirent.h xfnmatch.h 	xmalloc.h xobstack.h xstddef.h xstdlib.h xstring.h xsysstat.h 	xunistd.h
-+noinst_HEADERS = ansidecl.h error.h fnmatch.h obstack.h 	pathmax.h regex.h xalloca.h xdirent.h xfnmatch.h 	xmalloc.h xobstack.h xstddef.h xstdlib.h xstring.h xsysstat.h 	xunistd.h
- 
- 
- INCLUDES = -I. -I$(srcdir) 	   -I../intl -I$(top_srcdir)/intl 	   -I.. -I$(top_srcdir)
-@@ -118,7 +118,7 @@
- LIBS = @LIBS@
- ANSI2KNR = ../src/ansi2knr
- libsys_a_DEPENDENCIES =  @LIBOBJS@ @ALLOCA@
--libsys_a_OBJECTS =  xgetcwd$U.o xmalloc$U.o getopt$U.o getopt1$U.o
-+libsys_a_OBJECTS =  xgetcwd$U.o xmalloc$U.o
- AR = ar
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
-@@ -205,10 +205,6 @@
- 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/error.c; then echo $(srcdir)/error.c; else echo error.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > error_.c
- fnmatch_.c: fnmatch.c $(ANSI2KNR)
- 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fnmatch.c; then echo $(srcdir)/fnmatch.c; else echo fnmatch.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > fnmatch_.c
--getopt_.c: getopt.c $(ANSI2KNR)
--	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getopt.c; then echo $(srcdir)/getopt.c; else echo getopt.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getopt_.c
--getopt1_.c: getopt1.c $(ANSI2KNR)
--	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getopt1.c; then echo $(srcdir)/getopt1.c; else echo getopt1.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getopt1_.c
- memcpy_.c: memcpy.c $(ANSI2KNR)
- 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memcpy.c; then echo $(srcdir)/memcpy.c; else echo memcpy.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memcpy_.c
- memset_.c: memset.c $(ANSI2KNR)
-@@ -235,8 +231,8 @@
- 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xgetcwd.c; then echo $(srcdir)/xgetcwd.c; else echo xgetcwd.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xgetcwd_.c
- xmalloc_.c: xmalloc.c $(ANSI2KNR)
- 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xmalloc.c; then echo $(srcdir)/xmalloc.c; else echo xmalloc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xmalloc_.c
--alloca_.o basename_.o dirname_.o error_.o fnmatch_.o getopt_.o \
--getopt1_.o memcpy_.o memset_.o obstack_.o regex_.o strcspn_.o strdup_.o \
-+alloca_.o basename_.o dirname_.o error_.o fnmatch_.o \
-+memcpy_.o memset_.o obstack_.o regex_.o strcspn_.o strdup_.o \
- strndup_.o strpbrk_.o strspn_.o strstr_.o strtok_.o xgetcwd_.o \
- xmalloc_.o : $(ANSI2KNR)
- 
diff --git a/devel/id-utils/pkg-plist b/devel/id-utils/pkg-plist
index 6ae166ac0603..f39563823369 100644
--- a/devel/id-utils/pkg-plist
+++ b/devel/id-utils/pkg-plist
@@ -11,3 +11,5 @@ share/emacs/site-lisp/id-utils.el
 share/id-lang.map
 %%NLS%%share/locale/de/LC_MESSAGES/id-utils.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/id-utils.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/id-utils.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/id-utils.mo