From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 17 20:20:10 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B077416A4CE for ; Tue, 17 May 2005 20:20:10 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6ECA643D79 for ; Tue, 17 May 2005 20:20:09 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j4HKK3OE047555 for ; Tue, 17 May 2005 20:20:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j4HKK3bL047554; Tue, 17 May 2005 20:20:03 GMT (envelope-from gnats) Resent-Date: Tue, 17 May 2005 20:20:03 GMT Resent-Message-Id: <200505172020.j4HKK3bL047554@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Udo Schweigert Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 22FD816A4CE for ; Tue, 17 May 2005 20:19:16 +0000 (GMT) Received: from david.siemens.de (david.siemens.de [192.35.17.14]) by mx1.FreeBSD.org (Postfix) with ESMTP id 50D1343D88 for ; Tue, 17 May 2005 20:19:15 +0000 (GMT) (envelope-from udo.schweigert@siemens.com) Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by david.siemens.de (8.12.6/8.12.6) with ESMTP id j4HKJ9wP012356 for ; Tue, 17 May 2005 22:19:09 +0200 Received: from mars.cert.siemens.com (mars.cert.siemens.com [139.25.19.9]) by mail3.siemens.de (8.12.6/8.12.6) with ESMTP id j4HKJ9fG022204 for ; Tue, 17 May 2005 22:19:09 +0200 Received: from alaska.cert.siemens.com (alaska.cert.siemens.com [139.25.19.64]) mail/cert.mc.pre,v 1.67 2005/05/09 15:42:50 mailadm Exp $) with ESMTP id j4HKJ9Xq003385 for ; Tue, 17 May 2005 22:19:09 +0200 (CEST) Received: from alaska.cert.siemens.com (alaska.cert.siemens.de [127.0.0.1]) hosts/alaska/mail/config.mc,v 1.19 2004/08/29 16:18:57 ust Exp $) with ESMTP id j4HKJ9Jb088704 for ; Tue, 17 May 2005 22:19:09 +0200 (CEST) (envelope-from ust@alaska.cert.siemens.com) Received: (from ust@localhost) hosts/alaska/mail/submit.mc,v 1.6 2004/08/29 16:18:57 ust Exp $) id j4HKJ9wo067952; Tue, 17 May 2005 22:19:09 +0200 (CEST) (envelope-from ust) Message-Id: <200505172019.j4HKJ9wo067952@alaska.cert.siemens.com> Date: Tue, 17 May 2005 22:19:09 +0200 (CEST) From: Udo Schweigert To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/81175: maintainer-update of mail/mutt-devel X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Udo Schweigert List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 May 2005 20:20:11 -0000 >Number: 81175 >Category: ports >Synopsis: maintainer-update of mail/mutt-devel >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue May 17 20:20:03 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Udo Schweigert >Release: FreeBSD 5.4-RELEASE i386 >Organization: >Environment: >Description: Maintainer update of mail/mutt-devel: - Add WITHOUT_MUTT_FLOCK knob. - Fix the WITH_MUTT_SIDEBAR_PATCH knob. >How-To-Repeat: >Fix: diff -ru /usr/ports/mail/mutt-devel/Makefile ./Makefile --- /usr/ports/mail/mutt-devel/Makefile Mon May 9 06:06:59 2005 +++ ./Makefile Tue May 17 17:41:50 2005 @@ -90,6 +90,9 @@ # If you want to have the Mailbox Sidebar patch define: # WITH_MUTT_SIDEBAR_PATCH # +# If you do not want mutt to use the flock() function define: +# WITHOUT_MUTT_FLOCK +# PORTNAME= mutt-devel PORTVERSION= 1.5.9 @@ -132,7 +135,7 @@ DATADIR?= ${PREFIX}/share/mutt LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --enable-flock --disable-fcntl --with-ssl=${OPENSSLBASE} \ +CONFIGURE_ARGS= --disable-fcntl --with-ssl=${OPENSSLBASE} \ --with-sharedir=${PREFIX}/share/mutt --with-docdir=${DOCSDIR} \ --sysconfdir=${PREFIX}/etc --enable-external-dotlock \ --enable-pop --enable-imap --disable-warnings @@ -298,7 +301,6 @@ .endif .if defined(WITH_MUTT_SIDEBAR_PATCH) -.error The WITH_MUTT_SIDEBAR_PATCH is not available at the moment pre-configure:: @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-sidebar .endif @@ -308,6 +310,11 @@ @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-aspell .endif +.if defined(WITHOUT_MUTT_FLOCK) +CONFIGURE_ARGS+= --disable-flock +.else +CONFIGURE_ARGS+= --enable-flock +.endif .if defined(WITH_MUTT_LOCALES_FIX) CONFIGURE_ARGS+= --enable-locales-fix .endif @@ -376,7 +383,14 @@ PATCHFILES+= p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw .endif .if defined(WITH_MUTT_SIDEBAR_PATCH) -PATCHFILES+= patch-1.5.8i.sidebar.20050224.txt:thomer +SIDEBAR_PATCH= patch-1.5.8i.sidebar.20050224.txt +DISTFILES+= $(SIDEBAR_PATCH):thomer +SGML_NEEDED= yes +pre-patch:: + @${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/$(SIDEBAR_PATCH) > ${WRKDIR}/patch-sidebar + @${REINPLACE_CMD} -E '/^diff.*\/Makefile.in$$/,/^diff/d' \ + ${WRKDIR}/patch-sidebar + @${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-sidebar .endif WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} >Release-Note: >Audit-Trail: >Unformatted: