From owner-freebsd-ports Tue Dec 19 21:20:10 2000 From owner-freebsd-ports@FreeBSD.ORG Tue Dec 19 21:20:01 2000 Return-Path: Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B4BB937B402 for ; Tue, 19 Dec 2000 21:20:01 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id eBK5K1K48980; Tue, 19 Dec 2000 21:20:01 -0800 (PST) (envelope-from gnats) Resent-Date: Tue, 19 Dec 2000 21:20:01 -0800 (PST) Resent-Message-Id: <200012200520.eBK5K1K48980@freefall.freebsd.org> Resent-From: gnats-admin@FreeBSD.org (GNATS Management) Resent-To: freebsd-ports@FreeBSD.org Resent-Reply-To: gnats-admin@FreeBSD.org, dwcjr@inethouston.net Received: from leviathan.inethouston.com (216-118-21-146.pdq.net [216.118.21.146]) by hub.freebsd.org (Postfix) with ESMTP id DC51437B400 for ; Tue, 19 Dec 2000 21:16:41 -0800 (PST) Received: by leviathan.inethouston.com (Postfix, from userid 1001) id 3F29A177E3F; Tue, 19 Dec 2000 23:17:44 -0600 (CST) Message-Id: <20001220051744.3F29A177E3F@leviathan.inethouston.com> Date: Tue, 19 Dec 2000 23:17:44 -0600 (CST) From: dwcjr@inethouston.net Sender: poseiden@inethouston.net Reply-To: dwcjr@inethouston.net To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/23680: Update mail/cyrus update for portlint compliance Resent-Sender: gnats@FreeBSD.org Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 23680 >Category: ports >Synopsis: Update mail/cyrus update for portlint compliance >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Dec 19 21:20:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: David W. Chapman Jr. >Release: FreeBSD 4.2-STABLE i386 >Organization: RainTree Network Services >Environment: >Description: Erase extra blank lines in patches Change /usr/local in Makefile to ${PREFIX} USE ${CP}, ${MKDIR}, ${CHOWN} and ${CHMOD} Move Depends closer to top of Makefile Add man pages to Makefile >How-To-Repeat: >Fix: diff -urN cyrus.orig/Makefile cyrus/Makefile --- cyrus.orig/Makefile Tue Dec 19 23:01:43 2000 +++ cyrus/Makefile Tue Dec 19 23:11:36 2000 @@ -16,25 +16,25 @@ MAINTAINER= stb@FreeBSD.org -Y2K= http://asg.web.cmu.edu/cyrus/imapd/y2k.html - LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \ ${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl +Y2K= http://asg.web.cmu.edu/cyrus/imapd/y2k.html + GNU_CONFIGURE= YES CONFIGURE_ARGS= --with-cyrus-prefix=${PREFIX}/cyrus \ --with-cyrus-group=cyrus \ - --with-sasldir=/usr/local \ + --with-sasldir=${PREFIX} \ --with-tclsh=${PREFIX}/bin/tclsh8.2 \ --with-auth=unix \ --with-com-err -MAN1= cyradm.1 +MAN1= cyradm.1 imtest.1 installsieve.1 MAN3= imclient.3 MAN5= imapd.conf.5 -MAN8= arbitron.8 collectnews.8 cyrquota.8 deliver.8 imapd.8 \ - pop3d.8 reconstruct.8 rmnews.8 syncnews.8 +MAN8= arbitron.8 collectnews.8 cyrquota.8 deliver.8 fud.8 imapd.8 \ + mbpath.8 pop3d.8 reconstruct.8 rmnews.8 syncnews.8 timsieved.8 post-configure: @ ${SETENV} ${MAKE_ENV} perl -pi -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/imap/config.c ${WRKSRC}/imap/krbck .c @@ -79,22 +79,22 @@ ${INSTALL} -d -m 700 -o cyrus -g cyrus /var/pwcheck ${TOUCH} ${PREFIX}/etc/imap/mailboxes ${CHMOD} 640 ${PREFIX}/etc/imap/mailboxes - chown cyrus:cyrus ${PREFIX}/etc/imap/mailboxes - @${ECHO} "@exec mkdir %D/etc/imap" >>${TMPPLIST} + ${CHOWN} cyrus:cyrus ${PREFIX}/etc/imap/mailboxes + @${ECHO} "@exec ${MKDIR} %D/etc/imap" >>${TMPPLIST} .for dir in user quota proc log msg - @${ECHO} "@exec mkdir %D/etc/imap/${dir}" >>${TMPPLIST} + @${ECHO} "@exec ${MKDIR} %D/etc/imap/${dir}" >>${TMPPLIST} @${ECHO} "@dirrm etc/imap/${dir}" >>${TMPPLIST} .endfor - @${ECHO} "@exec cp /dev/null %D/etc/imap/mailboxes" >>${TMPPLIST} - @${ECHO} "@exec chown -R cyrus:cyrus %D/etc/imap" >>${TMPPLIST} - @${ECHO} "@exec chmod -R g-w,o= %D/etc/imap" >>${TMPPLIST} + @${ECHO} "@exec ${CP} /dev/null %D/etc/imap/mailboxes" >>${TMPPLIST} + @${ECHO} "@exec ${CHOWN} -R cyrus:cyrus %D/etc/imap" >>${TMPPLIST} + @${ECHO} "@exec ${CHMOD} -R g-w,o= %D/etc/imap" >>${TMPPLIST} @${ECHO} "@mode u=rwx,go=" >>${TMPPLIST} - @${ECHO} "@exec mkdir /var/pwcheck" >>${TMPPLIST} - @${ECHO} "@exec chown cyrus:cyrus /var/pwcheck" >>${TMPPLIST} - @${ECHO} "@exec chmod go= /var/pwcheck" >>${TMPPLIST} - @${ECHO} "@exec mkdir /var/spool/imap" >>${TMPPLIST} - @${ECHO} "@exec chown cyrus:cyrus /var/spool/imap" >>${TMPPLIST} - @${ECHO} "@exec chmod g-w,o= /var/spool/imap" >>${TMPPLIST} + @${ECHO} "@exec ${MKDIR} /var/pwcheck" >>${TMPPLIST} + @${ECHO} "@exec ${CHOWN} cyrus:cyrus /var/pwcheck" >>${TMPPLIST} + @${ECHO} "@exec ${CHMOD} go= /var/pwcheck" >>${TMPPLIST} + @${ECHO} "@exec ${MKDIR} /var/spool/imap" >>${TMPPLIST} + @${ECHO} "@exec ${CHOWN} cyrus:cyrus /var/spool/imap" >>${TMPPLIST} + @${ECHO} "@exec ${CHMOD} g-w,o= /var/spool/imap" >>${TMPPLIST} + @${ECHO} "@exec ${CHMOD} g-w,o= /var/spool/imap" >>${TMPPLIST} @${ECHO} "@cwd /var" >>${TMPPLIST} @${ECHO} "@dirrm pwcheck" >>${TMPPLIST} @${ECHO} "@dirrm spool/imap" >>${TMPPLIST} diff -urN cyrus.orig/files/patch-aa cyrus/files/patch-aa --- cyrus.orig/files/patch-aa Tue Dec 19 23:01:42 2000 +++ cyrus/files/patch-aa Tue Dec 19 23:02:45 2000 @@ -7,6 +7,4 @@ - $(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)/mbpath.8 $(srcdir)/timsieved.8 diff -urN cyrus.orig/files/patch-ac cyrus/files/patch-ac --- cyrus.orig/files/patch-ac Tue Dec 19 23:01:42 2000 +++ cyrus/files/patch-ac Tue Dec 19 23:02:21 2000 @@ -7,5 +7,4 @@ - SASLFLAGS="-I$sasldir/include" + SASLFLAGS="-I$sasldir/include/sasl" - fi - + fi diff -urN cyrus.orig/files/patch-bh cyrus/files/patch-bh --- cyrus.orig/files/patch-bh Tue Dec 19 23:01:42 2000 +++ cyrus/files/patch-bh Tue Dec 19 23:02:13 2000 @@ -7,5 +7,4 @@ -CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ +CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@ CFLAGS = @CFLAGS@ - LDFLAGS = @LDFLAGS@ - + LDFLAGS = @LDFLAGS@ diff -urN cyrus.orig/files/patch-bi cyrus/files/patch-bi --- cyrus.orig/files/patch-bi Tue Dec 19 23:01:42 2000 +++ cyrus/files/patch-bi Tue Dec 19 23:01:57 2000 @@ -7,5 +7,4 @@ -CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ +CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@ CFLAGS = @CFLAGS@ - LDFLAGS = @LDFLAGS@ - + LDFLAGS = @LDFLAGS@ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message