gunnar: server/pear Horde.mk,1.8,1.9

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	Horde.mk 
Log Message:
Allow to specify the repository to use and copy additional php/template files.

Index: Horde.mk
===================================================================
RCS file: /kolabrepository/server/pear/Horde.mk,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Horde.mk	19 May 2009 08:02:44 -0000	1.8
+++ Horde.mk	25 May 2009 16:48:37 -0000	1.9
@@ -34,6 +34,9 @@
 # Determine the release number from the *.spec file
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
+# Determine the repository
+REPO = $(shell grep "%define[ ]*V_repo " *.spec | sed -e "s/.*V_repo\s*\([A-Za-z0-9_\-]*\).*/\1/")
+
 # Determine the exact commit that should be retrieved from the repository
 COMMIT =  $(shell grep "%define[ ]*V_repo_commit" *.spec | sed -e "s/.*V_repo_commit\s*\([A-Za-z0-9_]*\).*/\1/")
 
@@ -55,8 +58,14 @@
 # Get the list of patches if there are any in the patch directory
 PATCHES = $(shell ls patches/$(PACKAGE)-$(VERSION)/*.patch 2> /dev/null)
 
+# Get the list of php (config) files if there are any in this directory
+PHP_FILES = $(shell ls *.php 2> /dev/null)
+
+# Get the list of template files if there are any in this directory
+TEMPLATE_FILES = $(shell ls *.template 2> /dev/null)
+
 # Generate a list of extra files for the package
-EXTRA=ChangeLog package.patch
+EXTRA=ChangeLog package.patch $(PHP_FILES) $(TEMPLATE_FILES)
 
 # Temporary repository checkout location
 ifeq ($(PACKAGE_VC),CVS)
@@ -71,14 +80,22 @@
 DATE=$(shell date +%Y-%m-%d)
 
 # CVS information
+ifeq ($(REPO),)
 CVS_REPO=framework
+else
+CVS_REPO=$(REPO)
+endif
 CVS_REPO_URL=:pserver:cvsread at anoncvs.horde.org:/repository
 CVS_REPO_UP_CMD=cvs update
 CVS_REPO_CO_CMD=cvs -d $(CVS_REPO_URL) co
 CVS_REPO_SC_CMD=cvs update -r
 
 # GIT information
+ifeq ($(REPO),)
 GIT_REPO=horde
+else
+GIT_REPO=$(REPO)
+endif
 GIT_REPO_URL=git://dev.horde.org/horde/git/$(GIT_REPO)
 GIT_REPO_UP_CMD=git pull origin master
 GIT_REPO_CO_CMD=git clone