native packages: tidy up and install to BUILD prefix to avoid conflicts

6 files changed, 43 insertions, 35 deletions

diff --git a/src/autoconf.mk b/src/autoconf.mk
index b1defb1..22ddd9f 100644
--- a/src/autoconf.mk
+++ b/src/autoconf.mk
@@ -5,20 +5,22 @@ PKG             := autoconf
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 2.69
 $(PKG)_CHECKSUM := e891c3193029775e83e0534ac0ee0c4c711f6d23
-$(PKG)_SUBDIR   := autoconf-$($(PKG)_VERSION)
-$(PKG)_FILE     := autoconf-$($(PKG)_VERSION).tar.xz
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/autoconf/$($(PKG)_FILE)
-$(PKG)_DEPS     :=
+$(PKG)_DEPS     := m4
 
 define $(PKG)_UPDATE
-    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
-    echo $($(PKG)_VERSION)
+    $(WGET) -q -O- 'http://ftp.gnu.org/gnu/autoconf/?C=M;O=D' | \
+    $(SED) -n 's,.*<a href="autoconf-\([0-9][^"]*\)\.tar.*,\1,p' | \
+    $(SORT) -V | \
+    tail -1
 endef
 
-define $(PKG)_BUILD_NATIVE
+define $(PKG)_BUILD_$(BUILD)
     mkdir '$(1).build'
     cd    '$(1).build' && '$(1)/configure' \
-        --prefix='$(PREFIX)'
+        --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1).build' -j '$(JOBS)'
     $(MAKE) -C '$(1).build' -j 1 install
 endef
diff --git a/src/automake.mk b/src/automake.mk
index 2d9c318..83eaaea 100644
--- a/src/automake.mk
+++ b/src/automake.mk
@@ -2,25 +2,25 @@
 # See index.html for further information.
 
 PKG             := automake
-$(PKG)_IGNORE   :=
+$(PKG)_IGNORE   := 1.14%
 $(PKG)_VERSION  := 1.13.2
 $(PKG)_CHECKSUM := 72ee9fcd180c54fd7c067155d85fa071a99c3ea3
-$(PKG)_SUBDIR   := automake-$($(PKG)_VERSION)
-$(PKG)_FILE     := automake-$($(PKG)_VERSION).tar.gz
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/automake/$($(PKG)_FILE)
-$(PKG)_DEPS     :=
-
-$(PKG)_DEPS_NATIVE := autoconf
+$(PKG)_DEPS     := autoconf
 
 define $(PKG)_UPDATE
-    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
-    echo $($(PKG)_VERSION)
+    $(WGET) -q -O- 'http://ftp.gnu.org/gnu/automake/?C=M;O=D' | \
+    $(SED) -n 's,.*<a href="automake-\([0-9][^"]*\)\.tar.*,\1,p' | \
+    $(SORT) -V | \
+    tail -1
 endef
 
-define $(PKG)_BUILD_NATIVE
+define $(PKG)_BUILD_$(BUILD)
     mkdir '$(1).build'
     cd    '$(1).build' && '$(1)/configure' \
-        --prefix='$(PREFIX)'
+        --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1).build' -j '$(JOBS)'
     $(MAKE) -C '$(1).build' -j 1 install
 endef
diff --git a/src/bison.mk b/src/bison.mk
index 94d89e2..e1faf71 100644
--- a/src/bison.mk
+++ b/src/bison.mk
@@ -2,7 +2,7 @@
 # See index.html for further information.
 
 PKG             := bison
-$(PKG)_IGNORE   :=
+$(PKG)_IGNORE   := 3%
 $(PKG)_VERSION  := 2.7.1
 $(PKG)_CHECKSUM := 00ab1b32d864622077c311e4f5420d4e2931fdc8
 $(PKG)_SUBDIR   := bison-$($(PKG)_VERSION)
@@ -11,14 +11,16 @@ $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/bison/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
-    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
-    echo $($(PKG)_VERSION)
+    $(WGET) -q -O- 'http://ftp.gnu.org/gnu/bison/?C=M;O=D' | \
+    $(SED) -n 's,.*<a href="bison-\([0-9][^"]*\)\.tar.*,\1,p' | \
+    $(SORT) -V | \
+    tail -1
 endef
 
-define $(PKG)_BUILD_NATIVE
+define $(PKG)_BUILD_NONE
     mkdir '$(1).build'
     cd    '$(1).build' && '$(1)/configure' \
-        --prefix='$(PREFIX)'
+        --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1).build' -j '$(JOBS)'
     $(MAKE) -C '$(1).build' -j 1 install
 endef
diff --git a/src/cmake.mk b/src/cmake.mk
index 6cd54e7..7f2f06d 100644
--- a/src/cmake.mk
+++ b/src/cmake.mk
@@ -2,23 +2,25 @@
 # See index.html for further information.
 
 PKG             := cmake
-$(PKG)_IGNORE   :=
+$(PKG)_IGNORE   := %
 $(PKG)_VERSION  := 2.8.9
 $(PKG)_CHECKSUM := b96663c0757a5edfbddc410aabf7126a92131e2b
 $(PKG)_SUBDIR   := cmake-$($(PKG)_VERSION)
 $(PKG)_FILE     := cmake-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://www.cmake.org/files/v2.8/$($(PKG)_FILE)
+$(PKG)_URL      := http://www.cmake.org/files/v$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
-    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
-    echo $($(PKG)_VERSION)
+    $(WGET) -q -O- 'http://www.cmake.org/cmake/resources/software.html' | \
+    $(SED) -n 's,.*cmake-\([0-9.]*\)\.tar.*,\1,p' | \
+    $(SORT) -V | \
+    tail -1
 endef
 
-define $(PKG)_BUILD_NATIVE
+define $(PKG)_BUILD_$(BUILD)
     mkdir '$(1).build'
     cd    '$(1).build' && '$(1)/configure' \
-        --prefix='$(PREFIX)'
+        --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1).build' -j '$(JOBS)'
     $(MAKE) -C '$(1).build' -j 1 install
 endef
diff --git a/src/flex.mk b/src/flex.mk
index 99baf0b..34c8d88 100644
--- a/src/flex.mk
+++ b/src/flex.mk
@@ -11,14 +11,16 @@ $(PKG)_URL      := http://prdownloads.sourceforge.net/flex/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
 define $(PKG)_UPDATE
-    echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
-    echo $($(PKG)_VERSION)
+    $(WGET) -q -O- 'http://flex.sourceforge.net/' | \
+    $(SED) -n 's,.*flex-\([0-9][^"]*\)\.tar.*,\1,p' | \
+    $(SORT) -V | \
+    tail -1
 endef
 
-define $(PKG)_BUILD_NATIVE
+define $(PKG)_BUILD_NONE
     mkdir '$(1).build'
     cd    '$(1).build' && '$(1)/configure' \
-        --prefix='$(PREFIX)'
+        --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1).build' -j '$(JOBS)'
     $(MAKE) -C '$(1).build' -j 1 install
 endef
diff --git a/src/pkgconf.mk b/src/pkgconf.mk
index 3197858..3fad13a 100644
--- a/src/pkgconf.mk
+++ b/src/pkgconf.mk
@@ -16,11 +16,11 @@ define $(PKG)_UPDATE
     head -1
 endef
 
-define $(PKG)_BUILD_NATIVE
+define $(PKG)_BUILD_$(BUILD)
     cd '$(1)' && ./autogen.sh
     cd '$(1)' && ./configure \
-        --prefix='$(PREFIX)'
+        --prefix='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
-    ln -sf '$(PREFIX)/bin/pkgconf' '$(PREFIX)/bin/pkg-config'
+    ln -sf '$(PREFIX)/$(TARGET)/bin/pkgconf' '$(PREFIX)/$(TARGET)/bin/pkg-config'
 endef