Date: Tue, 11 Feb 2014 10:45:17 +0000 (UTC) From: Andrej Zverev <az@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343731 - in head/lang: perl5.14/files perl5.16/files perl5.18/files Message-ID: <201402111045.s1BAjHIP039043@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: az Date: Tue Feb 11 10:45:16 2014 New Revision: 343731 URL: http://svnweb.freebsd.org/changeset/ports/343731 QAT: https://qat.redports.org/buildarchive/r343731/ Log: Partial restore r343675 (leave some warnings/errors output) Suggested by: ak@ Reviewed by: ak@ Modified: head/lang/perl5.14/files/use.perl head/lang/perl5.16/files/use.perl head/lang/perl5.18/files/use.perl Modified: head/lang/perl5.14/files/use.perl ============================================================================== --- head/lang/perl5.14/files/use.perl Tue Feb 11 10:14:35 2014 (r343730) +++ head/lang/perl5.14/files/use.perl Tue Feb 11 10:45:16 2014 (r343731) @@ -21,6 +21,7 @@ do_remove_links() bins=`/bin/ls /usr/bin/*perl*5.* ${PKG_PREFIX}/bin/*perl*5.* 2>/dev/null` for binary in ${bins} ; do if [ -L "${binary}" ] ; then + echo "use.perl: Removing ${binary} installed by an older perl port" /bin/rm -f "${binary}" fi done @@ -30,11 +31,15 @@ do_create_links() { for binary in ${special_link_list} ; do if [ -f "/usr/bin/${binary}" ] ; then + echo "use.perl: Backing up /usr/bin/${binary} as /usr/bin/${binary}.freebsd" /bin/mv -f "/usr/bin/${binary}" "/usr/bin/${binary}.freebsd" fi if [ -e "/usr/bin/${binary}" ] ; then + echo "use.perl: /usr/bin/${binary} is still there, which should not happen" elif [ -e "${PKG_PREFIX}/bin/perl${PERL_VERSION}" ] ; then /bin/ln -sf "${PKG_PREFIX}/bin/perl${PERL_VERSION}" "/usr/bin/${binary}" + else + echo "use.perl: ${PKG_PREFIX}/bin/perl${PERL_VERSION} is not there, a symlink won't do any good" fi done } Modified: head/lang/perl5.16/files/use.perl ============================================================================== --- head/lang/perl5.16/files/use.perl Tue Feb 11 10:14:35 2014 (r343730) +++ head/lang/perl5.16/files/use.perl Tue Feb 11 10:45:16 2014 (r343731) @@ -21,6 +21,7 @@ do_remove_links() bins=`/bin/ls /usr/bin/*perl*5.* ${PKG_PREFIX}/bin/*perl*5.* 2>/dev/null` for binary in ${bins} ; do if [ -L "${binary}" ] ; then + echo "use.perl: Removing ${binary} installed by an older perl port" /bin/rm -f "${binary}" fi done @@ -30,11 +31,15 @@ do_create_links() { for binary in ${special_link_list} ; do if [ -f "/usr/bin/${binary}" ] ; then + echo "use.perl: Backing up /usr/bin/${binary} as /usr/bin/${binary}.freebsd" /bin/mv -f "/usr/bin/${binary}" "/usr/bin/${binary}.freebsd" fi if [ -e "/usr/bin/${binary}" ] ; then + echo "use.perl: /usr/bin/${binary} is still there, which should not happen" elif [ -e "${PKG_PREFIX}/bin/perl${PERL_VERSION}" ] ; then /bin/ln -sf "${PKG_PREFIX}/bin/perl${PERL_VERSION}" "/usr/bin/${binary}" + else + echo "use.perl: ${PKG_PREFIX}/bin/perl${PERL_VERSION} is not there, a symlink won't do any good" fi done } Modified: head/lang/perl5.18/files/use.perl ============================================================================== --- head/lang/perl5.18/files/use.perl Tue Feb 11 10:14:35 2014 (r343730) +++ head/lang/perl5.18/files/use.perl Tue Feb 11 10:45:16 2014 (r343731) @@ -21,6 +21,7 @@ do_remove_links() bins=`/bin/ls /usr/bin/*perl*5.* ${PKG_PREFIX}/bin/*perl*5.* 2>/dev/null` for binary in ${bins} ; do if [ -L "${binary}" ] ; then + echo "use.perl: Removing ${binary} installed by an older perl port" /bin/rm -f "${binary}" fi done @@ -30,11 +31,15 @@ do_create_links() { for binary in ${special_link_list} ; do if [ -f "/usr/bin/${binary}" ] ; then + echo "use.perl: Backing up /usr/bin/${binary} as /usr/bin/${binary}.freebsd" /bin/mv -f "/usr/bin/${binary}" "/usr/bin/${binary}.freebsd" fi if [ -e "/usr/bin/${binary}" ] ; then + echo "use.perl: /usr/bin/${binary} is still there, which should not happen" elif [ -e "${PKG_PREFIX}/bin/perl${PERL_VERSION}" ] ; then /bin/ln -sf "${PKG_PREFIX}/bin/perl${PERL_VERSION}" "/usr/bin/${binary}" + else + echo "use.perl: ${PKG_PREFIX}/bin/perl${PERL_VERSION} is not there, a symlink won't do any good" fi done }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402111045.s1BAjHIP039043>