From 07db31cb5484ac5274d902e6ab949290df106075 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 18 Jul 2011 16:25:18 +0200
Subject: [PATCH] xbps-src: cleanup version/revision mess.

---
 xbps-src/libexec/doinst-helper.sh.in | 24 ++++++----------
 xbps-src/shutils/build_funcs.sh      | 15 +++-------
 xbps-src/shutils/builddep_funcs.sh   | 42 ++++++++++++----------------
 xbps-src/shutils/common_funcs.sh     | 33 +++++-----------------
 xbps-src/shutils/configure_funcs.sh  | 16 ++++-------
 xbps-src/shutils/extract_funcs.sh    |  9 ++----
 xbps-src/shutils/fetch_funcs.sh      | 14 +++-------
 xbps-src/shutils/make-binpkg.sh      |  9 ++----
 xbps-src/shutils/metadata.sh         | 10 +++----
 xbps-src/shutils/patch_funcs.sh      | 20 +++++--------
 xbps-src/shutils/stow_funcs.sh       |  2 +-
 xbps-src/shutils/strip_files.sh      | 12 ++------
 xbps-src/shutils/tmpl_funcs.sh.in    | 14 +++++++---
 xbps-src/shutils/verify_rundeps.sh   | 12 ++------
 xbps-src/xbps-src.sh.in              |  2 +-
 15 files changed, 80 insertions(+), 154 deletions(-)

diff --git a/xbps-src/libexec/doinst-helper.sh.in b/xbps-src/libexec/doinst-helper.sh.in
index f7e2be362e..00aa136631 100644
--- a/xbps-src/libexec/doinst-helper.sh.in
+++ b/xbps-src/libexec/doinst-helper.sh.in
@@ -42,16 +42,10 @@ done
 
 install_src_phase()
 {
-	local f i subpkg lver spkgrev
+	local f i subpkg spkgrev
 
 	[ -z $pkgname ] && return 2
 
-	if [ -n "$revision" ]; then
-		lver="${version}_${revision}"
-	else
-		lver="${version}"
-	fi
-
 	#
 	# There's nothing we can do if we are a meta template.
 	# Just creating the dir is enough to write the package metadata.
@@ -70,7 +64,7 @@ install_src_phase()
 	# Run pre_install func.
 	if [ ! -f $XBPS_PRE_INSTALL_DONE ]; then
 		run_func pre_install
-		msg_normal "'$pkgname-$lver': pre_install (destdir) phase done.\n"
+		msg_normal "$pkgver: pre_install (destdir) phase done.\n"
 		touch -f $XBPS_PRE_INSTALL_DONE
 	fi
 
@@ -85,18 +79,18 @@ install_src_phase()
 	esac
 	cd ${wrksrc} || msg_error "can't change cwd to wrksrc!\n"
 
-	msg_normal "'$pkgname-$lver': install (destdir) phase done.\n"
+	msg_normal "$pkgver: install (destdir) phase done.\n"
 
 	# Run post_install func.
 	if [ ! -f $XBPS_POST_INSTALL_DONE ]; then
 		run_func post_install
-		msg_normal "'$pkgname-$lver': post_install (destdir) phase done.\n"
+		msg_normal "$pkgver: post_install (destdir) phase done.\n"
 		touch -f $XBPS_POST_INSTALL_DONE
 	fi
 
 	# Remove libtool archives by default.
 	if [ -z "$keep_libtool_archives" ]; then
-		msg_normal "'$pkgname-$lver': removing libtool archives...\n"
+		msg_normal "$pkgver: removing libtool archives...\n"
 		find ${DESTDIR} -type f -name \*.la -delete
 	fi
 	# Always remove perllocal.pod and .packlist files.
@@ -106,10 +100,10 @@ install_src_phase()
 	fi
 	# Remove empty directories by default.
 	if [ -z "$keep_empty_dirs" ]; then
-		msg_normal "'$pkgname-$lver': removing empty dirs...\n"
+		msg_normal "$pkgver: removing empty dirs...\n"
 		find ${DESTDIR} -depth -type d -exec rmdir 2>/dev/null {} \;
 	fi
-	msg_normal "'$pkgname-$lver': installed into destdir.\n"
+	msg_normal "$pkgver: installed into destdir.\n"
 
 	if [ "$build_style" != "custom-install" -a -z "$distfiles" ]; then
 		touch -f $XBPS_INSTALL_DONE
@@ -128,7 +122,7 @@ install_src_phase()
 		if [ $? -eq 0 -a -z "$BOOTSTRAP_PKG_REBUILD" ]; then
 			continue
 		fi
-		msg_normal "'${sourcepkg}-$lver': preparing subpackage '${subpkg}'...\n"
+		msg_normal "$pkgver: preparing subpackage '${subpkg}'...\n"
 		if [ ! -f $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template ]; then
 			msg_error "Cannot find '${subpkg}' subpkg build template!\n"
 		fi
@@ -139,7 +133,7 @@ install_src_phase()
 			run_func do_install
 			touch -f ${wrksrc}/.xbps_do_install_${pkgname}_done
 		else
-			msg_warn "'$sourcepkg-$lver': skipping '$pkgname' subpkg, already installed into destdir.\n"
+			msg_warn "$pkgver: skipping '$pkgname' subpkg, already installed into destdir.\n"
 		fi
 	done
 }
diff --git a/xbps-src/shutils/build_funcs.sh b/xbps-src/shutils/build_funcs.sh
index 19003a6dad..c29be09542 100644
--- a/xbps-src/shutils/build_funcs.sh
+++ b/xbps-src/shutils/build_funcs.sh
@@ -37,7 +37,7 @@ do_make_build()
 
 build_src_phase()
 {
-	local pkg="$pkgname-$version" f lver
+	local f
 
 	[ -z $pkgname -o -z $version ] && return 1
 
@@ -54,13 +54,6 @@ build_src_phase()
 		cd $build_wrksrc || return 1
 	fi
 
-	if [ -n "$revision" ]; then
-		lver="${version}_${revision}"
-		pkg="${pkg}_${revision}"
-	else
-		lver="${version}"
-	fi
-
 	if [ "$build_style" = "python-module" ]; then
 		make_cmd="python"
 		make_build_args="setup.py build"
@@ -72,7 +65,7 @@ build_src_phase()
 	# Run pre_build func.
 	if [ ! -f $XBPS_PRE_BUILD_DONE ]; then
 		run_func pre_build
-		msg_normal "'$pkgname-$lver': pre_build phase done.\n"
+		msg_normal "$pkgver: pre_build phase done.\n"
 		touch -f $XBPS_PRE_BUILD_DONE
 	fi
 
@@ -82,12 +75,12 @@ build_src_phase()
 		run_func do_make_build
 	fi
 
-	msg_normal "'$pkgname-$lver': build phase done.\n"
+	msg_normal "$pkgver: build phase done.\n"
 
 	# Run post_build func.
 	if [ ! -f $XBPS_POST_BUILD_DONE ]; then
 		run_func post_build
-		msg_normal "'$pkgname-l$ver': post_build phase done.\n"
+		msg_normal "$pkgver: post_build phase done.\n"
 		touch -f $XBPS_POST_BUILD_DONE
 	fi
 
diff --git a/xbps-src/shutils/builddep_funcs.sh b/xbps-src/shutils/builddep_funcs.sh
index 920e508d0b..75b2abe4b7 100644
--- a/xbps-src/shutils/builddep_funcs.sh
+++ b/xbps-src/shutils/builddep_funcs.sh
@@ -34,7 +34,7 @@ install_pkglist_from_repos()
 
 	cmd="${fakeroot_cmd} ${fakeroot_cmd_args} ${XBPS_BIN_CMD} -Ay install"
 
-	msg_normal "'$pkgname': installing required dependencies ...\n"
+	msg_normal "$pkgver: installing required dependencies ...\n"
 	[ -z "${wrksrc}" ] && wrksrc="$XBPS_BUILDDIR/$pkgname"
 	[ ! -d "${wrksrc}" ] && mkdir -p "${wrksrc}"
 	${cmd} ${1} >${wrksrc}/.xbps_install_dependencies.log 2>&1
@@ -49,8 +49,8 @@ install_pkglist_from_repos()
 		#
 		# Any other returned is criticial.
 		autoremove_pkg_dependencies $KEEP_AUTODEPS
-		msg_red "'${pkgname}': failed to install required dependencies! (error $rval)\n"
-		msg_error "'${pkgname}': please take a look the logs in \$wrksrc.\n"
+		msg_red "$pkgver: failed to install required dependencies! (error $rval)\n"
+		msg_error "$pkgver': please take a look the logs in \$wrksrc.\n"
 	fi
 
 	return $rval
@@ -68,7 +68,7 @@ install_pkg_from_repos()
 	pkgdepname=$($XBPS_PKGDB_CMD getpkgdepname "$pkg")
 	cmd="${fakeroot_cmd} ${fakeroot_cmd_args} ${XBPS_BIN_CMD} -Ay install"
 
-	msg_normal "'$pkgname': installing required dependency '$pkg' ...\n"
+	msg_normal "$pkgver: installing required dependency '$pkg' ...\n"
 	[ -z "${wrksrc}" ] && wrksrc="$XBPS_BUILDDIR/$pkgname"
 	[ ! -d "${wrksrc}" ] && mkdir -p "${wrksrc}"
 	${cmd} "\"$pkg\"" >${wrksrc}/.xbps_install_dependency_${pkgdepname}.log 2>&1
@@ -83,7 +83,7 @@ install_pkg_from_repos()
 		#
 		# Any other returned is criticial.
 		autoremove_pkg_dependencies $KEEP_AUTODEPS
-		msg_red "'${pkgname}': failed to install '${pkg}' dependency! (error $rval)\n"
+		msg_red "$pkgver: failed to install '${pkg}' dependency! (error $rval)\n"
 		msg_error "Please see ${wrksrc}/.xbps_install_${pkgdepname}.log to see what went wrong!\n"
 	fi
 
@@ -102,11 +102,11 @@ autoremove_pkg_dependencies()
 	# package dependencies installed by the target package, do it.
 	#
 	if [ -n "$XBPS_PREFER_BINPKG_DEPS" -a -z "$bootstrap" ]; then
-		msg_normal "'$pkgname': removing automatically installed dependencies ...\n"
+		msg_normal "$pkgver: removing automatically installed dependencies ...\n"
 		# Autoremove installed binary packages.
 		${cmd} -y reconfigure all && ${cmd} -Rpyf autoremove 2>&1 >/dev/null
 		if [ $? -ne 0 ]; then
-			msg_red "'$pkgname': failed to remove automatic dependencies!\n"
+			msg_red "$pkgver: failed to remove automatic dependencies!\n"
 			exit 1
 		fi
 		# Maybe some dependency wasn't available in repositories and it had
@@ -149,9 +149,9 @@ install_pkg_deps()
 	[ $? -eq 0 ] && return 0
 
 	if [ -z "$saved_prevpkg" -a -n "${_ORIGINPKG}" ]; then
-		msg_normal "Installing '${_ORIGINPKG}' dependency: '$curpkg'.\n"
+		msg_normal "Installing ${_ORIGINPKG} dependency: '$curpkg'.\n"
 	else
-		msg_normal "Installing '$saved_prevpkg' dependency: '$curpkg'.\n"
+		msg_normal "Installing $saved_prevpkg dependency: '$curpkg'.\n"
 	fi
 
 	setup_tmpl "$curpkgname"
@@ -196,9 +196,9 @@ install_pkg_deps()
 		install_pkg_deps "${j}" "${curpkg}"
 		if [ $? -eq 1 ]; then
 			if [ -n "$saved_prevpkg" ]; then
-				msg_red "'$saved_prevpkg': failed to install dependency '$curpkg'\n"
+				msg_red "$saved_prevpkg: failed to install dependency '$curpkg'\n"
 			else
-				msg_red "'${_ORIGINPKG}': failed to install dependency '$curpkg'\n"
+				msg_red "${_ORIGINPKG}: failed to install dependency '$curpkg'\n"
 			fi
 			return 1
 		fi
@@ -213,19 +213,19 @@ install_pkg_deps()
 			# Package not found, build from source.
 			install_pkg "${curpkgname}"
 			if [ $? -eq 1 ]; then
-				msg_red "'$saved_prevpkg': failed to install dependency '$curpkg'\n"
+				msg_red "$saved_prevpkg: failed to install dependency '$curpkg'\n"
 				return 1
 			fi
 		fi
 	else
 		if [ -n "$saved_prevpkg" ]; then
-			msg_normal "'$saved_prevpkg': installing dependency '$curpkg'...\n"
+			msg_normal "$saved_prevpkg: installing dependency '$curpkg'...\n"
 		else
-			msg_normal "'${_ORIGINPKG}': installing dependency '$curpkg'...\n"
+			msg_normal "${_ORIGINPKG}: installing dependency '$curpkg'...\n"
 		fi
 		install_pkg "${curpkgname}"
 		if [ $? -eq 1 ]; then
-			msg_red "'$saved_prevpkg': failed to install dependency '$curpkg'\n"
+			msg_red "$saved_prevpkg: failed to install dependency '$curpkg'\n"
 			return 1
 		fi
 	fi
@@ -239,20 +239,14 @@ install_dependencies_pkg()
 {
 	local pkg="$1" rval
 	local lpkgname=$(${XBPS_PKGDB_CMD} getpkgname ${pkg})
-	local i j pkgn iver reqver notinstalled_deps lver
+	local i j pkgn iver reqver notinstalled_deps
 
 	[ -z "$pkg" ] && return 2
 	[ -z "$build_depends" ] && return 0
 
 	INSTALLING_DEPS=1
 
-	if [ -n "$revision" ]; then
-		lver="${version}_${revision}"
-	else
-		lver="${version}"
-	fi
-
-	msg_normal "'$pkgname-$lver': required build dependencies...\n"
+	msg_normal "$pkgver: required build dependencies...\n"
 
 	for i in ${build_depends}; do
 		pkgn="$($XBPS_PKGDB_CMD getpkgdepname ${i})"
@@ -270,7 +264,7 @@ install_dependencies_pkg()
 
 	# Install direct build dependencies from binary packages.
 	if [ -n "$XBPS_PREFER_BINPKG_DEPS" -a -z "$bootstrap" ]; then
-		msg_normal "'$pkg': installing dependencies from repositories ...\n"
+		msg_normal "$pkgver: installing dependencies from repositories ...\n"
 		for i in ${notinstalled_deps}; do
 			if [ -z "$pkglist" ]; then
 				pkglist="\"$i\""
diff --git a/xbps-src/shutils/common_funcs.sh b/xbps-src/shutils/common_funcs.sh
index e19ce1478f..5d4043fdcf 100644
--- a/xbps-src/shutils/common_funcs.sh
+++ b/xbps-src/shutils/common_funcs.sh
@@ -28,33 +28,20 @@
 #
 run_func_error()
 {
-	local lver func="$1"
+	local func="$1"
 
 	remove_pkgdestdir_sighandler ${pkgname} $KEEP_AUTODEPS
-
-	if [ -n "${revision}" ]; then
-		lver="${version}_${revision}"
-	else    
-		lver="${version}"
-	fi
-
 	echo
-	msg_error "${pkgname}-${lver}: '$func' interrupted!\n"
+	msg_error "$pkgver: '$func' interrupted!\n"
 }
 
 remove_pkgdestdir_sighandler()
 {
-	local lver subpkg _pkgname="$1" _kwrksrc="$2"
+	local subpkg _pkgname="$1" _kwrksrc="$2"
 
 	setup_tmpl ${_pkgname}
 	[ -z "$sourcepkg" ] && return 0
 
-	if [ -n "${revision}" ]; then
-		lver="${version}_${revision}"
-	else
-		lver="${version}"
-	fi
-
 	# If there is any problem in the middle of writting the metadata,
 	# just remove all files from destdir of pkg.
 
@@ -69,7 +56,7 @@ remove_pkgdestdir_sighandler()
 
 	if [ -d "$XBPS_DESTDIR/${sourcepkg}-${version%_*}" ]; then
 		rm -rf "$XBPS_DESTDIR/${sourcepkg}-${version%_*}"
-		msg_red "'${sourcepkg}-${lver}': removed files from DESTDIR...\n"
+		msg_red "$pkgver: removed files from DESTDIR...\n"
 	fi
 
 	autoremove_pkg_dependencies ${_kwrksrc}
@@ -94,16 +81,10 @@ var_is_a_function()
 run_func()
 {
 	local func="$1"
-	local lver rval logpipe logfile
+	local rval logpipe logfile
 
 	[ -z "$func" ] && return 1
 
-	if [ -n "$revision" ]; then
-		lver="${version}_${revision}"
-	else
-		lver="${version}"
-	fi
-
 	var_is_a_function $func
 	if [ $? -eq 1 ]; then
 		logpipe=/tmp/logpipe.$$
@@ -118,7 +99,7 @@ run_func()
 		exec 1>"$logpipe" 2>"$logpipe"
 		set -e
 		trap "run_func_error $func && return $?" INT
-		msg_normal "'$pkgname-$lver': running $func phase...\n"
+		msg_normal "$pkgver: running $func phase...\n"
 		$func 2>&1
 		rval=$?
 		set +e
@@ -126,7 +107,7 @@ run_func()
 		exec 1>&3 2>&3 3>&-
 		rm -f "$logpipe"
 		if [ $rval -ne 0 ]; then
-			msg_error "${pkgname}-${lver}: $func failed!\n"
+			msg_error "$pkgver: $func failed!\n"
 		fi
 	fi
 	return 255 # function not found.
diff --git a/xbps-src/shutils/configure_funcs.sh b/xbps-src/shutils/configure_funcs.sh
index 8932419cf9..80172d6fad 100644
--- a/xbps-src/shutils/configure_funcs.sh
+++ b/xbps-src/shutils/configure_funcs.sh
@@ -62,7 +62,7 @@ do_perl_configure()
 
 configure_src_phase()
 {
-	local f lver
+	local f
 
 	[ -z $pkgname ] && return 1
 	#
@@ -74,18 +74,12 @@ configure_src_phase()
 	  "$build_style" = "gnu_makefile" -o \
 	  "$build_style" = "python-module" ] && return 0
 
-	if [ -n "$revision" ]; then
-		lver="${version}_${revision}"
-	else
-		lver="${version}"
-	fi
-
 	cd $wrksrc || msg_error "unexistent build directory [$wrksrc].\n"
 
 	# Run pre_configure func.
 	if [ ! -f $XBPS_PRECONFIGURE_DONE ]; then
 		run_func pre_configure
-		msg_normal "'$pkgname-$lver': pre_configure phase done.\n"
+		msg_normal "$pkgver: pre_configure phase done.\n"
 		touch -f $XBPS_PRECONFIGURE_DONE
 	fi
 
@@ -108,15 +102,15 @@ configure_src_phase()
 		#
 		# Unknown build_style type won't work :-)
 		#
-		msg_error "'$pkgname-$lver': unknown build_style [$build_style]\n"
+		msg_error "$pkgver: unknown build_style [$build_style]\n"
 	fi
 
-	msg_normal "'$pkgname-$lver': configure phase done.\n"
+	msg_normal "$pkgver: configure phase done.\n"
 
 	# Run post_configure func.
 	if [ ! -f $XBPS_POSTCONFIGURE_DONE ]; then
 		run_func post_configure
-		msg_normal "'$pkgname-$lver': post_configure phase done.\n"
+		msg_normal "$pkgver: post_configure phase done.\n"
 		touch -f $XBPS_POSTCONFIGURE_DONE
 	fi
 
diff --git a/xbps-src/shutils/extract_funcs.sh b/xbps-src/shutils/extract_funcs.sh
index 263c0e98b8..29d3eee714 100644
--- a/xbps-src/shutils/extract_funcs.sh
+++ b/xbps-src/shutils/extract_funcs.sh
@@ -29,7 +29,7 @@
 #
 extract_distfiles()
 {
-	local pkg="$1" curfile cursufx f lver
+	local pkg="$1" curfile cursufx f
 
 	[ -f $XBPS_EXTRACT_DONE ] && return 0
 	[ -z "$IN_CHROOT" -a ! -w $XBPS_BUILDDIR ] && \
@@ -40,11 +40,6 @@ extract_distfiles()
 	#
 	[ -n "$pkg" -a -z "$pkgname" ] && return 1
 
-	if [ -n "$revision" ]; then
-		lver="${version}_${revision}"
-	else
-		lver="${version}"
-	fi
 	#
 	# If noextract is set, do a "fake extraction".
 	#
@@ -67,7 +62,7 @@ extract_distfiles()
 		mkdir -p ${wrksrc} || return 1
 	fi
 
-	msg_normal "'$pkgname-$lver': extracting distfile(s), please wait...\n"
+	msg_normal "$pkgver: extracting distfile(s), please wait...\n"
 
 	for f in ${distfiles}; do
 		curfile=$(basename $f)
diff --git a/xbps-src/shutils/fetch_funcs.sh b/xbps-src/shutils/fetch_funcs.sh
index 93974d78b5..7f446b811d 100644
--- a/xbps-src/shutils/fetch_funcs.sh
+++ b/xbps-src/shutils/fetch_funcs.sh
@@ -1,5 +1,5 @@
 #-
-# Copyright (c) 2008-2010 Juan Romero Pardines.
+# Copyright (c) 2008-2011 Juan Romero Pardines.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -34,7 +34,7 @@ verify_sha256_cksum()
 
 	[ -z "$file" -o -z "$cksum" ] && return 1
 
-	msg_normal "'$pkgname-$lver': verifying checksum for distfile '$file'... "
+	msg_normal "$pkgver: verifying checksum for distfile '$file'... "
 	filesum=$(${XBPS_DIGEST_CMD} $XBPS_SRCDISTDIR/$file)
 	if [ "$origsum" != "$filesum" ]; then
 		echo
@@ -63,12 +63,6 @@ fetch_distfiles()
 	# If nofetch is set in a build template, skip this phase
 	# entirely and run the do_fetch() function.
 	#
-	if [ -n "$revision" ]; then
-		lver="${version}_${revision}"
-	else
-		lver="${version}"
-	fi
-
 	if [ -n "$nofetch" ]; then
 		cd ${XBPS_BUILDDIR}
 		[ -n "$build_wrksrc" ] && mkdir -p "$wrksrc"
@@ -104,7 +98,7 @@ fetch_distfiles()
 			fi
 		fi
 
-		msg_normal "'$pkgname-$lver': fetching distfile '$curfile'...\n"
+		msg_normal "$pkgver: fetching distfile '$curfile'...\n"
 
 		if [ -n "$distfiles" ]; then
 			localurl="$f"
@@ -149,5 +143,5 @@ fetch_distfiles()
 		dfcount=$(($dfcount + 1))
 	done
 
-	unset lver cksum found
+	unset cksum found
 }
diff --git a/xbps-src/shutils/make-binpkg.sh b/xbps-src/shutils/make-binpkg.sh
index bfdb597700..41f7a4c63e 100644
--- a/xbps-src/shutils/make-binpkg.sh
+++ b/xbps-src/shutils/make-binpkg.sh
@@ -59,7 +59,7 @@ binpkg_cleanup()
 #
 xbps_make_binpkg_real()
 {
-	local mfiles binpkg pkgdir arch lver dirs _dirs d clevel
+	local mfiles binpkg pkgdir arch dirs _dirs d clevel
 
 	if [ ! -d "${DESTDIR}" ]; then
 		msg_warn "cannot find destdir for $pkgname... skipping!\n"
@@ -72,12 +72,7 @@ xbps_make_binpkg_real()
 	else
 		arch=$xbps_machine
 	fi
-	if [ -n "$revision" ]; then
-		lver="${version}_${revision}"
-	else
-		lver="${version}"
-	fi
-	binpkg=$pkgname-$lver.$arch.xbps
+	binpkg=$pkgver.$arch.xbps
 	pkgdir=$XBPS_PACKAGESDIR/$arch
 	#
 	# Don't overwrite existing binpkgs by default, skip them.
diff --git a/xbps-src/shutils/metadata.sh b/xbps-src/shutils/metadata.sh
index e7dbbc3d75..9dbb9eca7e 100644
--- a/xbps-src/shutils/metadata.sh
+++ b/xbps-src/shutils/metadata.sh
@@ -109,7 +109,7 @@ xbps_write_metadata_pkg_real()
 		fi
 		# Add info-files trigger.
 		triggers="info-files $triggers"
-		msg_normal "'$pkgname-$lver': processing info(1) files...\n"
+		msg_normal "$pkgver: processing info(1) files...\n"
 
 		find ${DESTDIR}/usr/share/info -type f -follow | while read f
 		do
@@ -144,7 +144,7 @@ xbps_write_metadata_pkg_real()
 	# compress all them with gzip.
 	#
 	if [ -d "${DESTDIR}/usr/share/man" ]; then
-		msg_normal "'$pkgname-$lver': processing manual pages...\n"
+		msg_normal "$pkgver: processing manual pages...\n"
 		find ${DESTDIR}/usr/share/man -type f -follow | while read f
 		do
 			j=$(echo "$f"|sed -e "$fpattern")
@@ -170,7 +170,7 @@ xbps_write_metadata_pkg_real()
 	TMPFLIST=$(mktemp -t flist.XXXXXXXXXX) || exit 1
 	TMPFPLIST=$(mktemp -t fplist.XXXXXXXXXX) || exit 1
 
-	msg_normal "'$pkgname-$lver': creating package metadata...\n"
+	msg_normal "$pkgver: creating package metadata...\n"
 
 	cat > "$TMPFPLIST" <<_EOF
 <?xml version="1.0" encoding="UTF-8"?>
@@ -275,7 +275,7 @@ _EOF
 <key>version</key>
 <string>$lver</string>
 <key>pkgver</key>
-<string>$pkgname-$lver</string>
+<string>$pkgver</string>
 <key>architecture</key>
 <string>$arch</string>
 <key>installed_size</key>
@@ -416,5 +416,5 @@ _EOF
 	xbps_write_metadata_scripts_pkg remove;				\
 	} || return $?
 
-	msg_normal "'$pkgname-$lver': successfully created package metadata.\n"
+	msg_normal "$pkgver: successfully created package metadata.\n"
 }
diff --git a/xbps-src/shutils/patch_funcs.sh b/xbps-src/shutils/patch_funcs.sh
index 4bfa461f8f..9d9a413b3d 100644
--- a/xbps-src/shutils/patch_funcs.sh
+++ b/xbps-src/shutils/patch_funcs.sh
@@ -1,5 +1,5 @@
 #-
-# Copyright (c) 2008-2010 Juan Romero Pardines.
+# Copyright (c) 2008-2011 Juan Romero Pardines.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,11 +25,11 @@
 
 #
 # Applies to the build directory all patches found in PATCHESDIR
-# (templates/$pkgname/patches).
+# (srcpkgs/$pkgname/patches).
 #
 _process_patch()
 {
-	local lver args _patch i=$1
+	local args _patch i=$1
 
 	args="-Np0"
 	_patch=$(basename $i)
@@ -40,12 +40,6 @@ _process_patch()
 	fi
 	cp -f $i $wrksrc
 
-	if [ -n "$revision" ]; then
-		lver="${version}_${revision}"
-	else
-		lver="${version}"
-	fi
-
 	# Try to guess if its a compressed patch.
 	if $(echo $i|grep -q '.diff.gz'); then
 		gunzip $wrksrc/${_patch}
@@ -64,15 +58,15 @@ _process_patch()
 	elif $(echo $i|grep -q '.patch'); then
 		:
 	else
-		msg_warn "'$pkgname-$lver': unknown patch type: $i.\n"
+		msg_warn "$pkgver: unknown patch type: $i.\n"
 		continue
 	fi
 
 	cd $wrksrc && patch -s ${args} < ${_patch} 2>/dev/null
 	if [ $? -eq 0 ]; then
-		msg_normal "'$pkgname-$lver': Patch applied: ${_patch}.\n"
+		msg_normal "$pkgver: Patch applied: ${_patch}.\n"
 	else
-		msg_error "'$pkgname-$lver': couldn't apply patch: ${_patch}.\n"
+		msg_error "'$pkgver: couldn't apply patch: ${_patch}.\n"
 	fi
 }
 
@@ -87,7 +81,7 @@ apply_tmpl_patches()
 			_process_patch "$PATCHESDIR/$f"
 		done
 	else
-		for f in $(echo $PATCHESDIR/*); do
+		for f in $PATCHESDIR/*; do
 			if $(echo $f|grep -q '.args'); then
 				continue
 			fi
diff --git a/xbps-src/shutils/stow_funcs.sh b/xbps-src/shutils/stow_funcs.sh
index c3f73d15b0..f03fb1387c 100644
--- a/xbps-src/shutils/stow_funcs.sh
+++ b/xbps-src/shutils/stow_funcs.sh
@@ -88,7 +88,7 @@ stow_pkg_real()
 	else
 		lver="${version}"
 	fi
-	msg_normal "'${pkgname}-$lver': stowning files into masterdir, please wait...\n"
+	msg_normal "$pkgver: stowning files into masterdir, please wait...\n"
 
 	# Copy files into masterdir.
 	for i in $(find -print); do
diff --git a/xbps-src/shutils/strip_files.sh b/xbps-src/shutils/strip_files.sh
index 6be834ce41..01042265b3 100644
--- a/xbps-src/shutils/strip_files.sh
+++ b/xbps-src/shutils/strip_files.sh
@@ -1,5 +1,5 @@
 #-
-# Copyright (c) 2010 Juan Romero Pardines.
+# Copyright (c) 2010-2011 Juan Romero Pardines.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -40,18 +40,10 @@ strip_files()
 
 strip_files_real()
 {
-	local lver
-
 	[ -n "$nostrip" -o -n "$noarch" ] && return 0
 	[ -z "$strip_cmd" ] && strip_cmd=strip
 
-	if [ -n "$revision" ]; then
-		lver="${version}_${revision}"
-	else
-		lver="${version}"
-	fi
-
-	msg_normal "'$pkgname-$lver': stripping files, please wait...\n"
+	msg_normal "$pkgver: stripping files, please wait...\n"
 	find ${DESTDIR} -type f | while read f; do
 		case "$(file -bi "$f")" in
 		application/x-executable*)
diff --git a/xbps-src/shutils/tmpl_funcs.sh.in b/xbps-src/shutils/tmpl_funcs.sh.in
index 9750f2cdc8..6a3c6f18ca 100644
--- a/xbps-src/shutils/tmpl_funcs.sh.in
+++ b/xbps-src/shutils/tmpl_funcs.sh.in
@@ -30,7 +30,7 @@ info_tmpl()
 {
 	local i=
 
-	for f in $(echo $XBPS_COMMONVARSDIR/*.sh); do
+	for f in $XBPS_COMMONVARSDIR/*.sh; do
 		[ -r ${f} ] && . ${f}
 	done
 
@@ -101,7 +101,7 @@ reset_tmpl_vars()
 			noarch subpackages sourcepkg gtk_iconcache_dirs \
 			abi_depends api_depends triggers openrc_services \
 			replaces system_accounts system_groups provides \
-			build_wrksrc create_wrksrc broken_as_needed \
+			build_wrksrc create_wrksrc broken_as_needed pkgver \
 			ignore_vdeps_dir noverifyrdeps conflicts dkms_modules \
 			gconf_entries gconf_schemas stow_copy stow_copy_files \
 			pre_remove post_remove post_stow do_build do_install \
@@ -126,7 +126,7 @@ setup_tmpl()
 		[ -n "$DESTDIR" ] && return 0
 	fi
 
-	for f in $(echo $XBPS_COMMONVARSDIR/*.sh); do
+	for f in $XBPS_COMMONVARSDIR/*.sh; do
 		[ -r ${f} ] && . ${f}
 	done
 
@@ -293,7 +293,7 @@ remove_tmpl_wrksrc()
 		return 0
 	fi
 
-	msg_normal "Cleaning '${sourcepkg}' build directory...\n"
+	msg_normal "$pkgver: cleaning build directory...\n"
 	rm -rf $lwrksrc
 	return $?
 }
@@ -302,6 +302,12 @@ set_tmpl_common_vars()
 {
 	[ -z "$pkgname" ] && return 1
 
+	if [ -n "$revision" ]; then
+		pkgver="${pkgname}-${version}_${revision}"
+	else
+		pkgver="${pkgname}-${version}"
+	fi
+
 	. $XBPS_SHUTILSDIR/install_files.sh
 
 	if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then
diff --git a/xbps-src/shutils/verify_rundeps.sh b/xbps-src/shutils/verify_rundeps.sh
index 9b6a701664..a60d9c1f75 100644
--- a/xbps-src/shutils/verify_rundeps.sh
+++ b/xbps-src/shutils/verify_rundeps.sh
@@ -44,20 +44,14 @@ find_rundep()
 
 verify_rundeps()
 {
-	local j i f nlib verify_deps maplib found_dup igndir lver
+	local j i f nlib verify_deps maplib found_dup igndir
 	local missing missing_libs rdep builddep rdep_list builddep_list
 
 	PKG_DESTDIR="$1"
 	maplib="$XBPS_COMMONVARSDIR/mapping_shlib_binpkg.txt"
 
-	if [ -n "$revision" ]; then
-		lver="${version}_${revision}"
-	else
-		lver="${version}"
-	fi
-
 	[ -n "$noarch" -o -n "$noverifyrdeps" ] && return 0
-	msg_normal "'$pkgname-$lver': verifying required run dependencies, please wait...\n"
+	msg_normal "$pkgver: verifying required run dependencies, please wait...\n"
 
 	depsftmp=$(mktemp -t xbps_src_depstmp.XXXXXXXXXX) || exit 1
 	find ${PKG_DESTDIR} -type f -perm -u+w > $depsftmp 2>/dev/null
@@ -194,5 +188,5 @@ verify_rundeps()
 	done
 	echo "============ CUT HERE ==============="
 
-	msg_error "'${pkgname}-${lver}': incorrect run dependencies, won't continue...\n"
+	msg_error "$pkgver: incorrect run dependencies, won't continue...\n"
 }
diff --git a/xbps-src/xbps-src.sh.in b/xbps-src/xbps-src.sh.in
index 665f3c9323..2bef31a073 100644
--- a/xbps-src/xbps-src.sh.in
+++ b/xbps-src/xbps-src.sh.in
@@ -273,7 +273,7 @@ if [ -n "${_MASTERDIR}" ]; then
 fi
 . @@XBPS_INSTALL_SHAREDIR@@/shutils/init_funcs.sh
 set_defvars
-for f in $(echo @@XBPS_INSTALL_SHAREDIR@@/shutils/*.sh); do
+for f in $(echo $XBPS_SHUTILSDIR/*.sh); do
 	[ -r "$f" ] && . $f
 done