Please update to 1.14. Found this patch, on test it, it works: http://www.calculate-linux.org/packages/www-apache/mod_scgi/files/mod_scgi-1.14-apache-2.4.patch
Created attachment 161404 [details] modified patch-mod_scgi-1.11-apache24 Attached the modified patch.
The patch is named patcg-mod_scgi-1.11-apache. Forgot to change it to ..-1.14-...
Created attachment 161448 [details] patch-Makefile
Thanks for the patch. It looks good to me. One more thing: I no longer use this port. It will be great if you could take the maintainership of it. Thanks, Dryice
Walter, could you please: 1) Create a single diff against the port which includes both changes to the Makefile and the patch in files/, and then obsolete the two existing attachments (attachment 161404 [details], and attachment 161448 [details]) 2) Include (as attachments), the following QA results: * portlint -AC * poudriere testport (or bulk -t) 3) I note that the Makefile diff leaves a commented out PORTREVISION, please also remove that. 4) According to the maintainer in comment 4, please also add a MAINTAINER change if you would like to maintain the port (highly recommended)
Created attachment 161514 [details] svn-diff_mod_scgi
Created attachment 161515 [details] portlint output
The Warning did not change, if I run make makepatch.
I make a svn-diff I hope that is what you want.
Created attachment 161516 [details] poudriere-ap24-mod_scgi-1.14.log
Created attachment 161517 [details] diff-mod_scgi (cleared svn-diff)
Attached a additional "cleared" svn-diff as diff-mod_scgi.
Thank you Walter, pending maintainer approval
Comment on attachment 161514 [details] svn-diff_mod_scgi This doesn't look like an svn diff against a HEAD svn export/checkout, obsoleting.
How to do - svn is puzzling me.
There is somewhere a missunderstood with svn and I can't find it: I did: svn co https://svn0.us-east.freebsd.org/ports/head/www/mod_scgi cd mod_scgi svn diff --old=. --new=../
(In reply to Walter Schwarzenfeld from comment #16) > There is somewhere a missunderstood with svn and I can't find it: > I did: > svn co https://svn0.us-east.freebsd.org/ports/head/www/mod_scgi > cd mod_scgi > svn diff --old=. --new=../ old (as in ORIGINAL) new (as in your EDITED version) HTH --Chris
old is "." new is ../ yes but it gaves this output as in the deprecate svn-diff version
"." is what I fetched with svn co https://svn0.us-east.freebsd.org/ports/head/www/mod_scgi. ../ is the modified port.
(In reply to Walter Schwarzenfeld from comment #19) > "." is what I fetched with svn co > https://svn0.us-east.freebsd.org/ports/head/www/mod_scgi. ../ is the > modified port. Ahh. I see what you're saying. :) I think it might be easier to try as follows: $ svn co --depth empty svn://svn.freebsd.org/ports/head 2015-09-29 $ svn up --set-depth empty 2015-09-29/www $ svn up 2015-09-29/www/scgi Then add / edit / ... If you added files (patches, etc...) you'll need to svn add (see man svn for more info). When you're finished editing, you should be able to: $ cd 2015-09-29/www $ svn diff > 2015-09-29.diff There is no reason you can't work from an arbitrary directory to perform your work. The only stipulation is the you perform all your work in the SAME directory. :) --Chrisa
Same result as in the deprecated svn-diff.
How do you do it, If you want a difference as I discribed, I am complete puzzled, nothing I try with svn works, I read the handbook , I use google and the man page is unusable.
I ask in the forum , I asked in irc freebsd-channel. Different suggestions no solution. I can't imagine I do all wrong.
I forgot to mention, I deleted the whole portstree and make a checkout against head. Svn diff after this gives nonsense: elixier - I never do anything with that.
And why not diffs for each files are accepted? It is clearer than than svn-diff?
(In reply to Walter Schwarzenfeld from comment #25) > And why not diffs for each files are accepted? It is clearer than than > svn-diff? Because the ports tree is managed by/with svn(1). So using svn an svn diff is the best way to update the tree. --Chris
Never worked with svn to update the tree working with portsnap. And it worked good and simple and not so complicated like svn.
Send me a link or an explanation, I find such one.
Ever get wrong results.
Or no results.
If have a modified port in www/mod_scgi. What have I to do, to get a difference with svn to the original port?
Created attachment 161532 [details] svn-diff
I hope that is now the right file.
No it is not. Sigh .. .I gave it up. Either you accepted patches or diffs for each files, or not and you let it be.
Created attachment 161534 [details] patch-Makefile
Created attachment 161535 [details] patch-distinfo
Created attachment 161536 [details] patch-mod_scgi_c
Sending again the patch files.
(In reply to Walter Schwarzenfeld from comment #28) > Send me a link or an explanation, I find such one. If you haven't already; have a look at the porters handbook; specifically: https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/slow-porting.html and https://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/slow-patch.html you will also need to better understand svn; specifically: svn add and svn status try svn help add these are also covered in the handbook. HTH --Chris
Sorry, this explains how I patch one file, nothing more.
If I had a repo in /usr/ports (or what directory ever) svn should be able show me difference of the tree (not garbage).
Created attachment 161549 [details] diff
I have made the file diff with sudo svn diff --patch-compatible --old . --new ../ Is this now acceptable?
And edit it
Walter, When you get the patches sorted out following our discussion in the FreeBSD forum can you please obsolete all the old patches? - Click "Details" to the right of each patch. - Click "edit details" to the right of the patch name. - Check the "obsolete" check box and hit submit at the bottom.
Created attachment 161569 [details] mod_scgi.diff
I hope I have find the trick (with a help of a nice guy). This should be the right diff.
Created attachment 161893 [details] QA'd mod_scgi.diff Walter, I've attached a QA'd diff and obsoleted yours. Issues: Portlint: WARN: /usr/ports/www/mod_scgi/pkg-descr: use WWW: with a single space, then http://www.mems-exchange.org/software/scgi/ WARN: Makefile: Consider defining LICENSE. WARN: /usr/ports/www/mod_scgi/files/patch-mod_scgi: patch was not generated using ``make makepatch''. It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format. You've identified these in your patch. I've fixed them in this one for you. Buildtime: USE_APACHE= 22+ means both apache22 and apache24 should work. As submitted this is not the case. I've renamed the patch you included and and tested builds with both the default (2.4) and with DEFAULT_VERSIONS= apache=2.2 on the following: 9.3-RELEASE-p28 amd64 9.3-RELEASE-p28 i386 10.1-RELEASE-p22 amd64 10.1-RELEASE-p22 i386 10.2-RELEASE-p5 amd64 10.2-RELEASE-p5 i386 11.0-CURRENT r289084 amd64 11.0-CURRENT r289115 i386 Other: I noticed the maintainer's name was in the MASTER_SITES so I checked `make fetch` and that failed. => scgi-1.14.tar.gz doesn't seem to exist in /distfiles/. => Attempting to fetch http://dryice.name/computer/FreeBSD/distfiles/scgi-1.14.tar.gz fetch: http://dryice.name/computer/FreeBSD/distfiles/scgi-1.14.tar.gz: Not Found 11.0-CURRENT r289115 i386 I've fixed this in the patch. Summary: With all those changes, here's the summary of everything for the commit message. www/mod_scgi: update 1.12 -> 1.14 and pass on MAINTAINER - Change MASTER_SITES from prior maintainer's mirror to upstream - Remove 2.2 in the COMMENT as the module builds on both 2.2 and 2.4 - Add LICENSE - Set USE_APACHE=22+ and add conditional patch for builds on Apache 2.4 - Update WWW in pkg-descr - Fix grammar in pkg-message PR: 203355 Approved by: dryice@dryice.name (outgoing maintainer) Submitted by: Walter Schwarzenfeld <w.litter@aon.at>
(In reply to Jason Unovitch from comment #48) Walter, Please read the summary above and learn from what I was looking for. The only thing I need is you to verify run time of the patch. Once you give me a "run time is good with Apache 2.4 and with Apache 2.2 (DEFAULT_VERSIONS= apache=2.2 in my make.conf)" I'll go ahead and commit this.
(In reply to Jason Unovitch from comment #49) Yes, works with apache22 and apache24.
A commit references this bug: Author: junovitch Date: Mon Oct 12 12:54:42 UTC 2015 New revision: 399120 URL: https://svnweb.freebsd.org/changeset/ports/399120 Log: www/mod_scgi: update 1.12 -> 1.14 and various fixes - Pass on MAINTAINER - Change MASTER_SITES from prior maintainer's mirror to upstream - Remove 2.2 in the COMMENT as the module builds/runs on both 2.2 and 2.4 - Add LICENSE - Set USE_APACHE=22+ and add conditional patch for builds on Apache 2.4 - Update WWW in pkg-descr - Fix grammar in pkg-message PR: 203355 Approved by: dryice@dryice.name (outgoing maintainer) Submitted by: Walter Schwarzenfeld <w.litter@aon.at> Changes: head/www/mod_scgi/Makefile head/www/mod_scgi/distinfo head/www/mod_scgi/files/ head/www/mod_scgi/files/apache24-compat-mod__scgi.c head/www/mod_scgi/pkg-descr head/www/mod_scgi/pkg-message
(In reply to Walter Schwarzenfeld from comment #50) Walter, Thank you for the confirmation. The patch has been committed.