From owner-freebsd-ports Wed Jun 28 23:37: 2 2000 Delivered-To: freebsd-ports@freebsd.org Received: from maynard.mail.mindspring.net (maynard.mail.mindspring.net [207.69.200.243]) by hub.freebsd.org (Postfix) with ESMTP id 0745237B525; Wed, 28 Jun 2000 23:36:57 -0700 (PDT) (envelope-from asami@cs.berkeley.edu) Received: from silvia.hip.berkeley.edu (sji-ca7-130.ix.netcom.com [209.109.235.130]) by maynard.mail.mindspring.net (8.9.3/8.8.5) with ESMTP id CAA23278; Thu, 29 Jun 2000 02:36:52 -0400 (EDT) Received: (from asami@localhost) by silvia.hip.berkeley.edu (8.9.3/8.6.9) id XAA46713; Wed, 28 Jun 2000 23:36:51 -0700 (PDT) To: Ade Lovett Cc: ports@FreeBSD.org, markm@FreeBSD.org Subject: Re: perl5 ports and perl5.006 References: <20000627190539.C3994@FreeBSD.org> <20000628100634.A74843@FreeBSD.org> <20000628205310.A31932@lovett.com> From: asami@FreeBSD.org (Satoshi - Ports Wraith - Asami) Date: 28 Jun 2000 23:36:49 -0700 In-Reply-To: Ade Lovett's message of "Wed, 28 Jun 2000 20:53:10 -0500" Message-ID: Lines: 62 X-Mailer: Gnus v5.7/Emacs 20.6 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org * From: Ade Lovett * On Wed, Jun 28, 2000 at 05:44:06PM -0700, Satoshi - Ports Wraith - Asami wrote: * > I thought Mark said this (replacing "${arch}-freebsd" with "mach") was * > intentional. Mark? * * Well, if it is, then we can handle everything in bsd.port.mk by * also defining PERL_ARCH in the OSVERSION >= 500006 case. Yes. See attached patch. Mark, does this look ok? * It's worth pointing out, however, that there's no "mach" in * /etc/mtree/BSD.local.dist .. only {i386,alpha}-freebsd Thanks for the reminder, I added it just now. * I can provide a complete patch for bsd.port.mk if this turns out * to be the case. Suffice to say that at the moment, as soon as * the cluster gets updated to a 5-current release that has perl5.006 * in it, there are going to be a huge amount of false positive failures * on anything that uses USE_PERL5. * * I think this is something we all want to avoid. *shudders in horror* ;) Well, (un)fortunately, snaps are still not building so my changes to BSD.local.dist and param.h, which made the following patch possible, should show up with the first available 5-current snap, thereby preventing any such thing from happening (since the bindist tarballs are created from snaps -- the first one with the new perl is also the first one with the param.h and PERL_ARCH changes). -PW === Index: bsd.port.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.340 diff -u -r1.340 bsd.port.mk --- bsd.port.mk 2000/06/16 21:52:40 1.340 +++ bsd.port.mk 2000/06/29 06:27:43 @@ -764,6 +764,11 @@ .endif .endif +.if ${OSVERSION} >= 500007 +PERL_VERSION= 5.006 +PERL_VER= 5.006 +PERL_ARCH= mach +.else .if ${OSVERSION} >= 300000 PERL_VERSION= 5.00503 .else @@ -771,6 +776,7 @@ .endif PERL_VER= 5.005 PERL_ARCH= ${ARCH}-freebsd +.endif PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \ PERL_VER=${PERL_VER} \ PERL_ARCH=${PERL_ARCH} To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message