[SM-Commit] PERFORCE change 79602 by Treeve Jelbert for review

Perforce Review Daemon p4review at smee.org
Sun May 21 07:50:01 EDT 2006


Change 79602 by treeve_jelbert at treeve-knowhow on 2006/05/21 12:48:41

	mldonkey-2.7.6

Affected files ...

... //sgl/grimoires/test/ftp/mldonkey/BUILD#2 integrate
... //sgl/grimoires/test/ftp/mldonkey/CONFIGURE#2 integrate
... //sgl/grimoires/test/ftp/mldonkey/DEPENDS#3 integrate
... //sgl/grimoires/test/ftp/mldonkey/DETAILS#5 integrate
... //sgl/grimoires/test/ftp/mldonkey/HISTORY#7 integrate

Differences ...

==== //sgl/grimoires/test/ftp/mldonkey/BUILD#2 (xtext) ====

@@ -1,12 +1,5 @@
-
-  case  $ONLY  in
-      y|Y)  OPTS="$OPTS --disable-multinet" ;;
-  esac  &&
-  ./configure --prefix=${INSTALL_ROOT}/usr  \
-              --sysconfdir=${INSTALL_ROOT}/etc  \
-              --localstatedir=${INSTALL_ROOT}/var  \
-              --mandir=${INSTALL_ROOT}/usr/share/man   \
-              --infodir=${INSTALL_ROOT}/usr/share/info  \
-              $OPTS  &&
-  make depend        &&
-  make opt           
+OPTS="--disable-multinet ${OPTS}" &&
+for NN in $ML_NET; do
+  OPTS="${OPTS} --enable-${NN}"
+done                              &&
+default_build

==== //sgl/grimoires/test/ftp/mldonkey/CONFIGURE#2 (xtext) ====

@@ -1,7 +1,4 @@
-if  !  grep  -q  "ONLY"  $SPELL_CONFIG;  then
-  if    query  "Disable other (non-ed2k) networks?" n
-  then  ONLY=y
-  else  ONLY=n
-  fi
-  echo  "ONLY=$ONLY"  >>  $SPELL_CONFIG
-fi
+source $GRIMOIRE/config_query_multi.function      &&
+config_query_list   ML_GUI    "which GUI?" none gtk2 gtk    &&
+config_query_multi  ML_NET    "which networks?" \
+                               donkey donkeysui bittorrent filetp gnutella gnutella2 fasttrack 

==== //sgl/grimoires/test/ftp/mldonkey/DEPENDS#3 (xtext) ====

@@ -1,4 +1,15 @@
+depends  g++   &&
 depends  zlib  &&
 depends  m4    &&
 depends  ocaml &&
-optional_depends lablgtk "" "--disable-gui" "for GUI"
+optional_depends gd "" "" "graphical support" &&
+case $ML_GUI in
+	none)
+	  ;;
+	gtk)
+	  depends lablgtk "--enable-gui=newgui1"
+          ;;
+	gtk2)
+	  depends lablgtk2 "--enable-gui=newgui2"
+          ;;
+esac           

==== //sgl/grimoires/test/ftp/mldonkey/DETAILS#5 (xtext) ====

@@ -1,14 +1,13 @@
            SPELL=mldonkey
-         VERSION=2.6.3
+         VERSION=2.7.6
+     SOURCE_HASH=sha512:8d1ebc3c82715e4a38739e198e54941c1af2284a5a8ea03864c8a0edd499176ea0697221fbcf1c62b3136066b45b26563723a266b33711995b68298921f055a4
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://savannah.nongnu.org/download/$SPELL/$SOURCE
+   SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
         WEB_SITE=http://www.mldonkey.org/
          ENTERED=20040325
-         UPDATED=20040325
       LICENSE[0]=GPL
        BUILD_API=2
-          SOURCE_HASH=sha1:ccb05db78ea2e8422146e5afcf431223ab987d05
         KEYWORDS="ftp"
            SHORT="MLdonkey is p2p application for the edonkey2000"
 cat << EOF

==== //sgl/grimoires/test/ftp/mldonkey/HISTORY#7 (text) ====

@@ -1,3 +1,16 @@
+2006-05-21 Treeve Jelbert <treeve01 at pi.be
+	* DETAILS: version 2.7.6
+	* CONFIGURE BUILD: use persistent variables
+	  allow cheice of gui and network support
+	* BUILD: use default_build
+          build optional features
+	* DEPENDS: add g++ 
+	  optional gd
+	  allow choice of gui
+
+2006-03-27 Bearcat M. Sandor <Sorcerer at thedragonsedge.com>
+     * DETAILS: Updated to 2.7.4
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 



More information about the SM-Commit mailing list