sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Unbreak on pointyhat.

Browse source 
- Upgrade to 2.04r03.
- Cleanup variables usage and dependency line.

Approved by:	maintainer
Comments from:	eik
This commit is contained in:
Jun Kuriyama 2004-10-12 22:45:25 +00:00
parent 08c4cd6543
commit beded58173
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=119109
10 changed files with 130 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
www/libapreq2/Makefile
View file

@ -6,7 +6,7 @@
# #
PORTNAME= libapreq2 PORTNAME= libapreq2
PORTVERSION= 2.03r04 PORTVERSION= 2.04r03
CATEGORIES= www perl5 devel CATEGORIES= www perl5 devel
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
MASTER_SITE_SUBDIR=libapreq MASTER_SITE_SUBDIR=libapreq
@ -16,26 +16,23 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/r/_/}-dev
MAINTAINER= autrijus@autrijus.org MAINTAINER= autrijus@autrijus.org
COMMENT= Generic Apache2 Request Library COMMENT= Generic Apache2 Request Library
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache2:${PORTSDIR}/www/mod_perl2 \ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache2/ModPerl/Config.pm:${PORTSDIR}/www/mod_perl2 \
${SITE_PERL}/ExtUtils/XSBuilder:${PORTSDIR}/devel/p5-ExtUtils-XSBuilder \ ${SITE_PERL}/ExtUtils/XSBuilder:${PORTSDIR}/devel/p5-ExtUtils-XSBuilder \
${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent ${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent
RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache2:${PORTSDIR}/www/mod_perl2 RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache2/ModPerl/Config.pm:${PORTSDIR}/www/mod_perl2
CONFLICTS= p5-libapreq CONFLICTS= p5-libapreq
USE_GMAKE= yes USE_GMAKE= yes
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--enable-perl-glue --with-apache2-apxs=${LOCALBASE}/sbin/apxs CONFIGURE_ARGS+=--enable-perl-glue --with-apache2-apxs=${APXS}
USE_PERL5= yes USE_PERL5= yes
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} USE_APACHE= yes
WRKSRC= ${WRKDIR}/${DISTNAME:S/_04//} WRKSRC= ${WRKDIR}/${DISTNAME:C/_[0-9]+//}
MAN3= Apache::Cookie.3 Apache::Request.3 post-configure:
cd ${CONFIGURE_WRKSRC}/glue/perl && \
${PERL5} Makefile.PL -apxs ${APXS} && \
${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
.include <bsd.port.pre.mk> .include <bsd.port.mk>
.if ${OSVERSION} >= 502126
BROKEN= "Broken pkg-plist"
.endif
.include <bsd.port.post.mk>

4
www/libapreq2/distinfo
View file

@ -1,2 +1,2 @@
MD5 (libapreq2-2.03_04-dev.tar.gz) = 18cefa860f15812ed35c5e1eb52f9a0a MD5 (libapreq2-2.04_03-dev.tar.gz) = 1f5dd762c877b716f3774d502f575196
SIZE (libapreq2-2.03_04-dev.tar.gz) = 447648 SIZE (libapreq2-2.04_03-dev.tar.gz) = 592748

11
www/libapreq2/files/patch-build-xsbuilder.pl Normal file
View file

@ -0,0 +1,11 @@
--- 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) ;

18
www/libapreq2/files/patch-src-Makefile.in
View file

@ -1,11 +1,13 @@
--- src/Makefile.in.orig Sun Nov 16 12:04:20 2003 --- src/Makefile.in.orig Thu Sep 23 17:02:24 2004
+++ src/Makefile.in Fri Jun 11 14:15:04 2004 +++ src/Makefile.in Thu Sep 23 17:02:55 2004
@@ -110,7 +110,7 @@ @@ -106,8 +106,8 @@
am__quote = @am__quote@ STRIP = @STRIP@
install_sh = @install_sh@ VERSION = @VERSION@
INCLUDES = @APR_INCLUDES@ @APU_INCLUDES@
-INCLUDES = @APR_INCLUDES@ @APU_INCLUDES@
-LIBS = @APR_LTLIBS@ @APU_LTLIBS@ -LIBS = @APR_LTLIBS@ @APU_LTLIBS@
+INCLUDES = @APR_INCLUDES@ @APU_INCLUDES@ -I$(prefix)/include/apache2/modules/perl
+LIBS = @APR_LTLIBS@ @APU_LTLIBS@ -L$(prefix)/lib +LIBS = @APR_LTLIBS@ @APU_LTLIBS@ -L$(prefix)/lib
LDFLAGS = @APR_LDFLAGS@ @APU_LDFLAGS@
EXTRA_DIST = groups.dox.in
BUILT_SOURCES = @APR_LA@ @APU_LA@ 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 \

36
www/libapreq2/pkg-plist
View file

@ -1,15 +1,41 @@
bin/apreq2-config
include/apreq2/apreq.h include/apreq2/apreq.h
include/apreq2/apreq_version.h
include/apreq2/apreq_cookie.h include/apreq2/apreq_cookie.h
include/apreq2/apreq_params.h
include/apreq2/apreq_env.h include/apreq2/apreq_env.h
include/apreq2/apreq_parsers.h include/apreq2/apreq_params.h
lib/libapreq2.so.2 include/apreq2/apreq_version.h
lib/libapreq2.la
lib/libapreq2.a lib/libapreq2.a
lib/libapreq2.la
lib/libapreq2.so
lib/libapreq2.so.2
libexec/apache2/mod_apreq.a
libexec/apache2/mod_apreq.so
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Cookie.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Cookie.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Cookie.pod %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Cookie.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Cookie/Error.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Cookie/Jar/Error.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Cookie/Table.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Request.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Request.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Request.pod %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Request.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Request/Error.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Request/Table.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Upload.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Upload.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Upload/Error.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Upload/Table.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Cookie/Cookie.bs
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Cookie/Cookie.so
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Request/Request.bs
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Request/Request.so
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Upload/Upload.bs
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Upload/Upload.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq2/.packlist %%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq2/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Upload
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Request
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Cookie
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Upload
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Request
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Cookie/Jar
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Cookie
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq2 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq2
@dirrm include/apreq2

25
www/p5-libapreq2/Makefile
View file

@ -6,7 +6,7 @@
# #
PORTNAME= libapreq2 PORTNAME= libapreq2
PORTVERSION= 2.03r04 PORTVERSION= 2.04r03
CATEGORIES= www perl5 devel CATEGORIES= www perl5 devel
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
MASTER_SITE_SUBDIR=libapreq MASTER_SITE_SUBDIR=libapreq
@ -16,26 +16,23 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/r/_/}-dev
MAINTAINER= autrijus@autrijus.org MAINTAINER= autrijus@autrijus.org
COMMENT= Generic Apache2 Request Library COMMENT= Generic Apache2 Request Library
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache2:${PORTSDIR}/www/mod_perl2 \ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache2/ModPerl/Config.pm:${PORTSDIR}/www/mod_perl2 \
${SITE_PERL}/ExtUtils/XSBuilder:${PORTSDIR}/devel/p5-ExtUtils-XSBuilder \ ${SITE_PERL}/ExtUtils/XSBuilder:${PORTSDIR}/devel/p5-ExtUtils-XSBuilder \
${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent ${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent
RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache2:${PORTSDIR}/www/mod_perl2 RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache2/ModPerl/Config.pm:${PORTSDIR}/www/mod_perl2
CONFLICTS= p5-libapreq CONFLICTS= p5-libapreq
USE_GMAKE= yes USE_GMAKE= yes
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--enable-perl-glue --with-apache2-apxs=${LOCALBASE}/sbin/apxs CONFIGURE_ARGS+=--enable-perl-glue --with-apache2-apxs=${APXS}
USE_PERL5= yes USE_PERL5= yes
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} USE_APACHE= yes
WRKSRC= ${WRKDIR}/${DISTNAME:S/_04//} WRKSRC= ${WRKDIR}/${DISTNAME:C/_[0-9]+//}
MAN3= Apache::Cookie.3 Apache::Request.3 post-configure:
cd ${CONFIGURE_WRKSRC}/glue/perl && \
${PERL5} Makefile.PL -apxs ${APXS} && \
${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
.include <bsd.port.pre.mk> .include <bsd.port.mk>
.if ${OSVERSION} >= 502126
BROKEN= "Broken pkg-plist"
.endif
.include <bsd.port.post.mk>

4
www/p5-libapreq2/distinfo
View file

@ -1,2 +1,2 @@
MD5 (libapreq2-2.03_04-dev.tar.gz) = 18cefa860f15812ed35c5e1eb52f9a0a MD5 (libapreq2-2.04_03-dev.tar.gz) = 1f5dd762c877b716f3774d502f575196
SIZE (libapreq2-2.03_04-dev.tar.gz) = 447648 SIZE (libapreq2-2.04_03-dev.tar.gz) = 592748

11
www/p5-libapreq2/files/patch-build-xsbuilder.pl Normal file
View file

@ -0,0 +1,11 @@
--- 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) ;

18
www/p5-libapreq2/files/patch-src-Makefile.in
View file

@ -1,11 +1,13 @@
--- src/Makefile.in.orig Sun Nov 16 12:04:20 2003 --- src/Makefile.in.orig Thu Sep 23 17:02:24 2004
+++ src/Makefile.in Fri Jun 11 14:15:04 2004 +++ src/Makefile.in Thu Sep 23 17:02:55 2004
@@ -110,7 +110,7 @@ @@ -106,8 +106,8 @@
am__quote = @am__quote@ STRIP = @STRIP@
install_sh = @install_sh@ VERSION = @VERSION@
INCLUDES = @APR_INCLUDES@ @APU_INCLUDES@
-INCLUDES = @APR_INCLUDES@ @APU_INCLUDES@
-LIBS = @APR_LTLIBS@ @APU_LTLIBS@ -LIBS = @APR_LTLIBS@ @APU_LTLIBS@
+INCLUDES = @APR_INCLUDES@ @APU_INCLUDES@ -I$(prefix)/include/apache2/modules/perl
+LIBS = @APR_LTLIBS@ @APU_LTLIBS@ -L$(prefix)/lib +LIBS = @APR_LTLIBS@ @APU_LTLIBS@ -L$(prefix)/lib
LDFLAGS = @APR_LDFLAGS@ @APU_LDFLAGS@
EXTRA_DIST = groups.dox.in
BUILT_SOURCES = @APR_LA@ @APU_LA@ 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 \

36
www/p5-libapreq2/pkg-plist
View file

@ -1,15 +1,41 @@
bin/apreq2-config
include/apreq2/apreq.h include/apreq2/apreq.h
include/apreq2/apreq_version.h
include/apreq2/apreq_cookie.h include/apreq2/apreq_cookie.h
include/apreq2/apreq_params.h
include/apreq2/apreq_env.h include/apreq2/apreq_env.h
include/apreq2/apreq_parsers.h include/apreq2/apreq_params.h
lib/libapreq2.so.2 include/apreq2/apreq_version.h
lib/libapreq2.la
lib/libapreq2.a lib/libapreq2.a
lib/libapreq2.la
lib/libapreq2.so
lib/libapreq2.so.2
libexec/apache2/mod_apreq.a
libexec/apache2/mod_apreq.so
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Cookie.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Cookie.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Cookie.pod %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Cookie.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Cookie/Error.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Cookie/Jar/Error.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Cookie/Table.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Request.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Request.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Request.pod %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Request.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Request/Error.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Request/Table.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Upload.pm
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Upload.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Upload/Error.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Upload/Table.pod
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Cookie/Cookie.bs
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Cookie/Cookie.so
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Request/Request.bs
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Request/Request.so
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Upload/Upload.bs
%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Upload/Upload.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq2/.packlist %%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq2/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Upload
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Request
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Cookie
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Upload
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Request
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Cookie/Jar
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Cookie
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq2 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libapreq2
@dirrm include/apreq2