Pullup ticket #2708 - requested by:

mldonkey: security update
mldonkey-gui: security update

Revisions pulled up:
- net/mldonkey/Makefile				1.46-1.48
- net/mldonkey/Makefile.common			1.34-1.36
- net/mldonkey/distinfo				1.46-1.48
- net/mldonkey-gui/Makefile			1.27
---
Module Name:	pkgsrc
Committed By:	wiz
Date:		Sat Jan 24 12:59:28 UTC 2009

Modified Files:
	pkgsrc/net/mldonkey: Makefile.common distinfo

Log Message:
Update to 2.9.7:

2009/01/20: version 2.9.7 = tag release-2-9-7
6727: Web_infos: Replace old GeoIP URL with new one
- old code added the new URL, even if GeoIP was not present in web_infos

2009/01/04
6714: BT: Fix bug when computing limits for max_bt_uploaders
6713: GeoIP: New web_infos URL for country list (thx to Choby)
- old URLs are updated to:
  http://www.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz

2008/12/13
6689: Allow compilation with Ocaml 3.11.0

2008/09/01
6629: Mail: Move hostname from subject to body (eydaimon)
Updated Mozilla protocol handler to version 2.5
- original source from http://www.informatik.uni-oldenburg.de/~dyna/mldonkey
6628: IP discover: Use http://whatismyip.org, old URL is not working anymore
---
Module Name:	pkgsrc
Committed By:	wiz
Date:		Mon Feb 16 13:11:41 UTC 2009

Modified Files:
	pkgsrc/net/mldonkey: Makefile Makefile.common
	pkgsrc/net/mldonkey-gui: Makefile

Log Message:
Convert to user-destdir.
---
Module Name:	pkgsrc
Committed By:	wiz
Date:		Tue Feb 24 22:50:45 UTC 2009

Modified Files:
	pkgsrc/net/mldonkey: Makefile distinfo
Added Files:
	pkgsrc/net/mldonkey/patches: patch-aa

Log Message:
Add patch fixing security problem from upstream.

Bump PKGREVISION.
---
Module Name:	pkgsrc
Committed By:	wiz
Date:		Wed Feb 25 23:39:37 UTC 2009

Modified Files:
	pkgsrc/net/mldonkey: Makefile Makefile.common distinfo
Removed Files:
	pkgsrc/net/mldonkey/patches: patch-aa

Log Message:
Update to 3.0.0:

2009/02/24: version 3.0.0 = tag release-3-0-0
6754: Fix local file access bug in internal http server
- this is an urgent security related bug-fix and effects
  all MLDonkey versions >= 2.8.4
6752: Optimized implementation of the ip_set module (cbah)
6736: Add/fix some copyright texts

4 files changed, 23 insertions, 16 deletions

diff --git a/net/mldonkey-gui/Makefile b/net/mldonkey-gui/Makefile
index ec937d7f127..bb60983054d 100644
--- a/net/mldonkey-gui/Makefile
+++ b/net/mldonkey-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2008/08/12 17:09:01 wiz Exp $
+# $NetBSD: Makefile,v 1.26.6.1 2009/02/26 14:03:28 tron Exp $
 #
 
 .include "../../net/mldonkey/Makefile.common"
@@ -18,11 +18,13 @@ INSTALLATION_DIRS=	bin
 .include "options.mk"
 
 do-install:
-	${RM} -f ${PREFIX}/bin/mlgui
-	cd ${PREFIX}/bin && ${LN} -s ../libexec/mldonkey/mlgui mlgui
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/mldonkey
-	${INSTALL_PROGRAM} ${WRKSRC}/mlgui ${PREFIX}/libexec/mldonkey
-	${INSTALL_PROGRAM} ${WRKSRC}/mlguistarter ${PREFIX}/libexec/mldonkey
-	${INSTALL_PROGRAM} ${WRKSRC}/mlnet+gui ${PREFIX}/libexec/mldonkey
+	${RM} -f ${DESTDIR}${PREFIX}/bin/mlgui
+	cd ${DESTDIR}${PREFIX}/bin && ${LN} -s ../libexec/mldonkey/mlgui mlgui
+	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/libexec/mldonkey
+	${INSTALL_PROGRAM} ${WRKSRC}/mlgui ${DESTDIR}${PREFIX}/libexec/mldonkey
+	${INSTALL_PROGRAM} ${WRKSRC}/mlguistarter \
+		${DESTDIR}${PREFIX}/libexec/mldonkey
+	${INSTALL_PROGRAM} ${WRKSRC}/mlnet+gui \
+		${DESTDIR}${PREFIX}/libexec/mldonkey
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index 6b1d3d3c722..c316ceb6375 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2007/07/04 20:54:50 jlam Exp $
+# $NetBSD: Makefile,v 1.45.16.1 2009/02/26 14:03:28 tron Exp $
 #
 
 .include "Makefile.common"
@@ -10,6 +10,8 @@ PKG_USERS_VARS+=	MLDONKEY_USER
 
 BUILD_DEFS+=		MLDONKEY_HOME VARBASE
 
+INSTALLATION_DIRS=	libexec/mldonkey
+
 OWN_DIRS_PERMS=		${MLDONKEY_HOME} ${MLDONKEY_USER} ${MLDONKEY_GROUP} 0700
 OWN_DIRS_PERMS+=	${VARBASE}/log/mldonkey \
 			${MLDONKEY_USER} ${MLDONKEY_GROUP} 0700
@@ -28,8 +30,7 @@ FILES_SUBST+=		MLDONKEY_HOME=${MLDONKEY_HOME:Q}
 FILES_SUBST+=		MLDONKEY_USER=${MLDONKEY_USER:Q}
 
 do-install:
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/mldonkey
-	${INSTALL_PROGRAM} ${WRKSRC}/mlnet ${PREFIX}/libexec/mldonkey
+	${INSTALL_PROGRAM} ${WRKSRC}/mlnet ${DESTDIR}${PREFIX}/libexec/mldonkey
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/mldonkey/Makefile.common b/net/mldonkey/Makefile.common
index 1eeec4cced5..32ceda4796d 100644
--- a/net/mldonkey/Makefile.common
+++ b/net/mldonkey/Makefile.common
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile.common,v 1.33 2008/08/12 17:09:01 wiz Exp $
+# $NetBSD: Makefile.common,v 1.33.6.1 2009/02/26 14:03:28 tron Exp $
 #
+# used by net/mldonkey/Makefile
+# used by net/mldonkey-gui/Makefile
 
-DISTNAME=	mldonkey-2.9.6
+DISTNAME=	mldonkey-3.0.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mldonkey/}
 EXTRACT_SUFX=	.tar.bz2
@@ -17,6 +19,8 @@ GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake perl
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFIGURE_ENV+=		WGET=""
 CONFIGURE_ENV+=		ac_cv_prog_WGET="no"
 CONFIGURE_ARGS+=	--enable-directconnect
diff --git a/net/mldonkey/distinfo b/net/mldonkey/distinfo
index 5a5b07a824b..2738ce1915d 100644
--- a/net/mldonkey/distinfo
+++ b/net/mldonkey/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.45 2008/08/12 17:09:01 wiz Exp $
+$NetBSD: distinfo,v 1.45.6.1 2009/02/26 14:03:28 tron Exp $
 
-SHA1 (mldonkey-2.9.6.tar.bz2) = 3c52b11e906aa08d1c4132e3bb23756d447f20f9
-RMD160 (mldonkey-2.9.6.tar.bz2) = f88ca0224e484be67d836038683bcf5c2bb5bac6
-Size (mldonkey-2.9.6.tar.bz2) = 2718844 bytes
+SHA1 (mldonkey-3.0.0.tar.bz2) = 8d3f1808578bb145655050c0224f512afe0266b5
+RMD160 (mldonkey-3.0.0.tar.bz2) = c53efda6b513bbfd2dcd71804600b0906252e463
+Size (mldonkey-3.0.0.tar.bz2) = 2723830 bytes