aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjylefort <jylefort@FreeBSD.org>2005-07-04 10:03:29 +0800
committerjylefort <jylefort@FreeBSD.org>2005-07-04 10:03:29 +0800
commit5a9cd99e18b591757f115763f9b4c3e959168930 (patch)
tree525c55edc66bf29f407819b5566b04b7d3a91d7f
parent917da1adfd95207ce2b562f1a8330d80a7ecb202 (diff)
downloadfreebsd-ports-gnome-5a9cd99e18b591757f115763f9b4c3e959168930.tar.gz
freebsd-ports-gnome-5a9cd99e18b591757f115763f9b4c3e959168930.tar.zst
freebsd-ports-gnome-5a9cd99e18b591757f115763f9b4c3e959168930.zip
- Update sidebar patch to 20050628 [1]
- When installing from a package: - unbreak installation of Muttrc - give Muttrc the permissions that it has (644) when installed from the port [1]: PR: ports/82831 Submitted by: Renato Botelho <freebsd@galle.com.br> Approved by: maintainer
-rw-r--r--mail/mutt-devel/Makefile4
-rw-r--r--mail/mutt-devel/distinfo4
-rw-r--r--mail/mutt-devel/scripts/generate-plist10
3 files changed, 11 insertions, 7 deletions
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 8a99849fb397..29ded9d298d5 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -99,7 +99,7 @@
PORTNAME= mutt-devel
PORTVERSION= 1.5.9
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES+= mail ipv6
.if defined(WITH_MUTT_NNTP)
CATEGORIES+= news
@@ -391,7 +391,7 @@ SGML_NEEDED= yes
PATCHFILES+= p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
.endif
.if defined(WITH_MUTT_SIDEBAR_PATCH)
-SIDEBAR_PATCH= patch-1.5.9i.sidebar.20050525.txt
+SIDEBAR_PATCH= patch-1.5.9i.sidebar.20050628.txt
DISTFILES+= $(SIDEBAR_PATCH):thomer
SGML_NEEDED= yes
pre-patch::
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index b9bb01111e62..4f7273bce5ca 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -12,5 +12,5 @@ MD5 (mutt/patch-1.5.4.cd.ifdef.1) = a545036cdb55519154d0b35465f52daa
SIZE (mutt/patch-1.5.4.cd.ifdef.1) = 3545
MD5 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 9e29a6778ab07a4de3442691e4573fea
SIZE (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 6405
-MD5 (mutt/patch-1.5.9i.sidebar.20050525.txt) = 409050fe068d392a962ba102076c7c75
-SIZE (mutt/patch-1.5.9i.sidebar.20050525.txt) = 46560
+MD5 (mutt/patch-1.5.9i.sidebar.20050628.txt) = da1311e36e74e58037de7d231983fd47
+SIZE (mutt/patch-1.5.9i.sidebar.20050628.txt) = 46571
diff --git a/mail/mutt-devel/scripts/generate-plist b/mail/mutt-devel/scripts/generate-plist
index a136ebac34b1..5aa4dc691bb6 100644
--- a/mail/mutt-devel/scripts/generate-plist
+++ b/mail/mutt-devel/scripts/generate-plist
@@ -28,9 +28,6 @@ bin/mutt_dotlock
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 cp %D/etc/Muttrc.dist %D/etc/Muttrc; fi
EOF
if [ "$MUTT_NLS" = "yes" ]; then
@@ -183,4 +180,11 @@ 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