Attachment 95331 Details for Bug 133694 – libapreq2-2.12.patch

[patch] libapreq2-2.12.patch

libapreq2-2.12.patch (text/plain), 10.73 KB, created by Philip M. Gollucci on 2009-04-13 08:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philip M. Gollucci

Created: 2009-04-13 08:10:00 UTC

Size: 10.73 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/www/libapreq2/Makefile,v
>retrieving revision 1.30
>diff -u -u -r1.30 Makefile
>--- Makefile	26 Aug 2008 18:59:39 -0000	1.30
>+++ Makefile	13 Apr 2009 06:58:14 -0000
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	libapreq2
>-PORTVERSION=	2.08
>-PORTREVISION=	3
>+PORTVERSION=	2.12
> CATEGORIES=	www devel
> MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
> MASTER_SITE_SUBDIR=libapreq
>@@ -16,6 +15,7 @@
> COMMENT=	Generic Apache2 Request Library
> 
> USE_APACHE=	2.0+
>+USE_GMAKE=	yes
> USE_LDCONFIG=	yes
> USE_AUTOTOOLS=	autoconf:262 libtool:15
> CONFIGURE_ARGS+=	--with-apache2-apxs=${APXS} --with-expat=${LOCALBASE}
>@@ -59,9 +59,9 @@
> .include <bsd.port.pre.mk>
> 
> .if ${APACHE_VERSION} == 20
>-SHLIB_MAJOR=	8
>-.else
> SHLIB_MAJOR=	9
>+.else
>+SHLIB_MAJOR=	10
> .endif
> 
> .include <bsd.port.post.mk>
>Index: distinfo
>===================================================================
>RCS file: /home/pcvs/ports/www/libapreq2/distinfo,v
>retrieving revision 1.8
>diff -u -u -r1.8 distinfo
>--- distinfo	10 Aug 2006 10:06:15 -0000	1.8
>+++ distinfo	13 Apr 2009 06:58:14 -0000
>@@ -1,3 +1,3 @@
>-MD5 (libapreq2-2.08.tar.gz) = 9fb3deec448f74c455d4ffc13846ea9f
>-SHA256 (libapreq2-2.08.tar.gz) = 8f8d71852ea3addab7690fa96fc50ea5f221f719156d50995f7f3e0a5a59e932
>-SIZE (libapreq2-2.08.tar.gz) = 847527
>+MD5 (libapreq2-2.12.tar.gz) = 76e2acde0d82246dea6f2565f3746eec
>+SHA256 (libapreq2-2.12.tar.gz) = 4bf0f37eb92c8a78f3402b2f830ef4928d399bee9ced7a7c0ec218956490b1b8
>+SIZE (libapreq2-2.12.tar.gz) = 859412
>Index: files/patch-glue-Makefile.in
>===================================================================
>RCS file: /home/pcvs/ports/www/libapreq2/files/patch-glue-Makefile.in,v
>retrieving revision 1.1
>diff -u -u -r1.1 patch-glue-Makefile.in
>--- files/patch-glue-Makefile.in	29 May 2006 15:33:44 -0000	1.1
>+++ files/patch-glue-Makefile.in	13 Apr 2009 06:58:14 -0000
>@@ -1,9 +1,9 @@
>---- glue/Makefile.in.orig	Mon May 29 19:31:01 2006
>-+++ glue/Makefile.in	Mon May 29 19:31:12 2006
>-@@ -262,7 +262,7 @@
>- 	cd perl; $(MAKE) test
>+--- ./glue/Makefile.in.orig	2009-04-13 06:32:19.000000000 +0000
>++++ ./glue/Makefile.in	2009-04-13 06:32:29.000000000 +0000
>+@@ -266,7 +266,7 @@
>  
>  perl_install:
>+ 	cd perl; INSTALL=1 @PERL@ @PERL_OPTS@ Makefile.PL -apxs @APACHE2_APXS@ @MM_OPTS@
> -	cd perl; $(MAKE) install
> +	cd perl; $(MAKE) pure_install
>  
>Index: files/patch-glue-perl-Makefile.PL
>===================================================================
>RCS file: /home/pcvs/ports/www/libapreq2/files/patch-glue-perl-Makefile.PL,v
>retrieving revision 1.6
>diff -u -u -r1.6 patch-glue-perl-Makefile.PL
>--- files/patch-glue-perl-Makefile.PL	26 Aug 2008 18:59:39 -0000	1.6
>+++ files/patch-glue-perl-Makefile.PL	13 Apr 2009 06:58:14 -0000
>@@ -1,103 +1,5 @@
> --- glue/perl/Makefile.PL.orig	2006-08-09 04:26:45.000000000 +0000
> +++ glue/perl/Makefile.PL	2008-08-25 18:07:08.000000000 +0000
>-@@ -37,6 +37,50 @@
>-     read $file, $_[0], -s $file;
>- }
>- 
>-+sub cmp_tuples {
>-+    my ($num_a, $num_b) = @_;
>-+
>-+    while (@$num_a && @$num_b) {
>-+        my $cmp = shift @$num_a <=> shift @$num_b;
>-+        return $cmp if $cmp;
>-+    }  
>-+
>-+    return @$num_a <=> @$num_b;
>-+}
>-+
>-+sub autoconf_foo {
>-+    my ($config, $re_start, $re_end, $re_match) = @_;
>-+
>-+    $$config =~ /^${re_start}APACHE2_INCLUDES${re_end}($re_match)/m or
>-+        die "Can't find apache include directory";
>-+    my $apache_includes = $1;
>-+    $$config =~ /^${re_start}APR_INCLUDES${re_end}($re_match)/m or
>-+        die "Can't find apache include directory";
>-+    $apache_includes .= " $1";
>-+
>-+    my $apr_libs ="";
>-+
>-+    $$config =~ m/^${re_start}APREQ_LIBNAME${re_end}($re_match)/m or
>-+        die "Can't find apreq libname";
>-+
>-+    my $apreq_libname = $1;
>-+
>-+    $$config =~ m/^${re_start}PACKAGE_VERSION${re_end}($re_match)/m or
>-+        die "Can't find package version";
>-+    my $version = $1;
>-+
>-+	## Code around an autoconf 2.60 bug
>-+	## http://lists.gnu.org/archive/html/bug-autoconf/2006-06/msg00127.html
>-+	## $ grep @PACKAGE_VERSION config.status-2.59 config.status-2.60 
>-+	## config.status-2.59:s,@PACKAGE_VERSION@,2.09,;t t
>-+	## config.status-2.60:s,@PACKAGE_VERSION@,|#_!!_#|2.09,g
>-+	foreach ($apache_includes, $apreq_libname, $version) {
>-+	    s/\|#_!!_#\|//g;
>-+	}
>-+
>-+    return ($apache_includes, $apr_libs, $apreq_libname, $version);
>-+}
>-+
>- my ($apache_includes, $apache_dir, $apr_libs, $apreq_libname, $perl_lib);
>- 
>- if (WIN32) {
>-@@ -63,31 +107,22 @@
>- }
>- else {
>-     slurp my $config => "$base_dir/config.status";
>--    $config =~ /^s,\@APACHE2_INCLUDES\@,([^,]+)/m or
>--        die "Can't find apache include directory";
>--    $apache_includes = $1;
>--    $config =~ /^s,\@APR_INCLUDES\@,([^,]+)/m or
>--        die "Can't find apache include directory";
>--    $apache_includes .= " $1";
>--
>--#    $config =~ m/^s,\@APR_LDFLAGS\@,([^,]+)/m or
>--#        die "Can't find apr ldflags";
>--#    $apr_libs = $1;
>--
>--#    $config =~ m/^s,\@APR_LIBS\@,([^,]+)/m or
>--#        die "Can't find apr libraries";
>--#    $apr_libs .= " $1";
>--
>--    $apr_libs ="";
>--
>--    $config =~ m/^s,\@APREQ_LIBNAME\@,([^,]+)/m or
>--        die "Can't find apreq libname";
>--    $apreq_libname = $1;
>--
>--    $config =~ m/^s,\@PACKAGE_VERSION\@,([^,]+)/m or
>--        die "Can't find package version";
>--    $version = $1;
>- 
>-+    $config =~ /GNU Autoconf (\d+\.\d+)/;
>-+    my $autoconf_ver = $1;
>-+ 
>-+    ### XXX: Lord have mercy on us.....
>-+    if (cmp_tuples([split /\./, $autoconf_ver], [qw(2 61)]) > 0) {
>-+        ### Autoconf >=2.62 changed the format of the file
>-+        ### I.E.: S["APACHE2_INCLUDES"]="-I/usr/local/include/apache2"
>-+        ($apache_includes, $apr_libs, $apreq_libname, $version) = 
>-+           autoconf_foo(\$config, qr/S\[\"/, qr/\"\]=\"/, qr/[^\"]+/);
>-+    }
>-+    else {
>-+       ### I.E.: s,@APACHE2_INCLUDES@,-I/usr/local/include/apache22,;t t
>-+       ($apache_includes, $apr_libs, $apreq_libname, $version) = 
>-+          autoconf_foo(\$config, qr/s,\@/, qr/\@,/, qr/[^,]+/);
>-+    }
>- }
>- 
>- my $apreq_libs = WIN32 ?
> @@ -415,8 +450,8 @@
>      'NAME'      => '$class',
>      'VERSION'   => '$version',
>Index: files/patch-library-Makefile.in
>===================================================================
>RCS file: /home/pcvs/ports/www/libapreq2/files/patch-library-Makefile.in,v
>retrieving revision 1.3
>diff -u -u -r1.3 patch-library-Makefile.in
>--- files/patch-library-Makefile.in	10 Aug 2006 10:06:15 -0000	1.3
>+++ files/patch-library-Makefile.in	13 Apr 2009 06:58:14 -0000
>@@ -1,11 +1,11 @@
>---- library/Makefile.in.orig	Thu Aug 10 01:43:51 2006
>-+++ library/Makefile.in	Thu Aug 10 01:43:58 2006
>+--- ./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 @@
>- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
>+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
>+ CPPFLAGS = @CPPFLAGS@
>  LDFLAGS = @LDFLAGS@
>- LIBOBJS = @LIBOBJS@
> -LIBS = @LIBS@
> +LIBS = @LIBS@ -L$(prefix)
>- LIBTOOL = @LIBTOOL@
>- LN_S = @LN_S@
>- LTLIBOBJS = @LTLIBOBJS@
>+ depcomp = $(SHELL) $(top_srcdir)/depcomp
>+ am__depfiles_maybe = depfiles
>+ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cookie.Plo ./$(DEPDIR)/error.Plo \
>Index: files/patch-module-Makefile.in
>===================================================================
>RCS file: /home/pcvs/ports/www/libapreq2/files/patch-module-Makefile.in,v
>retrieving revision 1.2
>diff -u -u -r1.2 patch-module-Makefile.in
>--- files/patch-module-Makefile.in	10 Aug 2006 10:06:15 -0000	1.2
>+++ files/patch-module-Makefile.in	13 Apr 2009 06:58:14 -0000
>@@ -1,11 +1,11 @@
>---- module/Makefile.in.orig	Tue Aug  8 21:29:05 2006
>-+++ module/Makefile.in	Thu Aug 10 01:45:23 2006
>-@@ -47,7 +47,7 @@
>- mkinstalldirs = $(install_sh) -d
>+--- ./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 @@
>  CONFIG_HEADER = $(top_builddir)/include/apreq_config.h
>  CONFIG_CLEAN_FILES =
>+ noinst_PROGRAMS = test_cgi$(EXEEXT)
> -PROGRAMS = $(noinst_PROGRAMS)
>-+PROGRAMS =
>++PROGRAMS = 
>+ 
>  test_cgi_SOURCES = test_cgi.c
>  test_cgi_OBJECTS = test_cgi.$(OBJEXT)
>- test_cgi_LDADD = $(LDADD)
>Index: www/p5-RTx-Statistics/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/www/p5-RTx-Statistics/Makefile,v
>retrieving revision 1.6
>diff -u -r1.6 Makefile
>--- www/p5-RTx-Statistics/Makefile      11 Apr 2009 22:48:06 -0000      1.6
>+++ www/p5-RTx-Statistics/Makefile      13 Apr 2009 06:56:51 -0000
>@@ -7,7 +7,7 @@
>
> PORTNAME=      RTx-Statistics
> PORTVERSION=   0.1.8
>-PORTREVISION=  1
>+PORTREVISION=  2
> CATEGORIES=    www perl5
> MASTER_SITES=  http://opensvn.csie.org/RTx_Statistics/releases/${PORTVERSION}/
> PKGNAMEPREFIX= p5-
>Index: www/rt38/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/www/rt38/Makefile,v
>retrieving revision 1.11
>diff -u -r1.11 Makefile
>--- www/rt38/Makefile   28 Mar 2009 01:16:37 -0000      1.11
>+++ www/rt38/Makefile   13 Apr 2009 06:56:51 -0000
>@@ -13,6 +13,7 @@
>
> PORTNAME=      rt
> PORTVERSION=   3.8.2
>+PORTREVISION=  1
> CATEGORIES=    www
> MASTER_SITES=  http://download.bestpractical.com/pub/rt/release/ \
>                ftp://ftp.eu.uu.net/pub/unix/ticketing/rt/release/
>Index: www/p5-RT-Authen-ExternalAuth/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/www/p5-RT-Authen-ExternalAuth/Makefile,v
>retrieving revision 1.2
>diff -u -r1.2 Makefile
>--- www/p5-RT-Authen-ExternalAuth/Makefile      13 Feb 2009 14:26:02 -0000      1.2
>+++ www/p5-RT-Authen-ExternalAuth/Makefile      13 Apr 2009 06:56:51 -0000
>@@ -7,6 +7,7 @@
>
> PORTNAME=      RT-Authen-ExternalAuth
> PORTVERSION=   0.08
>+PORTREVISION=  1
> CATEGORIES=    www net perl5
> MASTER_SITES=  CPAN
> PKGNAMEPREFIX= p5-
>Index: www/p5-RTx-Calendar/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/www/p5-RTx-Calendar/Makefile,v
>retrieving revision 1.4
>diff -u -r1.4 Makefile
>--- www/p5-RTx-Calendar/Makefile        19 Mar 2009 15:42:05 -0000      1.4
>+++ www/p5-RTx-Calendar/Makefile        13 Apr 2009 06:56:51 -0000
>@@ -7,6 +7,7 @@
>
> PORTNAME=      RTx-Calendar
> PORTVERSION=   0.07
>+PORTREVISION=  1
> CATEGORIES=    www perl5
> MASTER_SITES=  CPAN
> PKGNAMEPREFIX= p5-
>Index: www/p5-RT-Extension-SLA/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/www/p5-RT-Extension-SLA/Makefile,v
>retrieving revision 1.4
>diff -u -r1.4 Makefile
>--- www/p5-RT-Extension-SLA/Makefile    28 Jan 2009 10:34:25 -0000      1.4
>+++ www/p5-RT-Extension-SLA/Makefile    13 Apr 2009 06:56:51 -0000
>@@ -7,7 +7,7 @@
>
> PORTNAME=      RT-Extension-SLA
> PORTVERSION=   0.02
>-PORTREVISION=  1
>+PORTREVISION=  2
> CATEGORIES=    www perl5
> MASTER_SITES=  CPAN
> PKGNAMEPREFIX= p5-

Actions: View | Diff

Attachments on bug 133694: 95331