Index: cvs-package.mk
===================================================================
RCS file: /cvsroot/pkgsrc-wip/wip/mk/cvs-package.mk,v
retrieving revision 1.36
diff -u -r1.36 cvs-package.mk
--- cvs-package.mk	20 Nov 2009 11:18:59 -0000	1.36
+++ cvs-package.mk	27 Sep 2011 06:33:01 -0000
@@ -90,7 +90,7 @@
 
 DISTFILES?=		# empty
 PKGNAME?=		${DISTNAME:C,-[0-9].*,,}-cvs-${_CVS_PKGVERSION}
-# Enforce PKGREVISION unless CVS_TAG is set:
+# Enforce PKGREVISION unless CVS_TAG is set
 .if empty(CVS_TAG)
 . if defined(CHECKOUT_DATE)
 PKGREVISION?=		$(CHECKOUT_DATE:S/-//g)
@@ -124,7 +124,7 @@
 
 .for repo in ${CVS_REPOSITORIES}
 .  if !defined(CVS_ROOT.${repo})
-PKG_FAIL_REASON+=	"[cvs-package.mk] CVS_ROOT.${repo} must be set."
+PKG_FAIL_REASON+=	"[cvs-package.mk] CVS_ROOT."${repo:Q}" must be set."
 .  endif
 .endfor
 
@@ -152,6 +152,7 @@
 # Generation of repository-specific variables
 #
 
+# determine appropriate checkout date or tag
 .for repo in ${CVS_REPOSITORIES}
 CVS_MODULE.${repo}?=	${repo}
 
@@ -177,15 +178,15 @@
 #   command to extract cache file
 _CVS_EXTRACT_CACHED.${repo}=	\
 	if [ -f ${_CVS_DISTDIR}/${_CVS_DISTFILE.${repo}:Q} ]; then		\
-	  ${STEP_MSG} "Extracting cached CVS archive "${_CVS_DISTFILE.${repo}:Q}"."; \
+	  ${STEP_MSG} "(1a) Extracting cached CVS archive "${_CVS_DISTFILE.${repo}:Q}"."; \
 	  pax -r -z -f ${_CVS_DISTDIR}/${_CVS_DISTFILE.${repo}:Q};	\
 	  exit 0;							\
 	fi
 
 #   create cache archive
 _CVS_CREATE_CACHE.${repo}=	\
-	${STEP_MSG} "Creating cached CVS archive "${_CVS_DISTFILE.${repo}:Q}"."; \
-	${MKDIR} ${_CVS_DISTDIR:Q};					\
+	${STEP_MSG} "(5) Creating cached CVS archive "${_CVS_DISTFILE.${repo}:Q}"."; \
+	${MKDIR} ${_CVS_DISTDIR:Q};							\
 	pax -w -z -f ${_CVS_DISTDIR}/${_CVS_DISTFILE.${repo}:Q} ${CVS_MODULE.${repo}:Q}
 .endfor
 
@@ -198,7 +199,7 @@
 	${_CVS_EXTRACT_CACHED.${repo}};					\
 	p="$$(cd ${_CVS_DISTDIR} && ls -t ${PKGBASE}-${CVS_MODULE.${repo}}-* | head -n 1)";	\
 	if [ -n "$$p" ]; then						\
-	  ${STEP_MSG} "Extracting cached CVS archive \"""$$p\".";	\
+	  ${STEP_MSG} "(1b) Extracting cached CVS archive \"""$$p\".";	\
 	  pax -r -z -f ${_CVS_DISTDIR:Q}/"$$p";				\
 	fi;								\
 	case ${CVS_ROOT.${repo}:Q} in					\
@@ -210,12 +211,17 @@
 	  ;;								\
 	  *) ;;								\
 	esac;								\
-	${STEP_MSG} "Downloading "${CVS_MODULE.${repo}:Q}" from "${CVS_ROOT.${repo}:Q}"."; \
+	${STEP_MSG} "(2) Downloading "${CVS_MODULE.${repo}:Q}" from "${CVS_ROOT.${repo}:Q}"."; \
 	${SETENV} ${_CVS_ENV}						\
-	  ${_CVS_CMD} ${_CVS_FLAGS} -d ${CVS_ROOT.${repo}:Q}		\
-	    checkout ${_CVS_CHECKOUT_FLAGS} ${_CVS_TAG_FLAG.${repo}}	\
-	      -d ${repo} ${CVS_MODULE.${repo}:Q};				\
-	${_CVS_CREATE_CACHE.${repo}}
+	  ${_CVS_CMD} 							\
+			${_CVS_FLAGS}					\
+			-d ${CVS_ROOT.${repo}:Q}			\
+			checkout ${_CVS_CHECKOUT_FLAGS}			\
+			${_CVS_TAG_FLAG.${repo}}			\
+			-d ${repo} 					\
+			${CVS_MODULE.${repo}:Q};			\
+	${_CVS_CREATE_CACHE.${repo}};					\
+
 .endfor
 
 .endif