$NetBSD: patch-ad,v 1.1 2011/11/02 21:13:21 marino Exp $

--- ../FreeBSD/lib/db-pgsql.sh	2011-10-16 00:52:55.000000000 +0000
+++ lib/db-pgsql.sh
@@ -24,30 +24,30 @@
 #
 # $MCom: portstools/tinderbox/lib/db-pgsql.sh,v 1.2.2.5 2009/02/07 20:15:49 marcus Exp $
 #
-export DB_MAN_PREREQS="databases/p5-DBD-Pg databases/postgresql*-client"
-export DB_OPT_PREREQS="databases/php5-pgsql"
+export DB_MAN_PREREQS="p5-DBD-postgresql postgresql*-client"
+export DB_OPT_PREREQS="php5*-pgsql"
 
 if [ -n "${db_admin_pass}" ]; then
     export PGPASSWORD=${db_admin_pass}
     export DB_PROMPT='true'
-    export DB_SCHEMA_LOAD='/usr/local/bin/psql -U ${db_user} -h ${db_host} -d ${db_name} < "${schema_file}"'
-    export DB_DUMP='/usr/local/bin/pg_dump -U ${db_admin} -h ${db_host} --data-only --inserts --table=%%TABLE%% ${db_name} >> ${tmpfile}'
-    export DB_DROP='/usr/local/bin/dropdb -U ${db_admin} -h ${db_host} ${db_name}'
-    export DB_CHECK='/usr/local/bin/psql -U ${db_admin} -h ${db_host} -c "SELECT 0" ${db_name}'
-    export DB_CREATE='/usr/local/bin/createdb -O ${db_user} -U ${db_admin} -h ${db_host} ${db_name}'
+    export DB_SCHEMA_LOAD='/usr/pkg/bin/psql -U ${db_user} -h ${db_host} -d ${db_name} < "${schema_file}"'
+    export DB_DUMP='/usr/pkg/bin/pg_dump -U ${db_admin} -h ${db_host} --data-only --inserts --table=%%TABLE%% ${db_name} >> ${tmpfile}'
+    export DB_DROP='/usr/pkg/bin/dropdb -U ${db_admin} -h ${db_host} ${db_name}'
+    export DB_CHECK='/usr/pkg/bin/psql -U ${db_admin} -h ${db_host} -c "SELECT 0" ${db_name}'
+    export DB_CREATE='/usr/pkg/bin/createdb -O ${db_user} -U ${db_admin} -h ${db_host} ${db_name}'
     export DB_GRANT='echo "Make sure ${db_user} owns the database ${db_name} as well as all of its tables."'
-    export DB_QUERY='/usr/local/bin/psql -U ${db_admin} -h ${db_host} -t -q -A -F "`printf \"\t\"`" -c "${query}" ${db_name}'
+    export DB_QUERY='/usr/pkg/bin/psql -U ${db_admin} -h ${db_host} -t -q -A -F "`printf \"\t\"`" -c "${query}" ${db_name}'
     export DB_USER_PROMPT='echo "The next prompt will be for the new user'"'"'s (${db_user}) password on the database server ${db_host}."'
-    export DB_CREATE_USER='/usr/local/bin/createuser -E -S -d -R -h ${db_host} -U ${db_admin} -P ${db_user}'
+    export DB_CREATE_USER='/usr/pkg/bin/createuser -E -S -d -R -h ${db_host} -U ${db_admin} -P ${db_user}'
 else
     export DB_PROMPT='echo "The next prompt will be for ${db_admin}'"'"'s password to the ${db_name} database." | /usr/bin/fmt 75 79'
-    export DB_SCHEMA_LOAD='/usr/local/bin/psql -U ${db_user} -W -h ${db_host} -d ${db_name} < "${schema_file}"'
-    export DB_DUMP='/usr/local/bin/pg_dump -U ${db_admin} -W -h ${db_host} --data-only --inserts --table=%%TABLE%% ${db_name} >> ${tmpfile}'
-    export DB_DROP='/usr/local/bin/dropdb -U ${db_admin} -h ${db_host} -W ${db_name}'
-    export DB_CHECK='/usr/local/bin/psql -U ${db_admin} -h ${db_host} -W -c "SELECT 0" ${db_name}'
-    export DB_CREATE='/usr/local/bin/createdb -O ${db_user} -U ${db_admin} -h ${db_host} -W ${db_name}'
+    export DB_SCHEMA_LOAD='/usr/pkg/bin/psql -U ${db_user} -W -h ${db_host} -d ${db_name} < "${schema_file}"'
+    export DB_DUMP='/usr/pkg/bin/pg_dump -U ${db_admin} -W -h ${db_host} --data-only --inserts --table=%%TABLE%% ${db_name} >> ${tmpfile}'
+    export DB_DROP='/usr/pkg/bin/dropdb -U ${db_admin} -h ${db_host} -W ${db_name}'
+    export DB_CHECK='/usr/pkg/bin/psql -U ${db_admin} -h ${db_host} -W -c "SELECT 0" ${db_name}'
+    export DB_CREATE='/usr/pkg/bin/createdb -O ${db_user} -U ${db_admin} -h ${db_host} -W ${db_name}'
     export DB_GRANT='echo "Make sure ${db_user} owns the database ${db_name} as well as all of its tables."'
-    export DB_QUERY='/usr/local/bin/psql -U ${db_admin} -W -h ${db_host} -t -q -A -F "`printf \"\t\"`" -c "${query}" ${db_name}'
+    export DB_QUERY='/usr/pkg/bin/psql -U ${db_admin} -W -h ${db_host} -t -q -A -F "`printf \"\t\"`" -c "${query}" ${db_name}'
     export DB_USER_PROMPT='echo "The next prompt will be for the new user'"'"'s (${db_user}) password on the database server ${db_host}.  The prompt after that will be for ${db_admin}'"'"'s password."'
-    export DB_CREATE_USER='/usr/local/bin/createuser -E -S -d -R -h ${db_host} -U ${db_admin} -W -P ${db_user}'
+    export DB_CREATE_USER='/usr/pkg/bin/createuser -E -S -d -R -h ${db_host} -U ${db_admin} -W -P ${db_user}'
 fi