gunnar: server/php/patches Makefile,1.2,1.3

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/php/patches
In directory doto:/tmp/cvs-serv4970

Modified Files:
	Makefile 
Log Message:
Patches for PHP 5.3.1.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php/patches/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	2 Jul 2009 13:15:44 -0000	1.2
+++ Makefile	23 Dec 2009 23:25:55 -0000	1.3
@@ -1,57 +1,10 @@
-# This is a very rough draft for updating a patch series using
-# mercurial queues. The Makefile could see some optimizations but for
-# the occasional upstream update it hopefully does fine.
-#
-# Author: G. Wrobel
-
-OLD_VERSION=5.2.8
-NEW_VERSION=5.2.9
+OLD_VERSION=5.2.9
+NEW_VERSION=5.3.1
 
 PN=php
 
-SOURCE_URL=http://www.php.net/distributions/
-
-.PHONY: update
-update:
-	@if [ -d $(PN)-$(NEW_VERSION) ]; then echo "Patches for the new version do already exist!" && exit 1; fi
-	rm -rf tmp
-	mkdir -p tmp
-	cd tmp && wget $(SOURCE_URL)/$(PN)-$(OLD_VERSION).tar.bz2
-	cd tmp && tar xfj $(PN)-$(OLD_VERSION).tar.bz2
-	cd tmp/$(PN)-$(OLD_VERSION) && hg init && hg commit --addremove -m "$(PN)-$(OLD_VERSION)"
-	cd tmp && hg clone $(PN)-$(OLD_VERSION) $(PN)-PATCHED
-	printf "[extensions]\nhgext.mq =\n" > tmp/$(PN)-PATCHED/.hg/hgrc
-	cd tmp/$(PN)-PATCHED && hg qinit
-	cp $(PN)-$(OLD_VERSION)/series tmp/$(PN)-PATCHED/.hg/patches/
-	cd $(PN)-$(OLD_VERSION); \
-	for FL in KOLAB*; do \
-	  cp $$FL ../tmp/$(PN)-PATCHED/.hg/patches/$${FL/$(PN)-$(OLD_VERSION)_/}; \
-	done
-	cp $(PN)-$(OLD_VERSION)/series tmp/$(PN)-PATCHED/.hg/patches/
-	cd tmp/$(PN)-PATCHED && hg qpush -a && hg qpop -a
-	cd tmp && hg clone $(PN)-$(OLD_VERSION) $(PN)-$(NEW_VERSION)
-	cd tmp/$(PN)-$(NEW_VERSION) && hg locate -0 | xargs -0 rm
-	cd tmp && wget $(SOURCE_URL)/$(PN)-$(NEW_VERSION).tar.bz2
-	cd tmp && tar xfj $(PN)-$(NEW_VERSION).tar.bz2
-	cd tmp/$(PN)-$(NEW_VERSION) && hg commit --addremove -m "$(PN)-$(NEW_VERSION)"
-	cd tmp/$(PN)-PATCHED && hg pull ../$(PN)-$(NEW_VERSION) && hg update
-	@echo
-	@echo
-	@echo "The patch series will be pushed now. If errors occur you will need to fix them"
-	@echo "run \"hg qrefresh\" and continue with \"hg qpush\" until the full series applied"
-	@echo "successfully. Finally you may move back to the current directory and run \"make patches\""
-	@echo
-	@echo
-	cd tmp/$(PN)-PATCHED && hg qpush -a
+SOURCE_URL=http://www.php.net/distributions
 
-.PHONY: patches
-patches:
-	@if [ -d $(PN)-$(NEW_VERSION) ]; then echo "Patches for the new version do already exist!" && exit 1; fi
-	mkdir $(PN)-$(NEW_VERSION)
-	cd tmp/$(PN)-PATCHED/.hg/patches; \
-	for FL in KOLAB*; do \
-	  cp $$FL ../../../../$(PN)-$(NEW_VERSION)/$${FL/KOLAB_/KOLAB_$(PN)-$(NEW_VERSION)_}; \
-	done
-	cp tmp/$(PN)-PATCHED/.hg/patches/series $(PN)-$(NEW_VERSION)/ 
-	rm -rf tmp
+COMPRESSION=BZ2
 
+include ../../make-helper/hg-patch-queue.mk