diff options
| author | Christian Weisgerber <naddy@FreeBSD.org> | 2003-08-04 21:57:13 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@FreeBSD.org> | 2003-08-04 21:57:13 +0000 |
| commit | 3edff760b203c5c4996925238dbc3aed050c25d0 (patch) | |
| tree | 4c8e82c7fb249bd8a783cd376998030afa3b6425 /mail | |
| parent | - Do not remove etc/Muttrc when deinstalling and if it was changed. (diff) | |
- Do not remove etc/Muttrc when deinstalling and if it was changed.
- Always enable SSL as pop only works with that.
- Bump PORTREVISION.
PR: 55189
Submitted by: Udo Schweigert <udo.schweigert@siemens.com>
Notes
Notes:
svn path=/head/; revision=86313
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/mutt-devel/Makefile | 15 | ||||
| -rw-r--r-- | mail/mutt-devel/scripts/generate-plist | 3 |
2 files changed, 6 insertions, 12 deletions
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile index 0de801b509bc..446bd37974f1 100644 --- a/mail/mutt-devel/Makefile +++ b/mail/mutt-devel/Makefile @@ -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 @@ COMMENT?= The Mongrel of Mail User Agents (part Elm, Pine, Mush, mh, etc.) 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 @@ CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS} USE_REINPLACE= yes USE_AUTOMAKE= yes +USE_OPENSSL= yes PLIST= ${WRKDIR}/PLIST PKGMESSAGE= ${WRKDIR}/pkg-message @@ -173,9 +171,6 @@ CFLAGS+= -I${PREFIX}/include/ncurses -I${PREFIX}/include .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 @@ CONFIGURE_ARGS+= --with-curses=${PREFIX} .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 @@ pre-install: 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 --git a/mail/mutt-devel/scripts/generate-plist b/mail/mutt-devel/scripts/generate-plist index 044577ac04b2..92e354f4ed4c 100644 --- a/mail/mutt-devel/scripts/generate-plist +++ b/mail/mutt-devel/scripts/generate-plist @@ -28,7 +28,8 @@ bin/muttbug 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 |