5 files changed, 33 insertions, 43 deletions

diff --git a/devel/gettext/files/patch-Makefile.in b/devel/gettext/files/patch-Makefile.in
index f8296f0f995a..22d10ad84344 100644
--- a/devel/gettext/files/patch-Makefile.in
+++ b/devel/gettext/files/patch-Makefile.in
@@ -1,12 +1,11 @@
---- Makefile.in.orig	Tue Mar 12 14:51:22 2002
-+++ Makefile.in	Fri Mar 15 18:42:49 2002
-@@ -40,3 +40,3 @@
+--- Makefile.in.orig	Wed Jul 17 20:45:19 2002
++++ Makefile.in	Fri Jul 19 03:41:08 2002
+@@ -155,7 +155,7 @@
+ gettextsrc_DATA = ABOUT-NLS
+ gettextsrc_SCRIPTS = config.rpath mkinstalldirs
  
--ACLOCAL = @ACLOCAL@
-+ACLOCAL = /usr/bin/true
- AUTOCONF = @AUTOCONF@
-@@ -152,3 +152,3 @@
- 
--SUBDIRS = doc intl intl-java lib libuniname src po man m4 projects misc tests
-+SUBDIRS = doc intl lib libuniname src po man m4 projects misc tests
+-SUBDIRS = doc intl intl-java lib libuniname src po projects misc man m4 tests
++SUBDIRS = doc intl lib libuniname src po projects misc man m4 tests
  
+ EXTRA_DIST = config.rpath BUGS DISCLAIM PACKAGING README.gemtext \
+              djgpp/COPYING.DJ djgpp/Makefile.maint djgpp/README.DJ \
diff --git a/devel/gettext/files/patch-ae b/devel/gettext/files/patch-ae
index dde01c42aefe..c708e9d3c3f4 100644
--- a/devel/gettext/files/patch-ae
+++ b/devel/gettext/files/patch-ae
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Tue Mar 12 21:03:57 2002
-+++ configure	Mon Apr 29 23:49:41 2002
-@@ -6094,6 +6094,7 @@
+--- configure.orig	Wed Jul 17 20:45:27 2002
++++ configure	Fri Jul 19 03:44:17 2002
+@@ -7576,6 +7576,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,12 +11,12 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -11774,7 +11775,7 @@
-   IFS="$ac_save_ifs"
+@@ -14782,7 +14783,7 @@
+ 
  fi
  fi
--EMACS="$ac_cv_prog_EMACS"
+-EMACS=$ac_cv_prog_EMACS
 +EMACS=no
  if test -n "$EMACS"; then
-   echo "$ac_t""$EMACS" 1>&6
- else
+   echo "$as_me:14787: result: $EMACS" >&5
+ echo "${ECHO_T}$EMACS" >&6
diff --git a/devel/gettext/files/patch-doc::Makefile.in b/devel/gettext/files/patch-doc::Makefile.in
index 61e9567457ae..e0aec523d31b 100644
--- a/devel/gettext/files/patch-doc::Makefile.in
+++ b/devel/gettext/files/patch-doc::Makefile.in
@@ -1,5 +1,5 @@
 
-$FreeBSD: /tmp/pcvs/ports/devel/gettext/files/Attic/patch-doc::Makefile.in,v 1.1 2002-03-15 19:43:48 ade Exp $
+$FreeBSD: /tmp/pcvs/ports/devel/gettext/files/Attic/patch-doc::Makefile.in,v 1.2 2002-08-01 02:30:59 ade Exp $
 
 --- doc/Makefile.in.orig	Wed May 23 23:48:53 2001
 +++ doc/Makefile.in	Tue May 29 11:38:28 2001
@@ -12,12 +12,3 @@ $FreeBSD: /tmp/pcvs/ports/devel/gettext/files/Attic/patch-doc::Makefile.in,v 1.1
  dvidir = $(docdir)
  psdir = $(docdir)
  pdfdir = $(docdir)
-@@ -108,7 +108,7 @@
- SED = sed
- RM = rm -f
- 
--MAKEINFO = env LANG= LANGUAGE= @MAKEINFO@
-+MAKEINFO = env LANG= LANGUAGE= @MAKEINFO@ --no-split
- 
- info_TEXINFOS = gettext.texi
- gettext_TEXINFOS = iso-639.texi iso-3166.texi
diff --git a/devel/gettext/files/patch-lib::Makefile.in b/devel/gettext/files/patch-lib::Makefile.in
index e489945f3d18..a327eb023672 100644
--- a/devel/gettext/files/patch-lib::Makefile.in
+++ b/devel/gettext/files/patch-lib::Makefile.in
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- lib/Makefile.in.orig	Tue Mar 12 21:04:16 2002
-+++ lib/Makefile.in	Tue Apr 30 11:06:26 2002
-@@ -220,7 +220,7 @@
+--- lib/Makefile.in.orig	Fri Jul 19 03:46:30 2002
++++ lib/Makefile.in	Fri Jul 19 03:47:55 2002
+@@ -227,7 +227,7 @@
  # Need @LTLIBICONV@ because linebreak.c uses iconv().
  libgettextlib_la_LDFLAGS = \
    -release @VERSION@ \
@@ -12,12 +12,12 @@ $FreeBSD$
  
  
  
-@@ -238,14 +238,14 @@
+@@ -245,14 +245,14 @@
  gen-lbrkprop.c 3level.h Combining.txt
  
  
--DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
-+DEFS = -DLIBDIR=\"$(prefix)/libdata\" @DEFS@
+-DEFS = -DLIBDIR=\"$(libdir)\" -DEXEEXT=\"$(EXEEXT)\" @DEFS@
++DEFS = -DLIBDIR=\"$(prefix)/libdata\" -DEXEEXT=\"$(EXEEXT)\" @DEFS@
  INCLUDES = -I. -I$(srcdir) -I.. -I../intl -I$(top_srcdir)/intl
  
  DISTCLEANFILES = fnmatch.h
@@ -30,7 +30,7 @@ $FreeBSD$
  
  SUFFIXES = .sed .sin
  
-@@ -475,7 +475,7 @@
+@@ -482,7 +482,7 @@
  
  install-data-am: install-gettextsrcDATA
  
@@ -39,7 +39,7 @@ $FreeBSD$
  
  install-info: install-info-am
  
-@@ -522,7 +522,7 @@
+@@ -534,7 +534,7 @@
  
  all-local: charset.alias ref-add.sed ref-del.sed
  install-exec-local: all-local
diff --git a/devel/gettext/files/patch-src::Makefile.in b/devel/gettext/files/patch-src::Makefile.in
index dc1aba86367d..65af8a8c3173 100644
--- a/devel/gettext/files/patch-src::Makefile.in
+++ b/devel/gettext/files/patch-src::Makefile.in
@@ -1,18 +1,18 @@
 
 $FreeBSD$
 
---- src/Makefile.in.orig	Tue Mar 12 21:04:19 2002
-+++ src/Makefile.in	Tue Apr 30 00:01:24 2002
-@@ -173,7 +173,7 @@
- -I../lib -I$(top_srcdir)/lib -I../intl -I$(top_srcdir)/intl
+--- src/Makefile.in.orig	Wed Jul 17 20:46:11 2002
++++ src/Makefile.in	Fri Jul 19 03:51:12 2002
+@@ -181,7 +181,7 @@
  
- DEFS = -DLOCALEDIR=\"$(localedir)\" -DGETTEXTJAR=\"$(jardir)/gettext.jar\" \
+ DEFS = -DLOCALEDIR=\"$(localedir)\" -DUSEJEXE=$(USEJEXE) \
+ -DGETTEXTJEXEDIR=\"$(pkglibdir)\" -DGETTEXTJAR=\"$(jardir)/gettext.jar\" \
 --DLIBDIR=\"$(libdir)\" -DGETTEXTDATADIR=\"$(pkgdatadir)\" \
 +-DLIBDIR=\"$(prefix)/libdata\" -DGETTEXTDATADIR=\"$(pkgdatadir)\" \
  -DPROJECTSDIR=\"$(projectsdir)\" @DEFS@
  
  LDADD = ../lib/libgettextlib.la @LTLIBINTL@
-@@ -240,7 +240,7 @@
+@@ -248,7 +248,7 @@
  # use iconv().
  libgettextsrc_la_LDFLAGS = \
    -release @VERSION@ \
@@ -21,7 +21,7 @@ $FreeBSD$
  
  
  # Link dependencies.
-@@ -726,11 +726,11 @@
+@@ -747,11 +747,11 @@
  # Special rules for installation of auxiliary programs.
  
  install-exec-local: