diff options
-rw-r--r-- | mail/postfix-current/Makefile | 5 | ||||
-rw-r--r-- | mail/postfix-current/pkg-install | 3 | ||||
-rw-r--r-- | mail/postfix/Makefile | 5 | ||||
-rw-r--r-- | mail/postfix/pkg-install | 3 | ||||
-rw-r--r-- | mail/postfix1/Makefile | 5 | ||||
-rw-r--r-- | mail/postfix1/pkg-install | 3 | ||||
-rw-r--r-- | mail/postfix20/Makefile | 5 | ||||
-rw-r--r-- | mail/postfix20/pkg-install | 3 | ||||
-rw-r--r-- | mail/postfix21/Makefile | 5 | ||||
-rw-r--r-- | mail/postfix21/pkg-install | 3 | ||||
-rw-r--r-- | mail/postfix22/Makefile | 5 | ||||
-rw-r--r-- | mail/postfix22/pkg-install | 3 | ||||
-rw-r--r-- | mail/postfix23/Makefile | 5 | ||||
-rw-r--r-- | mail/postfix23/pkg-install | 3 | ||||
-rw-r--r-- | mail/postfix24/Makefile | 5 | ||||
-rw-r--r-- | mail/postfix24/pkg-install | 3 | ||||
-rw-r--r-- | mail/postfix25/Makefile | 5 | ||||
-rw-r--r-- | mail/postfix25/pkg-install | 3 | ||||
-rw-r--r-- | mail/postfix26/Makefile | 5 | ||||
-rw-r--r-- | mail/postfix26/pkg-install | 3 | ||||
-rw-r--r-- | mail/postfix27/Makefile | 5 | ||||
-rw-r--r-- | mail/postfix27/pkg-install | 3 | ||||
-rw-r--r-- | mail/postfix28/Makefile | 5 | ||||
-rw-r--r-- | mail/postfix28/pkg-install | 3 |
24 files changed, 48 insertions, 48 deletions
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index fa85c1c7d388..3e59b6eb7ad6 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -22,7 +22,6 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= khera@kciLink.com USE_SUBMAKE= yes -IS_INTERACTIVE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ @@ -63,7 +62,7 @@ post-patch: ${ECHO} "all: default" >> Makefile) pre-install: - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .if defined(NOPORTDOCS) READMEDIR=no @@ -109,7 +108,7 @@ do-install: .endif post-install: - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed # man pages, since the ports software compresses them after this step, and # if we run etc/postfix/post-install again during package installation, diff --git a/mail/postfix-current/pkg-install b/mail/postfix-current/pkg-install index 3ef249b885b1..8ecea1626d2b 100644 --- a/mail/postfix-current/pkg-install +++ b/mail/postfix-current/pkg-install @@ -4,13 +4,14 @@ # PKG_PREFIX=${PKG_PREFIX:=/usr/local} +BATCH=${BATCH:=no} ask() { local question default answer question=$1 default=$2 - if [ -z "${PACKAGE_BUILDING}" ]; then + if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then read -p "${question} [${default}]? " answer fi if [ x${answer} = x ]; then diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index fdc21a706a7d..793fe9f6c906 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -22,7 +22,6 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= khera@kciLink.com USE_SUBMAKE= yes -IS_INTERACTIVE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ @@ -61,7 +60,7 @@ post-patch: ${ECHO} "all: default" >> Makefile) pre-install: - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .if defined(NOPORTDOCS) READMEDIR=no @@ -107,7 +106,7 @@ do-install: .endif post-install: - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed # man pages, since the ports software compresses them after this step, and # if we run etc/postfix/post-install again during package installation, diff --git a/mail/postfix/pkg-install b/mail/postfix/pkg-install index 3ef249b885b1..8ecea1626d2b 100644 --- a/mail/postfix/pkg-install +++ b/mail/postfix/pkg-install @@ -4,13 +4,14 @@ # PKG_PREFIX=${PKG_PREFIX:=/usr/local} +BATCH=${BATCH:=no} ask() { local question default answer question=$1 default=$2 - if [ -z "${PACKAGE_BUILDING}" ]; then + if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then read -p "${question} [${default}]? " answer fi if [ x${answer} = x ]; then diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile index fdc21a706a7d..793fe9f6c906 100644 --- a/mail/postfix1/Makefile +++ b/mail/postfix1/Makefile @@ -22,7 +22,6 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= khera@kciLink.com USE_SUBMAKE= yes -IS_INTERACTIVE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ @@ -61,7 +60,7 @@ post-patch: ${ECHO} "all: default" >> Makefile) pre-install: - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .if defined(NOPORTDOCS) READMEDIR=no @@ -107,7 +106,7 @@ do-install: .endif post-install: - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed # man pages, since the ports software compresses them after this step, and # if we run etc/postfix/post-install again during package installation, diff --git a/mail/postfix1/pkg-install b/mail/postfix1/pkg-install index 3ef249b885b1..8ecea1626d2b 100644 --- a/mail/postfix1/pkg-install +++ b/mail/postfix1/pkg-install @@ -4,13 +4,14 @@ # PKG_PREFIX=${PKG_PREFIX:=/usr/local} +BATCH=${BATCH:=no} ask() { local question default answer question=$1 default=$2 - if [ -z "${PACKAGE_BUILDING}" ]; then + if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then read -p "${question} [${default}]? " answer fi if [ x${answer} = x ]; then diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile index fdc21a706a7d..793fe9f6c906 100644 --- a/mail/postfix20/Makefile +++ b/mail/postfix20/Makefile @@ -22,7 +22,6 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= khera@kciLink.com USE_SUBMAKE= yes -IS_INTERACTIVE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ @@ -61,7 +60,7 @@ post-patch: ${ECHO} "all: default" >> Makefile) pre-install: - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .if defined(NOPORTDOCS) READMEDIR=no @@ -107,7 +106,7 @@ do-install: .endif post-install: - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed # man pages, since the ports software compresses them after this step, and # if we run etc/postfix/post-install again during package installation, diff --git a/mail/postfix20/pkg-install b/mail/postfix20/pkg-install index 3ef249b885b1..8ecea1626d2b 100644 --- a/mail/postfix20/pkg-install +++ b/mail/postfix20/pkg-install @@ -4,13 +4,14 @@ # PKG_PREFIX=${PKG_PREFIX:=/usr/local} +BATCH=${BATCH:=no} ask() { local question default answer question=$1 default=$2 - if [ -z "${PACKAGE_BUILDING}" ]; then + if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then read -p "${question} [${default}]? " answer fi if [ x${answer} = x ]; then diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile index fdc21a706a7d..793fe9f6c906 100644 --- a/mail/postfix21/Makefile +++ b/mail/postfix21/Makefile @@ -22,7 +22,6 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= khera@kciLink.com USE_SUBMAKE= yes -IS_INTERACTIVE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ @@ -61,7 +60,7 @@ post-patch: ${ECHO} "all: default" >> Makefile) pre-install: - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .if defined(NOPORTDOCS) READMEDIR=no @@ -107,7 +106,7 @@ do-install: .endif post-install: - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed # man pages, since the ports software compresses them after this step, and # if we run etc/postfix/post-install again during package installation, diff --git a/mail/postfix21/pkg-install b/mail/postfix21/pkg-install index 3ef249b885b1..8ecea1626d2b 100644 --- a/mail/postfix21/pkg-install +++ b/mail/postfix21/pkg-install @@ -4,13 +4,14 @@ # PKG_PREFIX=${PKG_PREFIX:=/usr/local} +BATCH=${BATCH:=no} ask() { local question default answer question=$1 default=$2 - if [ -z "${PACKAGE_BUILDING}" ]; then + if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then read -p "${question} [${default}]? " answer fi if [ x${answer} = x ]; then diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile index fdc21a706a7d..793fe9f6c906 100644 --- a/mail/postfix22/Makefile +++ b/mail/postfix22/Makefile @@ -22,7 +22,6 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= khera@kciLink.com USE_SUBMAKE= yes -IS_INTERACTIVE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ @@ -61,7 +60,7 @@ post-patch: ${ECHO} "all: default" >> Makefile) pre-install: - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .if defined(NOPORTDOCS) READMEDIR=no @@ -107,7 +106,7 @@ do-install: .endif post-install: - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed # man pages, since the ports software compresses them after this step, and # if we run etc/postfix/post-install again during package installation, diff --git a/mail/postfix22/pkg-install b/mail/postfix22/pkg-install index 3ef249b885b1..8ecea1626d2b 100644 --- a/mail/postfix22/pkg-install +++ b/mail/postfix22/pkg-install @@ -4,13 +4,14 @@ # PKG_PREFIX=${PKG_PREFIX:=/usr/local} +BATCH=${BATCH:=no} ask() { local question default answer question=$1 default=$2 - if [ -z "${PACKAGE_BUILDING}" ]; then + if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then read -p "${question} [${default}]? " answer fi if [ x${answer} = x ]; then diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile index fdc21a706a7d..793fe9f6c906 100644 --- a/mail/postfix23/Makefile +++ b/mail/postfix23/Makefile @@ -22,7 +22,6 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= khera@kciLink.com USE_SUBMAKE= yes -IS_INTERACTIVE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ @@ -61,7 +60,7 @@ post-patch: ${ECHO} "all: default" >> Makefile) pre-install: - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .if defined(NOPORTDOCS) READMEDIR=no @@ -107,7 +106,7 @@ do-install: .endif post-install: - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed # man pages, since the ports software compresses them after this step, and # if we run etc/postfix/post-install again during package installation, diff --git a/mail/postfix23/pkg-install b/mail/postfix23/pkg-install index 3ef249b885b1..8ecea1626d2b 100644 --- a/mail/postfix23/pkg-install +++ b/mail/postfix23/pkg-install @@ -4,13 +4,14 @@ # PKG_PREFIX=${PKG_PREFIX:=/usr/local} +BATCH=${BATCH:=no} ask() { local question default answer question=$1 default=$2 - if [ -z "${PACKAGE_BUILDING}" ]; then + if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then read -p "${question} [${default}]? " answer fi if [ x${answer} = x ]; then diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile index fdc21a706a7d..793fe9f6c906 100644 --- a/mail/postfix24/Makefile +++ b/mail/postfix24/Makefile @@ -22,7 +22,6 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= khera@kciLink.com USE_SUBMAKE= yes -IS_INTERACTIVE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ @@ -61,7 +60,7 @@ post-patch: ${ECHO} "all: default" >> Makefile) pre-install: - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .if defined(NOPORTDOCS) READMEDIR=no @@ -107,7 +106,7 @@ do-install: .endif post-install: - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed # man pages, since the ports software compresses them after this step, and # if we run etc/postfix/post-install again during package installation, diff --git a/mail/postfix24/pkg-install b/mail/postfix24/pkg-install index 3ef249b885b1..8ecea1626d2b 100644 --- a/mail/postfix24/pkg-install +++ b/mail/postfix24/pkg-install @@ -4,13 +4,14 @@ # PKG_PREFIX=${PKG_PREFIX:=/usr/local} +BATCH=${BATCH:=no} ask() { local question default answer question=$1 default=$2 - if [ -z "${PACKAGE_BUILDING}" ]; then + if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then read -p "${question} [${default}]? " answer fi if [ x${answer} = x ]; then diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile index fdc21a706a7d..793fe9f6c906 100644 --- a/mail/postfix25/Makefile +++ b/mail/postfix25/Makefile @@ -22,7 +22,6 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= khera@kciLink.com USE_SUBMAKE= yes -IS_INTERACTIVE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ @@ -61,7 +60,7 @@ post-patch: ${ECHO} "all: default" >> Makefile) pre-install: - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .if defined(NOPORTDOCS) READMEDIR=no @@ -107,7 +106,7 @@ do-install: .endif post-install: - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed # man pages, since the ports software compresses them after this step, and # if we run etc/postfix/post-install again during package installation, diff --git a/mail/postfix25/pkg-install b/mail/postfix25/pkg-install index 3ef249b885b1..8ecea1626d2b 100644 --- a/mail/postfix25/pkg-install +++ b/mail/postfix25/pkg-install @@ -4,13 +4,14 @@ # PKG_PREFIX=${PKG_PREFIX:=/usr/local} +BATCH=${BATCH:=no} ask() { local question default answer question=$1 default=$2 - if [ -z "${PACKAGE_BUILDING}" ]; then + if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then read -p "${question} [${default}]? " answer fi if [ x${answer} = x ]; then diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile index fdc21a706a7d..793fe9f6c906 100644 --- a/mail/postfix26/Makefile +++ b/mail/postfix26/Makefile @@ -22,7 +22,6 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= khera@kciLink.com USE_SUBMAKE= yes -IS_INTERACTIVE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ @@ -61,7 +60,7 @@ post-patch: ${ECHO} "all: default" >> Makefile) pre-install: - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .if defined(NOPORTDOCS) READMEDIR=no @@ -107,7 +106,7 @@ do-install: .endif post-install: - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed # man pages, since the ports software compresses them after this step, and # if we run etc/postfix/post-install again during package installation, diff --git a/mail/postfix26/pkg-install b/mail/postfix26/pkg-install index 3ef249b885b1..8ecea1626d2b 100644 --- a/mail/postfix26/pkg-install +++ b/mail/postfix26/pkg-install @@ -4,13 +4,14 @@ # PKG_PREFIX=${PKG_PREFIX:=/usr/local} +BATCH=${BATCH:=no} ask() { local question default answer question=$1 default=$2 - if [ -z "${PACKAGE_BUILDING}" ]; then + if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then read -p "${question} [${default}]? " answer fi if [ x${answer} = x ]; then diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile index fdc21a706a7d..793fe9f6c906 100644 --- a/mail/postfix27/Makefile +++ b/mail/postfix27/Makefile @@ -22,7 +22,6 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= khera@kciLink.com USE_SUBMAKE= yes -IS_INTERACTIVE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ @@ -61,7 +60,7 @@ post-patch: ${ECHO} "all: default" >> Makefile) pre-install: - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .if defined(NOPORTDOCS) READMEDIR=no @@ -107,7 +106,7 @@ do-install: .endif post-install: - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed # man pages, since the ports software compresses them after this step, and # if we run etc/postfix/post-install again during package installation, diff --git a/mail/postfix27/pkg-install b/mail/postfix27/pkg-install index 3ef249b885b1..8ecea1626d2b 100644 --- a/mail/postfix27/pkg-install +++ b/mail/postfix27/pkg-install @@ -4,13 +4,14 @@ # PKG_PREFIX=${PKG_PREFIX:=/usr/local} +BATCH=${BATCH:=no} ask() { local question default answer question=$1 default=$2 - if [ -z "${PACKAGE_BUILDING}" ]; then + if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then read -p "${question} [${default}]? " answer fi if [ x${answer} = x ]; then diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile index fdc21a706a7d..793fe9f6c906 100644 --- a/mail/postfix28/Makefile +++ b/mail/postfix28/Makefile @@ -22,7 +22,6 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= khera@kciLink.com USE_SUBMAKE= yes -IS_INTERACTIVE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ @@ -61,7 +60,7 @@ post-patch: ${ECHO} "all: default" >> Makefile) pre-install: - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .if defined(NOPORTDOCS) READMEDIR=no @@ -107,7 +106,7 @@ do-install: .endif post-install: - @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed # man pages, since the ports software compresses them after this step, and # if we run etc/postfix/post-install again during package installation, diff --git a/mail/postfix28/pkg-install b/mail/postfix28/pkg-install index 3ef249b885b1..8ecea1626d2b 100644 --- a/mail/postfix28/pkg-install +++ b/mail/postfix28/pkg-install @@ -4,13 +4,14 @@ # PKG_PREFIX=${PKG_PREFIX:=/usr/local} +BATCH=${BATCH:=no} ask() { local question default answer question=$1 default=$2 - if [ -z "${PACKAGE_BUILDING}" ]; then + if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then read -p "${question} [${default}]? " answer fi if [ x${answer} = x ]; then |