From owner-svn-ports-head@FreeBSD.ORG Wed Apr 24 17:33:30 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 0CED3BD9; Wed, 24 Apr 2013 17:33:30 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id F3E111247; Wed, 24 Apr 2013 17:33:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3OHXTRU039713; Wed, 24 Apr 2013 17:33:29 GMT (envelope-from jgh@svn.freebsd.org) Received: (from jgh@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3OHXTph039706; Wed, 24 Apr 2013 17:33:29 GMT (envelope-from jgh@svn.freebsd.org) Message-Id: <201304241733.r3OHXTph039706@svn.freebsd.org> From: Jason Helfman Date: Wed, 24 Apr 2013 17:33:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316457 - in head/mail/mutt: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Apr 2013 17:33:30 -0000 Author: jgh Date: Wed Apr 24 17:33:29 2013 New Revision: 316457 URL: http://svnweb.freebsd.org/changeset/ports/316457 Log: - fix NOPORTDOCS - add GSSAPI option - while here adopt uses for GETTEXT PR: 177903 Submitted by: koukopoulos@gmail.com, Udo.Schweigert@siemens.com Approved by: maintainer, Udo.Schweigert@siemens.com Added: head/mail/mutt/files/extra-patch-nodoc-mailbox-contrib (contents, props changed) Modified: head/mail/mutt/Makefile (contents, props changed) head/mail/mutt/files/extra-patch-nodoc-contrib (contents, props changed) Modified: head/mail/mutt/Makefile ============================================================================== --- head/mail/mutt/Makefile Wed Apr 24 17:28:01 2013 (r316456) +++ head/mail/mutt/Makefile Wed Apr 24 17:33:29 2013 (r316457) @@ -9,7 +9,7 @@ PORTNAME= mutt PORTVERSION= 1.5.21 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES+= mail ipv6 MASTER_SITES= ftp://ftp.mutt.org/mutt/devel/ \ ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/devel/ \ @@ -60,7 +60,7 @@ LITE= YES .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 @@ DEBUG_DESC= Debugging capabilities 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 @@ -176,7 +177,7 @@ XML_USED= no .endif .if ${PORT_OPTIONS:MNLS} -USE_GETTEXT= yes +USES+= gettext SCRIPTS_ENV+= NLS="yes" .else CONFIGURE_ARGS+= --disable-nls @@ -412,16 +413,28 @@ SCRIPTS_ENV+= SIDEBAR_PATCH="yes" 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 @@ post-build: -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 @@ pre-install: 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 \ Modified: head/mail/mutt/files/extra-patch-nodoc-contrib ============================================================================== --- head/mail/mutt/files/extra-patch-nodoc-contrib Wed Apr 24 17:28:01 2013 (r316456) +++ head/mail/mutt/files/extra-patch-nodoc-contrib Wed Apr 24 17:33:29 2013 (r316457) @@ -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) ; \ Added: head/mail/mutt/files/extra-patch-nodoc-mailbox-contrib ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/mutt/files/extra-patch-nodoc-mailbox-contrib Wed Apr 24 17:33:29 2013 (r316457) @@ -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) ; \