sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

From: Perforce Review Daemon <p4review AT smee.org>
To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Mathieu Lonjaret" <lejatorn AT sourcemage.org>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 79601 by Treeve Jelbert for review
Date: Sun, 21 May 2006 12:50:01 +0100 (BST)

Change 79601 by treeve_jelbert@treeve-knowhow on 2006/05/21 12:47:58

mldonkey-2.7.6

Affected files ...

... //sgl/grimoires/devel/ftp/mldonkey/BUILD#2 edit
... //sgl/grimoires/devel/ftp/mldonkey/CONFIGURE#2 edit
... //sgl/grimoires/devel/ftp/mldonkey/DEPENDS#3 edit
... //sgl/grimoires/devel/ftp/mldonkey/DETAILS#6 edit
... //sgl/grimoires/devel/ftp/mldonkey/HISTORY#8 edit

Differences ...

==== //sgl/grimoires/devel/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/devel/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/devel/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/devel/ftp/mldonkey/DETAILS#6 (xtext) ====

@@ -1,14 +1,13 @@
SPELL=mldonkey
- VERSION=2.7.4
+ VERSION=2.7.6
+
SOURCE_HASH=sha512:8d1ebc3c82715e4a38739e198e54941c1af2284a5a8ea03864c8a0edd499176ea0697221fbcf1c62b3136066b45b26563723a266b33711995b68298921f055a4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
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:8d972e48f06e75b9d9773adfc1b51055c64d41fe
KEYWORDS="ftp"
SHORT="MLdonkey is p2p application for the edonkey2000"
cat << EOF

==== //sgl/grimoires/devel/ftp/mldonkey/HISTORY#8 (text) ====

@@ -1,3 +1,13 @@
+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

[SM-Commit] PERFORCE change 79601 by Treeve Jelbert for review, Perforce Review Daemon, 05/21/2006