From 65b27b644c5817eb63fe7b8392236c37e0386f9b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 5 Dec 2009 12:15:12 +0100 Subject: update some packages to latest upstream - openssh, aircrack-ng, autoconf, lighttpd - use mplayer svn version --- package/automake/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/automake') diff --git a/package/automake/Makefile b/package/automake/Makefile index 3c999c5cf..3f5bd4b85 100644 --- a/package/automake/Makefile +++ b/package/automake/Makefile @@ -4,12 +4,12 @@ include ${TOPDIR}/rules.mk PKG_NAME:= automake -PKG_VERSION:= 1.9.6 +PKG_VERSION:= 1.10 PKG_RELEASE:= 1 -PKG_MD5SUM:= c60f77a42f103606981d456f1615f5b4 +PKG_MD5SUM:= 452163c32d061c53a7acc0e8c1b689ba PKG_DESCR:= GNU automake PKG_SECTION:= utils -PKG_URL:= http://www.gnu.org/software/${PKG_NAME}/ +PKG_URL:= http://www.gnu.org/software/automake/ PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/} PKG_OPTS:= noscripts -- cgit v1.2.3 From ce621815fecece2b4d8a4cb7115eb82c1cb7ed44 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 23 Dec 2009 11:37:42 +0100 Subject: remove and ignore autogenerated Config.in files --- package/automake/Config.in | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 package/automake/Config.in (limited to 'package/automake') diff --git a/package/automake/Config.in b/package/automake/Config.in deleted file mode 100644 index 9ded7338f..000000000 --- a/package/automake/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config ADK_PACKAGE_AUTOMAKE - prompt "automake.......................... Automake" - tristate - default n - help - http://www.gnu.org/software/automake/ -- cgit v1.2.3 From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 7 Feb 2010 20:03:20 +0100 Subject: change defaults for CONFIG/BUILD/INSTALL styles All packages need an update, so here is a very huge commit. Most of the 460 source packages use automatic style for configuration, building and installing. Make these styles default to "auto". If you have a package, which does not conform to this, just use manual style and add a do-$task make target. I added a new style named AUTOTOOL style, which is needed for some broken packages, which needs to be updated via autoconf or automake. I renamed CONFIGURE_STYLE to CONFIG_STYLE. Updates for some packages, which have newer upstream versions. Renaming of all package/*/extra directories. Use the directory src/ to provide overwrites of source files or to add the code, when no upstream package is available or used. src directory will be automatically used. --- package/automake/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'package/automake') diff --git a/package/automake/Makefile b/package/automake/Makefile index 3f5bd4b85..4256f0d97 100644 --- a/package/automake/Makefile +++ b/package/automake/Makefile @@ -5,10 +5,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= automake PKG_VERSION:= 1.10 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 452163c32d061c53a7acc0e8c1b689ba PKG_DESCR:= GNU automake PKG_SECTION:= utils +PKG_DEPENDS:= microperl PKG_URL:= http://www.gnu.org/software/automake/ PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/} PKG_OPTS:= noscripts @@ -17,13 +18,12 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,AUTOMAKE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -CONFIGURE_STYLE:= gnu -BUILD_STYLE:= auto -INSTALL_STYLE:= auto - post-install: ${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/automake ${IDIR_AUTOMAKE}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/aclocal ${IDIR_AUTOMAKE}/usr/bin + ${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/share/automake-${PKG_VERSION}/ + ${CP} ${WRKINST}/usr/share/automake-${PKG_VERSION}/Automake \ + ${IDIR_AUTOMAKE}/usr/share/automake-${PKG_VERSION}/ include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From 8412c949934c0fc8eb1c73931b6bf60f75a1da4c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 24 Feb 2010 19:44:39 +0100 Subject: fix compile of some packages --- package/automake/Makefile | 2 +- package/automake/patches/patch-Makefile_am | 11 +++++++++++ package/automake/patches/patch-Makefile_in | 11 +++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 package/automake/patches/patch-Makefile_am create mode 100644 package/automake/patches/patch-Makefile_in (limited to 'package/automake') diff --git a/package/automake/Makefile b/package/automake/Makefile index 4256f0d97..645d44f3f 100644 --- a/package/automake/Makefile +++ b/package/automake/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= automake PKG_VERSION:= 1.10 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 452163c32d061c53a7acc0e8c1b689ba PKG_DESCR:= GNU automake PKG_SECTION:= utils diff --git a/package/automake/patches/patch-Makefile_am b/package/automake/patches/patch-Makefile_am new file mode 100644 index 000000000..e98c6ca49 --- /dev/null +++ b/package/automake/patches/patch-Makefile_am @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000..68c45e168 --- /dev/null +++ b/package/automake/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- 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 -- cgit v1.2.3