Index: head/mail/mutt/scripts/generate-plist =================================================================== --- head/mail/mutt/scripts/generate-plist (revision 342474) +++ head/mail/mutt/scripts/generate-plist (nonexistent) @@ -1,159 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# set -x - -trap ' cleanup ' 0 -trap ' echo_signal; exit 1' 1 2 3 15 - -tmp_first=$(mktemp ${WRKDIR:=/tmp}/.plist-first.XXXXXXXXXX) -tmp_last=$(mktemp ${WRKDIR}/.plist-last.XXXXXXXXXX) - -cleanup() { - rm -f $tmp_first $tmp_last -} - -echo_signal() { - echo "Got Signal -- aborting `basename $0`" -} - -PATH=/bin:/usr/bin - -cat > $tmp_first <> $tmp_first <> $tmp_first <> $tmp_first - fi - - if [ "$HTML" = "yes" ]; then - echo "%%DOCSDIR%%/html/advancedusage.html" >> $tmp_first - echo "%%DOCSDIR%%/html/configuration.html" >> $tmp_first - echo "%%DOCSDIR%%/html/gettingstarted.html" >> $tmp_first - echo "%%DOCSDIR%%/html/index.html" >> $tmp_first - echo "%%DOCSDIR%%/html/intro.html" >> $tmp_first - echo "%%DOCSDIR%%/html/manual.html" >> $tmp_first - echo "%%DOCSDIR%%/html/mimesupport.html" >> $tmp_first - echo "%%DOCSDIR%%/html/miscellany.html" >> $tmp_first - echo "%%DOCSDIR%%/html/optionalfeatures.html" >> $tmp_first - echo "%%DOCSDIR%%/html/reference.html" >> $tmp_first - echo "%%DOCSDIR%%/html/security.html" >> $tmp_first - echo "%%DOCSDIR%%/html/tuning.html" >> $tmp_first - if [ "$COMPRESSED_FOLDERS" = "yes" ]; then - echo "%%DOCSDIR%%/html/compressed-folders.html" >> $tmp_first - fi - echo "@dirrm %%DOCSDIR%%/html" >> $tmp_last - fi - cat >> $tmp_last < DW_PATCH_VERSION= 1.5.6 AC_PATCH_VERSION= 1.5.9 DW_MBOX_PATCH_VERSION= 1.5.18 .if !defined(VVV_PATCH_VERSION) VVV_PATCH_VERSION= ${PORTVERSION} .endif .if !defined(RR_PATCH_VERSION) RR_PATCH_VERSION= ${PORTVERSION} .endif .if !defined(DW_PATCH_VERSION) DW_PATCH_VERSION= ${PORTVERSION} .endif .if !defined(DW_MBOX_PATCH_VERSION) DW_MBOX_PATCH_VERSION= ${DW_PATCH_VERSION} .endif .if !defined(AC_PATCH_VERSION) AC_PATCH_VERSION= ${PORTVERSION} .endif .if defined (LITE) PKGNAMESUFFIX= -lite +PLIST_SUB+= MBOXMAN="" .endif # XXX # this should be done automagically by aclocal but .... # for now, this will have to do pre-build: @${REINPLACE_CMD} -E -e "s|^(ACLOCAL = ).+|\1${ACLOCAL}|" \ -e "s|^(AUTOCONF = ).+|\1${AUTOCONF}|" \ -e "s|^(AUTOMAKE = ).+|\1${AUTOMAKE}|" \ -e "s|^(AUTOHEADER = ).+|\1${AUTOHEADER}|" \ ${BUILD_WRKSRC}/Makefile RUN_DEPENDS+= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support .if !defined (LITE) .if ${PORT_OPTIONS:MASPELL} BUILD_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell RUN_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell .elif ${PORT_OPTIONS:MISPELL} BUILD_DEPENDS+= ispell:${PORTSDIR}/textproc/aspell-ispell RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/aspell-ispell .endif .if defined(PACKAGE_BUILDING) RUN_DEPENDS+= urlview:${PORTSDIR}/textproc/urlview .endif .endif # Handle ncurses/ncurses-port/slang .if ${PORT_OPTIONS:MSLANG} CONFIGURE_ARGS+= --with-slang=${LOCALBASE} LIB_DEPENDS+= libslang.so:${PORTSDIR}/devel/libslang2 .endif .if ${PORT_OPTIONS:MNCURSES} -USES= ncurses +USES+= ncurses .endif .if ! ${PORT_OPTIONS:MSGMLFORMAT} || ! ${PORT_OPTIONS:MXML} || !defined(XML_USED) \ || ! ${PORT_OPTIONS:MDOCS} XML_USED= no .endif .if ${PORT_OPTIONS:MNLS} USES+= gettext -SCRIPTS_ENV+= NLS="yes" +PLIST_SUB+= NLS="" .else CONFIGURE_ARGS+= --disable-nls +PLIST_SUB+= NLS="@comment " .endif .if ${PORT_OPTIONS:MSASL} LIB_DEPENDS+= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 CONFIGURE_ARGS+= --with-sasl=${LOCALBASE} .endif .if ${PORT_OPTIONS:MSMIME_OUTLOOK_COMPAT} post-patch:: @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smime-outlook .endif .if ${PORT_OPTIONS:MSMART_DATE} post-patch:: @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-smartdate .endif .if ${PORT_OPTIONS:MSIGNATURE_MENU} IGNORE= the WITH_SIGNATURE_MENU does not work at the moment XML_NEEDED= yes -SCRIPTS_ENV+= SIGNATURE_MENU="yes" post-patch:: @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-signature-menu .endif .if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH} post-patch:: .if ${PORT_OPTIONS:MNNTP} @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-maildir-mtime-nntp .else @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-maildir-mtime .endif .endif .if ${PORT_OPTIONS:MASPELL} post-patch:: @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-aspell .endif .if ${PORT_OPTIONS:MREVERSE_REPLY_PATCH} post-patch:: @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-reverse_reply .endif .if ${PORT_OPTIONS:MPARENT_CHILD_MATCH_PATCH} post-patch:: @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-parent-child-match .endif .if ${PORT_OPTIONS:MFLOCK} CONFIGURE_ARGS+= --enable-flock .else CONFIGURE_ARGS+= --disable-flock .endif .if ${PORT_OPTIONS:MLOCALES_FIX} CONFIGURE_ARGS+= --enable-locales-fix .endif .if ${PORT_OPTIONS:MICONV} USES+= iconv CONFIGURE_ARGS+= ${ICONV_CONFIGURE_ARG} .else CONFIGURE_ARGS+= --disable-iconv .endif .if ${PORT_OPTIONS:MIDN} LIB_DEPENDS+= libidn.so:${PORTSDIR}/dns/libidn CONFIGURE_ARGS+= --with-idn .else CONFIGURE_ARGS+= --without-idn .endif .if ${PORT_OPTIONS:MGPGME} LIB_DEPENDS+= libgpgme.so:${PORTSDIR}/security/gpgme CONFIGURE_ARGS+= --enable-gpgme .else CONFIGURE_ARGS+= --disable-gpgme .endif LDFLAGS= .if ${PORT_OPTIONS:MGSSAPI} .if exists(${LOCALBASE}/bin/krb5-config) LIB_DEPENDS+= libgssapi_krb5.so:${PORTSDIR}/security/krb5 CONFIGURE_ARGS+= --with-gss=${LOCALBASE} .elif exists(${KRB5_HOME}/bin/krb5-config) LIB_DEPENDS+= libgssapi_krb5.so:${PORTSDIR}/security/krb5 CONFIGURE_ARGS+= --with-gss=${KRB5_HOME} LDFLAGS+= -L${KRB5_HOME}/lib -rpath=${KRB5_HOME}/lib -ltinfow .elif exists(${HEIMDAL_HOME}/bin/krb5-config) LIB_DEPENDS+= libgssapi_krb5.so:${PORTSDIR}/security/krb5 CONFIGURE_ARGS+= --with-gss=${HEIMDAL_HOME} LDFLAGS+= -L${HEIMDAL_HOME}/lib -rpath=${HEIMDAL_HOME}/lib -ltinfow .elif (defined(MAKE_KERBEROS5)) || exists(/usr/lib/libkrb5.a) CONFIGURE_ARGS+= --with-gss WITH_KRB5_SYS=YES .endif .endif LDFLAGS+= -L${LOCALBASE}/lib -rpath=${LOCALBASE}/lib:/usr/lib -ltinfow CFLAGS+= ${CFLAGS_ADD} LDFLAGS+= ${LDFLAGS_ADD} .if ${PORT_OPTIONS:MSMTP} CONFIGURE_ARGS+= --enable-smtp .else CONFIGURE_ARGS+= --disable-smtp .endif .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug .endif PATCH_DIST_STRIP= -p1 .if ${PORT_OPTIONS:MCOMPRESSED_FOLDERS} DISTFILES+= patch-${RR_PATCH_VERSION}.rr.compressed.gz:vvv CONFIGURE_ARGS+= --enable-compressed XML_NEEDED= yes pre-patch:: @${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${RR_PATCH_VERSION}.rr.compressed.gz > ${WRKDIR}/patch-compressed @${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \ ${WRKDIR}/patch-compressed @${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-compressed .endif .if ${PORT_OPTIONS:MNNTP} DISTFILES+= patch-${VVV_PATCH_VERSION}.vvv.nntp.gz:vvv DISTFILES+= patch-${VVV_PATCH_VERSION}.vvv.nntp_ru.gz:vvv CONFIGURE_ARGS+= --enable-nntp XML_NEEDED= yes CATEGORIES+= news -SCRIPTS_ENV+= NNTP="yes" +PLIST_SUB+= NNTP="" pre-patch:: @${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${VVV_PATCH_VERSION}.vvv.nntp.gz > ${WRKDIR}/patch-nntp @${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \ ${WRKDIR}/patch-nntp @${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-nntp +post-install: + ${INSTALL_MAN} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR} +.else +PLIST_SUB+= NNTP="@comment " .endif .if ${PORT_OPTIONS:MQUOTE_PATCH} PATCHFILES+= patch-${VVV_PATCH_VERSION}.vvv.initials.gz:vvv \ patch-${VVV_PATCH_VERSION}.vvv.quote.gz:vvv XML_NEEDED= yes .endif .if ${PORT_OPTIONS:MIFDEF_PATCH} post-patch:: @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-ifdef .endif .if ${PORT_OPTIONS:MMBOX_HOOK_PATCH} IGNORE= the MBOX_HOOK_PATCH does not work at the moment #PATCHFILES+= p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw .endif .if ${PORT_OPTIONS:MSIDEBAR_PATCH} XML_NEEDED= yes .if ${PORT_OPTIONS:MNNTP} post-patch:: @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar-nntp .else post-patch:: @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-sidebar .endif .endif .if ${PORT_OPTIONS:MGREETING_PATCH} post-patch:: @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-greeting .endif .if ${PORT_OPTIONS:MTRASH_PATCH} post-patch:: @${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-trash-purge .endif WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} -MAN1= mutt.1 mutt_dotlock.1 flea.1 muttbug.1 pgpewrap.1 pgpring.1 smime_keys.1 -MAN5= muttrc.5 -.if ${PORT_OPTIONS:MMAILBOX_MANPAGES} -MAN5+= mbox.5 mmdf.5 -.endif post-patch:: @${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \ ${WRKSRC}/contrib/gpg.rc @${REINPLACE_CMD} -e 's,pgp6,pgp,g' \ ${WRKSRC}/contrib/pgp6.rc @${REINPLACE_CMD} -E -e 's|@samplesdir@|${EXAMPLESDIR}|g' \ ${WRKSRC}/contrib/Makefile.am -.if ! ${PORT_OPTIONS:MMAILBOX_MANPAGES} - @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-no-mbox-manpage -.endif pre-configure:: @(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4) .if defined(WITH_KRB5_SYS) @${ECHO_CMD} "#define HAVE_HEIMDAL" >> ${WRKSRC}/config.h.in @${REINPLACE_CMD} -e 's|||' \ ${WRKSRC}/imap/auth_gss.c .endif -.if ${PORT_OPTIONS:MSLAVE_HTML_PAGES} -SCRIPTS_ENV+= SLAVE_HTML_PAGES="${SLAVE_HTML_PAGES}" -.endif - .if ${PORT_OPTIONS:MCOMPRESSED_FOLDERS} -SCRIPTS_ENV+= COMPRESSED_FOLDERS="yes" +PLIST_SUB+= COMPRESS="" +.else +PLIST_SUB+= COMPRESS="@comment " .endif -.if ${PORT_OPTIONS:MQUOTE_PATCH} -SCRIPTS_ENV+= QUOTE_PATCH="yes" -.endif - .if ${PORT_OPTIONS:MIMAP_HEADER_CACHE} || ${PORT_OPTIONS:MMAILDIR_HEADER_CACHE} .if ${PORT_OPTIONS:MTOKYOCABINET} CONFIGURE_ARGS+= --enable-hcache --without-gdbm --without-bdb --with-tokyocabinet LIB_DEPENDS+= libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet .else USE_BDB= 42+ CONFIGURE_ARGS+= --enable-hcache --without-gdbm --with-bdb +CONFIGURE_SED= -e 's/BDB_VERSIONS="/&${BDB_LIB_NAME} db${BDB_VER} /' +pre-configure:: + @${REINPLACE_CMD} -E ${CONFIGURE_SED} ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}.ac .endif .else CONFIGURE_ARGS+= --disable-hcache .endif .if ${PORT_OPTIONS:MMAILDIR_HEADER_CACHE} CONFIGURE_ARGS+= --without-qdbm .endif -.if ${PORT_OPTIONS:MSIDEBAR_PATCH} -SCRIPTS_ENV+= SIDEBAR_PATCH="yes" -.endif - -.if ${PORT_OPTIONS:MIFDEF_PATCH} -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} XML_USED= yes .endif -.if ${PORT_OPTIONS:MDOCS} || ${XML_USED} == yes -INSTALL_DOCS= yes +.if ${PORT_OPTIONS:MMAILBOX_MANPAGES} +PLIST_SUB+= MBOXMAN="" .else -INSTALL_DOCS= no +PLIST_SUB+= MBOXMAN="@comment " .endif -.if ${INSTALL_DOCS} == yes -SCRIPTS_ENV+= PORTDOCS="yes" .if ${PORT_OPTIONS:MHTML} -SCRIPTS_ENV+= HTML="yes" +PLIST_SUB+= HTML="" +.else +PLIST_SUB+= HTML="@comment " .endif +.if ${PORT_OPTIONS:MDOCS} || ${XML_USED} == yes post-build: @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref @${REINPLACE_CMD} -E -e 's|\$$\{PREFIX\}|${PREFIX}|g' \ -e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \ -e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \ ${WRKSRC}/doc/mutt.man @${REINPLACE_CMD} -E -e 's|\$$\{PREFIX\}|${PREFIX}|g' \ -e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \ -e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \ ${WRKSRC}/doc/muttrc.man -.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 -.endif # ! INSTALL_DOCS .if ${XML_USED} == yes BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ lynx:${PORTSDIR}/www/lynx -post-patch:: - @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-xml .endif -pre-install: - @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/generate-plist > ${PLIST} - -post-install: - ${INSTALL_DATA} ${WRKSRC}/doc/Muttrc ${PREFIX}/etc/Muttrc.dist -.if ${INSTALL_DOCS} == yes - @${ECHO} "===> Installing Mutt documentation" - @${MKDIR} ${DOCSDIR} && ${CHMOD} a+rx ${DOCSDIR} - @cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \ - ../ABOUT-NLS ../contrib/language* ${DOCSDIR} -.if ${PORT_OPTIONS:MNNTP} - @cd ${WRKSRC} ; ${INSTALL_MAN} ChangeLog.nntp ${DOCSDIR} -.endif -.if ${PORT_OPTIONS:MHTML} - @${MKDIR} ${DOCSDIR}/html && ${CHMOD} a+rx ${DOCSDIR}/html - ${INSTALL_MAN} ${WRKSRC}/doc/*.html ${DOCSDIR}/html -.endif -.endif .if ${PORT_OPTIONS:MSLANG} +PKGMESSAGE= ${WRKDIR}/pkg-message @${ECHO} "=====================================================" > ${PKGMESSAGE} @${ECHO} "You have installed ${PORTNAME} with SLANG support." >> ${PKGMESSAGE} @${ECHO} "This may work for a color terminal only when defining" >> ${PKGMESSAGE} @${ECHO} "COLORTERM=yes and COLORFGBG=\"color1;color2\" in your" >> ${PKGMESSAGE} @${ECHO} "environment." >> ${PKGMESSAGE} @${ECHO} "=====================================================" >> ${PKGMESSAGE} .endif -.if !defined(BATCH) && ${PORT_OPTIONS:MSLANG} - @${CAT} ${PKGMESSAGE} - @${ECHO} -.endif .include Index: head/mail/mutt/files/extra-patch-nodoc-mailbox-contrib =================================================================== --- head/mail/mutt/files/extra-patch-nodoc-mailbox-contrib (revision 342474) +++ head/mail/mutt/files/extra-patch-nodoc-mailbox-contrib (nonexistent) @@ -1,28 +0,0 @@ ---- 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) ; \ Property changes on: head/mail/mutt/files/extra-patch-nodoc-mailbox-contrib ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/mutt/files/extra-patch-doc-xml =================================================================== --- head/mail/mutt/files/extra-patch-doc-xml (revision 342474) +++ head/mail/mutt/files/extra-patch-doc-xml (nonexistent) @@ -1,11 +0,0 @@ ---- doc/Makefile.am.orig 2010-09-17 16:23:30.000000000 +0200 -+++ doc/Makefile.am 2010-09-17 16:25:01.000000000 +0200 -@@ -47,7 +47,7 @@ - - all: makedoc-all - --makedoc-all: mutt.1 smime_keys.1 muttrc.man pgpewrap.1 pgpring.1 -+makedoc-all: mutt.1 smime_keys.1 muttrc.man pgpewrap.1 pgpring.1 manual.html stamp-doc-chunked manual.txt - - install-data-local: makedoc-all instdoc - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1 Property changes on: head/mail/mutt/files/extra-patch-doc-xml ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/mutt/files/extra-patch-no-mbox-manpage =================================================================== --- head/mail/mutt/files/extra-patch-no-mbox-manpage (revision 342474) +++ head/mail/mutt/files/extra-patch-no-mbox-manpage (nonexistent) @@ -1,29 +0,0 @@ ---- doc/Makefile.am.orig 2008-05-30 08:00:04.000000000 +0100 -+++ doc/Makefile.am 2008-09-19 18:55:55.000000000 +0100 -@@ -18,8 +18,6 @@ - gen-map-doc \ - muttrc.man.head \ - muttrc.man.tail \ -- mbox.man \ -- mmdf.man \ - manual.xml.head \ - manual.xml.tail \ - instdoc.sh.in \ -@@ -57,8 +55,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) ; \ -@@ -83,7 +79,7 @@ - for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \ - rm -f $(DESTDIR)$(mandir)/man1/$$f ; \ - done -- for f in muttrc.5 mbox.5 mmdf.5 ; do \ -+ for f in muttrc.5 ; do \ - rm -f $(DESTDIR)$(mandir)/man5/$$f ; \ - done - for f in $(srcdir_DOCFILES) $(topsrcdir_DOCFILES) $(HTML_DOCFILES) ; \ Property changes on: head/mail/mutt/files/extra-patch-no-mbox-manpage ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/mutt/files/extra-patch-nodoc-contrib =================================================================== --- head/mail/mutt/files/extra-patch-nodoc-contrib (revision 342474) +++ head/mail/mutt/files/extra-patch-nodoc-contrib (nonexistent) @@ -1,28 +0,0 @@ ---- 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 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 -- $(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) ; \ Property changes on: head/mail/mutt/files/extra-patch-nodoc-contrib ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/mutt/files/patch-02 =================================================================== --- head/mail/mutt/files/patch-02 (revision 342474) +++ head/mail/mutt/files/patch-02 (revision 342475) @@ -1,32 +1,13 @@ --- doc/Makefile.am.orig 2013-10-18 06:48:24.000000000 +0200 -+++ doc/Makefile.am 2013-10-18 12:30:09.000000000 +0200 -@@ -48,7 +48,7 @@ - - all: makedoc-all - --makedoc-all: mutt.1 smime_keys.1 muttrc.man manual.html stamp-doc-rc stamp-doc-chunked manual.txt pgpewrap.1 pgpring.1 -+makedoc-all: mutt.1 smime_keys.1 muttrc.man pgpewrap.1 pgpring.1 - - install-data-local: makedoc-all instdoc - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1 -@@ -73,9 +73,6 @@ - $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \ - done - -$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) -- -for f in $(HTML_DOCFILES) ; do \ -- $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \ -- done - $(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist - -if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \ - mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \ -@@ -106,9 +103,7 @@ ++++ doc/Makefile.am 2013-12-22 00:01:17.000000000 +0100 +@@ -106,9 +106,7 @@ check: manual.txt: manual.html - -LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \ - LC_ALL=C w3m -dump manual.html > $@ || \ - LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@ + -LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ Muttrc: stamp-doc-rc Index: head/mail/mutt/files/patch-staging-Makefile.am =================================================================== --- head/mail/mutt/files/patch-staging-Makefile.am (nonexistent) +++ head/mail/mutt/files/patch-staging-Makefile.am (revision 342475) @@ -0,0 +1,14 @@ +--- Makefile.am.orig 2013-12-20 12:47:32.000000000 +0100 ++++ Makefile.am 2013-12-20 12:52:38.000000000 +0100 +@@ -156,11 +156,6 @@ + rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \ + ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \ + fi +- if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \ +- chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \ +- chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \ +- { echo "Can't fix mutt_dotlock's permissions! This is required to lock mailboxes in the mail spool directory." >&2 ; exit 1 ; } \ +- fi + + install-data-local: + $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir) Property changes on: head/mail/mutt/files/patch-staging-Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/mutt/pkg-plist =================================================================== --- head/mail/mutt/pkg-plist (nonexistent) +++ head/mail/mutt/pkg-plist (revision 342475) @@ -0,0 +1,118 @@ +bin/flea +bin/mutt +bin/muttbug +@group mail +@mode 2755 +bin/mutt_dotlock +@group +@mode +bin/pgpewrap +bin/pgpring +bin/smime_keys +@unexec if cmp -s %D/etc/Muttrc.dist %D/etc/Muttrc; then rm -f %D/etc/Muttrc; fi +etc/Muttrc.dist +@exec if [ ! -f %D/etc/Muttrc ]; then install -m 644 %D/etc/Muttrc.dist %D/etc/Muttrc; fi +man/man1/flea.1.gz +man/man1/mutt.1.gz +man/man1/mutt_dotlock.1.gz +man/man1/muttbug.1.gz +man/man1/pgpewrap.1.gz +man/man1/pgpring.1.gz +man/man1/smime_keys.1.gz +%%MBOXMAN%%man/man5/mbox.5.gz +%%MBOXMAN%%man/man5/mmdf.5.gz +man/man5/muttrc.5.gz +%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/GPL +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/PGP-Notes.txt +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.SECURITY +%%PORTDOCS%%%%DOCSDIR%%/README.SSL +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/applying-patches.txt +%%PORTDOCS%%%%DOCSDIR%%/devel-notes.txt +%%PORTDOCS%%%%DOCSDIR%%/manual.txt +%%PORTDOCS%%%%DOCSDIR%%/patch-notes.txt +%%PORTDOCS%%%%DOCSDIR%%/smime-notes.txt +%%NNTP%%%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.nntp +%%PORTDOCS%%%%DOCSDIR%%/advancedusage.html +%%PORTDOCS%%%%DOCSDIR%%/configuration.html +%%PORTDOCS%%%%DOCSDIR%%/gettingstarted.html +%%PORTDOCS%%%%DOCSDIR%%/index.html +%%PORTDOCS%%%%DOCSDIR%%/intro.html +%%PORTDOCS%%%%DOCSDIR%%/manual.html +%%PORTDOCS%%%%DOCSDIR%%/mimesupport.html +%%PORTDOCS%%%%DOCSDIR%%/miscellany.html +%%PORTDOCS%%%%DOCSDIR%%/optionalfeatures.html +%%PORTDOCS%%%%DOCSDIR%%/reference.html +%%PORTDOCS%%%%DOCSDIR%%/security.html +%%PORTDOCS%%%%DOCSDIR%%/tuning.html +%%COMPRESS%%%%PORTDOCS%%%%DOCSDIR%%/compressed-folders.html +%%PORTDOCS%%@dirrm %%DOCSDIR%% +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Mush.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Pine.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tin.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ca-bundle.crt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.default +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.linux +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpg.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-3.2.5.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-4.1.5.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-4.2.0.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-4.3.2.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.freebsd-3.3.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.3.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.90.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.hpux-10.01.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.hpux-10.20.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.hpux-11.00.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.irix-6.5.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0a.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0d.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.4.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.5.1.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6-cjk.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.7.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mutt_xtitle +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp2.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp6.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.mailcap +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-tlr +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smime.rc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smime_keys_test.pl +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/iconv +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% +%%NLS%%share/locale/bg/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/ca/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/cs/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/da/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/de/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/el/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/eo/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/es/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/et/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/eu/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/fr/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/ga/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/gl/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/hu/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/id/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/it/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/ja/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/ko/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/lt/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/nl/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/pl/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/ru/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/sk/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/sv/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/tr/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/uk/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/mutt.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/mutt.mo Property changes on: head/mail/mutt/pkg-plist ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/mutt-lite/Makefile =================================================================== --- head/mail/mutt-lite/Makefile (revision 342474) +++ head/mail/mutt-lite/Makefile (revision 342475) @@ -1,14 +1,13 @@ # Created by: Udo Schweigert # $FreeBSD$ # Just to get a mutt-devel-lite pkg on pkg cluster MASTERDIR= ${.CURDIR}/../mutt COMMENT= The Mongrel of Mail User Agents (development version, lite package) CONFLICTS= ja-mutt-[0-9]* ja-mutt-devel-[0-9]* mutt-[0-9]* mutt-devel-[0-9]* mutt-lite-1.4* zh-mutt-devel-[0-9]* MUTT_LITE= yes -NO_STAGE= yes .include "${MASTERDIR}/Makefile"