Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 2 Aug 2003 19:39:42 +0200 (CEST)
From:      Udo Schweigert <udo.schweigert@siemens.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/55189: maintainer-update of mail/mutt-devel
Message-ID:  <200308021739.h72Hdg9s073025@alaska.cert.siemens.de>
Resent-Message-ID: <200308021740.h72HeDXK028054@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>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:
 
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200308021739.h72Hdg9s073025>