From owner-freebsd-ports@FreeBSD.ORG Tue Aug 19 09:16:48 2003 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1EE1816A4C0 for ; Tue, 19 Aug 2003 09:16:48 -0700 (PDT) Received: from mr01.hansenet.de (ftvu01ac.wf1.hansenet.de [213.191.74.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0976A43FE0 for ; Tue, 19 Aug 2003 09:16:41 -0700 (PDT) (envelope-from Dennis.Berger@BSDsystems.de) Received: from mail.nipsi.de (62.109.121.252) by mr01.hansenet.de (5.5.053) id 3F31156700008EC2 for ports@freebsd.org; Tue, 19 Aug 2003 18:16:39 +0200 Received: from blackbox.home.net (blackbox.home.net [172.16.1.13]) (TLS: TLSv1/SSLv3,256bits,AES256-SHA) by mail.nipsi.de with esmtp; Tue, 19 Aug 2003 18:16:38 +0200 Received: from BSDsystems.de (blackbox.home.net [172.16.1.13]) by blackbox.home.net (8.12.9/8.12.9) with ESMTP id h7JGGeRv035352 for ; Tue, 19 Aug 2003 18:16:41 +0200 (CEST) (envelope-from Dennis.Berger@BSDsystems.de) Message-ID: <3F424D68.2060203@BSDsystems.de> Date: Tue, 19 Aug 2003 18:16:40 +0200 From: Dennis Berger User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.4) Gecko/20030704 X-Accept-Language: en-us, en Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=_nipsi.home.net-30315-1061309799-0001-2" To: ports@freebsd.org Subject: [Fwd: courier port] courier-MTA patch attached X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Aug 2003 16:16:48 -0000 This is a MIME-formatted message. If you see this text it means that your E-mail software does not support MIME-formatted messages. --=_nipsi.home.net-30315-1061309799-0001-2 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit no response from the maintainer.... --=_nipsi.home.net-30315-1061309799-0001-2 Content-Type: message/rfc822; name="courier port" Content-Disposition: inline; filename="courier port" Message-ID: <3F3EDD05.4010809@BSDsystems.de> Date: Sun, 17 Aug 2003 03:40:21 +0200 From: Dennis Berger User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.4) Gecko/20030704 X-Accept-Language: en-us, en Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=_nipsi.home.net-30315-1061309799-0001-3" To: yds@CoolRat.org Subject: courier port This is a MIME-formatted message. If you see this text it means that your E-mail software does not support MIME-formatted messages. --=_nipsi.home.net-30315-1061309799-0001-3 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit patch is attached --=_nipsi.home.net-30315-1061309799-0001-3 Content-Type: text/plain; name="courier-patch.diff"; charset=iso-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="courier-patch.diff" diff -ur mail/courier/Makefile.orig mail/courier/Makefile --- mail/courier/Makefile.orig Sun Jan 19 08:00:37 2003 +++ mail/courier/Makefile Tue Jan 28 12:55:25 2003 @@ -6,15 +6,13 @@ # PORTNAME= courier -PORTVERSION= 0.39.3 +PORTVERSION= 0.42.2 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= courier MAINTAINER= yds@CoolRat.org COMMENT= Courier SMTP IMAP POP3 HTTP mail server suite - -BROKEN= "Changes ownership/permission of manpages, broken pkg-plist" RUN_DEPENDS= ${LOCALBASE}/share/sysconftool/sysconftool:${PORTSDIR}/devel/sysconftool \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/CIDR.pm:${PORTSDIR}/net/p5-Net-CIDR @@ -50,14 +48,14 @@ CALENDIR= /var/spool/calendar MIMETYPES= ${LOCALBASE}/etc/apache/mime.types:${LOCALBASE}/etc/apache2/mime.types +USE_BZIP2= yes USE_SUBMAKE= yes USE_PERL5= yes USE_GMAKE= yes USE_AUTOMAKE= yes USE_LIBTOOL= yes USE_OPENSSL= yes -USE_AUTOMAKE_VER=14 -USE_AUTOCONF_VER=213 +USE_AUTOMAKE_VER=15 CONFIGURE_ARGS= --disable-root-check --with-db=db \ --enable-syslog=1 --enable-use-flock \ --with-mailuser=${MAILOWN} \ @@ -147,15 +145,12 @@ # patch around a bug in autoconf where the INSTALL macro does # not get set properly in directories more than one level deep post-build: - @${PERL} -pi -e 's:^INSTALL = \.\./:INSTALL = ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP}:;' \ - `${GREP} -rl '^INSTALL = \.\./' ${WRKSRC}/* | ${GREP} '/Makefile$$'` - @${PERL} -pi -e 's:^TAR = gtar$$:TAR = ${TAR}:g;' \ - `${GREP} -rl '^TAR = gtar$$' ${WRKSRC}/* | ${GREP} '/Makefile$$'` @${PERL} -pi -e 's:^(auth)\s+(required).*:$$1\t\t$$2\tpam_unix.so\ttry_first_pass:g; \ s:^(account)\s+(required).*:$$1 \t$$2\tpam_unix.so:g; \ s:^(session)\s+(required).*:$$1 \t$$2\tpam_permit.so:g;' \ ${WRKSRC}/*/*.authpam* \ ${WRKSRC}/*/*/*.authpam* + @${PERL} -pi -e 's:^transform = .*freebsd.*:transform = s,x,x:;' ${WRKSRC}/Makefile ${WRKSRC}/*/Makefile ${WRKSRC}/*/*/Makefile @${LN} ${WRKSRC}/gpglib/README.html ${WRKSRC}/gpglib/README.gpglib.html @${LN} ${WRKSRC}/imap/FAQ ${WRKSRC}/imap/FAQ.imap @${LN} ${WRKSRC}/imap/FAQ.html ${WRKSRC}/imap/FAQ.imap.html diff -ur mail/courier/Makefile.man.orig mail/courier/Makefile.man --- mail/courier/Makefile.man.orig Sun Jun 9 02:54:01 2002 +++ mail/courier/Makefile.man Tue Jan 28 12:53:51 2003 @@ -4,7 +4,7 @@ couriertcpd.1 \ couriertls.1 \ dot-forward.1 \ - dotlock.1 \ + lockmail.1 \ mailbot.1 \ maildirmake.1 \ maildrop.1 \ @@ -19,6 +19,7 @@ testmxlookup.1 MAN5= \ dot-courier.5 \ + maildir.5 \ maildropex.5 \ maildropfilter.5 \ maildropgdbm.5 diff -ur mail/courier/Makefile.own.orig mail/courier/Makefile.own --- mail/courier/Makefile.own.orig Wed Aug 21 09:53:42 2002 +++ mail/courier/Makefile.own Tue Jan 28 12:53:52 2003 @@ -3,8 +3,8 @@ bin/couriertls \ bin/deliverquota \ bin/dotforward \ - bin/dotlock \ bin/imapd \ + bin/lockmail \ bin/mailbot \ bin/maildirmake \ bin/makemime \ diff -ur mail/courier/distinfo.orig mail/courier/distinfo --- mail/courier/distinfo.orig Wed Aug 21 09:53:42 2002 +++ mail/courier/distinfo Tue Jan 28 12:23:16 2003 @@ -1 +1 @@ -MD5 (courier-0.39.3.tar.gz) = 14a6e8d4ebb9053f2b7920d36bc5d3f9 +MD5 (courier-0.42.2.tar.bz2) = f607cbd949dd0fe7f138cf3b65d702f4 diff -ur mail/courier/pkg-plist.orig mail/courier/pkg-plist --- mail/courier/pkg-plist.orig Wed Aug 21 09:53:42 2002 +++ mail/courier/pkg-plist Tue Jan 28 13:40:23 2003 @@ -27,14 +27,15 @@ %%SUB_LDAP%%@unexec cmp -s %D/etc/courier/ldapaliasrc %D/etc/courier/ldapaliasrc.dist && rm -f %D/etc/courier/ldapaliasrc 2>/dev/null || true @unexec cmp -s %D/etc/courier/pop3d-ssl %D/etc/courier/pop3d-ssl.dist && rm -f %D/etc/courier/pop3d-ssl 2>/dev/null || true @unexec cmp -s %D/etc/courier/pop3d %D/etc/courier/pop3d.dist && rm -f %D/etc/courier/pop3d 2>/dev/null || true +bin/addcr bin/cancelmsg bin/courier-config bin/couriermlm bin/couriertls bin/deliverquota bin/dotforward -bin/dotlock bin/imapd +bin/lockmail bin/mailbot bin/maildirmake bin/maildrop @@ -302,8 +303,6 @@ share/courier/filterctl share/courier/imapd share/courier/imapd-ssl -share/courier/locale/locale.alias -@dirrm share/courier/locale share/courier/makeacceptmailfor share/courier/makealiases share/courier/makedat @@ -636,7 +635,6 @@ %%PORTDOCS%%share/doc/courier/html/deliverquota.html %%PORTDOCS%%share/doc/courier/html/dot-courier.html %%PORTDOCS%%share/doc/courier/html/dot-forward.html -%%PORTDOCS%%share/doc/courier/html/dotlock.html %%PORTDOCS%%share/doc/courier/html/draft-varshavchik-exdata-smtpext.txt %%PORTDOCS%%share/doc/courier/html/draft-varshavchik-security-smtpext.txt %%PORTDOCS%%share/doc/courier/html/draft-varshavchik-verp-smtpext.txt @@ -653,7 +651,9 @@ %%PORTDOCS%%share/doc/courier/html/links.html %%PORTDOCS%%share/doc/courier/html/local.html %%PORTDOCS%%share/doc/courier/html/localmailfilter.html +%%PORTDOCS%%share/doc/courier/html/lockmail.html %%PORTDOCS%%share/doc/courier/html/mailbot.html +%%PORTDOCS%%share/doc/courier/html/maildir.html %%PORTDOCS%%share/doc/courier/html/maildirmake.html %%PORTDOCS%%share/doc/courier/html/maildirquota.html %%PORTDOCS%%share/doc/courier/html/maildrop.README.html @@ -671,6 +671,7 @@ %%PORTDOCS%%share/doc/courier/html/makepercentrelay.html %%PORTDOCS%%share/doc/courier/html/makesmtpaccess.html %%PORTDOCS%%share/doc/courier/html/makeuserdb.html +%%PORTDOCS%%share/doc/courier/html/manpage.css %%PORTDOCS%%share/doc/courier/html/mimegpg.html %%PORTDOCS%%share/doc/courier/html/mkesmtpdcert.html %%PORTDOCS%%share/doc/courier/html/mkimapdcert.html --=_nipsi.home.net-30315-1061309799-0001-3-- --=_nipsi.home.net-30315-1061309799-0001-2 Content-Type: text/plain; name="courier-patch.diff"; charset=iso-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="courier-patch.diff" diff -ur mail/courier/Makefile.orig mail/courier/Makefile --- mail/courier/Makefile.orig Sun Jan 19 08:00:37 2003 +++ mail/courier/Makefile Tue Jan 28 12:55:25 2003 @@ -6,15 +6,13 @@ # PORTNAME= courier -PORTVERSION= 0.39.3 +PORTVERSION= 0.42.2 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= courier MAINTAINER= yds@CoolRat.org COMMENT= Courier SMTP IMAP POP3 HTTP mail server suite - -BROKEN= "Changes ownership/permission of manpages, broken pkg-plist" RUN_DEPENDS= ${LOCALBASE}/share/sysconftool/sysconftool:${PORTSDIR}/devel/sysconftool \ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/CIDR.pm:${PORTSDIR}/net/p5-Net-CIDR @@ -50,14 +48,14 @@ CALENDIR= /var/spool/calendar MIMETYPES= ${LOCALBASE}/etc/apache/mime.types:${LOCALBASE}/etc/apache2/mime.types +USE_BZIP2= yes USE_SUBMAKE= yes USE_PERL5= yes USE_GMAKE= yes USE_AUTOMAKE= yes USE_LIBTOOL= yes USE_OPENSSL= yes -USE_AUTOMAKE_VER=14 -USE_AUTOCONF_VER=213 +USE_AUTOMAKE_VER=15 CONFIGURE_ARGS= --disable-root-check --with-db=db \ --enable-syslog=1 --enable-use-flock \ --with-mailuser=${MAILOWN} \ @@ -147,15 +145,12 @@ # patch around a bug in autoconf where the INSTALL macro does # not get set properly in directories more than one level deep post-build: - @${PERL} -pi -e 's:^INSTALL = \.\./:INSTALL = ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP}:;' \ - `${GREP} -rl '^INSTALL = \.\./' ${WRKSRC}/* | ${GREP} '/Makefile$$'` - @${PERL} -pi -e 's:^TAR = gtar$$:TAR = ${TAR}:g;' \ - `${GREP} -rl '^TAR = gtar$$' ${WRKSRC}/* | ${GREP} '/Makefile$$'` @${PERL} -pi -e 's:^(auth)\s+(required).*:$$1\t\t$$2\tpam_unix.so\ttry_first_pass:g; \ s:^(account)\s+(required).*:$$1 \t$$2\tpam_unix.so:g; \ s:^(session)\s+(required).*:$$1 \t$$2\tpam_permit.so:g;' \ ${WRKSRC}/*/*.authpam* \ ${WRKSRC}/*/*/*.authpam* + @${PERL} -pi -e 's:^transform = .*freebsd.*:transform = s,x,x:;' ${WRKSRC}/Makefile ${WRKSRC}/*/Makefile ${WRKSRC}/*/*/Makefile @${LN} ${WRKSRC}/gpglib/README.html ${WRKSRC}/gpglib/README.gpglib.html @${LN} ${WRKSRC}/imap/FAQ ${WRKSRC}/imap/FAQ.imap @${LN} ${WRKSRC}/imap/FAQ.html ${WRKSRC}/imap/FAQ.imap.html diff -ur mail/courier/Makefile.man.orig mail/courier/Makefile.man --- mail/courier/Makefile.man.orig Sun Jun 9 02:54:01 2002 +++ mail/courier/Makefile.man Tue Jan 28 12:53:51 2003 @@ -4,7 +4,7 @@ couriertcpd.1 \ couriertls.1 \ dot-forward.1 \ - dotlock.1 \ + lockmail.1 \ mailbot.1 \ maildirmake.1 \ maildrop.1 \ @@ -19,6 +19,7 @@ testmxlookup.1 MAN5= \ dot-courier.5 \ + maildir.5 \ maildropex.5 \ maildropfilter.5 \ maildropgdbm.5 diff -ur mail/courier/Makefile.own.orig mail/courier/Makefile.own --- mail/courier/Makefile.own.orig Wed Aug 21 09:53:42 2002 +++ mail/courier/Makefile.own Tue Jan 28 12:53:52 2003 @@ -3,8 +3,8 @@ bin/couriertls \ bin/deliverquota \ bin/dotforward \ - bin/dotlock \ bin/imapd \ + bin/lockmail \ bin/mailbot \ bin/maildirmake \ bin/makemime \ diff -ur mail/courier/distinfo.orig mail/courier/distinfo --- mail/courier/distinfo.orig Wed Aug 21 09:53:42 2002 +++ mail/courier/distinfo Tue Jan 28 12:23:16 2003 @@ -1 +1 @@ -MD5 (courier-0.39.3.tar.gz) = 14a6e8d4ebb9053f2b7920d36bc5d3f9 +MD5 (courier-0.42.2.tar.bz2) = f607cbd949dd0fe7f138cf3b65d702f4 diff -ur mail/courier/pkg-plist.orig mail/courier/pkg-plist --- mail/courier/pkg-plist.orig Wed Aug 21 09:53:42 2002 +++ mail/courier/pkg-plist Tue Jan 28 13:40:23 2003 @@ -27,14 +27,15 @@ %%SUB_LDAP%%@unexec cmp -s %D/etc/courier/ldapaliasrc %D/etc/courier/ldapaliasrc.dist && rm -f %D/etc/courier/ldapaliasrc 2>/dev/null || true @unexec cmp -s %D/etc/courier/pop3d-ssl %D/etc/courier/pop3d-ssl.dist && rm -f %D/etc/courier/pop3d-ssl 2>/dev/null || true @unexec cmp -s %D/etc/courier/pop3d %D/etc/courier/pop3d.dist && rm -f %D/etc/courier/pop3d 2>/dev/null || true +bin/addcr bin/cancelmsg bin/courier-config bin/couriermlm bin/couriertls bin/deliverquota bin/dotforward -bin/dotlock bin/imapd +bin/lockmail bin/mailbot bin/maildirmake bin/maildrop @@ -302,8 +303,6 @@ share/courier/filterctl share/courier/imapd share/courier/imapd-ssl -share/courier/locale/locale.alias -@dirrm share/courier/locale share/courier/makeacceptmailfor share/courier/makealiases share/courier/makedat @@ -636,7 +635,6 @@ %%PORTDOCS%%share/doc/courier/html/deliverquota.html %%PORTDOCS%%share/doc/courier/html/dot-courier.html %%PORTDOCS%%share/doc/courier/html/dot-forward.html -%%PORTDOCS%%share/doc/courier/html/dotlock.html %%PORTDOCS%%share/doc/courier/html/draft-varshavchik-exdata-smtpext.txt %%PORTDOCS%%share/doc/courier/html/draft-varshavchik-security-smtpext.txt %%PORTDOCS%%share/doc/courier/html/draft-varshavchik-verp-smtpext.txt @@ -653,7 +651,9 @@ %%PORTDOCS%%share/doc/courier/html/links.html %%PORTDOCS%%share/doc/courier/html/local.html %%PORTDOCS%%share/doc/courier/html/localmailfilter.html +%%PORTDOCS%%share/doc/courier/html/lockmail.html %%PORTDOCS%%share/doc/courier/html/mailbot.html +%%PORTDOCS%%share/doc/courier/html/maildir.html %%PORTDOCS%%share/doc/courier/html/maildirmake.html %%PORTDOCS%%share/doc/courier/html/maildirquota.html %%PORTDOCS%%share/doc/courier/html/maildrop.README.html @@ -671,6 +671,7 @@ %%PORTDOCS%%share/doc/courier/html/makepercentrelay.html %%PORTDOCS%%share/doc/courier/html/makesmtpaccess.html %%PORTDOCS%%share/doc/courier/html/makeuserdb.html +%%PORTDOCS%%share/doc/courier/html/manpage.css %%PORTDOCS%%share/doc/courier/html/mimegpg.html %%PORTDOCS%%share/doc/courier/html/mkesmtpdcert.html %%PORTDOCS%%share/doc/courier/html/mkimapdcert.html --=_nipsi.home.net-30315-1061309799-0001-2--