[SM-Commit] GIT changes to master grimoire by Mathieu Lonjaret (646345beb9b84da98df26185253738257163c66c)

Mathieu Lonjaret scm at mail.sourcemage.org
Fri Sep 22 18:10:08 EDT 2006


GIT changes to master grimoire by Mathieu Lonjaret <lejatorn at sourcemage.org>:

 ftp/gtk-gnutella/BUILD     |   26 +++++++++++++++++++-------
 ftp/gtk-gnutella/CONFIGURE |    4 +++-
 ftp/gtk-gnutella/DEPENDS   |    3 ++-
 ftp/gtk-gnutella/HISTORY   |    4 ++++
 4 files changed, 28 insertions(+), 9 deletions(-)

New commits:
commit 646345beb9b84da98df26185253738257163c66c
Author: Mathieu Lonjaret <lejatorn at sourcemage.org>
Commit: Mathieu Lonjaret <lejatorn at sourcemage.org>

    gtk-gnutella: working on bug 13130

diff --git a/ftp/gtk-gnutella/BUILD b/ftp/gtk-gnutella/BUILD
index 976ba19..01e0730 100755
--- a/ftp/gtk-gnutella/BUILD
+++ b/ftp/gtk-gnutella/BUILD
@@ -1,8 +1,20 @@
-./Configure -d -e -r -s -O            \
- -Dprefix=${INSTALL_ROOT}/usr         \
- -Dsysconfdir=${INSTALL_ROOT}/etc     \
- -Dlocalstatedir=${INSTALL_ROOT}/var  \
- -Dcc=/usr/bin/gcc                    \
- -Dd_nls=undef                        \
- $OPTS                               &&
+if [ "$GNUTELLA_GTK_IP6" == "y" ]; then
+  OPTS="-D ipv6='true' ${OPTS}"
+else
+  OPTS="-D ipv6='false' ${OPTS}"
+fi                                          &&
+
+if [ "$GNUTELLA_GTK_RMTCTRL" == "y" ]; then
+  OPTS="-D remotectrl='true' ${OPTS}"
+else
+  OPTS="-D remotectrl='false' ${OPTS}"
+fi                                          &&
+
+./Configure -d -e -r -s -O                  \
+ -Dprefix=${INSTALL_ROOT}/usr               \
+ -Dsysconfdir=${INSTALL_ROOT}/etc           \
+ -Dlocalstatedir=${INSTALL_ROOT}/var        \
+ -Dcc=/usr/bin/gcc                          \
+ -Dd_nls=undef                              \
+ $OPTS                                      &&
 make
diff --git a/ftp/gtk-gnutella/CONFIGURE b/ftp/gtk-gnutella/CONFIGURE
index 97a5f72..d7035d0 100755
--- a/ftp/gtk-gnutella/CONFIGURE
+++ b/ftp/gtk-gnutella/CONFIGURE
@@ -1,3 +1,5 @@
 message  "${MESSAGE_COLOR}GTK+2 interface is slower${DEFAULT_COLOR}"  &&
 config_query_list  GNUTELLA_GTK  "Which gtk+ interface do you want?"  \
-                   1.x  2.x
+                   1.x  2.x                                           &&
+config_query GNUTELLA_GTK_IP6 "Use IPv6?" y                           &&
+config_query GNUTELLA_GTK_RMTCTRL "Experimental remote control?" n 
diff --git a/ftp/gtk-gnutella/DEPENDS b/ftp/gtk-gnutella/DEPENDS
index d2b0388..9ce07e1 100755
--- a/ftp/gtk-gnutella/DEPENDS
+++ b/ftp/gtk-gnutella/DEPENDS
@@ -1,4 +1,5 @@
-depends libxml2 &&
+depends libxml2                                            &&
+optional_depends "dbus" "-D dbus='true'" "-D dbus='false'" &&
 if  [  "$GNUTELLA_GTK"  =  "1.x"  ];  then
   depends  gtk+   "-Dgtkversion=1"
 else
diff --git a/ftp/gtk-gnutella/HISTORY b/ftp/gtk-gnutella/HISTORY
index 97a1339..6b440ae 100644
--- a/ftp/gtk-gnutella/HISTORY
+++ b/ftp/gtk-gnutella/HISTORY
@@ -1,3 +1,7 @@
+2006-09-23 Mathieu Lonjaret <lejatorn at sourcemage.org>
+	* BUILD, CONFIGURE, DEPENDS: working on bug #13130 (adding configure
+	* choices).
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2.
 



More information about the SM-Commit mailing list