Upgrade to 0.10.35, and associated changes.

PR:		ports/8842
Reviewed by:	<nakai@TokyoNet.AD.JP> (maintainer)
Submitted by:	<junker@jazz.snu.ac.kr>

18 files changed, 393 insertions, 126 deletions

diff --git a/devel/gettext-devel/Makefile b/devel/gettext-devel/Makefile
index 4fe799a33e2b..449c09f0d30a 100644
--- a/devel/gettext-devel/Makefile
+++ b/devel/gettext-devel/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:   gettext
-# Version required:    0.10
+# Version required:    0.10.35
 # Date created:        16 March 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.3 1998/09/23 17:58:38 vanilla Exp $
+# $Id: Makefile,v 1.4 1998/11/18 15:09:35 vanilla Exp $
 #
 
-DISTNAME=	gettext-0.10
+DISTNAME=	gettext-0.10.35
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	ftp://alpha.gnu.ai.mit.edu/gnu/
 
 MAINTAINER=	Nakai@technologist.com
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gnu-gettext
+CONFIGURE_ARGS=	i386--freebsd --with-gnu-gettext
 
 pre-configure:
 	${RM} ${WRKSRC}/doc/gettext.info*
@@ -23,5 +23,7 @@ post-install:
 	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	 fi
 	@install-info ${PREFIX}/info/gettext.info ${PREFIX}/info/dir
+	${INSTALL_DATA} ${WRKSRC}/misc/po-mode.el \
+		${PREFIX}/share/gettext/po-mode.el
 
 .include <bsd.port.mk>
diff --git a/devel/gettext-devel/distinfo b/devel/gettext-devel/distinfo
index 6d60ca65ce5c..c78c8247570c 100644
--- a/devel/gettext-devel/distinfo
+++ b/devel/gettext-devel/distinfo
@@ -1 +1 @@
-MD5 (gettext-0.10.tar.gz) = e9d58ee3880feed61b2b8145b5ec519a
+MD5 (gettext-0.10.35.tar.gz) = f29d32b82217b9d89fcda66328752acc
diff --git a/devel/gettext-devel/files/patch-ad b/devel/gettext-devel/files/patch-ad
new file mode 100644
index 000000000000..eea8e9c9deab
--- /dev/null
+++ b/devel/gettext-devel/files/patch-ad
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	Fri May  1 15:47:40 1998
++++ misc/Makefile.in	Fri Aug  7 23:13:23 1998
+@@ -164,10 +164,8 @@
+ 	@list='$(lisp_LISP)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
+ 	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p"; \
+-	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p; \
+ 	  if test -f $${p}c; then \
+ 	    echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c"; \
+-	    $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c; \
+ 	  else : ; fi; \
+ 	done
+ 
diff --git a/devel/gettext-devel/files/patch-ae b/devel/gettext-devel/files/patch-ae
new file mode 100644
index 000000000000..f52804bfa80c
--- /dev/null
+++ b/devel/gettext-devel/files/patch-ae
@@ -0,0 +1,12 @@
+diff -uNr ../gg/configure ./configure
+--- ../gg/configure	Fri May  1 14:48:25 1998
++++ ./configure	Mon Jul 20 12:49:23 1998
+@@ -4004,7 +4004,7 @@
+   ;;
+ esac
+ fi
+-EMACS="$ac_cv_path_EMACS"
++EMACS=no
+ if test -n "$EMACS"; then
+   echo "$ac_t""$EMACS" 1>&6
+ else
diff --git a/devel/gettext-devel/files/patch-af b/devel/gettext-devel/files/patch-af
new file mode 100644
index 000000000000..10096b53055b
--- /dev/null
+++ b/devel/gettext-devel/files/patch-af
@@ -0,0 +1,12 @@
+diff -uNr ../gg/misc/locale.alias ./misc/locale.alias
+--- ../gg/misc/locale.alias	Sun Oct 20 00:40:54 1996
++++ ./misc/locale.alias	Mon Jul 20 12:49:42 1998
+@@ -40,6 +40,7 @@
+ icelandic       is_IS.ISO-8859-1
+ italian         it_CH.ISO-8859-1
+ japanese	ja_JP.EUC
++korean		ko_KR.EUC
+ norwegian       no_NO.ISO-8859-1
+ polish          pl_PL.ISO-8859-2
+ portuguese      pt_PT.ISO-8859-1
+
diff --git a/devel/gettext-devel/pkg-plist b/devel/gettext-devel/pkg-plist
index e2ff60f2fca2..6506cdbf75a0 100644
--- a/devel/gettext-devel/pkg-plist
+++ b/devel/gettext-devel/pkg-plist
@@ -1,54 +1,104 @@
 bin/gettext
-bin/gettextize
 bin/msgcmp
 bin/msgfmt
 bin/msgmerge
 bin/msgunfmt
-bin/tupdate
 bin/xgettext
-include/libintl.h
+bin/msgcomm
+bin/gettextize
 @unexec install-info --delete %D/info/gettext.info %D/info/dir
 info/gettext.info
+info/gettext.info-1
+info/gettext.info-2
+info/gettext.info-3
+info/gettext.info-4
+info/gettext.info-5
 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/gettext.info %D/info/dir
+include/libintl.h
 lib/libintl.a
-share/gettext/aclocal.m4
-share/gettext/intl-ChangeLog
-share/gettext/intl-Makefile.in
-share/gettext/intl-VERSION
-share/gettext/intl-bindtextdom.c
-share/gettext/intl-cat-compat.c
-share/gettext/intl-dcgettext.c
-share/gettext/intl-dgettext.c
-share/gettext/intl-finddomain.c
-share/gettext/intl-gettext.c
-share/gettext/intl-gettext.h
-share/gettext/intl-gettextP.h
-share/gettext/intl-hash-string.h
-share/gettext/intl-intl-compat.c
-share/gettext/intl-libgettext.h
-share/gettext/intl-linux-msg.sed
-share/gettext/intl-loadmsgcat.c
-share/gettext/intl-localealias.c
-share/gettext/intl-po2tbl.sed.in
-share/gettext/intl-textdomain.c
-share/gettext/intl-xopen-msg.sed
-share/gettext/po-Makefile.in.in
-share/gettext/root-ABOUT-NLS
-share/locale/de/LC_MESSAGES/gettext.mo
-share/locale/fr/LC_MESSAGES/gettext.mo
-share/locale/locale.alias
 share/locale/no/LC_MESSAGES/gettext.mo
-share/locale/no@nynorsk/LC_MESSAGES/gettext.mo
-share/locale/sv/LC_MESSAGES/gettext.mo
-@dirrm share/gettext
+@dirrm share/locale/no/LC_MESSAGES
+@dirrm share/locale/no
+share/locale/da/LC_MESSAGES/gettext.mo
+@dirrm share/locale/da/LC_MESSAGES
+@dirrm share/locale/da
+share/locale/de/LC_MESSAGES/gettext.mo
 @dirrm share/locale/de/LC_MESSAGES
 @dirrm share/locale/de
+share/locale/es/LC_MESSAGES/gettext.mo
+@dirrm share/locale/es/LC_MESSAGES
+@dirrm share/locale/es
+share/locale/fr/LC_MESSAGES/gettext.mo
 @dirrm share/locale/fr/LC_MESSAGES
 @dirrm share/locale/fr
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
-@dirrm share/locale/no@nynorsk/LC_MESSAGES
-@dirrm share/locale/no@nynorsk
+share/locale/ko/LC_MESSAGES/gettext.mo
+@dirrm share/locale/ko/LC_MESSAGES
+@dirrm share/locale/ko
+share/locale/nl/LC_MESSAGES/gettext.mo
+@dirrm share/locale/nl/LC_MESSAGES
+@dirrm share/locale/nl
+share/locale/pl/LC_MESSAGES/gettext.mo
+@dirrm share/locale/pl/LC_MESSAGES
+@dirrm share/locale/pl
+share/locale/pt/LC_MESSAGES/gettext.mo
+@dirrm share/locale/pt/LC_MESSAGES
+@dirrm share/locale/pt
+share/locale/sl/LC_MESSAGES/gettext.mo
+@dirrm share/locale/sl/LC_MESSAGES
+@dirrm share/locale/sl
+share/locale/sv/LC_MESSAGES/gettext.mo
 @dirrm share/locale/sv/LC_MESSAGES
 @dirrm share/locale/sv
+share/locale/no@nynorsk/LC_MESSAGES/gettext.mo
+@dirrm share/locale/no@nynorsk/LC_MESSAGES
+@dirrm share/locale/no@nynorsk
+@exec mkdir -p %D/share/locale/ca/LC_MESSAGES
+@dirrm share/locale/ca/LC_MESSAGES
+@dirrm share/locale/ca
+@exec mkdir -p %D/share/locale/cs/LC_MESSAGES
+@dirrm share/locale/cs/LC_MESSAGES
+@dirrm share/locale/cs
+@exec mkdir -p %D/share/locale/it/LC_MESSAGES
+@dirrm share/locale/it/LC_MESSAGES
+@dirrm share/locale/it
+@exec mkdir -p %D/share/locale/ru/LC_MESSAGES
+@dirrm share/locale/ru/LC_MESSAGES
+@dirrm share/locale/ru
+@exec mkdir -p %D/share/locale/tr/LC_MESSAGES
+@dirrm share/locale/tr/LC_MESSAGES
+@dirrm share/locale/tr
+share/locale/locale.alias
+@dirrm share/locale
+share/gettext/intl/VERSION
+share/gettext/intl/ChangeLog
+share/gettext/intl/Makefile.in
+share/gettext/intl/linux-msg.sed
+share/gettext/intl/po2tbl.sed.in
+share/gettext/intl/xopen-msg.sed
+share/gettext/intl/gettext.h
+share/gettext/intl/gettextP.h
+share/gettext/intl/hash-string.h
+share/gettext/intl/libgettext.h
+share/gettext/intl/loadinfo.h
+share/gettext/intl/bindtextdom.c
+share/gettext/intl/dcgettext.c
+share/gettext/intl/dgettext.c
+share/gettext/intl/gettext.c
+share/gettext/intl/finddomain.c
+share/gettext/intl/loadmsgcat.c
+share/gettext/intl/localealias.c
+share/gettext/intl/textdomain.c
+share/gettext/intl/l10nflist.c
+share/gettext/intl/explodename.c
+share/gettext/intl/intl-compat.c
+share/gettext/intl/cat-compat.c
+share/gettext/po/Makefile.in.in
+share/gettext/ABOUT-NLS
+share/gettext/po-mode.el
+@dirrm share/gettext/intl
+@dirrm share/gettext/po
+@dirrm share/gettext
+share/aclocal/gettext.m4
+share/aclocal/lcmessage.m4
+share/aclocal/progtest.m4
diff --git a/devel/gettext-old/Makefile b/devel/gettext-old/Makefile
index 4fe799a33e2b..449c09f0d30a 100644
--- a/devel/gettext-old/Makefile
+++ b/devel/gettext-old/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:   gettext
-# Version required:    0.10
+# Version required:    0.10.35
 # Date created:        16 March 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.3 1998/09/23 17:58:38 vanilla Exp $
+# $Id: Makefile,v 1.4 1998/11/18 15:09:35 vanilla Exp $
 #
 
-DISTNAME=	gettext-0.10
+DISTNAME=	gettext-0.10.35
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	ftp://alpha.gnu.ai.mit.edu/gnu/
 
 MAINTAINER=	Nakai@technologist.com
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gnu-gettext
+CONFIGURE_ARGS=	i386--freebsd --with-gnu-gettext
 
 pre-configure:
 	${RM} ${WRKSRC}/doc/gettext.info*
@@ -23,5 +23,7 @@ post-install:
 	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	 fi
 	@install-info ${PREFIX}/info/gettext.info ${PREFIX}/info/dir
+	${INSTALL_DATA} ${WRKSRC}/misc/po-mode.el \
+		${PREFIX}/share/gettext/po-mode.el
 
 .include <bsd.port.mk>
diff --git a/devel/gettext-old/distinfo b/devel/gettext-old/distinfo
index 6d60ca65ce5c..c78c8247570c 100644
--- a/devel/gettext-old/distinfo
+++ b/devel/gettext-old/distinfo
@@ -1 +1 @@
-MD5 (gettext-0.10.tar.gz) = e9d58ee3880feed61b2b8145b5ec519a
+MD5 (gettext-0.10.35.tar.gz) = f29d32b82217b9d89fcda66328752acc
diff --git a/devel/gettext-old/files/patch-ad b/devel/gettext-old/files/patch-ad
new file mode 100644
index 000000000000..eea8e9c9deab
--- /dev/null
+++ b/devel/gettext-old/files/patch-ad
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	Fri May  1 15:47:40 1998
++++ misc/Makefile.in	Fri Aug  7 23:13:23 1998
+@@ -164,10 +164,8 @@
+ 	@list='$(lisp_LISP)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
+ 	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p"; \
+-	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p; \
+ 	  if test -f $${p}c; then \
+ 	    echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c"; \
+-	    $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c; \
+ 	  else : ; fi; \
+ 	done
+ 
diff --git a/devel/gettext-old/files/patch-ae b/devel/gettext-old/files/patch-ae
new file mode 100644
index 000000000000..f52804bfa80c
--- /dev/null
+++ b/devel/gettext-old/files/patch-ae
@@ -0,0 +1,12 @@
+diff -uNr ../gg/configure ./configure
+--- ../gg/configure	Fri May  1 14:48:25 1998
++++ ./configure	Mon Jul 20 12:49:23 1998
+@@ -4004,7 +4004,7 @@
+   ;;
+ esac
+ fi
+-EMACS="$ac_cv_path_EMACS"
++EMACS=no
+ if test -n "$EMACS"; then
+   echo "$ac_t""$EMACS" 1>&6
+ else
diff --git a/devel/gettext-old/files/patch-af b/devel/gettext-old/files/patch-af
new file mode 100644
index 000000000000..10096b53055b
--- /dev/null
+++ b/devel/gettext-old/files/patch-af
@@ -0,0 +1,12 @@
+diff -uNr ../gg/misc/locale.alias ./misc/locale.alias
+--- ../gg/misc/locale.alias	Sun Oct 20 00:40:54 1996
++++ ./misc/locale.alias	Mon Jul 20 12:49:42 1998
+@@ -40,6 +40,7 @@
+ icelandic       is_IS.ISO-8859-1
+ italian         it_CH.ISO-8859-1
+ japanese	ja_JP.EUC
++korean		ko_KR.EUC
+ norwegian       no_NO.ISO-8859-1
+ polish          pl_PL.ISO-8859-2
+ portuguese      pt_PT.ISO-8859-1
+
diff --git a/devel/gettext-old/pkg-plist b/devel/gettext-old/pkg-plist
index e2ff60f2fca2..6506cdbf75a0 100644
--- a/devel/gettext-old/pkg-plist
+++ b/devel/gettext-old/pkg-plist
@@ -1,54 +1,104 @@
 bin/gettext
-bin/gettextize
 bin/msgcmp
 bin/msgfmt
 bin/msgmerge
 bin/msgunfmt
-bin/tupdate
 bin/xgettext
-include/libintl.h
+bin/msgcomm
+bin/gettextize
 @unexec install-info --delete %D/info/gettext.info %D/info/dir
 info/gettext.info
+info/gettext.info-1
+info/gettext.info-2
+info/gettext.info-3
+info/gettext.info-4
+info/gettext.info-5
 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/gettext.info %D/info/dir
+include/libintl.h
 lib/libintl.a
-share/gettext/aclocal.m4
-share/gettext/intl-ChangeLog
-share/gettext/intl-Makefile.in
-share/gettext/intl-VERSION
-share/gettext/intl-bindtextdom.c
-share/gettext/intl-cat-compat.c
-share/gettext/intl-dcgettext.c
-share/gettext/intl-dgettext.c
-share/gettext/intl-finddomain.c
-share/gettext/intl-gettext.c
-share/gettext/intl-gettext.h
-share/gettext/intl-gettextP.h
-share/gettext/intl-hash-string.h
-share/gettext/intl-intl-compat.c
-share/gettext/intl-libgettext.h
-share/gettext/intl-linux-msg.sed
-share/gettext/intl-loadmsgcat.c
-share/gettext/intl-localealias.c
-share/gettext/intl-po2tbl.sed.in
-share/gettext/intl-textdomain.c
-share/gettext/intl-xopen-msg.sed
-share/gettext/po-Makefile.in.in
-share/gettext/root-ABOUT-NLS
-share/locale/de/LC_MESSAGES/gettext.mo
-share/locale/fr/LC_MESSAGES/gettext.mo
-share/locale/locale.alias
 share/locale/no/LC_MESSAGES/gettext.mo
-share/locale/no@nynorsk/LC_MESSAGES/gettext.mo
-share/locale/sv/LC_MESSAGES/gettext.mo
-@dirrm share/gettext
+@dirrm share/locale/no/LC_MESSAGES
+@dirrm share/locale/no
+share/locale/da/LC_MESSAGES/gettext.mo
+@dirrm share/locale/da/LC_MESSAGES
+@dirrm share/locale/da
+share/locale/de/LC_MESSAGES/gettext.mo
 @dirrm share/locale/de/LC_MESSAGES
 @dirrm share/locale/de
+share/locale/es/LC_MESSAGES/gettext.mo
+@dirrm share/locale/es/LC_MESSAGES
+@dirrm share/locale/es
+share/locale/fr/LC_MESSAGES/gettext.mo
 @dirrm share/locale/fr/LC_MESSAGES
 @dirrm share/locale/fr
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
-@dirrm share/locale/no@nynorsk/LC_MESSAGES
-@dirrm share/locale/no@nynorsk
+share/locale/ko/LC_MESSAGES/gettext.mo
+@dirrm share/locale/ko/LC_MESSAGES
+@dirrm share/locale/ko
+share/locale/nl/LC_MESSAGES/gettext.mo
+@dirrm share/locale/nl/LC_MESSAGES
+@dirrm share/locale/nl
+share/locale/pl/LC_MESSAGES/gettext.mo
+@dirrm share/locale/pl/LC_MESSAGES
+@dirrm share/locale/pl
+share/locale/pt/LC_MESSAGES/gettext.mo
+@dirrm share/locale/pt/LC_MESSAGES
+@dirrm share/locale/pt
+share/locale/sl/LC_MESSAGES/gettext.mo
+@dirrm share/locale/sl/LC_MESSAGES
+@dirrm share/locale/sl
+share/locale/sv/LC_MESSAGES/gettext.mo
 @dirrm share/locale/sv/LC_MESSAGES
 @dirrm share/locale/sv
+share/locale/no@nynorsk/LC_MESSAGES/gettext.mo
+@dirrm share/locale/no@nynorsk/LC_MESSAGES
+@dirrm share/locale/no@nynorsk
+@exec mkdir -p %D/share/locale/ca/LC_MESSAGES
+@dirrm share/locale/ca/LC_MESSAGES
+@dirrm share/locale/ca
+@exec mkdir -p %D/share/locale/cs/LC_MESSAGES
+@dirrm share/locale/cs/LC_MESSAGES
+@dirrm share/locale/cs
+@exec mkdir -p %D/share/locale/it/LC_MESSAGES
+@dirrm share/locale/it/LC_MESSAGES
+@dirrm share/locale/it
+@exec mkdir -p %D/share/locale/ru/LC_MESSAGES
+@dirrm share/locale/ru/LC_MESSAGES
+@dirrm share/locale/ru
+@exec mkdir -p %D/share/locale/tr/LC_MESSAGES
+@dirrm share/locale/tr/LC_MESSAGES
+@dirrm share/locale/tr
+share/locale/locale.alias
+@dirrm share/locale
+share/gettext/intl/VERSION
+share/gettext/intl/ChangeLog
+share/gettext/intl/Makefile.in
+share/gettext/intl/linux-msg.sed
+share/gettext/intl/po2tbl.sed.in
+share/gettext/intl/xopen-msg.sed
+share/gettext/intl/gettext.h
+share/gettext/intl/gettextP.h
+share/gettext/intl/hash-string.h
+share/gettext/intl/libgettext.h
+share/gettext/intl/loadinfo.h
+share/gettext/intl/bindtextdom.c
+share/gettext/intl/dcgettext.c
+share/gettext/intl/dgettext.c
+share/gettext/intl/gettext.c
+share/gettext/intl/finddomain.c
+share/gettext/intl/loadmsgcat.c
+share/gettext/intl/localealias.c
+share/gettext/intl/textdomain.c
+share/gettext/intl/l10nflist.c
+share/gettext/intl/explodename.c
+share/gettext/intl/intl-compat.c
+share/gettext/intl/cat-compat.c
+share/gettext/po/Makefile.in.in
+share/gettext/ABOUT-NLS
+share/gettext/po-mode.el
+@dirrm share/gettext/intl
+@dirrm share/gettext/po
+@dirrm share/gettext
+share/aclocal/gettext.m4
+share/aclocal/lcmessage.m4
+share/aclocal/progtest.m4
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 4fe799a33e2b..449c09f0d30a 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:   gettext
-# Version required:    0.10
+# Version required:    0.10.35
 # Date created:        16 March 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.3 1998/09/23 17:58:38 vanilla Exp $
+# $Id: Makefile,v 1.4 1998/11/18 15:09:35 vanilla Exp $
 #
 
-DISTNAME=	gettext-0.10
+DISTNAME=	gettext-0.10.35
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	ftp://alpha.gnu.ai.mit.edu/gnu/
 
 MAINTAINER=	Nakai@technologist.com
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gnu-gettext
+CONFIGURE_ARGS=	i386--freebsd --with-gnu-gettext
 
 pre-configure:
 	${RM} ${WRKSRC}/doc/gettext.info*
@@ -23,5 +23,7 @@ post-install:
 	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
 	 fi
 	@install-info ${PREFIX}/info/gettext.info ${PREFIX}/info/dir
+	${INSTALL_DATA} ${WRKSRC}/misc/po-mode.el \
+		${PREFIX}/share/gettext/po-mode.el
 
 .include <bsd.port.mk>
diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo
index 6d60ca65ce5c..c78c8247570c 100644
--- a/devel/gettext/distinfo
+++ b/devel/gettext/distinfo
@@ -1 +1 @@
-MD5 (gettext-0.10.tar.gz) = e9d58ee3880feed61b2b8145b5ec519a
+MD5 (gettext-0.10.35.tar.gz) = f29d32b82217b9d89fcda66328752acc
diff --git a/devel/gettext/files/patch-ad b/devel/gettext/files/patch-ad
new file mode 100644
index 000000000000..eea8e9c9deab
--- /dev/null
+++ b/devel/gettext/files/patch-ad
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	Fri May  1 15:47:40 1998
++++ misc/Makefile.in	Fri Aug  7 23:13:23 1998
+@@ -164,10 +164,8 @@
+ 	@list='$(lisp_LISP)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
+ 	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p"; \
+-	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p; \
+ 	  if test -f $${p}c; then \
+ 	    echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c"; \
+-	    $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c; \
+ 	  else : ; fi; \
+ 	done
+ 
diff --git a/devel/gettext/files/patch-ae b/devel/gettext/files/patch-ae
new file mode 100644
index 000000000000..f52804bfa80c
--- /dev/null
+++ b/devel/gettext/files/patch-ae
@@ -0,0 +1,12 @@
+diff -uNr ../gg/configure ./configure
+--- ../gg/configure	Fri May  1 14:48:25 1998
++++ ./configure	Mon Jul 20 12:49:23 1998
+@@ -4004,7 +4004,7 @@
+   ;;
+ esac
+ fi
+-EMACS="$ac_cv_path_EMACS"
++EMACS=no
+ if test -n "$EMACS"; then
+   echo "$ac_t""$EMACS" 1>&6
+ else
diff --git a/devel/gettext/files/patch-af b/devel/gettext/files/patch-af
new file mode 100644
index 000000000000..10096b53055b
--- /dev/null
+++ b/devel/gettext/files/patch-af
@@ -0,0 +1,12 @@
+diff -uNr ../gg/misc/locale.alias ./misc/locale.alias
+--- ../gg/misc/locale.alias	Sun Oct 20 00:40:54 1996
++++ ./misc/locale.alias	Mon Jul 20 12:49:42 1998
+@@ -40,6 +40,7 @@
+ icelandic       is_IS.ISO-8859-1
+ italian         it_CH.ISO-8859-1
+ japanese	ja_JP.EUC
++korean		ko_KR.EUC
+ norwegian       no_NO.ISO-8859-1
+ polish          pl_PL.ISO-8859-2
+ portuguese      pt_PT.ISO-8859-1
+
diff --git a/devel/gettext/pkg-plist b/devel/gettext/pkg-plist
index e2ff60f2fca2..6506cdbf75a0 100644
--- a/devel/gettext/pkg-plist
+++ b/devel/gettext/pkg-plist
@@ -1,54 +1,104 @@
 bin/gettext
-bin/gettextize
 bin/msgcmp
 bin/msgfmt
 bin/msgmerge
 bin/msgunfmt
-bin/tupdate
 bin/xgettext
-include/libintl.h
+bin/msgcomm
+bin/gettextize
 @unexec install-info --delete %D/info/gettext.info %D/info/dir
 info/gettext.info
+info/gettext.info-1
+info/gettext.info-2
+info/gettext.info-3
+info/gettext.info-4
+info/gettext.info-5
 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/gettext.info %D/info/dir
+include/libintl.h
 lib/libintl.a
-share/gettext/aclocal.m4
-share/gettext/intl-ChangeLog
-share/gettext/intl-Makefile.in
-share/gettext/intl-VERSION
-share/gettext/intl-bindtextdom.c
-share/gettext/intl-cat-compat.c
-share/gettext/intl-dcgettext.c
-share/gettext/intl-dgettext.c
-share/gettext/intl-finddomain.c
-share/gettext/intl-gettext.c
-share/gettext/intl-gettext.h
-share/gettext/intl-gettextP.h
-share/gettext/intl-hash-string.h
-share/gettext/intl-intl-compat.c
-share/gettext/intl-libgettext.h
-share/gettext/intl-linux-msg.sed
-share/gettext/intl-loadmsgcat.c
-share/gettext/intl-localealias.c
-share/gettext/intl-po2tbl.sed.in
-share/gettext/intl-textdomain.c
-share/gettext/intl-xopen-msg.sed
-share/gettext/po-Makefile.in.in
-share/gettext/root-ABOUT-NLS
-share/locale/de/LC_MESSAGES/gettext.mo
-share/locale/fr/LC_MESSAGES/gettext.mo
-share/locale/locale.alias
 share/locale/no/LC_MESSAGES/gettext.mo
-share/locale/no@nynorsk/LC_MESSAGES/gettext.mo
-share/locale/sv/LC_MESSAGES/gettext.mo
-@dirrm share/gettext
+@dirrm share/locale/no/LC_MESSAGES
+@dirrm share/locale/no
+share/locale/da/LC_MESSAGES/gettext.mo
+@dirrm share/locale/da/LC_MESSAGES
+@dirrm share/locale/da
+share/locale/de/LC_MESSAGES/gettext.mo
 @dirrm share/locale/de/LC_MESSAGES
 @dirrm share/locale/de
+share/locale/es/LC_MESSAGES/gettext.mo
+@dirrm share/locale/es/LC_MESSAGES
+@dirrm share/locale/es
+share/locale/fr/LC_MESSAGES/gettext.mo
 @dirrm share/locale/fr/LC_MESSAGES
 @dirrm share/locale/fr
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
-@dirrm share/locale/no@nynorsk/LC_MESSAGES
-@dirrm share/locale/no@nynorsk
+share/locale/ko/LC_MESSAGES/gettext.mo
+@dirrm share/locale/ko/LC_MESSAGES
+@dirrm share/locale/ko
+share/locale/nl/LC_MESSAGES/gettext.mo
+@dirrm share/locale/nl/LC_MESSAGES
+@dirrm share/locale/nl
+share/locale/pl/LC_MESSAGES/gettext.mo
+@dirrm share/locale/pl/LC_MESSAGES
+@dirrm share/locale/pl
+share/locale/pt/LC_MESSAGES/gettext.mo
+@dirrm share/locale/pt/LC_MESSAGES
+@dirrm share/locale/pt
+share/locale/sl/LC_MESSAGES/gettext.mo
+@dirrm share/locale/sl/LC_MESSAGES
+@dirrm share/locale/sl
+share/locale/sv/LC_MESSAGES/gettext.mo
 @dirrm share/locale/sv/LC_MESSAGES
 @dirrm share/locale/sv
+share/locale/no@nynorsk/LC_MESSAGES/gettext.mo
+@dirrm share/locale/no@nynorsk/LC_MESSAGES
+@dirrm share/locale/no@nynorsk
+@exec mkdir -p %D/share/locale/ca/LC_MESSAGES
+@dirrm share/locale/ca/LC_MESSAGES
+@dirrm share/locale/ca
+@exec mkdir -p %D/share/locale/cs/LC_MESSAGES
+@dirrm share/locale/cs/LC_MESSAGES
+@dirrm share/locale/cs
+@exec mkdir -p %D/share/locale/it/LC_MESSAGES
+@dirrm share/locale/it/LC_MESSAGES
+@dirrm share/locale/it
+@exec mkdir -p %D/share/locale/ru/LC_MESSAGES
+@dirrm share/locale/ru/LC_MESSAGES
+@dirrm share/locale/ru
+@exec mkdir -p %D/share/locale/tr/LC_MESSAGES
+@dirrm share/locale/tr/LC_MESSAGES
+@dirrm share/locale/tr
+share/locale/locale.alias
+@dirrm share/locale
+share/gettext/intl/VERSION
+share/gettext/intl/ChangeLog
+share/gettext/intl/Makefile.in
+share/gettext/intl/linux-msg.sed
+share/gettext/intl/po2tbl.sed.in
+share/gettext/intl/xopen-msg.sed
+share/gettext/intl/gettext.h
+share/gettext/intl/gettextP.h
+share/gettext/intl/hash-string.h
+share/gettext/intl/libgettext.h
+share/gettext/intl/loadinfo.h
+share/gettext/intl/bindtextdom.c
+share/gettext/intl/dcgettext.c
+share/gettext/intl/dgettext.c
+share/gettext/intl/gettext.c
+share/gettext/intl/finddomain.c
+share/gettext/intl/loadmsgcat.c
+share/gettext/intl/localealias.c
+share/gettext/intl/textdomain.c
+share/gettext/intl/l10nflist.c
+share/gettext/intl/explodename.c
+share/gettext/intl/intl-compat.c
+share/gettext/intl/cat-compat.c
+share/gettext/po/Makefile.in.in
+share/gettext/ABOUT-NLS
+share/gettext/po-mode.el
+@dirrm share/gettext/intl
+@dirrm share/gettext/po
+@dirrm share/gettext
+share/aclocal/gettext.m4
+share/aclocal/lcmessage.m4
+share/aclocal/progtest.m4