diff options
| author | Anton Berezin <tobez@FreeBSD.org> | 2005-06-24 09:17:06 +0000 |
|---|---|---|
| committer | Anton Berezin <tobez@FreeBSD.org> | 2005-06-24 09:17:06 +0000 |
| commit | cb044765cac302a6d2f050170f3c803917d5eb06 (patch) | |
| tree | e35a39ee6e0eb95d1d1d187baa9e89dd51f115fa /lang/perl5.14/files/use.perl | |
| parent | a3b72b88565aea64e0c2c6dd5e2286024e95154a (diff) | |
| download | ports-cb044765cac302a6d2f050170f3c803917d5eb06.tar.gz ports-cb044765cac302a6d2f050170f3c803917d5eb06.zip | |
Upgrade to 5.8.7. In addition:
- add perl-after-upgrade utility to move around
dependent packages
- fix $0 expansion in use.perl [1]
- enable threaded perl on amd64 [2]
- always compile perl with -pthread [3]
- fix errno issue in SDBM_File [4]
- add support for // and err (defined-or) [5]
- add WITH_DEBUGGING option [6]
- fix suidperl symlink [7]
- fix several small bugs in use.perl
- print possible WITH_XXX flags (no OPTIONS support yet)
[1] Submitted by: erwin, Niël Dogger <niel@introweb.nl>
[2] Nudged by: Mike Schroll <FreeBSD@LogicX.us>
[3] Nudged by: skv
[4] perl bug #35938
[5] Obtained from: H.Merijn Brand <h.m.brand@xs4all.nl>
[6] PR: 78811, submitted by: skv
[7] PR: 80069, submitted by: Sergey N. Voronkov <serg@tmn.ru>
A different solution was actually implemented.
Notes
Notes:
svn path=/head/; revision=137960
Diffstat (limited to 'lang/perl5.14/files/use.perl')
| -rw-r--r-- | lang/perl5.14/files/use.perl | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/lang/perl5.14/files/use.perl b/lang/perl5.14/files/use.perl index 57e1acde0bc8..eca7811f3a85 100644 --- a/lang/perl5.14/files/use.perl +++ b/lang/perl5.14/files/use.perl @@ -34,9 +34,9 @@ if [ "x$this" = "xuse.perl" ]; then need_cleanup_make_conf=yes need_cleanup_manpath=yes else - echo 'Usage: - $0 port -> /usr/bin/perl is the perl5 port - $0 system -> /usr/bin/perl is the system perl' + echo "Usage: + ${0##*/} port -> /usr/bin/perl is the perl5 port + ${0##*/} system -> /usr/bin/perl is the system perl" exit 2; fi else @@ -77,14 +77,14 @@ link_list=" pod2man pod2text s2p - splain" + splain + suidperl" if [ $osreldate -ge 500036 ] ; then link_list="" fi special_link_list=" perl - perl5 - suidperl" + perl5" do_remove_links() { @@ -130,11 +130,11 @@ do_create_links() for binary in $special_link_list do if [ -f "/usr/bin/$binary" ] ; then - echo " Removing /usr/bin/$binary" + echo " Backing up /usr/bin/$binary as /usr/bin/$binary.freebsd" + /bin/mv -f "/usr/bin/$binary" "/usr/bin/$binary.freebsd" fi bin=`echo $binary | /usr/bin/sed -e 's!perl5!perl!'` - bin=`echo $bin | /usr/bin/sed -e 's!suidperl!sperl!'` - if [ -e "/usr/bin/$binary.XXX" ] ; then + if [ -e "/usr/bin/$binary" ] ; then echo " *** /usr/bin/$binary is still there, which should not happen" elif [ -e "$PKG_PREFIX/bin/${bin}%%PERL_VERSION%%" ] ; then echo " Symlinking $PKG_PREFIX/bin/${bin}%%PERL_VERSION%% to /usr/bin/$binary" @@ -185,6 +185,10 @@ do_base_system_perl() else echo " *** $bin is NOT there, nothing to restore" fi + if [ -f "/usr/bin/$binary.freebsd" ] ; then + echo " Removing backup copy /usr/bin/$binary.freebsd" + rm -f "/usr/bin/$binary.freebsd" + fi fi done echo "Done." |