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
This commit is contained in:
Anton Berezin 2005-02-02 09:34:05 +00:00
parent bdc7d6ab90
commit e2611e24e0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=127896
15 changed files with 34 additions and 60 deletions

View file

@ -1173,9 +1173,9 @@ BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT}
RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT}
.endif
.if ${OSVERSION} >= 502100
PERL_VERSION?= 5.8.5
PERL_VER?= 5.8.5
.if ${OSVERSION} >= 500036
PERL_VERSION?= 5.8.6
PERL_VER?= 5.8.6
.else
.if ${OSVERSION} >= 500032
PERL_VERSION?= 5.6.1

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -7,7 +7,7 @@
PORTNAME= perl
PORTVERSION= ${PERL_VER}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= lang devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
${MASTER_SITE_LOCAL:S/$/:local/} \
@ -79,23 +79,13 @@ CONFIGURE_ARGS+= -Dusemymalloc=n
.error You have `USE_PERL5' variable defined either in environment or in make(1) arguments. Please undefine and try again.
.endif
.if ${OSVERSION} >= 502100
LATEST_LINK= perl5.8
.endif
.if ${OSVERSION} < 500036
PKGMESSAGE= ${PKGDIR}/pkg-message-sysperl
.elif ${OSVERSION} < 502100
PKGMESSAGE= ${PKGDIR}/.not-here
.else
PKGMESSAGE= ${PKGDIR}/pkg-message-prefer58
.endif
.if ${OSVERSION} >= 500036 && ${OSVERSION} < 502100
PLIST_SUB+= NEED_USE_PERL="@comment "
.else
PLIST_SUB+= NEED_USE_PERL=""
.endif
.if defined(WITH_GDBM)
MAN3+= GDBM_File.3
@ -140,9 +130,7 @@ post-install:
${BSDPAN_WRKSRC}/${file} ${BSDPAN_DEST}/${file}
.endfor
PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.if ${OSVERSION} < 500036 || ${OSVERSION} >= 502100
${INSTALL_SCRIPT} ${WRKDIR}/use.perl ${PREFIX}/bin/use.perl
@fmt ${PKGMESSAGE}
.endif
.include <bsd.port.post.mk>

View file

@ -41,16 +41,10 @@ if [ "x$this" = "xuse.perl" ]; then
fi
else
if [ "$2" = "POST-INSTALL" ] ; then
need_remove_links=yes
if [ $osreldate -ge 500036 -a $osreldate -lt 502100 ] ; then
need_create_links=yes
need_cleanup_make_conf=yes
need_cleanup_manpath=yes
need_spam_make_conf=yes
need_spam_manpath=yes
fi
need_post_install=yes
elif [ "$2" = "POST-DEINSTALL" ] ; then
# XXX this needs a more intelligent handling
# XXX since we would not want to remove perl5.8's links
need_remove_links=yes
if [ $osreldate -lt 500036 ] ; then
need_base_system_perl=yes

View file

@ -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

View file

@ -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

View file

@ -7,7 +7,7 @@
PORTNAME= perl
PORTVERSION= ${PERL_VER}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= lang devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN} \
${MASTER_SITE_LOCAL:S/$/:local/} \
@ -79,23 +79,13 @@ CONFIGURE_ARGS+= -Dusemymalloc=n
.error You have `USE_PERL5' variable defined either in environment or in make(1) arguments. Please undefine and try again.
.endif
.if ${OSVERSION} >= 502100
LATEST_LINK= perl5.8
.endif
.if ${OSVERSION} < 500036
PKGMESSAGE= ${PKGDIR}/pkg-message-sysperl
.elif ${OSVERSION} < 502100
PKGMESSAGE= ${PKGDIR}/.not-here
.else
PKGMESSAGE= ${PKGDIR}/pkg-message-prefer58
.endif
.if ${OSVERSION} >= 500036 && ${OSVERSION} < 502100
PLIST_SUB+= NEED_USE_PERL="@comment "
.else
PLIST_SUB+= NEED_USE_PERL=""
.endif
.if defined(WITH_GDBM)
MAN3+= GDBM_File.3
@ -140,9 +130,7 @@ post-install:
${BSDPAN_WRKSRC}/${file} ${BSDPAN_DEST}/${file}
.endfor
PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.if ${OSVERSION} < 500036 || ${OSVERSION} >= 502100
${INSTALL_SCRIPT} ${WRKDIR}/use.perl ${PREFIX}/bin/use.perl
@fmt ${PKGMESSAGE}
.endif
.include <bsd.port.post.mk>

View file

@ -41,16 +41,10 @@ if [ "x$this" = "xuse.perl" ]; then
fi
else
if [ "$2" = "POST-INSTALL" ] ; then
need_remove_links=yes
if [ $osreldate -ge 500036 -a $osreldate -lt 502100 ] ; then
need_create_links=yes
need_cleanup_make_conf=yes
need_cleanup_manpath=yes
need_spam_make_conf=yes
need_spam_manpath=yes
fi
need_post_install=yes
elif [ "$2" = "POST-DEINSTALL" ] ; then
# XXX this needs a more intelligent handling
# XXX since we would not want to remove perl5.8's links
need_remove_links=yes
if [ $osreldate -lt 500036 ] ; then
need_base_system_perl=yes