From owner-svn-ports-all@FreeBSD.ORG Tue Feb 11 10:45:18 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 00690100; Tue, 11 Feb 2014 10:45:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DF6601300; Tue, 11 Feb 2014 10:45:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1BAjHSA039048; Tue, 11 Feb 2014 10:45:17 GMT (envelope-from az@svn.freebsd.org) Received: (from az@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1BAjHIP039043; Tue, 11 Feb 2014 10:45:17 GMT (envelope-from az@svn.freebsd.org) Message-Id: <201402111045.s1BAjHIP039043@svn.freebsd.org> From: Andrej Zverev Date: Tue, 11 Feb 2014 10:45:17 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Feb 2014 10:45:18 -0000 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 }