5 files changed, 4 insertions, 79 deletions

diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile
index 31452fa98918..d22ec7afcb68 100644
--- a/www/libapreq2/Makefile
+++ b/www/libapreq2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libapreq2
-PORTVERSION=	2.02r02
+PORTVERSION=	2.03r04
 CATEGORIES=	www perl5 devel
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 MASTER_SITE_SUBDIR=libapreq
@@ -28,7 +28,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-perl-glue
 USE_PERL5=	yes
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-WRKSRC=		${WRKDIR}/${DISTNAME:S/_02//}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/_04//}
 
 MAN3=		Apache::Cookie.3 Apache::Request.3
 
diff --git a/www/libapreq2/distinfo b/www/libapreq2/distinfo
index 15688756d02c..8d0b36ed5f6f 100644
--- a/www/libapreq2/distinfo
+++ b/www/libapreq2/distinfo
@@ -1,2 +1,2 @@
-MD5 (libapreq2-2.02_02-dev.tar.gz) = dbca30cd45ec88c642ef38ae6d229865
-SIZE (libapreq2-2.02_02-dev.tar.gz) = 458737
+MD5 (libapreq2-2.03_04-dev.tar.gz) = 18cefa860f15812ed35c5e1eb52f9a0a
+SIZE (libapreq2-2.03_04-dev.tar.gz) = 447648
diff --git a/www/libapreq2/files/patch-Makefile.in b/www/libapreq2/files/patch-Makefile.in
deleted file mode 100644
index bab9964d67a0..000000000000
--- a/www/libapreq2/files/patch-Makefile.in
+++ /dev/null
@@ -1,43 +0,0 @@
---- Makefile.in.orig	Sat Jun  5 11:37:37 2004
-+++ Makefile.in	Sat Jun  5 11:38:18 2004
-@@ -493,7 +493,7 @@
- 	-rm -rf $(distdir)
- 	tar xzvf $(distdir).tar.gz
- 	@cd $(distdir); @PERL@ -M$(EUM) -e "die 'Bogus MANIFEST' if $(EUM)::manicheck"
--	@cd $(distdir); @PERL@ Makefile.PL -apxs @APACHE2_APXS@ && make test
-+	@cd $(distdir); @PERL@ Makefile.PL -apxs @APACHE2_APXS@ && $(MAKE) test
- 	rm -rf $(distdir)
- 	@echo "$(distdir).tar.gz is kosher."
- 
-@@ -534,26 +534,26 @@
- test: lib_test env_test $(PERL_TEST)
- 
- env_test:
--	cd env; make test
-+	cd env; $(MAKE) test
- 
- lib_test: check
- 	t/testall -v
- 
- perl_install:
--	cd glue/perl; make install
-+	cd glue/perl; $(MAKE) install
- 
- perl_test:
--	cd glue/perl; make test
-+	cd glue/perl; $(MAKE) test
- 
- perl_glue:
- 	cd glue/perl; @PERL@ ../../build/xsbuilder.pl run
- 	cd glue/perl; @PERL@ Makefile.PL -apxs @APACHE2_APXS@
--	cd glue/perl; make
-+	cd glue/perl; $(MAKE)
- 
- @BUILD_HTTPD_TRUE@install-exec-local: httpd_install
- 
- @BUILD_HTTPD_TRUE@httpd_install:
--@BUILD_HTTPD_TRUE@	cd @APACHE2_SRC@; make install
-+@BUILD_HTTPD_TRUE@	cd @APACHE2_SRC@; $(MAKE) install
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/www/libapreq2/files/patch-glue::Makefile.in b/www/libapreq2/files/patch-glue::Makefile.in
deleted file mode 100644
index 3378bf119c39..000000000000
--- a/www/libapreq2/files/patch-glue::Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- glue/Makefile.in.orig	Sat Jun  5 11:38:26 2004
-+++ glue/Makefile.in	Sat Jun  5 11:38:36 2004
-@@ -251,16 +251,16 @@
- 	cd perl; @PERL@ Makefile.PL -apxs @APACHE2_APXS@
- 
- perl_glue: perl/Makefile
--	cd perl; make
-+	cd perl; $(MAKE)
- 
- perl_test: perl/Makefile
--	cd perl; make test
-+	cd perl; $(MAKE) test
- 
- perl_install:
--	cd perl; make install
-+	cd perl; $(MAKE) install
- 
- perl_clean:
--	cd perl; make clean
-+	cd perl; $(MAKE) clean
- 
- @BUILD_PERL_GLUE_TRUE@all-local: perl_glue
- 
diff --git a/www/libapreq2/files/patch-src-Makefile.in b/www/libapreq2/files/patch-src-Makefile.in
index 353c4a021d83..cf67dc604ce6 100644
--- a/www/libapreq2/files/patch-src-Makefile.in
+++ b/www/libapreq2/files/patch-src-Makefile.in
@@ -9,12 +9,3 @@
  BUILT_SOURCES = @APR_LA@ @APU_LA@
  lib_LTLIBRARIES = lib@APREQ_LIBNAME@.la
  lib@APREQ_LIBNAME@_la_SOURCES = apreq.c apreq_version.c apreq_cookie.c \
-@@ -158,7 +158,7 @@
- 	apreq_config.h.in
- SOURCES = $(lib@APREQ_LIBNAME@_la_SOURCES)
- 
--all: $(BUILT_SOURCES) apreq_config.h
-+all: $(lib_LTLIBRARIES) apreq_config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
- .SUFFIXES: