Attachment #133416 for bug #177903

Lines 60-66 Link Here

(-)./Makefile (-15 / +26 lines)
60	.endif	60	.endif
61	.if !defined (LITE)	61	.if !defined (LITE)
62	OPTIONS_DEFINE= COMPRESSED_FOLDERS SASL DEBUG FLOCK \	62	OPTIONS_DEFINE= COMPRESSED_FOLDERS SASL DEBUG FLOCK \
63	GPGME GREETING_PATCH HTML ICONV IDN IFDEF_PATCH \	63	GPGME GREETING_PATCH GSSAPI HTML ICONV IDN IFDEF_PATCH \
64	IMAP_HEADER_CACHE LOCALES_FIX MAILBOX_MANPAGES \	64	IMAP_HEADER_CACHE LOCALES_FIX MAILBOX_MANPAGES \
65	MAILDIR_HEADER_CACHE MAILDIR_MTIME_PATCH \	65	MAILDIR_HEADER_CACHE MAILDIR_MTIME_PATCH \
66	NNTP PARENT_CHILD_MATCH_PATCH \	66	NNTP PARENT_CHILD_MATCH_PATCH \
Lines 79-84 Link Here
79	FLOCK_DESC= flock() usage	79	FLOCK_DESC= flock() usage
80	GPGME_DESC= Gpgme interface	80	GPGME_DESC= Gpgme interface
81	GREETING_PATCH_DESC= Greeting support	81	GREETING_PATCH_DESC= Greeting support
		82	GSSAPI_DESC= Use the gss API
82	HTML_DESC= HTML documentation	83	HTML_DESC= HTML documentation
83	IFDEF_PATCH_DESC= ifdef feature	84	IFDEF_PATCH_DESC= ifdef feature
84	IMAP_HEADER_CACHE_DESC= IMAP header cache	85	IMAP_HEADER_CACHE_DESC= IMAP header cache
Lines 412-427 Link Here
412	SCRIPTS_ENV+= IFDEF_PATCH="yes"	413	SCRIPTS_ENV+= IFDEF_PATCH="yes"
413	.endif	414	.endif
414		415
		416	.if ${PORT_OPTIONS:MREVERSE_REPLY_PATCH}
		417	SCRIPTS_ENV+= REVERSE_REPLY_PATCH="yes"
		418	.endif
		419
		420	.if defined (XML_NEEDED) && ${PORT_OPTIONS:MXML}
		421	XML_USED= yes
		422	.endif
415	.if ${PORT_OPTIONS:MHTML}	423	.if ${PORT_OPTIONS:MHTML}
416	SCRIPTS_ENV+= HTML="yes"	424	XML_USED= yes
417	.endif	425	.endif
418		426
419	.if ${PORT_OPTIONS:MREVERSE_REPLY_PATCH}	427	.if ${PORT_OPTIONS:MDOCS} \|\| ${XML_USED} == yes
420	SCRIPTS_ENV+= REVERSE_REPLY_PATCH="yes"	428	INSTALL_DOCS= yes
		429	.else
		430	INSTALL_DOCS= no
421	.endif	431	.endif
422		432
423	.if ${PORT_OPTIONS:MDOCS}	433	.if ${INSTALL_DOCS} == yes
424	SCRIPTS_ENV+= PORTDOCS="yes"	434	SCRIPTS_ENV+= PORTDOCS="yes"
		435	.if ${PORT_OPTIONS:MHTML}
		436	SCRIPTS_ENV+= HTML="yes"
		437	.endif
425	post-build:	438	post-build:
426	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref	439	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref
427	@${REINPLACE_CMD} -E -e 's\|\$$\{PREFIX\}\|${PREFIX}\|g' \	440	@${REINPLACE_CMD} -E -e 's\|\$$\{PREFIX\}\|${PREFIX}\|g' \
Lines 432-448 Link Here
432	-e 's\|\$$\{DOCSDIR\}\|${DOCSDIR}\|g' \	445	-e 's\|\$$\{DOCSDIR\}\|${DOCSDIR}\|g' \
433	-e 's\|\$$\{EXAMPLESDIR\}\|${EXAMPLESDIR}\|g' \	446	-e 's\|\$$\{EXAMPLESDIR\}\|${EXAMPLESDIR}\|g' \
434	${WRKSRC}/doc/muttrc.man	447	${WRKSRC}/doc/muttrc.man
435		448	.else # ! INSTALL_DOCS
436	.if ${PORT_OPTIONS:MHTML}
437	XML_USED= yes
438	.endif
439	.if defined(XML_NEEDED) && ${PORT_OPTIONS:MXML}
440	XML_USED= yes
441	.endif
442	.else # ! DOCS
443	post-patch::	449	post-patch::
		450	.if ${PORT_OPTIONS:MMAILBOX_MANPAGES}
		451	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-mailbox-contrib
		452	.else
444	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib	453	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib
445	.endif # ! DOCS	454	.endif
		455	.endif # ! INSTALL_DOCS
446		456
447	.if ${XML_USED} == yes	457	.if ${XML_USED} == yes
448	BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \	458	BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \
Lines 457-463 Link Here
457		467
458	post-install:	468	post-install:
459	${INSTALL_DATA} ${WRKSRC}/doc/Muttrc ${PREFIX}/etc/Muttrc.dist	469	${INSTALL_DATA} ${WRKSRC}/doc/Muttrc ${PREFIX}/etc/Muttrc.dist
460	.if ${PORT_OPTIONS:MDOCS}	470	.if ${INSTALL_DOCS} == yes
461	@${ECHO} "===> Installing Mutt documentation"	471	@${ECHO} "===> Installing Mutt documentation"
462	@${MKDIR} ${DOCSDIR} && ${CHMOD} a+rx ${DOCSDIR}	472	@${MKDIR} ${DOCSDIR} && ${CHMOD} a+rx ${DOCSDIR}
463	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \	473	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
Lines 466-471 Link Here
466	@cd ${WRKSRC} ; ${INSTALL_MAN} ChangeLog.nntp ${DOCSDIR}	476	@cd ${WRKSRC} ; ${INSTALL_MAN} ChangeLog.nntp ${DOCSDIR}
467	.endif	477	.endif
468	.if ${PORT_OPTIONS:MHTML}	478	.if ${PORT_OPTIONS:MHTML}
		479	echo Hallo!!!
469	@${MKDIR} ${DOCSDIR}/html && ${CHMOD} a+rx ${DOCSDIR}/html	480	@${MKDIR} ${DOCSDIR}/html && ${CHMOD} a+rx ${DOCSDIR}/html
470	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${DOCSDIR}/html	481	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${DOCSDIR}/html
471	.endif	482	.endif

Lines 9-20 Link Here

(-)./files/extra-patch-nodoc-contrib (-5 / +5 lines)
9		9
10	bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@	10	bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
11		11
12	--- doc/Makefile.am.orig 2008-05-19 19:43:38.000000000 +0200	12	--- doc/Makefile.am.orig 2013-04-22 10:10:43.000000000 +0200
13	+++ doc/Makefile.am 2008-05-19 19:45:35.000000000 +0200	13	+++ doc/Makefile.am 2013-04-22 10:11:30.000000000 +0200
14	@@ -60,14 +60,6 @@	14	@@ -57,14 +57,6 @@
		15	test x@DOTLOCK_TARGET@ = x \|\| ./instdoc $(srcdir)/dotlock.man \
		16	$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
15	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5	17	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
16	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
17	./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
18	- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)	18	- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
19	- for f in $(topsrcdir_DOCFILES) ; do \	19	- for f in $(topsrcdir_DOCFILES) ; do \
20	- $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \	20	- $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \




--- 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) ; \

Return to bug 177903

Line 0 Link Here

(-)./files/extra-patch-nodoc-mailbox-contrib (+28 lines)
	1	--- Makefile.am.orig Fri Feb 11 14:54:08 2005
	2	+++ Makefile.am Fri Feb 11 14:55:33 2005
	3	@@ -10,7 +10,7 @@
	4	IMAP_INCLUDES = -I$(top_srcdir)/imap
	5	endif
	6
	7	-SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . doc
	8	+SUBDIRS = m4 po intl $(IMAP_SUBDIR) . doc
	9
	10	bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
	11
	12	--- doc/Makefile.am.orig 2008-05-19 19:43:38.000000000 +0200
	13	+++ doc/Makefile.am 2008-05-19 19:45:35.000000000 +0200
	14	@@ -60,14 +60,6 @@
	15	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
	16	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
	17	./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
	18	- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
	19	- for f in $(topsrcdir_DOCFILES) ; do \
	20	- $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
	21	- done
	22	- for f in $(srcdir_DOCFILES) ; do \
	23	- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
	24	- done
	25	- -$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
	26	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
	27	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
	28	mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \