Attachment 133416 Details for Bug 177903 – mutt.diff

[patch] mutt.diff

mutt.diff (text/x-diff; charset=us-ascii), 5.15 KB, created by Udo.Schweigert on 2013-04-22 15:43:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Udo.Schweigert

Created: 2013-04-22 15:43:28 UTC

Size: 5.15 KB

patch

obsolete

>diff -ru  /usr/ports/mail/mutt/Makefile ./Makefile
>--- /usr/ports/mail/mutt/Makefile	2013-03-15 23:04:28.759697000 +0100
>+++ ./Makefile	2013-04-22 15:03:37.016604000 +0200
>@@ -60,7 +60,7 @@
> .endif
> .if !defined (LITE)
> OPTIONS_DEFINE=	COMPRESSED_FOLDERS SASL DEBUG FLOCK \
>-		GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \
>+		GPGME GREETING_PATCH GSSAPI HTML ICONV IDN IFDEF_PATCH \
> 		IMAP_HEADER_CACHE LOCALES_FIX MAILBOX_MANPAGES \
> 		MAILDIR_HEADER_CACHE MAILDIR_MTIME_PATCH \
> 		NNTP PARENT_CHILD_MATCH_PATCH \
>@@ -79,6 +79,7 @@
> FLOCK_DESC=	flock() usage
> GPGME_DESC=	Gpgme interface
> GREETING_PATCH_DESC=	Greeting support
>+GSSAPI_DESC=	Use the gss API
> HTML_DESC=	HTML documentation
> IFDEF_PATCH_DESC=	ifdef feature
> IMAP_HEADER_CACHE_DESC=	IMAP header cache
>@@ -412,16 +413,28 @@
> SCRIPTS_ENV+=	IFDEF_PATCH="yes"
> .endif
> 
>+.if ${PORT_OPTIONS:MREVERSE_REPLY_PATCH}
>+SCRIPTS_ENV+=	REVERSE_REPLY_PATCH="yes"
>+.endif
>+
>+.if defined (XML_NEEDED) && ${PORT_OPTIONS:MXML}
>+XML_USED=	yes
>+.endif
> .if ${PORT_OPTIONS:MHTML}
>-SCRIPTS_ENV+=	HTML="yes"
>+XML_USED=	yes
> .endif
> 
>-.if ${PORT_OPTIONS:MREVERSE_REPLY_PATCH}
>-SCRIPTS_ENV+=	REVERSE_REPLY_PATCH="yes"
>+.if ${PORT_OPTIONS:MDOCS} || ${XML_USED} == yes
>+INSTALL_DOCS=	yes
>+.else
>+INSTALL_DOCS=	no
> .endif
> 
>-.if ${PORT_OPTIONS:MDOCS}
>+.if ${INSTALL_DOCS} == yes
> SCRIPTS_ENV+=	PORTDOCS="yes"
>+.if ${PORT_OPTIONS:MHTML}
>+SCRIPTS_ENV+=	HTML="yes"
>+.endif
> post-build:
> 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref
> 	@${REINPLACE_CMD} -E -e 's|\$$\{PREFIX\}|${PREFIX}|g' \
>@@ -432,17 +445,14 @@
> 		-e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \
> 		-e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \
> 		${WRKSRC}/doc/muttrc.man
>-
>-.if ${PORT_OPTIONS:MHTML}
>-XML_USED=	yes
>-.endif
>-.if defined(XML_NEEDED) && ${PORT_OPTIONS:MXML}
>-XML_USED=	yes
>-.endif
>-.else 	# ! DOCS
>+.else 	# ! INSTALL_DOCS
> post-patch::
>+.if ${PORT_OPTIONS:MMAILBOX_MANPAGES}
>+	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-mailbox-contrib
>+.else
> 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib
>-.endif # ! DOCS
>+.endif
>+.endif # ! INSTALL_DOCS
> 
> .if ${XML_USED} == yes
> BUILD_DEPENDS+=	xsltproc:${PORTSDIR}/textproc/libxslt \
>@@ -457,7 +467,7 @@
> 
> post-install:
> 	${INSTALL_DATA} ${WRKSRC}/doc/Muttrc ${PREFIX}/etc/Muttrc.dist
>-.if ${PORT_OPTIONS:MDOCS}
>+.if ${INSTALL_DOCS} == yes
> 	@${ECHO} "===>   Installing Mutt documentation"
> 	@${MKDIR} ${DOCSDIR} && ${CHMOD} a+rx ${DOCSDIR}
> 	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
>@@ -466,6 +476,7 @@
> 	@cd ${WRKSRC} ; ${INSTALL_MAN} ChangeLog.nntp ${DOCSDIR}
> .endif
> .if ${PORT_OPTIONS:MHTML}
>+	echo Hallo!!!
> 	@${MKDIR} ${DOCSDIR}/html && ${CHMOD} a+rx ${DOCSDIR}/html
> 	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${DOCSDIR}/html
> .endif
>diff -ru  /usr/ports/mail/mutt/files/extra-patch-nodoc-contrib ./files/extra-patch-nodoc-contrib
>--- /usr/ports/mail/mutt/files/extra-patch-nodoc-contrib	2012-07-22 11:15:04.057605000 +0200
>+++ ./files/extra-patch-nodoc-contrib	2013-04-22 10:12:05.000000000 +0200
>@@ -9,12 +9,12 @@
>  
>  bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
>  
>---- doc/Makefile.am.orig	2008-05-19 19:43:38.000000000 +0200
>-+++ doc/Makefile.am	2008-05-19 19:45:35.000000000 +0200
>-@@ -60,14 +60,6 @@
>+--- doc/Makefile.am.orig	2013-04-22 10:10:43.000000000 +0200
>++++ doc/Makefile.am	2013-04-22 10:11:30.000000000 +0200
>+@@ -57,14 +57,6 @@
>+ 	test x@DOTLOCK_TARGET@ = x || ./instdoc $(srcdir)/dotlock.man \
>+ 		$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
>  	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
>- 	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
>- 	./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
> -	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
> -	for f in $(topsrcdir_DOCFILES) ; do \
> -		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
>diff -ru  /usr/ports/mail/mutt/files/extra-patch-nodoc-mailbox-contrib ./files/extra-patch-nodoc-mailbox-contrib
>--- /usr/ports/mail/mutt/files/extra-patch-nodoc-mailbox-contrib	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/extra-patch-nodoc-mailbox-contrib	2013-04-22 10:09:08.000000000 +0200
>@@ -0,0 +1,28 @@
>+--- Makefile.am.orig	Fri Feb 11 14:54:08 2005
>++++ Makefile.am	Fri Feb 11 14:55:33 2005
>+@@ -10,7 +10,7 @@
>+ IMAP_INCLUDES = -I$(top_srcdir)/imap
>+ endif
>+ 
>+-SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . doc
>++SUBDIRS = m4 po intl $(IMAP_SUBDIR) . doc
>+ 
>+ bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
>+ 
>+--- doc/Makefile.am.orig	2008-05-19 19:43:38.000000000 +0200
>++++ doc/Makefile.am	2008-05-19 19:45:35.000000000 +0200
>+@@ -60,14 +60,6 @@
>+ 	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
>+ 	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
>+ 	./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
>+-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
>+-	for f in $(topsrcdir_DOCFILES) ; do \
>+-		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
>+-	done
>+-	for f in $(srcdir_DOCFILES) ; do \
>+-		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
>+-	done
>+-	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
>+ 	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
>+ 	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
>+ 		mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \

Actions: View | Diff

Attachments on bug 177903: 133415 | 133416