From a641010726cc3b8de4ec68ac92c89eb2b918fe2f Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Fri, 30 Sep 2011 16:05:15 -0300
Subject: [PATCH 1/3] Remove line forgotten last commit

---
 etc/inc/pkg-utils.inc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc
index 91a211dcb9..d0383c2705 100644
--- a/etc/inc/pkg-utils.inc
+++ b/etc/inc/pkg-utils.inc
@@ -104,7 +104,6 @@ function remove_freebsd_package($packagestring) {
 	$linkdirs = array('bin','sbin');
 	foreach($linkdirs as $dir) {
 		if(is_dir("{$pbidir}/{$dir}")) {
-			file_put_contents('/tmp/vcoque.debug',"{$pbidir}/{$dir}",FILE_APPEND);
 			$files = scandir("{$pbidir}/{$dir}");
 			foreach($files as $f) {
 				if($f != '.' && $f != '..') {

From 9b1b25ee04af27e9eeedc106940316a90129e76c Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Fri, 30 Sep 2011 17:36:18 -0300
Subject: [PATCH 2/3] Fix pbi_info path

---
 etc/inc/pkg-utils.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc
index d0383c2705..ee1d1c8bfd 100644
--- a/etc/inc/pkg-utils.inc
+++ b/etc/inc/pkg-utils.inc
@@ -519,7 +519,7 @@ function pkg_fetch_recursive($pkgname, $filename, $dependlevel = 0, $base_url =
 	exec("/usr/local/sbin/pbi_add {$pkgstaging} -f -v --no-checksig {$fetchto} 2>&1", $pkgaddout);
 	pkg_debug($pkgname . " " . print_r($pkgaddout, true) . "\npbi_add successfully completed.\n");
 
-	exec("/usr/local/bin/pbi_info " . preg_replace('/\.pbi$/','',$filename) . " | /usr/bin/awk '/Prefix/ {print $2}'",$pbidir);
+	exec("/usr/local/sbin/pbi_info " . preg_replace('/\.pbi$/','',$filename) . " | /usr/bin/awk '/Prefix/ {print $2}'",$pbidir);
 	$pbidir = $pbidir[0];
 	$linkdirs = array('bin','sbin');
 	foreach($linkdirs as $dir) {

From 169f15744a589f9719d830ec9d9ff07cf622fc8f Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Fri, 30 Sep 2011 22:45:54 -0300
Subject: [PATCH 3/3] Create symlinks for packages config files into the PBI
 directory

---
 etc/inc/pkg-utils.inc | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc
index ee1d1c8bfd..8f6543bbfb 100644
--- a/etc/inc/pkg-utils.inc
+++ b/etc/inc/pkg-utils.inc
@@ -780,6 +780,18 @@ function install_package_xml($pkg) {
 			if($pkg_config['custom_php_install_command']) {
 				$static_output .= gettext("Executing custom_php_install_command()...");
 				update_output_window($static_output);
+				/* XXX: create symlinks for conf files into the PBI directories.
+				 *	change packages to store configs at /usr/pbi/pkg/etc and remove this
+				 */
+				eval_once($pkg_config['custom_php_install_command']);
+				exec("/usr/local/sbin/pbi_info | grep {$pkg} | xargs /usr/local/sbin/pbi_info | awk '/Prefix/ {print $2}'",$pbidir);
+				$pbidir = $pbidir[0];
+				exec("find /usr/local/etc/ -name *.conf | grep {$pkg}",$files);
+				foreach($files as $f) {
+					$pbiconf = str_replace('/usr/local',$pbidir,$f);
+					unlink($pbiconf);
+					symlink($f,$pbiconf);
+				}
 				eval_once($pkg_config['custom_php_install_command']);
 				$static_output .= gettext("done.") . "\n";
 				update_output_window($static_output);