log files 8.2-RELEASE/amd64 https://redports.org/~fidaj/20120311082946-69966-15316/cairo-dock-plugins-2.3.0.3_3.log 8.2-RELEASE/i386 https://redports.org/~fidaj/20120311082946-69966-15317/cairo-dock-plugins-2.3.0.3_3.log 9.0-RELEASE/amd64 https://redports.org/~fidaj/20120311075042-60553-15312/cairo-dock-plugins-2.3.0.3_3.log 9.0-RELEASE/i386 https://redports.org/~fidaj/20120311075042-60553-15313/cairo-dock-plugins-2.3.0.3_3.log Fix: Patch attached with submission follows:
Updated and corrected several errors listed in the following PR: http://www.freebsd.org/cgi/query-pr.cgi?pr=165898 http://www.freebsd.org/cgi/query-pr.cgi?pr=166607 http://www.freebsd.org/cgi/query-pr.cgi?pr=166747 http://www.freebsd.org/cgi/query-pr.cgi?pr=166749 Builgroup: 10-CURRENT/amd64 Log: https://redports.org//~fidaj/20120408095210-66266-19217/cairo-dock-plugins-2.3.0.3_3.log Builgroup: 10-CURRENT/i386 Log: https://redports.org//~fidaj/20120408095204-88817-19216/cairo-dock-plugins-2.3.0.3_3.log Builgroup: 9.0-RELEASE/amd64 Log: https://redports.org//~fidaj/20120408095130-65624-19215/cairo-dock-plugins-2.3.0.3_3.log Builgroup: 9.0-RELEASE/i386 Log: https://redports.org//~fidaj/20120408095125-54119-19214/cairo-dock-plugins-2.3.0.3_3.log Builgroup: 8.2-RELEASE/amd64 Log: https://redports.org//~fidaj/20120408095119-58507-19213/cairo-dock-plugins-2.3.0.3_3.log Builgroup: 8.2-RELEASE/i386 Log: https://redports.org//~fidaj/20120408095112-43678-19212/cairo-dock-plugins-2.3.0.3_3.log Builgroup: 7.4-RELEASE/amd64 Log: https://redports.org//~fidaj/20120408095104-94627-19211/cairo-dock-plugins-2.3.0.3_3.log Builgroup: 7.4-RELEASE/i386 Log: https://redports.org//~fidaj/20120408095057-58944-19210/cairo-dock-plugins-2.3.0.3_3.log
Responsible Changed From-To: freebsd-ports-bugs->scheidell I'll take it.
State Changed From-To: open->feedback Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/cairo-dock-plugins/Makefile b/cairo-dock-plugins/Makefile |index d14c1ac..ad329f7 100644 |--- a/cairo-dock-plugins/Makefile |+++ b/cairo-dock-plugins/Makefile -------------------------- Patching file Makefile using Plan A... Hunk #1 succeeded at 7. Hunk #2 succeeded at 22. Hunk #3 failed at 32. Hunk #4 succeeded at 45. Hunk #5 succeeded at 97. 1 out of 5 hunks failed--saving rejects to Makefile.rej %cat Makefile.rej *************** *** 29,35 **** USE_XORG= xrender USE_DOS2UNIX= YES USE_CMAKE= yes - USE_GCC= 4.5+ MAKE_JOBS_SAFE= YES PLIST_SUB+= PYVER="${PYTHON_VERSION:S/thon//}" --- 32,38 ---- USE_XORG= xrender USE_DOS2UNIX= YES USE_CMAKE= yes + USE_GCC= 4.6+ MAKE_JOBS_SAFE= YES PLIST_SUB+= PYVER="${PYTHON_VERSION:S/thon//}" Your makefile was updated: 2012/04/07 23:03:57 gerald This change approved by you ? <http://www.freebsd.org/cgi/cvsweb.cgi/ports/deskutils/cairo-dock-plugins/Makefile>
manually edited it for USE_GCC, thanks, understood: next issue: please check this patch: add_pkg ===> Patching for cairo-dock-plugins-2.3.0.3_3 ===> Converting DOS text files to UNIX text files ===> Applying FreeBSD patches for cairo-dock-plugins-2.3.0.3_3 1 out of 2 hunks failed--saving rejects to netspeed/data/netspeed.rej => Patch patch-netspeed failed to apply cleanly. it in a tinderbox, do I don't have access to the rej file (tinderbox builds jailed host, loads prestine os, starts compiling things, deletes when done) do you know about redports? can you test this out in redports? (you might want to adjust the patch to skip around the USE_GCC think ) but see if you can tell what happened to patch-netspeed. -- Michael Scheidell, CTO >*| * SECNAP Network Security Corporation d: +1.561.948.2259 w: http://people.freebsd.org/~scheidell
See my original patch... Probably through the mail is incorrect ASCII encoding ...
scheidell 2012-04-14 21:51:16 UTC FreeBSD ports repository Modified files: deskutils/cairo-dock-plugins Makefile distinfo Added files: deskutils/cairo-dock-plugins/files patch-CDBashApplet.sh patch-Doncky-data-nvidia-config patch-GMenu-applet-menu patch-Network-Monitor-data-access-point patch-Network-Monitor-data-wifi patch-System-Monitor-data-nvidia-config patch-System-Monitor.conf.in patch-applet-appli-finder.c patch-applet-notifications.c patch-calc.sh patch-demo_bash.sh patch-netspeed patch-updatedb.sh patch-upload2free.sh patch-wifi-data-access-point patch-wifi-data-wifi Log: - fix many bugs PR: ports/165926 Submitted by: Ivan Klymenko <fidaj@ukr.net> (maintainer) Revision Changes Path 1.11 +9 -2 ports/deskutils/cairo-dock-plugins/Makefile 1.5 +2 -0 ports/deskutils/cairo-dock-plugins/distinfo 1.1 +8 -0 ports/deskutils/cairo-dock-plugins/files/patch-CDBashApplet.sh (new) 1.1 +8 -0 ports/deskutils/cairo-dock-plugins/files/patch-Doncky-data-nvidia-config (new) 1.1 +22 -0 ports/deskutils/cairo-dock-plugins/files/patch-GMenu-applet-menu (new) 1.1 +15 -0 ports/deskutils/cairo-dock-plugins/files/patch-Network-Monitor-data-access-point (new) 1.1 +18 -0 ports/deskutils/cairo-dock-plugins/files/patch-Network-Monitor-data-wifi (new) 1.1 +8 -0 ports/deskutils/cairo-dock-plugins/files/patch-System-Monitor-data-nvidia-config (new) 1.1 +11 -0 ports/deskutils/cairo-dock-plugins/files/patch-System-Monitor.conf.in (new) 1.1 +20 -0 ports/deskutils/cairo-dock-plugins/files/patch-applet-appli-finder.c (new) 1.1 +11 -0 ports/deskutils/cairo-dock-plugins/files/patch-applet-notifications.c (new) 1.1 +8 -0 ports/deskutils/cairo-dock-plugins/files/patch-calc.sh (new) 1.1 +17 -0 ports/deskutils/cairo-dock-plugins/files/patch-demo_bash.sh (new) 1.1 +17 -0 ports/deskutils/cairo-dock-plugins/files/patch-netspeed (new) 1.1 +8 -0 ports/deskutils/cairo-dock-plugins/files/patch-updatedb.sh (new) 1.1 +8 -0 ports/deskutils/cairo-dock-plugins/files/patch-upload2free.sh (new) 1.1 +15 -0 ports/deskutils/cairo-dock-plugins/files/patch-wifi-data-access-point (new) 1.1 +18 -0 ports/deskutils/cairo-dock-plugins/files/patch-wifi-data-wifi (new) _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: feedback->closed Committed. Thanks!