Index: databases/postgresql92-server/Makefile =================================================================== --- databases/postgresql92-server/Makefile (revision 426569) +++ databases/postgresql92-server/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME?= postgresql DISTVERSION?= 9.2.19 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= databases MASTER_SITES= PGSQL/source/v${DISTVERSION} PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}${COMPONENT} Index: databases/postgresql92-server/files/postgresql.in =================================================================== --- databases/postgresql92-server/files/postgresql.in (revision 426569) +++ databases/postgresql92-server/files/postgresql.in (working copy) @@ -14,6 +14,7 @@ # postgresql_flags="-w -s -m fast" # postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C" # postgresql_class="default" +# postgresql_fib="NONE" # postgresql_profiles="" # # See %%PREFIX%%/share/doc/postgresql/README-server for more info @@ -37,6 +38,7 @@ eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data"} postgresql_class=${postgresql_class:-"default"} postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"} +postgresql_fib=${postgresql_fib:-"NONE"} name=postgresql rcvar=postgresql_enable @@ -62,6 +64,7 @@ eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}" eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}" eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}" + eval postgresql_fib="\${postgresql_${profile}_fib:-${postgresql_fib}}" fi else if [ "x${postgresql_profiles}" != "x" -a "x$1" != "x" ]; then @@ -103,12 +106,19 @@ postgresql_command() { - su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" + case "$postgresql_fib" in + [Nn][Oo][Nn][Ee]) + ;; + *) + command="setfib -F ${postgresql_fib} ${command}" + ;; + esac + su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" } postgresql_initdb() { - su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" + su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" } run_rc_command "$1" Index: databases/postgresql93-server/files/postgresql.in =================================================================== --- databases/postgresql93-server/files/postgresql.in (revision 426569) +++ databases/postgresql93-server/files/postgresql.in (working copy) @@ -14,6 +14,7 @@ # postgresql_flags="-w -s -m fast" # postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C" # postgresql_class="default" +# postgresql_fib="NONE" # postgresql_profiles="" # # See %%PREFIX%%/share/doc/postgresql/README-server for more info @@ -37,6 +38,7 @@ eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data"} postgresql_class=${postgresql_class:-"default"} postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"} +postgresql_fib=${postgresql_fib:-"NONE"} name=postgresql rcvar=postgresql_enable @@ -62,6 +64,7 @@ eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}" eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}" eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}" + eval postgresql_fib="\${postgresql_${profile}_fib:-${postgresql_fib}}" fi else if [ "x${postgresql_profiles}" != "x" -a "x$1" != "x" ]; then @@ -103,12 +106,19 @@ postgresql_command() { - su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" + case "$postgresql_fib" in + [Nn][Oo][Nn][Ee]) + ;; + *) + command="setfib -F ${postgresql_fib} ${command}" + ;; + esac + su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" } postgresql_initdb() { - su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" + su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" } run_rc_command "$1" Index: databases/postgresql94-server/files/postgresql.in =================================================================== --- databases/postgresql94-server/files/postgresql.in (revision 426569) +++ databases/postgresql94-server/files/postgresql.in (working copy) @@ -14,6 +14,7 @@ # postgresql_flags="-w -s -m fast" # postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C" # postgresql_class="default" +# postgresql_fib="NONE" # postgresql_profiles="" # # See %%PREFIX%%/share/doc/postgresql/README-server for more info @@ -37,6 +38,7 @@ eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data"} postgresql_class=${postgresql_class:-"default"} postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"} +postgresql_fib=${postgresql_fib:-"NONE"} name=postgresql rcvar=postgresql_enable @@ -62,6 +64,7 @@ eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}" eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}" eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}" + eval postgresql_fib="\${postgresql_${profile}_fib:-${postgresql_fib}}" fi else if [ "x${postgresql_profiles}" != "x" -a "x$1" != "x" ]; then @@ -103,12 +106,19 @@ postgresql_command() { - su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" + case "$postgresql_fib" in + [Nn][Oo][Nn][Ee]) + ;; + *) + command="setfib -F ${postgresql_fib} ${command}" + ;; + esac + su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" } postgresql_initdb() { - su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" + su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" } run_rc_command "$1" Index: databases/postgresql95-server/files/postgresql.in =================================================================== --- databases/postgresql95-server/files/postgresql.in (revision 426569) +++ databases/postgresql95-server/files/postgresql.in (working copy) @@ -14,6 +14,7 @@ # postgresql_flags="-w -s -m fast" # postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C" # postgresql_class="default" +# postgresql_fib="NONE" # postgresql_profiles="" # # See %%PREFIX%%/share/doc/postgresql/README-server for more info @@ -37,6 +38,7 @@ eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data"} postgresql_class=${postgresql_class:-"default"} postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"} +postgresql_fib=${postgresql_fib:-"NONE"} name=postgresql rcvar=postgresql_enable @@ -62,6 +64,7 @@ eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}" eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}" eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}" + eval postgresql_fib="\${postgresql_${profile}_fib:-${postgresql_fib}}" fi else if [ "x${postgresql_profiles}" != "x" -a "x$1" != "x" ]; then @@ -103,12 +106,19 @@ postgresql_command() { - su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" + case "$postgresql_fib" in + [Nn][Oo][Nn][Ee]) + ;; + *) + command="setfib -F ${postgresql_fib} ${command}" + ;; + esac + su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" } postgresql_initdb() { - su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" + su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" } run_rc_command "$1" Index: databases/postgresql96-server/files/postgresql.in =================================================================== --- databases/postgresql96-server/files/postgresql.in (revision 426569) +++ databases/postgresql96-server/files/postgresql.in (working copy) @@ -14,6 +14,7 @@ # postgresql_flags="-w -s -m fast" # postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C" # postgresql_class="default" +# postgresql_fib="NONE" # postgresql_profiles="" # # See %%PREFIX%%/share/doc/postgresql/README-server for more info @@ -37,6 +38,7 @@ eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data96"} postgresql_class=${postgresql_class:-"default"} postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"} +postgresql_fib=${postgresql_fib:-"NONE"} name=postgresql rcvar=postgresql_enable @@ -62,6 +64,7 @@ eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}" eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}" eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}" + eval postgresql_fib="\${postgresql_${profile}_fib:-${postgresql_fib}}" fi else if [ "x${postgresql_profiles}" != "x" -a "x$1" != "x" ]; then @@ -103,12 +106,19 @@ postgresql_command() { - su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" + case "$postgresql_fib" in + [Nn][Oo][Nn][Ee]) + ;; + *) + command="setfib -F ${postgresql_fib} ${command}" + ;; + esac + su -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}" } postgresql_initdb() { - su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" + su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" } run_rc_command "$1"