Date: Sun, 22 Dec 2013 11:15:03 +0100 (CET) From: Udo Schweigert <udo.schweigert@siemens.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/185081: maintainer-update of mail/mutt Message-ID: <201312221015.rBMAF3Iu002939@alaska.cert.siemens.de> Resent-Message-ID: <201312221020.rBMAK1SK085319@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185081
>Category: ports
>Synopsis: maintainer-update of mail/mutt
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Dec 22 10:20:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Udo Schweigert
>Release: FreeBSD 8.4-RELEASE-p4 amd64
>Organization:
>Environment:
>Description:
Maintainer update of mail/mutt:
- Enable staging, simplifying the port, especially the PLIST code
- Make port work with installed db6 for header caches
Committer: New files (svn add): files/patch-staging-Makefile.am pkg-plist
Removed files (svn rm): files/extra-patch-doc-xml files/extra-patch-no-mbox-manpage files/extra-patch-nodoc-contrib files/extra-patch-nodoc-mailbox-contrib scripts/generate-plist scripts/
>How-To-Repeat:
>Fix:
diff -ru /usr/ports/mail/mutt/Makefile ./Makefile
--- /usr/ports/mail/mutt/Makefile 2013-11-23 06:06:24.000000000 +0100
+++ ./Makefile 2013-12-22 10:35:59.468617000 +0100
@@ -103,11 +103,6 @@
NLS XML SMTP
.endif
-PLIST= ${WRKDIR}/PLIST
-PKGMESSAGE= ${WRKDIR}/pkg-message
-SCRIPTS_ENV= WRKDIR="${WRKDIR}"
-
-NO_STAGE= yes
.include <bsd.port.options.mk>
DW_PATCH_VERSION= 1.5.6
@@ -175,9 +170,10 @@
.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}
@@ -198,7 +194,6 @@
.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
@@ -310,12 +305,16 @@
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:
+ @cd ${WRKSRC} ; ${INSTALL_MAN} ChangeLog.nntp ${STAGEDIR}${DOCSDIR}
+.else
+PLIST_SUB+= NNTP="@comment "
.endif
.if ${PORT_OPTIONS:MQUOTE_PATCH}
@@ -355,11 +354,6 @@
.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' \
@@ -368,9 +362,6 @@
${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)
@@ -380,16 +371,10 @@
${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"
-.endif
-
-.if ${PORT_OPTIONS:MQUOTE_PATCH}
-SCRIPTS_ENV+= QUOTE_PATCH="yes"
+PLIST_SUB+= COMPRESS=""
+.else
+PLIST_SUB+= COMPRESS="@comment "
.endif
.if ${PORT_OPTIONS:MIMAP_HEADER_CACHE} || ${PORT_OPTIONS:MMAILDIR_HEADER_CACHE}
@@ -399,6 +384,9 @@
.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
@@ -408,18 +396,6 @@
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
@@ -427,17 +403,18 @@
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' \
@@ -448,42 +425,16 @@
-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}
@@ -492,8 +443,4 @@
@${ECHO} "=====================================================" >> ${PKGMESSAGE}
.endif
-.if !defined(BATCH) && ${PORT_OPTIONS:MSLANG}
- @${CAT} ${PKGMESSAGE}
- @${ECHO}
-.endif
.include <bsd.port.mk>
diff -ru /usr/ports/mail/mutt/files/extra-patch-doc-xml ./files/extra-patch-doc-xml
--- /usr/ports/mail/mutt/files/extra-patch-doc-xml 2013-10-23 06:07:20.000000000 +0200
+++ ./files/extra-patch-doc-xml 1970-01-01 01:00:00.000000000 +0100
@@ -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
diff -ru /usr/ports/mail/mutt/files/extra-patch-no-mbox-manpage ./files/extra-patch-no-mbox-manpage
--- /usr/ports/mail/mutt/files/extra-patch-no-mbox-manpage 2012-07-22 11:15:04.057605000 +0200
+++ ./files/extra-patch-no-mbox-manpage 1970-01-01 01:00:00.000000000 +0100
@@ -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) ; \
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 2013-04-25 06:07:18.000000000 +0200
+++ ./files/extra-patch-nodoc-contrib 1970-01-01 01:00:00.000000000 +0100
@@ -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) ; \
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 2013-04-25 06:07:18.000000000 +0200
+++ ./files/extra-patch-nodoc-mailbox-contrib 1970-01-01 01:00:00.000000000 +0100
@@ -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) ; \
diff -ru /usr/ports/mail/mutt/files/patch-02 ./files/patch-02
--- /usr/ports/mail/mutt/files/patch-02 2013-10-23 06:07:20.000000000 +0200
+++ ./files/patch-02 2013-12-22 00:33:31.402151000 +0100
@@ -1,25 +1,6 @@
--- 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
diff -ru /usr/ports/mail/mutt/files/patch-staging-Makefile.am ./files/patch-staging-Makefile.am
--- /usr/ports/mail/mutt/files/patch-staging-Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-staging-Makefile.am 2013-12-21 17:31:07.034066000 +0100
@@ -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)
diff -ru /usr/ports/mail/mutt/pkg-plist ./pkg-plist
--- /usr/ports/mail/mutt/pkg-plist 1970-01-01 01:00:00.000000000 +0100
+++ ./pkg-plist 2013-12-22 10:35:59.468617000 +0100
@@ -0,0 +1,120 @@
+@mode 755
+bin/flea
+bin/mutt
+bin/muttbug
+@group mail
+@mode 2755
+bin/mutt_dotlock
+@group
+@mode 755
+bin/pgpewrap
+bin/pgpring
+bin/smime_keys
+@mode 644
+@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%%@dirrmtry %%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%%@dirrmtry %%EXAMPLESDIR%%/iconv
+%%PORTEXAMPLES%%@dirrmtry %%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
diff -ru /usr/ports/mail/mutt/scripts/generate-plist ./scripts/generate-plist
--- /usr/ports/mail/mutt/scripts/generate-plist 2013-03-14 08:34:30.338488000 +0100
+++ ./scripts/generate-plist 1970-01-01 01:00:00.000000000 +0100
@@ -1,159 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: head/mail/mutt/scripts/generate-plist 314137 2013-03-14 07:34:30Z jgh $
-#
-# 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 <<EOF
-bin/flea
-bin/mutt
-bin/muttbug
-bin/mutt_dotlock
-bin/pgpewrap
-bin/pgpring
-bin/smime_keys
-EOF
-
-if [ "$NLS" = "yes" ]; then
- cat >> $tmp_first <<EOF
-share/locale/bg/LC_MESSAGES/mutt.mo
-share/locale/ca/LC_MESSAGES/mutt.mo
-share/locale/cs/LC_MESSAGES/mutt.mo
-share/locale/da/LC_MESSAGES/mutt.mo
-share/locale/de/LC_MESSAGES/mutt.mo
-share/locale/el/LC_MESSAGES/mutt.mo
-share/locale/eo/LC_MESSAGES/mutt.mo
-share/locale/es/LC_MESSAGES/mutt.mo
-share/locale/et/LC_MESSAGES/mutt.mo
-share/locale/eu/LC_MESSAGES/mutt.mo
-share/locale/fr/LC_MESSAGES/mutt.mo
-share/locale/ga/LC_MESSAGES/mutt.mo
-share/locale/gl/LC_MESSAGES/mutt.mo
-share/locale/hu/LC_MESSAGES/mutt.mo
-share/locale/id/LC_MESSAGES/mutt.mo
-share/locale/it/LC_MESSAGES/mutt.mo
-share/locale/ja/LC_MESSAGES/mutt.mo
-share/locale/ko/LC_MESSAGES/mutt.mo
-share/locale/lt/LC_MESSAGES/mutt.mo
-share/locale/nl/LC_MESSAGES/mutt.mo
-share/locale/pl/LC_MESSAGES/mutt.mo
-share/locale/pt_BR/LC_MESSAGES/mutt.mo
-share/locale/ru/LC_MESSAGES/mutt.mo
-share/locale/sk/LC_MESSAGES/mutt.mo
-share/locale/sv/LC_MESSAGES/mutt.mo
-share/locale/tr/LC_MESSAGES/mutt.mo
-share/locale/uk/LC_MESSAGES/mutt.mo
-share/locale/zh_CN/LC_MESSAGES/mutt.mo
-share/locale/zh_TW/LC_MESSAGES/mutt.mo
-EOF
-fi
-
-if [ "$PORTDOCS" = "yes" ]; then
- cat >> $tmp_first <<EOF
-%%DOCSDIR%%/ABOUT-NLS
-%%DOCSDIR%%/COPYRIGHT
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/GPL
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/PGP-Notes.txt
-%%DOCSDIR%%/README
-%%DOCSDIR%%/README.SECURITY
-%%DOCSDIR%%/README.SSL
-%%DOCSDIR%%/TODO
-%%DOCSDIR%%/applying-patches.txt
-%%DOCSDIR%%/devel-notes.txt
-%%DOCSDIR%%/language.txt
-%%DOCSDIR%%/language50.txt
-%%DOCSDIR%%/manual.txt
-%%DOCSDIR%%/patch-notes.txt
-%%DOCSDIR%%/smime-notes.txt
-%%EXAMPLESDIR%%/Mush.rc
-%%EXAMPLESDIR%%/Pine.rc
-%%EXAMPLESDIR%%/Tin.rc
-%%EXAMPLESDIR%%/ca-bundle.crt
-%%EXAMPLESDIR%%/colors.default
-%%EXAMPLESDIR%%/colors.linux
-%%EXAMPLESDIR%%/gpg.rc
-%%EXAMPLESDIR%%/mutt_xtitle
-%%EXAMPLESDIR%%/pgp2.rc
-%%EXAMPLESDIR%%/pgp6.rc
-%%EXAMPLESDIR%%/sample.mailcap
-%%EXAMPLESDIR%%/sample.muttrc
-%%EXAMPLESDIR%%/sample.muttrc-tlr
-%%EXAMPLESDIR%%/smime.rc
-%%EXAMPLESDIR%%/smime_keys_test.pl
-%%EXAMPLESDIR%%/iconv/iconv.aix-3.2.5.rc
-%%EXAMPLESDIR%%/iconv/iconv.aix-4.1.5.rc
-%%EXAMPLESDIR%%/iconv/iconv.aix-4.2.0.rc
-%%EXAMPLESDIR%%/iconv/iconv.aix-4.3.2.rc
-%%EXAMPLESDIR%%/iconv/iconv.freebsd-3.3.rc
-%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.3.rc
-%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.90.rc
-%%EXAMPLESDIR%%/iconv/iconv.hpux-10.01.rc
-%%EXAMPLESDIR%%/iconv/iconv.hpux-10.20.rc
-%%EXAMPLESDIR%%/iconv/iconv.hpux-11.00.rc
-%%EXAMPLESDIR%%/iconv/iconv.irix-6.5.rc
-%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0a.rc
-%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0d.rc
-%%EXAMPLESDIR%%/iconv/iconv.solaris-2.4.rc
-%%EXAMPLESDIR%%/iconv/iconv.solaris-2.5.1.rc
-%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6-cjk.rc
-%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6.rc
-%%EXAMPLESDIR%%/iconv/iconv.solaris-2.7.rc
-EOF
-
- if [ "$NNTP" = "yes" ]; then
- echo "%%DOCSDIR%%/ChangeLog.nntp" >> $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 <<EOF
-@dirrm %%EXAMPLESDIR%%/iconv
-@dirrm %%EXAMPLESDIR%%
-@dirrm %%DOCSDIR%%
-EOF
-fi
-
-sort -u $tmp_first
-
-cat<<EOF
-@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
-EOF
-
-cat $tmp_last
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312221015.rBMAF3Iu002939>