Created attachment 143492 [details] x11-toolkits/scintilla patch - Update to 3.4.3 (I couldn't tell if Bugzilla allowed for multiple attachments at once, doesn't appear to, the editors/scite patch will be in the next reply.)
Created attachment 143493 [details] editors/scite patch Follow-up to add editors/scite patch.
Created attachment 143494 [details] x11-toolkits/scintilla patch Replaces the previous patch for x11-toolkits/scintilla, realized that I didn't need the compiler USES anymore.
Created attachment 144639 [details] scintilla-3.4.4.patch Updated patch for scintilla 3.4.4
Created attachment 144640 [details] scite-3.4.4.patch Updated patch for scite 3.4.4.
miwi won't be around, let somebody else take it (patch-ready)
ugh, besides no longer applying due to adamw changes (fixed on my end), scintilla tarball has been re-rolled so unprofessional: fetch: http://kaz.dl.sourceforge.net/project/scintilla/SciTE/3.4.4/scite344.tgz: size mismatch: expected 2244513, actual 2245870 I guess since it comes from SF, I can just regenerate the distfile. It would be good to get some verification that this version of 3.4.4 is okay.
but now patch-makefile (the former patch-aa) doesn't apply cleanly. Can you update the scintilla patch after verifying the reroll?
Created attachment 145445 [details] scintilla-3.4.4.patch This is the updated patch for x11-toolkits/scintilla. From what I saw of the tarball, it looks like they may have prematurely released the 3.4.4 tarball as a diff between what I originally had and what was actually out there showed 3.4.3 in the version information. As a side note, the patch for editors/scite also needs to be updated, but I will have to provide that tonight as I need to test it first.
do they have to be updated together?
Created attachment 145498 [details] scite-3.4.4.patch Updating the scite patch as well now. Also need to note that files/patch-src__FilePath.h was removed, as it compiles fine without it. In reply to the question, ideally, they should be committed together. Both share the same distfile (scintilla is actually using the scite distfile) and scite depends on scintilla.
I'll try to get to this tonight.
A commit references this bug: Author: marino Date: Fri Aug 8 19:47:37 UTC 2014 New revision: 364377 URL: http://svnweb.freebsd.org/changeset/ports/364377 Log: scite and scintilla: Upgrade version 3.4.1 => 3.4.4 PR: 190754 Submitted by: maintainer (Naram Qashat) Changes: head/editors/scite/Makefile head/editors/scite/distinfo head/editors/scite/files/patch-makefile head/editors/scite/files/patch-src__FilePath.h head/x11-toolkits/scintilla/Makefile head/x11-toolkits/scintilla/distinfo head/x11-toolkits/scintilla/files/patch-makefile
Thanks!