summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorJim Mock <jim@FreeBSD.org>2002-02-27 00:52:32 +0000
committerJim Mock <jim@FreeBSD.org>2002-02-27 00:52:32 +0000
commit473c6cc48e65bfacb4cab0b3e8a05f33e8965baa (patch)
tree31f625f3703093bffd7bf5a51a37f5e11725984d /mail
parentAdd the missing extra-patch-sgmlformat patch and fix a few things: (diff)
Fix pkg-plist.
Submitted by: maintainer
Notes
Notes: svn path=/head/; revision=55289
Diffstat (limited to 'mail')
-rw-r--r--mail/mutt-devel/Makefile19
-rw-r--r--mail/mutt-devel/pkg-plist2
2 files changed, 20 insertions, 1 deletions
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index eead3da635f4..379184d26f14 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -225,6 +225,7 @@ PLIST_SUB+= SUB_ADD_C="@comment "
PLIST_SUB+= SUB_ADD_D="@comment "
PLIST_SUB+= SUB_ADD_E="@comment "
PLIST_SUB+= SUB_ADD_F="@comment "
+PLIST_SUB+= SUB_PGP_A="@comment "
.elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH)
PLIST_SUB+= SUB_ADD_F=""
@@ -234,6 +235,7 @@ PLIST_SUB+= SUB_ADD_C="@comment "
PLIST_SUB+= SUB_ADD_D="@comment "
PLIST_SUB+= SUB_ADD_E="@comment "
PLIST_SUB+= SUB_ADD_G="@comment "
+PLIST_SUB+= SUB_PGP_A="@comment "
.elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
!defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH)
PLIST_SUB+= SUB_ADD_G=""
@@ -243,6 +245,7 @@ PLIST_SUB+= SUB_ADD_C="@comment "
PLIST_SUB+= SUB_ADD_D="@comment "
PLIST_SUB+= SUB_ADD_E="@comment "
PLIST_SUB+= SUB_ADD_F="@comment "
+PLIST_SUB+= SUB_PGP_A="@comment "
.elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
!defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH)
PLIST_SUB+= SUB_ADD_F=""
@@ -252,6 +255,7 @@ PLIST_SUB+= SUB_ADD_C="@comment "
PLIST_SUB+= SUB_ADD_D="@comment "
PLIST_SUB+= SUB_ADD_E="@comment "
PLIST_SUB+= SUB_ADD_G="@comment "
+PLIST_SUB+= SUB_PGP_A="@comment "
.elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH)
PLIST_SUB+= SUB_ADD_C=""
@@ -261,6 +265,7 @@ PLIST_SUB+= SUB_ADD_D="@comment "
PLIST_SUB+= SUB_ADD_E="@comment "
PLIST_SUB+= SUB_ADD_F="@comment "
PLIST_SUB+= SUB_ADD_G="@comment "
+PLIST_SUB+= SUB_PGP_A="@comment "
.elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH)
PLIST_SUB+= SUB_ADD_B=""
@@ -270,6 +275,7 @@ PLIST_SUB+= SUB_ADD_D="@comment "
PLIST_SUB+= SUB_ADD_E="@comment "
PLIST_SUB+= SUB_ADD_F="@comment "
PLIST_SUB+= SUB_ADD_G="@comment "
+PLIST_SUB+= SUB_PGP_A="@comment "
.elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
!defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH)
PLIST_SUB+= SUB_ADD_C=""
@@ -279,6 +285,7 @@ PLIST_SUB+= SUB_ADD_D="@comment "
PLIST_SUB+= SUB_ADD_E="@comment "
PLIST_SUB+= SUB_ADD_F="@comment "
PLIST_SUB+= SUB_ADD_G="@comment "
+PLIST_SUB+= SUB_PGP_A="@comment "
.elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
!defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH)
PLIST_SUB+= SUB_ADD_B=""
@@ -288,6 +295,7 @@ PLIST_SUB+= SUB_ADD_D="@comment "
PLIST_SUB+= SUB_ADD_E="@comment "
PLIST_SUB+= SUB_ADD_F="@comment "
PLIST_SUB+= SUB_ADD_G="@comment "
+PLIST_SUB+= SUB_PGP_A="@comment "
.elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH)
PLIST_SUB+= SUB_ADD_E=""
@@ -297,6 +305,7 @@ PLIST_SUB+= SUB_ADD_C="@comment "
PLIST_SUB+= SUB_ADD_D="@comment "
PLIST_SUB+= SUB_ADD_F="@comment "
PLIST_SUB+= SUB_ADD_G="@comment "
+PLIST_SUB+= SUB_PGP_A="@comment "
.elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH)
PLIST_SUB+= SUB_ADD_D=""
@@ -306,6 +315,7 @@ PLIST_SUB+= SUB_ADD_C="@comment "
PLIST_SUB+= SUB_ADD_E="@comment "
PLIST_SUB+= SUB_ADD_F="@comment "
PLIST_SUB+= SUB_ADD_G="@comment "
+PLIST_SUB+= SUB_PGP_A="@comment "
.elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
!defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH)
PLIST_SUB+= SUB_ADD_E=""
@@ -315,6 +325,7 @@ PLIST_SUB+= SUB_ADD_C="@comment "
PLIST_SUB+= SUB_ADD_D="@comment "
PLIST_SUB+= SUB_ADD_F="@comment "
PLIST_SUB+= SUB_ADD_G="@comment "
+PLIST_SUB+= SUB_PGP_A="@comment "
.elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
!defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH)
PLIST_SUB+= SUB_ADD_D=""
@@ -324,6 +335,7 @@ PLIST_SUB+= SUB_ADD_C="@comment "
PLIST_SUB+= SUB_ADD_E="@comment "
PLIST_SUB+= SUB_ADD_F="@comment "
PLIST_SUB+= SUB_ADD_G="@comment "
+PLIST_SUB+= SUB_PGP_A="@comment "
.elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH)
PLIST_SUB+= SUB_ADD_A=""
@@ -333,6 +345,7 @@ PLIST_SUB+= SUB_ADD_D="@comment "
PLIST_SUB+= SUB_ADD_E="@comment "
PLIST_SUB+= SUB_ADD_F="@comment "
PLIST_SUB+= SUB_ADD_G="@comment "
+PLIST_SUB+= SUB_PGP_A="@comment "
.elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH)
PLIST_SUB+= SUB_ADD_A="@comment "
@@ -342,6 +355,7 @@ PLIST_SUB+= SUB_ADD_D="@comment "
PLIST_SUB+= SUB_ADD_E="@comment "
PLIST_SUB+= SUB_ADD_F="@comment "
PLIST_SUB+= SUB_ADD_G="@comment "
+PLIST_SUB+= SUB_PGP_A="@comment "
.elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
!defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH)
PLIST_SUB+= SUB_ADD_A=""
@@ -351,6 +365,7 @@ PLIST_SUB+= SUB_ADD_D="@comment "
PLIST_SUB+= SUB_ADD_E="@comment "
PLIST_SUB+= SUB_ADD_F="@comment "
PLIST_SUB+= SUB_ADD_G="@comment "
+PLIST_SUB+= SUB_PGP_A="@comment "
.elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
!defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH)
PLIST_SUB+= SUB_ADD_A="@comment "
@@ -360,6 +375,7 @@ PLIST_SUB+= SUB_ADD_D="@comment "
PLIST_SUB+= SUB_ADD_E="@comment "
PLIST_SUB+= SUB_ADD_F="@comment "
PLIST_SUB+= SUB_ADD_G="@comment "
+PLIST_SUB+= SUB_PGP_A=""
.else # patches
PLIST_SUB+= SUB_ADD_A="@comment "
PLIST_SUB+= SUB_ADD_B="@comment "
@@ -368,6 +384,7 @@ PLIST_SUB+= SUB_ADD_D="@comment "
PLIST_SUB+= SUB_ADD_E="@comment "
PLIST_SUB+= SUB_ADD_F="@comment "
PLIST_SUB+= SUB_ADD_G="@comment "
+PLIST_SUB+= SUB_PGP_A=""
.endif
.else # HTML
PLIST_SUB+= SUB_HTML="@comment "
@@ -378,6 +395,7 @@ PLIST_SUB+= SUB_ADD_D="@comment "
PLIST_SUB+= SUB_ADD_E="@comment "
PLIST_SUB+= SUB_ADD_F="@comment "
PLIST_SUB+= SUB_ADD_G="@comment "
+PLIST_SUB+= SUB_PGP_A="@comment "
.endif
.else # NOPORTDOCS
PLIST_SUB+= SUB_HTML="@comment "
@@ -389,6 +407,7 @@ PLIST_SUB+= SUB_ADD_D="@comment "
PLIST_SUB+= SUB_ADD_E="@comment "
PLIST_SUB+= SUB_ADD_F="@comment "
PLIST_SUB+= SUB_ADD_G="@comment "
+PLIST_SUB+= SUB_PGP_A="@comment "
post-patch::
${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib
.endif
diff --git a/mail/mutt-devel/pkg-plist b/mail/mutt-devel/pkg-plist
index 8d213181010c..a0132d825846 100644
--- a/mail/mutt-devel/pkg-plist
+++ b/mail/mutt-devel/pkg-plist
@@ -346,7 +346,7 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
%%SUB_HTML%%share/doc/mutt/html/manual332.html
%%SUB_HTML%%share/doc/mutt/html/manual333.html
%%SUB_HTML%%share/doc/mutt/html/manual334.html
-%%SUB_HTML%%%%SUB_PGP%%share/doc/mutt/html/manual335.html
+%%SUB_HTML%%%%SUB_PGP_A%%%%SUB_PGP%%share/doc/mutt/html/manual335.html
%%SUB_HTML%%share/doc/mutt/html/manual34.html
%%SUB_HTML%%share/doc/mutt/html/manual35.html
%%SUB_HTML%%share/doc/mutt/html/manual36.html