Date: Mon, 28 Jan 2002 11:35:16 +0100 (CET) From: Udo Schweigert <udo.schweigert@siemens.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/34369: maintainer-update of mail/mutt-devel Message-ID: <200201281035.g0SAZGKP019906@reims.mchp.siemens.de>
next in thread | raw e-mail | index | archive | help
>Number: 34369
>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: Mon Jan 28 02:40:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Udo Schweigert
>Release: FreeBSD 4.5-RC i386
>Organization:
>Environment:
System: FreeBSD alaska.cert.siemens.de 4.5-RC FreeBSD 4.5-RC #40: Thu Jan 10 09:39:52 CET 2002 ust@alaska.cert.siemens.de:/usr/obj/work/src/RELENG_4/sys/alaska i386
>Description:
Update of mail/mutt-devel:
- Use the latest patches from www.mutt.org.ua
- Make the dependency on sgmlformat configurable by the new knob
WITHOUT_MUTT_SGMLFORMAT (requested by Neil Darlow <neil@darlow.co.uk>)
>How-To-Repeat:
>Fix:
diff -ru --exclude=CVS /usr/ports/mail/mutt-devel/Makefile mutt-devel/Makefile
--- /usr/ports/mail/mutt-devel/Makefile Wed Jan 23 00:12:14 2002
+++ mutt-devel/Makefile Mon Jan 28 11:30:36 2002
@@ -21,6 +21,11 @@
# If you want to install the mutt documentation in html format define:
# WITH_MUTT_HTML
#
+# If you do not want that the documentation is rebuilt using sgmlformat
+# define:
+# WITHOUT_MUTT_SGMLFORMAT
+# (this can't be stated if WITH_MUTT_HTML is defined)
+#
# If you want to read news with mutt define:
# WITH_MUTT_NNTP
# (note that this implies building of the inn-stable port to be able to
@@ -42,8 +47,7 @@
PORTNAME= mutt-devel
PORTVERSION= 1.3.27
-PORTREVISION= 1
-PATCH_VERSION= 1.3.26
+PORTREVISION= 2
CATEGORIES+= mail
.if defined(WITH_MUTT_NNTP)
CATEGORIES+= news
@@ -124,7 +128,12 @@
LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \
giconv.2:${PORTSDIR}/converters/libiconv
+.if defined(NOPORTDOCS)
+WITHOUT_MUTT_SGMLFORMAT= yes
+.endif
+.if !defined(WITHOUT_MUTT_SGMLFORMAT)
BUILD_DEPENDS+= sgmlfmt:${PORTSDIR}/textproc/sgmlformat
+.endif
.if defined(USE_SLANG)
LIB_DEPENDS+= slang.1:${PORTSDIR}/devel/libslang
.elif defined(USE_NCURSES) && ${OSVERSION} < 400000
@@ -208,6 +217,14 @@
.else
PLIST_SUB+= SUB_NNTP="@comment "
.endif
+.if defined(WITHOUT_MUTT_SGMLFORMAT)
+.if defined(WITH_MUTT_HTML)
+.error You can't say both: WITH_MUTT_HTML and WITHOUT_MUTT_SGMLFORMAT
+.endif
+PLIST_SUB+= SUB_SGML="@comment "
+.else
+PLIST_SUB+= SUB_SGML=""
+.endif
.if defined(WITH_MUTT_HTML)
PLIST_SUB+= SUB_HTML=""
.if defined(WITH_MUTT_IMAP) || defined(WITH_MUTT_POP)
@@ -827,6 +844,7 @@
.else # NOPORTDOCS
PLIST_SUB+= SUB_HTML="@comment "
PLIST_SUB+= SUB_NNTP="@comment "
+PLIST_SUB+= SUB_SGML="@comment "
PLIST_SUB+= SUB_ADD_A="@comment "
PLIST_SUB+= SUB_ADD_B="@comment "
PLIST_SUB+= SUB_ADD_C="@comment "
@@ -853,9 +871,13 @@
@${ECHO} "===> Installing Mutt documentation"
@${MKDIR} ${PREFIX}/share/doc/mutt && \
${CHMOD} a+rx ${PREFIX}/share/doc/mutt
- @cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt manual.latin1 \
+ @cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt \
PGP-Notes.txt ../ABOUT-NLS ../contrib/language* \
${PREFIX}/share/doc/mutt
+.if !defined(WITHOUT_MUTT_SGMLFORMAT)
+ @cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.latin1 \
+ ${PREFIX}/share/doc/mutt
+.endif
.if defined(WITH_MUTT_NNTP)
@cd ${WRKSRC} ; ${INSTALL_MAN} ChangeLog.nntp \
${PREFIX}/share/doc/mutt
diff -ru --exclude=CVS /usr/ports/mail/mutt-devel/distinfo mutt-devel/distinfo
--- /usr/ports/mail/mutt-devel/distinfo Mon Jan 28 06:15:31 2002
+++ mutt-devel/distinfo Mon Jan 28 10:45:04 2002
@@ -1,6 +1,6 @@
MD5 (mutt/mutt-1.3.27i.tar.gz) = 88e7e61686b0959733ae3f7cadb07bce
-MD5 (mutt/patch-1.3.26.rr.compressed.gz) = 50022cbc701ce743e6d4b079fa79afd9
-MD5 (mutt/patch-1.3.26.vvv.nntp.gz) = 2681fd642fec4440b21dbb998ccf156c
-MD5 (mutt/patch-1.3.26.vvv.initials.gz) = 5493b3b59c8403510a5ac36eec39b247
-MD5 (mutt/patch-1.3.26.vvv.quote.gz) = afa621c7b8a3ebb57b8067fcc19189a3
-MD5 (mutt/patch-1.3.26.vvv.ru.gz) = 8a76bdc1a8853f339fe3827b9b008856
+MD5 (mutt/patch-1.3.27.rr.compressed.gz) = a821153bf644a9bb98552177c66f9201
+MD5 (mutt/patch-1.3.27.vvv.nntp.gz) = ab347aa1c1455e4321a64d68c35afe61
+MD5 (mutt/patch-1.3.27.vvv.initials.gz) = 774d654d99a5e113c34dcd325eae65b8
+MD5 (mutt/patch-1.3.27.vvv.quote.gz) = 413dcc9493823146f1cf7fdbd2a4f68d
+MD5 (mutt/patch-1.3.27.vvv.ru.gz) = e8b01d6783fcf2737067d8c4534ad246
diff -ru --exclude=CVS /usr/ports/mail/mutt-devel/pkg-plist mutt-devel/pkg-plist
--- /usr/ports/mail/mutt-devel/pkg-plist Wed Jan 23 00:12:14 2002
+++ mutt-devel/pkg-plist Mon Jan 28 11:23:43 2002
@@ -50,7 +50,7 @@
%%PORTDOCS%%share/doc/mutt/language.txt
%%PORTDOCS%%share/doc/mutt/language50.txt
%%PORTDOCS%%share/doc/mutt/manual.txt
-%%PORTDOCS%%share/doc/mutt/manual.latin1
+%%SUB_SGML%%share/doc/mutt/manual.latin1
%%PORTDOCS%%share/doc/mutt/patch-notes.txt
%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.aix-3.2.5.rc
%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.aix-4.1.5.rc
>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?200201281035.g0SAZGKP019906>