Attachment #77700 for bug #111844




#

PORTNAME=	mod_perl
PORTVERSION=	1.30
PORTREVISION=	2
CATEGORIES=	www perl5
MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR=	Apache

MAINTAINER=	pgollucci@p6m7g8.com
COMMENT=	Embeds a Perl interpreter in the Apache server

BUILD_DEPENDS=	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
RUN_DEPENDS=	${BUILD_DEPENDS}

USE_APACHE=	yes
PERL_CONFIGURE=	yes
CONFIGURE_ARGS+=	USE_APXS=1 EVERYTHING=1 INSTALLSITELIB=${SITE_PERL} \
			INSTALLSITEARCH=${SITE_PERL}/${PERL_ARCH} \

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (mod_perl-1.29.tar.gz) = 1491931790509b9af06fc037d02b0e7a	1	MD5 (mod_perl-1.30.tar.gz) = bfd6f6cff1ab1cc3dbb58a236701d169
2	SHA256 (mod_perl-1.29.tar.gz) = b401efaa105dd5f82d6e61f0efa372d4018db15e0748ca34a52d8daa209dea6b	2	SHA256 (mod_perl-1.30.tar.gz) = af6e1380a9197750b2d443f02a7a0dba3586c3fc0c8269beaafef09159184a08
3	SIZE (mod_perl-1.29.tar.gz) = 378877	3	SIZE (mod_perl-1.30.tar.gz) = 389029




--- Makefile.PL.orig	Wed Apr 18 22:00:41 2007
+++ Makefile.PL	Wed Apr 18 22:01:40 2007
@@ -1380,7 +1380,10 @@
     my $string = $self->MM::install;
     my $add = "";
     if ($USE_APXS) {
-        $add = "apxs_install";
+      # XXX The FreeBSD port for mod_perl takes care of installing libperl.so
+      # itself via the pkg-install script.
+      #
+      #  $add = "apxs_install";
+	print "Disabling apxs_install target; deferred to pkg-install\n";
     }
     elsif ($win32_auto and 
            ($win32_args{INSTALL_DLL} or $win32_args{INSTALL_LIB})) {

Return to bug 111844

Lines 6-24 Link Here

(-)Makefile (-4 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= mod_perl	8	PORTNAME= mod_perl
9	PORTVERSION= 1.29	9	PORTVERSION= 1.30
10	PORTREVISION= 2
11	CATEGORIES= www perl5	10	CATEGORIES= www perl5
12	MASTER_SITES= ${MASTER_SITE_PERL_CPAN}	11	MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
13	MASTER_SITE_SUBDIR= Apache	12	MASTER_SITE_SUBDIR= Apache
14		13
15	MAINTAINER= apache@FreeBSD.org	14	MAINTAINER= pgollucci@p6m7g8.com
16	COMMENT= Embeds a Perl interpreter in the Apache server	15	COMMENT= Embeds a Perl interpreter in the Apache server
17		16
18	BUILD_DEPENDS= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww	17	BUILD_DEPENDS= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
19	RUN_DEPENDS= ${BUILD_DEPENDS}	18	RUN_DEPENDS= ${BUILD_DEPENDS}
20		19
21	USE_APACHE= YES	20	USE_APACHE= yes
22	PERL_CONFIGURE= yes	21	PERL_CONFIGURE= yes
23	CONFIGURE_ARGS+= USE_APXS=1 EVERYTHING=1 INSTALLSITELIB=${SITE_PERL} \	22	CONFIGURE_ARGS+= USE_APXS=1 EVERYTHING=1 INSTALLSITELIB=${SITE_PERL} \
24	INSTALLSITEARCH=${SITE_PERL}/${PERL_ARCH} \	23	INSTALLSITEARCH=${SITE_PERL}/${PERL_ARCH} \

Lines 1-15 Link Here

(-)files/patch-Makefile.PL (-12 / +11 lines)
1	--- Makefile.PL.orig Thu Feb 15 12:39:35 2001	1	--- Makefile.PL.orig Wed Apr 18 22:00:41 2007
2	+++ Makefile.PL Thu Feb 15 12:41:28 2001	2	+++ Makefile.PL Wed Apr 18 22:01:40 2007
3	@@ -1300,7 +1300,11 @@	3	@@ -1380,7 +1380,10 @@
4	my $string = $self->MM::install;	4	my $string = $self->MM::install;
5	my $add = "";	5	my $add = "";
6	if($USE_APXS) {	6	if ($USE_APXS) {
7	- $add = "apxs_install";	7	- $add = "apxs_install";
8	+# XXX The FreeBSD port for mod_perl takes care of installing libperl.so	8	+ # XXX The FreeBSD port for mod_perl takes care of installing libperl.so
9	+# itself via the pkg-install script.	9	+ # itself via the pkg-install script.
10	+#	10	+ #
11	+# $add = "apxs_install";	11	+ # $add = "apxs_install";
12	+ print "Disabling apxs_install target; deferred to pkg-install\n";
13	}	12	}
14	elsif ($win32_auto and $win32_args{INSTALL_DLL}) {	13	elsif ($win32_auto and
15	$add = 'amp_install';	14	($win32_args{INSTALL_DLL} or $win32_args{INSTALL_LIB})) {