Resurrect mail/mutt-devel and make it install mutt-1.5.6, the development

version of Mutt, a text mail reader and PGP & S/MIME support.  This
is primarily to support a mutt that builds with SASLv2 support.

13 files changed, 410 insertions, 0 deletions

diff --git a/mail/mutt-devel/DESCR b/mail/mutt-devel/DESCR
new file mode 100644
index 00000000000..254cb041460
--- /dev/null
+++ b/mail/mutt-devel/DESCR
@@ -0,0 +1,9 @@
+The Mutt E-Mail Client by Michael Elkins <me@cs.hmc.edu>
+
+``All mail clients suck.  This one just sucks less.'' -me, circa 1995
+
+Mutt is a small but very powerful text-based MIME mail client.  Mutt
+is highly configurable, and is well suited to the mail power user with
+advanced features like key bindings, keyboard macros, mail threading,
+regular expression searches and a powerful pattern matching language
+for selecting groups of messages.
diff --git a/mail/mutt-devel/INSTALL b/mail/mutt-devel/INSTALL
new file mode 100644
index 00000000000..2b586fde291
--- /dev/null
+++ b/mail/mutt-devel/INSTALL
@@ -0,0 +1,12 @@
+# $NetBSD: INSTALL,v 1.3 2004/07/21 22:37:10 jlam Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+	${RM} -f @DOCDIR@/samples
+	${LN} -sf ../../examples/mutt @DOCDIR@/samples
+	;;
+
+DEINSTALL)
+	${RM} -f @DOCDIR@/samples
+	;;
+esac
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
new file mode 100644
index 00000000000..e560e5fbee7
--- /dev/null
+++ b/mail/mutt-devel/Makefile
@@ -0,0 +1,93 @@
+# $NetBSD: Makefile,v 1.26 2004/07/21 22:37:10 jlam Exp $
+
+DISTNAME=		mutt-1.5.6i
+PKGNAME=		${DISTNAME:C/i$//}
+CATEGORIES=		mail
+MUTT_SITES=		ftp://ftp.mutt.org/mutt/ \
+			ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \
+			ftp://gd.tuwien.ac.at/infosys/mail/mutt/ \
+			ftp://ftp.fu-berlin.de/unix/mail/mutt/
+MASTER_SITES=		${MUTT_SITES:=devel/}
+
+MAINTAINER=		jlam@NetBSD.org
+HOMEPAGE=		http://www.mutt.org/
+COMMENT=		Text-based MIME mail client with PGP & S/MIME support
+
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+.include "../../mk/bsd.prefs.mk"
+
+WRKSRC=			${WRKDIR}/${DISTNAME:C/i$$//}
+BUILD_DEFS+=		MUTT_OPTIONS
+BUILD_USES_MSGFMT=	yes
+USE_BUILDLINK3=		yes
+USE_PKGLOCALEDIR=	yes
+USE_PERL5=		yes
+REPLACE_PERL=		smime_keys */*.pl
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}			\
+			--with-docdir=${PREFIX}/share/doc/mutt		\
+			--without-included-gettext			\
+			--enable-pop					\
+			--enable-imap
+
+.if (${OPSYS} == "SunOS")
+CONFIGURE_ARGS+=	--without-wc-funcs
+.endif
+
+# There is a problem using /bin/sh on old NetBSD releases, so use /bin/ksh
+# there.
+#
+.if !empty(MACHINE_PLATFORM:MNetBSD-1.[0-5]*-*)
+CONFIGURE_ARGS+=	--with-exec-shell=/bin/ksh
+.endif
+
+.include "Makefile.options"
+
+LDFLAGS+=		${_STRIPFLAG_CC}
+
+USE_PKGINSTALL=		yes
+DEINSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
+INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
+DOCDIR=			${PREFIX}/share/doc/mutt
+EGDIR=			${PREFIX}/share/examples/mutt
+CONF_FILES=		${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
+SUPPORT_FILES=		${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
+FILES_SUBST+=		DOCDIR=${DOCDIR}
+
+.if exists(${WRKSRC}/mutt_dotlock)
+PLIST_SUBST+=		MUTT_DOTLOCK=
+.else
+PLIST_SUBST+=		MUTT_DOTLOCK="@comment "
+.endif
+INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR}
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+
+# Fix some absolute paths in installed files.
+post-build:
+	for file in ${WRKSRC}/contrib/gpg.rc; do			\
+		${MV} -f $$file $$file.save;				\
+		${SED}	-e "s,/usr/bin/gpg,gpg,g"			\
+			$$file.save > $$file;				\
+	done
+	for file in ${WRKSRC}/doc/mutt.man; do				\
+		${MV} -f $$file $$file.save;				\
+		${SED}	-e "s,/etc/,${PKG_SYSCONFDIR}/,g"		\
+			-e "s,/usr/local/doc/mutt/,${DOCDIR}/,g"	\
+			-e "s,/usr/local/,${PREFIX}/,g"			\
+			$$file.save > $$file;				\
+	done
+
+# Pre-create some directories and symlinks used during the installation
+# process.
+#
+pre-install:
+	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	${RM} -f ${DOCDIR}/samples
+	${LN} -sf ${EGDIR} ${DOCDIR}/samples
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mutt-devel/Makefile.options b/mail/mutt-devel/Makefile.options
new file mode 100644
index 00000000000..9e39de248ff
--- /dev/null
+++ b/mail/mutt-devel/Makefile.options
@@ -0,0 +1,71 @@
+# $NetBSD: Makefile.options,v 1.1 2004/07/21 22:37:10 jlam Exp $
+#
+# MUTT_ALL_OPTIONS lists all of the currently-supported optional modules
+# that may be built into Mutt.
+#
+# MUTT_OPTIONS is a list of the modules that will be built into Mutt.
+#
+MUTT_ALL_OPTIONS=	slang ncurses ssl sasl
+
+.if defined(MUTT_USE_SLANG) || defined(MUTT_USE_NCURSES) || \
+    defined(MUTT_USE_SSL) || defined(MUTT_USE_SASL)
+.  if !defined(MUTT_OPTIONS)
+.    if defined(MUTT_USE_SLANG) && !empty(MUTT_USE_SLANG:M[yY][eE][sS])
+MUTT_OPTIONS+=		slang
+.    endif
+.    if defined(MUTT_USE_NCURSES) && !empty(MUTT_USE_NCURSES:M[yY][eE][sS])
+MUTT_OPTIONS+=		ncurses
+.    endif
+.    if defined(MUTT_USE_SSL) && !empty(MUTT_USE_SSL:M[yY][eE][sS])
+MUTT_OPTIONS+=		ssl
+.    endif
+.    if defined(MUTT_USE_SASL) && !empty(MUTT_USE_SASL:M[yY][eE][sS])
+MUTT_OPTIONS+=		sasl
+.    endif
+.  endif
+.endif
+
+MUTT_OPTIONS?=		ssl
+
+_MUTT_OPTIONS=		# empty
+.for _opt_ in ${MUTT_OPTIONS}
+.  if empty(_MUTT_OPTIONS:M${_opt_})
+.    if !empty(MUTT_ALL_OPTIONS:M${_opt_})
+_MUTT_OPTIONS+=		${_opt_}
+.    else
+PKG_FAIL_REASON+=	"\"${_opt_}\" is not a supported Mutt build option."
+.    endif
+.  endif
+.endfor
+
+###
+### Slang and ncurses
+###
+.if !empty(_MUTT_OPTIONS:Mslang)
+.  include "../../devel/libslang/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-slang=${BUILDLINK_PREFIX.libslang}
+.else
+.  if !empty(_MUTT_OPTIONS:Mslang)
+USE_NCURSES=		yes
+.  endif
+.  include "../../devel/ncurses/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-curses=${BUILDLINK_PREFIX.ncurses}
+.endif
+
+###
+### SASLv2
+###
+.if !empty(_MUTT_OPTIONS:Msasl)
+.  include "../../security/cyrus-sasl2/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-sasl2=${BUILDLINK_PREFIX.cyrus-sasl}
+.endif
+
+###
+### SSL
+###
+.if !empty(_MUTT_OPTIONS:Mssl)
+.  include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
+.else
+CONFIGURE_ARGS+=	--without-ssl
+.endif
diff --git a/mail/mutt-devel/PLIST b/mail/mutt-devel/PLIST
new file mode 100644
index 00000000000..91d5c6e1f96
--- /dev/null
+++ b/mail/mutt-devel/PLIST
@@ -0,0 +1,104 @@
+@comment $NetBSD: PLIST,v 1.5 2004/07/21 22:37:10 jlam Exp $
+bin/flea
+bin/mutt
+bin/muttbug
+${MUTT_DOTLOCK}bin/mutt_dotlock
+bin/pgpewrap
+bin/pgpring
+bin/smime_keys
+man/man1/flea.1
+man/man1/mutt.1
+man/man1/mutt_dotlock.1
+man/man1/muttbug.1
+man/man5/mutt-mbox.5
+man/man5/muttrc.5
+share/doc/mutt/COPYRIGHT
+share/doc/mutt/ChangeLog
+share/doc/mutt/ChangeLog.old
+share/doc/mutt/GPL
+share/doc/mutt/INSTALL
+share/doc/mutt/NEWS
+share/doc/mutt/PGP-Notes.txt
+share/doc/mutt/README
+share/doc/mutt/README.SECURITY
+share/doc/mutt/README.SSL
+share/doc/mutt/TODO
+share/doc/mutt/applying-patches.txt
+share/doc/mutt/devel-notes.txt
+share/doc/mutt/html/manual-1.html
+share/doc/mutt/html/manual-2.html
+share/doc/mutt/html/manual-3.html
+share/doc/mutt/html/manual-4.html
+share/doc/mutt/html/manual-5.html
+share/doc/mutt/html/manual-6.html
+share/doc/mutt/html/manual-7.html
+share/doc/mutt/html/manual.html
+share/doc/mutt/manual.txt
+share/doc/mutt/patch-notes.txt
+share/doc/mutt/smime-notes.txt
+share/examples/mutt/Mush.rc
+share/examples/mutt/Muttrc
+share/examples/mutt/Pine.rc
+share/examples/mutt/Tin.rc
+share/examples/mutt/ca-bundle.crt
+share/examples/mutt/colors.default
+share/examples/mutt/colors.linux
+share/examples/mutt/gpg.rc
+share/examples/mutt/iconv/iconv.aix-3.2.5.rc
+share/examples/mutt/iconv/iconv.aix-4.1.5.rc
+share/examples/mutt/iconv/iconv.aix-4.2.0.rc
+share/examples/mutt/iconv/iconv.aix-4.3.2.rc
+share/examples/mutt/iconv/iconv.freebsd-3.3.rc
+share/examples/mutt/iconv/iconv.glibc-2.1.3.rc
+share/examples/mutt/iconv/iconv.glibc-2.1.90.rc
+share/examples/mutt/iconv/iconv.hpux-10.01.rc
+share/examples/mutt/iconv/iconv.hpux-10.20.rc
+share/examples/mutt/iconv/iconv.hpux-11.00.rc
+share/examples/mutt/iconv/iconv.irix-6.5.rc
+share/examples/mutt/iconv/iconv.osf1-4.0a.rc
+share/examples/mutt/iconv/iconv.osf1-4.0d.rc
+share/examples/mutt/iconv/iconv.solaris-2.4.rc
+share/examples/mutt/iconv/iconv.solaris-2.5.1.rc
+share/examples/mutt/iconv/iconv.solaris-2.6-cjk.rc
+share/examples/mutt/iconv/iconv.solaris-2.6.rc
+share/examples/mutt/iconv/iconv.solaris-2.7.rc
+share/examples/mutt/mime.types
+share/examples/mutt/pgp2.rc
+share/examples/mutt/pgp5.rc
+share/examples/mutt/pgp6.rc
+share/examples/mutt/sample.mailcap
+share/examples/mutt/sample.muttrc
+share/examples/mutt/sample.muttrc-tlr
+share/examples/mutt/smime.rc
+share/examples/mutt/smime_keys_test.pl
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/mutt.mo
+@dirrm share/examples/mutt/iconv
+@dirrm share/examples/mutt
+@dirrm share/doc/mutt/html
+@dirrm share/doc/mutt
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
new file mode 100644
index 00000000000..a11af91163f
--- /dev/null
+++ b/mail/mutt-devel/distinfo
@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.17 2004/07/21 22:37:10 jlam Exp $
+
+SHA1 (mutt-1.5.6i.tar.gz) = 5b3ea613abeff4007fadc38946806aee2f225f48
+Size (mutt-1.5.6i.tar.gz) = 2910730 bytes
+SHA1 (patch-aa) = 59d89dce24110be2927c8a1ea1fa5b780d644372
+SHA1 (patch-ab) = a4f89fc1b78f73ea4cbf13d73422b13126a7b9ff
+SHA1 (patch-ac) = b48ff9f66ff2b483b5aa0c312e08bd22c7cf03be
+SHA1 (patch-ag) = ebfeb5c03770501f7e7cc918ec2c56ddc2f1ed1d
+SHA1 (patch-ah) = 4227c5768b900e58fa4a679e6ad67efc974a70b5
+SHA1 (patch-ai) = e9a872cdde09dfae012d63a475f100e8be70acb5
+SHA1 (patch-al) = e645a9daf6d439292a83bb196b19bede3fa046e1
diff --git a/mail/mutt-devel/patches/patch-aa b/mail/mutt-devel/patches/patch-aa
new file mode 100644
index 00000000000..504355f7d57
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-aa
@@ -0,0 +1,18 @@
+$NetBSD: patch-aa,v 1.5 2004/07/21 22:37:10 jlam Exp $
+
+--- send.c.orig	Sun Feb  1 12:10:58 2004
++++ send.c
+@@ -1689,6 +1689,13 @@ full_fcc:
+     }
+   }
+ 
++#ifdef CRYPT_BACKEND_CLASSIC_PGP
++  {
++    /* Extend the PGP expiry time while messages are being sent. */
++    extern time_t PgpExptime;
++    PgpExptime = time (NULL) + PgpTimeout;
++  }
++#endif
+ 
+   rv = 0;
+   
diff --git a/mail/mutt-devel/patches/patch-ab b/mail/mutt-devel/patches/patch-ab
new file mode 100644
index 00000000000..b779de32964
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.4 2004/07/21 22:37:10 jlam Exp $
+
+--- Makefile.in.orig	Wed Jul 21 17:56:30 2004
++++ Makefile.in
+@@ -113,11 +113,11 @@ EXTRA_PROGRAMS = mutt_dotlock pgpring ma
+ 
+ SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
+ 
+-bin_SCRIPTS = muttbug flea
++bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
+ 
+ BUILT_SOURCES = keymap_defs.h patchlist.c
+ 
+-bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
++bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
+ mutt_SOURCES = $(BUILT_SOURCES) 	addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c         crypt.c cryptglue.c 	commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c 	edit.c enter.c flags.c init.c filter.c from.c getdomain.c 	handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c 	main.c mbox.c menu.c mh.c mx.c pager.c parse.c pattern.c 	postpone.c query.c recvattach.c recvcmd.c 	rfc822.c rfc1524.c rfc2047.c rfc2231.c 	score.c send.c sendlib.c signal.c sort.c 	status.c system.c thread.c charset.c history.c lib.c 	muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c 	url.c ascii.c mutt_idna.c
+ 
+ 
diff --git a/mail/mutt-devel/patches/patch-ac b/mail/mutt-devel/patches/patch-ac
new file mode 100644
index 00000000000..8de0b48a4c4
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.4 2004/07/21 22:37:10 jlam Exp $
+
+--- curs_main.c.orig	Wed Nov  5 04:41:31 2003
++++ curs_main.c
+@@ -1048,6 +1048,11 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE);
+           cp = _("Open mailbox");
+ 
+ 	buf[0] = '\0';
++	if (option (OPTCHANGEFOLDERNEXT) && Context && Context->path)
++	{
++	  strfcpy (buf, Context->path, sizeof (buf));
++	  mutt_pretty_mailbox (buf);
++	}
+ 	mutt_buffy (buf, sizeof (buf));
+ 
+ 	if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)
diff --git a/mail/mutt-devel/patches/patch-ag b/mail/mutt-devel/patches/patch-ag
new file mode 100644
index 00000000000..33eea7e0c1e
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2004/07/21 22:37:10 jlam Exp $
+
+--- doc/Makefile.in.orig	Sat Dec  7 09:15:01 2002
++++ doc/Makefile.in
+@@ -79,7 +79,7 @@ install: all instdoc
+ 	./instdoc $(srcdir)/dotlock.man \
+ 		$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
+ 	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
+-	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
++	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mutt-mbox.5
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
+ 	for f in $(srcdir_DOCFILES) ; do \
+ 		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
diff --git a/mail/mutt-devel/patches/patch-ah b/mail/mutt-devel/patches/patch-ah
new file mode 100644
index 00000000000..ea0e144b4c4
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-ah
@@ -0,0 +1,18 @@
+$NetBSD: patch-ah,v 1.1 2004/07/21 22:37:10 jlam Exp $
+
+--- init.h.orig	Sun Feb  1 12:15:17 2004
++++ init.h
+@@ -280,6 +280,13 @@ struct option_t MuttVars[] = {
+   ** .pp
+   ** Character set your terminal uses to display and enter textual data.
+   */
++  { "change_folder_next", DT_BOOL, R_NONE, OPTCHANGEFOLDERNEXT, 0 },
++  /*
++  ** .pp
++  ** When this variable is set, the change-folder command will start at the
++  ** next folder after the current folder in your mailbox list instead of
++  ** starting at the first folder.
++  */
+   { "check_new",	DT_BOOL, R_NONE, OPTCHECKNEW, 1 },
+   /*
+   ** .pp
diff --git a/mail/mutt-devel/patches/patch-ai b/mail/mutt-devel/patches/patch-ai
new file mode 100644
index 00000000000..976232127d0
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-ai
@@ -0,0 +1,12 @@
+$NetBSD: patch-ai,v 1.1 2004/07/21 22:37:10 jlam Exp $
+
+--- mutt.h.orig	Sun Feb  1 12:15:17 2004
++++ mutt.h
+@@ -328,6 +328,7 @@ enum
+   OPTBEEP,
+   OPTBEEPNEW,
+   OPTBOUNCEDELIVERED,
++  OPTCHANGEFOLDERNEXT,
+   OPTCHECKNEW,
+   OPTCOLLAPSEUNREAD,
+   OPTCONFIRMAPPEND,
diff --git a/mail/mutt-devel/patches/patch-al b/mail/mutt-devel/patches/patch-al
new file mode 100644
index 00000000000..3073ec127ad
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-al
@@ -0,0 +1,15 @@
+$NetBSD: patch-al,v 1.1 2004/07/21 22:37:10 jlam Exp $
+
+--- configure.orig	Sun Feb  1 13:22:06 2004
++++ configure
+@@ -7842,9 +7842,8 @@ EOF
+ 
+ fi
+ 
+-CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/intl"
+-
+ if test "$BUILD_INCLUDED_LIBINTL" = "yes"; then
++  CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/intl"
+   cat >> confdefs.h <<\EOF
+ #define HAVE_BIND_TEXTDOMAIN_CODESET 1
+ EOF