gunnar: server/pear Pear.mk,1.2,1.3

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/pear
In directory doto:/tmp/cvs-serv24476

Modified Files:
	Pear.mk 
Log Message:
Fix variable parsing.

Index: Pear.mk
===================================================================
RCS file: /kolabrepository/server/pear/Pear.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Pear.mk	23 Jun 2009 14:24:08 -0000	1.2
+++ Pear.mk	23 Jun 2009 14:56:37 -0000	1.3
@@ -41,10 +41,10 @@
 REPO = $(shell grep "^repo=" package.info | sed -e "s/repo='\([A-Za-z0-9_\-]*\)'.*/\1/")
 
 # Determine the exact commit that should be retrieved from the repository
-COMMIT =  $(shell grep "^repo_commit=" package.info | sed -e "s/repo_commit='\([A-Za-z0-9_]*\)'.*/\1/")
+COMMIT =  $(shell grep "^repo_commit=" package.info | sed -e "s/repo_commit='\([A-Za-z0-9_:]*\)'.*/\1/")
 
 # Determine the release tag a package derived from a repository checkout should get
-RELTAG = $(shell grep "^repo_release=" package.info | sed -e "s/repo_release='*\([0-9]*\)'.*/\1/")
+RELTAG = $(shell grep "^repo_release=" package.info | sed -e "s/repo_release='\([0-9]*\)'.*/\1/")
 
 # Determine the download url for the PEAR package from the *.spec file
 SOURCE_URL=$(shell grep "^sourceurl=" package.info | sed -e "s/sourceurl='\(.*\)'$$/\1/")
@@ -132,7 +132,7 @@
 ifeq ($(PACKAGE_VC),CVS)
 .PHONY: $(UPSTREAM)/$(CVS_REPO)
 $(UPSTREAM)/$(CVS_REPO):
-	@if [ -e $(UPSTREAM)/$(CVS_REPO) ]; then                        \
+	if [ -e $(UPSTREAM)/$(CVS_REPO) ]; then                        \
 	  cd $(UPSTREAM)/$(CVS_REPO) && $(CVS_REPO_SC_CMD) "$(COMMIT)"; \
 	else                                                            \
 	  echo The password is 'horde';                                 \