Date: Tue, 17 May 2005 22:19:09 +0200 (CEST) From: Udo Schweigert <udo.schweigert@siemens.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/81175: maintainer-update of mail/mutt-devel Message-ID: <200505172019.j4HKJ9wo067952@alaska.cert.siemens.com> Resent-Message-ID: <200505172020.j4HKK3bL047554@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200505172019.j4HKJ9wo067952>