From owner-freebsd-perl@FreeBSD.ORG Sun Feb 29 15:30:46 2004 Return-Path: Delivered-To: freebsd-perl@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F052C16A4CF for ; Sun, 29 Feb 2004 15:30:46 -0800 (PST) Received: from dragon.nuxi.com (trang.nuxi.com [66.93.134.19]) by mx1.FreeBSD.org (Postfix) with ESMTP id C1B8B43D1F for ; Sun, 29 Feb 2004 15:30:46 -0800 (PST) (envelope-from obrien@NUXI.com) Received: from dragon.nuxi.com (obrien@localhost [127.0.0.1]) by dragon.nuxi.com (8.12.10/8.12.10) with ESMTP id i1TNUkOJ048395 for ; Sun, 29 Feb 2004 15:30:46 -0800 (PST) (envelope-from obrien@dragon.nuxi.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.12.11/8.12.11/Submit) id i1TNUkoS048394 for perl@freebsd.org; Sun, 29 Feb 2004 15:30:46 -0800 (PST) (envelope-from obrien) Date: Sun, 29 Feb 2004 15:30:45 -0800 From: "David O'Brien" To: perl@freebsd.org Message-ID: <20040229233045.GA48378@dragon.nuxi.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.1i X-Operating-System: FreeBSD 5.2-CURRENT Organization: The NUXI BSD Group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 Subject: [PATCH] This should fix the pkg_add -r problem in 5.2-CURRENT X-BeenThere: freebsd-perl@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: obrien@freebsd.org List-Id: maintainer of a number of perl-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Feb 2004 23:30:47 -0000 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)