Re: HOMEPAGE / MASTER_SITE cleanup
The correct solution is to mirror them. On 13 October 2016 20:45:40 Rafael Sadowskiwrote: On Mon Oct 10, 2016 at 04:39:10PM +0100, Stuart Henderson wrote: On 2016/10/08 09:03, Rafael Sadowski wrote: > 1.3.1) Check MASTER_SITES. If offline replace with ${MASTER_SITE_OPENBSD} Those need mirroring, MASTER_SITE_OPENBSD needs to fetch them from the MASTER_SITES location... What is the correct solution? My template was: http://v4.freshbsd.org/commit/openbsd/ports/13P1JcW2TXcTNyej
Re: HOMEPAGE / MASTER_SITE cleanup
On Mon Oct 10, 2016 at 04:39:10PM +0100, Stuart Henderson wrote: > On 2016/10/08 09:03, Rafael Sadowski wrote: > > 1.3.1) Check MASTER_SITES. If offline replace with ${MASTER_SITE_OPENBSD} > > Those need mirroring, MASTER_SITE_OPENBSD needs to fetch them from the > MASTER_SITES location... What is the correct solution? My template was: http://v4.freshbsd.org/commit/openbsd/ports/13P1JcW2TXcTNyej
Re: HOMEPAGE / MASTER_SITE cleanup
On Sat, Oct 08, 2016 at 09:03:13AM +0200, Rafael Sadowski wrote: > hi ports@, > > I started with the motivation to bump all $HOMEPAGE and/or $MASTER_SITES > variables from http to https (Where it is possible). I found a lot of > unavailable homepages in the tree and tried to fix all of them (without p5-, > py- > and some sub-dirs like www/drupal{6,7}/*). > > My test-case after searching not available $HOMEPAGE's (script part): > > 1.) Check $HOMEPAGE in webbrowser. > 1.1) Modify URL, search at google for a new version. > 1.2) If a new site is available: > 1.2.1) Update and bump REVISION > 1.2.2) Check MASTER_SITES and make fetch/makesum > 1.3) If $HOMEPAGE is dead and I found no alternative > 1.3.1) Remove and bump REVISION > 1.3.1) Check MASTER_SITES. If offline replace with ${MASTER_SITE_OPENBSD} I've committed the suckless updates. Thanks! > Kind regards, > > Rafael Sadowski
Re: HOMEPAGE / MASTER_SITE cleanup
On 2016/10/08 09:03, Rafael Sadowski wrote: > 1.3.1) Check MASTER_SITES. If offline replace with ${MASTER_SITE_OPENBSD} Those need mirroring, MASTER_SITE_OPENBSD needs to fetch them from the MASTER_SITES location...
Re: HOMEPAGE / MASTER_SITE cleanup
Rafael Sadowskiwrites: > On Sun Oct 09, 2016 at 09:42:22AM +0200, Jeremie Courreges-Anglas wrote: >> Rafael Sadowski writes: >> >> > On Sat Oct 08, 2016 at 09:07:47PM +0200, Dmitrij D. Czarkoff wrote: >> >> Rafael Sadowski wrote: >> >> >> >> >>> -HOMEPAGE= http://tcpreplay.appneta.com/ >> >> >>> +HOMEPAGE= http://tcpreplay.appneta.com/ >> >> >> >> >> >> Does removing whitespace warrant REVISION bump? >> >> > >> >> >It is a tab directly after the HOMEPAGE. >> >> >> >> I think it does not really call for REVISION bump. Yes, it is a change, >> >> but it is not really necessary to force update. Or am I getting >> >> REVISION wrong again? >> > >> > I'm not so familiar with the internal package process and how make/perl >> > handle >> > $HOMEPAGE but sh(1) catch the tab: >> > >> > url=`make show=HOMEPAGE` >> >> Here it's not a matter of "is this change really worth it to force >> update?". The issue at hand is that if you repackage after fixing the >> homepage, the checksum of +DESC changes, and register-plist will >> rightfully complain. So a bump is needed. >> >> (If you don't see this behavior because you set an empty >> PLIST_REPOSITORY, well, don't do that.) >> > > Thanks jca@ for your illustration. Last night I checked the both .tgz > packages. With and without tab after the URL and surprise, surprise the > difference between the two packages are 7 Bytes. So a REVISION bump is > necessary, isn't it? You can't assume that if the resulting package size changes in successive builds, then the package needs a revision bump. Many other reasons may change the resulting package size. As mentioned in the manpage, register-plist(1) exits by default if the HOMEPAGE changes. That's on purpose. And since any register-plist error should be avoided, yes, you need a REVISION bump. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: HOMEPAGE / MASTER_SITE cleanup
On Sun Oct 09, 2016 at 09:42:22AM +0200, Jeremie Courreges-Anglas wrote: > Rafael Sadowskiwrites: > > > On Sat Oct 08, 2016 at 09:07:47PM +0200, Dmitrij D. Czarkoff wrote: > >> Rafael Sadowski wrote: > >> > >> >>> -HOMEPAGE= http://tcpreplay.appneta.com/ > >> >>> +HOMEPAGE= http://tcpreplay.appneta.com/ > >> >> > >> >> Does removing whitespace warrant REVISION bump? > >> > > >> >It is a tab directly after the HOMEPAGE. > >> > >> I think it does not really call for REVISION bump. Yes, it is a change, > >> but it is not really necessary to force update. Or am I getting > >> REVISION wrong again? > > > > I'm not so familiar with the internal package process and how make/perl > > handle > > $HOMEPAGE but sh(1) catch the tab: > > > > url=`make show=HOMEPAGE` > > Here it's not a matter of "is this change really worth it to force > update?". The issue at hand is that if you repackage after fixing the > homepage, the checksum of +DESC changes, and register-plist will > rightfully complain. So a bump is needed. > > (If you don't see this behavior because you set an empty > PLIST_REPOSITORY, well, don't do that.) > Thanks jca@ for your illustration. Last night I checked the both .tgz packages. With and without tab after the URL and surprise, surprise the difference between the two packages are 7 Bytes. So a REVISION bump is necessary, isn't it? Rafael
Re: HOMEPAGE / MASTER_SITE cleanup
Rafael Sadowskiwrites: > On Sat Oct 08, 2016 at 09:07:47PM +0200, Dmitrij D. Czarkoff wrote: >> Rafael Sadowski wrote: >> >> >>> -HOMEPAGE= http://tcpreplay.appneta.com/ >> >>> +HOMEPAGE= http://tcpreplay.appneta.com/ >> >> >> >> Does removing whitespace warrant REVISION bump? >> > >> >It is a tab directly after the HOMEPAGE. >> >> I think it does not really call for REVISION bump. Yes, it is a change, >> but it is not really necessary to force update. Or am I getting >> REVISION wrong again? > > I'm not so familiar with the internal package process and how make/perl handle > $HOMEPAGE but sh(1) catch the tab: > > url=`make show=HOMEPAGE` Here it's not a matter of "is this change really worth it to force update?". The issue at hand is that if you repackage after fixing the homepage, the checksum of +DESC changes, and register-plist will rightfully complain. So a bump is needed. (If you don't see this behavior because you set an empty PLIST_REPOSITORY, well, don't do that.) -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: HOMEPAGE / MASTER_SITE cleanup
On Sat Oct 08, 2016 at 09:07:47PM +0200, Dmitrij D. Czarkoff wrote: > Rafael Sadowskiwrote: > > >>> -HOMEPAGE= http://tcpreplay.appneta.com/ > >>> +HOMEPAGE= http://tcpreplay.appneta.com/ > >> > >> Does removing whitespace warrant REVISION bump? > > > >It is a tab directly after the HOMEPAGE. > > I think it does not really call for REVISION bump. Yes, it is a change, > but it is not really necessary to force update. Or am I getting > REVISION wrong again? I'm not so familiar with the internal package process and how make/perl handle $HOMEPAGE but sh(1) catch the tab: url=`make show=HOMEPAGE`
Re: HOMEPAGE / MASTER_SITE cleanup
Rafael Sadowskiwrote: >>> -HOMEPAGE= http://tcpreplay.appneta.com/ >>> +HOMEPAGE= http://tcpreplay.appneta.com/ >> >> Does removing whitespace warrant REVISION bump? > >It is a tab directly after the HOMEPAGE. I think it does not really call for REVISION bump. Yes, it is a change, but it is not really necessary to force update. Or am I getting REVISION wrong again?
Re: HOMEPAGE / MASTER_SITE cleanup
On Sat Oct 08, 2016 at 03:35:17PM +0100, Raf Czlonka wrote: > On Sat, Oct 08, 2016 at 08:03:13AM BST, Rafael Sadowski wrote: > > hi ports@, > > > > I started with the motivation to bump all $HOMEPAGE and/or $MASTER_SITES > > variables from http to https (Where it is possible). I found a lot of > > unavailable homepages in the tree and tried to fix all of them (without > > p5-, py- > > and some sub-dirs like www/drupal{6,7}/*). > > > > My test-case after searching not available $HOMEPAGE's (script part): > > > > 1.) Check $HOMEPAGE in webbrowser. > > 1.1) Modify URL, search at google for a new version. > > 1.2) If a new site is available: > > 1.2.1) Update and bump REVISION > > 1.2.2) Check MASTER_SITES and make fetch/makesum > > 1.3) If $HOMEPAGE is dead and I found no alternative > > 1.3.1) Remove and bump REVISION > > 1.3.1) Check MASTER_SITES. If offline replace with ${MASTER_SITE_OPENBSD} > > > > Kind regards, > > > > Rafael Sadowski > > Hi Rafael, > > I skimmed through the list so have only a couple of comments. > > > [...] > > Index: databases/db/Makefile.inc > > === > > RCS file: /cvs/ports/databases/db/Makefile.inc,v > > retrieving revision 1.37 > > diff -u -p -u -p -r1.37 Makefile.inc > > --- databases/db/Makefile.inc 12 Mar 2016 16:45:57 - 1.37 > > +++ databases/db/Makefile.inc 8 Oct 2016 06:55:28 - > > @@ -5,7 +5,7 @@ COMMENT-tcl=TCL bindings for Berkeley D > > > > DISTNAME= db-${VERSION} > > CATEGORIES=databases > > -HOMEPAGE= http://www.oracle.com/technology/products/berkeley-db/ > > +HOMEPAGE= http://www.oracle.com/us/products/database/berkeley-db/db/ > > This one redirects to https://www.oracle.com/database/berkeley-db/db.html > at least in the UK. > You're right. Thanks > > [...] > > Index: net/tcpreplay/Makefile > > === > > RCS file: /cvs/ports/net/tcpreplay/Makefile,v > > retrieving revision 1.37 > > diff -u -p -u -p -r1.37 Makefile > > --- net/tcpreplay/Makefile 6 Jul 2016 10:29:51 - 1.37 > > +++ net/tcpreplay/Makefile 8 Oct 2016 06:55:41 - > > @@ -4,9 +4,9 @@ COMMENT=resend network traffic saved by > > > > DISTNAME= tcpreplay-4.0.5 > > CATEGORIES=net > > -REVISION= 1 > > +REVISION= 2 > > > > -HOMEPAGE= http://tcpreplay.appneta.com/ > > +HOMEPAGE= http://tcpreplay.appneta.com/ > > Does removing whitespace warrant REVISION bump? > It is a tab directly after the HOMEPAGE. Thanks Raf
Re: HOMEPAGE / MASTER_SITE cleanup
On Sat, Oct 08, 2016 at 08:03:13AM BST, Rafael Sadowski wrote: > hi ports@, > > I started with the motivation to bump all $HOMEPAGE and/or $MASTER_SITES > variables from http to https (Where it is possible). I found a lot of > unavailable homepages in the tree and tried to fix all of them (without p5-, > py- > and some sub-dirs like www/drupal{6,7}/*). > > My test-case after searching not available $HOMEPAGE's (script part): > > 1.) Check $HOMEPAGE in webbrowser. > 1.1) Modify URL, search at google for a new version. > 1.2) If a new site is available: > 1.2.1) Update and bump REVISION > 1.2.2) Check MASTER_SITES and make fetch/makesum > 1.3) If $HOMEPAGE is dead and I found no alternative > 1.3.1) Remove and bump REVISION > 1.3.1) Check MASTER_SITES. If offline replace with ${MASTER_SITE_OPENBSD} > > Kind regards, > > Rafael Sadowski Hi Rafael, I skimmed through the list so have only a couple of comments. > [...] > Index: databases/db/Makefile.inc > === > RCS file: /cvs/ports/databases/db/Makefile.inc,v > retrieving revision 1.37 > diff -u -p -u -p -r1.37 Makefile.inc > --- databases/db/Makefile.inc 12 Mar 2016 16:45:57 - 1.37 > +++ databases/db/Makefile.inc 8 Oct 2016 06:55:28 - > @@ -5,7 +5,7 @@ COMMENT-tcl= TCL bindings for Berkeley D > > DISTNAME=db-${VERSION} > CATEGORIES= databases > -HOMEPAGE=http://www.oracle.com/technology/products/berkeley-db/ > +HOMEPAGE=http://www.oracle.com/us/products/database/berkeley-db/db/ This one redirects to https://www.oracle.com/database/berkeley-db/db.html at least in the UK. > [...] > Index: net/tcpreplay/Makefile > === > RCS file: /cvs/ports/net/tcpreplay/Makefile,v > retrieving revision 1.37 > diff -u -p -u -p -r1.37 Makefile > --- net/tcpreplay/Makefile6 Jul 2016 10:29:51 - 1.37 > +++ net/tcpreplay/Makefile8 Oct 2016 06:55:41 - > @@ -4,9 +4,9 @@ COMMENT= resend network traffic saved by > > DISTNAME=tcpreplay-4.0.5 > CATEGORIES= net > -REVISION=1 > +REVISION=2 > > -HOMEPAGE=http://tcpreplay.appneta.com/ > +HOMEPAGE=http://tcpreplay.appneta.com/ Does removing whitespace warrant REVISION bump? Regards, Raf
Re: HOMEPAGE / MASTER_SITE cleanup
On Sat Oct 08, 2016 at 02:38:30PM +0200, Dmitrij D. Czarkoff wrote: > Unfortunately I did not have time for the whole list... > > Rafael Sadowskiwrote: > > >+MASTER_SITES= ${MASTER_SITE_OPENBSD} > > I think we should consider removing the ports that need this. I would prefer it but I don't use any of this old stuff. > > >Index: audio/disc-cover/Makefile > >=== > >RCS file: /cvs/ports/audio/disc-cover/Makefile,v > >retrieving revision 1.26 > >diff -u -p -u -p -r1.26 Makefile > >--- audio/disc-cover/Makefile 11 Aug 2015 20:13:39 - 1.26 > >+++ audio/disc-cover/Makefile 8 Oct 2016 06:55:27 - > >@@ -6,8 +6,7 @@ DISTNAME= disc-cover-1.5.6 > > DISTFILES=${DISTNAME}${EXTRACT_SUFX} webserver-1.0${EXTRACT_SUFX} > > DIST_SUBDIR= disc-cover > > CATEGORIES= audio > >- > >-HOMEPAGE= http://www.vanhemert.co.uk/disc-cover.html > >+REVISION= 0 > > > > # GPL > > PERMIT_PACKAGE_CDROM= Yes > > https://sourceforge.net/projects/disc-cover/ > > >Index: audio/toolame/Makefile > >=== > >RCS file: /cvs/ports/audio/toolame/Makefile,v > >retrieving revision 1.8 > >diff -u -p -u -p -r1.8 Makefile > >--- audio/toolame/Makefile 10 Mar 2013 22:55:06 - 1.8 > >+++ audio/toolame/Makefile 8 Oct 2016 06:55:27 - > >@@ -4,10 +4,8 @@ COMMENT= optimized mpeg 1/2 layer 2 aud > > > > DISTNAME= toolame-02l > > PKGNAME= toolame-0.2l > >-REVISION= 1 > >+REVISION= 2 > > CATEGORIES= audio > >- > >-HOMEPAGE= http://www.eftel.com/~mikecheng/planckenergy/ > > > > # GPL > > PERMIT_PACKAGE_CDROM= Yes > > https://sourceforge.net/projects/toolame/ > > >Index: books/AsteriskGuide/Makefile > >=== > >RCS file: /cvs/ports/books/AsteriskGuide/Makefile,v > >retrieving revision 1.4 > >diff -u -p -u -p -r1.4 Makefile > >--- books/AsteriskGuide/Makefile 3 Dec 2015 21:24:29 \ > >- 1.4 > >+++ books/AsteriskGuide/Makefile 8 Oct 2016 06:55:27 - > >@@ -8,10 +8,9 @@ DISTNAME= AsteriskGuideFree87P > > PKGNAME= AsteriskGuide-2.0 > > EXTRACT_SUFX= .pdf > > EXTRACT_ONLY= > >+REVISION= 0 > > > > CATEGORIES= books telephony > >- > >-HOMEPAGE= http://www.asteriskguide.com/ > > > > MAINTAINER= Diego Casati > > > > HOMEPAGE is used in MASTER_SITES here, so: > > Index: Makefile > === > RCS file: /var/cvs/ports/books/AsteriskGuide/Makefile,v > retrieving revision 1.4 > diff -u -p -r1.4 Makefile > --- Makefile 3 Dec 2015 21:24:29 - 1.4 > +++ Makefile 8 Oct 2016 11:48:32 - > @@ -8,19 +8,17 @@ DISTNAME= AsteriskGuideFree87P > PKGNAME= AsteriskGuide-2.0 > EXTRACT_SUFX=.pdf > EXTRACT_ONLY= > +REVISION=0 > > CATEGORIES= books telephony > > -HOMEPAGE=http://www.asteriskguide.com/ > - > MAINTAINER= Diego Casati > > # CC-Attribution-NonCommercial-NoDerivs > # see page vii of the PDF > PERMIT_PACKAGE_CDROM=Yes > > -MASTER_SITES=https://spacehopper.org/mirrors/ \ > - ${HOMEPAGE}pdf/ > +MASTER_SITES=https://spacehopper.org/mirrors/ > > NO_BUILD=Yes > NO_TEST= Yes > > > >Index: converters/recode/Makefile > >=== > [...] > >-HOMEPAGE= http://recode.progiciels-bpi.ca > [...] > > # moved to https://github.com/pinard/Recode/ > >-MASTER_SITES= ${MASTER_SITE_GNU:=recode/} > >+MASTER_SITES= ${MASTER_SITE_OPENBSD} > > Really? Yes, really: "For clarity: recode is free software, but it is not a GNU package. However, the GNU web site has long had this page about it, so it will remain for reference." -- https://www.gnu.org/software/recode/recode.html ... and the new website is also offline.
Re: HOMEPAGE / MASTER_SITE cleanup
Unfortunately I did not have time for the whole list... Rafael Sadowskiwrote: >+MASTER_SITES= ${MASTER_SITE_OPENBSD} I think we should consider removing the ports that need this. >Index: audio/disc-cover/Makefile >=== >RCS file: /cvs/ports/audio/disc-cover/Makefile,v >retrieving revision 1.26 >diff -u -p -u -p -r1.26 Makefile >--- audio/disc-cover/Makefile 11 Aug 2015 20:13:39 - 1.26 >+++ audio/disc-cover/Makefile 8 Oct 2016 06:55:27 - >@@ -6,8 +6,7 @@ DISTNAME= disc-cover-1.5.6 > DISTFILES=${DISTNAME}${EXTRACT_SUFX} webserver-1.0${EXTRACT_SUFX} > DIST_SUBDIR= disc-cover > CATEGORIES= audio >- >-HOMEPAGE= http://www.vanhemert.co.uk/disc-cover.html >+REVISION= 0 > > # GPL > PERMIT_PACKAGE_CDROM= Yes https://sourceforge.net/projects/disc-cover/ >Index: audio/toolame/Makefile >=== >RCS file: /cvs/ports/audio/toolame/Makefile,v >retrieving revision 1.8 >diff -u -p -u -p -r1.8 Makefile >--- audio/toolame/Makefile 10 Mar 2013 22:55:06 - 1.8 >+++ audio/toolame/Makefile 8 Oct 2016 06:55:27 - >@@ -4,10 +4,8 @@ COMMENT= optimized mpeg 1/2 layer 2 aud > > DISTNAME= toolame-02l > PKGNAME= toolame-0.2l >-REVISION= 1 >+REVISION= 2 > CATEGORIES= audio >- >-HOMEPAGE= http://www.eftel.com/~mikecheng/planckenergy/ > > # GPL > PERMIT_PACKAGE_CDROM= Yes https://sourceforge.net/projects/toolame/ >Index: books/AsteriskGuide/Makefile >=== >RCS file: /cvs/ports/books/AsteriskGuide/Makefile,v >retrieving revision 1.4 >diff -u -p -u -p -r1.4 Makefile >--- books/AsteriskGuide/Makefile 3 Dec 2015 21:24:29 \ >- 1.4 >+++ books/AsteriskGuide/Makefile 8 Oct 2016 06:55:27 - >@@ -8,10 +8,9 @@ DISTNAME= AsteriskGuideFree87P > PKGNAME= AsteriskGuide-2.0 > EXTRACT_SUFX= .pdf > EXTRACT_ONLY= >+REVISION= 0 > > CATEGORIES= books telephony >- >-HOMEPAGE= http://www.asteriskguide.com/ > > MAINTAINER= Diego Casati > HOMEPAGE is used in MASTER_SITES here, so: Index: Makefile === RCS file: /var/cvs/ports/books/AsteriskGuide/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- Makefile3 Dec 2015 21:24:29 - 1.4 +++ Makefile8 Oct 2016 11:48:32 - @@ -8,19 +8,17 @@ DISTNAME= AsteriskGuideFree87P PKGNAME= AsteriskGuide-2.0 EXTRACT_SUFX= .pdf EXTRACT_ONLY= +REVISION= 0 CATEGORIES=books telephony -HOMEPAGE= http://www.asteriskguide.com/ - MAINTAINER=Diego Casati # CC-Attribution-NonCommercial-NoDerivs # see page vii of the PDF PERMIT_PACKAGE_CDROM= Yes -MASTER_SITES= https://spacehopper.org/mirrors/ \ - ${HOMEPAGE}pdf/ +MASTER_SITES= https://spacehopper.org/mirrors/ NO_BUILD= Yes NO_TEST= Yes >Index: converters/recode/Makefile >=== [...] >-HOMEPAGE= http://recode.progiciels-bpi.ca [...] > # moved to https://github.com/pinard/Recode/ >-MASTER_SITES= ${MASTER_SITE_GNU:=recode/} >+MASTER_SITES= ${MASTER_SITE_OPENBSD} Really? >Index: devel/qt-creator/Makefile >=== >RCS file: /cvs/ports/devel/qt-creator/Makefile,v >retrieving revision 1.18 >diff -u -p -u -p -r1.18 Makefile >--- devel/qt-creator/Makefile 23 Sep 2016 09:16:54 - 1.18 >+++ devel/qt-creator/Makefile 8 Oct 2016 06:55:33 - >@@ -7,7 +7,7 @@ COMMENT = cross-platform IDE for use wi > V = 1.3.1 > DISTNAME =qt-creator-${V}-src > PKGNAME = qt-creator-${V} >-REVISION =7 >+REVISION =8 > EXTRACT_SUFX =.zip > ONLY_FOR_ARCHS = ${GCC4_ARCHS} > >@@ -26,8 +26,6 @@ MAKE_FLAGS +=LIBAggregation_VERSION=${ > LIBUtils_VERSION=${LIBUtils_VERSION} > > CATEGORIES = devel editors >- >-HOMEPAGE =http://qt.nokia.com/products/appdev/developer-tool\ >s/developer-tools > > # LGPL 2.1 with C++ headers exception (more permissive than LGPL) > PERMIT_PACKAGE_CDROM =Yes https://wiki.qt.io/Qt_Creator >Index: editors/uemacs/Makefile >=== >RCS file: /cvs/ports/editors/uemacs/Makefile,v >retrieving revision 1.21 >diff -u -p -u -p -r1.21 Makefile >--- editors/uemacs/Makefile11 Mar 2013 11:02:50 - 1.21 >+++ editors/uemacs/Makefile8 Oct 2016 06:55:33 - >@@ -5,8 +5,7 @@ COMMENT= full