Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 29 Feb 2004 15:30:45 -0800
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
Message-ID:  <20040229233045.GA48378@dragon.nuxi.com>

next in thread | raw e-mail | index | archive | help
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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040229233045.GA48378>