Date: Mon, 01 Mar 2004 09:33:38 +0100 From: Mathieu Arnold <mat@mat.cc> To: David O'Brien <obrien@freebsd.org> Cc: perl@freebsd.org Subject: Re: [PATCH] This should fix the pkg_add -r problem in 5.2-CURRENT (fwd) (fwd) Message-ID: <297718343.1078133618@pouet.in.mat.cc>
next in thread | raw e-mail | index | archive | help
Return-Path: <tobez@tobez.org>
Received: from plouf.absolight.net ([unix socket])
by plouf.absolight.net (Cyrus v2.2.2-BETA) with LMTP;
Mon, 01 Mar 2004 09:24:14 +0100
X-Sieve: CMU Sieve 2.2
Received: from localhost (localhost [127.0.0.1])
by plouf.absolight.net (Postfix) with ESMTP id 1AD5D60488F
for <mat@absolight.fr>; Mon, 1 Mar 2004 09:24:14 +0100 (CET)
X-Original-To: mat@mat.cc
Received: from heechee.tobez.org (heechee.tobez.org [217.157.39.226])
by plouf.absolight.net (Postfix) with ESMTP id 998F9604876
for <mat@mat.cc>; Mon, 1 Mar 2004 09:24:07 +0100 (CET)
Received: by heechee.tobez.org (Postfix, from userid 1001)
id 52E8F175D1; Mon, 1 Mar 2004 09:23:54 +0100 (CET)
Date: Mon, 1 Mar 2004 09:23:54 +0100
From: Anton Berezin <tobez@FreeBSD.org>
To: Mathieu Arnold <mat@mat.cc>
Subject: Re: [PATCH] This should fix the pkg_add -r problem in 5.2-CURRENT
(fwd)
Message-ID: <20040301082354.GA10193@heechee.tobez.org>
References: <295428328.1078131328@pouet.in.mat.cc>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <295428328.1078131328@pouet.in.mat.cc>
User-Agent: Mutt/1.5.6i
X-Spam-Checker-Version: SpamAssassin 2.63-abso_2004012301 (2004-01-11) on
plouf.absolight.net by root@absolight.fr
X-Spam-Level:
X-Spam-Status: No, hits=-4.9 required=5.0 tests=BAYES_00=-4.9 autolearn=ham
X-Virus-Scanned: by amavisd 0.1
I would expect PORTREVISION to be bumped in both cases, but otherwise,
ok.
On Mon, Mar 01, 2004 at 08:55:28AM +0100, Mathieu Arnold wrote:
> From: David O'Brien <obrien@freebsd.org>
> To: perl@freebsd.org
> Subject: [PATCH] This should fix the pkg_add -r problem in 5.2-CURRENT
> Date: Sun, 29 Feb 2004 15:30:45 -0800
> Message-ID: <20040229233045.GA48378@dragon.nuxi.com>
> Content-Type: text/plain; charset=us-ascii
> Organization: The NUXI BSD Group
>
> We have a problem in 5.2-CURRENT in that "pkg_add -r perl" does the wrong
> thing. 'portupgrade -PP' also does the wrong thing because we didn't
> deal with LATEST_LINK properly when the default perl was changed from 5.6
> to 5.8. This diff will at least fix the 1st problem, and may help the
> 2nd problem.
>
> OK to commit?
>
>
>
> Index: perl5/Makefile
> ===================================================================
> RCS file: /home/ncvs/ports/lang/perl5/Makefile,v
> retrieving revision 1.61
> diff -u -r1.61 Makefile
> --- perl5/Makefile 5 Feb 2004 06:11:16 -0000 1.61
> +++ perl5/Makefile 29 Feb 2004 23:28:41 -0000
> @@ -23,6 +23,10 @@
> PERL_ARCH= mach
> PERL_VERSION= ${PERL_VER}
>
> +.if ${OSVERSION} >= 502100
> +LATEST_LINK= perl5.6
> +.endif
> +
> HAS_CONFIGURE= yes
> CONFIGURE_SCRIPT=Configure
> CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \
> Index: perl5.8/Makefile
> ===================================================================
> RCS file: /home/ncvs/ports/lang/perl5.8/Makefile,v
> retrieving revision 1.71
> diff -u -r1.71 Makefile
> --- perl5.8/Makefile 19 Feb 2004 09:40:50 -0000 1.71
> +++ perl5.8/Makefile 29 Feb 2004 23:28:24 -0000
> @@ -24,6 +24,10 @@
> PERL_ARCH= mach
> PERL_VERSION= ${PERL_VER}
>
> +.if ${OSVERSION} < 502100
> +LATEST_LINK= perl5.8
> +.endif
> +
> HAS_CONFIGURE= yes
> CONFIGURE_SCRIPT=Configure
> CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \
> @@ -205,8 +209,6 @@
> MAN3+= GDBM_File.3
> .endif
> MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER}
> -
> -LATEST_LINK= perl5.8
>
> test:
> @(cd ${WRKSRC}; make test)
> _______________________________________________
> freebsd-perl@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-perl
> To unsubscribe, send any mail to "freebsd-perl-unsubscribe@freebsd.org"
--
Civilization is a fractal patchwork of old and new and dangerously new.
-- Vernor Vinge
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?297718343.1078133618>