diff options
author | joerg <joerg> | 2006-02-05 22:45:53 +0000 |
---|---|---|
committer | joerg <joerg> | 2006-02-05 22:45:53 +0000 |
commit | 35e5b779e3e9d22158eec76d867367dae5d629c9 (patch) | |
tree | c0e557085ca63ad37d8bffea51b7bc35d35a06ea /devel/gettext/patches | |
parent | 06c21515b066f26cbfcb2e62f334705e967f6ad3 (diff) | |
download | pkgsrc-35e5b779e3e9d22158eec76d867367dae5d629c9.tar.gz |
Update gettext to 0.14.5. Many bugfixes and improvements,
including support for relocable programs, Qt support,
separation of the PO processing functions into a separate
library and more.
Reorganise the gettext infrastructure by splitting of the
tools into devel/gettext-tools, which will be used by the tools
framework. The remaining devel/gettext package contains
gettextize and autopoint aka the infrastructure to embbed gettext
into a package.
Due to the ABI and API changes, a recursive revision bump will
follow.
Take blaim by receiving the maintainer hat.
With input from jlam@, reed@ and wiz@.
Diffstat (limited to 'devel/gettext/patches')
-rw-r--r-- | devel/gettext/patches/patch-aa | 14 | ||||
-rw-r--r-- | devel/gettext/patches/patch-ab | 8 | ||||
-rw-r--r-- | devel/gettext/patches/patch-ac | 13 | ||||
-rw-r--r-- | devel/gettext/patches/patch-ad | 22 | ||||
-rw-r--r-- | devel/gettext/patches/patch-ae | 15 | ||||
-rw-r--r-- | devel/gettext/patches/patch-ag | 49 | ||||
-rw-r--r-- | devel/gettext/patches/patch-ah | 100 | ||||
-rw-r--r-- | devel/gettext/patches/patch-aj | 30 | ||||
-rw-r--r-- | devel/gettext/patches/patch-ak | 24 | ||||
-rw-r--r-- | devel/gettext/patches/patch-al | 29 | ||||
-rw-r--r-- | devel/gettext/patches/patch-am | 15 | ||||
-rw-r--r-- | devel/gettext/patches/patch-an | 22 | ||||
-rw-r--r-- | devel/gettext/patches/patch-ao | 15 | ||||
-rw-r--r-- | devel/gettext/patches/patch-ap | 15 |
14 files changed, 207 insertions, 164 deletions
diff --git a/devel/gettext/patches/patch-aa b/devel/gettext/patches/patch-aa index 264150d4721..843f7ed9352 100644 --- a/devel/gettext/patches/patch-aa +++ b/devel/gettext/patches/patch-aa @@ -1,15 +1,15 @@ -$NetBSD: patch-aa,v 1.10 2002/11/30 23:21:35 salo Exp $ +$NetBSD: patch-aa,v 1.11 2006/02/05 22:45:53 joerg Exp $ ---- configure.orig Tue Aug 6 15:57:16 2002 -+++ configure Sun Sep 1 16:06:20 2002 -@@ -14293,10 +14293,6 @@ +--- gettext-runtime/configure.orig 2006-02-03 14:56:53.000000000 +0000 ++++ gettext-runtime/configure +@@ -31906,10 +31906,6 @@ echo "${ECHO_T}$gt_cv_func_gnugettext2_l + if test "$nls_cv_use_gnu_gettext" = "yes"; then - INTLOBJS="\$(GETTOBJS)" - BUILD_INCLUDED_LIBINTL=yes + 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" \ + CATOBJEXT= diff --git a/devel/gettext/patches/patch-ab b/devel/gettext/patches/patch-ab index eedd52a4d49..5e613a2639e 100644 --- a/devel/gettext/patches/patch-ab +++ b/devel/gettext/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.5 2002/11/27 17:41:06 drochner Exp $ +$NetBSD: patch-ab,v 1.6 2006/02/05 22:45:53 joerg Exp $ ---- 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 @@ +--- gettext-tools/misc/Makefile.in.orig 2005-05-23 11:24:28.000000000 +0000 ++++ gettext-tools/misc/Makefile.in +@@ -569,7 +569,7 @@ info: info-am info-am: diff --git a/devel/gettext/patches/patch-ac b/devel/gettext/patches/patch-ac deleted file mode 100644 index 4174a7f8dc6..00000000000 --- a/devel/gettext/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2002/11/27 17:41:06 drochner Exp $ - ---- 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 \ - $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ - $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \ diff --git a/devel/gettext/patches/patch-ad b/devel/gettext/patches/patch-ad new file mode 100644 index 00000000000..9926fc7b453 --- /dev/null +++ b/devel/gettext/patches/patch-ad @@ -0,0 +1,22 @@ +$NetBSD: patch-ad,v 1.3 2006/02/05 22:45:53 joerg Exp $ + +--- gettext-tools/Makefile.in.orig 2006-02-03 15:55:59.000000000 +0000 ++++ gettext-tools/Makefile.in +@@ -348,7 +348,7 @@ sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies + ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 +-SUBDIRS = doc intl lib libgrep libuniname src po projects misc man m4 tests examples ++SUBDIRS = doc intl lib libgrep libuniname src po man tests + # vms_jackets.h is a header that comes with Compaq's "porting library". + # KEEP_CRTL_SETLOCALE tells it to not override the native locale support. + EXTRA_DIST = misc/DISCLAIM Makefile.vms config.h_vms README.woe32 \ +@@ -774,7 +774,7 @@ info: info-recursive + + info-am: + +-install-data-am: install-gettextsrcSCRIPTS ++install-data-am: + + install-exec-am: + diff --git a/devel/gettext/patches/patch-ae b/devel/gettext/patches/patch-ae new file mode 100644 index 00000000000..71bac2c941c --- /dev/null +++ b/devel/gettext/patches/patch-ae @@ -0,0 +1,15 @@ +$NetBSD: patch-ae,v 1.3 2006/02/05 22:45:53 joerg Exp $ + +--- gettext-tools/configure.orig 2006-02-03 17:13:33.000000000 +0000 ++++ gettext-tools/configure +@@ -39057,10 +39057,6 @@ echo "${ECHO_T}$gt_cv_func_gnugettext2_l + + if test "$nls_cv_use_gnu_gettext" = "yes"; then + 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 + + CATOBJEXT= diff --git a/devel/gettext/patches/patch-ag b/devel/gettext/patches/patch-ag index 1c1204847bd..4c42aa382cf 100644 --- a/devel/gettext/patches/patch-ag +++ b/devel/gettext/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.5 2003/12/05 18:15:49 erh Exp $ +$NetBSD: patch-ag,v 1.6 2006/02/05 22:45:54 joerg Exp $ ---- lib/Makefile.in.orig 2002-08-06 08:58:14.000000000 -0500 -+++ lib/Makefile.in 2003-12-04 17:16:55.000000000 -0600 -@@ -227,7 +227,7 @@ +--- gettext-tools/lib/Makefile.in.orig 2005-05-23 11:24:27.000000000 +0000 ++++ gettext-tools/lib/Makefile.in +@@ -455,7 +455,7 @@ libgettextlib_la_LIBADD = @LTLIBOBJS@ # Need @LTLIBICONV@ because linebreak.c uses iconv(). libgettextlib_la_LDFLAGS = \ -release @VERSION@ \ @@ -10,17 +10,38 @@ $NetBSD: patch-ag,v 1.5 2003/12/05 18:15:49 erh Exp $ + @LTLIBINTL@ @LTLIBICONV@ -lc + # Extra files to be installed. +@@ -683,7 +683,7 @@ check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-local + installdirs: +- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(examplesbuildauxdir)" "$(DESTDIR)$(gettextsrcdir)"; do \ ++ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gettextsrcdir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done + install: $(BUILT_SOURCES) +@@ -735,7 +735,7 @@ info: info-am -@@ -517,9 +517,12 @@ + info-am: +-install-data-am: install-examplesbuildauxDATA install-gettextsrcDATA ++install-data-am: - # No need to install libgettextlib.a. -+# Unless we're on AIX, where .a's are shared libraries. - install-exec-am: install-exec-clean - install-exec-clean: -+.if ${OPSYS} != "AIX" - $(RM) $(DESTDIR)$(libdir)/libgettextlib.a -+.endif + install-exec-am: install-exec-local install-libLTLIBRARIES - all-local c-ctype.lo execute.lo javacomp.lo javaexec.lo pipe-bidi.lo pipe-in.lo pipe-out.lo progname.lo tmpdir.lo wait-process.lo xerror.lo: @STDBOOL_H@ - stdbool.h: stdbool.h.in +@@ -781,15 +781,6 @@ uninstall-am: uninstall-examplesbuildaux + uninstall-gettextsrcDATA uninstall-info-am \ + uninstall-libLTLIBRARIES uninstall-local + +- +-# No need to install libgettextlib.a, except on AIX. +-install-exec-local: install-libLTLIBRARIES install-exec-clean +-install-exec-clean: +- case "@host_os@" in \ +- aix*) ;; \ +- *) $(RM) $(DESTDIR)$(libdir)/libgettextlib.a ;; \ +- esac +- + # The following is needed in order to create an <stdbool.h> when the system + # doesn't have one that works. + all-local $(libgettextlib_la_OBJECTS): @STDBOOL_H@ diff --git a/devel/gettext/patches/patch-ah b/devel/gettext/patches/patch-ah index 2982d8bd7fc..1721c600a06 100644 --- a/devel/gettext/patches/patch-ah +++ b/devel/gettext/patches/patch-ah @@ -1,8 +1,28 @@ -$NetBSD: patch-ah,v 1.4 2003/12/05 18:15:49 erh Exp $ +$NetBSD: patch-ah,v 1.5 2006/02/05 22:45:54 joerg Exp $ ---- src/Makefile.in.orig 2002-08-06 08:59:06.000000000 -0500 -+++ src/Makefile.in 2003-12-04 17:34:23.000000000 -0600 -@@ -248,7 +248,7 @@ +--- gettext-tools/src/Makefile.in.orig 2006-02-03 14:37:39.000000000 +0000 ++++ gettext-tools/src/Makefile.in +@@ -185,9 +185,7 @@ msggrep_DEPENDENCIES = $(am__DEPENDENCIE + am_msginit_OBJECTS = msginit-msginit.$(OBJEXT) \ + msginit-plural-count.$(OBJEXT) msginit-localealias.$(OBJEXT) + msginit_OBJECTS = $(am_msginit_OBJECTS) +-msginit_DEPENDENCIES = \ +- ../intl/localename.@INTL_LIBTOOL_SUFFIX_PREFIX@o \ +- libgettextsrc.la ++msginit_DEPENDENCIES = libgettextsrc.la + am_msgmerge_OBJECTS = msgmerge-msgmerge.$(OBJEXT) \ + msgmerge-plural-count.$(OBJEXT) + msgmerge_OBJECTS = $(am_msgmerge_OBJECTS) +@@ -449,7 +447,7 @@ install_sh = @install_sh@ + libdir = @libdir@ + libexecdir = @libexecdir@ + lispdir = @lispdir@ +-localedir = $(datadir)/locale ++localedir = /usr/pkg/share/locale + localstatedir = @localstatedir@ + mandir = @mandir@ + mkdir_p = @mkdir_p@ +@@ -592,7 +590,7 @@ urlget_SOURCES = urlget.c # use iconv(). libgettextsrc_la_LDFLAGS = \ -release @VERSION@ \ @@ -10,39 +30,53 @@ $NetBSD: patch-ah,v 1.4 2003/12/05 18:15:49 erh Exp $ + ../lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc - # Link dependencies. -@@ -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 + # How to build libgettextpo.la. +@@ -623,8 +621,7 @@ msgen_LDADD = libgettextsrc.la @INTL_MAC + msgexec_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ + msgfilter_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ + msggrep_LDADD = $(LIBGREP) libgettextsrc.la @INTL_MACOSX_LIBS@ +-msginit_LDADD = ../intl/localename.@INTL_LIBTOOL_SUFFIX_PREFIX@o \ +- libgettextsrc.la @INTL_MACOSX_LIBS@ ++msginit_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ - msguniq_LDADD = libgettextsrc.la + msguniq_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ -@@ -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) -@@ -731,9 +727,12 @@ +@@ -1349,7 +1346,7 @@ info-am: + + install-data-am: install-data-local install-includeHEADERS + +-install-exec-am: install-binPROGRAMS install-exec-local \ ++install-exec-am: install-binPROGRAMS \ + install-libLTLIBRARIES + install-info: install-info-am +@@ -1396,14 +1393,6 @@ uninstall-am: uninstall-binPROGRAMS unin + uninstall-info-am uninstall-libLTLIBRARIES uninstall-local - # No need to install libgettextsrc.a. -+# Unless we're on AIX, where .a's are shared libraries. - install-exec-am: install-exec-clean - install-exec-clean: -+.if ${OPSYS} != "AIX" - $(RM) $(DESTDIR)$(libdir)/libgettextsrc.a -+.endif +-# No need to install libgettextsrc.a, except on AIX. +-install-exec-local: install-libLTLIBRARIES install-exec-clean +-install-exec-clean: +- case "@host_os@" in \ +- aix*) ;; \ +- *) $(RM) $(DESTDIR)$(libdir)/libgettextsrc.a ;; \ +- esac +- po-lex.o po-lex.lo: po-gram-gen2.h po-gram-gen2.h: po-gram-gen.h + $(SED) -e 's/yy/po_gram_/g' -e 's/extern /extern DLL_VARIABLE /' $(srcdir)/po-gram-gen.h > $@-tmp +@@ -1507,12 +1496,12 @@ uninstall-csharp-yes: all-csharp-yes + $(RM) $(DESTDIR)$(pkglibdir)/msgunfmt.net.exe + uninstall-csharp-no: + +-install-data-local: install-tcl ++install-data-local: + install-tcl: + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) + $(INSTALL_DATA) $(srcdir)/msgunfmt.tcl $(DESTDIR)$(pkgdatadir)/msgunfmt.tcl + +-installdirs-local: installdirs-tcl ++installdirs-local: + installdirs-tcl: + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) + diff --git a/devel/gettext/patches/patch-aj b/devel/gettext/patches/patch-aj index f21b3f02d3a..9fb65a21da0 100644 --- a/devel/gettext/patches/patch-aj +++ b/devel/gettext/patches/patch-aj @@ -1,20 +1,22 @@ -$NetBSD: patch-aj,v 1.3 2002/11/27 17:41:07 drochner Exp $ +$NetBSD: patch-aj,v 1.4 2006/02/05 22:45:54 joerg Exp $ ---- Makefile.in.orig Tue Aug 6 15:57:07 2002 -+++ Makefile.in Sun Sep 1 16:51:37 2002 -@@ -149,13 +149,13 @@ +--- gettext-runtime/Makefile.in.orig 2006-02-03 14:42:03.000000000 +0000 ++++ gettext-runtime/Makefile.in +@@ -300,7 +300,7 @@ sysconfdir = @sysconfdir@ + target_alias = @target_alias@ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies - ACLOCAL_AMFLAGS = -I m4 + ACLOCAL_AMFLAGS = -I m4 -I ../gettext-tools/m4 -I ../autoconf-lib-link/m4 -I ../m4 +-SUBDIRS = doc intl intl-java intl-csharp lib @SUBDIR_libasprintf@ src po man m4 ++SUBDIRS = doc lib src po man m4 + DIST_SUBDIRS = doc intl intl-java intl-csharp lib libasprintf src po man m4 + EXTRA_DIST = BUGS Makefile.vms config.h_vms README.woe32 Makefile.msvc \ + config.h.msvc windows/dllexport.h windows/intl.rc +@@ -719,7 +719,7 @@ info: info-recursive --MAKEINFO = env LANG= LANGUAGE= @MAKEINFO@ -+MAKEINFO = env LANG= LANGUAGE= /usr/bin/makeinfo + info-am: - gettextsrcdir = $(datadir)/gettext - gettextsrc_DATA = ABOUT-NLS - gettextsrc_SCRIPTS = config.rpath mkinstalldirs +-install-data-am: install-gettextsrcDATA ++install-data-am: --SUBDIRS = doc intl intl-java lib libuniname src po projects misc man m4 tests -+SUBDIRS = doc lib libuniname src po misc man + install-exec-am: - 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 index ec71cdd2691..c06f8876f93 100644 --- a/devel/gettext/patches/patch-ak +++ b/devel/gettext/patches/patch-ak @@ -1,13 +1,13 @@ -$NetBSD: patch-ak,v 1.4 2003/04/27 19:18:21 jmmv Exp $ +$NetBSD: patch-ak,v 1.5 2006/02/05 22:45:54 joerg Exp $ ---- doc/Makefile.in.orig 2002-08-06 15:57:45.000000000 +0200 -+++ doc/Makefile.in -@@ -152,7 +152,7 @@ DVIPS = @DVIPS@ -D600 - # Documentation in Portable Document Format. - TEXI2PDF = @TEXI2PDF@ - --docdir = $(prefix)/doc/@PACKAGE@ -+docdir = $(datadir)/doc/@PACKAGE@ - dvidir = $(docdir) - psdir = $(docdir) - pdfdir = $(docdir) +--- gettext-runtime/intl/Makefile.in.orig 2006-02-04 19:34:01.000000000 +0000 ++++ gettext-runtime/intl/Makefile.in +@@ -257,7 +257,7 @@ check: all + # separate library. + # If you want to use the one which comes with this version of the + # package, you have to use `configure --with-included-gettext'. +-install: install-exec install-data ++install: + install-exec: all + if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \ + && test '@USE_INCLUDED_LIBINTL@' = yes; then \ diff --git a/devel/gettext/patches/patch-al b/devel/gettext/patches/patch-al index 76793f5307d..4a698ce2b19 100644 --- a/devel/gettext/patches/patch-al +++ b/devel/gettext/patches/patch-al @@ -1,13 +1,22 @@ -$NetBSD: patch-al,v 1.1 2003/04/27 19:18:21 jmmv Exp $ +$NetBSD: patch-al,v 1.2 2006/02/05 22:45:54 joerg Exp $ ---- man/Makefile.in.orig 2002-08-06 16:00:40.000000000 +0200 -+++ man/Makefile.in -@@ -147,7 +147,7 @@ mandir = @mandir@ - PERL = @PERL@ +--- gettext-tools/po/Makefile.in.in.orig 2006-02-04 20:52:36.000000000 +0000 ++++ gettext-tools/po/Makefile.in.in +@@ -156,7 +156,7 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot - VERSION = @VERSION@ --docdir = $(prefix)/doc/@PACKAGE@ -+docdir = $(datadir)/doc/@PACKAGE@ - htmldir = $(docdir) + install: install-exec install-data + install-exec: +-install-data: install-data-@USE_NLS@ ++install-data: + if test "$(PACKAGE)" = "gettext-tools"; then \ + $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ + for file in $(DISTFILES.common) Makevars.template; do \ +@@ -215,7 +215,7 @@ install-strip: install - localedir = $(datadir)/locale + installdirs: installdirs-exec installdirs-data + installdirs-exec: +-installdirs-data: installdirs-data-@USE_NLS@ ++installdirs-data: + if test "$(PACKAGE)" = "gettext-tools"; then \ + $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ + else \ diff --git a/devel/gettext/patches/patch-am b/devel/gettext/patches/patch-am deleted file mode 100644 index 8e39a19a5a5..00000000000 --- a/devel/gettext/patches/patch-am +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-am,v 1.1 2004/10/13 17:14:36 gavan Exp $ - ---- lib/execute.c.orig 2002-01-02 10:55:32.000000000 +0000 -+++ lib/execute.c -@@ -56,6 +56,10 @@ - # define STDERR_FILENO 2 - #endif - -+#ifndef HAVE_ENVIRON_DECL -+extern char **environ; -+#endif -+ - #define _(str) gettext (str) - - diff --git a/devel/gettext/patches/patch-an b/devel/gettext/patches/patch-an index 7fac37420de..4016e389ddd 100644 --- a/devel/gettext/patches/patch-an +++ b/devel/gettext/patches/patch-an @@ -1,15 +1,13 @@ -$NetBSD: patch-an,v 1.1 2004/10/13 17:14:36 gavan Exp $ +$NetBSD: patch-an,v 1.2 2006/02/05 22:45:54 joerg Exp $ ---- lib/pipe-bidi.c.orig 2002-01-02 10:55:32.000000000 +0000 -+++ lib/pipe-bidi.c -@@ -51,6 +51,10 @@ - # define STDOUT_FILENO 1 - #endif - -+#ifndef HAVE_ENVIRON_DECL -+extern char **environ; -+#endif -+ - #define _(str) gettext (str) +--- Makefile.in.orig 2006-02-04 21:41:03.000000000 +0000 ++++ Makefile.in +@@ -153,7 +153,7 @@ subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies +-SUBDIRS = autoconf-lib-link gettext-runtime gettext-tools ++SUBDIRS = gettext-runtime gettext-tools + # DJGPP port. diff --git a/devel/gettext/patches/patch-ao b/devel/gettext/patches/patch-ao deleted file mode 100644 index 90cfc8a05e7..00000000000 --- a/devel/gettext/patches/patch-ao +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2004/10/13 17:14:36 gavan Exp $ - ---- lib/pipe-in.c.orig 2002-01-02 10:55:32.000000000 +0000 -+++ lib/pipe-in.c -@@ -51,6 +51,10 @@ - # define STDOUT_FILENO 1 - #endif - -+#ifndef HAVE_ENVIRON_DECL -+extern char **environ; -+#endif -+ - #define _(str) gettext (str) - - diff --git a/devel/gettext/patches/patch-ap b/devel/gettext/patches/patch-ap deleted file mode 100644 index 47a896ea697..00000000000 --- a/devel/gettext/patches/patch-ap +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2004/10/13 17:14:36 gavan Exp $ - ---- lib/pipe-out.c.orig 2002-01-02 10:55:32.000000000 +0000 -+++ lib/pipe-out.c -@@ -51,6 +51,10 @@ - # define STDOUT_FILENO 1 - #endif - -+#ifndef HAVE_ENVIRON_DECL -+extern char **environ; -+#endif -+ - #define _(str) gettext (str) - - |