svn commit: r343675 - in head/lang: perl5.14/files perl5.16/files perl5.18/files

Andrej Zverev az at FreeBSD.org
Mon Feb 10 19:33:06 UTC 2014


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
 }
 


More information about the svn-ports-all mailing list