Date: Mon, 17 Jan 2011 22:59:45 +0100 From: Olli Hauer <ohauer@FreeBSD.org> To: "Philip M. Gollucci" <pgollucci@p6m7g8.com> Cc: Erwin Lansing <erwin@freebsd.org>, apache@freebsd.org Subject: Re: [ports-amd64@pointyhat-west.isc.freebsd.org: ap13-mod_bandwidth-2.1.0 failed on amd64 7.4-release] Message-ID: <4D34BBD1.7030301@FreeBSD.org> In-Reply-To: <4D322B65.6060707@p6m7g8.com> References: <20110115150734.GS67325@droso.net> <4D322B65.6060707@p6m7g8.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2011-01-16 00:19, Philip M. Gollucci wrote: > I'm backlogged, anyone else feel free to jump on it. > On 1/15/2011 10:07 AM, Erwin Lansing wrote: [...] >> fetch: ftp://pointyhat.freebsd.org/pub/FreeBSD/ports/distfiles/apache/mod_bandwidth-2.1.0.tar.gz: File unavailable (e.g., file not found, no access) >> => Couldn't fetch it - please try to retrieve this >> => port manually into /tmp/distfiles/apache and try again. >> *** Error code 1 >> >> Stop in /a/ports/www/mod_bandwidth. >> ================================================================ >> build of /usr/ports/www/mod_bandwidth ended at Sat Jan 15 14:33:15 UTC 2011 >> Hi Philip, I found the source file via g...le in the local-distfiles from clement. Unfortunately his commit bit was taken somewhere last year, but the file is available on all mirrors. Solution 1) add LOCAL/clement to MASTER_SITE Solution 2) portmgr copy the file from clement to distfiles/apache Solution 3) this patch (fetch sources .c .pl) I compared the single source files with the one in the tar archive and they are identical. http://people.freebsd.org/~ohauer/diffs/mod_bandwidth.diff (Not sure If we can use MASTER_SITE_FREEBSD) Please give the patch a short review. Index: Makefile =================================================================== RCS file: /home/pcvs/ports/www/mod_bandwidth/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- Makefile 20 Oct 2010 03:26:33 -0000 1.15 +++ Makefile 17 Jan 2011 21:36:25 -0000 @@ -10,15 +10,22 @@ PORTNAME= mod_bandwidth PORTVERSION= 2.1.0 +PORTREVISION= 1 CATEGORIES= www -MASTER_SITES= ftp://ftp.cohprog.com/pub/apache/module/1.3.0/ -## only .c is available from upstream, ftp.fbsd has the tgz +MASTER_SITES= ftp://ftp.cohprog.com/pub/apache/module/:1 \ + ftp://ftp.cohprog.com/pub/apache/module/ +MASTER_SITE_SUBDIR=1.3.0/:1 PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} +EXTRACT_SUFX= # none +## source files are only as .c and .pl available from upstream +DISTFILES= mod_bandwidth.c:1 cleanlink.pl DIST_SUBDIR= apache +EXTRACT_ONLY= MAINTAINER= apache@FreeBSD.org COMMENT= Bandwidth management module for the Apache webserver +#MASTER_SITE_FREEBSD= yes MAKE_JOBS_SAFE= yes CONFLICTS= apache-contrib-1.* @@ -27,11 +34,18 @@ USE_APACHE= 1.3 AP_FAST_BUILD= yes AP_GENPLIST= yes +NO_WRKSUBDIR= yes PLIST_FILES+= sbin/cleanlink.pl +post-extract: +.for i in ${DISTFILES:C/:1//} + @${CP} ${DISTDIR}/${DIST_SUBDIR}/${i} ${WRKSRC}/ +.endfor + post-install: + @${ECHO} "@unexec ${SED} -i '' '/AddModule mod_bandwidth.c/d' %D/etc/apache/httpd.conf" >> ${TMPPLIST} @${INSTALL_SCRIPT} ${WRKSRC}/cleanlink.pl ${LOCALBASE}/sbin - ${CAT} ${PKGMESSAGE} + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/pcvs/ports/www/mod_bandwidth/distinfo,v retrieving revision 1.9 diff -u -r1.9 distinfo --- distinfo 31 Aug 2008 19:13:01 -0000 1.9 +++ distinfo 17 Jan 2011 21:36:25 -0000 @@ -1,3 +1,4 @@ -MD5 (apache/mod_bandwidth-2.1.0.tar.gz) = 627e825c123501d6fa83b47ce47f9633 -SHA256 (apache/mod_bandwidth-2.1.0.tar.gz) = f1b9f69a962a748f0a263395f6b0dff8bf379f19356ffdd2286bfd7b98763f72 -SIZE (apache/mod_bandwidth-2.1.0.tar.gz) = 12698 +SHA256 (apache/mod_bandwidth.c) = e2cfa8ebe5340cd0a2a20c7048b2d49eed71d3c9ffd362fe32579bfedf09410d +SIZE (apache/mod_bandwidth.c) = 44217 +SHA256 (apache/cleanlink.pl) = e8ce6a0b68621bc98ceb03e90391c71426ea6dd329b3083901807b084079c0dc +SIZE (apache/cleanlink.pl) = 1009
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4D34BBD1.7030301>