Date: Fri, 4 Jan 2002 16:37:03 +0100 (CET) From: Udo Schweigert <udo.schweigert@siemens.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/33536: maintainer update of mail/mutt-devel Message-ID: <200201041537.g04Fb3RU075919@reims.mchp.siemens.de>
next in thread | raw e-mail | index | archive | help
>Number: 33536
>Category: ports
>Synopsis: maintainer update of mail/mutt-devel
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Jan 04 07:40:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Udo Schweigert
>Release: FreeBSD 4.5-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD alaska.cert.siemens.de 4.5-PRERELEASE FreeBSD 4.5-PRERELEASE #38: Sat Dec 22 08:45:23 CET 2001 ust@alaska.cert.siemens.de:/usr/obj/work/src/RELENG_4/sys/alaska i386
>Description:
Update of port mail/mutt-devel. This update fixes:
- detection of libraries by configure.
- superflouous installation of some html files.
- additional doc files when NNTP support is wanted.
- fix the missing ca-locale file in pkg-plist.
These four were submitted by Vsevolod Volkov <vvv@mutt.org.ua>.
Also changed:
- WITH_MUTT_SLANG is now the default (which can be changed by defining
WITHOUT_MUTT_SLANG)
- fixed the usage of WITH_MUTT_NCURSES (ncurses is part of the base system
since 4.0)
- WITH_MUTT_SSL is included when PACKAGE_BUILDING is defined
- some hints which knobs are available at the beginning of the Makefile
>How-To-Repeat:
>Fix:
diff -ru --exclude=CVS /usr/ports/mail/mutt-devel/Makefile mutt-devel/Makefile
--- /usr/ports/mail/mutt-devel/Makefile Thu Jan 3 22:58:52 2002
+++ mutt-devel/Makefile Fri Jan 4 16:23:09 2002
@@ -6,8 +6,43 @@
# $FreeBSD: ports/mail/mutt-devel/Makefile,v 1.142 2002/01/03 21:58:52 jim Exp $
#
+# There are several knobs which are used to define additions to the core
+# mutt functionality. The two most important are:
+#
+# WITH_MUTT_IMAP, which should be defined if you are accessing an IMAP server
+# (here you also can say WITH_MUTT_SSL, if your IMAP server is SSL capable)
+# WITH_MUTT_POP, which should be defined if you are accessing a POP server
+# (here you also can say WITH_MUTT_SSL, if your POP server is SSL capable)
+#
+# In general you can choose between using the SLANG port (which is really
+# recommended and is now the default) and ncurses (WITH_MUTT_NCURSES). If you
+# don't want to use SLANG define WITHOUT_MUTT_SLANG.
+#
+# If you want to install the mutt documentation in html format define:
+# WITH_MUTT_HTML
+#
+# If you want to read news with mutt define:
+# WITH_MUTT_NNTP
+# (note that this implies building of the inn port to be able to post new
+# articles)
+#
+# If you want to use the SASL authentication features with your email server
+# define
+# WITH_MUTT_CYRUS_SASL
+#
+# If you want to access compressed email folders define:
+# WITH_MUTT_COMPRESSED_FOLDERS
+#
+# If you want to enable extended quoting functions define:
+# WITH_MUTT_QUOTE_PATCH
+#
+# If you want to enable extended functions for the ru locale define:
+# WITH_MUTT_RU_PATCH
+
+
PORTNAME= mutt-devel
PORTVERSION= 1.3.25
+PORTREVISION= 1
CATEGORIES+= mail
.if defined(WITH_MUTT_NNTP)
CATEGORIES+= news
@@ -25,6 +60,7 @@
MAINTAINER= udo.schweigert@siemens.com
DIST_SUBDIR= mutt
+CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LDFLAGS=-L${LOCALBASE}/lib
CONFIGURE_ARGS= --enable-flock --disable-fcntl \
--with-sharedir=${PREFIX}/share/mutt \
--with-docdir=${PREFIX}/share/doc/mutt \
@@ -56,6 +92,7 @@
.endif
.if defined(PACKAGE_BUILDING)
+WITH_MUTT_SSL= yes
WITH_MUTT_SLANG= yes
WITH_MUTT_IMAP= yes
WITH_MUTT_POP= yes
@@ -67,6 +104,20 @@
WITH_MUTT_HTML= yes
.endif
.endif
+
+.if defined(WITH_MUTT_SLANG)
+USE_SLANG= yes
+.endif
+.if defined(WITH_MUTT_NCURSES_PORT)
+WITH_MUTT_NCURSES= yes
+.endif
+.if defined(WITH_MUTT_NCURSES) && !defined(USE_SLANG)
+USE_NCURSES= yes
+.endif
+.if !defined(USE_SLANG) && !defined(WITHOUT_MUTT_SLANG) && !defined(USE_NCURSES)
+USE_SLANG= yes
+.endif
+
.if defined(WITH_MUTT_SSL) && !defined(WITH_MUTT_IMAP) && \
!defined(WITH_MUTT_POP)
WITH_MUTT_IMAP= yes
@@ -75,9 +126,9 @@
LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \
giconv.2:${PORTSDIR}/converters/libiconv
-.if defined(WITH_MUTT_SLANG)
+.if defined(USE_SLANG)
LIB_DEPENDS+= slang.1:${PORTSDIR}/devel/libslang
-.elif defined(WITH_MUTT_NCURSES_PORT)
+.elif defined(USE_NCURSES) && ${OSVERSION} < 400000
LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses
CFLAGS+= -I${PREFIX}/include/ncurses -I${PREFIX}/include
.endif
@@ -99,9 +150,9 @@
.if defined(WITH_MUTT_LOCALES_FIX)
CONFIGURE_ARGS+= --enable-locales-fix
.endif
-.if defined(WITH_MUTT_SLANG)
+.if defined(USE_SLANG)
CONFIGURE_ARGS+= --with-slang=${PREFIX}
-.elif defined(WITH_MUTT_NCURSES_PORT)
+.elif defined(USE_NCURSES) && ${OSVERSION} < 400000
CONFIGURE_ARGS+= --with-curses=${PREFIX}
.endif
.if defined(WITH_MUTT_SSL)
@@ -157,6 +208,11 @@
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref
printf ",s|\$${PREFIX}|%s|g\nw\nq\n" ${PREFIX} | \
ed -s ${WRKSRC}/doc/mutt.man
+.if defined(WITH_MUTT_NNTP)
+PLIST_SUB+= SUB_NNTP=""
+.else
+PLIST_SUB+= SUB_NNTP="@comment "
+.endif
.if defined(WITH_MUTT_HTML)
PLIST_SUB+= SUB_HTML=""
.if defined(WITH_MUTT_IMAP) || defined(WITH_MUTT_POP)
@@ -775,6 +831,7 @@
.endif
.else # NOPORTDOCS
PLIST_SUB+= SUB_HTML="@comment "
+PLIST_SUB+= SUB_NNTP="@comment "
PLIST_SUB+= SUB_ADD_A="@comment "
PLIST_SUB+= SUB_ADD_B="@comment "
PLIST_SUB+= SUB_ADD_C="@comment "
@@ -802,7 +859,12 @@
@${MKDIR} ${PREFIX}/share/doc/mutt && \
${CHMOD} a+rx ${PREFIX}/share/doc/mutt
@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
+ ../ABOUT-NLS ../contrib/language* \
${PREFIX}/share/doc/mutt
+.if defined(WITH_MUTT_NNTP)
+ @cd ${WRKSRC} ; ${INSTALL_MAN} ChangeLog.nntp \
+ ${PREFIX}/share/doc/mutt
+.endif
.if defined(WITH_MUTT_HTML)
@${MKDIR} ${PREFIX}/share/doc/mutt/html && \
${CHMOD} a+rx ${PREFIX}/share/doc/mutt/html
diff -ru --exclude=CVS /usr/ports/mail/mutt-devel/files/patch-02 mutt-devel/files/patch-02
--- /usr/ports/mail/mutt-devel/files/patch-02 Fri Jan 4 09:43:13 2002
+++ mutt-devel/files/patch-02 Fri Jan 4 14:13:32 2002
@@ -9,7 +9,7 @@
try-html: ../makedoc
- test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
-+ $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
++ rm *.html && $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
try-txt: ../makedoc
- test -f manual.txt || $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
diff -ru --exclude=CVS /usr/ports/mail/mutt-devel/pkg-plist mutt-devel/pkg-plist
--- /usr/ports/mail/mutt-devel/pkg-plist Fri Jan 4 09:43:13 2002
+++ mutt-devel/pkg-plist Fri Jan 4 14:13:32 2002
@@ -7,6 +7,7 @@
bin/pgpring
etc/Muttrc
etc/mime.types
+share/locale/ca/LC_MESSAGES/mutt.mo
share/locale/cs/LC_MESSAGES/mutt.mo
share/locale/da/LC_MESSAGES/mutt.mo
share/locale/de/LC_MESSAGES/mutt.mo
@@ -32,6 +33,7 @@
share/locale/uk/LC_MESSAGES/mutt.mo
share/locale/zh_CN/LC_MESSAGES/mutt.mo
share/locale/zh_TW/LC_MESSAGES/mutt.mo
+%%PORTDOCS%%share/doc/mutt/ABOUT-NLS
%%PORTDOCS%%share/doc/mutt/PGP-Notes.txt
%%PORTDOCS%%share/doc/mutt/applying-patches.txt
%%PORTDOCS%%share/doc/mutt/devel-notes.txt
@@ -39,11 +41,14 @@
%%PORTDOCS%%share/doc/mutt/GPL
%%PORTDOCS%%share/doc/mutt/INSTALL
%%PORTDOCS%%share/doc/mutt/ChangeLog
+%%SUB_NNTP%%share/doc/mutt/ChangeLog.nntp
%%PORTDOCS%%share/doc/mutt/README
%%PORTDOCS%%share/doc/mutt/NEWS
%%PORTDOCS%%share/doc/mutt/TODO
%%PORTDOCS%%share/doc/mutt/README.SECURITY
%%PORTDOCS%%share/doc/mutt/README.SSL
+%%PORTDOCS%%share/doc/mutt/language.txt
+%%PORTDOCS%%share/doc/mutt/language50.txt
%%PORTDOCS%%share/doc/mutt/manual.txt
%%PORTDOCS%%share/doc/mutt/patch-notes.txt
%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.aix-3.2.5.rc
@@ -77,13 +82,6 @@
%%PORTDOCS%%@dirrm share/doc/mutt/samples/iconv
%%PORTDOCS%%@dirrm share/doc/mutt/samples
%%SUB_HTML%%share/doc/mutt/manual.latin1
-%%SUB_HTML%%share/doc/mutt/html/manual-1.html
-%%SUB_HTML%%share/doc/mutt/html/manual-2.html
-%%SUB_HTML%%share/doc/mutt/html/manual-3.html
-%%SUB_HTML%%share/doc/mutt/html/manual-4.html
-%%SUB_HTML%%share/doc/mutt/html/manual-5.html
-%%SUB_HTML%%share/doc/mutt/html/manual-6.html
-%%SUB_HTML%%share/doc/mutt/html/manual-7.html
%%SUB_HTML%%share/doc/mutt/html/manual.html
%%SUB_HTML%%share/doc/mutt/html/manual_toc.html
%%SUB_HTML%%share/doc/mutt/html/manual1.html
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200201041537.g04Fb3RU075919>