From owner-cvs-all@FreeBSD.ORG Tue Jul 20 12:46:56 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 95F0416A4CE; Tue, 20 Jul 2004 12:46:56 +0000 (GMT) Received: from mailbox.rainbownet.com (mailbox.rainbownet.com [213.174.191.133]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A7C943D41; Tue, 20 Jul 2004 12:46:54 +0000 (GMT) (envelope-from aturetta@commit.it) Received: from nbangx ([192.168.29.102]) (authenticated user aturetta@rainbownet.com) by rainbownet.com (rainbownet.com [127.0.0.1]) (MDaemon.PRO.v6.8.5.R) with ESMTP id 41-md50000000533.tmp; Tue, 20 Jul 2004 14:45:59 +0200 Message-ID: <005f01c46e57$820fa510$661da8c0@lan> From: "Angelo Turetta" To: , , References: <200407171851.i6HIp7qw055717@repoman.freebsd.org> Date: Tue, 20 Jul 2004 14:45:59 +0200 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_005C_01C46E68.456927B0" X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2800.1437 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1441 X-Authenticated-Sender: aturetta@rainbownet.com X-Spam-Processed: rainbownet.com, Tue, 20 Jul 2004 14:45:59 +0200 (not processed: message from valid local sender) X-MDRemoteIP: 192.168.29.102 X-Return-Path: aturetta@commit.it cc: Dirk Meyer Subject: Re: cvs commit: ports/mail/sendmail Makefile distinfo ports/mail/sendmail/files patch-aa X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Jul 2004 12:46:56 -0000 This is a multi-part message in MIME format. ------=_NextPart_000_005C_01C46E68.456927B0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit I think SOCKETMAP has been included in the basic sendmail distribution, thus the 'extra' patch in ports fails now when building with SENDMAIL_WITH_SOCKETMAP=yes. The attached patch fixed the build error for me, along with the deletion of the now unused patch file, but please verify if this is correct. Bye, Angelo Turetta ----- Original Message ----- From: "Dirk Meyer" To: ; ; Sent: Saturday, July 17, 2004 8:51 PM Subject: cvs commit: ports/mail/sendmail Makefile distinfo ports/mail/sendmail/files patch-aa > dinoex 2004-07-17 18:51:07 UTC > > FreeBSD ports repository > > Modified files: > mail/sendmail Makefile distinfo > mail/sendmail/files patch-aa > Log: > - update to 8.13.0 > > Revision Changes Path > 1.91 +1 -19 ports/mail/sendmail/Makefile > 1.21 +2 -6 ports/mail/sendmail/distinfo > 1.9 +23 -20 ports/mail/sendmail/files/patch-aa > > ------=_NextPart_000_005C_01C46E68.456927B0 Content-Type: application/octet-stream; name="sm813.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="sm813.patch" Index: Makefile=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /home/ncvs/ports/mail/sendmail/Makefile,v=0A= retrieving revision 1.92=0A= diff -u -r1.92 Makefile=0A= --- Makefile 17 Jul 2004 18:52:01 -0000 1.92=0A= +++ Makefile 20 Jul 2004 12:38:06 -0000=0A= @@ -100,9 +100,6 @@=0A= .else=0A= CONFLICTS+=3D sendmail*+sasl2*-8.*=0A= .endif=0A= -.if defined(SENDMAIL_WITH_SOCKETMAP)=0A= -EXTRA_PATCHES+=3D ${FILESDIR}/socketmap.patch=0A= -.endif=0A= .if defined(SENDMAIL_WITH_CYRUSLOOKUP)=0A= EXTRA_PATCHES+=3D ${FILESDIR}/cyruslookup.patch=0A= .endif=0A= ------=_NextPart_000_005C_01C46E68.456927B0--