From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 2 10:40:16 2003 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 6351037B404 for ; Sat, 2 Aug 2003 10:40:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA3D943FD7 for ; Sat, 2 Aug 2003 10:40:13 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h72HeDUp028055 for ; Sat, 2 Aug 2003 10:40:13 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h72HeDXK028054; Sat, 2 Aug 2003 10:40:13 -0700 (PDT) Resent-Date: Sat, 2 Aug 2003 10:40:13 -0700 (PDT) Resent-Message-Id: <200308021740.h72HeDXK028054@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 93C9B37B401 for ; Sat, 2 Aug 2003 10:39:46 -0700 (PDT) Received: from goliath.siemens.de (goliath.siemens.de [192.35.17.28]) by mx1.FreeBSD.org (Postfix) with ESMTP id E15FB43FE0 for ; Sat, 2 Aug 2003 10:39:44 -0700 (PDT) (envelope-from udo.schweigert@siemens.com) Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by goliath.siemens.de (8.11.7/8.11.7) with ESMTP id h72Hdhx03457 for ; Sat, 2 Aug 2003 19:39:43 +0200 (MEST) Received: from mars.cert.siemens.de (ust.mchp.siemens.de [139.23.201.17]) by mail3.siemens.de (8.11.7/8.11.7) with ESMTP id h72HdhG21605 for ; Sat, 2 Aug 2003 19:39:43 +0200 (MEST) Received: from alaska.cert.siemens.de (alaska.cert.siemens.de [139.23.202.134]) 1.46 2003/05/28 09:28:32 ust Exp $) with ESMTP id h72HdgLP058828 for ; Sat, 2 Aug 2003 19:39:42 +0200 (CEST) Received: from alaska.cert.siemens.de (alaska.cert.siemens.de [127.0.0.1]) hosts/alaska/mail/config.mc,v 1.15 2002/12/31 15:32:17 ust Exp $) with ESMTP id h72Hdglh073696 for ; Sat, 2 Aug 2003 19:39:42 +0200 (CEST) (envelope-from ust@alaska.cert.siemens.de) Received: (from ust@localhost) hosts/alaska/mail/submit.mc,v 1.4 2002/12/31 15:32:17 ust Exp $) id h72Hdg9s073025; Sat, 2 Aug 2003 19:39:42 +0200 (CEST) (envelope-from ust) Message-Id: <200308021739.h72Hdg9s073025@alaska.cert.siemens.de> Date: Sat, 2 Aug 2003 19:39:42 +0200 (CEST) From: Udo Schweigert To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/55189: 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: Sat, 02 Aug 2003 17:40:16 -0000 >Number: 55189 >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: Sat Aug 02 10:40:13 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Udo Schweigert >Release: FreeBSD 4.8-STABLE i386 >Organization: >Environment: >Description: Maintainer update of mail/mutt-devel: - Do not remove etc/Muttrc when deinstalling and if it was changed. - Always enable SSL as pop only works with that. - Bump PORTREVISION. >How-To-Repeat: >Fix: diff -ru /usr/ports/mail/mutt-devel/Makefile ./Makefile --- /usr/ports/mail/mutt-devel/Makefile Sun Jul 20 14:09:18 2003 +++ ./Makefile Sat Aug 2 16:28:44 2003 @@ -41,9 +41,6 @@ # WITH_MUTT_QUOTE_PATCH # This is a default knob and can be disabled by WITHOUT_MUTT_QUOTE_PATCH # -# WITH_MUTT_SSL can be enabled if your IMAP/POP server is SSL capable. -# This is a default knob and can be disabled by WITHOUT_MUTT_SSL -# # If you want to make SMIME outlook compatible define: # WITH_MUTT_SMIME_OUTLOOK_COMPAT # This is a default knob and can be disabled by @@ -75,7 +72,7 @@ PORTNAME= mutt-devel PORTVERSION= 1.5.4 -PORTREVISION?= 5 +PORTREVISION?= 6 CATEGORIES+= mail ipv6 .if defined(WITH_MUTT_NNTP) CATEGORIES+= news @@ -98,7 +95,7 @@ DIST_SUBDIR= mutt CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LDFLAGS=-L${LOCALBASE}/lib -CONFIGURE_ARGS= --enable-flock --disable-fcntl \ +CONFIGURE_ARGS= --enable-flock --disable-fcntl --with-ssl=${OPENSSLBASE} \ --with-sharedir=${PREFIX}/share/mutt \ --with-docdir=${PREFIX}/share/doc/mutt \ --sysconfdir=${PREFIX}/etc --enable-external-dotlock \ @@ -109,6 +106,7 @@ USE_REINPLACE= yes USE_AUTOMAKE= yes +USE_OPENSSL= yes PLIST= ${WRKDIR}/PLIST PKGMESSAGE= ${WRKDIR}/pkg-message @@ -173,9 +171,6 @@ .elif defined(USE_SLANG) LIB_DEPENDS+= slang.1:${PORTSDIR}/devel/libslang .endif -.if !defined(WITHOUT_MUTT_SSL) -USE_OPENSSL= yes -.endif .if defined(WITH_MUTT_CYRUS_SASL) BROKEN= "mutt-devel's SASL code appears to be broken" LIB_DEPENDS+= sasl.8:${PORTSDIR}/security/cyrus-sasl @@ -199,9 +194,6 @@ .elif defined(USE_SLANG) CONFIGURE_ARGS+= --with-slang=${PREFIX} .endif -.if !defined(WITHOUT_MUTT_SSL) -CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} -.endif .if defined(WITH_MUTT_CYRUS_SASL) CONFIGURE_ARGS+= --with-sasl=${LOCALBASE} .endif @@ -310,6 +302,7 @@ post-install: @${ECHO} > ${PKGMESSAGE} + ${INSTALL_DATA} ${WRKSRC}/Muttrc ${PREFIX}/etc/Muttrc.dist .if !defined(NOPORTDOCS) @${ECHO} "===> Installing Mutt documentation" @${MKDIR} ${PREFIX}/share/doc/mutt && \ diff -ru /usr/ports/mail/mutt-devel/scripts/generate-plist ./scripts/generate-plist --- /usr/ports/mail/mutt-devel/scripts/generate-plist Wed Mar 26 19:22:23 2003 +++ ./scripts/generate-plist Sat Aug 2 14:51:40 2003 @@ -28,7 +28,8 @@ bin/pgpewrap bin/pgpring bin/smime_keys -etc/Muttrc +@unexec if cmp -s %D/etc/Muttrc.dist %D/etc/Muttrc; then rm -f %D/etc/Muttrc; fi +etc/Muttrc.dist etc/mime.types share/locale/ca/LC_MESSAGES/mutt.mo share/locale/cs/LC_MESSAGES/mutt.mo >Release-Note: >Audit-Trail: >Unformatted: