Port was marked broken, as distfiles were un-fetchable. This PR corrects this problem by adding reliable MASTER_SITES, and requests an update to MAINTAINER. A patch will follow shortly, as a reply to this pr(1). Fix: A patch will follow shortly as a reply to this PR. How-To-Repeat: Attempt to build this port.
OK. Here's the patch(1), as promised. CORRECTS: MASTER_SITES MAINTAINER PROVIDES: STAGEDIR FILES AFFECTED: Makefile distinfo Index: cherokee/Makefile =================================================================== --- cherokee/Makefile (revision 351960) +++ cherokee/Makefile (working copy) @@ -5,14 +5,13 @@ PORTVERSION= 1.2.101 PORTREVISION= 4 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_SAMBA} -MASTER_SITE_SUBDIR=cherokee/1.2/${PORTVERSION} +MASTER_SITES= https://github.com/cherokee/webserver/archive/ \ + http://bsdforge.com/projects/source/www/cherokee/ +DISTNAME= v${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= portmaster@bsdforge.com COMMENT= Fast and flexible web server -BROKEN= No public distfiles - USES= gettext gmake pathfix pkgconfig USE_OPENSSL= yes USE_LDCONFIG= yes @@ -167,14 +166,14 @@ ${WRKSRC}/qa/run-tests.py post-install: - @${INSTALL} -d ${CONFSUBDIRS:S|^|${PREFIX}/etc/cherokee/|} + @${INSTALL} -d ${CONFSUBDIRS:S|^|${STAGEDIR}${PREFIX}/etc/cherokee/|} @for i in ${DEFCONFS};do\ - ${INSTALL_DATA} ${WRKSRC}/$$i.sample ${PREFIX}/etc/cherokee/$$i.default;done - @${INSTALL_DATA} ${WRKSRC}/performance.conf.sample ${PREFIX}/etc/cherokee/cherokee.conf.perf_sample - @:>${PREFIX}/etc/cherokee/mods-enabled/.empty - @:>${PREFIX}/etc/cherokee/sites-available/.empty - @:>${PREFIX}/etc/cherokee/sites-enabled/.empty - @:>${PREFIX}/etc/cherokee/ssl/.empty + ${INSTALL_DATA} ${WRKSRC}/$$i.sample ${STAGEDIR}${PREFIX}/etc/cherokee/$$i.default;done + @${INSTALL_DATA} ${WRKSRC}/performance.conf.sample ${STAGEDIR}${PREFIX}/etc/cherokee/cherokee.conf.perf_sample + @:>${STAGEDIR}${PREFIX}/etc/cherokee/mods-enabled/.empty + @:>${STAGEDIR}${PREFIX}/etc/cherokee/sites-available/.empty + @:>${STAGEDIR}${PREFIX}/etc/cherokee/sites-enabled/.empty + @:>${STAGEDIR}${PREFIX}/etc/cherokee/ssl/.empty @for i in `${FIND} ${PREFIX}/etc/cherokee/ -name \*.default`;do\ if [ ! -f $${i%.default} ];then ${CP} $$i $${i%.default};fi;done @for i in `${FIND} ${PREFIX}/etc/cherokee/ -name \*.sample`;do\ Index: cherokee/distinfo =================================================================== --- cherokee/distinfo (revision 351960) +++ cherokee/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (cherokee-1.2.101.tar.gz) = ca465ab3772479fc843b38ffc45113bf24d8bfae9185cdd5176b099d5a17feb8 -SIZE (cherokee-1.2.101.tar.gz) = 6320209 +SHA256 (v1.2.101.tar.gz) = 81b71bd4cb17462b93603bb420e40c628680e833f7e074048820f0bca58bf0f9 +SIZE (v1.2.101.tar.gz) = 4997404
PLEASE DISREGARD LAST SENT PATCH. Sorry. After adding STAGING support, I forfot to remove: NO_STAGE=yes This corrects that, and works as intended. CORRECTS: MASTER_SITES MAINTAINER PROVIDES: STAGEDIR FILES AFFECTED: Makefile distinfo Index: cherokee/Makefile =================================================================== --- cherokee/Makefile (revision 351960) +++ cherokee/Makefile (working copy) @@ -5,14 +5,13 @@ PORTVERSION= 1.2.101 PORTREVISION= 4 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_SAMBA} -MASTER_SITE_SUBDIR=cherokee/1.2/${PORTVERSION} +MASTER_SITES= https://github.com/cherokee/webserver/archive/ \ + http://bsdforge.com/projects/source/www/cherokee/ +DISTNAME= v${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= portmaster@bsdforge.com COMMENT= Fast and flexible web server -BROKEN= No public distfiles - USES= gettext gmake pathfix pkgconfig USE_OPENSSL= yes USE_LDCONFIG= yes @@ -56,7 +55,6 @@ RRDTOOL_DESC= Usage graphs support UWSGI_DESC= uWSGI support -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MADMIN} @@ -167,14 +165,14 @@ ${WRKSRC}/qa/run-tests.py post-install: - @${INSTALL} -d ${CONFSUBDIRS:S|^|${PREFIX}/etc/cherokee/|} + @${INSTALL} -d ${CONFSUBDIRS:S|^|${STAGEDIR}${PREFIX}/etc/cherokee/|} @for i in ${DEFCONFS};do\ - ${INSTALL_DATA} ${WRKSRC}/$$i.sample ${PREFIX}/etc/cherokee/$$i.default;done - @${INSTALL_DATA} ${WRKSRC}/performance.conf.sample ${PREFIX}/etc/cherokee/cherokee.conf.perf_sample - @:>${PREFIX}/etc/cherokee/mods-enabled/.empty - @:>${PREFIX}/etc/cherokee/sites-available/.empty - @:>${PREFIX}/etc/cherokee/sites-enabled/.empty - @:>${PREFIX}/etc/cherokee/ssl/.empty + ${INSTALL_DATA} ${WRKSRC}/$$i.sample ${STAGEDIR}${PREFIX}/etc/cherokee/$$i.default;done + @${INSTALL_DATA} ${WRKSRC}/performance.conf.sample ${STAGEDIR}${PREFIX}/etc/cherokee/cherokee.conf.perf_sample + @:>${STAGEDIR}${PREFIX}/etc/cherokee/mods-enabled/.empty + @:>${STAGEDIR}${PREFIX}/etc/cherokee/sites-available/.empty + @:>${STAGEDIR}${PREFIX}/etc/cherokee/sites-enabled/.empty + @:>${STAGEDIR}${PREFIX}/etc/cherokee/ssl/.empty @for i in `${FIND} ${PREFIX}/etc/cherokee/ -name \*.default`;do\ if [ ! -f $${i%.default} ];then ${CP} $$i $${i%.default};fi;done @for i in `${FIND} ${PREFIX}/etc/cherokee/ -name \*.sample`;do\ Index: cherokee/distinfo =================================================================== --- cherokee/distinfo (revision 351960) +++ cherokee/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (cherokee-1.2.101.tar.gz) = ca465ab3772479fc843b38ffc45113bf24d8bfae9185cdd5176b099d5a17feb8 -SIZE (cherokee-1.2.101.tar.gz) = 6320209 +SHA256 (v1.2.101.tar.gz) = 81b71bd4cb17462b93603bb420e40c628680e833f7e074048820f0bca58bf0f9 +SIZE (v1.2.101.tar.gz) = 4997404
>> Thank you very much for your problem report. >> It has the internal identification `ports/188920'. >> The individual assigned to look at your >> report is: freebsd-ports-bugs. >> >> You can access the state of your problem report at any time >> via this link: >> >> http://www.freebsd.org/cgi/query-pr.cgi?pr=188920 >> >>>Category: ports >>>Responsible: freebsd-ports-bugs >>>Synopsis: NEW-MAINTAINER, MASTER_SITES -- salvage www/cherokee >>>Arrival-Date: Wed Apr 23 16:00:00 UTC 2014 >> Sorry. Seems I forgot to STAGE the DOCSDIR. Simply use this pacth, and disregard the previous patches. Sorry for the bother. --Chris
Responsible Changed From-To: freebsd-ports-bugs->cs I'll take it.
Responsible Changed From-To: cs->freebsd-ports-bugs Back to pool.
(In reply to Carlo Strub from comment #5) > Responsible Changed > From-To: cs->freebsd-ports-bugs > > Back to pool. Did you encounter any problems with the last patch?
Created attachment 143378 [details] Here is the latest diff(1)/patch(1) again. It's fully staged, and working. I'm not sure what happened. But the last patch(1)/diff(1) should have easily been submitted. It passed all tests, and worked fine. But this PR's status was recently changed. Why? Please use the patch(1) attached. Thank you. --Chris
Hi Chris, This still needs work. The latest patch is incomplete (what happened to the distinfo changes?) and it doesn't build; 1. WRKSRC is incorrect - the Github tarball presumably extract differently to the old one. 2. Even with that fixed, the patch for configure fails to apply because there's no configure script. Autoconf needs to be used to generate that. 3. You haven't dealt with moving manpages to pkg-plist (and removing MAN1 from Makefile). Based on the above I can't see how this worked for you at all. Could you take another look? And if you have access to poudriere or tinderbox, make sure it builds in that first. Tim.
@Lars - sorry, didn't see you on the CC list. Are you already looking at this? If so, I'll leave you to it. Tim.
(In reply to Tim Bishop from comment #8) > Hi Chris, > > This still needs work. The latest patch is incomplete (what happened to the > distinfo changes?) and it doesn't build; > > 1. WRKSRC is incorrect - the Github tarball presumably extract differently > to the old one. > 2. Even with that fixed, the patch for configure fails to apply because > there's no configure script. Autoconf needs to be used to generate that. > 3. You haven't dealt with moving manpages to pkg-plist (and removing MAN1 > from Makefile). > > Based on the above I can't see how this worked for you at all. Could you > take another look? And if you have access to poudriere or tinderbox, make > sure it builds in that first. > > Tim. Ugh. Sorry. Revisiting this now. I see that the version on their github server. While still maintaining the same file name. Is NOT the same file I checked out, built, and created this patch for. I'm not going to have time to reconcile all of this, and create a strategy to accommodate their versioning setup. As I've since committed myself to a number of other FreeBSD ports. Reconciling this, will put me over my threshold. Again. Sorry for the bother, and please return this to ports@. If it's not there already. Thank you for all your time, and attention to this. --Chris
I close this very old PR. The new MASTERSITEs are already in the portstree - together with an update to a newer version. Therefore the intend of the PR was succeeded, but the PR itself is overcome by events.