Date: Sun, 27 May 2001 11:17:12 +0400 From: Dmitry Sivachenko <demon@freebsd.org> To: reg@freebsd.org Cc: ports@freebsd.org Subject: gettext upgrade Message-ID: <20010527111711.A81208@netserv1.chg.ru>
next in thread | raw e-mail | index | archive | help
Hello!
Please review this patch which upgrades devel/gettext package.
Thanks,
--dima
diff -Nur gettext.old/Makefile gettext/Makefile
--- gettext.old/Makefile Thu Jun 29 19:22:08 2000
+++ gettext/Makefile Sun May 27 11:10:26 2001
@@ -6,23 +6,26 @@
#
PORTNAME= gettext
-PORTVERSION= 0.10.35
+PORTVERSION= 0.10.38
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= gettext
MAINTAINER= reg@FreeBSD.org
+LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv
+
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
+CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE}
PLIST_SUB= LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
-pre-configure:
- ${RM} ${WRKSRC}/doc/gettext.info*
+MAN3= gettext.3 ngettext.3 textdomain.3 bindtextdomain.3 \
+ bind_textdomain_codeset.3 dgettext.3 dcgettext.3 \
+ dngettext.3 dcngettext.3
post-install:
- @install-info ${PREFIX}/info/gettext.info ${PREFIX}/info/dir
${MKDIR} ${PREFIX}/share/emacs/site-lisp
${INSTALL_DATA} ${WRKSRC}/misc/po-mode.el \
${PREFIX}/share/emacs/site-lisp/po-mode.el
diff -Nur gettext.old/distinfo gettext/distinfo
--- gettext.old/distinfo Wed Dec 2 01:38:45 1998
+++ gettext/distinfo Sun May 27 08:52:13 2001
@@ -1 +1 @@
-MD5 (gettext-0.10.35.tar.gz) = f29d32b82217b9d89fcda66328752acc
+MD5 (gettext-0.10.38.tar.gz) = c807f357ea5e5324adf7ad3d52c40c84
diff -Nur gettext.old/files/patch-ad gettext/files/patch-ad
--- gettext.old/files/patch-ad Sun Dec 6 18:30:16 1998
+++ gettext/files/patch-ad Sun May 27 08:56:40 2001
@@ -11,14 +11,3 @@
else : ; fi; \
done
---- doc/Makefile.in.orig Thu Dec 3 20:12:35 1998
-+++ doc/Makefile.in Thu Dec 3 20:12:51 1998
-@@ -79,7 +79,7 @@
- LIBOBJS = @LIBOBJS@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = @MAKEINFO@ --no-split
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
- NM = @NM@
diff -Nur gettext.old/files/patch-ae gettext/files/patch-ae
--- gettext.old/files/patch-ae Sat Jan 22 11:20:01 2000
+++ gettext/files/patch-ae Sun May 27 08:59:03 2001
@@ -1,52 +1,5 @@
--- configure.orig Fri May 1 07:48:25 1998
+++ configure Wed Feb 17 02:05:55 1999
-@@ -837,13 +837,13 @@
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
--if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-- ACLOCAL=aclocal
-- echo "$ac_t""found" 1>&6
--else
-+#if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-+# ACLOCAL=aclocal
-+# echo "$ac_t""found" 1>&6
-+#else
- ACLOCAL="$missing_dir/missing aclocal"
- echo "$ac_t""missing" 1>&6
--fi
-+#fi
-
- echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
- echo "configure:850: checking for working autoconf" >&5
-@@ -863,13 +863,13 @@
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
--if (automake --version) < /dev/null > /dev/null 2>&1; then
-- AUTOMAKE=automake
-- echo "$ac_t""found" 1>&6
--else
-+#if (automake --version) < /dev/null > /dev/null 2>&1; then
-+# AUTOMAKE=automake
-+# echo "$ac_t""found" 1>&6
-+#else
- AUTOMAKE="$missing_dir/missing automake"
- echo "$ac_t""missing" 1>&6
--fi
-+#fi
-
- echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
- echo "configure:876: checking for working autoheader" >&5
-@@ -3958,7 +3958,7 @@
- fi
-
-
-- l=
-+ l=l
-
-
- test -d po || mkdir po
@@ -4004,7 +4004,7 @@
;;
esac
diff -Nur gettext.old/files/patch-af gettext/files/patch-af
--- gettext.old/files/patch-af Sun Dec 6 18:30:16 1998
+++ gettext/files/patch-af Thu Jan 1 03:00:00 1970
@@ -1,10 +0,0 @@
---- misc/locale.alias.orig Sat Oct 19 23:40:54 1996
-+++ misc/locale.alias Thu Dec 3 20:11:52 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 -Nur gettext.old/files/patch-ah gettext/files/patch-ah
--- gettext.old/files/patch-ah Tue Mar 9 04:08:51 1999
+++ gettext/files/patch-ah Thu Jan 1 03:00:00 1970
@@ -1,11 +0,0 @@
---- intl/Makefile.in.orig Wed Feb 17 02:18:40 1999
-+++ intl/Makefile.in Wed Feb 17 02:30:13 1999
-@@ -119,7 +119,7 @@
- $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
- fi; \
- $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
-- $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
-+ $(LIBTOOL) --mode=install $(INSTALL) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
- else \
- : ; \
- fi
diff -Nur gettext.old/files/patch-ai gettext/files/patch-ai
--- gettext.old/files/patch-ai Fri Dec 24 14:33:16 1999
+++ gettext/files/patch-ai Thu Jan 1 03:00:00 1970
@@ -1,12 +0,0 @@
---- m4/gettext.m4.orig Fri Dec 24 20:23:44 1999
-+++ m4/gettext.m4 Fri Dec 24 20:25:52 1999
-@@ -73,6 +73,9 @@
- INSTOBJEXT=.mo
- fi
- fi
-+ if test "$gt_cv_func_gettext_libintl" = "yes"; then
-+ INTLLIBS='-lintl'
-+ fi
- ])
-
- if test "$CATOBJEXT" = "NONE"; then
diff -Nur gettext.old/files/patch-al gettext/files/patch-al
--- gettext.old/files/patch-al Thu Jan 1 03:00:00 1970
+++ gettext/files/patch-al Sun May 27 09:36:52 2001
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig Sun May 27 09:36:04 2001
++++ doc/Makefile.in Sun May 27 09:36:13 2001
+@@ -97,7 +97,7 @@
+ aclocaldir = @aclocaldir@
+ lispdir = @lispdir@
+
+-docdir = $(prefix)/doc/@PACKAGE@
++docdir = $(prefix)/share/doc/@PACKAGE@
+ dvidir = $(docdir)
+ psdir = $(docdir)
+ pdfdir = $(docdir)
diff -Nur gettext.old/files/patch-am gettext/files/patch-am
--- gettext.old/files/patch-am Thu Jan 1 03:00:00 1970
+++ gettext/files/patch-am Sun May 27 10:15:48 2001
@@ -0,0 +1,11 @@
+--- man/Makefile.in.orig Sun May 27 10:14:59 2001
++++ man/Makefile.in Sun May 27 10:15:08 2001
+@@ -101,7 +101,7 @@
+
+ VERSION = @VERSION@
+ mandir = @mandir@
+-docdir = $(prefix)/doc/@PACKAGE@
++docdir = $(prefix)/share/doc/@PACKAGE@
+ htmldir = $(docdir)
+
+ AUTOMAKE_OPTIONS = 1.2 gnits
diff -Nur gettext.old/files/patch-an gettext/files/patch-an
--- gettext.old/files/patch-an Thu Jan 1 03:00:00 1970
+++ gettext/files/patch-an Sun May 27 11:05:28 2001
@@ -0,0 +1,19 @@
+--- intl/Makefile.in.orig Tue May 22 20:57:19 2001
++++ intl/Makefile.in Sun May 27 11:04:40 2001
+@@ -151,11 +151,11 @@
+ : ; \
+ fi
+ if test '@USE_INCLUDED_LIBINTL@' = yes; then \
+- $(mkinstalldirs) $(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; \
++ $(mkinstalldirs) $(DESTDIR)$(datadir)/gettext; \
++ temp=$(DESTDIR)$(datadir)/gettext/t-charset.alias; \
++ dest=$(DESTDIR)$(datadir)/gettext/charset.alias; \
++ if test -f $(DESTDIR)$(datadir)/gettext/charset.alias; then \
++ orig=$(DESTDIR)$(datadir)/gettext/charset.alias; \
+ sed -f ref-add.sed $$orig > $$temp; \
+ $(INSTALL_DATA) $$temp $$dest; \
+ rm -f $$temp; \
diff -Nur gettext.old/pkg-plist gettext/pkg-plist
--- gettext.old/pkg-plist Fri Jun 16 14:37:52 2000
+++ gettext/pkg-plist Sun May 27 11:13:42 2001
@@ -5,42 +5,62 @@
bin/msgfmt
bin/msgmerge
bin/msgunfmt
+bin/ngettext
bin/xgettext
+include/libintl.h
@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 install-info %D/info/gettext.info %D/info/dir
-include/libintl.h
-lib/libintl.a
-lib/libintl.so
lib/libintl.so.1
+lib/libintl.so
+lib/libintl.a
+share/emacs/site-lisp/po-mode.el
share/aclocal/gettext.m4
share/aclocal/lcmessage.m4
share/aclocal/progtest.m4
-share/gettext/ABOUT-NLS
-share/gettext/po/Makefile.in.in
+share/aclocal/codeset.m4
+share/aclocal/glibc21.m4
+share/aclocal/iconv.m4
+share/aclocal/isc-posix.m4
+share/gettext/intl/VERSION
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/explodename.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/l10nflist.c
share/gettext/intl/libgettext.h
-share/gettext/intl/linux-msg.sed
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/po2tbl.sed.in
-share/gettext/intl/xopen-msg.sed
share/gettext/intl/textdomain.c
+share/gettext/intl/l10nflist.c
+share/gettext/intl/explodename.c
+share/gettext/intl/intl-compat.c
+share/gettext/intl/config.charset
+share/gettext/intl/locale.alias
+share/gettext/intl/ref-add.sin
+share/gettext/intl/ref-del.sin
+share/gettext/intl/libgnuintl.h
+share/gettext/intl/dcigettext.c
+share/gettext/intl/dcngettext.c
+share/gettext/intl/dngettext.c
+share/gettext/intl/ngettext.c
+share/gettext/intl/plural.y
+share/gettext/intl/localcharset.c
+share/gettext/intl/plural.c
+share/gettext/po/Makefile.in.in
+share/gettext/ABOUT-NLS
+share/gettext/charset.alias
share/locale/da/LC_MESSAGES/gettext.mo
share/locale/de/LC_MESSAGES/gettext.mo
share/locale/es/LC_MESSAGES/gettext.mo
@@ -48,13 +68,47 @@
share/locale/ko/LC_MESSAGES/gettext.mo
share/locale/nl/LC_MESSAGES/gettext.mo
share/locale/no/LC_MESSAGES/gettext.mo
-share/locale/no@nynorsk/LC_MESSAGES/gettext.mo
share/locale/pl/LC_MESSAGES/gettext.mo
share/locale/pt/LC_MESSAGES/gettext.mo
share/locale/sl/LC_MESSAGES/gettext.mo
share/locale/sv/LC_MESSAGES/gettext.mo
+share/locale/ru/LC_MESSAGES/gettext.mo
+share/locale/cs/LC_MESSAGES/gettext.mo
+share/locale/el/LC_MESSAGES/gettext.mo
+share/locale/nn/LC_MESSAGES/gettext.mo
+share/locale/it/LC_MESSAGES/gettext.mo
+share/locale/ja/LC_MESSAGES/gettext.mo
+share/locale/pt_BR/LC_MESSAGES/gettext.mo
+share/locale/tr/LC_MESSAGES/gettext.mo
+share/locale/en@quot/LC_MESSAGES/gettext.mo
+share/locale/gl/LC_MESSAGES/gettext.mo
+share/locale/et/LC_MESSAGES/gettext.mo
+share/locale/zh/LC_MESSAGES/gettext.mo
+share/locale/en@boldquot/LC_MESSAGES/gettext.mo
+share/locale/id/LC_MESSAGES/gettext.mo
share/locale/locale.alias
-share/emacs/site-lisp/po-mode.el
+share/doc/gettext/gettext_1.html
+share/doc/gettext/gettext_10.html
+share/doc/gettext/gettext_11.html
+share/doc/gettext/gettext_12.html
+share/doc/gettext/gettext_13.html
+share/doc/gettext/gettext_14.html
+share/doc/gettext/gettext_2.html
+share/doc/gettext/gettext_3.html
+share/doc/gettext/gettext_4.html
+share/doc/gettext/gettext_5.html
+share/doc/gettext/gettext_6.html
+share/doc/gettext/gettext_7.html
+share/doc/gettext/gettext_8.html
+share/doc/gettext/gettext_9.html
+share/doc/gettext/gettext_foot.html
+share/doc/gettext/gettext_toc.html
+share/doc/gettext/gettext.3.html
+share/doc/gettext/ngettext.3.html
+share/doc/gettext/textdomain.3.html
+share/doc/gettext/bindtextdomain.3.html
+share/doc/gettext/bind_textdomain_codeset.3.html
+@dirrm share/doc/gettext
@dirrm share/gettext/intl
@dirrm share/gettext/po
@dirrm share/gettext
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010527111711.A81208>