Hello, On Tue, Dec 30, 2008 at 6:55 PM, Dmitry Marakasov <[email protected]> wrote: > But I assume what you need is -r option for diff - it compares 2 > directories recursively, processing all changes as well as new and > removed files correctly.
I actually tried with the -r option to diff after sending mail to this list. But it seems like -r on it's own isn't enough, I also need patch with the -E argument. I created the attached patch with diff -ruN ... when I try patch without '-E': r...@kg-vm# patch -C -p1 < /home/tingo/work/amule/amule2-3.diff Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN amule2.org/Makefile amule2/Makefile |--- amule2.org/Makefile 2008-08-21 08:18:04.000000000 +0200 |+++ amule2/Makefile 2008-12-29 21:18:08.000000000 +0100 -------------------------- Patching file Makefile using Plan A... Hunk #1 succeeded at 6. Hunk #2 succeeded at 45 (offset 1 line). Hunk #3 succeeded at 121 (offset 1 line). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN amule2.org/Makefile.man amule2/Makefile.man |--- amule2.org/Makefile.man 2006-01-04 06:59:25.000000000 +0100 |+++ amule2/Makefile.man 2008-12-29 20:51:00.000000000 +0100 -------------------------- Patching file Makefile.man using Plan A... Hunk #1 succeeded at 1. Hunk #2 succeeded at 20. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN amule2.org/distinfo amule2/distinfo |--- amule2.org/distinfo 2007-01-12 18:18:48.000000000 +0100 |+++ amule2/distinfo 2008-12-29 20:43:48.000000000 +0100 -------------------------- Patching file distinfo using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN amule2.org/files/patch-amuleDlg.cpp amule2/files/patch-amuleDlg.cpp |--- amule2.org/files/patch-amuleDlg.cpp 2006-01-04 06:59:25.000000000 +0100 |+++ amule2/files/patch-amuleDlg.cpp 1970-01-01 01:00:00.000000000 +0100 -------------------------- Patching file files/patch-amuleDlg.cpp using Plan A... Hunk #1 failed at 0. 1 out of 1 hunks failed--saving rejects to files/patch-amuleDlg.cpp.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN amule2.org/pkg-plist amule2/pkg-plist |--- amule2.org/pkg-plist 2007-10-25 01:36:24.000000000 +0200 |+++ amule2/pkg-plist 2008-12-29 22:24:25.000000000 +0100 -------------------------- Patching file pkg-plist using Plan A... Hunk #1 succeeded at 39. done Looks like it doesn't remove the file. Next try - now with '-E': r...@kg-vm# patch -C -Ep1 < /home/tingo/work/amule/amule2-3.diff Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN amule2.org/Makefile amule2/Makefile |--- amule2.org/Makefile 2008-08-21 08:18:04.000000000 +0200 |+++ amule2/Makefile 2008-12-29 21:18:08.000000000 +0100 -------------------------- Patching file Makefile using Plan A... Hunk #1 succeeded at 6. Hunk #2 succeeded at 45 (offset 1 line). Hunk #3 succeeded at 121 (offset 1 line). Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN amule2.org/Makefile.man amule2/Makefile.man |--- amule2.org/Makefile.man 2006-01-04 06:59:25.000000000 +0100 |+++ amule2/Makefile.man 2008-12-29 20:51:00.000000000 +0100 -------------------------- Patching file Makefile.man using Plan A... Hunk #1 succeeded at 1. Hunk #2 succeeded at 20. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN amule2.org/distinfo amule2/distinfo |--- amule2.org/distinfo 2007-01-12 18:18:48.000000000 +0100 |+++ amule2/distinfo 2008-12-29 20:43:48.000000000 +0100 -------------------------- Patching file distinfo using Plan A... Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN amule2.org/files/patch-amuleDlg.cpp amule2/files/patch-amuleDlg.cpp |--- amule2.org/files/patch-amuleDlg.cpp 2006-01-04 06:59:25.000000000 +0100 |+++ amule2/files/patch-amuleDlg.cpp 1970-01-01 01:00:00.000000000 +0100 -------------------------- Patching file files/patch-amuleDlg.cpp using Plan A... Hunk #1 failed at 0. Removing files/patch-amuleDlg.cpp (empty after patching). 1 out of 1 hunks failed--saving rejects to files/patch-amuleDlg.cpp.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ruN amule2.org/pkg-plist amule2/pkg-plist |--- amule2.org/pkg-plist 2007-10-25 01:36:24.000000000 +0200 |+++ amule2/pkg-plist 2008-12-29 22:24:25.000000000 +0100 -------------------------- Patching file pkg-plist using Plan A... Hunk #1 succeeded at 39. done It stills says "hunk failed" but now it removes the empty file. So this is good then? Thanks for your feedback, helpful as always. -- Regards, Torfinn Ingolfsen
diff -ruN amule2.org/Makefile amule2/Makefile --- amule2.org/Makefile 2008-08-21 08:18:04.000000000 +0200 +++ amule2/Makefile 2008-12-29 21:18:08.000000000 +0100 @@ -6,18 +6,17 @@ # PORTNAME= aMule -PORTVERSION= 2.1.3 -PORTREVISION= 7 +PORTVERSION= 2.2.3 CATEGORIES= net-p2p MASTER_SITES= SF/amule -PATCH_SITES= http://cvs.pld-linux.org/cgi-bin/cvsweb/SOURCES/ -PATCHFILES= aMule-wx.patch?rev=1.2 -PATCH_DIST_STRIP= -p1 - MAINTAINER= [email protected] COMMENT= The all-platform eMule p2p client +BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \ + ${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp +LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl + LATEST_LINK= aMule2 CONFLICTS= aMule-1.* aMule-devel-[0-9]* ed2k-hash-* @@ -45,6 +44,11 @@ AMULEDAEMON "Compile aMule daemon version - EXPERIMENTAL" off \ WXUNICODE "Enable Unicode support" on +DOCSDIR= ${PREFIX}/share/doc/aMule-${PORTVERSION} +PORTDOCS= docs/AUTHORS docs/COPYING docs/Changelog docs/Doxyfile docs/EC_Protocol.txt \ + docs/ED2K-Links.HOWTO docs/INSTALL docs/README* docs/Releases.dia docs/TODO \ + docs/amule-win32.HOWTO.txt docs/amulesig.txt docs/license.txt docs/socks4.protocol + .include <bsd.port.pre.mk> .if !defined(WITHOUT_NLS) @@ -116,24 +120,9 @@ # Man pages management .include "Makefile.man" -post-install: -# fr manpages are still incomplete and can't be managed -# by MANLANG. Will be done when pages are complete. -.if defined(WITH_AMULECMD) - ${GZIP_CMD} ${PREFIX}/man/fr/man1/amulecmd.1 -.endif -.if defined(WITH_AMULEWEBSRV) - ${GZIP_CMD} ${PREFIX}/man/fr/man1/amuleweb.1 -.endif - ${GZIP_CMD} ${PREFIX}/man/fr/man1/amule.1 -.if defined(WITH_AMULEDAEMON) - ${GZIP_CMD} ${PREFIX}/man/fr/man1/amuled.1 -.endif -.if defined(WITH_ED2K) - ${GZIP_CMD} ${PREFIX}/man/fr/man1/ed2k.1 -.endif -.if defined(WITH_ALC) - ${GZIP_CMD} ${PREFIX}/man/fr/man1/alcc.1 -.endif +post-patch: +# remove some bashisms +# ${REINPLACE_CMD} -e '/if test/ s|==|=|' ${WRKSRC}/configure +# ${REINPLACE_CMD} -e '/if test/ s|==|=|' ${WRKSRC}/automake/manpages.am .include <bsd.port.post.mk> diff -ruN amule2.org/Makefile.man amule2/Makefile.man --- amule2.org/Makefile.man 2006-01-04 06:59:25.000000000 +0100 +++ amule2/Makefile.man 2008-12-29 20:51:00.000000000 +0100 @@ -1,12 +1,12 @@ # TODO : Add fr here when pages are complete -MANLANG= "" de es hu +MANLANG= "" MANCOMPRESSED= no .if defined(WITH_CAS) -MAN1+= cas.1 -MAN1+= wxcas.1 +MAN1_EN+= cas.1 +MAN1_EN+= wxcas.1 .endif .if defined(WITH_ALC) -MAN1+= alc.1 +MAN1_EN+= alc.1 MAN1+= alcc.1 .endif .if defined(WITH_AMULEWEBSRV) @@ -20,6 +20,7 @@ .endif .if defined(WITH_AMULEDAEMON) MAN1+= amuled.1 +MAN1_EN+= amulegui.1 .endif MAN1+= amule.1 -MAN1+= xas.1 +MAN1_EN+= xas.1 diff -ruN amule2.org/distinfo amule2/distinfo --- amule2.org/distinfo 2007-01-12 18:18:48.000000000 +0100 +++ amule2/distinfo 2008-12-29 20:43:48.000000000 +0100 @@ -1,6 +1,3 @@ -MD5 (aMule-2.1.3.tar.bz2) = 0aafdd159edb8ad5f0064da87998b47d -SHA256 (aMule-2.1.3.tar.bz2) = 6e97e947bb7ac231b75e3b21a509a2ec0239bcd7e9dbfc6062c520a6d13b0244 -SIZE (aMule-2.1.3.tar.bz2) = 3248530 -MD5 (aMule-wx.patch?rev=1.2) = 7b61651b0abdee7dc577a03dad8025c1 -SHA256 (aMule-wx.patch?rev=1.2) = c0c0a55fb437fdf618137f2cb0c5ff59a1595aeddf5455a1bad2b2ab11b0a244 -SIZE (aMule-wx.patch?rev=1.2) = 4943 +MD5 (aMule-2.2.3.tar.bz2) = 64a0d41edbdd7cf36fa892e45a652bfd +SHA256 (aMule-2.2.3.tar.bz2) = 8886215ae8b3aef74875cd1ace551109324649d1d353db6b0c1ac785f48dc44a +SIZE (aMule-2.2.3.tar.bz2) = 4666001 diff -ruN amule2.org/files/patch-amuleDlg.cpp amule2/files/patch-amuleDlg.cpp --- amule2.org/files/patch-amuleDlg.cpp 2006-01-04 06:59:25.000000000 +0100 +++ amule2/files/patch-amuleDlg.cpp 1970-01-01 01:00: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: [email protected] (administrative issues) \n" - " Copyright (C) 2003-2006 aMule Team \n\n" - " Part of aMule is based on \n" diff -ruN amule2.org/pkg-plist amule2/pkg-plist --- amule2.org/pkg-plist 2007-10-25 01:36:24.000000000 +0200 +++ amule2/pkg-plist 2008-12-29 22:24:25.000000000 +0100 @@ -39,20 +39,6 @@ @dirrmtry share/locale/it_CH @dirrmtry share/locale/ko_KR/LC_MESSAGES @dirrmtry share/locale/ko_KR -share/doc/aMule-2.1.3/ABOUT-NLS -share/doc/aMule-2.1.3/amulesig.txt -share/doc/aMule-2.1.3/amule-win32.HOWTO.txt -share/doc/aMule-2.1.3/Changelog -share/doc/aMule-2.1.3/Doxyfile -share/doc/aMule-2.1.3/ED2K-Links.HOWTO -share/doc/aMule-2.1.3/INSTALL -share/doc/aMule-2.1.3/license.txt -share/doc/aMule-2.1.3/README -share/doc/aMule-2.1.3/TODO -share/doc/aMule-2.1.3/EC_Protocol.txt -share/doc/aMule-2.1.3/socks4.protocol -...@dirrmtry share/doc/aMule-2.1.3 -...@dirrmtry share/doc %%PL_CAS%%share/cas/tmp.html %%PL_CAS%%share/cas/stat.png %%pl_ca...@dirrmtry share/cas
_______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "[email protected]"
