head	1.4;
access;
symbols
	RELEASE_4_3_0:1.3
	RELEASE_4_2_0:1.2
	RELEASE_4_1_1:1.2
	RELEASE_4_1_0:1.2
	RELEASE_3_5_0:1.2
	p5_libapreq_0_31:1.1.1.1
	FRANK_MAYHAR:1.1.1;
locks; strict;
comment	@# @;


1.4
date	2001.07.01.05.05.53;	author vanilla;	state dead;
branches;
next	1.3;

1.3
date	2001.03.14.22.44.22;	author vanilla;	state Exp;
branches;
next	1.2;

1.2
date	2000.04.23.16.42.13;	author vanilla;	state Exp;
branches;
next	1.1;

1.1
date	2000.03.19.05.42.08;	author vanilla;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2000.03.19.05.42.08;	author vanilla;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Upgrade to 0.33.

No Responsed by:	maintainer
@
text
@--- c/Makefile.PL.orig	Wed Mar 29 22:22:28 2000
+++ c/Makefile.PL	Wed Mar 14 11:21:17 2001
@@@@ -7,49 +7,23 @@@@
     win32_setup();
 }
 else {
-    require Apache::src;
-    my $src = Apache::src->new;
+    my $inc1 = `apxs -q INCLUDEDIR`;
+    my $inc2 = $inc1 ."/modules/perl";
 
     use Cwd;
     my $pwd = fastcwd;
     my @@objs = qw(apache_request.o apache_cookie.o apache_multipart_buffer.o);
-    $MY_LD_RUN_PATH = "$Config{installsitearch}/auto/libapreq:$pwd"; 
 
     WriteMakefile(
-       #grr, problems with things finding libapreq.so, sort out later.
        'LINKTYPE' => 'static',
-#       'SKIP' => [qw(dynamic_lib dynamic_bs)],
        'NAME'	 => 'libapreq',
-       'INC' 	 => $src->inc,
-       'TYPEMAPS'   => $src->typemaps,
+       'INC' 	 => "-I$inc1 -I$inc2",
        'OBJECT' => "@@objs",
     );
 }
 
 use Cwd;
 my $pwd = fastcwd;
-$ENV{LD_RUN_PATH} = 
-    "$ENV{LD_RUN_PATH}:$Config{installsitearch}/auto/libapr:$pwd";
-
-sub MY::dynamic {
-    my $self = shift;
-    my $string = $self->MM::dynamic;
-    $string =~ s/(Makefile\s+).*/$1/g;
-    $string;
-}
-
-sub MY::top_targets { 
-    my $self = shift; 
-    my $string = $self->MM::top_targets; 
-    my $libapreq = <<"EOF";
-LD_RUN_PATH = $ENV{LD_RUN_PATH}
-EOF
-
-    my $so = "\n".'$(DLBASE).$(DLEXT): $(INST_DYNAMIC)'."\n";
-
-    $string =~ s/(pure_all\s+::\s+)(.*)/$1 static $2/; 
-    return $libapreq . $so . $string;
-}
 
 sub MY::post_initialize { 
     my $self = shift; 
@


1.3
log
@Upgrade to 0.31_03.

PR:		ports/25807
Submitted by:	maintainer
@
text
@@


1.2
log
@Make it compileable with latest version of p5-Apache.
@
text
@d1 2
a2 2
--- c/Makefile.PL.orig	Sat May  1 14:44:28 1999
+++ c/Makefile.PL	Sun Apr 23 21:47:27 2000
d14 1
a14 1
     my @@objs = qw(apache_request.o apache_cookie.o multipart_buffer.o);
a55 47
--- Cookie/Makefile.PL.orig	Sat May  1 14:44:28 1999
+++ Cookie/Makefile.PL	Sun Apr 23 21:43:43 2000
@@@@ -15,9 +15,9 @@@@
     xsubpp("Cookie");
 }
 else {
-    require Apache::src;
-    my $src = Apache::src->new;
     use File::Path 'mkpath';
+    my $inc1 = `apxs -q INCLUDEDIR`;
+    my $inc2 = $inc1."/modules/perl";
     my $root = "../blib/arch/auto/libapreq";
     mkpath $root, 1, 0755 unless -d $root;
 
@@@@ -25,8 +25,7 @@@@
     system "touch $root/libapreq.a";
     WriteMakefile(
         @@mm_args,
-        'INC'	=> "-I../c ". $src->inc,
-        'TYPEMAPS'  => $src->typemaps,
+        'INC'	=> "-I../c -I$inc1 -I$inc2",
         'LIBS' => "-L$root -lapreq",
     );
     unlink "$root/libapreq.a";
--- Request/Makefile.PL.orig	Sat May  1 14:44:28 1999
+++ Request/Makefile.PL	Sun Apr 23 21:43:43 2000
@@@@ -15,8 +15,8 @@@@
     xsubpp("Request");
 }
 else {
-    require Apache::src;
-    my $src = Apache::src->new;
+    my $inc1 = `apxs -q INCLUDEDIR`;
+    my $inc2 = $inc1 ."/modules/perl";
     use File::Path 'mkpath';
     my $root = "../blib/arch/auto/libapreq";
     mkpath $root, 1, 0755 unless -d $root;
@@@@ -25,8 +25,7 @@@@
     system "touch $root/libapreq.a";
     WriteMakefile(
 	  @@mm_args,
-	  'INC'	=> "-I../c ". $src->inc,
-	  'TYPEMAPS'  => $src->typemaps,
+	  'INC'	=> "-I../c -I$inc1 -I$inc2",
           'LIBS' => "-L$root -lapreq",
     );
     unlink "$root/libapreq.a";
@


1.1
log
@Initial revision
@
text
@d1 3
a3 3
--- c/Makefile.PL.orig	Tue Mar 14 09:16:14 2000
+++ c/Makefile.PL	Tue Mar 14 16:31:06 2000
@@@@ -7,49 +7,41 @@@@
d9 2
a10 1
+    my $inc = `apxs -q INCLUDEDIR`;
d19 1
a19 1
-       'LINKTYPE' => 'static',
a20 1
+       'LINKTYPE' => 'dynamic',
d24 1
a24 1
+       'INC' 	 => "-I$inc",
d33 1
a33 1
 
a52 18
+#sub MY::dynamic {
+#    my $self = shift;
+#    my $string = $self->MM::dynamic;
+#    $string =~ s/(Makefile\s+).*/$1/g;
+#    $string;
+#}
+
+#sub MY::top_targets { 
+#    my $self = shift; 
+#    my $string = $self->MM::top_targets; 
+#    my $libapreq = <<"EOF";
+#EOF
+#
+#    my $so = "\n".'$(DLBASE).$(DLEXT): $(INST_DYNAMIC)'."\n";
+#
+#    $string =~ s/(pure_all\s+::\s+)(.*)/$1 static $2/; 
+#    return $libapreq . $so . $string;
+#}
d56 3
a58 3
--- Cookie/Makefile.PL.orig	Tue Mar 14 16:02:52 2000
+++ Cookie/Makefile.PL	Tue Mar 14 16:05:01 2000
@@@@ -15,9 +15,8 @@@@
d65 2
a66 1
+    my $inc = `apxs -q INCLUDEDIR`;
d70 1
a70 1
@@@@ -25,8 +24,7 @@@@
d76 1
a76 1
+        'INC'	=> "-I../c -I$inc -I$ENV{'PORTSDIR'}/www/p5-Apache/work/mod_perl-1.21/src/modules/perl",
d80 3
a82 3
--- Request/Makefile.PL.orig	Tue Mar 14 09:53:01 2000
+++ Request/Makefile.PL	Tue Mar 14 16:01:06 2000
@@@@ -15,9 +15,8 @@@@
d88 2
a90 1
+    my $inc = `apxs -q INCLUDEDIR`;
d93 1
a93 2
 
@@@@ -25,8 +24,7 @@@@
d99 1
a99 1
+	  'INC'	=> "-I../c -I$inc -I$ENV{'PORTSDIR'}/www/p5-Apache/work/mod_perl-1.21/src/modules/perl",
@


1.1.1.1
log
@libapreq - Generic Apache Request Library

PR:		ports/17370
Submitted by:	frank@@exit.com (Frank Mayhar)
@
text
@@
