From 7c980e275971d46a2be50ebe564c0125cb759727 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 9 Nov 2010 22:15:42 +0100
Subject: try to fix bzr, unify python support

---
 package/bzr/Makefile | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'package/bzr')

diff --git a/package/bzr/Makefile b/package/bzr/Makefile
index 7b6836cae..ba8aba484 100644
--- a/package/bzr/Makefile
+++ b/package/bzr/Makefile
@@ -4,31 +4,30 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		bzr
-PKG_VERSION:=		2.0.4
+PKG_VERSION:=		2.3b3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		0b253f59601ebc9ee5975c612fc65f43
+PKG_MD5SUM:=		94f9181b9a4ab84b94cfbc06bd5dfd91
 PKG_DESCR:=		bazaar
 PKG_SECTION:=		scm
 PKG_DEPENDS:=		python2
 PKG_BUILDDEP:=		python2
 PKG_URL:=		http://bazaar.canonical.com/en/
-PKG_SITES:=		http://launchpad.net/bzr/2.0/${PKG_VERSION}/+download/
+PKG_SITES:=		http://launchpad.net/bzr/2.3/${PKG_VERSION}/+download/
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,BZR,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-PYTHON_VERSION=2.6
-PYTHON_DIR:=$(STAGING_DIR)/usr
-PYTHON_BIN_DIR:=$(PYTHON_DIR)/bin
-PYTHON_INC_DIR:=$(PYTHON_DIR)/include/python$(PYTHON_VERSION)
-PYTHON_LIB_DIR:=$(PYTHON_DIR)/lib/python$(PYTHON_VERSION)
-PYTHON:=python$(PYTHON_VERSION)
-PYTHON_PKG_DIR:=/usr/lib/python$(PYTHON_VERSION)/site-packages
-
 CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
+include $(TOPDIR)/mk/python.mk
+
+do-build:
+	cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py install --prefix="$(WRKINST)/usr"
 
-post-install:
+do-install:
 	$(INSTALL_DIR) $(IDIR_BZR)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/bzr \
 		$(IDIR_BZR)/usr/bin
-- 
cgit v1.2.3