update to latest upstream version and add host build stuff

3 files changed, 9 insertions, 26 deletions

diff --git a/package/automake/Makefile b/package/automake/Makefile
index 814d753a2..7c12ded6e 100644
--- a/package/automake/Makefile
+++ b/package/automake/Makefile
@@ -4,21 +4,25 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		automake
-PKG_VERSION:=		1.11.1
-PKG_RELEASE:=		2
-PKG_EXTRAVER:=		1.11
-PKG_MD5SUM:=		4ee7f0ff5f0e467d58b6bd5da96b1c74
+PKG_VERSION:=		1.12.2
+PKG_RELEASE:=		1
+PKG_EXTRAVER:=		1.12
+PKG_MD5SUM:=		e620cb9e0259159341c0e0d6b712b67a
 PKG_DESCR:=		GNU automake
 PKG_SECTION:=		lang
+PKG_BUILDDEP:=		autoconf-host
 PKG_URL:=		http://www.gnu.org/software/automake/
 PKG_SITES:=		${MASTER_SITE_GNU:=${PKG_NAME}/}
 PKG_OPTS:=		noscripts
 
+include ${TOPDIR}/mk/host.mk
 include ${TOPDIR}/mk/package.mk
 
+$(eval $(call HOST_template,AUTOMAKE,automake,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,AUTOMAKE,automake,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 XAKE_FLAGS+=		PERL="/usr/bin/perl"
+HOST_STYLE:=		auto
 
 automake-install:
 	${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/bin
@@ -31,4 +35,5 @@ automake-install:
 	${CP} ${WRKINST}/usr/share/automake-${PKG_EXTRAVER} \
 		${IDIR_AUTOMAKE}/usr/share
 
+include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/automake/patches/patch-Makefile_am b/package/automake/patches/patch-Makefile_am
deleted file mode 100644
index e98c6ca49..000000000
--- a/package/automake/patches/patch-Makefile_am
+++ /dev/null
@@ -1,11 +0,0 @@
---- automake-1.10.orig/Makefile.am	2006-08-22 12:01:20.000000000 +0200
-+++ automake-1.10/Makefile.am	2010-02-23 19:48:10.927027207 +0100
-@@ -24,7 +24,7 @@
- ## automake (run in doc, tests, and in the rebuild rules.)
- ## `.' goes before doc and tests, because the latter two directories
- ## run aclocal and automake.
--SUBDIRS = lib . doc m4 tests
-+SUBDIRS = lib . m4
- 
- bin_SCRIPTS = automake aclocal
- 
diff --git a/package/automake/patches/patch-Makefile_in b/package/automake/patches/patch-Makefile_in
deleted file mode 100644
index 68c45e168..000000000
--- a/package/automake/patches/patch-Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- automake-1.10.orig/Makefile.in	2006-10-15 19:25:23.000000000 +0200
-+++ automake-1.10/Makefile.in	2010-02-23 19:50:59.178535678 +0100
-@@ -162,7 +162,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = lib . doc m4 tests
-+SUBDIRS = lib . m4
- bin_SCRIPTS = automake aclocal
- CLEANFILES = $(bin_SCRIPTS)
- AUTOMAKESOURCES = automake.in aclocal.in