>Number: 82467
>Category: ports
>Synopsis: [PATCH] update net/mldonkey to latest stable
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Jun 21 06:50:20 GMT 2005
>Closed-Date:
>Last-Modified:
>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 at 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 at 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 @@
ATTENTIONATTENTION:
- 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 at FreeBSD.org>
# Holger Lamm <holger at 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:
>Unformatted: