From owner-freebsd-ports@FreeBSD.ORG Mon Dec 29 23:04:06 2008 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AF204106566B for ; Mon, 29 Dec 2008 23:04:06 +0000 (UTC) (envelope-from tingox@gmail.com) Received: from mail-bw0-f19.google.com (mail-bw0-f19.google.com [209.85.218.19]) by mx1.freebsd.org (Postfix) with ESMTP id 074D68FC1C for ; Mon, 29 Dec 2008 23:04:05 +0000 (UTC) (envelope-from tingox@gmail.com) Received: by bwz12 with SMTP id 12so13451566bwz.19 for ; Mon, 29 Dec 2008 15:04:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:in-reply-to:mime-version:content-type :content-transfer-encoding:content-disposition:references; bh=ckH9A3dX7ZaeBQPtzsHbHlPztVEZeAGkFUkbm7vPO9s=; b=mgc8ZxjZgVBPoykRyPmg/u0hPOiBzIdus/a8eh7nIumxJGKVNE7q2XUyRmGnLbJ0Hk mivE5/ah5ZN0YYrAbz8fWF5VGmVsFEocQaEVCTQhpd/U5/mF3T1eeo6pwUoo/b3agQxp 8oegJx1b/oPobVskFfVnpSlMQG1mGoIerNtNo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:in-reply-to:mime-version :content-type:content-transfer-encoding:content-disposition :references; b=O01qAJYlBYU/hxMOtVHoR3EM/xhFjZvhoRIuY8530TJQNybBSHQPpoWsmynDyQxxvG X6xQtm5bxwIgW2yg0Mmpri7rMLAGxFrEO+Lc1WdCoYzKqo1RFnu7ciJ188G7YjicuUIs GDIr7NTWDeznwU52OEqFT08MOiJ6pVtepFkKc= Received: by 10.223.114.208 with SMTP id f16mr10242296faq.91.1230591843968; Mon, 29 Dec 2008 15:04:03 -0800 (PST) Received: by 10.223.115.202 with HTTP; Mon, 29 Dec 2008 15:04:03 -0800 (PST) Message-ID: Date: Tue, 30 Dec 2008 00:04:03 +0100 From: "Torfinn Ingolfsen" To: freebsd-ports@freebsd.org In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: Subject: Re: aMule 22.3 porting - some questions 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: Mon, 29 Dec 2008 23:04:06 -0000 Another question: how do I create a diff that removes one of the files in amule2/files? I tried diff -u amule2.org/files/patch-amuleDlg.cpp /dev/null >> amule2.diff And the diff looks ok: --- amule2.org/files/patch-amuleDlg.cpp 2006-01-04 06:59:25.000000000 +0100 +++ /dev/null 2008-12-29 23:22:00.000000000 +0100 @@ -1,24 +0,0 @@ ---- src/amuleDlg.cpp.orig Sun Jan 1 06:17:25 2006 -+++ src/amuleDlg.cpp Tue Jan 3 19:12:04 2006 -@@ -413,9 +413,9 @@ - { - wxString msg = wxT(" "); - #ifdef CLIENT_GUI -- msg << _("aMule remote control ") << wxT(VERSION); -+ msg << _("aMule remote control ") << wxT(VERSION) << wxT(" for FreeBSD"); - #else -- msg << wxT("aMule ") << wxT(VERSION); -+ msg << wxT("aMule ") << wxT(VERSION) << wxT(" for FreeBSD"); - #endif - msg << wxT(" "); - #ifdef CVSDATE -@@ -425,7 +425,8 @@ - " 'All-Platform' p2p client based on eMule \n\n" - " Website: http://www.amule.org \n" - " Forum: http://forum.amule.org \n" -- " FAQ: http://wiki.amule.org \n\n" -+ " FAQ: http://wiki.amule.org \n" -+ " FreeBSD port: http://contribs.martymac.com \n\n" - " Contact: admin@amule.org (administrative issues) \n" - " Copyright (C) 2003-2006 aMule Team \n\n" - " Part of aMule is based on \n" But when I try to apply it, patch rejects it. -- Regards, Torfinn Ingolfsen