diff options
| author | Akinori MUSHA <knu@FreeBSD.org> | 2001-06-13 03:16:57 +0000 |
|---|---|---|
| committer | Akinori MUSHA <knu@FreeBSD.org> | 2001-06-13 03:16:57 +0000 |
| commit | 2d50ab98aa9fed5154e47ecf80f4b62373da731e (patch) | |
| tree | 6b8d958c846823aa4b8ff318a36bc2dcf9068a20 /databases | |
| parent | Turn Tcl/Tk support on when BATCH is defined. (diff) | |
The configure script *must* run pre-fetch, since the dependencies are
checked in the fetch target. Before the patch below, make install will
fail to depend on Tcl/Tk, for instance.
Synchronize the batch and default interactive selections for optional
parts of the port.
PR: ports/27949
Submitted by: Palle Girgensohn <girgen@partitur.se> (MAINTAINER)
Notes
Notes:
svn path=/head/; revision=43927
Diffstat (limited to 'databases')
28 files changed, 112 insertions, 112 deletions
diff --git a/databases/postgresql-devel-server/Makefile b/databases/postgresql-devel-server/Makefile index 2b9808841e99..a344f35f60e5 100644 --- a/databases/postgresql-devel-server/Makefile +++ b/databases/postgresql-devel-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -89,15 +89,15 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ NO_OPENSSL="${NO_OPENSSL}" \ DISTNAME="${DISTNAME}" -pre-extract: - @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql - -# We must .include here because we need the Makefile.inc @ pre-install, -# but it is created @ pre-extract +# We must .include here because we need the Makefile.inc @ pre-install +# to determine the correct plist. .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif +pre-everything: + @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql + pre-install: @ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL .if !defined(BATCH) diff --git a/databases/postgresql-devel-server/scripts/configure.postgresql b/databases/postgresql-devel-server/scripts/configure.postgresql index 998aec70c2cb..d9f176d10a4b 100644 --- a/databases/postgresql-devel-server/scripts/configure.postgresql +++ b/databases/postgresql-devel-server/scripts/configure.postgresql @@ -15,14 +15,14 @@ if [ ! "${BATCH}" ]; then fi if [ "${BATCH}" ]; then - set \"MultiByte\" \"ODBC\" \"SSL\" + set \"MultiByte\" \"ODBC\" \"SSL\" \"TCL\" \"TK\" else /usr/bin/dialog --title "configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 7 \ JDBC "Java DataBase Connectivity" OFF \ MultiByte "Multibyte for Multilingualism" ON \ -ODBC "Open Database Connectivity" OFF \ +ODBC "Open Database Connectivity" ON \ TCL "Tcl" ON \ TCLTK "Tcl/Tk" ON \ SSL "Secure Socket Layer" ON \ diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile index 2b9808841e99..a344f35f60e5 100644 --- a/databases/postgresql-devel/Makefile +++ b/databases/postgresql-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -89,15 +89,15 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ NO_OPENSSL="${NO_OPENSSL}" \ DISTNAME="${DISTNAME}" -pre-extract: - @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql - -# We must .include here because we need the Makefile.inc @ pre-install, -# but it is created @ pre-extract +# We must .include here because we need the Makefile.inc @ pre-install +# to determine the correct plist. .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif +pre-everything: + @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql + pre-install: @ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL .if !defined(BATCH) diff --git a/databases/postgresql-devel/scripts/configure.postgresql b/databases/postgresql-devel/scripts/configure.postgresql index 998aec70c2cb..d9f176d10a4b 100644 --- a/databases/postgresql-devel/scripts/configure.postgresql +++ b/databases/postgresql-devel/scripts/configure.postgresql @@ -15,14 +15,14 @@ if [ ! "${BATCH}" ]; then fi if [ "${BATCH}" ]; then - set \"MultiByte\" \"ODBC\" \"SSL\" + set \"MultiByte\" \"ODBC\" \"SSL\" \"TCL\" \"TK\" else /usr/bin/dialog --title "configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 7 \ JDBC "Java DataBase Connectivity" OFF \ MultiByte "Multibyte for Multilingualism" ON \ -ODBC "Open Database Connectivity" OFF \ +ODBC "Open Database Connectivity" ON \ TCL "Tcl" ON \ TCLTK "Tcl/Tk" ON \ SSL "Secure Socket Layer" ON \ diff --git a/databases/postgresql7/Makefile b/databases/postgresql7/Makefile index 2b9808841e99..a344f35f60e5 100644 --- a/databases/postgresql7/Makefile +++ b/databases/postgresql7/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -89,15 +89,15 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ NO_OPENSSL="${NO_OPENSSL}" \ DISTNAME="${DISTNAME}" -pre-extract: - @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql - -# We must .include here because we need the Makefile.inc @ pre-install, -# but it is created @ pre-extract +# We must .include here because we need the Makefile.inc @ pre-install +# to determine the correct plist. .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif +pre-everything: + @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql + pre-install: @ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL .if !defined(BATCH) diff --git a/databases/postgresql7/scripts/configure.postgresql b/databases/postgresql7/scripts/configure.postgresql index 998aec70c2cb..d9f176d10a4b 100644 --- a/databases/postgresql7/scripts/configure.postgresql +++ b/databases/postgresql7/scripts/configure.postgresql @@ -15,14 +15,14 @@ if [ ! "${BATCH}" ]; then fi if [ "${BATCH}" ]; then - set \"MultiByte\" \"ODBC\" \"SSL\" + set \"MultiByte\" \"ODBC\" \"SSL\" \"TCL\" \"TK\" else /usr/bin/dialog --title "configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 7 \ JDBC "Java DataBase Connectivity" OFF \ MultiByte "Multibyte for Multilingualism" ON \ -ODBC "Open Database Connectivity" OFF \ +ODBC "Open Database Connectivity" ON \ TCL "Tcl" ON \ TCLTK "Tcl/Tk" ON \ SSL "Secure Socket Layer" ON \ diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile index 2b9808841e99..a344f35f60e5 100644 --- a/databases/postgresql73-server/Makefile +++ b/databases/postgresql73-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -89,15 +89,15 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ NO_OPENSSL="${NO_OPENSSL}" \ DISTNAME="${DISTNAME}" -pre-extract: - @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql - -# We must .include here because we need the Makefile.inc @ pre-install, -# but it is created @ pre-extract +# We must .include here because we need the Makefile.inc @ pre-install +# to determine the correct plist. .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif +pre-everything: + @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql + pre-install: @ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL .if !defined(BATCH) diff --git a/databases/postgresql73-server/scripts/configure.postgresql b/databases/postgresql73-server/scripts/configure.postgresql index 998aec70c2cb..d9f176d10a4b 100644 --- a/databases/postgresql73-server/scripts/configure.postgresql +++ b/databases/postgresql73-server/scripts/configure.postgresql @@ -15,14 +15,14 @@ if [ ! "${BATCH}" ]; then fi if [ "${BATCH}" ]; then - set \"MultiByte\" \"ODBC\" \"SSL\" + set \"MultiByte\" \"ODBC\" \"SSL\" \"TCL\" \"TK\" else /usr/bin/dialog --title "configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 7 \ JDBC "Java DataBase Connectivity" OFF \ MultiByte "Multibyte for Multilingualism" ON \ -ODBC "Open Database Connectivity" OFF \ +ODBC "Open Database Connectivity" ON \ TCL "Tcl" ON \ TCLTK "Tcl/Tk" ON \ SSL "Secure Socket Layer" ON \ diff --git a/databases/postgresql73/Makefile b/databases/postgresql73/Makefile index 2b9808841e99..a344f35f60e5 100644 --- a/databases/postgresql73/Makefile +++ b/databases/postgresql73/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -89,15 +89,15 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ NO_OPENSSL="${NO_OPENSSL}" \ DISTNAME="${DISTNAME}" -pre-extract: - @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql - -# We must .include here because we need the Makefile.inc @ pre-install, -# but it is created @ pre-extract +# We must .include here because we need the Makefile.inc @ pre-install +# to determine the correct plist. .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif +pre-everything: + @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql + pre-install: @ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL .if !defined(BATCH) diff --git a/databases/postgresql73/scripts/configure.postgresql b/databases/postgresql73/scripts/configure.postgresql index 998aec70c2cb..d9f176d10a4b 100644 --- a/databases/postgresql73/scripts/configure.postgresql +++ b/databases/postgresql73/scripts/configure.postgresql @@ -15,14 +15,14 @@ if [ ! "${BATCH}" ]; then fi if [ "${BATCH}" ]; then - set \"MultiByte\" \"ODBC\" \"SSL\" + set \"MultiByte\" \"ODBC\" \"SSL\" \"TCL\" \"TK\" else /usr/bin/dialog --title "configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 7 \ JDBC "Java DataBase Connectivity" OFF \ MultiByte "Multibyte for Multilingualism" ON \ -ODBC "Open Database Connectivity" OFF \ +ODBC "Open Database Connectivity" ON \ TCL "Tcl" ON \ TCLTK "Tcl/Tk" ON \ SSL "Secure Socket Layer" ON \ diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile index 2b9808841e99..a344f35f60e5 100644 --- a/databases/postgresql74-server/Makefile +++ b/databases/postgresql74-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -89,15 +89,15 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ NO_OPENSSL="${NO_OPENSSL}" \ DISTNAME="${DISTNAME}" -pre-extract: - @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql - -# We must .include here because we need the Makefile.inc @ pre-install, -# but it is created @ pre-extract +# We must .include here because we need the Makefile.inc @ pre-install +# to determine the correct plist. .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif +pre-everything: + @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql + pre-install: @ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL .if !defined(BATCH) diff --git a/databases/postgresql74-server/scripts/configure.postgresql b/databases/postgresql74-server/scripts/configure.postgresql index 998aec70c2cb..d9f176d10a4b 100644 --- a/databases/postgresql74-server/scripts/configure.postgresql +++ b/databases/postgresql74-server/scripts/configure.postgresql @@ -15,14 +15,14 @@ if [ ! "${BATCH}" ]; then fi if [ "${BATCH}" ]; then - set \"MultiByte\" \"ODBC\" \"SSL\" + set \"MultiByte\" \"ODBC\" \"SSL\" \"TCL\" \"TK\" else /usr/bin/dialog --title "configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 7 \ JDBC "Java DataBase Connectivity" OFF \ MultiByte "Multibyte for Multilingualism" ON \ -ODBC "Open Database Connectivity" OFF \ +ODBC "Open Database Connectivity" ON \ TCL "Tcl" ON \ TCLTK "Tcl/Tk" ON \ SSL "Secure Socket Layer" ON \ diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile index 2b9808841e99..a344f35f60e5 100644 --- a/databases/postgresql80-server/Makefile +++ b/databases/postgresql80-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -89,15 +89,15 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ NO_OPENSSL="${NO_OPENSSL}" \ DISTNAME="${DISTNAME}" -pre-extract: - @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql - -# We must .include here because we need the Makefile.inc @ pre-install, -# but it is created @ pre-extract +# We must .include here because we need the Makefile.inc @ pre-install +# to determine the correct plist. .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif +pre-everything: + @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql + pre-install: @ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL .if !defined(BATCH) diff --git a/databases/postgresql80-server/scripts/configure.postgresql b/databases/postgresql80-server/scripts/configure.postgresql index 998aec70c2cb..d9f176d10a4b 100644 --- a/databases/postgresql80-server/scripts/configure.postgresql +++ b/databases/postgresql80-server/scripts/configure.postgresql @@ -15,14 +15,14 @@ if [ ! "${BATCH}" ]; then fi if [ "${BATCH}" ]; then - set \"MultiByte\" \"ODBC\" \"SSL\" + set \"MultiByte\" \"ODBC\" \"SSL\" \"TCL\" \"TK\" else /usr/bin/dialog --title "configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 7 \ JDBC "Java DataBase Connectivity" OFF \ MultiByte "Multibyte for Multilingualism" ON \ -ODBC "Open Database Connectivity" OFF \ +ODBC "Open Database Connectivity" ON \ TCL "Tcl" ON \ TCLTK "Tcl/Tk" ON \ SSL "Secure Socket Layer" ON \ diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile index 2b9808841e99..a344f35f60e5 100644 --- a/databases/postgresql81-server/Makefile +++ b/databases/postgresql81-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -89,15 +89,15 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ NO_OPENSSL="${NO_OPENSSL}" \ DISTNAME="${DISTNAME}" -pre-extract: - @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql - -# We must .include here because we need the Makefile.inc @ pre-install, -# but it is created @ pre-extract +# We must .include here because we need the Makefile.inc @ pre-install +# to determine the correct plist. .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif +pre-everything: + @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql + pre-install: @ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL .if !defined(BATCH) diff --git a/databases/postgresql81-server/scripts/configure.postgresql b/databases/postgresql81-server/scripts/configure.postgresql index 998aec70c2cb..d9f176d10a4b 100644 --- a/databases/postgresql81-server/scripts/configure.postgresql +++ b/databases/postgresql81-server/scripts/configure.postgresql @@ -15,14 +15,14 @@ if [ ! "${BATCH}" ]; then fi if [ "${BATCH}" ]; then - set \"MultiByte\" \"ODBC\" \"SSL\" + set \"MultiByte\" \"ODBC\" \"SSL\" \"TCL\" \"TK\" else /usr/bin/dialog --title "configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 7 \ JDBC "Java DataBase Connectivity" OFF \ MultiByte "Multibyte for Multilingualism" ON \ -ODBC "Open Database Connectivity" OFF \ +ODBC "Open Database Connectivity" ON \ TCL "Tcl" ON \ TCLTK "Tcl/Tk" ON \ SSL "Secure Socket Layer" ON \ diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile index 2b9808841e99..a344f35f60e5 100644 --- a/databases/postgresql82-server/Makefile +++ b/databases/postgresql82-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -89,15 +89,15 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ NO_OPENSSL="${NO_OPENSSL}" \ DISTNAME="${DISTNAME}" -pre-extract: - @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql - -# We must .include here because we need the Makefile.inc @ pre-install, -# but it is created @ pre-extract +# We must .include here because we need the Makefile.inc @ pre-install +# to determine the correct plist. .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif +pre-everything: + @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql + pre-install: @ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL .if !defined(BATCH) diff --git a/databases/postgresql82-server/scripts/configure.postgresql b/databases/postgresql82-server/scripts/configure.postgresql index 998aec70c2cb..d9f176d10a4b 100644 --- a/databases/postgresql82-server/scripts/configure.postgresql +++ b/databases/postgresql82-server/scripts/configure.postgresql @@ -15,14 +15,14 @@ if [ ! "${BATCH}" ]; then fi if [ "${BATCH}" ]; then - set \"MultiByte\" \"ODBC\" \"SSL\" + set \"MultiByte\" \"ODBC\" \"SSL\" \"TCL\" \"TK\" else /usr/bin/dialog --title "configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 7 \ JDBC "Java DataBase Connectivity" OFF \ MultiByte "Multibyte for Multilingualism" ON \ -ODBC "Open Database Connectivity" OFF \ +ODBC "Open Database Connectivity" ON \ TCL "Tcl" ON \ TCLTK "Tcl/Tk" ON \ SSL "Secure Socket Layer" ON \ diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile index 2b9808841e99..a344f35f60e5 100644 --- a/databases/postgresql83-server/Makefile +++ b/databases/postgresql83-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -89,15 +89,15 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ NO_OPENSSL="${NO_OPENSSL}" \ DISTNAME="${DISTNAME}" -pre-extract: - @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql - -# We must .include here because we need the Makefile.inc @ pre-install, -# but it is created @ pre-extract +# We must .include here because we need the Makefile.inc @ pre-install +# to determine the correct plist. .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif +pre-everything: + @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql + pre-install: @ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL .if !defined(BATCH) diff --git a/databases/postgresql83-server/scripts/configure.postgresql b/databases/postgresql83-server/scripts/configure.postgresql index 998aec70c2cb..d9f176d10a4b 100644 --- a/databases/postgresql83-server/scripts/configure.postgresql +++ b/databases/postgresql83-server/scripts/configure.postgresql @@ -15,14 +15,14 @@ if [ ! "${BATCH}" ]; then fi if [ "${BATCH}" ]; then - set \"MultiByte\" \"ODBC\" \"SSL\" + set \"MultiByte\" \"ODBC\" \"SSL\" \"TCL\" \"TK\" else /usr/bin/dialog --title "configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 7 \ JDBC "Java DataBase Connectivity" OFF \ MultiByte "Multibyte for Multilingualism" ON \ -ODBC "Open Database Connectivity" OFF \ +ODBC "Open Database Connectivity" ON \ TCL "Tcl" ON \ TCLTK "Tcl/Tk" ON \ SSL "Secure Socket Layer" ON \ diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile index 2b9808841e99..a344f35f60e5 100644 --- a/databases/postgresql84-server/Makefile +++ b/databases/postgresql84-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -89,15 +89,15 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ NO_OPENSSL="${NO_OPENSSL}" \ DISTNAME="${DISTNAME}" -pre-extract: - @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql - -# We must .include here because we need the Makefile.inc @ pre-install, -# but it is created @ pre-extract +# We must .include here because we need the Makefile.inc @ pre-install +# to determine the correct plist. .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif +pre-everything: + @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql + pre-install: @ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL .if !defined(BATCH) diff --git a/databases/postgresql84-server/scripts/configure.postgresql b/databases/postgresql84-server/scripts/configure.postgresql index 998aec70c2cb..d9f176d10a4b 100644 --- a/databases/postgresql84-server/scripts/configure.postgresql +++ b/databases/postgresql84-server/scripts/configure.postgresql @@ -15,14 +15,14 @@ if [ ! "${BATCH}" ]; then fi if [ "${BATCH}" ]; then - set \"MultiByte\" \"ODBC\" \"SSL\" + set \"MultiByte\" \"ODBC\" \"SSL\" \"TCL\" \"TK\" else /usr/bin/dialog --title "configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 7 \ JDBC "Java DataBase Connectivity" OFF \ MultiByte "Multibyte for Multilingualism" ON \ -ODBC "Open Database Connectivity" OFF \ +ODBC "Open Database Connectivity" ON \ TCL "Tcl" ON \ TCLTK "Tcl/Tk" ON \ SSL "Secure Socket Layer" ON \ diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile index 2b9808841e99..a344f35f60e5 100644 --- a/databases/postgresql90-server/Makefile +++ b/databases/postgresql90-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -89,15 +89,15 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ NO_OPENSSL="${NO_OPENSSL}" \ DISTNAME="${DISTNAME}" -pre-extract: - @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql - -# We must .include here because we need the Makefile.inc @ pre-install, -# but it is created @ pre-extract +# We must .include here because we need the Makefile.inc @ pre-install +# to determine the correct plist. .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif +pre-everything: + @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql + pre-install: @ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL .if !defined(BATCH) diff --git a/databases/postgresql90-server/scripts/configure.postgresql b/databases/postgresql90-server/scripts/configure.postgresql index 998aec70c2cb..d9f176d10a4b 100644 --- a/databases/postgresql90-server/scripts/configure.postgresql +++ b/databases/postgresql90-server/scripts/configure.postgresql @@ -15,14 +15,14 @@ if [ ! "${BATCH}" ]; then fi if [ "${BATCH}" ]; then - set \"MultiByte\" \"ODBC\" \"SSL\" + set \"MultiByte\" \"ODBC\" \"SSL\" \"TCL\" \"TK\" else /usr/bin/dialog --title "configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 7 \ JDBC "Java DataBase Connectivity" OFF \ MultiByte "Multibyte for Multilingualism" ON \ -ODBC "Open Database Connectivity" OFF \ +ODBC "Open Database Connectivity" ON \ TCL "Tcl" ON \ TCLTK "Tcl/Tk" ON \ SSL "Secure Socket Layer" ON \ diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile index 2b9808841e99..a344f35f60e5 100644 --- a/databases/postgresql91-server/Makefile +++ b/databases/postgresql91-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -89,15 +89,15 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ NO_OPENSSL="${NO_OPENSSL}" \ DISTNAME="${DISTNAME}" -pre-extract: - @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql - -# We must .include here because we need the Makefile.inc @ pre-install, -# but it is created @ pre-extract +# We must .include here because we need the Makefile.inc @ pre-install +# to determine the correct plist. .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif +pre-everything: + @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql + pre-install: @ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL .if !defined(BATCH) diff --git a/databases/postgresql91-server/scripts/configure.postgresql b/databases/postgresql91-server/scripts/configure.postgresql index 998aec70c2cb..d9f176d10a4b 100644 --- a/databases/postgresql91-server/scripts/configure.postgresql +++ b/databases/postgresql91-server/scripts/configure.postgresql @@ -15,14 +15,14 @@ if [ ! "${BATCH}" ]; then fi if [ "${BATCH}" ]; then - set \"MultiByte\" \"ODBC\" \"SSL\" + set \"MultiByte\" \"ODBC\" \"SSL\" \"TCL\" \"TK\" else /usr/bin/dialog --title "configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 7 \ JDBC "Java DataBase Connectivity" OFF \ MultiByte "Multibyte for Multilingualism" ON \ -ODBC "Open Database Connectivity" OFF \ +ODBC "Open Database Connectivity" ON \ TCL "Tcl" ON \ TCLTK "Tcl/Tk" ON \ SSL "Secure Socket Layer" ON \ diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile index 2b9808841e99..a344f35f60e5 100644 --- a/databases/postgresql92-server/Makefile +++ b/databases/postgresql92-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= postgresql PORTVERSION= 7.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \ ftp://ftp.postgresql.org/pub/%SUBDIR%/ \ @@ -89,15 +89,15 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ NO_OPENSSL="${NO_OPENSSL}" \ DISTNAME="${DISTNAME}" -pre-extract: - @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql - -# We must .include here because we need the Makefile.inc @ pre-install, -# but it is created @ pre-extract +# We must .include here because we need the Makefile.inc @ pre-install +# to determine the correct plist. .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif +pre-everything: + @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql + pre-install: @ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PORTNAME} PRE-INSTALL .if !defined(BATCH) diff --git a/databases/postgresql92-server/scripts/configure.postgresql b/databases/postgresql92-server/scripts/configure.postgresql index 998aec70c2cb..d9f176d10a4b 100644 --- a/databases/postgresql92-server/scripts/configure.postgresql +++ b/databases/postgresql92-server/scripts/configure.postgresql @@ -15,14 +15,14 @@ if [ ! "${BATCH}" ]; then fi if [ "${BATCH}" ]; then - set \"MultiByte\" \"ODBC\" \"SSL\" + set \"MultiByte\" \"ODBC\" \"SSL\" \"TCL\" \"TK\" else /usr/bin/dialog --title "configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 7 \ JDBC "Java DataBase Connectivity" OFF \ MultiByte "Multibyte for Multilingualism" ON \ -ODBC "Open Database Connectivity" OFF \ +ODBC "Open Database Connectivity" ON \ TCL "Tcl" ON \ TCLTK "Tcl/Tk" ON \ SSL "Secure Socket Layer" ON \ |