5 files changed, 21 insertions, 61 deletions

diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 0f3e5e1be74b..1a0b87fe9820 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gettext
-PORTVERSION=	0.17
-PORTREVISION=	1
+PORTVERSION=	0.18
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gettext
@@ -19,7 +18,7 @@ MAINTAINER=	autotools@FreeBSD.org
 COMMENT=	GNU gettext package
 
 USE_ICONV=	yes
-LIBTOOLFILES=	autoconf-lib-link/configure gettext-runtime/configure \
+LIBTOOLFILES=	gettext-runtime/configure \
 		gettext-runtime/libasprintf/configure gettext-tools/configure
 USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	ACLOCAL="${TRUE}" \
diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo
index ebbb9721833a..63ae0a9f2404 100644
--- a/devel/gettext/distinfo
+++ b/devel/gettext/distinfo
@@ -1,3 +1,3 @@
-MD5 (gettext-0.17.tar.gz) = 58a2bc6d39c0ba57823034d55d65d606
-SHA256 (gettext-0.17.tar.gz) = 209638bb8e162f22c281145a34e220c66f1f6e9ff5e4c50c6f2ef2ded59537ba
-SIZE (gettext-0.17.tar.gz) = 11640890
+MD5 (gettext-0.18.tar.gz) = d52a3e061032a1ed13856d42fc86f0fd
+SHA256 (gettext-0.18.tar.gz) = 02342c1de18c03c601f8b91cbd896b70486a4b945bd816f34541e0d7b5a96fe5
+SIZE (gettext-0.18.tar.gz) = 12011166
diff --git a/devel/gettext/files/patch-ad b/devel/gettext/files/patch-ad
index 4bd832b13da3..5e93184aa1aa 100644
--- a/devel/gettext/files/patch-ad
+++ b/devel/gettext/files/patch-ad
@@ -1,14 +1,9 @@
---- gettext-tools/misc/Makefile.in.orig	Mon Mar 14 07:24:11 2005
-+++ gettext-tools/misc/Makefile.in	Mon Mar 14 20:40:33 2005
-@@ -447,11 +447,9 @@
- 	  list='$(lisp_LISP)'; for p in $$list; do \
- 	    if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	    f=$(am__strip_dir) \
+--- gettext-tools/misc/Makefile.in.orig	2010-05-09 11:58:59.000000000 -0700
++++ gettext-tools/misc/Makefile.in	2010-05-17 18:05:21.000000000 -0700
+@@ -1285,6 +1285,4 @@
+ 	    $(am__strip_dir) \
 -	    echo " $(lispLISP_INSTALL) '$$d$$p' '$(DESTDIR)$(lispdir)/$$f'"; \
- 	    $(lispLISP_INSTALL) "$$d$$p" "$(DESTDIR)$(lispdir)/$$f"; \
+ 	    $(lispLISP_INSTALL) "$$d$$p" "$(DESTDIR)$(lispdir)/$$f" || exit $$?; \
  	    if test -f $${p}c; then \
- 	      echo " $(lispLISP_INSTALL) '$${p}c' '$(DESTDIR)$(lispdir)/$${f}c'"; \
--	      $(lispLISP_INSTALL) "$${p}c" "$(DESTDIR)$(lispdir)/$${f}c"; \
- 	    else : ; fi; \
- 	  done; \
- 	else : ; fi
+-	      echo " $(lispLISP_INSTALL) '$${p}c' '$(DESTDIR)$(lispdir)/$${f}c'"; \
+ 	      $(lispLISP_INSTALL) "$${p}c" "$(DESTDIR)$(lispdir)/$${f}c" || exit $$?; \
diff --git a/devel/gettext/files/patch-gettext-runtime_intl_Makefile.in b/devel/gettext/files/patch-gettext-runtime_intl_Makefile.in
deleted file mode 100644
index 823552253a8b..000000000000
--- a/devel/gettext/files/patch-gettext-runtime_intl_Makefile.in
+++ /dev/null
@@ -1,40 +0,0 @@
---- gettext-runtime/intl/Makefile.in.orig	2007-11-04 21:21:12.000000000 +0000
-+++ gettext-runtime/intl/Makefile.in	2007-12-12 03:28:44.000000000 +0000
-@@ -79,3 +79,3 @@
- DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
---DLIBDIR=\"$(libdir)\" -DBUILDING_LIBINTL -DBUILDING_DLL -DIN_LIBINTL \
-+-DLIBDIR=\"$(prefix)/libdata\" -DBUILDING_LIBINTL -DBUILDING_DLL -DIN_LIBINTL \
- -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
-@@ -195,3 +195,3 @@
- 	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
--	  $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) @LTLIBTHREAD@ @LTLIBC@ \
-+	  $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) @LTLIBTHREAD@ \
- 	  $(OBJECTS_RES_@WOE32@) \
-@@ -369,18 +369,2 @@
- 	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
--	  test @GLIBC21@ != no || $(mkdir_p) $(DESTDIR)$(libdir); \
--	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
--	  dest=$(DESTDIR)$(libdir)/charset.alias; \
--	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
--	    orig=$(DESTDIR)$(libdir)/charset.alias; \
--	    sed -f ref-add.sed $$orig > $$temp; \
--	    $(INSTALL_DATA) $$temp $$dest; \
--	    rm -f $$temp; \
--	  else \
--	    if test @GLIBC21@ = no; then \
--	      orig=charset.alias; \
--	      sed -f ref-add.sed $$orig > $$temp; \
--	      $(INSTALL_DATA) $$temp $$dest; \
--	      rm -f $$temp; \
--	    fi; \
--	  fi; \
- 	  $(mkdir_p) $(DESTDIR)$(localedir); \
-@@ -472,5 +456,5 @@
- 	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
--	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
--	    temp=$(DESTDIR)$(libdir)/t-charset.alias; \
--	    dest=$(DESTDIR)$(libdir)/charset.alias; \
-+	  if test -f $(DESTDIR)$(prefix)/libdata/charset.alias; then \
-+	    temp=$(DESTDIR)$(prefix)/libdata/t-charset.alias; \
-+	    dest=$(DESTDIR)$(prefix)/libdata/charset.alias; \
- 	    sed -f ref-del.sed $$dest > $$temp; \
diff --git a/devel/gettext/pkg-plist b/devel/gettext/pkg-plist
index 6283b5e11a1b..ba19c39880cb 100644
--- a/devel/gettext/pkg-plist
+++ b/devel/gettext/pkg-plist
@@ -36,20 +36,21 @@ lib/libgettextlib.so
 lib/libgettextpo.a
 lib/libgettextpo.la
 lib/libgettextpo.so
-lib/libgettextpo.so.4
+lib/libgettextpo.so.5
 lib/libgettextsrc.la
 lib/libgettextsrc-%%VERSION%%.so
 lib/libgettextsrc.so
 lib/libintl.a
 lib/libintl.la
 lib/libintl.so
-lib/libintl.so.8
+lib/libintl.so.9
 libdata/gettext-tools/hostname
 libdata/gettext-tools/project-id
 libdata/gettext-tools/urlget
 libdata/gettext-tools/user-email
 share/aclocal/codeset.m4
 share/aclocal/gettext.m4
+share/aclocal/fcntl-o.m4
 share/aclocal/glibc2.m4
 share/aclocal/glibc21.m4
 share/aclocal/iconv.m4
@@ -72,6 +73,7 @@ share/aclocal/printf-posix.m4
 share/aclocal/progtest.m4
 share/aclocal/size_max.m4
 share/aclocal/stdint_h.m4
+share/aclocal/threadlib.m4
 share/aclocal/uintmax_t.m4
 share/aclocal/visibility.m4
 share/aclocal/wchar_t.m4
@@ -140,7 +142,7 @@ share/aclocal/xsize.m4
 share/emacs/site-lisp/po-compat.el
 share/emacs/site-lisp/po-mode.el
 %%DATADIR%%/ABOUT-NLS
-%%DATADIR%%/archive.tar.gz
+%%DATADIR%%/archive.cvs.tar.gz
 %%DATADIR%%/config.rpath
 %%DATADIR%%/gettext.h
 %%DATADIR%%/intl/COPYING.LIB-2.0
@@ -197,7 +199,9 @@ share/emacs/site-lisp/po-mode.el
 %%DATADIR%%/intl/ref-del.sin
 %%DATADIR%%/intl/relocatable.c
 %%DATADIR%%/intl/relocatable.h
+%%DATADIR%%/intl/setlocale.c
 %%DATADIR%%/intl/textdomain.c
+%%DATADIR%%/intl/threadlib.c
 %%DATADIR%%/intl/tsearch.c
 %%DATADIR%%/intl/tsearch.h
 %%DATADIR%%/intl/vasnprintf.c
@@ -239,6 +243,8 @@ share/emacs/site-lisp/po-mode.el
 %%DATADIR%%/styles/po-vim.css
 share/locale/be/LC_MESSAGES/gettext-runtime.mo
 share/locale/be/LC_MESSAGES/gettext-tools.mo
+share/locale/bg/LC_MESSAGES/gettext-runtime.mo
+share/locale/bg/LC_MESSAGES/gettext-tools.mo
 share/locale/ca/LC_MESSAGES/gettext-runtime.mo
 share/locale/ca/LC_MESSAGES/gettext-tools.mo
 share/locale/cs/LC_MESSAGES/gettext-runtime.mo