From e2611e24e061b6fd7fdececed33cd8361b900f81 Mon Sep 17 00:00:00 2001
From: Anton Berezin <tobez@FreeBSD.org>
Date: Wed, 2 Feb 2005 09:34:05 +0000
Subject: Update bsd.port.mk's notion of the perl version (to 5.8.6) [1]. Use
 more correct OSVERSION threshold to distinguish between base system perl and
 perl from ports - the right value is 500036 [1].

Also, simplify OSVERSION-related logic in lang/perl5 and lang/perl5.8.
Now it goes as follows:

- for lang/perl5.8, if there is perl in the base system, install
  use.perl script, use a helpful pkg-message, and do not automatically
  update symlinks;
- for lang/perl5.8, if there is no perl in the base system, do not
  install use.perl script, and update symlinks automatically;
- for lang/perl5, always install use.perl;
- for lang/perl5, never update symlinks automatically;
- for lang/perl5, vary produced pkg-message depending on the presence of
  the base system perl.

Bump PORTREVISION for both lang/perl5 and lang/perl5.8.

[1] Approved by:	portmgr
---
 lang/perl5.14/Makefile       | 6 ++++--
 lang/perl5.14/files/use.perl | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'lang/perl5.14')

diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile
index feb908223f83..4b23c9f21a6f 100644
--- a/lang/perl5.14/Makefile
+++ b/lang/perl5.14/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VER}
+PORTREVISION=	1
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
@@ -90,8 +91,9 @@ CONFIGURE_ARGS+=	-Dusemymalloc=n
 CONFIGURE_ARGS+=	-Duse64bitint
 .endif
 
-.if ${OSVERSION} < 502100
 LATEST_LINK=	perl5.8
+
+.if ${OSVERSION} < 500036
 PLIST_SUB+=		NEED_USE_PERL=""
 .else
 PKGMESSAGE=	${PKGDIR}/.not-here
@@ -151,7 +153,7 @@ post-install:
 		${BSDPAN_WRKSRC}/${files} ${BSDPAN_DEST}/${files}
 .endfor
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.if ${OSVERSION} < 502100
+.if ${OSVERSION} < 500036
 	${INSTALL_SCRIPT} ${WRKDIR}/use.perl ${PREFIX}/bin/use.perl
 	@fmt ${PKGMESSAGE}
 .endif
diff --git a/lang/perl5.14/files/use.perl b/lang/perl5.14/files/use.perl
index c20a441b65da..57e1acde0bc8 100644
--- a/lang/perl5.14/files/use.perl
+++ b/lang/perl5.14/files/use.perl
@@ -42,7 +42,7 @@ if [ "x$this" = "xuse.perl" ]; then
 else
 	if [ "$2" = "POST-INSTALL" ] ; then
 		need_remove_links=yes
-		if [ $osreldate -ge 502100 ] ; then
+		if [ $osreldate -ge 500036 ] ; then
 			need_create_links=yes
 			need_cleanup_make_conf=yes
 			need_cleanup_manpath=yes
-- 
cgit v1.2.3