From josemi@freebsd.jazztel.es  Tue Jun 21 06:41:50 2005
Return-Path: <josemi@freebsd.jazztel.es>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 03B1616A41C
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 21 Jun 2005 06:41:50 +0000 (GMT)
	(envelope-from josemi@freebsd.jazztel.es)
Received: from 62-14-156-60.inversas.jazztel.es (62-14-156-60.inversas.jazztel.es [62.14.156.60])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DF3C943D4C
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 21 Jun 2005 06:41:48 +0000 (GMT)
	(envelope-from josemi@freebsd.jazztel.es)
Received: from redesjm.local (orion.redesjm.local [192.168.254.16])
	by 62-14-156-60.inversas.jazztel.es (8.13.3/8.13.3) with ESMTP id j5L6fYDY006060;
	Tue, 21 Jun 2005 08:41:34 +0200 (CEST)
	(envelope-from josemi@redesjm.local)
Received: (from josemi@localhost)
	by redesjm.local (8.13.3/8.13.3/Submit) id j5L6fYc6029852;
	Tue, 21 Jun 2005 08:41:34 +0200 (CEST)
	(envelope-from josemi)
Message-Id: <200506210641.j5L6fYc6029852@redesjm.local>
Date: Tue, 21 Jun 2005 08:41:34 +0200 (CEST)
From: Jose M Rodriguez <josemi@freebsd.jazztel.es>
Reply-To: Jose M Rodriguez <josemi@freebsd.jazztel.es>
To: FreeBSD-gnats-submit@freebsd.org
Cc: holger@e-gitt.net
Subject: [PATCH] update net/mldonkey to latest stable
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         82467
>Category:       ports
>Synopsis:       [PATCH] update net/mldonkey to latest stable
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 21 06:50:20 GMT 2005
>Closed-Date:    Fri Jun 24 07:39:26 GMT 2005
>Last-Modified:  Fri Jun 24 15:30:07 GMT 2005
>Originator:     Jose M Rodriguez
>Release:        FreeBSD 5.4-RELEASE-p2 i386
>Organization:
RedesJM
>Environment:
System: FreeBSD orion.redesjm.local 5.4-RELEASE-p2 FreeBSD 5.4-RELEASE-p2 #0: Thu Jun 9 17:54:55 CEST 2005 root@orion.redesjm.local:/usr/obj/usr/src/sys/ORION i386

>Description:
	Update net/mldonkey to the latest stable release
	and polite Makefile
>How-To-Repeat:
>Fix:

--- patch-mldonkey begins here ---
Index: Makefile
===================================================================
RCS file: /home/cvs/freebsd/ports/net/mldonkey/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile	9 Jan 2005 03:45:31 -0000	1.23
+++ Makefile	20 Jun 2005 19:51:38 -0000
@@ -6,28 +6,23 @@
 #
 
 PORTNAME=	mldonkey
-PORTVERSION=	2.5.23
+PORTVERSION=	2.5.28.1
 CATEGORIES+=	net
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${DOWNLOADVERSION}
-
-PATCH_SITES=	http://www.schraegerpunkt.de/
-PATCHFILES=	mldonkey-${DOWNLOADVERSION}-${PORTVERSION:C/.+\.//}.patch.gz
 
 MAINTAINER?=	holger@e-gitt.net
 COMMENT?=	A OCAML client for multiple peer-to-peer networks
 
-BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
-		autoconf213:${PORTSDIR}/devel/autoconf213
-
-DOWNLOADVERSION=2.5.22
+BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
 
-CONFLICTS=	mldonkey-devel-[0-9]* mldonkey-{core,gui}-devel-[0.9]*
+CONFLICTS=	mldonkey-devel-[0-9]*
 
+USE_BZIP2=	yes
+WANT_AUTOCONF_VER=	259
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-pthread --enable-ocamlver=3
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DOWNLOADVERSION}
 USE_GMAKE=	yes
 ALL_TARGET=	depend opt
 
@@ -38,9 +33,15 @@
 # have no 'without-' flag
 CONFIGURE_ARGS+=--disable-gui
 PLIST_SUB+=	CORE="" GUI="@comment " GUICORE="@comment "
+CONFLICTS+=	mldonkey-core-devel-[0.9]* mldonkey-core-stable-[0.9]* \
+		mldonkey-[0-9]*
 PKGNAMESUFFIX=	-core
 .else
 PLIST_SUB+=	GUI=""
+CONFLICTS+=	mldonkey-gui-devel-[0.9]*
+.if !defined(WITHOUT_CORE)
+CONFLICTS+=	mldonkey-[0-9]*
+.endif
 BUILD_DEPENDS+=	lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk \
 		${LOCALBASE}/lib/ocaml/jabbr.cma:${PORTSDIR}/net/ocaml-jabbr
 # we don't need lablgtk as RUN dependency, but we need gtk+glib
@@ -55,6 +56,8 @@
 
 DOCFILES=	Authors.txt Bugs.txt ChangeLog Developers.txt FAQ.html \
 		Install.txt Readme.txt Todo.txt ed2k_links.txt
+PORTDOCS=	${DOCFILES}
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .include <bsd.port.pre.mk>
 
@@ -70,6 +73,13 @@
 post-patch:
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
 		${WRKDIR}/wrapper.sh
+	${REINPLACE_CMD} -E \
+		-e 's|%%AUTOCONF%%|${AUTOCONF}|' \
+		${BUILD_WRKSRC}/config/Makefile.in
+	
+post-build:
+	@${SED} -e 's,%%DOCSDIR%%,${DOCSDIR},' \
+		< ${.CURDIR}/pkg-message > ${PKGMESSAGE}
 
 do-install:
 .ifndef(WITHOUT_CORE)
Index: distinfo
===================================================================
RCS file: /home/cvs/freebsd/ports/net/mldonkey/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo	19 Sep 2004 17:32:20 -0000	1.9
+++ distinfo	20 Jun 2005 16:24:05 -0000
@@ -1,4 +1,2 @@
-MD5 (mldonkey-2.5.22.tar.gz) = 958ffb63dbcfcb0f6e48788774dfbb42
-SIZE (mldonkey-2.5.22.tar.gz) = 3474104
-MD5 (mldonkey-2.5.22-23.patch.gz) = 091c77f0dd29be7443ac62e99cc41dc0
-SIZE (mldonkey-2.5.22-23.patch.gz) = 88210
+MD5 (mldonkey-2.5.28.1.tar.bz2) = 4f24b2e1eeac4b54151ca2473ade45ec
+SIZE (mldonkey-2.5.28.1.tar.bz2) = 2791684
Index: pkg-message
===================================================================
RCS file: /home/cvs/freebsd/ports/net/mldonkey/pkg-message,v
retrieving revision 1.3
diff -u -r1.3 pkg-message
--- pkg-message	15 Jun 2003 19:39:42 -0000	1.3
+++ pkg-message	20 Jun 2005 17:37:31 -0000
@@ -1,7 +1,7 @@
 	ATTENTIONATTENTION:
 
 - If you want to know how to use mldonkey, read "INSTALL" or
-  "FAQ.html" in the port docs (/usr/local/share/doc/mldonkey)
+  "FAQ.html" in the port docs (%%DOCSDIR%%)
 
 - It is not a bad idea to install mplayer. You will be able
   to preview half-downloaded files (if you have the beginning).
Index: pkg-plist
===================================================================
RCS file: /home/cvs/freebsd/ports/net/mldonkey/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- pkg-plist	18 Mar 2004 14:54:46 -0000	1.5
+++ pkg-plist	20 Jun 2005 19:53:52 -0000
@@ -7,13 +7,3 @@
 %%GUI%%bin/mlchat
 %%GUI%%bin/mlgui
 %%GUI%%bin/mlim
-%%PORTDOCS%%share/doc/mldonkey/Authors.txt
-%%PORTDOCS%%share/doc/mldonkey/Bugs.txt
-%%PORTDOCS%%share/doc/mldonkey/ChangeLog
-%%PORTDOCS%%share/doc/mldonkey/Developers.txt
-%%PORTDOCS%%share/doc/mldonkey/FAQ.html
-%%PORTDOCS%%share/doc/mldonkey/Install.txt
-%%PORTDOCS%%share/doc/mldonkey/Readme.txt
-%%PORTDOCS%%share/doc/mldonkey/Todo.txt
-%%PORTDOCS%%share/doc/mldonkey/ed2k_links.txt
-%%PORTDOCS%%@dirrm share/doc/mldonkey
Index: files/kill_mldonkey
===================================================================
RCS file: /home/cvs/freebsd/ports/net/mldonkey/files/kill_mldonkey,v
retrieving revision 1.1
diff -u -r1.1 kill_mldonkey
--- files/kill_mldonkey	26 Jan 2003 18:42:48 -0000	1.1
+++ files/kill_mldonkey	19 Jun 2005 20:50:22 -0000
@@ -1,4 +1,7 @@
+#!/bin/sh
 #
+# $FreeBSD$
+
 # Copyright (c) 2003
 # Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 # Holger Lamm <holger@e-gitt.net>
@@ -26,26 +29,26 @@
 # SUCH DAMAGE.
 #
 
-#!/bin/sh
-
 #
 # Add Username and password here
 # like this:
 #
-HTTPUSER="you"
-HTTPPASS="yourpassword"
-
-# Add location and port of mldonkey core
-HTTPURL="127.0.0.1:4080"
+#MLNETUSER="admin"
+#MLNETPASS=""
+#MLNETHOST="127.0.0.1"
+#MLNETPORT="4080"
 
 # internal configuration
 HTTP_COMMAND="/usr/bin/fetch"
-HTTP_COMMAND_ARGS="-1 -q -s"
+HTTP_COMMAND_ARGS="-1 -q -s -o /dev/null"
 
-if [ -n "${HTTPUSER}" -a -n "${HTTPPASS}" ]
-then
-	export HTTP_AUTH=basic:*:${HTTPUSER}:${HTTPPASS}
+if [ -n "${MLNETPASS}" ]; then
+	export HTTP_AUTH=basic:*:${MLNETUSER:-admin}:${MLNETPASS}
 fi
 
-${HTTP_COMMAND} ${HTTP_COMMAND_ARGS} "http://${HTTPURL}/submit?q=kill"
+exec > /dev/null 2>&1
+
+${HTTP_COMMAND} ${HTTP_COMMAND_ARGS} \
+	"http://${MLNETHOST:-127.0.0.1}:${MLNETPORT:-4080}/submit?q=kill" \
+	2>&1 > /dev/null
 
--- patch-mldonkey ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: pav 
State-Changed-When: Wed Jun 22 11:35:31 GMT 2005 
State-Changed-Why:  
Asked maintainer for approval 


Responsible-Changed-From-To: freebsd-ports-bugs->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Wed Jun 22 11:35:31 GMT 2005 
Responsible-Changed-Why:  
Track 

http://www.freebsd.org/cgi/query-pr.cgi?pr=82467 

From: Pav Lucistnik <pav@FreeBSD.org>
To: holger@e-gitt.net, bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/82467: [PATCH] update net/mldonkey to latest stable
Date: Wed, 22 Jun 2005 13:35:27 +0200

 Dear maintainer of FreeBSD port net/mldonkey, please take a look at
 
 http://www.freebsd.org/cgi/query-pr.cgi?q=82467
 
 Do you approve this update?
 
 -- 
 Pav Lucistnik <pav@oook.cz>
               <pav@FreeBSD.org>
 
 Like 'Do Notte Buye Betamacks.' That was a prediction for 1972.

From: Holger Lamm <holger@e-gitt.net>
To: bug-followup@FreeBSD.org,  josemi@freebsd.jazztel.es
Cc:  
Subject: Re: ports/82467: [PATCH] update net/mldonkey to latest stable
Date: Thu, 23 Jun 2005 22:39:35 +0200

 This is a multi-part message in MIME format.
 --------------070509070109040204020301
 Content-Type: text/plain; charset=us-ascii; format=flowed
 Content-Transfer-Encoding: 7bit
 
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
 OK;
 I also got this startup script contibuted by Herve Quiroz hg@freebsd.org
 to be included in the next update.
 This patch is in addition to the one above.
 
 Regards,
 Holger
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.5 (GNU/Linux)
 Comment: Using GnuPG with Debian - http://enigmail.mozdev.org
 
 iD8DBQFCux4GgdO/JOxNDBQRAke3AKCSYEiqNR5CBQ1z/4C5ojLKS+adfwCgjklV
 NJ4Kbo8Vg6zxlWrZx3EdVGw=
 =PZPg
 -----END PGP SIGNATURE-----
 
 --------------070509070109040204020301
 Content-Type: text/plain;
  name="patch2-mldonkey"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="patch2-mldonkey"
 
 diff -Nur ./Makefile ../mldonkey/Makefile
 --- ./Makefile	Thu Jun 23 22:20:48 2005
 +++ ../mldonkey/Makefile	Thu Jun 23 22:12:42 2005
 @@ -86,6 +86,7 @@
  	@${INSTALL_PROGRAM} ${WRKSRC}/mlnet		${PREFIX}/bin/mlnet-real
  	@${INSTALL_SCRIPT} ${FILESDIR}/kill_mldonkey	${PREFIX}/bin
  	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh		${PREFIX}/bin/mlnet
 +	@${INSTALL_SCRIPT} ${WRKDIR}/mlnet.sh		${PREFIX}/etc/rc.d
  .endif
  .ifndef(WITHOUT_GUI)
  	@${INSTALL_PROGRAM} ${WRKSRC}/mlchat		${PREFIX}/bin
 diff -Nur ./files/mlnet.sh ../mldonkey/files/mlnet.sh
 --- ./files/mlnet.sh	Thu Jan  1 01:00:00 1970
 +++ ../mldonkey/files/mlnet.sh	Thu Jun 23 22:38:19 2005
 @@ -0,0 +1,61 @@
 +#!/bin/sh
 +# $FreeBSD$
 +
 +# PROVIDE: mlnet
 +# REQUIRE: LOGIN
 +# KEYWORD: FreeBSD shutdown
 +
 +mlnet_enable=${mlnet_enable:-"NO"}
 +mlnet_http_port=${mlnet_http_port:-"4080"}
 +mlnet_logfile=${mlnet_logfile:-"/var/log/mlnet"}
 +
 +. /etc/rc.subr
 +
 +name=mlnet
 +rcvar=`set_rcvar`
 +command="/usr/local/bin/${name}"
 +start_cmd="${name}_start"
 +stop_cmd="${name}_stop"
 +
 +mlnet_conf="/usr/local/etc/mlnet.conf"
 +required_files="${mlnet_conf}"
 +mlnet_user=${mlnet_user:-"mlnet"}
 +
 +if [ -r ${mlnet_conf} ] ; then
 +	. ${mlnet_conf}
 +fi
 +
 +mlnet_url="http://"
 +if [ -n "${mlnet_http_user}" -a -n "${mlnet_http_password}" ] ; then
 +	mlnet_url="${mlnet_url}${mlnet_http_user}:${mlnet_http_password}@"
 +fi
 +mlnet_url="${mlnet_url}localhost:${mlnet_http_port}"
 +
 +mlnet_start() {
 +	if checkyesno mlnet_enable ; then
 +		echo -n " mlnet"
 +		su ${mlnet_user} -c "${command} \
 +			${mlnet_flags} \
 +			-daemon \
 +			-http_port ${mlnet_http_port}" \
 +			>>${mlnet_logfile} 2>&1
 +	fi
 +}
 +
 +mlnet_stop() {
 +	if checkyesno mlnet_enable ; then
 +		echo -n " mlnet"
 +		/usr/local/bin/wget --spider -q \
 +			"${mlnet_url}/submit?q=close_fds" \
 +			>>${mlnet_logfile} 2>&1
 +		/usr/local/bin/wget --spider -q \
 +			"${mlnet_url}/submit?q=save" \
 +			>>${mlnet_logfile} 2>&1
 +		/usr/local/bin/wget --spider -q \
 +			"${mlnet_url}/submit?q=kill" \
 +			>>${mlnet_logfile} 2>&1
 +	fi
 +}
 +
 +load_rc_config ${name}
 +run_rc_command "$1"
 diff -Nur ./pkg-plist ../mldonkey/pkg-plist
 --- ./pkg-plist	Thu Jun 23 22:20:48 2005
 +++ ../mldonkey/pkg-plist	Thu Jun 23 22:13:03 2005
 @@ -1,6 +1,7 @@
  %%CORE%%bin/kill_mldonkey
  %%CORE%%bin/mlnet
  %%CORE%%bin/mlnet-real
 +%%CORE%%etc/rc.d/mlnet.sh
  %%GUICORE%%bin/mlguistarter
  %%GUICORE%%bin/mldonkey_previewer
  %%GUICORE%%bin/mlnet+gui
 
 --------------070509070109040204020301--

From: Jose M Rodriguez <josemi@freebsd.jazztel.es>
To: Holger Lamm <holger@e-gitt.net>
Cc: bug-followup@FreeBSD.org, josemi@freebsd.jazztel.es
Subject: Re: ports/82467: [PATCH] update net/mldonkey to latest stable
Date: Fri, 24 Jun 2005 09:19:37 +0200

 El Jueves, 23 de Junio de 2005 22:39, Holger Lamm escribi=F3:
 > OK;
 > I also got this startup script contibuted by Herve Quiroz
 > hg@freebsd.org to be included in the next update.
 > This patch is in addition to the one above.
 >
 > Regards,
 > Holger
 
 I'm not sure this is the right thing.  This script doesn't use std. rcNG=20
 defs and constructs.
 
 =2D-
   josemi
State-Changed-From-To: feedback->closed 
State-Changed-By: pav 
State-Changed-When: Fri Jun 24 07:39:19 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=82467 

From: Jose M Rodriguez <josemi@freebsd.jazztel.es>
To: bug-followup@FreeBSD.org
Cc: pav@FreeBSD.org, holger@e-gitt.net
Subject: Re: ports/82467: [PATCH] update net/mldonkey to latest stable
Date: Fri, 24 Jun 2005 17:23:50 +0200

 --Boundary-00=_HWCvCcKvp9j9fgb
 Content-Type: text/plain;
   charset="us-ascii"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 Hi,
 
 I spend some time trying to improve kill_mldonkey / mlnet.sh scripts.  I 
 think those versions are homogeneous and more closer to rcNG std.
 
 I don't change from wget to fetch by default on mlnet.sh.  But i thing I 
 like that.
 
 Allthough I know there'are problems with fetch as used, it's in the base 
 system.  I don't like make mldonkey-core run depends on wget by 
 mlnet.sh
 
 Also, found code in distrib Tools using netcat (nc) and the telnet port.  
 If any interest, this can be also tried.  We have nc in the base 
 system.
 
 --
   josemi
 
 --Boundary-00=_HWCvCcKvp9j9fgb
 Content-Type: text/x-diff;
   charset="us-ascii";
   name="patch-mldonkey"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
 	filename="patch-mldonkey"
 
 Index: files/kill_mldonkey
 ===================================================================
 RCS file: /home/cvs/freebsd/ports/net/mldonkey/files/kill_mldonkey,v
 retrieving revision 1.2
 diff -u -r1.2 kill_mldonkey
 --- files/kill_mldonkey	24 Jun 2005 07:39:10 -0000	1.2
 +++ files/kill_mldonkey	24 Jun 2005 15:06:03 -0000
 @@ -48,7 +48,10 @@
  
  exec > /dev/null 2>&1
  
 -${HTTP_COMMAND} ${HTTP_COMMAND_ARGS} \
 -	"http://${MLNETHOST:-127.0.0.1}:${MLNETPORT:-4080}/submit?q=kill" \
 -	2>&1 > /dev/null
  
 +${HTTP_COMMAND} ${HTTP_COMMAND_ARGS} \
 +	"http://${MLNETHOST:=127.0.0.1}:${MLNETPORT:=4080}/submit?q=close_fds"
 +${HTTP_COMMAND} ${HTTP_COMMAND_ARGS} \
 +	"http://${MLNETHOST:=127.0.0.1}:${MLNETPORT:=4080}/submit?q=save"
 +${HTTP_COMMAND} ${HTTP_COMMAND_ARGS} \
 +	"http://${MLNETHOST:=127.0.0.1}:${MLNETPORT:=4080}/submit?q=kill"
 Index: files/mlnet.sh
 ===================================================================
 RCS file: /home/cvs/freebsd/ports/net/mldonkey/files/mlnet.sh,v
 retrieving revision 1.1
 diff -u -r1.1 mlnet.sh
 --- files/mlnet.sh	24 Jun 2005 07:39:10 -0000	1.1
 +++ files/mlnet.sh	24 Jun 2005 15:10:11 -0000
 @@ -5,10 +5,6 @@
  # REQUIRE: LOGIN
  # KEYWORD: FreeBSD shutdown
  
 -mlnet_enable=${mlnet_enable:-"NO"}
 -mlnet_http_port=${mlnet_http_port:-"4080"}
 -mlnet_logfile=${mlnet_logfile:-"/var/log/mlnet"}
 -
  . %%RC_SUBR%%
  
  name=mlnet
 @@ -17,19 +13,14 @@
  start_cmd="${name}_start"
  stop_cmd="${name}_stop"
  
 -mlnet_conf="%%PREFIX%%/etc/mlnet.conf"
 -required_files="${mlnet_conf}"
 -mlnet_user=${mlnet_user:-"mlnet"}
 -
 -if [ -r ${mlnet_conf} ] ; then
 -	. ${mlnet_conf}
 -fi
 -
 -mlnet_url="http://"
 -if [ -n "${mlnet_http_user}" -a -n "${mlnet_http_password}" ] ; then
 -	mlnet_url="${mlnet_url}${mlnet_http_user}:${mlnet_http_password}@"
 -fi
 -mlnet_url="${mlnet_url}localhost:${mlnet_http_port}"
 +mlnet_enable="NO"
 +mlnet_http_port="4080"
 +mlnet_logfile="/var/log/mlnet"
 +mlnet_user="mlnet"
 +mlnet_http_command="%%LOCALBASE%%/bin/wget"
 +mlnet_http_command_args="--spider -q"
 +#mlnet_http_command="/usr/bin/fetch"
 +#lnet_http_command_args="-1 -q -s -o /dev/null"
  
  mlnet_start() {
  	if checkyesno mlnet_enable ; then
 @@ -44,14 +35,20 @@
  
  mlnet_stop() {
  	if checkyesno mlnet_enable ; then
 +		mlnet_url="http://"
 +		if [ -n "${mlnet_http_password}" ]; then
 +			mlnet_url="${mlnet_url}${mlnet_http_user:-admin}"
 +			mlnet_url="${mlnet_url}:${mlnet_http_password}@"
 +		fi
 +		mlnet_url="${mlnet_url}localhost:${mlnet_http_port}"
  		echo -n " mlnet"
 -		%%LOCALBASE%%/bin/wget --spider -q \
 +		${mlnet_http_command} ${mlnet_http_command_args} \
  			"${mlnet_url}/submit?q=close_fds" \
  			>>${mlnet_logfile} 2>&1
 -		%%LOCALBASE%%/bin/wget --spider -q \
 +		${mlnet_http_command} ${mlnet_http_command_args} \
  			"${mlnet_url}/submit?q=save" \
  			>>${mlnet_logfile} 2>&1
 -		%%LOCALBASE%%/bin/wget --spider -q \
 +		${mlnet_http_command} ${mlnet_http_command_args} \
  			"${mlnet_url}/submit?q=kill" \
  			>>${mlnet_logfile} 2>&1
  	fi
 
 --Boundary-00=_HWCvCcKvp9j9fgb--
>Unformatted:
