Date: Mon, 11 Nov 2002 14:59:31 +0100 (CET) From: Udo Schweigert <udo.schweigert@siemens.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Alan Eldridge <alane@FreeBSD.org> Subject: ports/45212: maintainer-update of mail/mutt Message-ID: <200211111359.gABDxVGn080720@alaska.cert.siemens.de>
next in thread | raw e-mail | index | archive | help
>Number: 45212
>Category: ports
>Synopsis: maintainer-update of mail/mutt
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Nov 11 06:00:05 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Udo Schweigert
>Release: FreeBSD 4.7-STABLE i386
>Organization:
>Environment:
Tested with:
4.5-RELEASE-p22
4.7-RELEASE-p1
5.0-CURRENT
>Description:
Maintainer update of mail/mutt:
- Fix build with new bsd.port.mk
- Use REINPLACE_CMD instead of perl
- Fix warning messages in -current.
>How-To-Repeat:
>Fix:
diff -ru /usr/ports/mail/mutt/Makefile ./Makefile
--- /usr/ports/mail/mutt/Makefile Tue Nov 5 06:30:56 2002
+++ ./Makefile Mon Nov 11 13:21:18 2002
@@ -60,7 +60,7 @@
USE_OPENSSL= yes
GNU_CONFIGURE= yes
USE_AUTOMAKE= yes # configure.in is patched by <PATCHFILES>
-AUTOMAKE_ARGS= --include-deps
+USE_REINPLACE= yes
CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LDFLAGS=-L${LOCALBASE}/lib
CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl \
@@ -88,10 +88,11 @@
# this should be done automagically by aclocal but ....
# for now, this will have to do
pre-build:
- @${PERL} -pi -e "s/^(ACLOCAL = ).+/\1${ACLOCAL}/; s/^(AUTOCONF = ).+/\1${AUTOCONF}/; \
- s/^(AUTOMAKE = ).+/\1${AUTOMAKE}/; s/^(AUTOHEADER = ).+/\1${AUTOHEADER}/" \
+ ${REINPLACE_CMD} -E -e "s|^(ACLOCAL = ).+|\1${ACLOCAL}|" \
+ -e "s|^(AUTOCONF = ).+|\1${AUTOCONF}|" \
+ -e "s|^(AUTOMAKE = ).+|\1${AUTOMAKE}|" \
+ -e "s|^(AUTOHEADER = ).+|\1${AUTOHEADER}|" \
${BUILD_WRKSRC}/Makefile
- cd ${WRKSRC} && ${MAKE} keymap_defs.h
.if !defined(NOPORTDOCS)
post-build:
diff -ru /usr/ports/mail/mutt/files/patch-configure.in ./files/patch-configure.in
--- /usr/ports/mail/mutt/files/patch-configure.in Mon Jul 29 06:30:44 2002
+++ ./files/patch-configure.in Mon Nov 11 14:24:38 2002
@@ -1,5 +1,5 @@
---- configure.in.orig Fri Jun 21 14:52:03 2002
-+++ configure.in Fri Jun 21 14:54:07 2002
+--- configure.in.orig Mon Nov 11 14:11:26 2002
++++ configure.in Mon Nov 11 14:12:09 2002
@@ -515,7 +515,7 @@
AC_MSG_ERROR([SSL support is only useful with POP or IMAP support])
fi
@@ -18,12 +18,12 @@
LDFLAGS="$LDFLAGS -L$with_sasl/lib"
fi
-@@ -609,6 +609,8 @@
- [if test $enableval = yes; then
- AC_DEFINE(USE_FLOCK,1, [ Define to use flock() to lock mailboxes. ])
- fi])
-+
-+MUTTLIBS="$MUTTLIBS -lxpg4"
+@@ -625,7 +625,7 @@
+ fi])
- mutt_cv_fcntl=yes
- AC_ARG_ENABLE(fcntl, [ --disable-fcntl Do NOT use fcntl() to lock files ],
+ if test x$GCC = xyes -a $mutt_cv_warnings = yes; then
+- CFLAGS="-Wall -pedantic $CFLAGS"
++ CFLAGS="-Wall $CFLAGS"
+ fi
+
+ AC_ARG_ENABLE(nfs-fix, [ --enable-nfs-fix Work around an NFS with broken attributes caching ],
>Release-Note:
>Audit-Trail:
>Unformatted:
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?200211111359.gABDxVGn080720>