From 5db2b1e09c8fa682683ebcb216bedf6f4c488aa6 Mon Sep 17 00:00:00 2001 From: drochner Date: Wed, 27 Nov 2002 17:41:05 +0000 Subject: bite the bullet and upgrade to 0.11.5 There are too many changes to list in a sensible way. The most visible change for me is that libintl requires libiconv now. Also untangled the 3 sub-pkgs -- a common patch dir makes it too complex. This pkg used to expose buildlink2 problems - the pkg libintl was pulled in in cases where USE_GNU_GETTEXT was not set. There were some improvements to libtool filtering, and x11/gtk builds now, so I hope this is settled. --- devel/gettext/Makefile | 21 ++--- devel/gettext/PLIST | 171 ++++++++++++++++++++++++++++++++++++++--- devel/gettext/distinfo | 22 ++---- devel/gettext/patches/patch-aa | 42 +++++----- devel/gettext/patches/patch-ab | 20 ++--- devel/gettext/patches/patch-ac | 17 ++-- devel/gettext/patches/patch-ad | 60 --------------- devel/gettext/patches/patch-ae | 51 ------------ devel/gettext/patches/patch-af | 34 -------- devel/gettext/patches/patch-ag | 27 ------- devel/gettext/patches/patch-ah | 26 ------- devel/gettext/patches/patch-ai | 83 ++++++-------------- devel/gettext/patches/patch-aj | 25 +++--- devel/gettext/patches/patch-ak | 28 ------- 14 files changed, 252 insertions(+), 375 deletions(-) delete mode 100644 devel/gettext/patches/patch-ad delete mode 100644 devel/gettext/patches/patch-ae delete mode 100644 devel/gettext/patches/patch-af delete mode 100644 devel/gettext/patches/patch-ag delete mode 100644 devel/gettext/patches/patch-ah delete mode 100644 devel/gettext/patches/patch-ak (limited to 'devel/gettext') diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index a08e784a9f4..d6fdba84aa5 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.37 2002/08/28 06:50:35 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2002/11/27 17:41:05 drochner Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp # -DISTNAME= gettext-0.10.35 -PKGREVISION= 2 +DISTNAME= gettext-0.11.5 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=gettext/} @@ -11,31 +10,27 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/gettext/gettext.html COMMENT= tools for providing messages in different languages -DEPENDS+= gettext-m4-0.10.35:../../devel/gettext-m4 +DEPENDS+= gettext-m4-0.11.5:../../devel/gettext-m4 USE_BUILDLINK2= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIG_GUESS_OVERRIDE= ${WRKSRC}/config.guess CONFIG_SUB_OVERRIDE= ${WRKSRC}/config.sub CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" +USE_GNU_GETTEXT= yes +CONFIGURE_ARGS+= --without-included-gettext +CONFIGURE_ARGS+= --with-libintl-prefix=${BUILDLINK_PREFIX.gettext} INFO_FILES= gettext.info TEXINFO_OVERRIDE= YES -post-patch: - ${RM} -f ${WRKSRC}/intl/libgettext.h - ${RM} -f ${WRKSRC}/intl/libintl.h - ${CP} ${FILESDIR}/libgettext.h ${WRKSRC}/intl - -post-configure: - ${RM} -f ${WRKSRC}/intl/libintl.h - post-install: cd ${WRKSRC}/intl; ${MAKE_PROGRAM} install-data .include "../../devel/gettext-lib/buildlink2.mk" +.include "../../converters/libiconv/buildlink2.mk" .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gettext/PLIST b/devel/gettext/PLIST index 82472334cf8..a98ca1352c0 100644 --- a/devel/gettext/PLIST +++ b/devel/gettext/PLIST @@ -1,58 +1,207 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:10 seb Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/11/27 17:41:05 drochner Exp $ +bin/autopoint bin/gettext bin/gettextize +bin/msgattrib +bin/msgcat bin/msgcmp bin/msgcomm +bin/msgconv +bin/msgen +bin/msgexec +bin/msgfilter bin/msgfmt +bin/msggrep +bin/msginit bin/msgmerge bin/msgunfmt +bin/msguniq +bin/ngettext bin/xgettext -@unexec ${INSTALL_INFO} --delete %D/info/gettext.info %D/info/dir +doc/gettext/autopoint.1.html +doc/gettext/bind_textdomain_codeset.3.html +doc/gettext/bindtextdomain.3.html +doc/gettext/gettext.1.html +doc/gettext/gettext.3.html +doc/gettext/gettext_1.html +doc/gettext/gettext_10.html +doc/gettext/gettext_11.html +doc/gettext/gettext_12.html +doc/gettext/gettext_13.html +doc/gettext/gettext_14.html +doc/gettext/gettext_15.html +doc/gettext/gettext_16.html +doc/gettext/gettext_17.html +doc/gettext/gettext_18.html +doc/gettext/gettext_19.html +doc/gettext/gettext_2.html +doc/gettext/gettext_20.html +doc/gettext/gettext_21.html +doc/gettext/gettext_22.html +doc/gettext/gettext_3.html +doc/gettext/gettext_4.html +doc/gettext/gettext_5.html +doc/gettext/gettext_6.html +doc/gettext/gettext_7.html +doc/gettext/gettext_8.html +doc/gettext/gettext_9.html +doc/gettext/gettext_foot.html +doc/gettext/gettext_toc.html +doc/gettext/gettextize.1.html +doc/gettext/msgattrib.1.html +doc/gettext/msgcat.1.html +doc/gettext/msgcmp.1.html +doc/gettext/msgcomm.1.html +doc/gettext/msgconv.1.html +doc/gettext/msgen.1.html +doc/gettext/msgexec.1.html +doc/gettext/msgfilter.1.html +doc/gettext/msgfmt.1.html +doc/gettext/msggrep.1.html +doc/gettext/msginit.1.html +doc/gettext/msgmerge.1.html +doc/gettext/msgunfmt.1.html +doc/gettext/msguniq.1.html +doc/gettext/ngettext.1.html +doc/gettext/ngettext.3.html +doc/gettext/textdomain.3.html +doc/gettext/xgettext.1.html +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gettext.info info/gettext.info info/gettext.info-1 +info/gettext.info-10 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 +info/gettext.info-6 +info/gettext.info-7 +info/gettext.info-8 +info/gettext.info-9 +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gettext.info +lib/gettext/hostname +lib/gettext/project-id +lib/gettext/urlget +lib/gettext/user-email +lib/libgettextlib-${PKGVERSION}.so +lib/libgettextlib.la +lib/libgettextlib.so +lib/libgettextsrc-${PKGVERSION}.so +lib/libgettextsrc.la +lib/libgettextsrc.so +man/man1/autopoint.1 +man/man1/gettext.1 +man/man1/gettextize.1 +man/man1/msgattrib.1 +man/man1/msgcat.1 +man/man1/msgcmp.1 +man/man1/msgcomm.1 +man/man1/msgconv.1 +man/man1/msgen.1 +man/man1/msgexec.1 +man/man1/msgfilter.1 +man/man1/msgfmt.1 +man/man1/msggrep.1 +man/man1/msginit.1 +man/man1/msgmerge.1 +man/man1/msgunfmt.1 +man/man1/msguniq.1 +man/man1/ngettext.1 +man/man1/xgettext.1 +man/man3/bind_textdomain_codeset.3 +man/man3/bindtextdomain.3 +man/man3/dcgettext.3 +man/man3/dcngettext.3 +man/man3/dgettext.3 +man/man3/dngettext.3 +man/man3/gettext.3 +man/man3/ngettext.3 +man/man3/textdomain.3 share/gettext/ABOUT-NLS +share/gettext/archive.tar.gz +share/gettext/config.rpath +share/gettext/gettext.h +share/gettext/intl/COPYING.LIB-2.0 +share/gettext/intl/COPYING.LIB-2.1 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/config.charset share/gettext/intl/dcgettext.c +share/gettext/intl/dcigettext.c +share/gettext/intl/dcngettext.c share/gettext/intl/dgettext.c +share/gettext/intl/dngettext.c +share/gettext/intl/eval-plural.h 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/gmo.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/libgnuintl.h share/gettext/intl/loadinfo.h share/gettext/intl/loadmsgcat.c +share/gettext/intl/localcharset.c +share/gettext/intl/locale.alias share/gettext/intl/localealias.c -share/gettext/intl/po2tbl.sed.in +share/gettext/intl/localename.c +share/gettext/intl/ngettext.c +share/gettext/intl/os2compat.c +share/gettext/intl/os2compat.h +share/gettext/intl/osdep.c +share/gettext/intl/plural-exp.c +share/gettext/intl/plural-exp.h +share/gettext/intl/plural.c +share/gettext/intl/plural.y +share/gettext/intl/ref-add.sin +share/gettext/intl/ref-del.sin share/gettext/intl/textdomain.c -share/gettext/intl/xopen-msg.sed +share/gettext/mkinstalldirs +share/gettext/msgunfmt.tcl share/gettext/po/Makefile.in.in -share/locale/locale.alias +share/gettext/po/Makevars +share/gettext/po/Rules-quot +share/gettext/po/boldquot.sed +share/gettext/po/en@boldquot.header +share/gettext/po/en@quot.header +share/gettext/po/insert-header.sin +share/gettext/po/quot.sed +share/gettext/po/remove-potcdate.sin +${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gettext.mo +${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gettext.mo +${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gettext.mo ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gettext.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gettext.mo +${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gettext.mo +${PKGLOCALEDIR}/locale/en@boldquot/LC_MESSAGES/gettext.mo +${PKGLOCALEDIR}/locale/en@quot/LC_MESSAGES/gettext.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gettext.mo +${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gettext.mo +${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gettext.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gettext.mo +${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gettext.mo +${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gettext.mo +${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gettext.mo +${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gettext.mo ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gettext.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gettext.mo +${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gettext.mo ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gettext.mo -${PKGLOCALEDIR}/locale/no@nynorsk/LC_MESSAGES/gettext.mo ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gettext.mo ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gettext.mo +${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gettext.mo +${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gettext.mo +${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gettext.mo ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gettext.mo ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gettext.mo +${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gettext.mo +${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gettext.mo @dirrm share/gettext/po @dirrm share/gettext/intl @dirrm share/gettext +@dirrm lib/gettext +@dirrm doc/gettext diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo index d43d48bed23..52a57175e5f 100644 --- a/devel/gettext/distinfo +++ b/devel/gettext/distinfo @@ -1,15 +1,9 @@ -$NetBSD: distinfo,v 1.5 2002/08/19 19:20:31 seb Exp $ +$NetBSD: distinfo,v 1.6 2002/11/27 17:41:05 drochner Exp $ -SHA1 (gettext-0.10.35.tar.gz) = fcf5aedd794b45f9a63cb30deba96e842cc2d77c -Size (gettext-0.10.35.tar.gz) = 713694 bytes -SHA1 (patch-aa) = 059c972c3a1de3801b7369715c18183f483a4b03 -SHA1 (patch-ab) = aa7e3c08b3b598d48c768bea0d7afe9e375c4174 -SHA1 (patch-ac) = 78ddaf89f7f069751097c6a692a04dbaf9a3914f -SHA1 (patch-ad) = c30246c62ad2a3809f092d4e83747a781437fc8c -SHA1 (patch-ae) = a5b82ab8b98c34a8889d60fd9cb224bc1ccdd4d0 -SHA1 (patch-af) = 1e93d62e848f3dd6d902c0c91b32bb593f3afc43 -SHA1 (patch-ag) = 72e94b26e72ff9d3a7af01304e1854fe48b1b5de -SHA1 (patch-ah) = 2822c9d3a6e9f2a9ae0d4b5ed5c25525e3d4f34d -SHA1 (patch-ai) = dd77fb17fae639152ae1deca233f3a56629ecaea -SHA1 (patch-aj) = d0f2f662d895c015f85df0eedd4cc7d2e4170122 -SHA1 (patch-ak) = ab2ecc0805258b029782f51a357e0b8c8abd02fa +SHA1 (gettext-0.11.5.tar.gz) = 4d17534afac106bc0f2310a9fd77a291d433234b +Size (gettext-0.11.5.tar.gz) = 3724099 bytes +SHA1 (patch-aa) = 0b0b2fe55a10db61431f7217b804e4540581263d +SHA1 (patch-ab) = 6e9eec0ff3bbab05df5a6b513ee9f8d3b39ad385 +SHA1 (patch-ac) = 1703e08d31fb31b99f6496ef56f4c405f1baefab +SHA1 (patch-ai) = 97b824ed5e8b776a6b9e5a75287c6349e8e345d4 +SHA1 (patch-aj) = 8c8cf6fcc6f23a54b5e20e1ab741d4a7d92a11a7 diff --git a/devel/gettext/patches/patch-aa b/devel/gettext/patches/patch-aa index 2eb0197f563..3a7c90b55ff 100644 --- a/devel/gettext/patches/patch-aa +++ b/devel/gettext/patches/patch-aa @@ -1,24 +1,24 @@ -$NetBSD: patch-aa,v 1.8 2002/08/19 19:20:32 seb Exp $ +$NetBSD: patch-aa,v 1.9 2002/11/27 17:41:06 drochner Exp $ -Build shared libintl. And force directory for locale date. - ---- configure.orig Fri May 1 07:48:25 1998 -+++ configure -@@ -3690,7 +3690,7 @@ fi - USE_INCLUDED_LIBINTL=yes - CATOBJEXT=.cat - INSTOBJEXT=.cat -- DATADIRNAME=lib -+ DATADIRNAME=${PKGLOCALEDIR} - INTLDEPS='$(top_builddir)/intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` -@@ -3958,7 +3958,7 @@ fi - fi - +--- configure.orig Tue Aug 6 15:57:16 2002 ++++ configure Sun Sep 1 16:06:20 2002 +@@ -14293,10 +14293,6 @@ + if test "$nls_cv_use_gnu_gettext" = "yes"; then + INTLOBJS="\$(GETTOBJS)" + BUILD_INCLUDED_LIBINTL=yes +- USE_INCLUDED_LIBINTL=yes +- LIBINTL="\${top_builddir}/intl/libintl.la $LIBICONV" +- LTLIBINTL="\${top_builddir}/intl/libintl.la $LTLIBICONV" +- LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` + fi + + if test "$gt_use_preinstalled_gnugettext" = "yes" \ +@@ -14369,7 +14365,7 @@ + nls_cv_header_intl= + nls_cv_header_libgt= + +- DATADIRNAME=share ++ DATADIRNAME=${PKGLOCALEDIR} -- l= -+ l=l - + INSTOBJEXT=.mo - test -d po || mkdir po diff --git a/devel/gettext/patches/patch-ab b/devel/gettext/patches/patch-ab index 04132e10225..eedd52a4d49 100644 --- a/devel/gettext/patches/patch-ab +++ b/devel/gettext/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.4 1998/12/28 20:18:13 tron Exp $ +$NetBSD: patch-ab,v 1.5 2002/11/27 17:41:06 drochner Exp $ ---- misc/Makefile.in.orig Fri May 1 08:47:40 1998 -+++ misc/Makefile.in Tue Dec 22 23:49:22 1998 -@@ -232,7 +232,7 @@ - install-exec: install-binSCRIPTS - @$(NORMAL_INSTALL) +--- misc/Makefile.in.orig Tue Aug 6 16:00:33 2002 ++++ misc/Makefile.in Sun Sep 1 14:12:13 2002 +@@ -342,7 +342,7 @@ --install-data: install-lispLISP install-localeDATA -+install-data: install-localeDATA - @$(NORMAL_INSTALL) + info-am: + +-install-data-am: install-gettextsrcDATA install-lispLISP ++install-data-am: install-gettextsrcDATA + + install-exec-am: install-binSCRIPTS - install: install-exec install-data all diff --git a/devel/gettext/patches/patch-ac b/devel/gettext/patches/patch-ac index ea4848e55d9..4174a7f8dc6 100644 --- a/devel/gettext/patches/patch-ac +++ b/devel/gettext/patches/patch-ac @@ -1,18 +1,13 @@ -$NetBSD: patch-ac,v 1.3 2002/08/19 19:20:32 seb Exp $ +$NetBSD: patch-ac,v 1.4 2002/11/27 17:41:06 drochner Exp $ ---- intl/Makefile.in.orig Mon Apr 27 23:53:18 1998 -+++ intl/Makefile.in -@@ -119,11 +119,11 @@ install-exec: all - $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \ - fi; \ - $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \ -- $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \ -+ $(LIBTOOL) --mode=install ${INSTALL_DATA} libintl.la $(libdir); \ +--- intl/Makefile.in.orig Thu Jul 25 14:49:57 2002 ++++ intl/Makefile.in Sun Sep 1 14:13:47 2002 +@@ -181,7 +181,7 @@ else \ : ; \ fi -install-data: all +install-data: if test "$(PACKAGE)" = "gettext"; then \ - if test -r $(MKINSTALLDIRS); then \ - $(MKINSTALLDIRS) $(gettextsrcdir); \ + $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ + $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \ diff --git a/devel/gettext/patches/patch-ad b/devel/gettext/patches/patch-ad deleted file mode 100644 index 896a8f32f59..00000000000 --- a/devel/gettext/patches/patch-ad +++ /dev/null @@ -1,60 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2000/06/30 17:07:36 danw Exp $ - -Fixes from glibc - ---- intl/dcgettext.c.orig Fri Jun 23 03:13:56 2000 -+++ intl/dcgettext.c Fri Jun 23 03:42:33 2000 -@@ -217,6 +217,17 @@ - # define DCGETTEXT dcgettext__ - #endif - -+static int enable_secure; -+# define ENABLE_SECURE (enable_secure == 1) -+# define DETERMINE_SECURE \ -+ if (enable_secure == 0) \ -+ { \ -+ if (getuid () != geteuid () || getgid () != getegid ()) \ -+ enable_secure = 1; \ -+ else \ -+ enable_secure = -1; \ -+ } -+ - /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY - locale. */ - char * -@@ -241,6 +252,9 @@ - if (msgid == NULL) - return NULL; - -+ /* See whether this is a SUID binary or not. */ -+ DETERMINE_SECURE; -+ - /* If DOMAINNAME is NULL, we are interested in the default domain. If - CATEGORY is not LC_MESSAGES this might not make much sense but the - defintion left this undefined. */ -@@ -339,6 +353,15 @@ - while (categoryvalue[0] != '\0' && categoryvalue[0] != ':') - *cp++ = *categoryvalue++; - *cp = '\0'; -+ -+ /* When this is a SUID binary we must not allow accessing files -+ outside the dedicated directories. */ -+ if (ENABLE_SECURE -+ && (memchr (single_locale, '/', -+ _nl_find_language (single_locale) - single_locale) -+ != NULL)) -+ /* Ignore this entry. */ -+ continue; - } - - /* If the current locale value is C (or POSIX) we don't load a -@@ -396,7 +419,8 @@ - struct loaded_l10nfile *domain_file; - const char *msgid; - { -- size_t top, act, bottom; -+ size_t act = 0; -+ size_t top, bottom; - struct loaded_domain *domain; - - if (domain_file->decided == 0) diff --git a/devel/gettext/patches/patch-ae b/devel/gettext/patches/patch-ae deleted file mode 100644 index 80a7b1fecb1..00000000000 --- a/devel/gettext/patches/patch-ae +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2000/06/30 17:07:36 danw Exp $ - ---- intl/explodename.c.orig Fri Jun 23 03:21:26 2000 -+++ intl/explodename.c Fri Jun 23 03:50:55 2000 -@@ -43,6 +43,17 @@ - - /* @@ end of prolog @@ */ - -+char * -+_nl_find_language (const char *name) -+{ -+ while (name[0] != '\0' && name[0] != '_' && name[0] != '@' -+ && name[0] != '+' && name[0] != ',') -+ ++name; -+ -+ return (char *) name; -+} -+ -+ - int - _nl_explode_name (name, language, modifier, territory, codeset, - normalized_codeset, special, sponsor, revision) -@@ -51,7 +62,7 @@ - const char **modifier; - const char **territory; - const char **codeset; -- const char **normalized_codeset; -+ char **normalized_codeset; - const char **special; - const char **sponsor; - const char **revision; -@@ -74,9 +85,7 @@ - mask = 0; - syntax = undecided; - *language = cp = name; -- while (cp[0] != '\0' && cp[0] != '_' && cp[0] != '@' -- && cp[0] != '+' && cp[0] != ',') -- ++cp; -+ cp = _nl_find_language (*language); - - if (*language == cp) - /* This does not make sense: language has to be specified. Use -@@ -111,7 +120,7 @@ - *normalized_codeset = _nl_normalize_codeset (*codeset, - cp - *codeset); - if (strcmp (*codeset, *normalized_codeset) == 0) -- free ((char *) *normalized_codeset); -+ free (*normalized_codeset); - else - mask |= XPG_NORM_CODESET; - } diff --git a/devel/gettext/patches/patch-af b/devel/gettext/patches/patch-af deleted file mode 100644 index ab643a92474..00000000000 --- a/devel/gettext/patches/patch-af +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-af,v 1.1 2000/06/30 17:07:36 danw Exp $ - -Fixes from glibc - ---- intl/finddomain.c.orig Fri Jun 23 03:23:00 2000 -+++ intl/finddomain.c Fri Jun 23 04:18:34 2000 -@@ -81,7 +81,7 @@ - const char *modifier; - const char *territory; - const char *codeset; -- const char *normalized_codeset; -+ char *normalized_codeset; - const char *special; - const char *sponsor; - const char *revision; -@@ -192,6 +192,10 @@ - if (alias_value != NULL) - free (locale); - -+ /* The space for normalized_codeset is dynamically allocated. Free it. */ -+ if (mask & XPG_NORM_CODESET) -+ free (normalized_codeset); -+ - return retval; - } - -@@ -208,6 +212,7 @@ - if (runp->data != NULL) - _nl_unload_domain ((struct loaded_domain *) runp->data); - runp = runp->next; -+ free (here->filename); - free (here); - } - } diff --git a/devel/gettext/patches/patch-ag b/devel/gettext/patches/patch-ag deleted file mode 100644 index 7d858048d19..00000000000 --- a/devel/gettext/patches/patch-ag +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2002/07/21 19:26:30 schmonz Exp $ - -Fix inspired by glibc, which gets it wrong. - ---- intl/l10nflist.c.orig Wed Apr 29 12:38:06 1998 -+++ intl/l10nflist.c -@@ -349,8 +349,9 @@ _nl_make_l10nflist (l10nfile_list, dirli - - /* Normalize codeset name. There is no standard for the codeset - names. Normalization allows the user to use any of the common -- names. */ --const char * -+ names. The return value is dynamically allocated and has to be -+ freed by the caller. */ -+char * - _nl_normalize_codeset (codeset, name_len) - const unsigned char *codeset; - size_t name_len; -@@ -388,7 +389,7 @@ _nl_normalize_codeset (codeset, name_len - *wp = '\0'; - } - -- return (const char *) retval; -+ return retval; - } - - diff --git a/devel/gettext/patches/patch-ah b/devel/gettext/patches/patch-ah deleted file mode 100644 index c1c0e229d41..00000000000 --- a/devel/gettext/patches/patch-ah +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2000/06/30 17:07:36 danw Exp $ - ---- intl/loadinfo.h.orig Fri Jun 23 03:27:25 2000 -+++ intl/loadinfo.h Fri Jun 23 03:52:01 2000 -@@ -50,8 +50,8 @@ - }; - - --extern const char *_nl_normalize_codeset PARAMS ((const unsigned char *codeset, -- size_t name_len)); -+extern char *_nl_normalize_codeset PARAMS ((const unsigned char *codeset, -+ size_t name_len)); - - extern struct loaded_l10nfile * - _nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list, -@@ -70,7 +70,9 @@ - const char **modifier, - const char **territory, - const char **codeset, -- const char **normalized_codeset, -+ char **normalized_codeset, - const char **special, - const char **sponsor, - const char **revision)); -+ -+extern char *_nl_find_language PARAMS ((const char *name)); diff --git a/devel/gettext/patches/patch-ai b/devel/gettext/patches/patch-ai index 473b39a007e..6771c00f6c4 100644 --- a/devel/gettext/patches/patch-ai +++ b/devel/gettext/patches/patch-ai @@ -1,63 +1,26 @@ -$NetBSD: patch-ai,v 1.1 2000/10/31 17:06:18 itojun Exp $ +$NetBSD: patch-ai,v 1.2 2002/11/27 17:41:07 drochner Exp $ -use already-installed libintl, not in-tree libintl - ---- src/Makefile.in.orig Fri May 1 15:47:25 1998 -+++ src/Makefile.in Wed Nov 1 01:25:11 2000 -@@ -108,7 +108,7 @@ - - INCLUDES = -I$(srcdir) -I.. -I$(top_srcdir)/lib -I../intl -I$(top_srcdir)/intl - DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ --LDADD = ../lib/libnlsut.a ../intl/libintl.$la -+LDADD = ../lib/libnlsut.a +--- src/Makefile.in.orig Tue Aug 6 15:59:06 2002 ++++ src/Makefile.in Sun Sep 1 16:27:46 2002 +@@ -267,9 +267,7 @@ + msgexec_LDADD = libgettextsrc.la + msgfilter_LDADD = libgettextsrc.la + msggrep_LDADD = libgettextsrc.la +-msginit_LDADD = ../intl/localealias.@INTL_LIBTOOL_SUFFIX_PREFIX@o \ +- ../intl/localename.@INTL_LIBTOOL_SUFFIX_PREFIX@o \ +- libgettextsrc.la ++msginit_LDADD = libgettextsrc.la - SED = sed - YACC = @YACC@ -@@ -136,39 +136,39 @@ + msguniq_LDADD = libgettextsrc.la - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ -lintl - gettext_OBJECTS = gettextp.o - gettext_LDADD = $(LDADD) --gettext_DEPENDENCIES = ../lib/libnlsut.a ../intl/libintl.$la -+gettext_DEPENDENCIES = ../lib/libnlsut.a - gettext_LDFLAGS = - msgcmp_OBJECTS = message.o msgcmp.o open-po.o po-gram.gen.o \ - po-hash.gen.o po-lex.o po.o str-list.o dir-list.o - msgcmp_LDADD = $(LDADD) --msgcmp_DEPENDENCIES = ../lib/libnlsut.a ../intl/libintl.$la -+msgcmp_DEPENDENCIES = ../lib/libnlsut.a - msgcmp_LDFLAGS = - msgfmt_OBJECTS = msgfmt.o open-po.o po-gram.gen.o po-hash.gen.o \ - po-lex.o po.o str-list.o message.o dir-list.o - msgfmt_LDADD = $(LDADD) --msgfmt_DEPENDENCIES = ../lib/libnlsut.a ../intl/libintl.$la -+msgfmt_DEPENDENCIES = ../lib/libnlsut.a - msgfmt_LDFLAGS = - msgmerge_OBJECTS = message.o msgmerge.o open-po.o po-gram.gen.o \ - po-hash.gen.o po-lex.o po.o str-list.o dir-list.o - msgmerge_LDADD = $(LDADD) --msgmerge_DEPENDENCIES = ../lib/libnlsut.a ../intl/libintl.$la -+msgmerge_DEPENDENCIES = ../lib/libnlsut.a - msgmerge_LDFLAGS = - msgunfmt_OBJECTS = message.o msgunfmt.o str-list.o - msgunfmt_LDADD = $(LDADD) --msgunfmt_DEPENDENCIES = ../lib/libnlsut.a ../intl/libintl.$la -+msgunfmt_DEPENDENCIES = ../lib/libnlsut.a - msgunfmt_LDFLAGS = - xgettext_OBJECTS = message.o open-po.o po-gram.gen.o po-hash.gen.o \ - po-lex.o po.o str-list.o xget-lex.o xgettext.o dir-list.o - xgettext_LDADD = $(LDADD) --xgettext_DEPENDENCIES = ../lib/libnlsut.a ../intl/libintl.$la -+xgettext_DEPENDENCIES = ../lib/libnlsut.a - xgettext_LDFLAGS = - msgcomm_OBJECTS = msgcomm.o message.o po-gram.gen.o po-hash.gen.o \ - po-lex.o open-po.o po.o str-list.o dir-list.o - msgcomm_LDADD = $(LDADD) --msgcomm_DEPENDENCIES = ../lib/libnlsut.a ../intl/libintl.$la -+msgcomm_DEPENDENCIES = ../lib/libnlsut.a - msgcomm_LDFLAGS = - CFLAGS = @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +@@ -367,9 +365,7 @@ + msggrep_LDFLAGS = + am_msginit_OBJECTS = msginit.$(OBJEXT) + msginit_OBJECTS = $(am_msginit_OBJECTS) +-msginit_DEPENDENCIES = ../intl/localealias.@INTL_LIBTOOL_SUFFIX_PREFIX@o \ +- ../intl/localename.@INTL_LIBTOOL_SUFFIX_PREFIX@o \ +- libgettextsrc.la ++msginit_DEPENDENCIES = libgettextsrc.la + msginit_LDFLAGS = + am_msgmerge_OBJECTS = msgmerge.$(OBJEXT) + msgmerge_OBJECTS = $(am_msgmerge_OBJECTS) diff --git a/devel/gettext/patches/patch-aj b/devel/gettext/patches/patch-aj index d0fe6906ef3..f21b3f02d3a 100644 --- a/devel/gettext/patches/patch-aj +++ b/devel/gettext/patches/patch-aj @@ -1,13 +1,20 @@ -$NetBSD: patch-aj,v 1.2 2001/06/16 03:34:39 jlam Exp $ +$NetBSD: patch-aj,v 1.3 2002/11/27 17:41:07 drochner Exp $ ---- Makefile.in- Wed Nov 1 01:32:40 2000 -+++ Makefile.in Wed Nov 1 01:32:49 2000 -@@ -103,7 +103,7 @@ +--- Makefile.in.orig Tue Aug 6 15:57:07 2002 ++++ Makefile.in Sun Sep 1 16:51:37 2002 +@@ -149,13 +149,13 @@ + AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies + ACLOCAL_AMFLAGS = -I m4 + +-MAKEINFO = env LANG= LANGUAGE= @MAKEINFO@ ++MAKEINFO = env LANG= LANGUAGE= /usr/bin/makeinfo + + gettextsrcdir = $(datadir)/gettext gettextsrc_DATA = ABOUT-NLS + gettextsrc_SCRIPTS = config.rpath mkinstalldirs - EXTRA_DIST = BUGS DISCLAIM README.gemtext --SUBDIRS = doc lib intl src po m4 misc tests -+SUBDIRS = doc lib src po misc tests +-SUBDIRS = doc intl intl-java lib libuniname src po projects misc man m4 tests ++SUBDIRS = doc lib libuniname src po misc man - DISTCLEANFILES = intl/libintl.h - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + EXTRA_DIST = config.rpath BUGS DISCLAIM PACKAGING README.gemtext \ + djgpp/COPYING.DJ djgpp/Makefile.maint djgpp/README.DJ \ diff --git a/devel/gettext/patches/patch-ak b/devel/gettext/patches/patch-ak deleted file mode 100644 index fd605336be6..00000000000 --- a/devel/gettext/patches/patch-ak +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-ak,v 1.2 2002/08/19 19:20:33 seb Exp $ - -Use locally-built msgfmt. And fix locale directory. - ---- po/Makefile.in.in.orig Wed Apr 29 03:53:09 1998 -+++ po/Makefile.in.in -@@ -20,7 +20,7 @@ prefix = @prefix@ - exec_prefix = @exec_prefix@ - datadir = $(prefix)/@DATADIRNAME@ - localedir = $(datadir)/locale --gnulocaledir = $(prefix)/share/locale -+gnulocaledir = $(prefix)/$(PKGLOCALEDIR)/locale - gettextsrcdir = $(prefix)/share/gettext/po - subdir = po - -@@ -30,9 +30,9 @@ MKINSTALLDIRS = $(top_srcdir)/@MKINSTALL - - CC = @CC@ - GENCAT = @GENCAT@ --GMSGFMT = PATH=../src:$$PATH @GMSGFMT@ --MSGFMT = @MSGFMT@ --XGETTEXT = PATH=../src:$$PATH @XGETTEXT@ -+GMSGFMT = PATH=../src:$$PATH msgfmt -+MSGFMT = PATH=../src:$$PATH msgfmt -+XGETTEXT = PATH=../src:$$PATH xgettext - MSGMERGE = PATH=../src:$$PATH msgmerge - - DEFS = @DEFS@ -- cgit v1.2.3