Date: Fri, 7 Jan 2011 21:10:53 +1030 (CST) From: Jarrod Sayers <jarrod@downtools.com.au> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/153759: [patch] www/p5-Apache2-Scoreboard: Repair broken port and upgrade to 2.09.2 Message-ID: <201101071040.p07Aer2X038099@burbank.downtools.com.au> Resent-Message-ID: <201101071050.p07Ao4fk035416@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 153759 >Category: ports >Synopsis: [patch] www/p5-Apache2-Scoreboard: Repair broken port and upgrade to 2.09.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jan 07 10:50:03 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Jarrod Sayers >Release: FreeBSD 8.1-RELEASE-p2 i386 >Organization: >Environment: System: FreeBSD burbank.downtools.com.au 8.1-RELEASE-p2 FreeBSD 8.1-RELEASE-p2 #7: Sat Dec 18 19:18:08 CST 2010 root@burbank.downtools.com.au:/usr/obj/usr/src/sys/BURBANK i386 >Description: Repair broken port and upgrade to 2.09.2. - ports/www/p5-Apache2-Scoreboard/Makefile (modified) - ports/www/p5-Apache2-Scoreboard/distinfo (modified) - ports/www/p5-Apache2-Scoreboard/files/patch-Dummy__Makefile.PL (added) - ports/www/p5-Apache2-Scoreboard/files/patch-Makefile.PL (added) - ports/www/p5-Apache2-Scoreboard/files/patch-mp2-api (removed) >How-To-Repeat: >Fix: The diff can be downloaded from: http://www.downtools.com.au/~jarrod/FreeBSD/www-p5-Apache2-Scoreboard-2.09.2.diff --- www-p5-Apache2-Scoreboard-2.09.2.diff begins here --- diff -ruN ports/www/p5-Apache2-Scoreboard.orig/Makefile ports/www/p5-Apache2-Scoreboard/Makefile --- ports/www/p5-Apache2-Scoreboard.orig/Makefile 2010-09-08 20:00:05.000000000 +0930 +++ ports/www/p5-Apache2-Scoreboard/Makefile 2011-01-07 19:34:27.000000000 +1030 @@ -6,19 +6,22 @@ # PORTNAME= Apache2-Scoreboard -PORTVERSION= 2.08 +PORTVERSION= 2.09.2 CATEGORIES= www perl5 -MASTER_SITES= CPAN +MASTER_SITES= CPAN/../../authors/id/M/MJ/MJH PKGNAMEPREFIX= p5- DISTNAME= Apache-Scoreboard-${PORTVERSION} MAINTAINER= perl@FreeBSD.org COMMENT= Perl interface to the Apache scoreboard structure -BUILD_DEPENDS= ${LOCALBASE}/libexec/apache2/mod_perl.so:${PORTSDIR}/www/mod_perl2 +BUILD_DEPENDS= ${LOCALBASE}/${APACHEMODDIR}/mod_perl.so:${PORTSDIR}/www/mod_perl2 RUN_DEPENDS= ${BUILD_DEPENDS} -BROKEN= does not compile +USE_APACHE= 2.0+ + +# XXX: Hack to strip trailing patch revision from port version. +WRKSRC= ${WRKDIR}/${PORTNAME:C/^Apache2-/Apache-/g}-${PORTVERSION:C/^([0-9]+\.[0-9]+)\.?.*/\1/g} PERL_CONFIGURE= 5.8.0+ @@ -27,8 +30,9 @@ USE_LDCONFIG= YES post-patch: - @${RM} -f ${WRKSRC}/lib/Apache/*.orig - ${SED} -i.bak 's@%%LOCALBASE%%@${LOCALBASE}@g' ${WRKSRC}/Makefile.PL - ${SED} -i.bak 's@%%LOCALBASE%%@${LOCALBASE}@g' ${WRKSRC}/Dummy/Makefile.PL +.for _file in Makefile.PL Dummy/Makefile.PL + @${REINPLACE_CMD} -e 's#%%LOCALBASE%%#${LOCALBASE}#g' \ + -e 's#%%APACHEINCLUDEDIR%%#${APACHEINCLUDEDIR}#g' ${WRKSRC}/${_file} +.endfor .include <bsd.port.mk> diff -ruN ports/www/p5-Apache2-Scoreboard.orig/distinfo ports/www/p5-Apache2-Scoreboard/distinfo --- ports/www/p5-Apache2-Scoreboard.orig/distinfo 2006-04-18 00:48:37.000000000 +0930 +++ ports/www/p5-Apache2-Scoreboard/distinfo 2011-01-07 18:10:42.000000000 +1030 @@ -1,3 +1,2 @@ -MD5 (Apache-Scoreboard-2.08.tar.gz) = f66b6e222cfc4b41c9b327af2478b44b -SHA256 (Apache-Scoreboard-2.08.tar.gz) = c089aeb59d329ad1f9cbac2a631b1ee06e95c7dd31ae49a985e75642d798caba -SIZE (Apache-Scoreboard-2.08.tar.gz) = 18572 +SHA256 (Apache-Scoreboard-2.09.2.tar.gz) = 671252a383aabc5c7906dd54e7dce92b65d944a56782f7233ca5a83c6299cc34 +SIZE (Apache-Scoreboard-2.09.2.tar.gz) = 18728 diff -ruN ports/www/p5-Apache2-Scoreboard.orig/files/patch-Dummy__Makefile.PL ports/www/p5-Apache2-Scoreboard/files/patch-Dummy__Makefile.PL --- ports/www/p5-Apache2-Scoreboard.orig/files/patch-Dummy__Makefile.PL 1970-01-01 09:30:00.000000000 +0930 +++ ports/www/p5-Apache2-Scoreboard/files/patch-Dummy__Makefile.PL 2011-01-07 18:40:53.000000000 +1030 @@ -0,0 +1,12 @@ +--- Dummy/Makefile.PL.orig 2008-01-22 05:47:31.000000000 +1030 ++++ Dummy/Makefile.PL 2011-01-07 18:39:11.000000000 +1030 +@@ -24,7 +24,8 @@ + my $apr_inc = `$apr_config --includedir`; + chomp $apr_inc; + my $extra_inc; +-$extra_inc = "-I$apr_inc" if ($apr_inc); ++$extra_inc = "-I%%LOCALBASE%%/%%APACHEINCLUDEDIR%%/modules/perl"; ++$extra_inc .= " -I$apr_inc" if ($apr_inc); + + ModPerl::MM::WriteMakefile( + NAME => 'Apache::DummyScoreboard', diff -ruN ports/www/p5-Apache2-Scoreboard.orig/files/patch-Makefile.PL ports/www/p5-Apache2-Scoreboard/files/patch-Makefile.PL --- ports/www/p5-Apache2-Scoreboard.orig/files/patch-Makefile.PL 1970-01-01 09:30:00.000000000 +0930 +++ ports/www/p5-Apache2-Scoreboard/files/patch-Makefile.PL 2011-01-07 18:40:59.000000000 +1030 @@ -0,0 +1,12 @@ +--- Makefile.PL.orig 2008-01-22 05:47:41.000000000 +1030 ++++ Makefile.PL 2011-01-07 18:38:36.000000000 +1030 +@@ -36,7 +36,8 @@ + my $apr_inc = `$apr_config --includedir`; + chomp $apr_inc; + my $extra_inc; +-$extra_inc = "-I$apr_inc" if ($apr_inc); ++$extra_inc = "-I%%LOCALBASE%%/%%APACHEINCLUDEDIR%%/modules/perl"; ++$extra_inc .= " -I$apr_inc" if ($apr_inc); + + ModPerl::MM::WriteMakefile( + NAME => 'Apache::Scoreboard', diff -ruN ports/www/p5-Apache2-Scoreboard.orig/files/patch-mp2-api ports/www/p5-Apache2-Scoreboard/files/patch-mp2-api --- ports/www/p5-Apache2-Scoreboard.orig/files/patch-mp2-api 2006-04-18 00:48:37.000000000 +0930 +++ ports/www/p5-Apache2-Scoreboard/files/patch-mp2-api 1970-01-01 09:30:00.000000000 +0930 @@ -1,37 +0,0 @@ ---- Makefile.PL.orig Mon Apr 17 17:08:56 2006 -+++ Makefile.PL Mon Apr 17 17:10:29 2006 -@@ -30,13 +30,18 @@ - Apache::TestMM::filter_args(); - Apache::TestMM::generate_script('t/TEST'); - -+# XXX: this is a hack! -+my $extra_inc = "-I%%LOCALBASE%%/include/apache2/modules/perl/"; -+ - ModPerl::MM::WriteMakefile( - NAME => 'Apache::Scoreboard', - VERSION_FROM => 'lib/Apache/Scoreboard.pm', - PREREQ_PM => \%require, - clean => { - FILES => "@{ clean_files() }", -- } -+ }, -+ # XXX: this is a hack! -+ INC => join " ", $extra_inc, ModPerl::MM::get_def_opt('INC') - ); - - sub clean_files { ---- Dummy/Makefile.PL.orig Mon Apr 17 17:12:37 2006 -+++ Dummy/Makefile.PL Mon Apr 17 17:13:12 2006 -@@ -18,7 +18,12 @@ - - genxs(); - -+# XXX: this is a hack! -+my $extra_inc = "-I%%LOCALBASE%%/include/apache2/modules/perl/"; -+ - ModPerl::MM::WriteMakefile( - NAME => 'Apache::DummyScoreboard', - VERSION_FROM => 'DummyScoreboard.pm', -+ # XXX: this is a hack! -+ INC => join " ", $extra_inc, ModPerl::MM::get_def_opt('INC') - ); --- www-p5-Apache2-Scoreboard-2.09.2.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101071040.p07Aer2X038099>