From owner-freebsd-ports Wed Nov 28 8:50:40 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 85FF937B417 for ; Wed, 28 Nov 2001 08:50:02 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id fASGo2x68401; Wed, 28 Nov 2001 08:50:02 -0800 (PST) (envelope-from gnats) Date: Wed, 28 Nov 2001 08:50:02 -0800 (PST) Message-Id: <200111281650.fASGo2x68401@freefall.freebsd.org> To: freebsd-ports@FreeBSD.org Cc: From: Udo Schweigert Subject: Re: ports/32341: maintainer-update of mail/mutt-devel Reply-To: Udo Schweigert Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org The following reply was made to PR ports/32341; it has been noted by GNATS. From: Udo Schweigert To: freebsd-gnats-submit@FreeBSD.org, freebsd-ports@FreeBSD.org Cc: Subject: Re: ports/32341: maintainer-update of mail/mutt-devel Date: Wed, 28 Nov 2001 17:42:18 +0100 And here is an updated patch, reflecting the most recent changes to Mk/bsd.port.mk and thus using the new AUTO{CONF,MAKE} variables. Now the port again uses USE_AUTOMAKE_VER which in turn calls AUTOMAKE, but there is no other way of getting ACLOCAL to be defined (ACLOCAL is the only part of AUTOMAKE which is really needed) The first submitted patch is included in this one. Best regards -- Udo Schweigert, Siemens AG | Voice : +49 89 636 42170 CT IC 3, Siemens CERT | Fax : +49 89 636 41166 D-81730 Muenchen / Germany | email : udo.schweigert@siemens.com diff -ru /usr/ports/mail/mutt-devel/Makefile mutt-devel/Makefile --- /usr/ports/mail/mutt-devel/Makefile Wed Nov 14 08:13:21 2001 +++ mutt-devel/Makefile Wed Nov 28 17:33:37 2001 @@ -31,8 +31,8 @@ .include -USE_AUTOCONF= yes -AUTOCONF= autoconf +USE_AUTOCONF= yes +USE_AUTOMAKE_VER= 15 .if defined(WITH_MUTT_COMPRESSED_FOLDERS) || defined(WITH_MUTT_NNTP) || \ defined(WITH_MUTT_RU_PATCH) || defined(WITH_MUTT_QUOTE_PATCH) @@ -46,8 +46,6 @@ PATCH_VERSION= ${PORTVERSION} .endif -BUILD_DEPENDS+= automake:${PORTSDIR}/devel/automake \ - autoconf:${PORTSDIR}/devel/autoconf .if defined(PACKAGE_BUILDING) WITH_MUTT_SLANG= yes WITH_MUTT_IMAP= yes @@ -83,6 +81,10 @@ ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-inews .endif .endif +.if defined(WITH_MUTT_CYRUS_SASL) +LIB_DEPENDS+= sasl.8:${PORTSDIR}/security/cyrus-sasl +.endif + .if defined(WITH_MUTT_LOCALES_FIX) CONFIGURE_ARGS+= --enable-locales-fix @@ -101,6 +103,11 @@ .if defined(WITH_MUTT_IMAP) CONFIGURE_ARGS+= --enable-imap .endif +.if defined(WITH_MUTT_CYRUS_SASL) +CONFIGURE_ARGS+= --enable-imap \ + --with-sasl=${LOCALBASE} +WITH_MUTT_IMAP= yes +.endif .if defined(WITH_MUTT_POP_IMAP) CONFIGURE_ARGS+= --enable-pop --enable-imap .endif @@ -134,7 +141,7 @@ @${CHMOD} 700 ${WRKSRC}/patchlist.sh pre-configure:: - (cd ${WRKSRC}; aclocal -I m4) + (cd ${WRKSRC}; ${ACLOCAL} -I m4) .if !defined(NOPORTDOCS) post-build: diff -ru /usr/ports/mail/mutt-devel/files/patch-01 mutt-devel/files/patch-01 --- /usr/ports/mail/mutt-devel/files/patch-01 Thu Jul 26 09:29:14 2001 +++ mutt-devel/files/patch-01 Wed Nov 28 17:12:55 2001 @@ -1,5 +1,14 @@ ---- configure.in.orig Tue Jul 24 23:27:40 2001 -+++ configure.in Wed Jul 25 07:51:00 2001 +--- configure.in.orig Thu Nov 8 23:39:59 2001 ++++ configure.in Mon Nov 26 20:29:39 2001 +@@ -569,7 +569,7 @@ + then + if test "$with_sasl" != "yes" + then +- CPPFLAGS="$CPPFLAGS -I$with_sasl/include" ++ CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl" + LDFLAGS="$LDFLAGS -L$with_sasl/lib" + fi + @@ -674,7 +674,7 @@ mutt_save_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message