Date: Tue, 30 Dec 2008 00:04:03 +0100 From: "Torfinn Ingolfsen" <tingox@gmail.com> To: freebsd-ports@freebsd.org Subject: Re: aMule 22.3 porting - some questions Message-ID: <ef8c8a880812291504g1daa00d5o5de7bfd27fa20765@mail.gmail.com> In-Reply-To: <ef8c8a880812291349g5fd986ebwe970f3ed040ba2fb@mail.gmail.com> References: <ef8c8a880812291349g5fd986ebwe970f3ed040ba2fb@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ef8c8a880812291504g1daa00d5o5de7bfd27fa20765>