[Lunar-commits] <moonbase> fixes

[Samuel Verstraete]

commit b2d0643cd97aaf622a471fffcea882b7a282f334
Author: Samuel Verstraete <elangelo at lunar-linux.org>
Date:   Tue May 12 13:35:57 2009 +0200

    fixes
---
 devel/binutils/BUILD            |   10 +++++-----
 devel/binutils/DETAILS          |    2 +-
 gnome2/desktop/libsoup/DEPENDS  |    2 ++
 xfce4/core/Thunar/BUILD         |    2 +-
 xfce4/core/exo/BUILD            |   14 ++++++++++++++
 xfce4/core/libxfcegui4/BUILD    |    2 +-
 xfce4/core/xfce4-settings/BUILD |   14 ++++++++++++++
 xfce4/core/xfconf/BUILD         |   14 ++++++++++++++
 8 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/devel/binutils/BUILD b/devel/binutils/BUILD
index 3a1ccd0..b01a5de 100644
--- a/devel/binutils/BUILD
+++ b/devel/binutils/BUILD
@@ -1,13 +1,13 @@
 (
 
-  patch_it $SOURCE_CACHE/$SOURCE2 0 &&
+#  patch_it $SOURCE_CACHE/$SOURCE2 0 &&
 
   #Somehow I believe this might/should be logged as a bug to the glibc guys...
-  sedit 's/^all: all-redirect/all: all-redirect $(MKDOC)/' \
-                    bfd/doc/Makefile.in  &&
+#  sedit 's/^all: all-redirect/all: all-redirect $(MKDOC)/' \
+#                    bfd/doc/Makefile.in  &&
 
-  aclocal  &&
-  autoconf &&
+#  aclocal  &&
+#  autoconf &&
 
   OPTS+=" --host=$BUILD"     &&
   default_config             &&
diff --git a/devel/binutils/DETAILS b/devel/binutils/DETAILS
index 2641824..4a49cab 100644
--- a/devel/binutils/DETAILS
+++ b/devel/binutils/DETAILS
@@ -1,7 +1,7 @@
           MODULE=binutils
          VERSION=2.19
           SOURCE=$MODULE-$VERSION.tar.bz2
-         SOURCE2=binutils-2.18-makeinfo.patch
+         #SOURCE2=binutils-2.18-makeinfo.patch
    SOURCE_URL[0]=$GNU_URL/$MODULE/
    SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/$MODULE/
      SOURCE2_URL=$PATCH_URL
diff --git a/gnome2/desktop/libsoup/DEPENDS b/gnome2/desktop/libsoup/DEPENDS
index bbda9c7..40dfa40 100644
--- a/gnome2/desktop/libsoup/DEPENDS
+++ b/gnome2/desktop/libsoup/DEPENDS
@@ -2,3 +2,5 @@ depends  glib-2
 depends  gnutls
 depends  sqlite
 depends  libproxy
+
+optional_depends GConf "" "--without-gnome" "gnome support"
diff --git a/xfce4/core/Thunar/BUILD b/xfce4/core/Thunar/BUILD
index 12e8e69..15f96e8 100644
--- a/xfce4/core/Thunar/BUILD
+++ b/xfce4/core/Thunar/BUILD
@@ -4,7 +4,7 @@
    # make sure proper PKG_CONFIG_PATH is set
    export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
-   ./configure  --build=$BUILD                                        \
+   ./autogen.sh --build=$BUILD                                        \
                 --prefix=${MODULE_PREFIX}        \
                 $OPTS                                           &&
 
diff --git a/xfce4/core/exo/BUILD b/xfce4/core/exo/BUILD
new file mode 100644
index 0000000..5ca1695
--- /dev/null
+++ b/xfce4/core/exo/BUILD
@@ -0,0 +1,14 @@
+(
+   [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
+   # make sure proper PKG_CONFIG_PATH is set
+   export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+
+   ./autogen.sh --build=$BUILD                                        \
+                --prefix=${MODULE_PREFIX}        \
+                --enable-xinerama                                \
+                $OPTS                                           &&
+
+   default_make
+
+) > $C_FIFO 2>&1
diff --git a/xfce4/core/libxfcegui4/BUILD b/xfce4/core/libxfcegui4/BUILD
index b695eac..5ca1695 100644
--- a/xfce4/core/libxfcegui4/BUILD
+++ b/xfce4/core/libxfcegui4/BUILD
@@ -4,7 +4,7 @@
    # make sure proper PKG_CONFIG_PATH is set
    export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
-   ./configure  --build=$BUILD                                        \
+   ./autogen.sh --build=$BUILD                                        \
                 --prefix=${MODULE_PREFIX}        \
                 --enable-xinerama                                \
                 $OPTS                                           &&
diff --git a/xfce4/core/xfce4-settings/BUILD b/xfce4/core/xfce4-settings/BUILD
new file mode 100644
index 0000000..5ca1695
--- /dev/null
+++ b/xfce4/core/xfce4-settings/BUILD
@@ -0,0 +1,14 @@
+(
+   [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
+   # make sure proper PKG_CONFIG_PATH is set
+   export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+
+   ./autogen.sh --build=$BUILD                                        \
+                --prefix=${MODULE_PREFIX}        \
+                --enable-xinerama                                \
+                $OPTS                                           &&
+
+   default_make
+
+) > $C_FIFO 2>&1
diff --git a/xfce4/core/xfconf/BUILD b/xfce4/core/xfconf/BUILD
new file mode 100644
index 0000000..5ca1695
--- /dev/null
+++ b/xfce4/core/xfconf/BUILD
@@ -0,0 +1,14 @@
+(
+   [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
+   # make sure proper PKG_CONFIG_PATH is set
+   export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
+
+   ./autogen.sh --build=$BUILD                                        \
+                --prefix=${MODULE_PREFIX}        \
+                --enable-xinerama                                \
+                $OPTS                                           &&
+
+   default_make
+
+) > $C_FIFO 2>&1