Date: Tue, 8 Aug 2006 07:22:36 GMT From: "Philip M. Gollucci" <pgollucci@p6m7g8.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/101639: Update: www/p5-Apache-Peek 1.02 -> 1.06, unbreak mp2 builds, request maintainership Message-ID: <200608080722.k787MaDB020064@www.freebsd.org> Resent-Message-ID: <200608080730.k787UFc1041097@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 101639
>Category: ports
>Synopsis: Update: www/p5-Apache-Peek 1.02 -> 1.06, unbreak mp2 builds, request maintainership
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Aug 08 07:30:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Philip M. Gollucci
>Release: 6.1-stable
>Organization:
P6M7G8 Consulting
>Environment:
FreeBSD home.p6m7g8.net 6.1-STABLE FreeBSD 6.1-STABLE #0: Mon Jul 3 23:24:44 PDT 2006 pgollucci@home.p6m7g8.net:/usr/obj/usr/src/sys/HOME i386
>Description:
Depends on:
http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/101636
Obsolete/Superceeds
http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/84143
From Skv:
3. I don't like hack with INC overriding. I suppose ModPerl::MM must be
patched to support correct set of -I dirs. Too much modules are
depended on mod_perl2 hence such "-I" workaround must be applied to
mod_perl2 port.
I did patch this as feed back to 84143, but was never comitted. That
particular patch no longer works as www/apache22 is now a choice too,
if you so desire I could craft another patch for this. I; however,
with my mod_perl PMC hat on, do not particular like this idea.
This passes portlint -A except for this
FATAL: breaks INDEX ([: -le: argument expected [: -le: argument expected p5-Apache-Peek-1.06: "/usr/ports/apache20" non-existent -- dependency list incomplete).
1 fatal errors and 0 warnings found.
This is caused by the inclusion of USE_APACHE=x and is not unique to this port
any any apache version.
I've tested this port with
lang/perl5.8
www/apache13 + www/mod_perl
www/apache20 + www/mod_perl2
www/apache22 + www/mod_perl2
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/p5-Apache-Peek/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile 17 May 2005 17:18:22 -0000 1.12
+++ Makefile 8 Aug 2006 07:12:49 -0000
@@ -2,34 +2,38 @@
# Date created: 24-Jul-2000
# Whom: Leo Kim <leo@florida.sarang.net>
#
-# $FreeBSD: ports/www/p5-Apache-Peek/Makefile,v 1.12 2005/05/17 17:18:22 sem Exp $
+# $FreeBSD$
#
PORTNAME= Apache-Peek
-PORTVERSION= 1.02
+PORTVERSION= 1.06
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= ../../authors/id/S/ST/STAS
+MASTER_SITE_SUBDIR= Apache
PKGNAMEPREFIX= p5-
-MAINTAINER= skv@FreeBSD.org
+MAINTAINER= pgollucci@p6m7g8.com
COMMENT= A data debugging tool for the XS programmer (under mod_perl)
.if defined(WITH_MODPERL2)
-BROKEN= Broken due the new mod_perl2 API
-BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache2/mod_perl.pm:${PORTSDIR}/www/mod_perl2
-MOD_PERL= 2
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2
.else
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
- ${SITE_PERL}/${PERL_ARCH}/Apache/Test.pm:${PORTSDIR}/www/p5-Apache-Test
-MOD_PERL= 1
+ ${SITE_PERL}/${PERL_ARCH}/Apache/Test.pm:${PORTSDIR}/www/p5-Apache-Test
.endif
-PERL_CONFIGURE= YES
+## this is intentionally outside the above if because of portlint
+.if defined(WITH_MODPERL2)
+MODPERL= 2
+.else
+MODPERL= 1
+.endif
-CONFIGURE_ARGS= -httpd ${LOCALBASE}/sbin/httpd
+USE_APACHE= 1.3+
-MAN3= Apache::Peek.3
+PERL_CONFIGURE= YES
+
+CONFIGURE_ARGS= MOD_PERL=${MOD_PERL} -httpd ${LOCALBASE}/sbin/httpd
.include <bsd.port.pre.mk>
@@ -37,9 +41,19 @@
BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Devel/Peek.pm:${PORTSDIR}/devel/p5-Devel-Peek
.endif
-RUN_DEPENDS= ${BUILD_DEPENDS}
+.if defined(WITH_MODPERL2)
+INC=-I${LOCALBASE}/${APACHEINCLUDEDIR} \
+ -I${LOCALBASE}/${APACHEINCLUDEDIR}/modules \
+ -I${LOCALBASE}/${APACHEINCLUDEDIR}/modules/perl
+
+.if ${APACHE_VERSION} == 22
+INC+=-I${LOCALBASE}/include/apr-1
+.endif
+
+CONFIGURE_ARGS+='INC=${INC}'
-post-patch:
- @${PERL} -pi -e '$$_="" if /^test_configure\(/;' ${WRKSRC}/Makefile.PL
+.endif
+
+MAN3= Apache::Peek.3
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/www/p5-Apache-Peek/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 24 Jan 2006 03:13:40 -0000 1.4
+++ distinfo 8 Aug 2006 07:12:49 -0000
@@ -1,3 +1,3 @@
-MD5 (Apache-Peek-1.02.tar.gz) = 160f9c78fcf6d7d034ce83bf7b4c118b
-SHA256 (Apache-Peek-1.02.tar.gz) = 6bbce1d04d492c08f5ccaa9af2948ee78793b7ce3c089782a7d3cffd794e43f9
-SIZE (Apache-Peek-1.02.tar.gz) = 23500
+MD5 (Apache-Peek-1.06.tar.gz) = c1e028bbd61ba01b8e48035466b39feb
+SHA256 (Apache-Peek-1.06.tar.gz) = 1b64ef67d69225602b34ea29de4613b7210d7808e36786b5ec99d7f7e70bbf86
+SIZE (Apache-Peek-1.06.tar.gz) = 49865
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608080722.k787MaDB020064>