From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Dec 30 17:50:30 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B536D16A4CE for ; Thu, 30 Dec 2004 17:50:30 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE88A43D4C for ; Thu, 30 Dec 2004 17:50:29 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id iBUHoSGd088804 for ; Thu, 30 Dec 2004 17:50:28 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id iBUHoST7088803; Thu, 30 Dec 2004 17:50:28 GMT (envelope-from gnats) Resent-Date: Thu, 30 Dec 2004 17:50:28 GMT Resent-Message-Id: <200412301750.iBUHoST7088803@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Mario Sergio Fujikawa Ferreira Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 09AD816A4CF for ; Thu, 30 Dec 2004 17:40:29 +0000 (GMT) Received: from vette.gigo.com (vette.gigo.com [216.218.228.114]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7C2C743D49 for ; Thu, 30 Dec 2004 17:40:28 +0000 (GMT) (envelope-from lioux@uol.com.br) Received: from 200.181.89.39 (200-181-089-039.pvoce205.dial.brasiltelecom.net.br [200.181.89.39]) by vette.gigo.com (Postfix) with ESMTP id 646DA546C for ; Thu, 30 Dec 2004 09:40:27 -0800 (PST) Received: (qmail 53097 invoked by uid 1001); 30 Dec 2004 17:40:15 -0000 Message-Id: <20041230174015.53054.qmail@exxodus.fedaykin.here> Date: 30 Dec 2004 17:40:15 -0000 From: Mario Sergio Fujikawa Ferreira To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: pav@FreeBSD.org cc: Holger Lamm Subject: ports/75664: Create net/mldonkey-{,core-,gui-}devel ports from net/mldonkey{,-core,-gui} X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Mario Sergio Fujikawa Ferreira List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Dec 2004 17:50:30 -0000 >Number: 75664 >Category: ports >Synopsis: Create net/mldonkey-{,core-,gui-}devel ports from net/mldonkey{,-core,-gui} >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Dec 30 17:50:28 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Mario Sergio Fujikawa Ferreira >Release: FreeBSD 5.3-STABLE i386 >Organization: >Environment: System: FreeBSD home.home.net 5.3-STABLE FreeBSD 5.3-STABLE #0: Tue Dec 28 13:38:16 BRST 2004 lioux@home:/usr/obj/usr/src/sys/LIOUX i386 n.a. >Description: The current mldonkey version available in the net/mldonkey port is not the one currently advised by the developers. They have been advising users to run the the development versions. However, it has been a long standing FreeBSD ports tradition to provide stable versions per default and; optionaly, development versions. Therefore, I would like to create development (-devel) versions of our current mldonkey ports. This addition requires the following repo copies: net/mldonkey -> net/mldonkey-devel net/mldonkey-core -> net/mldonkey-core-devel net/mldonkey-gui -> net/mldonkey-gui-devel Patches are supplied to be applied after the repo copies: net/mldonkey -> patch-mldonkey net/mldonkey-devel -> patch-mldonkey-devel net/mldonkey-core-devel -> patch-mldonkey-core-devel net/mldonkey-gui-devel -> patch-mldonkey-gui-devel I kept the previous MAINTAINER in the Makefiles. However, I do not mind maintaining these development versions if that is okay with the maintainer. I do understand, however, that it might be easier for the current maintainer to keep them all together. :) This should be at his discretion. >How-To-Repeat: Repo copy then apply the attached patches. >Fix: In case the patches break when attached, grab a copy at http://people.FreeBSD.org/~lioux/patch-mldonkey-devel.tbz MD5 (patch-mldonkey-devel.tbz) = e21b01786a1715a5e1aa2f1aee5798b2 diff -ruN /usr/ports/net/mldonkey/Makefile mldonkey/Makefile --- /usr/ports/net/mldonkey/Makefile Tue Oct 26 07:50:22 2004 +++ mldonkey/Makefile Thu Dec 30 15:25:20 2004 @@ -23,6 +23,8 @@ DOWNLOADVERSION=2.5.22 +CONFLICTS= mldonkey-devel-[0-9]* mldonkey-{core,gui}-devel-[0.9]* + GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-pthread --enable-ocamlver=3 WRKSRC= ${WRKDIR}/${PORTNAME}-${DOWNLOADVERSION} diff -ruN /usr/ports/net/mldonkey/Makefile mldonkey-devel/Makefile --- /usr/ports/net/mldonkey/Makefile Tue Oct 26 07:50:22 2004 +++ mldonkey-devel/Makefile Thu Dec 30 15:26:09 2004 @@ -6,28 +6,41 @@ # PORTNAME= mldonkey -PORTVERSION= 2.5.23 +PORTVERSION= 2.5.28.h CATEGORIES+= net -MASTER_SITES= ${MASTER_SITE_SAVANNAH} -MASTER_SITE_SUBDIR= ${PORTNAME} +#MASTER_SITES= ${MASTER_SITE_SAVANNAH} +#MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= http://download.berlios.de/pub/mldonkey/spiralvoice/cvs/ +PKGNAMESUFFIX= -devel DISTNAME= ${PORTNAME}-${DOWNLOADVERSION} -PATCH_SITES= http://www.schraegerpunkt.de/ -PATCHFILES= mldonkey-${DOWNLOADVERSION}-${PORTVERSION:C/.+\.//}.patch.gz +PATCH_SITES= http://download.berlios.de/pub/mldonkey/spiralvoice/patchpacks/ +PATCHFILES= patch_pack${PORTVERSION:C/^.\..\.(.)/\1/:C/\.//}.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 +BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml -DOWNLOADVERSION=2.5.22 +DOWNLOADVERSION=${PORTVERSION:R} +NO_LATEST_LINK= yes +CONFLICTS= mldonkey-[0-9]* mldonkey-{core,gui}-[0.9]* + +USE_BZIP2= yes +USE_AUTOCONF_VER= 213 +USE_REINPLACE= yes GNU_CONFIGURE= yes +USE_GMAKE= yes +ALL_TARGET= opt + CONFIGURE_ARGS= --enable-pthread --enable-ocamlver=3 +CONFIGURE_WRKSRC= ${WRKSRC}/config WRKSRC= ${WRKDIR}/${PORTNAME}-${DOWNLOADVERSION} -USE_GMAKE= yes -ALL_TARGET= depend opt + +# XXX +# filetp is known to be broken on version 2.5.28* and prior +CONFIGURE_ARGS+= --disable-filetp .if defined(WITHOUT_GUI) .if defined(WITHOUT_CORE) @@ -36,7 +49,7 @@ # have no 'without-' flag CONFIGURE_ARGS+=--disable-gui PLIST_SUB+= CORE="" GUI="@comment " GUICORE="@comment " -PKGNAMESUFFIX= -core +PKGNAMESUFFIX= -core-devel .else PLIST_SUB+= GUI="" BUILD_DEPENDS+= lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk \ @@ -44,7 +57,7 @@ # we don't need lablgtk as RUN dependency, but we need gtk+glib USE_GNOME= gtk12 .if defined(WITHOUT_CORE) -PKGNAMESUFFIX= -gui +PKGNAMESUFFIX= -gui-devel PLIST_SUB+= CORE="@comment " GUICORE="@comment " .else PLIST_SUB+= CORE="" GUICORE="" @@ -53,6 +66,7 @@ DOCFILES= Authors.txt Bugs.txt ChangeLog Developers.txt FAQ.html \ Install.txt Readme.txt Todo.txt ed2k_links.txt +PORTDOCS= ${DOCFILES} .include @@ -62,12 +76,12 @@ @${ECHO_MSG} "You can disable the CORE by defining WITHOUT_CORE." .endif -pre-configure: - @cd ${WRKSRC}/config && ${AUTOCONF} - post-patch: @${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \ ${WRKDIR}/wrapper.sh + @${REINPLACE_CMD} -E \ + -e 's|%%AUTOCONF%%|${AUTOCONF}|' \ + ${BUILD_WRKSRC}/${MAKEFILE} do-install: .ifndef(WITHOUT_CORE) diff -ruN /usr/ports/net/mldonkey/distinfo mldonkey-devel/distinfo --- /usr/ports/net/mldonkey/distinfo Mon Sep 20 08:49:16 2004 +++ mldonkey-devel/distinfo Thu Dec 30 14:18:11 2004 @@ -1,4 +1,4 @@ -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.tar.bz2) = bee2811a76f83c543ca19e45a9d04ff4 +SIZE (mldonkey-2.5.28.tar.bz2) = 2767585 +MD5 (patch_pack28h.gz) = 28b3977cff499f8fc9f9b5713ebbf9c8 +SIZE (patch_pack28h.gz) = 57739 diff -ruN /usr/ports/net/mldonkey/files/patch-Makefile mldonkey-devel/files/patch-Makefile --- /usr/ports/net/mldonkey/files/patch-Makefile Sun Sep 19 14:31:58 2004 +++ mldonkey-devel/files/patch-Makefile Thu Dec 30 14:25:40 2004 @@ -5,7 +5,7 @@ config/configure: config/configure.in - cd config; autoconf -+ cd config; autoconf213 ++ cd config; %%AUTOCONF%% ifeq ("$(MYCONFIG_ARGS_DEFINED)" , "yes") diff -ruN /usr/ports/net/mldonkey/pkg-descr mldonkey-devel/pkg-descr --- /usr/ports/net/mldonkey/pkg-descr Mon Nov 15 23:19:47 2004 +++ mldonkey-devel/pkg-descr Thu Dec 30 15:24:23 2004 @@ -5,13 +5,15 @@ a GTK GUI. The following protocols are supported: -- eDonkey (http://www.edonkey2000.com/) -- Overnet (http://www.overnet.com/) -- Bittorrent (http://bitconjurer.org/BitTorrent/) -- Gnutella (http://www.gnutella.org/) -- Gnutella2 (http://www.shareaza.com/) -- Soulseek (http://www.slsk.org/) -- Direct-Connect (http://www.neo-modus.com/) -- Opennap (http://opennap.sourceforge.net/) +- eDonkey (http://www.edonkey2000.com/) +- Overnet (http://www.overnet.com/) +- Bittorrent (http://bitconjurer.org/BitTorrent/) +- Gnutella (http://www.gnutella.org/) +- Gnutella2 (http://www.shareaza.com/) +- Fasttrack +- Soulseek (http://www.slsk.org/) +- Direct-Connect (http://www.neo-modus.com/) +- Opennap (http://opennap.sourceforge.net/) +- Kademlia WWW: http://www.nongnu.org/mldonkey/ diff -ruN /usr/ports/net/mldonkey/pkg-plist mldonkey-devel/pkg-plist --- /usr/ports/net/mldonkey/pkg-plist Wed Jul 28 21:37:35 2004 +++ mldonkey-devel/pkg-plist Thu Dec 30 15:11:52 2004 @@ -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 diff -ruN /usr/ports/net/mldonkey-core/Makefile mldonkey-core-devel/Makefile --- /usr/ports/net/mldonkey-core/Makefile Sun Jun 15 16:57:46 2003 +++ mldonkey-core-devel/Makefile Thu Dec 30 15:26:03 2004 @@ -10,6 +10,6 @@ COMMENT= Client 'core' for the MLDonkey peer-to-peer network -MASTERDIR= ${.CURDIR}/../mldonkey +MASTERDIR= ${.CURDIR}/../mldonkey-devel .include "${MASTERDIR}/Makefile" diff -ruN /usr/ports/net/mldonkey-gui/Makefile mldonkey-gui-devel/Makefile --- /usr/ports/net/mldonkey-gui/Makefile Wed Jul 28 21:37:35 2004 +++ mldonkey-gui-devel/Makefile Thu Dec 30 15:26:14 2004 @@ -12,6 +12,6 @@ COMMENT= A OCAML/GTK GUI for the MLdonkey peer-to-peer network client -MASTERDIR= ${.CURDIR}/../mldonkey +MASTERDIR= ${.CURDIR}/../mldonkey-devel .include "${MASTERDIR}/Makefile" >Release-Note: >Audit-Trail: >Unformatted: