From owner-freebsd-ports@FreeBSD.ORG Sun Jun 19 20:08:48 2005 Return-Path: X-Original-To: freebsd-ports@freebsd.org Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F3EBD16A41C; Sun, 19 Jun 2005 20:08:47 +0000 (GMT) (envelope-from josemi@freebsd.jazztel.es) Received: from 62-15-207-214.inversas.jazztel.es (62-15-207-214.inversas.jazztel.es [62.15.207.214]) by mx1.FreeBSD.org (Postfix) with ESMTP id 450E643D1D; Sun, 19 Jun 2005 20:08:46 +0000 (GMT) (envelope-from josemi@freebsd.jazztel.es) Received: from redesjm.local (orion.redesjm.local [192.168.254.16]) by 62-15-207-214.inversas.jazztel.es (8.13.3/8.13.3) with ESMTP id j5JK8WJV000931; Sun, 19 Jun 2005 22:08:32 +0200 (CEST) (envelope-from josemi@redesjm.local) Received: from localhost (localhost [[UNIX: localhost]]) by redesjm.local (8.13.3/8.13.3/Submit) id j5JK8VhO000950; Sun, 19 Jun 2005 22:08:31 +0200 (CEST) (envelope-from josemi@redesjm.local) From: Jose M Rodriguez To: freebsd-ports@freebsd.org Date: Sun, 19 Jun 2005 22:08:30 +0200 User-Agent: KMail/1.8 References: <200506191436.21704.josemi@redesjm.local> In-Reply-To: <200506191436.21704.josemi@redesjm.local> MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_/CdtC+B6zc57bMD" Message-Id: <200506192208.31532.josemi@redesjm.local> X-AntiVirus: checked by AntiVir Milter (version: 1.1.0-3; AVE: 6.30.0.15; VDF: 6.30.0.207; host: antares.redesjm.local) Cc: ports@freebsd.org, holger@e-gitt.net, Jose M Rodriguez , lioux@freebsd.org Subject: Re: About a mldonkey stable core port X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jun 2005 20:08:48 -0000 --Boundary-00=_/CdtC+B6zc57bMD Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline El Domingo, 19 de Junio de 2005 14:36, Jose M Rodriguez escribi=F3: > Hi, > > Trying to setup a local mldonkey agent, I found a little problem with > the actual mldonkey ports. > ... New port is in ports/82424. Only need a little correction to=20 kill_mldonkey (default mlnet user is 'admin', not 'Admin'). Attached CONFLICTS patches to mldonkey ports. Also think that the fixes=20 to kill_mldonkey may be imported. =2D- josemi --Boundary-00=_/CdtC+B6zc57bMD Content-Type: text/x-diff; charset="iso-8859-1"; name="patch-mldonkey" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-mldonkey" 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 19 Jun 2005 15:51:13 -0000 @@ -23,7 +23,7 @@ DOWNLOADVERSION=2.5.22 -CONFLICTS= mldonkey-devel-[0-9]* mldonkey-{core,gui}-devel-[0.9]* +CONFLICTS= mldonkey-devel-[0-9]* GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-pthread --enable-ocamlver=3 @@ -38,9 +38,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 --Boundary-00=_/CdtC+B6zc57bMD Content-Type: text/x-diff; charset="iso-8859-1"; name="patch-mldonkey-devel" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-mldonkey-devel" Index: Makefile =================================================================== RCS file: /home/cvs/freebsd/ports/net/mldonkey-devel/Makefile,v retrieving revision 1.43 diff -u -r1.43 Makefile --- Makefile 12 Jun 2005 18:38:43 -0000 1.43 +++ Makefile 19 Jun 2005 15:52:28 -0000 @@ -24,7 +24,7 @@ DOWNLOADVERSION=2.5.30.16 NO_LATEST_LINK= yes -CONFLICTS= mldonkey-[0-9]* mldonkey-{core,gui}-[0.9]* +CONFLICTS= mldonkey-[0-9]* USE_BZIP2= yes USE_ICONV= yes @@ -56,9 +56,15 @@ CONFIGURE_ARGS+=--disable-gui \ --disable-gd PLIST_SUB+= CORE="" GUI="@comment " GUICORE="@comment " +CONFLICTS+= mldonkey-core-[0.9]* mldonkey-core-stable-[0.9]* \ + mldonkey-devel-[0-9]* PKGNAMESUFFIX= -core-devel .else PLIST_SUB+= GUI="" +CONFLICTS+= mldonkey-gui-[0.9]* +.if !defined(WITHOUT_CORE) +CONFLICTS+= mldonkey-devel-[0-9]* +.endif BUILD_DEPENDS+= lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk \ ${LOCALBASE}/lib/ocaml/jabbr.cma:${PORTSDIR}/net/ocaml-jabbr LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd --Boundary-00=_/CdtC+B6zc57bMD--