From 1e8a2130a5b5ce6697956379e17bdeee435286ae Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Tue, 29 Oct 2013 09:17:25 +0100
Subject: update python2 and use new host infrastructure

---
 mk/buildhlp.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mk/buildhlp.mk')

diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index 8b6a4a8c8..ef8c55391 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -98,12 +98,12 @@ endif
 		env ${AUTOTOOL_ENV} autoreconf -if)
 	@rm -rf ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}/autom4te.cache
 	@# restore config.sub/config.guess
-	@for i in $$(find ${WRKDIR}.orig -name config.sub);do \
+	@for i in $$(find ${WRKDIR} -name config.sub);do \
 		if [ -f $$i.bak ];then \
 			mv $$i.bak $$i; \
 		fi;\
 	done
-	@for i in $$(find ${WRKDIR}.orig -name config.guess);do \
+	@for i in $$(find ${WRKDIR} -name config.guess);do \
 		if [ -f $$i.bak ];then \
 			mv $$i.bak $$i; \
 		fi;\
-- 
cgit v1.2.3


From 21795cc1a20760ff37bca88b799fef664e70ccf2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 29 Oct 2013 10:32:23 +0100
Subject: convert tslib to autotool infrastructure, downgrade m4, newest
 version have problems generating correct Makefiles

---
 mk/buildhlp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mk/buildhlp.mk')

diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index 8b6a4a8c8..64945c158 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -95,7 +95,7 @@ else
 endif
 	@-test -r ${WRKDIR}/.autoreconf_done && \
 		(cd ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}; \
-		env ${AUTOTOOL_ENV} autoreconf -if)
+		env ${AUTOTOOL_ENV} autoreconf -if) $(MAKE_TRACE)
 	@rm -rf ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}/autom4te.cache
 	@# restore config.sub/config.guess
 	@for i in $$(find ${WRKDIR}.orig -name config.sub);do \
-- 
cgit v1.2.3


From 1a6d2ebae0efbdee792cb15165dc0ebca9a9831b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 29 Oct 2013 15:09:37 +0100
Subject: inverse logic to avoid error message

---
 mk/buildhlp.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mk/buildhlp.mk')

diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index 41f09d946..5fdc7011a 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -93,7 +93,7 @@ ifeq ($(strip ${_IN_PACKAGE})$(strip ${_IN_CVTC}),1)
 else
 	@$(MAKE) -s V=0 prepare WRKDIR=${WRKDIR}.orig PREVENT_PATCH=: NO_CHECKSUM=1
 endif
-	@-test -r ${WRKDIR}/.autoreconf_done && \
+	@-test ! -r ${WRKDIR}/.autoreconf_done || \
 		(cd ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}; \
 		env ${AUTOTOOL_ENV} autoreconf -if) $(MAKE_TRACE)
 	@rm -rf ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}/autom4te.cache
-- 
cgit v1.2.3


From 5ce633839096d25a684af6978ba9da7d6d34fdaf Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 30 Oct 2013 15:46:44 +0100
Subject: fix update-patches when WRKDIST is overwritten in the Makefile

---
 mk/buildhlp.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'mk/buildhlp.mk')

diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index 5fdc7011a..79014ac4b 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -94,7 +94,8 @@ else
 	@$(MAKE) -s V=0 prepare WRKDIR=${WRKDIR}.orig PREVENT_PATCH=: NO_CHECKSUM=1
 endif
 	@-test ! -r ${WRKDIR}/.autoreconf_done || \
-		(cd ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}; \
+		(wrkdist=$(WRKDIST) dir=$${wrkdist#$(WRKDIR)}; \
+		cd ${WRKDIR}.orig$${dir}; \
 		env ${AUTOTOOL_ENV} autoreconf -if) $(MAKE_TRACE)
 	@rm -rf ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}/autom4te.cache
 	@# restore config.sub/config.guess
-- 
cgit v1.2.3


From b520d5c344c10b079673446d7f3cce1c24449d2a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 31 Oct 2013 09:20:22 +0100
Subject: forgot to import regular expression module

---
 mk/buildhlp.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mk/buildhlp.mk')

diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index 79014ac4b..587a97125 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -96,8 +96,8 @@ endif
 	@-test ! -r ${WRKDIR}/.autoreconf_done || \
 		(wrkdist=$(WRKDIST) dir=$${wrkdist#$(WRKDIR)}; \
 		cd ${WRKDIR}.orig$${dir}; \
-		env ${AUTOTOOL_ENV} autoreconf -if) $(MAKE_TRACE)
-	@rm -rf ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}/autom4te.cache
+		env ${AUTOTOOL_ENV} autoreconf -if; \
+		rm -rf ${WRKDIR}.orig$${dir}/autom4te.cache ) $(MAKE_TRACE)
 	@# restore config.sub/config.guess
 	@for i in $$(find ${WRKDIR} -name config.sub);do \
 		if [ -f $$i.bak ];then \
-- 
cgit v1.2.3