Merge branch 'x-fixes' into ms-no-toolchain

Conflicts:
	pkgs/core/gcc/gcc.nm
	pkgs/core/libassuan/libassuan.nm
	pkgs/toolchain/gcc-static/gcc-static.nm
	pkgs/toolchain/gcc/gcc.nm

diff --cc pkgs/core/autoconf/autoconf.nm
Simple merge

diff --cc pkgs/core/bison/bison.nm
Simple merge

diff --cc pkgs/core/cmake/cmake.nm
Simple merge

diff --cc pkgs/core/curl/curl.nm
Simple merge

diff --cc pkgs/core/dbus/dbus.nm
index 1ea095b2e33317d5974db1f537813eb06622f326,b0cf158f40c40c94b2b17ff9eff75ca400577264..ba149e13fe50e1887d5bc4724b59610ec6b44615
--- 1/pkgs/core/dbus/dbus.nm
--- 2/pkgs/core/dbus/dbus.nm
+++ b/pkgs/core/dbus/dbus.nm
@@@ -42,12 -42,8 +42,12 @@@ define PKG_DESCRIPTIO
        per-user-login-session messaging facility.
  endef
  
- PKG_TARBALL    = $(THISAPP).tar.gz
+ PKG_TARBALL    = $(THISAPP).885483.tar.gz
  
 +PKG_PACKAGES  += $(PKG_NAME)-devel $(PKG_NAME)-libs
 +
 +PKG_FILES-$(PKG_NAME)-devel += /usr/lib/dbus-1.0
 +
  CONFIGURE_OPTIONS += \
        --sysconfdir=/etc \
        --localstatedir=/var \

diff --cc pkgs/core/fontconfig/fontconfig.nm
Simple merge

diff --cc pkgs/core/gcc/gcc.nm
index 0007b0a057544b9efc7cbf41d6e8714d1aaf95f6,14fe53c113a1fa1094e2753bad8d9c548c1471df..05bda5f866a951f97b656e5a0264c05230a47e69
--- 1/pkgs/core/gcc/gcc.nm
--- 2/pkgs/core/gcc/gcc.nm
+++ b/pkgs/core/gcc/gcc.nm
@@@ -53,40 -52,11 +53,40 @@@ els
        CONFIG_CPU = --with-cpu=$(TARGET_MACHINE) --with-arch=$(TARGET_MACHINE)
  endif
  
- PKG_TARBALL   += $(THISAPP).tar.bz2
+ PKG_TARBALL   += $(THISAPP).tar.gz
  
 -###############################################################################
 -# Installation Details
 -###############################################################################
 +# A package for C++
 +PKG_PACKAGES += $(PKG_NAME)-c++
 +PKG_DEPS-$(PKG_NAME)-c++ = gcc libstdc++-devel
 +define PKG_FILES-$(PKG_NAME)-c++
 +      /usr/bin/*++
 +      /usr/lib/gcc/*/*/cc1plus
 +      /usr/share/man/man*/*++*
 +endef
 +
 +# libgcc
 +PKG_PACKAGES += libgcc
 +define PKG_FILES-libgcc
 +      /usr/lib/libgcc*.so.*
 +endef
 +
 +PKG_PACKAGES += libgcc-devel
 +define PKG_FILES-libgcc-devel
 +      /usr/lib/libgcc*.so
 +endef
 +
 +# libstdc++
 +PKG_PACKAGES += libstdc++
 +define PKG_FILES-libstdc++
 +      /usr/lib/libstdc++*.so.*
 +endef
 +
 +PKG_PACKAGES += libstdc++-devel
 +define PKG_FILES-libstdc++-devel
 +      /usr/include/c++
 +      /usr/lib/libstdc++*.so
 +endef
 +
  
  define STAGE_PREPARE_CMDS
        -mkdir -v $(DIR_SRC)/gcc-build

diff --cc pkgs/core/glibc/glibc.nm
Simple merge

diff --cc pkgs/core/iptables/iptables.nm
Simple merge

diff --cc pkgs/core/libassuan/libassuan.nm
index 53a9b4b06271c98be72d3688fdd65803a61ef9eb,a8e5bb6c8bdc0d14c36346f19f0a2fb439d09f16..5eff57bd39e66541ce90aa8c0dc63239814d7151
--- 1/pkgs/core/libassuan/libassuan.nm
--- 2/pkgs/core/libassuan/libassuan.nm
+++ b/pkgs/core/libassuan/libassuan.nm
@@@ -46,9 -46,3 +46,12 @@@ define PKG_DESCRIPTIO
  endef
  
  PKG_TARBALL    = $(THISAPP).tar.bz2
++<<<<<<< HEAD
 +
 +PKG_PACKAGES  += $(PKG_NAME)-devel
 +
 +define STAGE_PREPARE_CMDS
 +      cd $(DIR_APP) && autoreconf --install
 +endef
++=======
++>>>>>>> x-fixes

diff --cc pkgs/core/libgcrypt/libgcrypt.nm
Simple merge

diff --cc pkgs/core/libgpg-error/libgpg-error.nm
Simple merge

diff --cc pkgs/core/libksba/libksba.nm
Simple merge

diff --cc pkgs/core/libssh2/libssh2.nm
Simple merge

diff --cc pkgs/core/pixman/pixman.nm
index 0eb5fa53b4a1943314a193150c8f389a977fb071,da92016c2ab6810a067c2182c76ad5519e5a4de6..e7a1e0f42bb931d6a28880e79ca5ba6355f649b8
--- 1/pkgs/core/pixman/pixman.nm
--- 2/pkgs/core/pixman/pixman.nm
+++ b/pkgs/core/pixman/pixman.nm
@@@ -40,10 -40,8 +40,10 @@@ define PKG_DESCRIPTIO
        Pixman is a pixel manipulation library for X and cairo.
  endef
  
- PKG_TARBALL    = $(THISAPP).tar.bz2
+ PKG_TARBALL    = $(THISAPP).tar.gz
  
 +PKG_PACKAGES  += $(PKG_NAME)-devel
 +
  # XXX double check this later on
  ifeq "$(TARGET)" "via-c7"
        CONFIGURE_OPTIONS += --enable-mmx #--enable-sse2

diff --cc pkgs/core/python/python.nm
Simple merge

diff --cc pkgs/core/sudo/sudo.nm
Simple merge

diff --cc pkgs/core/syslinux/syslinux.nm
Simple merge

diff --cc pkgs/core/vsftpd/vsftpd.nm
Simple merge