- Update to 2.05. Unbreak.

PR:		ports/81336
Submitted by:	maintainer

4 files changed, 28 insertions, 24 deletions

diff --git a/www/libapreq2/files/patch-build-xsbuilder.pl b/www/libapreq2/files/patch-build-xsbuilder.pl
deleted file mode 100644
index 3ea80734a3d3..000000000000
--- a/www/libapreq2/files/patch-build-xsbuilder.pl
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/xsbuilder.pl.orig    Thu Sep 23 17:15:43 2004
-+++ build/xsbuilder.pl Thu Sep 23 17:15:26 2004
-@@ -309,7 +309,7 @@
-     'NAME'      => '$class',
-     'VERSION'   => '$version',
-     'TYPEMAPS'  => [qw(@$mp2_typemaps $typemap)],
--    'INC'       => "-I$base_dir/glue/perl/xs -I$src_dir -I$xs_dir $apache_includes",
-+    'INC'       => "-I$base_dir/glue/perl/xs -I$src_dir -I$xs_dir -I\\\$(PREFIX)/include/apache2/modules/perl $apache_includes",
-     'LIBS'      => "$apreq_libs $apr_libs",
- } ;
- $txt .= "'depend'  => $deps,\n" if ($deps) ;
diff --git a/www/libapreq2/files/patch-glue-perl-Makefile.PL b/www/libapreq2/files/patch-glue-perl-Makefile.PL
new file mode 100644
index 000000000000..452b081b44a9
--- /dev/null
+++ b/www/libapreq2/files/patch-glue-perl-Makefile.PL
@@ -0,0 +1,13 @@
+--- glue/perl/Makefile.PL	Mon May  2 20:24:29 2005
++++ glue/perl/Makefile.PL	Sat May 21 17:57:39 2005
+@@ -443,8 +443,8 @@
+     'NAME'      => '$class',
+     'VERSION'   => '$version',
+     'TYPEMAPS'  => [qw(@$mp2_typemaps $typemap)],
+-    'INC'       => "-I$base_dir/glue/perl/xs -I$inc_dir -I$xs_dir $apache_includes",
+-    'LIBS'      => "$apreq_libs $apr_libs",
++    'INC'       => "-I$base_dir/glue/perl/xs -I$inc_dir -I$xs_dir $apache_includes -I\\\$(PREFIX)/include/apache2/modules/perl",
++    'LIBS'      => "$apreq_libs $apr_libs -L\\\$(PREFIX)/lib",
+ } ;
+ $txt .= "'depend'  => $deps,\n" if ($deps) ;
+ $txt .= qq{    
diff --git a/www/libapreq2/files/patch-library-Makefile.in b/www/libapreq2/files/patch-library-Makefile.in
new file mode 100644
index 000000000000..f6efd93c0d77
--- /dev/null
+++ b/www/libapreq2/files/patch-library-Makefile.in
@@ -0,0 +1,15 @@
+--- library/Makefile.in.orig	Sat May 21 17:21:51 2005
++++ library/Makefile.in	Sat May 21 17:22:18 2005
+@@ -137,10 +137,10 @@
+ libapreq2_la_OBJECTS = $(am_libapreq2_la_OBJECTS)
+ 
+ DEFS = @DEFS@
+-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include -I$(prefix)/include/apache2/modules/perl
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -L$(prefix)/lib
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cookie.Plo ./$(DEPDIR)/error.Plo \
diff --git a/www/libapreq2/files/patch-src-Makefile.in b/www/libapreq2/files/patch-src-Makefile.in
deleted file mode 100644
index c2adfdbccde1..000000000000
--- a/www/libapreq2/files/patch-src-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/Makefile.in.orig       Thu Sep 23 17:02:24 2004
-+++ src/Makefile.in    Thu Sep 23 17:02:55 2004
-@@ -106,8 +106,8 @@
- STRIP = @STRIP@
- VERSION = @VERSION@
- 
--INCLUDES = @APR_INCLUDES@ @APU_INCLUDES@
--LIBS = @APR_LTLIBS@ @APU_LTLIBS@
-+INCLUDES = @APR_INCLUDES@ @APU_INCLUDES@ -I$(prefix)/include/apache2/modules/perl
-+LIBS = @APR_LTLIBS@ @APU_LTLIBS@ -L$(prefix)/lib
- LDFLAGS = @APR_LDFLAGS@ @APU_LDFLAGS@
- EXTRA_DIST = groups.dox.in
- BUILT_SOURCES = @APR_LA@ @APU_LA@