mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-22 04:17:44 +00:00
Code Issues Releases Activity

- Install translatesieve as well. [1]

Browse Source 
- Ignore . and .. while iterating through the directories
  holding usernames. [2]
  This patch was sent to upstream by submitter and already
  mergend into it.
- Sort pkg-plist.

Requested by:	"Daniel O'Connor" <doconnor@gsoft.com.au> [1]
Submitted by:	"Daniel O'Connor" <doconnor@gsoft.com.au> [2]
This commit is contained in:
Hajimu UMEMOTO 2020-11-14 09:03:14 +00:00
parent 52124930c1
commit 91acd82a6d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=555099
3 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mail/cyrus-imapd32/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= cyrus-imapd
PORTVERSION= 3.2.4
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= mail
MASTER_SITES= https://github.com/cyrusimap/cyrus-imapd/releases/download/${PORTNAME}-${PORTVERSION}/
PKGNAMESUFFIX= 32
@ -39,7 +39,8 @@ MAKE_JOBS_UNSAFE= yes
USES+= shebangfix
SHEBANG_FILES= imap/promdatagen snmp/snmpgen tools/config2header \
tools/masssievec tools/mkimap perl/sieve/scripts/*.pl
tools/masssievec tools/mkimap tools/translatesieve \
perl/sieve/scripts/*.pl
CPE_VENDOR= cmu
CPE_PRODUCT= cyrus_imap_server
@ -182,9 +183,11 @@ post-patch:
-e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
-e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
${WRKSRC}/tools/mkimap
.for f in masssievec translatesieve
@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
-e "s|/usr/sieve|/var/imap/sieve|g" \
${WRKSRC}/tools/masssievec
${WRKSRC}/tools/${f}
.endfor
@${REINPLACE_CMD} \
-e 's|$$(libdir)/\(pkgconfig\)|${PREFIX}/libdata/\1|g' \
-e 's|$$(mandir)/\(man[8]\)|${PREFIX}/cyrus/man/\1|g' \
@ -199,10 +202,10 @@ post-install:
${SED} -e 's,/run/cyrus/socket,/var/imap/socket,' \
${WRKSRC}/doc/examples/cyrus_conf/normal.conf \
> ${STAGEDIR}${EXAMPLESDIR}/cyrus.conf
${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
${STAGEDIR}${CYRUS_PREFIX}/sbin/mkimap
${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
${STAGEDIR}${CYRUS_PREFIX}/sbin/masssievec
.for f in mkimap masssievec translatesieve
${INSTALL_SCRIPT} ${WRKSRC}/tools/${f} \
${STAGEDIR}${CYRUS_PREFIX}/sbin/${f}
.endfor
${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \
${STAGEDIR}${PREFIX}/etc/man.d/cyrus-imapd.conf
.for s in 1 3 5

12
mail/cyrus-imapd32/files/patch-tools__translatesieve Normal file
View File

@ -0,0 +1,12 @@
--- tools/translatesieve.orig 2020-10-04 23:31:24 UTC
+++ tools/translatesieve
@@ -204,6 +204,9 @@ if ($altnamespace > $OPT_WasAlt) {
chdir $sievedir or die "couldn't change to $sievedir";
opendir (H, ".");
while (my $i = readdir H) {
+ if ($i eq "." || $i eq "..") {
+ next;
+ }
if (-d $i) {
if (! chdir $i) {
ouch "couldn't chdir to $i";

7
mail/cyrus-imapd32/pkg-plist
View File

@ -18,13 +18,16 @@ cyrus/libexec/imapd
cyrus/libexec/lmtpd
cyrus/libexec/lmtpproxyd
cyrus/libexec/master
%%MURDER%%cyrus/libexec/mupdate
%%NNTP%%cyrus/libexec/nntpd
cyrus/libexec/notifyd
cyrus/libexec/pop3d
cyrus/libexec/pop3proxyd
cyrus/libexec/promstatsd
cyrus/libexec/proxyd
%%LDAP%%cyrus/libexec/ptloader
cyrus/libexec/smmapd
%%REPLICATION%%cyrus/libexec/sync_server
cyrus/libexec/timsieved
cyrus/sbin/arbitron
cyrus/sbin/chk_cyrus
@ -57,10 +60,8 @@ cyrus/sbin/mbexamine
cyrus/sbin/mbpath
cyrus/sbin/mbtool
cyrus/sbin/mkimap
%%MURDER%%cyrus/libexec/mupdate
%%LDAP%%cyrus/sbin/ptdump
%%LDAP%%cyrus/sbin/ptexpire
%%LDAP%%cyrus/libexec/ptloader
cyrus/sbin/quota
cyrus/sbin/reconstruct
%%BACKUP%%cyrus/sbin/restore
@ -69,8 +70,8 @@ cyrus/sbin/sieved
%%SQUATTER%%cyrus/sbin/squatter
%%REPLICATION%%cyrus/sbin/sync_client
%%REPLICATION%%cyrus/sbin/sync_reset
%%REPLICATION%%cyrus/libexec/sync_server
cyrus/sbin/tls_prune
cyrus/sbin/translatesieve
cyrus/sbin/unexpunge
etc/man.d/cyrus-imapd.conf
include/cyrus/acl.h