6 files changed, 19 insertions, 22 deletions

diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile
index 6e6866f1cb60..6a605bdab241 100644
--- a/www/libapreq2/Makefile
+++ b/www/libapreq2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libapreq2
-PORTVERSION=	2.12
-PORTREVISION=	2
+PORTVERSION=	2.13
 CATEGORIES=	www devel
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 MASTER_SITE_SUBDIR=libapreq
@@ -64,7 +63,7 @@ PLIST_SUB+=	WITH_MODPERL2="@comment "
 .if ${APACHE_VERSION} == 20
 SHLIB_MAJOR=	9
 .else
-SHLIB_MAJOR=	10
+SHLIB_MAJOR=	11
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/libapreq2/distinfo b/www/libapreq2/distinfo
index 2bd456dd93dd..188a7fe2574b 100644
--- a/www/libapreq2/distinfo
+++ b/www/libapreq2/distinfo
@@ -1,3 +1,2 @@
-MD5 (libapreq2-2.12.tar.gz) = 76e2acde0d82246dea6f2565f3746eec
-SHA256 (libapreq2-2.12.tar.gz) = 4bf0f37eb92c8a78f3402b2f830ef4928d399bee9ced7a7c0ec218956490b1b8
-SIZE (libapreq2-2.12.tar.gz) = 859412
+SHA256 (libapreq2-2.13.tar.gz) = 5731e6833b32d88e4a5c690e45ddf20fcf969ce3da666c5627d775e92da0cf6e
+SIZE (libapreq2-2.13.tar.gz) = 891320
diff --git a/www/libapreq2/files/patch-glue-perl-Makefile.PL b/www/libapreq2/files/patch-glue-perl-Makefile.PL
index 26d6f73c2aba..4387e267b7e6 100644
--- a/www/libapreq2/files/patch-glue-perl-Makefile.PL
+++ b/www/libapreq2/files/patch-glue-perl-Makefile.PL
@@ -6,8 +6,8 @@
      '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)/%%APACHEINCLUDEDIR%%/modules/perl",
-+    'LIBS'      => "$apreq_libs $apr_libs -L\\\$(PREFIX)/lib",
++    'INC'       => "-I$base_dir/glue/perl/xs -I$inc_dir -I$xs_dir $apache_includes -I\\\$(LOCALBASE)/%%APACHEINCLUDEDIR%%/modules/perl",
++    'LIBS'      => "$apreq_libs $apr_libs -L\\\$(LOCALBASE)/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
index cc5e82cfeea7..caa5d3320bed 100644
--- a/www/libapreq2/files/patch-library-Makefile.in
+++ b/www/libapreq2/files/patch-library-Makefile.in
@@ -1,11 +1,11 @@
---- ./library/Makefile.in.orig	2009-04-13 06:34:05.000000000 +0000
-+++ ./library/Makefile.in	2009-04-13 06:35:03.000000000 +0000
-@@ -144,7 +144,7 @@
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
- CPPFLAGS = @CPPFLAGS@
+--- library/Makefile.in.orig
++++ library/Makefile.in
+@@ -133,7 +133,7 @@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
 -LIBS = @LIBS@
 +LIBS = @LIBS@ -L$(prefix)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cookie.Plo ./$(DEPDIR)/error.Plo \
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
diff --git a/www/libapreq2/files/patch-module-Makefile.in b/www/libapreq2/files/patch-module-Makefile.in
index 6dc704f27dab..7ba20eb0c595 100644
--- a/www/libapreq2/files/patch-module-Makefile.in
+++ b/www/libapreq2/files/patch-module-Makefile.in
@@ -1,11 +1,11 @@
---- ./module/Makefile.in.orig	2009-04-13 06:36:59.000000000 +0000
-+++ ./module/Makefile.in	2009-04-13 06:35:59.000000000 +0000
-@@ -128,7 +128,7 @@
+--- module/Makefile.in.orig
++++ module/Makefile.in
+@@ -43,7 +43,7 @@
+ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/include/apreq_config.h
  CONFIG_CLEAN_FILES =
- noinst_PROGRAMS = test_cgi$(EXEEXT)
 -PROGRAMS = $(noinst_PROGRAMS)
 +PROGRAMS = 
- 
  test_cgi_SOURCES = test_cgi.c
  test_cgi_OBJECTS = test_cgi.$(OBJEXT)
+ test_cgi_LDADD = $(LDADD)
diff --git a/www/libapreq2/pkg-plist b/www/libapreq2/pkg-plist
index 2ca70c0ff94c..58a26ded684a 100644
--- a/www/libapreq2/pkg-plist
+++ b/www/libapreq2/pkg-plist
@@ -15,7 +15,6 @@ lib/libapreq2.so.%%SHLIB_MAJOR%%
 %%APACHEMODDIR%%/mod_apreq2.a
 %%APACHEMODDIR%%/mod_apreq2.la
 %%APACHEMODDIR%%/mod_apreq2.so
-%%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/DummyVersions.pm
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request.pm
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request.pod
 %%WITH_MODPERL2%%%%SITE_PERL%%/%%PERL_ARCH%%/APR/Request/Apache2.pm