1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00

install manpages for ${PREFIX}/cyrus/bin into ${PREFIX}/cyrus/man

to avoid conflict with other ports.

PR:		ports/60949, ports/29223, ports/47913
This commit is contained in:
Hajimu UMEMOTO 2004-04-02 20:13:53 +00:00
parent fba09a1864
commit 844bcae556
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=105990
25 changed files with 309 additions and 458 deletions

View File

@ -7,7 +7,7 @@
PORTNAME= cyrus-imapd
PORTVERSION= 2.0.17
#PORTREVISION= 0
PORTREVISION= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@ -50,9 +50,12 @@ CONFIGURE_ARGS+=--with-ucdsnmp=no
MAN1= cyradm.1 imtest.1 installsieve.1
MAN3= imclient.3
MAN5= cyrus.conf.5 imapd.conf.5 krb.equiv.5
MAN8= arbitron.8 collectnews.8 ctl_deliver.8 ctl_mboxlist.8 \
cyrquota.8 deliver.8 fud.8 idled.8 imapd.8 ipurge.8 \
lmtpd.8 master.8 mbpath.8 pop3d.8 reconstruct.8 rmnews.8 \
CYRUS_MAN3= Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \
Cyrus::IMAP::Shell.3 Cyrus::SIEVE::acap.3 \
Cyrus::SIEVE::managesieve.3
CYRUS_MAN8= arbitron.8 collectnews.8 ctl_deliver.8 ctl_mboxlist.8 \
deliver.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 \
master.8 mbpath.8 pop3d.8 quota.8 reconstruct.8 rmnews.8 \
syncnews.8 timsieved.8
DOCS= HEY-YOU-WITH-THE-EDITOR README acl-extension anoncvs bugs \
@ -73,46 +76,51 @@ post-patch:
@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
${WRKSRC}/tools/mkimap
pre-install:
@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
post-install:
@ ${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
.if !defined(NOPORTDOCS)
${MKDIR} ${PREFIX}/share/doc/cyrus/man
${MKDIR} ${PREFIX}/share/doc/cyrus/text
.for file in ${HTDOCS}
${INSTALL_DATA} ${WRKSRC}/doc/${file}.html \
${PREFIX}/share/doc/cyrus
@${ECHO_CMD} share/doc/cyrus/${file}.html >>${TMPPLIST}
.for file in ${CYRUS_MAN3}
@${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${file}
@${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${file}.gz \
>>${TMPPLIST}
.endfor
.for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8}
ofile=`echo ${file} | ${SED} s/cyrquota/quota/`; \
if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \
${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \
${PREFIX}/share/doc/cyrus/man/$${ofile}.html; \
${ECHO_CMD} share/doc/cyrus/man/$${ofile}.html >>${TMPPLIST}; \
.for file in ${CYRUS_MAN8}
@${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${file}
@${ECHO_CMD} cyrus/man/man8/${file}.gz >>${TMPPLIST}
.endfor
@${ECHO_CMD} "@dirrm cyrus/man/man8" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm cyrus/man" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm cyrus" >>${TMPPLIST}
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}/man
@${MKDIR} ${DOCSDIR}/text
.for file in ${HTDOCS}
@${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR}
@${ECHO_CMD} share/doc/${PORTNAME}/${file}.html >>${TMPPLIST}
.endfor
.for file in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8}
@if [ -f ${WRKSRC}/doc/man/${file}.html ]; then \
${INSTALL_DATA} ${WRKSRC}/doc/man/${file}.html \
${DOCSDIR}/man/${file}.html; \
${ECHO_CMD} share/doc/${PORTNAME}/man/${file}.html \
>>${TMPPLIST}; \
fi
.endfor
${INSTALL_DATA} ${WRKSRC}/doc/cyrusv2.mc \
${PREFIX}/share/doc/cyrus
@${ECHO_CMD} share/doc/cyrus/cyrusv2.mc >>${TMPPLIST}
@${INSTALL_DATA} ${WRKSRC}/doc/cyrusv2.mc ${DOCSDIR}
@${ECHO_CMD} share/doc/${PORTNAME}/cyrusv2.mc >>${TMPPLIST}
.for file in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/doc/text/${file} \
${PREFIX}/share/doc/cyrus/text
@${ECHO_CMD} share/doc/cyrus/text/${file} >>${TMPPLIST}
@${INSTALL_DATA} ${WRKSRC}/doc/text/${file} ${DOCSDIR}/text
@${ECHO_CMD} share/doc/${PORTNAME}/text/${file} >>${TMPPLIST}
.endfor
@${ECHO_CMD} "@dirrm share/doc/cyrus/text" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm share/doc/cyrus/man" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm share/doc/cyrus" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/text" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST}
.endif
${INSTALL_SCRIPT} ${FILESDIR}/imapd.sh \
@${INSTALL_SCRIPT} ${FILESDIR}/imapd.sh \
${PREFIX}/etc/rc.d/imapd.sh.sample
${INSTALL_DATA} ${FILESDIR}/imapd.conf \
@${INSTALL_DATA} ${FILESDIR}/imapd.conf \
${PREFIX}/etc/imapd.conf.dist
${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
@${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
${PREFIX}/etc/cyrus.conf.dist
${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
@${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
${PREFIX}/cyrus/bin/mkimap
@PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${CAT} ${PKGMESSAGE}

View File

@ -0,0 +1,13 @@
Index: Makefile.in
diff -u Makefile.in.orig Makefile.in
--- Makefile.in.orig Wed Dec 4 07:21:09 2002
+++ Makefile.in Sat Apr 3 03:40:04 2004
@@ -98,7 +98,7 @@
$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man1
$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man3
$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man5
- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man8
+ $(srcdir)/install-sh -d ${DESTDIR}$(cyrus_prefix)/man/man8
@for d in $(SUBDIRS); \
do \
(cd $$d; echo "### Making" install "in" `pwd`; \

View File

@ -1,12 +1,13 @@
--- man/Makefile.in.orig Tue Sep 1 03:49:14 1998
+++ man/Makefile.in Mon May 10 02:27:39 1999
@@ -52,7 +52,7 @@
MAN3 = $(srcdir)/imclient.3
MAN5 = $(srcdir)/imapd.conf.5 $(srcdir)/krb.equiv.5
MAN8 = $(srcdir)/arbitron.8 $(srcdir)/collectnews.8 $(srcdir)/deliver.8 \
- $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \
+ $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/cyrquota.8 \
$(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 \
$(srcdir)/mbpath.8 $(srcdir)/timsieved.8
Index: man/Makefile.in
diff -u man/Makefile.in.orig man/Makefile.in
--- man/Makefile.in.orig Mon Jul 16 03:08:15 2001
+++ man/Makefile.in Sat Apr 3 03:40:33 2004
@@ -89,7 +89,7 @@
done
for file in $(MAN8); \
do \
- $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/man/man8 || exit 1; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)$(cyrus_prefix)/man/man8 || exit 1; \
done
.c.o:

View File

@ -1,38 +0,0 @@
--- man/quota.8.orig Sun May 4 22:26:33 1997
+++ man/quota.8 Sun May 4 22:27:24 1997
@@ -11,9 +11,9 @@
.\" use of the code for commercial purposes or benefits by anyone
.\" without specific, additional permission by the owner of the code.
.SH NAME
-quota \- report and optionally fix quota usage
+cyrquota \- report and optionally fix quota usage
.SH SYNOPSIS
-.B quota
+.B cyrquota
[
.B \-f
]
@@ -21,12 +21,12 @@
.IR mailbox-prefix ...
]
.SH DESCRIPTION
-.I Quota
+.I Cyrquota
generates a report listing quota roots, giving their limits and usage.
If the
.I \-f
option is given,
-.I quota
+.I cyrquota
first fixes any inconsistencies in the quota subsystem, such as
mailboxes with the wrong quota root or quota roots with the wrong
quota usage reported.
@@ -37,7 +37,7 @@
prefixes.
.PP
Running
-.I quota
+.I cyrquota
with both the
.I \-f
option and

View File

@ -5,7 +5,6 @@ bin/sieveshell
cyrus/bin/ctl_deliver
cyrus/bin/ctl_mboxlist
cyrus/bin/cyrdump
cyrus/bin/cyrquota
cyrus/bin/deliver
cyrus/bin/feedcyrus
cyrus/bin/fud
@ -16,6 +15,7 @@ cyrus/bin/master
cyrus/bin/mbpath
cyrus/bin/mkimap
cyrus/bin/pop3d
cyrus/bin/quota
cyrus/bin/reconstruct
cyrus/bin/timsieved
@unexec if cmp -s %D/etc/cyrus.conf %D/etc/cyrus.conf.dist; then rm -f %D/etc/cyrus.conf; fi
@ -53,12 +53,6 @@ include/cyrus/util.h
include/cyrus/xmalloc.h
lib/libacap.a
lib/libcyrus.a
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::acap.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
@ -75,7 +69,6 @@ lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
@dirrm cyrus/bin
@dirrm cyrus
@dirrm include/cyrus
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE

View File

@ -7,7 +7,7 @@
PORTNAME= cyrus-imapd
PORTVERSION= 2.1.16
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@ -48,12 +48,12 @@ USE_BDB_VER= ${WITH_BDB_VER}
.else
USE_BDB_VER= 3
.endif
.if ${USE_BDB_VER} == 41
LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41
.if ${USE_BDB_VER} == 3
LIB_DEPENDS+= db3.3:${PORTSDIR}/databases/db3
.elif ${USE_BDB_VER} == 4
LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4
.elif ${USE_BDB_VER} == 3
LIB_DEPENDS+= db3.3:${PORTSDIR}/databases/db3
.elif ${USE_BDB_VER} == 41
LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41
.else
BROKEN= "WITH_BDB_VER must be 3, 4 or 41"
.endif
@ -96,11 +96,14 @@ MAN1= cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \
pop3test.1 sieveshell.1 sivtest.1 smtptest.1
MAN3= imclient.3
MAN5= cyrus.conf.5 imapd.conf.5 krb.equiv.5
MAN8= arbitron.8 chk_cyrus.8 collectnews.8 ctl_cyrusdb.8 \
ctl_deliver.8 ctl_mboxlist.8 cvt_cyrusdb.8 cyrquota.8 \
deliver.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 master.8 \
mbexamine.8 mbpath.8 notifyd.8 pop3d.8 reconstruct.8 \
rmnews.8 squatter.8 syncnews.8 timsieved.8 tls_prune.8
CYRUS_MAN3= Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \
Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3
CYRUS_MAN8= arbitron.8 chk_cyrus.8 collectnews.8 ctl_cyrusdb.8 \
ctl_deliver.8 ctl_mboxlist.8 cvt_cyrusdb.8 deliver.8 \
fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 master.8 \
mbexamine.8 mbpath.8 notifyd.8 pop3d.8 quota.8 \
reconstruct.8 rmnews.8 squatter.8 syncnews.8 \
timsieved.8 tls_prune.8
DOCS= altnamespace anoncvs bugs changes faq feedback index \
install install-admin-mb install-auth install-compile \
@ -143,51 +146,57 @@ post-patch:
-e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
-e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \
${WRKSRC}/tools/mkimap
@${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
.if ${PERL_LEVEL} < 500600
@${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \
${WRKSRC}/perl/sieve/scripts/sieveshell.pl
.endif
post-install:
@${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
.if !defined(NOPORTDOCS)
${MKDIR} ${PREFIX}/share/doc/cyrus-imapd2/man
${MKDIR} ${PREFIX}/share/doc/cyrus-imapd2/text
.for file in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/doc/${file}.html \
${PREFIX}/share/doc/cyrus-imapd2
@${ECHO_CMD} share/doc/cyrus-imapd2/${file}.html >>${TMPPLIST}
.for file in ${CYRUS_MAN3}
@${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${file}
@${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${file}.gz \
>>${TMPPLIST}
.endfor
.for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8}
ofile=`echo ${file} | ${SED} s/cyrquota/quota/`; \
if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \
${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \
${PREFIX}/share/doc/cyrus-imapd2/man/$${ofile}.html; \
${ECHO_CMD} share/doc/cyrus-imapd2/man/$${ofile}.html \
.for file in ${CYRUS_MAN8}
@${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${file}
@${ECHO_CMD} cyrus/man/man8/${file}.gz >>${TMPPLIST}
.endfor
@${ECHO_CMD} "@dirrm cyrus/man/man8" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm cyrus/man" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm cyrus" >>${TMPPLIST}
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}/man
@${MKDIR} ${DOCSDIR}/text
.for file in ${DOCS}
@${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR}
@${ECHO_CMD} share/doc/${PORTNAME}/${file}.html >>${TMPPLIST}
.endfor
.for file in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8}
@if [ -f ${WRKSRC}/doc/man/${file}.html ]; then \
${INSTALL_DATA} ${WRKSRC}/doc/man/${file}.html \
${DOCSDIR}/man/${file}.html; \
${ECHO_CMD} share/doc/${PORTNAME}/man/${file}.html \
>>${TMPPLIST}; \
fi
.endfor
${INSTALL_DATA} ${WRKSRC}/doc/cyrusv2.mc \
${PREFIX}/share/doc/cyrus-imapd2
@${ECHO_CMD} share/doc/cyrus-imapd2/cyrusv2.mc >>${TMPPLIST}
@${INSTALL_DATA} ${WRKSRC}/doc/cyrusv2.mc ${DOCSDIR}
@${ECHO_CMD} share/doc/${PORTNAME}/cyrusv2.mc >>${TMPPLIST}
.for file in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/doc/text/${file} \
${PREFIX}/share/doc/cyrus-imapd2/text
@${ECHO_CMD} share/doc/cyrus-imapd2/text/${file} >>${TMPPLIST}
@${INSTALL_DATA} ${WRKSRC}/doc/text/${file} ${DOCSDIR}/text
@${ECHO_CMD} share/doc/${PORTNAME}/text/${file} >>${TMPPLIST}
.endfor
@${ECHO_CMD} "@dirrm share/doc/cyrus-imapd2/text" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm share/doc/cyrus-imapd2/man" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm share/doc/cyrus-imapd2" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/text" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST}
.endif
@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${FILESDIR}/imapd.sh > ${PREFIX}/etc/rc.d/imapd.sh
@${CHMOD} 755 ${PREFIX}/etc/rc.d/imapd.sh
${INSTALL_DATA} ${FILESDIR}/imapd.conf \
@${INSTALL_DATA} ${FILESDIR}/imapd.conf \
${PREFIX}/etc/imapd.conf.dist
${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
@${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
${PREFIX}/etc/cyrus.conf.dist
${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
@${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
${PREFIX}/cyrus/bin/mkimap
@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
POST-INSTALL

View File

@ -0,0 +1,13 @@
Index: Makefile.in
diff -u Makefile.in.orig Makefile.in
--- Makefile.in.orig Thu Nov 20 01:45:26 2003
+++ Makefile.in Sat Apr 3 03:15:59 2004
@@ -98,7 +98,7 @@
$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man1
$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man3
$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man5
- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man8
+ $(srcdir)/install-sh -d ${DESTDIR}$(cyrus_prefix)/man/man8
@for d in $(SUBDIRS); \
do \
(cd $$d; echo "### Making" install "in" `pwd`; \

View File

@ -1,12 +1,13 @@
--- man/Makefile.in.orig Tue Sep 1 03:49:14 1998
+++ man/Makefile.in Mon May 10 02:27:39 1999
@@ -52,7 +52,7 @@
MAN3 = $(srcdir)/imclient.3
MAN5 = $(srcdir)/imapd.conf.5 $(srcdir)/krb.equiv.5
MAN8 = $(srcdir)/arbitron.8 $(srcdir)/collectnews.8 $(srcdir)/deliver.8 \
- $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \
+ $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/cyrquota.8 \
$(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 \
$(srcdir)/mbpath.8 $(srcdir)/timsieved.8
Index: man/Makefile.in
diff -u man/Makefile.in.orig man/Makefile.in
--- man/Makefile.in.orig Tue May 13 04:43:51 2003
+++ man/Makefile.in Sat Apr 3 03:17:17 2004
@@ -97,7 +97,7 @@
done
for file in $(MAN8); \
do \
- $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/man/man8 || exit 1; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)$(cyrus_prefix)/man/man8 || exit 1; \
done
.c.o:

View File

@ -1,38 +0,0 @@
--- man/quota.8.orig Sun May 4 22:26:33 1997
+++ man/quota.8 Sun May 4 22:27:24 1997
@@ -11,9 +11,9 @@
.\" use of the code for commercial purposes or benefits by anyone
.\" without specific, additional permission by the owner of the code.
.SH NAME
-quota \- report and optionally fix quota usage
+cyrquota \- report and optionally fix quota usage
.SH SYNOPSIS
-.B quota
+.B cyrquota
[
.B \-f
]
@@ -21,12 +21,12 @@
.IR mailbox-prefix ...
]
.SH DESCRIPTION
-.I Quota
+.I Cyrquota
generates a report listing quota roots, giving their limits and usage.
If the
.I \-f
option is given,
-.I quota
+.I cyrquota
first fixes any inconsistencies in the quota subsystem, such as
mailboxes with the wrong quota root or quota roots with the wrong
quota usage reported.
@@ -37,7 +37,7 @@
prefixes.
.PP
Running
-.I quota
+.I cyrquota
with both the
.I \-f
option and

View File

@ -14,27 +14,27 @@ cyrus/bin/ctl_deliver
cyrus/bin/ctl_mboxlist
cyrus/bin/cvt_cyrusdb
cyrus/bin/cyrdump
cyrus/bin/cyrquota
cyrus/bin/deliver
cyrus/bin/feedcyrus
cyrus/bin/fud
cyrus/bin/imapd
cyrus/bin/ipurge
cyrus/bin/lmtpd
%%MURDER%%cyrus/bin/lmtpproxyd
cyrus/bin/master
cyrus/bin/mbexamine
cyrus/bin/mbpath
cyrus/bin/mkimap
%%MURDER%%cyrus/bin/mupdate
cyrus/bin/notifyd
cyrus/bin/pop3d
%%MURDER%%cyrus/bin/pop3proxyd
%%MURDER%%cyrus/bin/proxyd
cyrus/bin/quota
cyrus/bin/reconstruct
cyrus/bin/squatter
cyrus/bin/timsieved
cyrus/bin/tls_prune
%%MURDER%%cyrus/bin/lmtpproxyd
%%MURDER%%cyrus/bin/mupdate
%%MURDER%%cyrus/bin/pop3proxyd
%%MURDER%%cyrus/bin/proxyd
@unexec if cmp -s %D/etc/cyrus.conf %D/etc/cyrus.conf.dist; then rm -f %D/etc/cyrus.conf; fi
etc/cyrus.conf.dist
@exec [ -f %B/cyrus.conf ] || cp %B/%f %B/cyrus.conf
@ -72,11 +72,6 @@ include/cyrus/util.h
include/cyrus/xmalloc.h
lib/libacap.a
lib/libcyrus.a
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
@ -89,7 +84,6 @@ lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
@dirrm cyrus/bin
@dirrm cyrus
@dirrm include/cyrus
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE

View File

@ -7,7 +7,7 @@
PORTNAME= cyrus-imapd
PORTVERSION= 2.2.3
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@ -129,10 +129,12 @@ MAN1= cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \
nntptest.1 pop3test.1 sieveshell.1 sivtest.1 smtptest.1
MAN3= imclient.3
MAN5= cyrus.conf.5 imapd.conf.5 krb.equiv.5
MAN8= arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 cyrquota.8 \
deliver.8 fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 \
lmtpd.8 master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 \
CYRUS_MAN3= Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \
Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3
CYRUS_MAN8= arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 deliver.8 \
fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 \
master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 quota.8 \
reconstruct.8 rmnews.8 smmapd.8 squatter.8 syncnews.8 \
timsieved.8 tls_prune.8
@ -144,8 +146,6 @@ DOCS= altnamespace anoncvs bugs changes faq feedback index \
mailing-list man notes os overview questions readme sieve \
sieve-protocol specs
DOCSDIR= ${PREFIX}/share/doc/cyrus-imapd22
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
PKGINSTALL= ${WRKDIR}/pkg-install
@ -183,52 +183,61 @@ post-patch:
@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
-e "s|/usr/sieve|/var/imap/sieve|g" \
${WRKSRC}/tools/masssievec
@${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
.if ${PERL_LEVEL} < 500600
@${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \
${WRKSRC}/perl/sieve/scripts/sieveshell.pl
.endif
post-install:
@${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}/man
${MKDIR} ${DOCSDIR}/text
.for file in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR}
@${ECHO_CMD} share/doc/cyrus-imapd22/${file}.html >>${TMPPLIST}
.for file in ${CYRUS_MAN3}
@${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${file}
@${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${file}.gz \
>>${TMPPLIST}
.endfor
.for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8}
ofile=`echo ${file} | ${SED} s/cyrquota/quota/`; \
if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \
${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \
${DOCSDIR}/man/$${ofile}.html; \
${ECHO_CMD} share/doc/cyrus-imapd22/man/$${ofile}.html \
.for file in ${CYRUS_MAN8}
@${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${file}
@${ECHO_CMD} cyrus/man/man8/${file}.gz >>${TMPPLIST}
.endfor
@${ECHO_CMD} "@dirrm cyrus/man/man8" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm cyrus/man" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm cyrus" >>${TMPPLIST}
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}/man
@${MKDIR} ${DOCSDIR}/text
.for file in ${DOCS}
@${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR}
@${ECHO_CMD} share/doc/${PORTNAME}/${file}.html >>${TMPPLIST}
.endfor
.for file in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8}
@if [ -f ${WRKSRC}/doc/man/${file}.html ]; then \
${INSTALL_DATA} ${WRKSRC}/doc/man/${file}.html \
${DOCSDIR}/man/${file}.html; \
${ECHO_CMD} share/doc/${PORTNAME}/man/${file}.html \
>>${TMPPLIST}; \
fi
.endfor
.for file in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png
${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
@${ECHO_CMD} share/doc/cyrus-imapd22/${file} >>${TMPPLIST}
@${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
@${ECHO_CMD} share/doc/${PORTNAME}/${file} >>${TMPPLIST}
.endfor
.for file in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/doc/text/${file} ${DOCSDIR}/text
@${ECHO_CMD} share/doc/cyrus-imapd22/text/${file} >>${TMPPLIST}
@${INSTALL_DATA} ${WRKSRC}/doc/text/${file} ${DOCSDIR}/text
@${ECHO_CMD} share/doc/${PORTNAME}/text/${file} >>${TMPPLIST}
.endfor
@${ECHO_CMD} "@dirrm share/doc/cyrus-imapd22/text" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm share/doc/cyrus-imapd22/man" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm share/doc/cyrus-imapd22" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/text" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST}
.endif
@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${FILESDIR}/imapd.sh > ${PREFIX}/etc/rc.d/imapd.sh
@${CHMOD} 755 ${PREFIX}/etc/rc.d/imapd.sh
${INSTALL_DATA} ${FILESDIR}/imapd.conf \
@${INSTALL_DATA} ${FILESDIR}/imapd.conf \
${PREFIX}/etc/imapd.conf.dist
${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
@${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
${PREFIX}/etc/cyrus.conf.dist
${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
@${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
${PREFIX}/cyrus/bin/mkimap
${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
@${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
${PREFIX}/cyrus/bin/masssievec
@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
POST-INSTALL

View File

@ -1,7 +1,7 @@
Index: Makefile.in
diff -u Makefile.in.orig Makefile.in
--- Makefile.in.orig Tue Jan 13 06:02:09 2004
+++ Makefile.in Thu Mar 11 01:34:50 2004
+++ Makefile.in Sat Apr 3 00:04:36 2004
@@ -90,13 +90,13 @@
touch distcvs
@ -19,7 +19,7 @@ diff -u Makefile.in.orig Makefile.in
+ $(INSTALL) -d ${DESTDIR}$(prefix)/man/man1
+ $(INSTALL) -d ${DESTDIR}$(prefix)/man/man3
+ $(INSTALL) -d ${DESTDIR}$(prefix)/man/man5
+ $(INSTALL) -d ${DESTDIR}$(prefix)/man/man8
+ $(INSTALL) -d ${DESTDIR}$(cyrus_prefix)/man/man8
@for d in $(SUBDIRS); \
do \
(cd $$d; echo "### Making" install "in" `pwd`; \

View File

@ -1,13 +1,13 @@
Index: man/Makefile.in
diff -u man/Makefile.in.orig man/Makefile.in
--- man/Makefile.in.orig Fri Jun 20 05:49:50 2003
+++ man/Makefile.in Fri Jul 18 00:30:05 2003
@@ -69,7 +69,7 @@
MAN3 = $(srcdir)/imclient.3
MAN5 = imapd.conf.5 $(srcdir)/krb.equiv.5 $(srcdir)/cyrus.conf.5
MAN8 = $(srcdir)/arbitron.8 $(srcdir)/cyr_expire.8 $(srcdir)/deliver.8 \
- $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \
+ $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/cyrquota.8 \
$(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 \
$(srcdir)/mbpath.8 $(srcdir)/timsieved.8 $(srcdir)/master.8 \
$(srcdir)/lmtpd.8 $(srcdir)/idled.8 $(srcdir)/ctl_mboxlist.8 \
--- man/Makefile.in.orig Sat Nov 8 06:33:54 2003
+++ man/Makefile.in Fri Apr 2 23:50:30 2004
@@ -102,7 +102,7 @@
done
for file in $(MAN8); \
do \
- $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/man/man8 || exit 1; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)$(cyrus_prefix)/man/man8 || exit 1; \
done
.c.o:

View File

@ -1,38 +0,0 @@
--- man/quota.8.orig Sun May 4 22:26:33 1997
+++ man/quota.8 Sun May 4 22:27:24 1997
@@ -11,9 +11,9 @@
.\" use of the code for commercial purposes or benefits by anyone
.\" without specific, additional permission by the owner of the code.
.SH NAME
-quota \- report and optionally fix quota usage
+cyrquota \- report and optionally fix quota usage
.SH SYNOPSIS
-.B quota
+.B cyrquota
[
.B \-f
]
@@ -21,12 +21,12 @@
.IR mailbox-prefix ...
]
.SH DESCRIPTION
-.I Quota
+.I Cyrquota
generates a report listing quota roots, giving their limits and usage.
If the
.I \-f
option is given,
-.I quota
+.I cyrquota
first fixes any inconsistencies in the quota subsystem, such as
mailboxes with the wrong quota root or quota roots with the wrong
quota usage reported.
@@ -37,7 +37,7 @@
prefixes.
.PP
Running
-.I quota
+.I cyrquota
with both the
.I \-f
option and

View File

@ -16,7 +16,6 @@ cyrus/bin/ctl_mboxlist
cyrus/bin/cvt_cyrusdb
cyrus/bin/cyr_expire
cyrus/bin/cyrdump
cyrus/bin/cyrquota
cyrus/bin/deliver
%%NNTP%%cyrus/bin/fetchnews
cyrus/bin/fud
@ -36,6 +35,7 @@ cyrus/bin/notifyd
cyrus/bin/pop3d
cyrus/bin/pop3proxyd
%%MURDER%%cyrus/bin/proxyd
cyrus/bin/quota
cyrus/bin/reconstruct
cyrus/bin/sievec
cyrus/bin/smmapd
@ -83,11 +83,6 @@ include/cyrus/util.h
include/cyrus/xmalloc.h
lib/libcyrus_min.a
lib/libcyrus.a
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
@ -100,7 +95,6 @@ lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
@dirrm cyrus/bin
@dirrm cyrus
@dirrm include/cyrus
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE

View File

@ -7,7 +7,7 @@
PORTNAME= cyrus-imapd
PORTVERSION= 2.2.3
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@ -129,10 +129,12 @@ MAN1= cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \
nntptest.1 pop3test.1 sieveshell.1 sivtest.1 smtptest.1
MAN3= imclient.3
MAN5= cyrus.conf.5 imapd.conf.5 krb.equiv.5
MAN8= arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 cyrquota.8 \
deliver.8 fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 \
lmtpd.8 master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 \
CYRUS_MAN3= Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \
Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3
CYRUS_MAN8= arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 deliver.8 \
fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 \
master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 quota.8 \
reconstruct.8 rmnews.8 smmapd.8 squatter.8 syncnews.8 \
timsieved.8 tls_prune.8
@ -144,8 +146,6 @@ DOCS= altnamespace anoncvs bugs changes faq feedback index \
mailing-list man notes os overview questions readme sieve \
sieve-protocol specs
DOCSDIR= ${PREFIX}/share/doc/cyrus-imapd22
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
PKGINSTALL= ${WRKDIR}/pkg-install
@ -183,52 +183,61 @@ post-patch:
@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
-e "s|/usr/sieve|/var/imap/sieve|g" \
${WRKSRC}/tools/masssievec
@${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
.if ${PERL_LEVEL} < 500600
@${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \
${WRKSRC}/perl/sieve/scripts/sieveshell.pl
.endif
post-install:
@${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}/man
${MKDIR} ${DOCSDIR}/text
.for file in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR}
@${ECHO_CMD} share/doc/cyrus-imapd22/${file}.html >>${TMPPLIST}
.for file in ${CYRUS_MAN3}
@${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${file}
@${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${file}.gz \
>>${TMPPLIST}
.endfor
.for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8}
ofile=`echo ${file} | ${SED} s/cyrquota/quota/`; \
if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \
${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \
${DOCSDIR}/man/$${ofile}.html; \
${ECHO_CMD} share/doc/cyrus-imapd22/man/$${ofile}.html \
.for file in ${CYRUS_MAN8}
@${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${file}
@${ECHO_CMD} cyrus/man/man8/${file}.gz >>${TMPPLIST}
.endfor
@${ECHO_CMD} "@dirrm cyrus/man/man8" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm cyrus/man" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm cyrus" >>${TMPPLIST}
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}/man
@${MKDIR} ${DOCSDIR}/text
.for file in ${DOCS}
@${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR}
@${ECHO_CMD} share/doc/${PORTNAME}/${file}.html >>${TMPPLIST}
.endfor
.for file in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8}
@if [ -f ${WRKSRC}/doc/man/${file}.html ]; then \
${INSTALL_DATA} ${WRKSRC}/doc/man/${file}.html \
${DOCSDIR}/man/${file}.html; \
${ECHO_CMD} share/doc/${PORTNAME}/man/${file}.html \
>>${TMPPLIST}; \
fi
.endfor
.for file in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png
${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
@${ECHO_CMD} share/doc/cyrus-imapd22/${file} >>${TMPPLIST}
@${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
@${ECHO_CMD} share/doc/${PORTNAME}/${file} >>${TMPPLIST}
.endfor
.for file in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/doc/text/${file} ${DOCSDIR}/text
@${ECHO_CMD} share/doc/cyrus-imapd22/text/${file} >>${TMPPLIST}
@${INSTALL_DATA} ${WRKSRC}/doc/text/${file} ${DOCSDIR}/text
@${ECHO_CMD} share/doc/${PORTNAME}/text/${file} >>${TMPPLIST}
.endfor
@${ECHO_CMD} "@dirrm share/doc/cyrus-imapd22/text" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm share/doc/cyrus-imapd22/man" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm share/doc/cyrus-imapd22" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/text" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST}
.endif
@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${FILESDIR}/imapd.sh > ${PREFIX}/etc/rc.d/imapd.sh
@${CHMOD} 755 ${PREFIX}/etc/rc.d/imapd.sh
${INSTALL_DATA} ${FILESDIR}/imapd.conf \
@${INSTALL_DATA} ${FILESDIR}/imapd.conf \
${PREFIX}/etc/imapd.conf.dist
${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
@${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
${PREFIX}/etc/cyrus.conf.dist
${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
@${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
${PREFIX}/cyrus/bin/mkimap
${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
@${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
${PREFIX}/cyrus/bin/masssievec
@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
POST-INSTALL

View File

@ -1,7 +1,7 @@
Index: Makefile.in
diff -u Makefile.in.orig Makefile.in
--- Makefile.in.orig Tue Jan 13 06:02:09 2004
+++ Makefile.in Thu Mar 11 01:34:50 2004
+++ Makefile.in Sat Apr 3 00:04:36 2004
@@ -90,13 +90,13 @@
touch distcvs
@ -19,7 +19,7 @@ diff -u Makefile.in.orig Makefile.in
+ $(INSTALL) -d ${DESTDIR}$(prefix)/man/man1
+ $(INSTALL) -d ${DESTDIR}$(prefix)/man/man3
+ $(INSTALL) -d ${DESTDIR}$(prefix)/man/man5
+ $(INSTALL) -d ${DESTDIR}$(prefix)/man/man8
+ $(INSTALL) -d ${DESTDIR}$(cyrus_prefix)/man/man8
@for d in $(SUBDIRS); \
do \
(cd $$d; echo "### Making" install "in" `pwd`; \

View File

@ -1,13 +1,13 @@
Index: man/Makefile.in
diff -u man/Makefile.in.orig man/Makefile.in
--- man/Makefile.in.orig Fri Jun 20 05:49:50 2003
+++ man/Makefile.in Fri Jul 18 00:30:05 2003
@@ -69,7 +69,7 @@
MAN3 = $(srcdir)/imclient.3
MAN5 = imapd.conf.5 $(srcdir)/krb.equiv.5 $(srcdir)/cyrus.conf.5
MAN8 = $(srcdir)/arbitron.8 $(srcdir)/cyr_expire.8 $(srcdir)/deliver.8 \
- $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \
+ $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/cyrquota.8 \
$(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 \
$(srcdir)/mbpath.8 $(srcdir)/timsieved.8 $(srcdir)/master.8 \
$(srcdir)/lmtpd.8 $(srcdir)/idled.8 $(srcdir)/ctl_mboxlist.8 \
--- man/Makefile.in.orig Sat Nov 8 06:33:54 2003
+++ man/Makefile.in Fri Apr 2 23:50:30 2004
@@ -102,7 +102,7 @@
done
for file in $(MAN8); \
do \
- $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/man/man8 || exit 1; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)$(cyrus_prefix)/man/man8 || exit 1; \
done
.c.o:

View File

@ -1,38 +0,0 @@
--- man/quota.8.orig Sun May 4 22:26:33 1997
+++ man/quota.8 Sun May 4 22:27:24 1997
@@ -11,9 +11,9 @@
.\" use of the code for commercial purposes or benefits by anyone
.\" without specific, additional permission by the owner of the code.
.SH NAME
-quota \- report and optionally fix quota usage
+cyrquota \- report and optionally fix quota usage
.SH SYNOPSIS
-.B quota
+.B cyrquota
[
.B \-f
]
@@ -21,12 +21,12 @@
.IR mailbox-prefix ...
]
.SH DESCRIPTION
-.I Quota
+.I Cyrquota
generates a report listing quota roots, giving their limits and usage.
If the
.I \-f
option is given,
-.I quota
+.I cyrquota
first fixes any inconsistencies in the quota subsystem, such as
mailboxes with the wrong quota root or quota roots with the wrong
quota usage reported.
@@ -37,7 +37,7 @@
prefixes.
.PP
Running
-.I quota
+.I cyrquota
with both the
.I \-f
option and

View File

@ -16,7 +16,6 @@ cyrus/bin/ctl_mboxlist
cyrus/bin/cvt_cyrusdb
cyrus/bin/cyr_expire
cyrus/bin/cyrdump
cyrus/bin/cyrquota
cyrus/bin/deliver
%%NNTP%%cyrus/bin/fetchnews
cyrus/bin/fud
@ -36,6 +35,7 @@ cyrus/bin/notifyd
cyrus/bin/pop3d
cyrus/bin/pop3proxyd
%%MURDER%%cyrus/bin/proxyd
cyrus/bin/quota
cyrus/bin/reconstruct
cyrus/bin/sievec
cyrus/bin/smmapd
@ -83,11 +83,6 @@ include/cyrus/util.h
include/cyrus/xmalloc.h
lib/libcyrus_min.a
lib/libcyrus.a
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
@ -100,7 +95,6 @@ lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
@dirrm cyrus/bin
@dirrm cyrus
@dirrm include/cyrus
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE

View File

@ -7,7 +7,7 @@
PORTNAME= cyrus-imapd
PORTVERSION= 2.2.3
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@ -129,10 +129,12 @@ MAN1= cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \
nntptest.1 pop3test.1 sieveshell.1 sivtest.1 smtptest.1
MAN3= imclient.3
MAN5= cyrus.conf.5 imapd.conf.5 krb.equiv.5
MAN8= arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 cyrquota.8 \
deliver.8 fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 \
lmtpd.8 master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 \
CYRUS_MAN3= Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \
Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3
CYRUS_MAN8= arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 deliver.8 \
fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 \
master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 quota.8 \
reconstruct.8 rmnews.8 smmapd.8 squatter.8 syncnews.8 \
timsieved.8 tls_prune.8
@ -144,8 +146,6 @@ DOCS= altnamespace anoncvs bugs changes faq feedback index \
mailing-list man notes os overview questions readme sieve \
sieve-protocol specs
DOCSDIR= ${PREFIX}/share/doc/cyrus-imapd22
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
PKGINSTALL= ${WRKDIR}/pkg-install
@ -183,52 +183,61 @@ post-patch:
@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \
-e "s|/usr/sieve|/var/imap/sieve|g" \
${WRKSRC}/tools/masssievec
@${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
.if ${PERL_LEVEL} < 500600
@${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \
${WRKSRC}/perl/sieve/scripts/sieveshell.pl
.endif
post-install:
@${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}/man
${MKDIR} ${DOCSDIR}/text
.for file in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR}
@${ECHO_CMD} share/doc/cyrus-imapd22/${file}.html >>${TMPPLIST}
.for file in ${CYRUS_MAN3}
@${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${file}
@${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${file}.gz \
>>${TMPPLIST}
.endfor
.for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8}
ofile=`echo ${file} | ${SED} s/cyrquota/quota/`; \
if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \
${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \
${DOCSDIR}/man/$${ofile}.html; \
${ECHO_CMD} share/doc/cyrus-imapd22/man/$${ofile}.html \
.for file in ${CYRUS_MAN8}
@${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${file}
@${ECHO_CMD} cyrus/man/man8/${file}.gz >>${TMPPLIST}
.endfor
@${ECHO_CMD} "@dirrm cyrus/man/man8" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm cyrus/man" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm cyrus" >>${TMPPLIST}
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}/man
@${MKDIR} ${DOCSDIR}/text
.for file in ${DOCS}
@${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR}
@${ECHO_CMD} share/doc/${PORTNAME}/${file}.html >>${TMPPLIST}
.endfor
.for file in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8}
@if [ -f ${WRKSRC}/doc/man/${file}.html ]; then \
${INSTALL_DATA} ${WRKSRC}/doc/man/${file}.html \
${DOCSDIR}/man/${file}.html; \
${ECHO_CMD} share/doc/${PORTNAME}/man/${file}.html \
>>${TMPPLIST}; \
fi
.endfor
.for file in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png
${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
@${ECHO_CMD} share/doc/cyrus-imapd22/${file} >>${TMPPLIST}
@${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
@${ECHO_CMD} share/doc/${PORTNAME}/${file} >>${TMPPLIST}
.endfor
.for file in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/doc/text/${file} ${DOCSDIR}/text
@${ECHO_CMD} share/doc/cyrus-imapd22/text/${file} >>${TMPPLIST}
@${INSTALL_DATA} ${WRKSRC}/doc/text/${file} ${DOCSDIR}/text
@${ECHO_CMD} share/doc/${PORTNAME}/text/${file} >>${TMPPLIST}
.endfor
@${ECHO_CMD} "@dirrm share/doc/cyrus-imapd22/text" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm share/doc/cyrus-imapd22/man" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm share/doc/cyrus-imapd22" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/text" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST}
@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST}
.endif
@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${FILESDIR}/imapd.sh > ${PREFIX}/etc/rc.d/imapd.sh
@${CHMOD} 755 ${PREFIX}/etc/rc.d/imapd.sh
${INSTALL_DATA} ${FILESDIR}/imapd.conf \
@${INSTALL_DATA} ${FILESDIR}/imapd.conf \
${PREFIX}/etc/imapd.conf.dist
${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
@${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
${PREFIX}/etc/cyrus.conf.dist
${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
@${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
${PREFIX}/cyrus/bin/mkimap
${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
@${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \
${PREFIX}/cyrus/bin/masssievec
@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
POST-INSTALL

View File

@ -1,7 +1,7 @@
Index: Makefile.in
diff -u Makefile.in.orig Makefile.in
--- Makefile.in.orig Tue Jan 13 06:02:09 2004
+++ Makefile.in Thu Mar 11 01:34:50 2004
+++ Makefile.in Sat Apr 3 00:04:36 2004
@@ -90,13 +90,13 @@
touch distcvs
@ -19,7 +19,7 @@ diff -u Makefile.in.orig Makefile.in
+ $(INSTALL) -d ${DESTDIR}$(prefix)/man/man1
+ $(INSTALL) -d ${DESTDIR}$(prefix)/man/man3
+ $(INSTALL) -d ${DESTDIR}$(prefix)/man/man5
+ $(INSTALL) -d ${DESTDIR}$(prefix)/man/man8
+ $(INSTALL) -d ${DESTDIR}$(cyrus_prefix)/man/man8
@for d in $(SUBDIRS); \
do \
(cd $$d; echo "### Making" install "in" `pwd`; \

View File

@ -1,13 +1,13 @@
Index: man/Makefile.in
diff -u man/Makefile.in.orig man/Makefile.in
--- man/Makefile.in.orig Fri Jun 20 05:49:50 2003
+++ man/Makefile.in Fri Jul 18 00:30:05 2003
@@ -69,7 +69,7 @@
MAN3 = $(srcdir)/imclient.3
MAN5 = imapd.conf.5 $(srcdir)/krb.equiv.5 $(srcdir)/cyrus.conf.5
MAN8 = $(srcdir)/arbitron.8 $(srcdir)/cyr_expire.8 $(srcdir)/deliver.8 \
- $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \
+ $(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/cyrquota.8 \
$(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 \
$(srcdir)/mbpath.8 $(srcdir)/timsieved.8 $(srcdir)/master.8 \
$(srcdir)/lmtpd.8 $(srcdir)/idled.8 $(srcdir)/ctl_mboxlist.8 \
--- man/Makefile.in.orig Sat Nov 8 06:33:54 2003
+++ man/Makefile.in Fri Apr 2 23:50:30 2004
@@ -102,7 +102,7 @@
done
for file in $(MAN8); \
do \
- $(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/man/man8 || exit 1; \
+ $(INSTALL) -m 644 $$file $(DESTDIR)$(cyrus_prefix)/man/man8 || exit 1; \
done
.c.o:

View File

@ -1,38 +0,0 @@
--- man/quota.8.orig Sun May 4 22:26:33 1997
+++ man/quota.8 Sun May 4 22:27:24 1997
@@ -11,9 +11,9 @@
.\" use of the code for commercial purposes or benefits by anyone
.\" without specific, additional permission by the owner of the code.
.SH NAME
-quota \- report and optionally fix quota usage
+cyrquota \- report and optionally fix quota usage
.SH SYNOPSIS
-.B quota
+.B cyrquota
[
.B \-f
]
@@ -21,12 +21,12 @@
.IR mailbox-prefix ...
]
.SH DESCRIPTION
-.I Quota
+.I Cyrquota
generates a report listing quota roots, giving their limits and usage.
If the
.I \-f
option is given,
-.I quota
+.I cyrquota
first fixes any inconsistencies in the quota subsystem, such as
mailboxes with the wrong quota root or quota roots with the wrong
quota usage reported.
@@ -37,7 +37,7 @@
prefixes.
.PP
Running
-.I quota
+.I cyrquota
with both the
.I \-f
option and

View File

@ -16,7 +16,6 @@ cyrus/bin/ctl_mboxlist
cyrus/bin/cvt_cyrusdb
cyrus/bin/cyr_expire
cyrus/bin/cyrdump
cyrus/bin/cyrquota
cyrus/bin/deliver
%%NNTP%%cyrus/bin/fetchnews
cyrus/bin/fud
@ -36,6 +35,7 @@ cyrus/bin/notifyd
cyrus/bin/pop3d
cyrus/bin/pop3proxyd
%%MURDER%%cyrus/bin/proxyd
cyrus/bin/quota
cyrus/bin/reconstruct
cyrus/bin/sievec
cyrus/bin/smmapd
@ -83,11 +83,6 @@ include/cyrus/util.h
include/cyrus/xmalloc.h
lib/libcyrus_min.a
lib/libcyrus.a
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3
lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
@ -100,7 +95,6 @@ lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
@dirrm cyrus/bin
@dirrm cyrus
@dirrm include/cyrus
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE