From 8d870e03c6884f1a621a054d651d1f6fe22da194 Mon Sep 17 00:00:00 2001 From: Norikatsu Shigemura Date: Sun, 8 May 2005 07:44:30 +0000 Subject: Chase dependency on p5-DBD-Pg. (Use p5-DBD-Pg-13 on FreeBSD 4.x and Perl 5.00503) --- databases/mysql2pgsql/Makefile | 8 +++++++- databases/p5-Class-DBI-Pg/Makefile | 12 +++++++++--- databases/p5-DBD-PgSPI/Makefile | 9 +++++---- databases/postgresql_autodoc/Makefile | 12 +++++++++--- mail/sympa/Makefile | 8 ++++++-- textproc/openfts/Makefile | 13 ++++++++++--- www/rt2/Makefile | 8 ++++++-- 7 files changed, 52 insertions(+), 18 deletions(-) diff --git a/databases/mysql2pgsql/Makefile b/databases/mysql2pgsql/Makefile index d7e20bddd508..db2e1cf2e876 100644 --- a/databases/mysql2pgsql/Makefile +++ b/databases/mysql2pgsql/Makefile @@ -17,7 +17,13 @@ EXTRACT_ONLY= ${PORTNAME} MAINTAINER= petef@FreeBSD.org COMMENT= Convert a MySQL dump to a PostgreSQL dump +.include + +.if ${PERL_LEVEL} < 500600 +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg-13 +.else RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg +.endif PATCH_WRKSRC= ${WRKDIR} PLIST_FILES= bin/mysql2pgsql @@ -31,4 +37,4 @@ do-extract: do-install: ${INSTALL_SCRIPT} ${WRKDIR}/mysql2pgsql ${PREFIX}/bin -.include +.include diff --git a/databases/p5-Class-DBI-Pg/Makefile b/databases/p5-Class-DBI-Pg/Makefile index 9da2ab1a9766..d38e729e7367 100644 --- a/databases/p5-Class-DBI-Pg/Makefile +++ b/databases/p5-Class-DBI-Pg/Makefile @@ -15,8 +15,14 @@ PKGNAMEPREFIX= p5- MAINTAINER= mat@FreeBSD.org COMMENT= Extensions to Class::DBI for PostgreSQL -BUILD_DEPENDS= ${SITE_PERL}/Class/DBI.pm:${PORTSDIR}/databases/p5-Class-DBI \ - ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg +.include + +BUILD_DEPENDS= ${SITE_PERL}/Class/DBI.pm:${PORTSDIR}/databases/p5-Class-DBI +.if ${PERL_LEVEL} < 500600 +BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg-13 +.else +BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg +.endif RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= yes @@ -32,4 +38,4 @@ post-install: @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .endif -.include +.include diff --git a/databases/p5-DBD-PgSPI/Makefile b/databases/p5-DBD-PgSPI/Makefile index 4fc3cfd96581..91b56c60eb19 100644 --- a/databases/p5-DBD-PgSPI/Makefile +++ b/databases/p5-DBD-PgSPI/Makefile @@ -18,8 +18,7 @@ COMMENT= Provides access to PostgreSQL db through DBI within pl/perl functions BUILD_DEPENDS= ${RUN_DEPENDS} \ ${NONEXISTENT}:${PORTSDIR}/${POSTGRESQL_PORT}:configure -RUN_DEPENDS= ${LOCALBASE}/lib/postgresql/plperl.so:${PORTSDIR}/databases/p5-postgresql-plperl \ - ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg +RUN_DEPENDS= ${LOCALBASE}/lib/postgresql/plperl.so:${PORTSDIR}/databases/p5-postgresql-plperl USE_PGSQL= yes PERL_CONFIGURE= yes @@ -46,9 +45,11 @@ PGSQL_VER= ${DEFAULT_PGSQL_VER} .endif .if ${PERL_LEVEL} < 500600 -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI-137 +RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI-137 \ + ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg-13 .else -RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI +RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \ + ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg .endif CONFIGURE_ENV= POSTGRES_HOME="`${PGSQL_WRKSRC_CMD}`/src" \ diff --git a/databases/postgresql_autodoc/Makefile b/databases/postgresql_autodoc/Makefile index c611ca7c0c36..a104c09b2b82 100644 --- a/databases/postgresql_autodoc/Makefile +++ b/databases/postgresql_autodoc/Makefile @@ -14,8 +14,14 @@ DIST_SUBDIR= postgresql MAINTAINER= olgeni@FreeBSD.org COMMENT= Automatic documentation generator for postgresql databases -BUILD_DEPENDS= ${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \ - ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg +.include + +BUILD_DEPENDS= ${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template +.if ${PERL_LEVEL} < 500600 +BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg-13 +.else +BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg +.endif GNU_CONFIGURE= yes USE_GMAKE= yes @@ -24,4 +30,4 @@ CONFIGURE_ARGS+= --datadir=${DATADIR} WRKSRC= ${WRKDIR}/postgresql_autodoc -.include +.include diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile index 772b32e6c8df..652095479ab3 100644 --- a/mail/sympa/Makefile +++ b/mail/sympa/Makefile @@ -31,6 +31,8 @@ RUN_DEPENDS= ${BUILD_DEPENDS} DB_TYPE= +.include + .if defined(WITH_FASTCGI) .if defined(WITH_APACHE2) BUILD_DEPENDS+= ${LOCALBASE}/libexec/apache2/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi @@ -44,7 +46,11 @@ BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/FCGI.pm:${PORTSDIR}/www/p5-FastCGI BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/Oracle.pm:${PORTSDIR}/databases/p5-DBD-Oracle .else .if ${DB_TYPE} == "Pg" +.if ${PERL_LEVEL} < 500600 +BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg-13 +.else BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg +.endif .else .if ${DB_TYPE} == "Sybase" BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/Sybase.pm:${PORTSDIR}/databases/p5-DBD-Sybase @@ -91,8 +97,6 @@ post-install: post-deinstall: @PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL -.include - .if ${ARCH} == "amd64" BROKEN= "Configure fails on amd64" .endif diff --git a/textproc/openfts/Makefile b/textproc/openfts/Makefile index ec8ba2840736..a015c199578a 100644 --- a/textproc/openfts/Makefile +++ b/textproc/openfts/Makefile @@ -15,8 +15,7 @@ DISTNAME= Search-OpenFTS-${PORTVERSION} MAINTAINER= kuriyama@FreeBSD.org COMMENT= Open Source Full Text Search engine -RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg \ - ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \ +RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \ ${LOCALBASE}/lib/postgresql/tsearch2.so:${PORTSDIR}/databases/postgresql-contrib PERL_CONFIGURE= yes @@ -30,6 +29,14 @@ MAN3= Search::OpenFTS.3 Search::OpenFTS::Base.3 \ .if !defined(NOPORTDOCS) PORTDOCS= Changes INSTALL README primer.html +.include + +.if ${PERL_LEVEL} < 500600 +RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg-13 +.else +RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg +.endif + post-install: ${MKDIR} ${EXAMPLESDIR} ${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR} @@ -48,4 +55,4 @@ create-database: psql ${DBNAME} < tsearch.sql && \ psql ${DBNAME} < openfts.sql -.include +.include diff --git a/www/rt2/Makefile b/www/rt2/Makefile index 6a69d12a01e1..e6666738a1f4 100644 --- a/www/rt2/Makefile +++ b/www/rt2/Makefile @@ -44,8 +44,14 @@ WRKSRC= ${WRKDIR}/rt-${RT_VERSION} RT_VERSION= ${PORTVERSION:C/\./-/g} DB_TYPE?= mysql +.include + .if ${DB_TYPE} == "Pg" +.if ${PERL_LEVEL} < 500600 +BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg-13 +.else BUILD_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg +.endif .else DB_TYPE= mysql BUILD_DEPENDS+= ${LOCALBASE}/bin/safe_mysqld:${PORTSDIR}/databases/mysql323-server @@ -147,8 +153,6 @@ do-install: post-install: @${SED} s!%%PREFIX%%!${PREFIX}!g ${PKGMESSAGE} -.include - .if ${OSVERSION} >= 502000 BROKEN= "Broken pkg-plist" .endif -- cgit v1.2.3