diff options
| author | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2002-11-11 14:29:03 +0000 |
|---|---|---|
| committer | Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> | 2002-11-11 14:29:03 +0000 |
| commit | 93fc6edbdc3052f9764b588eaf829c0decd5528a (patch) | |
| tree | 509ee449544d0f284af7d3545d361193881e8fc4 /mail/mutt14 | |
| parent | - Update to version 1.3.7 (diff) | |
o Fix build to match recent updates in GNU auto* support in bsd.port.mk
o Deploy USE_REINPLACE instead of PERL
o Fix warning messages in -CURRENT
PR: 45212
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=69896
Diffstat (limited to 'mail/mutt14')
| -rw-r--r-- | mail/mutt14/Makefile | 9 | ||||
| -rw-r--r-- | mail/mutt14/files/patch-configure.in | 20 |
2 files changed, 15 insertions, 14 deletions
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile index b92de8b9820b..948ecd20c95a 100644 --- a/mail/mutt14/Makefile +++ b/mail/mutt14/Makefile @@ -60,7 +60,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} 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 @@ MAN5= mbox.5 muttrc.5 # 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 --git a/mail/mutt14/files/patch-configure.in b/mail/mutt14/files/patch-configure.in index 20909e07a9a0..0b37933c1c62 100644 --- a/mail/mutt14/files/patch-configure.in +++ b/mail/mutt14/files/patch-configure.in @@ -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 ], |