diff options
author | olgeni <olgeni@FreeBSD.org> | 2001-04-26 01:23:33 +0800 |
---|---|---|
committer | olgeni <olgeni@FreeBSD.org> | 2001-04-26 01:23:33 +0800 |
commit | 984716a405c960675015af785b9e4b7cd5dbb91b (patch) | |
tree | 4b1a3095b3595025e1803f9456a1ae839833ad97 /databases | |
parent | e49d1d49d957693cdbd919d6d39eb7e6a8460a16 (diff) | |
download | freebsd-ports-gnome-984716a405c960675015af785b9e4b7cd5dbb91b.tar.gz freebsd-ports-gnome-984716a405c960675015af785b9e4b7cd5dbb91b.tar.zst freebsd-ports-gnome-984716a405c960675015af785b9e4b7cd5dbb91b.zip |
Specify the full path of the jakarta port's "ant" utility (/usr/local/bin) so
it won't be confused with the "ant" screensaver (in /usr/X11R6/bin).
PR: 26841
Submitted by: Palle Girgensohn <girgen@partitur.se>
Diffstat (limited to 'databases')
14 files changed, 28 insertions, 14 deletions
diff --git a/databases/postgresql-devel-server/scripts/configure.postgresql b/databases/postgresql-devel-server/scripts/configure.postgresql index 5dc646d548a5..b887c91dd9df 100644 --- a/databases/postgresql-devel-server/scripts/configure.postgresql +++ b/databases/postgresql-devel-server/scripts/configure.postgresql @@ -88,7 +88,8 @@ while [ "$1" ]; do fi fi cat <<-EOF - BUILD_DEPENDS+= ant:\${PORTSDIR}/devel/jakarta-ant + BUILD_DEPENDS+= \${LOCALBASE}/bin/ant:\${PORTSDIR}/devel/jakarta-ant + CONFIGURE_ENV+= ANT=\${LOCALBASE}/bin/ant WITH_JDBC=YES MAKE_ENV+= JAVA_HOME=\${JAVA_HOME} SCRIPTS_ENV+= JAVA_HOME=\${JAVA_HOME} diff --git a/databases/postgresql-devel/scripts/configure.postgresql b/databases/postgresql-devel/scripts/configure.postgresql index 5dc646d548a5..b887c91dd9df 100644 --- a/databases/postgresql-devel/scripts/configure.postgresql +++ b/databases/postgresql-devel/scripts/configure.postgresql @@ -88,7 +88,8 @@ while [ "$1" ]; do fi fi cat <<-EOF - BUILD_DEPENDS+= ant:\${PORTSDIR}/devel/jakarta-ant + BUILD_DEPENDS+= \${LOCALBASE}/bin/ant:\${PORTSDIR}/devel/jakarta-ant + CONFIGURE_ENV+= ANT=\${LOCALBASE}/bin/ant WITH_JDBC=YES MAKE_ENV+= JAVA_HOME=\${JAVA_HOME} SCRIPTS_ENV+= JAVA_HOME=\${JAVA_HOME} diff --git a/databases/postgresql7/scripts/configure.postgresql b/databases/postgresql7/scripts/configure.postgresql index 5dc646d548a5..b887c91dd9df 100644 --- a/databases/postgresql7/scripts/configure.postgresql +++ b/databases/postgresql7/scripts/configure.postgresql @@ -88,7 +88,8 @@ while [ "$1" ]; do fi fi cat <<-EOF - BUILD_DEPENDS+= ant:\${PORTSDIR}/devel/jakarta-ant + BUILD_DEPENDS+= \${LOCALBASE}/bin/ant:\${PORTSDIR}/devel/jakarta-ant + CONFIGURE_ENV+= ANT=\${LOCALBASE}/bin/ant WITH_JDBC=YES MAKE_ENV+= JAVA_HOME=\${JAVA_HOME} SCRIPTS_ENV+= JAVA_HOME=\${JAVA_HOME} diff --git a/databases/postgresql73-server/scripts/configure.postgresql b/databases/postgresql73-server/scripts/configure.postgresql index 5dc646d548a5..b887c91dd9df 100644 --- a/databases/postgresql73-server/scripts/configure.postgresql +++ b/databases/postgresql73-server/scripts/configure.postgresql @@ -88,7 +88,8 @@ while [ "$1" ]; do fi fi cat <<-EOF - BUILD_DEPENDS+= ant:\${PORTSDIR}/devel/jakarta-ant + BUILD_DEPENDS+= \${LOCALBASE}/bin/ant:\${PORTSDIR}/devel/jakarta-ant + CONFIGURE_ENV+= ANT=\${LOCALBASE}/bin/ant WITH_JDBC=YES MAKE_ENV+= JAVA_HOME=\${JAVA_HOME} SCRIPTS_ENV+= JAVA_HOME=\${JAVA_HOME} diff --git a/databases/postgresql73/scripts/configure.postgresql b/databases/postgresql73/scripts/configure.postgresql index 5dc646d548a5..b887c91dd9df 100644 --- a/databases/postgresql73/scripts/configure.postgresql +++ b/databases/postgresql73/scripts/configure.postgresql @@ -88,7 +88,8 @@ while [ "$1" ]; do fi fi cat <<-EOF - BUILD_DEPENDS+= ant:\${PORTSDIR}/devel/jakarta-ant + BUILD_DEPENDS+= \${LOCALBASE}/bin/ant:\${PORTSDIR}/devel/jakarta-ant + CONFIGURE_ENV+= ANT=\${LOCALBASE}/bin/ant WITH_JDBC=YES MAKE_ENV+= JAVA_HOME=\${JAVA_HOME} SCRIPTS_ENV+= JAVA_HOME=\${JAVA_HOME} diff --git a/databases/postgresql74-server/scripts/configure.postgresql b/databases/postgresql74-server/scripts/configure.postgresql index 5dc646d548a5..b887c91dd9df 100644 --- a/databases/postgresql74-server/scripts/configure.postgresql +++ b/databases/postgresql74-server/scripts/configure.postgresql @@ -88,7 +88,8 @@ while [ "$1" ]; do fi fi cat <<-EOF - BUILD_DEPENDS+= ant:\${PORTSDIR}/devel/jakarta-ant + BUILD_DEPENDS+= \${LOCALBASE}/bin/ant:\${PORTSDIR}/devel/jakarta-ant + CONFIGURE_ENV+= ANT=\${LOCALBASE}/bin/ant WITH_JDBC=YES MAKE_ENV+= JAVA_HOME=\${JAVA_HOME} SCRIPTS_ENV+= JAVA_HOME=\${JAVA_HOME} diff --git a/databases/postgresql80-server/scripts/configure.postgresql b/databases/postgresql80-server/scripts/configure.postgresql index 5dc646d548a5..b887c91dd9df 100644 --- a/databases/postgresql80-server/scripts/configure.postgresql +++ b/databases/postgresql80-server/scripts/configure.postgresql @@ -88,7 +88,8 @@ while [ "$1" ]; do fi fi cat <<-EOF - BUILD_DEPENDS+= ant:\${PORTSDIR}/devel/jakarta-ant + BUILD_DEPENDS+= \${LOCALBASE}/bin/ant:\${PORTSDIR}/devel/jakarta-ant + CONFIGURE_ENV+= ANT=\${LOCALBASE}/bin/ant WITH_JDBC=YES MAKE_ENV+= JAVA_HOME=\${JAVA_HOME} SCRIPTS_ENV+= JAVA_HOME=\${JAVA_HOME} diff --git a/databases/postgresql81-server/scripts/configure.postgresql b/databases/postgresql81-server/scripts/configure.postgresql index 5dc646d548a5..b887c91dd9df 100644 --- a/databases/postgresql81-server/scripts/configure.postgresql +++ b/databases/postgresql81-server/scripts/configure.postgresql @@ -88,7 +88,8 @@ while [ "$1" ]; do fi fi cat <<-EOF - BUILD_DEPENDS+= ant:\${PORTSDIR}/devel/jakarta-ant + BUILD_DEPENDS+= \${LOCALBASE}/bin/ant:\${PORTSDIR}/devel/jakarta-ant + CONFIGURE_ENV+= ANT=\${LOCALBASE}/bin/ant WITH_JDBC=YES MAKE_ENV+= JAVA_HOME=\${JAVA_HOME} SCRIPTS_ENV+= JAVA_HOME=\${JAVA_HOME} diff --git a/databases/postgresql82-server/scripts/configure.postgresql b/databases/postgresql82-server/scripts/configure.postgresql index 5dc646d548a5..b887c91dd9df 100644 --- a/databases/postgresql82-server/scripts/configure.postgresql +++ b/databases/postgresql82-server/scripts/configure.postgresql @@ -88,7 +88,8 @@ while [ "$1" ]; do fi fi cat <<-EOF - BUILD_DEPENDS+= ant:\${PORTSDIR}/devel/jakarta-ant + BUILD_DEPENDS+= \${LOCALBASE}/bin/ant:\${PORTSDIR}/devel/jakarta-ant + CONFIGURE_ENV+= ANT=\${LOCALBASE}/bin/ant WITH_JDBC=YES MAKE_ENV+= JAVA_HOME=\${JAVA_HOME} SCRIPTS_ENV+= JAVA_HOME=\${JAVA_HOME} diff --git a/databases/postgresql83-server/scripts/configure.postgresql b/databases/postgresql83-server/scripts/configure.postgresql index 5dc646d548a5..b887c91dd9df 100644 --- a/databases/postgresql83-server/scripts/configure.postgresql +++ b/databases/postgresql83-server/scripts/configure.postgresql @@ -88,7 +88,8 @@ while [ "$1" ]; do fi fi cat <<-EOF - BUILD_DEPENDS+= ant:\${PORTSDIR}/devel/jakarta-ant + BUILD_DEPENDS+= \${LOCALBASE}/bin/ant:\${PORTSDIR}/devel/jakarta-ant + CONFIGURE_ENV+= ANT=\${LOCALBASE}/bin/ant WITH_JDBC=YES MAKE_ENV+= JAVA_HOME=\${JAVA_HOME} SCRIPTS_ENV+= JAVA_HOME=\${JAVA_HOME} diff --git a/databases/postgresql84-server/scripts/configure.postgresql b/databases/postgresql84-server/scripts/configure.postgresql index 5dc646d548a5..b887c91dd9df 100644 --- a/databases/postgresql84-server/scripts/configure.postgresql +++ b/databases/postgresql84-server/scripts/configure.postgresql @@ -88,7 +88,8 @@ while [ "$1" ]; do fi fi cat <<-EOF - BUILD_DEPENDS+= ant:\${PORTSDIR}/devel/jakarta-ant + BUILD_DEPENDS+= \${LOCALBASE}/bin/ant:\${PORTSDIR}/devel/jakarta-ant + CONFIGURE_ENV+= ANT=\${LOCALBASE}/bin/ant WITH_JDBC=YES MAKE_ENV+= JAVA_HOME=\${JAVA_HOME} SCRIPTS_ENV+= JAVA_HOME=\${JAVA_HOME} diff --git a/databases/postgresql90-server/scripts/configure.postgresql b/databases/postgresql90-server/scripts/configure.postgresql index 5dc646d548a5..b887c91dd9df 100644 --- a/databases/postgresql90-server/scripts/configure.postgresql +++ b/databases/postgresql90-server/scripts/configure.postgresql @@ -88,7 +88,8 @@ while [ "$1" ]; do fi fi cat <<-EOF - BUILD_DEPENDS+= ant:\${PORTSDIR}/devel/jakarta-ant + BUILD_DEPENDS+= \${LOCALBASE}/bin/ant:\${PORTSDIR}/devel/jakarta-ant + CONFIGURE_ENV+= ANT=\${LOCALBASE}/bin/ant WITH_JDBC=YES MAKE_ENV+= JAVA_HOME=\${JAVA_HOME} SCRIPTS_ENV+= JAVA_HOME=\${JAVA_HOME} diff --git a/databases/postgresql91-server/scripts/configure.postgresql b/databases/postgresql91-server/scripts/configure.postgresql index 5dc646d548a5..b887c91dd9df 100644 --- a/databases/postgresql91-server/scripts/configure.postgresql +++ b/databases/postgresql91-server/scripts/configure.postgresql @@ -88,7 +88,8 @@ while [ "$1" ]; do fi fi cat <<-EOF - BUILD_DEPENDS+= ant:\${PORTSDIR}/devel/jakarta-ant + BUILD_DEPENDS+= \${LOCALBASE}/bin/ant:\${PORTSDIR}/devel/jakarta-ant + CONFIGURE_ENV+= ANT=\${LOCALBASE}/bin/ant WITH_JDBC=YES MAKE_ENV+= JAVA_HOME=\${JAVA_HOME} SCRIPTS_ENV+= JAVA_HOME=\${JAVA_HOME} diff --git a/databases/postgresql92-server/scripts/configure.postgresql b/databases/postgresql92-server/scripts/configure.postgresql index 5dc646d548a5..b887c91dd9df 100644 --- a/databases/postgresql92-server/scripts/configure.postgresql +++ b/databases/postgresql92-server/scripts/configure.postgresql @@ -88,7 +88,8 @@ while [ "$1" ]; do fi fi cat <<-EOF - BUILD_DEPENDS+= ant:\${PORTSDIR}/devel/jakarta-ant + BUILD_DEPENDS+= \${LOCALBASE}/bin/ant:\${PORTSDIR}/devel/jakarta-ant + CONFIGURE_ENV+= ANT=\${LOCALBASE}/bin/ant WITH_JDBC=YES MAKE_ENV+= JAVA_HOME=\${JAVA_HOME} SCRIPTS_ENV+= JAVA_HOME=\${JAVA_HOME} |