--- Portfile-orig	Thu Aug 28 00:16:12 2003
+++ Portfile	Thu Aug 28 00:19:07 2003
@@ -35,13 +35,14 @@
 
 variant server	{
  	depends_run path:/Library/StartupItems/DarwinPortsStartup:DarwinPortsStartup
-	configure.args	--localstatedir=${dbdir} --sysconfdir=${prefix}/etc --without-bench --with-innodb --with-unix-socket-path=${prefix}/var/run/mysqld/mysqld.sock 
+	configure.args	--localstatedir=${dbdir} --sysconfdir=${prefix}/etc/mysql4 --without-bench --with-innodb --with-unix-socket-path=${prefix}/var/run/mysqld/mysqld.sock 
 	
 	pre-destroot	{ 
 		system "install -o mysql -g mysql -m 775 -d ${destroot}${dbdir}" 
+		file mkdir ${destroot}${prefix}/etc/mysql4
 		file mkdir ${destroot}${prefix}/var/run
 		file mkdir ${destroot}${prefix}/var/run/mysqld
-		file mkdir ${destroot}${prefix}/var/logs
+		file mkdir ${destroot}${prefix}/var/log
 		file mkdir ${destroot}${prefix}/var/log/mysql
 		system "touch ${destroot}${prefix}/var/run/mysqld/.turd \
                 ${destroot}${prefix}/var/log/mysql/.turd"  
@@ -58,8 +59,9 @@
 		
 		system "install -o root -m 755 -c ${portpath}/files/mysql4.sh ${destroot}${prefix}/etc/rc.d/"
 		reinplace "s|__PREFIX|${prefix}|g" ${destroot}${prefix}/etc/rc.d/mysql4.sh
-		
-		system "cp ${portpath}/files/my.cnf ${destroot}${prefix}/etc/my.cnf"
-		reinplace "s|__PREFIX|${prefix}|g" ${destroot}${prefix}/etc/my.cnf
+	
+			
+		system "cp ${portpath}/files/my.cnf ${destroot}${prefix}/etc/mysql4/my.cnf"
+		reinplace "s|__PREFIX|${prefix}|g" ${destroot}${prefix}/etc//mysql4/my.cnf
 	}
 }