From owner-svn-ports-head@FreeBSD.ORG Mon Feb 10 19:33:06 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5DA4A947; Mon, 10 Feb 2014 19:33:06 +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 4775B1023; Mon, 10 Feb 2014 19:33:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1AJX6P7079572; Mon, 10 Feb 2014 19:33:06 GMT (envelope-from az@svn.freebsd.org) Received: (from az@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1AJX5uB079569; Mon, 10 Feb 2014 19:33:05 GMT (envelope-from az@svn.freebsd.org) Message-Id: <201402101933.s1AJX5uB079569@svn.freebsd.org> From: Andrej Zverev Date: Mon, 10 Feb 2014 19:33:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343675 - 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-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Feb 2014 19:33:06 -0000 Author: az Date: Mon Feb 10 19:33:05 2014 New Revision: 343675 URL: http://svnweb.freebsd.org/changeset/ports/343675 QAT: https://qat.redports.org/buildarchive/r343675/ Log: Turn use.perl into silent mode Reviewed by: bapt@, mat@ 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 Mon Feb 10 19:27:13 2014 (r343674) +++ head/lang/perl5.14/files/use.perl Mon Feb 10 19:33:05 2014 (r343675) @@ -13,43 +13,30 @@ special_link_list="perl perl5" do_remove_links() { - echo "Removing stale symlinks from /usr/bin..." for binary in ${special_link_list} ; do if [ -L "/usr/bin/${binary}" ] ; then - echo " Removing /usr/bin/${binary}" /bin/rm -f "/usr/bin/${binary}" - else - echo " Skipping /usr/bin/${binary}" fi done 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 " Removing ${binary} installed by an older perl port" /bin/rm -f "${binary}" fi done - echo "Done." } do_create_links() { - echo "Creating various symlinks in /usr/bin..." for binary in ${special_link_list} ; do if [ -f "/usr/bin/${binary}" ] ; then - echo " 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 " *** /usr/bin/${binary} is still there, which should not happen" elif [ -e "${PKG_PREFIX}/bin/perl${PERL_VERSION}" ] ; then - echo " Symlinking ${PKG_PREFIX}/bin/perl${PERL_VERSION} to /usr/bin/${binary}" /bin/ln -sf "${PKG_PREFIX}/bin/perl${PERL_VERSION}" "/usr/bin/${binary}" - else - echo " *** ${PKG_PREFIX}/bin/perl${PERL_VERSION} is not there, a symlink won't do any good" fi done - echo "Done." } do_post_install() @@ -63,15 +50,12 @@ do_post_install() do_remove_perl5_signature() { - echo -n "Removing ${PERL5_SIGNATURE}..." [ -f "${PERL5_SIGNATURE}" ] && /bin/rm "${PERL5_SIGNATURE}" - echo " Done." } do_cleanup_manpath() { if [ -f /etc/manpath.config ] ; then - echo -n "Cleaning up /etc/manpath.config..." /bin/cp -p /etc/manpath.config /etc/manpath.config.new /usr/bin/awk 's=0; /^#.*use.perl/ { s=1; mode=1 } @@ -81,27 +65,22 @@ do_cleanup_manpath() { if (s != 1) { mode = 0 } if (mode == 0) print }' /etc/manpath.config >/etc/manpath.config.new /bin/mv /etc/manpath.config /etc/manpath.config.bak /bin/mv /etc/manpath.config.new /etc/manpath.config - echo " Done." fi } do_create_perl5_signature() { - echo -n "Creating ${PERL5_SIGNATURE}..." echo "${banner}" >>"${PERL5_SIGNATURE}" echo "# Do not modify PERL_VERSION here, instead use DEFAULT_VERSIONS= perl5=${PERL_VER}" >>"${PERL5_SIGNATURE}" echo "PERL_VERSION=${PERL_VERSION}" >>"${PERL5_SIGNATURE}" - echo " Done." } do_spam_manpath() { if [ -f /etc/manpath.config ] ; then - echo -n "Spamming /etc/manpath.config..." echo "${banner}" >>/etc/manpath.config echo "OPTIONAL_MANPATH ${PKG_PREFIX}/lib/perl5/${PERL_VER}/man" >>/etc/manpath.config echo "OPTIONAL_MANPATH ${PKG_PREFIX}/lib/perl5/${PERL_VER}/perl/man" >>/etc/manpath.config - echo " Done." fi } Modified: head/lang/perl5.16/files/use.perl ============================================================================== --- head/lang/perl5.16/files/use.perl Mon Feb 10 19:27:13 2014 (r343674) +++ head/lang/perl5.16/files/use.perl Mon Feb 10 19:33:05 2014 (r343675) @@ -13,43 +13,30 @@ special_link_list="perl perl5" do_remove_links() { - echo "Removing stale symlinks from /usr/bin..." for binary in ${special_link_list} ; do if [ -L "/usr/bin/${binary}" ] ; then - echo " Removing /usr/bin/${binary}" /bin/rm -f "/usr/bin/${binary}" - else - echo " Skipping /usr/bin/${binary}" fi done 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 " Removing ${binary} installed by an older perl port" /bin/rm -f "${binary}" fi done - echo "Done." } do_create_links() { - echo "Creating various symlinks in /usr/bin..." for binary in ${special_link_list} ; do if [ -f "/usr/bin/${binary}" ] ; then - echo " 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 " *** /usr/bin/${binary} is still there, which should not happen" elif [ -e "${PKG_PREFIX}/bin/perl${PERL_VERSION}" ] ; then - echo " Symlinking ${PKG_PREFIX}/bin/perl${PERL_VERSION} to /usr/bin/${binary}" /bin/ln -sf "${PKG_PREFIX}/bin/perl${PERL_VERSION}" "/usr/bin/${binary}" - else - echo " *** ${PKG_PREFIX}/bin/perl${PERL_VERSION} is not there, a symlink won't do any good" fi done - echo "Done." } do_post_install() @@ -63,15 +50,12 @@ do_post_install() do_remove_perl5_signature() { - echo -n "Removing ${PERL5_SIGNATURE}..." [ -f "${PERL5_SIGNATURE}" ] && /bin/rm "${PERL5_SIGNATURE}" - echo " Done." } do_cleanup_manpath() { if [ -f /etc/manpath.config ] ; then - echo -n "Cleaning up /etc/manpath.config..." /bin/cp -p /etc/manpath.config /etc/manpath.config.new /usr/bin/awk 's=0; /^#.*use.perl/ { s=1; mode=1 } @@ -81,27 +65,22 @@ do_cleanup_manpath() { if (s != 1) { mode = 0 } if (mode == 0) print }' /etc/manpath.config >/etc/manpath.config.new /bin/mv /etc/manpath.config /etc/manpath.config.bak /bin/mv /etc/manpath.config.new /etc/manpath.config - echo " Done." fi } do_create_perl5_signature() { - echo -n "Creating ${PERL5_SIGNATURE}..." echo "${banner}" >>"${PERL5_SIGNATURE}" echo "# Do not modify PERL_VERSION here, instead use DEFAULT_VERSIONS= perl5=${PERL_VER}" >>"${PERL5_SIGNATURE}" echo "PERL_VERSION=${PERL_VERSION}" >>"${PERL5_SIGNATURE}" - echo " Done." } do_spam_manpath() { if [ -f /etc/manpath.config ] ; then - echo -n "Spamming /etc/manpath.config..." echo "${banner}" >>/etc/manpath.config echo "OPTIONAL_MANPATH ${PKG_PREFIX}/lib/perl5/${PERL_VER}/man" >>/etc/manpath.config echo "OPTIONAL_MANPATH ${PKG_PREFIX}/lib/perl5/${PERL_VER}/perl/man" >>/etc/manpath.config - echo " Done." fi } Modified: head/lang/perl5.18/files/use.perl ============================================================================== --- head/lang/perl5.18/files/use.perl Mon Feb 10 19:27:13 2014 (r343674) +++ head/lang/perl5.18/files/use.perl Mon Feb 10 19:33:05 2014 (r343675) @@ -13,43 +13,30 @@ special_link_list="perl perl5" do_remove_links() { - echo "Removing stale symlinks from /usr/bin..." for binary in ${special_link_list} ; do if [ -L "/usr/bin/${binary}" ] ; then - echo " Removing /usr/bin/${binary}" /bin/rm -f "/usr/bin/${binary}" - else - echo " Skipping /usr/bin/${binary}" fi done 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 " Removing ${binary} installed by an older perl port" /bin/rm -f "${binary}" fi done - echo "Done." } do_create_links() { - echo "Creating various symlinks in /usr/bin..." for binary in ${special_link_list} ; do if [ -f "/usr/bin/${binary}" ] ; then - echo " 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 " *** /usr/bin/${binary} is still there, which should not happen" elif [ -e "${PKG_PREFIX}/bin/perl${PERL_VERSION}" ] ; then - echo " Symlinking ${PKG_PREFIX}/bin/perl${PERL_VERSION} to /usr/bin/${binary}" /bin/ln -sf "${PKG_PREFIX}/bin/perl${PERL_VERSION}" "/usr/bin/${binary}" - else - echo " *** ${PKG_PREFIX}/bin/perl${PERL_VERSION} is not there, a symlink won't do any good" fi done - echo "Done." } do_post_install() @@ -63,15 +50,12 @@ do_post_install() do_remove_perl5_signature() { - echo -n "Removing ${PERL5_SIGNATURE}..." [ -f "${PERL5_SIGNATURE}" ] && /bin/rm "${PERL5_SIGNATURE}" - echo " Done." } do_cleanup_manpath() { if [ -f /etc/manpath.config ] ; then - echo -n "Cleaning up /etc/manpath.config..." /bin/cp -p /etc/manpath.config /etc/manpath.config.new /usr/bin/awk 's=0; /^#.*use.perl/ { s=1; mode=1 } @@ -81,27 +65,22 @@ do_cleanup_manpath() { if (s != 1) { mode = 0 } if (mode == 0) print }' /etc/manpath.config >/etc/manpath.config.new /bin/mv /etc/manpath.config /etc/manpath.config.bak /bin/mv /etc/manpath.config.new /etc/manpath.config - echo " Done." fi } do_create_perl5_signature() { - echo -n "Creating ${PERL5_SIGNATURE}..." echo "${banner}" >>"${PERL5_SIGNATURE}" echo "# Do not modify PERL_VERSION here, instead use DEFAULT_VERSIONS= perl5=${PERL_VER}" >>"${PERL5_SIGNATURE}" echo "PERL_VERSION=${PERL_VERSION}" >>"${PERL5_SIGNATURE}" - echo " Done." } do_spam_manpath() { if [ -f /etc/manpath.config ] ; then - echo -n "Spamming /etc/manpath.config..." echo "${banner}" >>/etc/manpath.config echo "OPTIONAL_MANPATH ${PKG_PREFIX}/lib/perl5/${PERL_VER}/man" >>/etc/manpath.config echo "OPTIONAL_MANPATH ${PKG_PREFIX}/lib/perl5/${PERL_VER}/perl/man" >>/etc/manpath.config - echo " Done." fi }