summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorKirill Ponomarev <krion@FreeBSD.org>2005-03-21 09:03:36 +0000
committerKirill Ponomarev <krion@FreeBSD.org>2005-03-21 09:03:36 +0000
commitb7d2bc66905548d130dbf2e480d472d8e8b503d8 (patch)
tree5ab6e6f6b0d640d74392c8f66f7b1e68a0accea1 /mail
parentWhile no one is looking, slip the nve interface into the list of ethernet (diff)
Fix the pgp6 examples and no longer install pgp5 examples.
PR: ports/79076 Submitted by: maintainer
Diffstat (limited to 'mail')
-rw-r--r--mail/mutt/Makefile2
-rw-r--r--mail/mutt/files/patch-contrib-Makefile.in11
-rw-r--r--mail/mutt/pkg-plist1
-rw-r--r--mail/mutt14/Makefile2
-rw-r--r--mail/mutt14/files/patch-contrib-Makefile.in11
-rw-r--r--mail/mutt14/pkg-plist1
6 files changed, 26 insertions, 2 deletions
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 75caf1f3b6f3..a5555c38f88f 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -115,6 +115,8 @@ MAN5= mbox.5 muttrc.5
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.in
diff --git a/mail/mutt/files/patch-contrib-Makefile.in b/mail/mutt/files/patch-contrib-Makefile.in
new file mode 100644
index 000000000000..71e216bd607c
--- /dev/null
+++ b/mail/mutt/files/patch-contrib-Makefile.in
@@ -0,0 +1,11 @@
+--- contrib/Makefile.in.orig Mon Jun 4 19:14:31 2001
++++ contrib/Makefile.in Mon Mar 21 08:12:59 2005
+@@ -20,7 +20,7 @@
+
+ subdir = contrib
+
+-SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
++SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \
+ sample.muttrc sample.mailcap sample.muttrc-tlr
+
+ DISTFILES = Makefile.in language.txt language50.txt \
diff --git a/mail/mutt/pkg-plist b/mail/mutt/pkg-plist
index 6cb96b47395a..7420fade3608 100644
--- a/mail/mutt/pkg-plist
+++ b/mail/mutt/pkg-plist
@@ -46,7 +46,6 @@ etc/mime.types.dist
%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6.rc
%%EXAMPLESDIR%%/iconv/iconv.solaris-2.7.rc
%%EXAMPLESDIR%%/pgp2.rc
-%%EXAMPLESDIR%%/pgp5.rc
%%EXAMPLESDIR%%/pgp6.rc
%%EXAMPLESDIR%%/sample.mailcap
%%EXAMPLESDIR%%/sample.muttrc
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 75caf1f3b6f3..a5555c38f88f 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -115,6 +115,8 @@ MAN5= mbox.5 muttrc.5
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.in
diff --git a/mail/mutt14/files/patch-contrib-Makefile.in b/mail/mutt14/files/patch-contrib-Makefile.in
new file mode 100644
index 000000000000..71e216bd607c
--- /dev/null
+++ b/mail/mutt14/files/patch-contrib-Makefile.in
@@ -0,0 +1,11 @@
+--- contrib/Makefile.in.orig Mon Jun 4 19:14:31 2001
++++ contrib/Makefile.in Mon Mar 21 08:12:59 2005
+@@ -20,7 +20,7 @@
+
+ subdir = contrib
+
+-SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
++SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \
+ sample.muttrc sample.mailcap sample.muttrc-tlr
+
+ DISTFILES = Makefile.in language.txt language50.txt \
diff --git a/mail/mutt14/pkg-plist b/mail/mutt14/pkg-plist
index 6cb96b47395a..7420fade3608 100644
--- a/mail/mutt14/pkg-plist
+++ b/mail/mutt14/pkg-plist
@@ -46,7 +46,6 @@ etc/mime.types.dist
%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6.rc
%%EXAMPLESDIR%%/iconv/iconv.solaris-2.7.rc
%%EXAMPLESDIR%%/pgp2.rc
-%%EXAMPLESDIR%%/pgp5.rc
%%EXAMPLESDIR%%/pgp6.rc
%%EXAMPLESDIR%%/sample.mailcap
%%EXAMPLESDIR%%/sample.muttrc