commit - 2152e377226509a6b3c5f6cd9c8c4a88a9487091
commit + dccb2976785d6ff50a59b1e930a6e2a2b340d498
blob - 00c3d9448bf559ab2cc4bf355937df4125fb5ecf
blob + 1f172aed39ecaa8b8d7b41f88d774d7d9dd643af
--- MacOSX/ngircd.pbproj/project.pbxproj
+++ MacOSX/ngircd.pbproj/project.pbxproj
@@ -54,6 +54,7 @@
 				014CEA520018CE5811CA2923,
 				014CEA530018CE5811CA2923,
 			);
+			hasScannedForEncodings = 1;
 			isa = PBXProject;
 			mainGroup = 08FB7794FE84155DC02AAC07;
 			projectDirPath = "";
@@ -114,14 +115,12 @@
 			productInstallPath = "$(HOME)/bin";
 			productName = ngircd;
 			productReference = 034768E8FF38A79811DB9C8B;
-			shouldUseHeadermap = 1;
 		};
 		08FB77A0FE84155DC02AAC07 = {
 			buildActionMask = 2147483647;
 			files = (
 				F52162CE01C7B904012300F4,
 				F52162CF01C7B904012300F4,
-				F52162D001C7B904012300F4,
 				F52162D901C7BAAE012300F4,
 				F52162DC01C7BCDD012300F4,
 				F52162E401C7C79E012300F4,
@@ -147,6 +146,9 @@
 				F5BEF13302A12AFE01A85B03,
 				F5E9448502C9F49D01A85B04,
 				F5D5CC9403990FED0155B873,
+				FA42C8B003C0A01400A85B04,
+				FA42C8B403C0B30700A85B04,
+				FA550F2E03D59C8D00A85B04,
 			);
 			isa = PBXHeadersBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -156,7 +158,6 @@
 			files = (
 				F52162D101C7B904012300F4,
 				F52162D201C7B904012300F4,
-				F52162D301C7B904012300F4,
 				F52162DD01C7BCDD012300F4,
 				F52162E501C7C79E012300F4,
 				F51D17FF01C8F5B701E11C2E,
@@ -176,6 +177,10 @@
 				F5BEF13502A24F1001A85B03,
 				F5E9448602C9F49D01A85B04,
 				F5D5CC9603990FFA0155B873,
+				FAC0384003BB335400A85B04,
+				FA42C8AE03C0A00B00A85B04,
+				FA42C8B203C0B2F300A85B04,
+				FA550F2D03D59C8C00A85B04,
 			);
 			isa = PBXSourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -224,16 +229,18 @@
 //F53
 //F54
 		F51044520297ABF80173DE11 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = vsnprintf.c;
-			path = /Users/alex/Develop/ngircd/src/portab/vsnprintf.c;
-			refType = 0;
+			path = ../src/portab/vsnprintf.c;
+			refType = 2;
 		};
 		F51044540297AC170173DE11 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = splint.h;
-			path = portab/splint.h;
-			refType = 4;
+			path = ../src/portab/splint.h;
+			refType = 2;
 		};
 		F51044550297AC170173DE11 = {
 			fileRef = F51044540297AC170173DE11;
@@ -248,12 +255,14 @@
 			};
 		};
 		F51D17FC01C8F5B701E11C2E = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = client.c;
 			path = ../src/ngircd/client.c;
 			refType = 2;
 		};
 		F51D17FD01C8F5B701E11C2E = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = client.h;
 			path = ../src/ngircd/client.h;
@@ -272,24 +281,28 @@
 			};
 		};
 		F51D180001C8FDD001E11C2E = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = channel.c;
 			path = ../src/ngircd/channel.c;
 			refType = 2;
 		};
 		F51D180101C8FDD001E11C2E = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = channel.h;
 			path = ../src/ngircd/channel.h;
 			refType = 2;
 		};
 		F51D180201C8FDD001E11C2E = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = irc.c;
 			path = ../src/ngircd/irc.c;
 			refType = 2;
 		};
 		F51D180301C8FDD001E11C2E = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = irc.h;
 			path = ../src/ngircd/irc.h;
@@ -314,14 +327,18 @@
 			};
 		};
 		F51DBB13022D95E801A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "irc-write.c";
-			refType = 4;
+			name = "irc-write.c";
+			path = "../src/ngircd/irc-write.c";
+			refType = 2;
 		};
 		F51DBB14022D95E801A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "irc-write.h";
-			refType = 4;
+			name = "irc-write.h";
+			path = "../src/ngircd/irc-write.h";
+			refType = 2;
 		};
 		F51DBB15022D95E801A85B04 = {
 			fileRef = F51DBB14022D95E801A85B04;
@@ -336,14 +353,18 @@
 			};
 		};
 		F51DBB17022D995501A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "irc-mode.c";
-			refType = 4;
+			name = "irc-mode.c";
+			path = "../src/ngircd/irc-mode.c";
+			refType = 2;
 		};
 		F51DBB18022D995501A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "irc-mode.h";
-			refType = 4;
+			name = "irc-mode.h";
+			path = "../src/ngircd/irc-mode.h";
+			refType = 2;
 		};
 		F51DBB19022D995501A85B04 = {
 			fileRef = F51DBB18022D995501A85B04;
@@ -358,14 +379,18 @@
 			};
 		};
 		F51DBB1B022D9D8F01A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "irc-login.c";
-			refType = 4;
+			name = "irc-login.c";
+			path = "../src/ngircd/irc-login.c";
+			refType = 2;
 		};
 		F51DBB1C022D9D8F01A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "irc-login.h";
-			refType = 4;
+			name = "irc-login.h";
+			path = "../src/ngircd/irc-login.h";
+			refType = 2;
 		};
 		F51DBB1D022D9D8F01A85B04 = {
 			fileRef = F51DBB1C022D9D8F01A85B04;
@@ -380,6 +405,7 @@
 			};
 		};
 		F51F791201DFC95301D13771 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = defines.h;
 			path = ../src/ngircd/defines.h;
@@ -393,7 +419,7 @@
 		};
 		F51F791401DFD0DE01D13771 = {
 			children = (
-				F5E9447B02C9EE0E01A85B04,
+				FA550F3103D59CB300A85B04,
 				F5263AEF01E2A9B801CE8F8F,
 				F51F791501DFD0DE01D13771,
 				F5E9447D02C9EE2801A85B04,
@@ -409,19 +435,25 @@
 			refType = 0;
 		};
 		F51F791501DFD0DE01D13771 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = CVS.txt;
-			refType = 4;
+			name = CVS.txt;
+			path = ../doc/CVS.txt;
+			refType = 2;
 		};
 		F51F791601DFD0DE01D13771 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = RFC.txt;
-			refType = 4;
+			name = RFC.txt;
+			path = ../doc/RFC.txt;
+			refType = 2;
 		};
 		F51F791701DFD0DE01D13771 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "sample-ngircd.conf";
-			refType = 4;
+			name = "sample-ngircd.conf";
+			path = "../doc/sample-ngircd.conf";
+			refType = 2;
 		};
 		F520AEA80335E29001A85B04 = {
 			children = (
@@ -447,79 +479,109 @@
 			refType = 0;
 		};
 		F520AEA90335E29001A85B04 = {
+			fileEncoding = 5;
 			isa = PBXExecutableFileReference;
-			path = "channel-test";
-			refType = 4;
+			name = "channel-test";
+			path = ../src/testsuite/tests.sh;
+			refType = 2;
 		};
 		F520AEAA0335E29001A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "channel-test.e";
-			refType = 4;
+			name = "channel-test.e";
+			path = "../src/testsuite/channel-test.e";
+			refType = 2;
 		};
 		F520AEAC0335E29001A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "check-idle.e";
-			refType = 4;
+			name = "check-idle.e";
+			path = "../src/testsuite/check-idle.e";
+			refType = 2;
 		};
 		F520AEAD0335E29001A85B04 = {
+			fileEncoding = 5;
 			isa = PBXExecutableFileReference;
-			path = "connect-test";
-			refType = 4;
+			name = "connect-test";
+			path = ../src/testsuite/tests.sh;
+			refType = 2;
 		};
 		F520AEAE0335E29001A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "connect-test.e";
-			refType = 4;
+			name = "connect-test.e";
+			path = "../src/testsuite/connect-test.e";
+			refType = 2;
 		};
 		F520AECA0335E29001A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = Makefile.am;
-			refType = 4;
+			name = Makefile.am;
+			path = ../src/testsuite/Makefile.am;
+			refType = 2;
 		};
 		F520AECC0335E29001A85B04 = {
+			fileEncoding = 5;
 			isa = PBXExecutableFileReference;
-			path = "mode-test";
-			refType = 4;
+			name = "mode-test";
+			path = ../src/testsuite/tests.sh;
+			refType = 2;
 		};
 		F520AECD0335E29001A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "mode-test.e";
-			refType = 4;
+			name = "mode-test.e";
+			path = "../src/testsuite/mode-test.e";
+			refType = 2;
 		};
 		F520AED00335E29001A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "ngircd-test.conf";
-			refType = 4;
+			name = "ngircd-test.conf";
+			path = "../src/testsuite/ngircd-test.conf";
+			refType = 2;
 		};
 		F520AED40335E29001A85B04 = {
+			fileEncoding = 5;
 			isa = PBXExecutableFileReference;
-			path = "start-server.sh";
-			refType = 4;
+			name = "start-server.sh";
+			path = "../src/testsuite/start-server.sh";
+			refType = 2;
 		};
 		F520AED50335E29001A85B04 = {
+			fileEncoding = 5;
 			isa = PBXExecutableFileReference;
-			path = "stop-server.sh";
-			refType = 4;
+			name = "stop-server.sh";
+			path = "../src/testsuite/stop-server.sh";
+			refType = 2;
 		};
 		F520AED60335E29001A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "stress-A.e";
-			refType = 4;
+			name = "stress-A.e";
+			path = "../src/testsuite/stress-A.e";
+			refType = 2;
 		};
 		F520AED70335E29001A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "stress-B.e";
-			refType = 4;
+			name = "stress-B.e";
+			path = "../src/testsuite/stress-B.e";
+			refType = 2;
 		};
 		F520AED80335E29001A85B04 = {
+			fileEncoding = 5;
 			isa = PBXExecutableFileReference;
-			path = "stress-server.sh";
-			refType = 4;
+			name = "stress-server.sh";
+			path = "../src/testsuite/stress-server.sh";
+			refType = 2;
 		};
 		F520AF0C0335E29001A85B04 = {
+			fileEncoding = 5;
 			isa = PBXExecutableFileReference;
-			path = tests.sh;
-			refType = 4;
+			name = tests.sh;
+			path = ../src/testsuite/tests.sh;
+			refType = 2;
 		};
 		F520AF150335F1B801A85B04 = {
 			children = (
@@ -533,19 +595,25 @@
 			refType = 0;
 		};
 		F520AF180335F1B801A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = Makefile.am;
-			refType = 4;
+			name = Makefile.am;
+			path = ../man/Makefile.am;
+			refType = 2;
 		};
 		F520AF1A0335F1B801A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = ngircd.8;
-			refType = 4;
+			name = ngircd.8;
+			path = ../man/ngircd.8;
+			refType = 2;
 		};
 		F520AF1B0335F1B801A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = ngircd.conf.5;
-			refType = 4;
+			name = ngircd.conf.5;
+			path = ../man/ngircd.conf.5;
+			refType = 2;
 		};
 		F52162B301C7B904012300F4 = {
 			children = (
@@ -553,6 +621,7 @@
 				F52162D801C7BAAE012300F4,
 				F52162B901C7B904012300F4,
 				F5F18132023EC61E01A85B04,
+				FA550F2903D59C4D00A85B04,
 				F520AEA80335E29001A85B04,
 			);
 			isa = PBXGroup;
@@ -561,9 +630,11 @@
 			refType = 2;
 		};
 		F52162B801C7B904012300F4 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = Makefile.am;
-			refType = 4;
+			name = Makefile.am;
+			path = ../src/Makefile.am;
+			refType = 2;
 		};
 		F52162B901C7B904012300F4 = {
 			children = (
@@ -578,6 +649,10 @@
 				F52162E301C7C77B012300F4,
 				F52162DA01C7BCDC012300F4,
 				F52162DB01C7BCDC012300F4,
+				FA42C8B103C0B2F300A85B04,
+				FA42C8B303C0B30700A85B04,
+				FA42C8AD03C0A00B00A85B04,
+				FA42C8AF03C0A01400A85B04,
 				F55047BA0240F6E501A85B04,
 				F55047BB0240F6E501A85B04,
 				F51D180201C8FDD001E11C2E,
@@ -608,8 +683,6 @@
 				F576ABFB01D5E77301A85B03,
 				F5BEF13102A12AFE01A85B03,
 				F5BEF13202A12AFE01A85B03,
-				F52162C001C7B904012300F4,
-				F52162C101C7B904012300F4,
 				F51F791201DFC95301D13771,
 				F576ABFE01D61D7401A85B03,
 			);
@@ -618,89 +691,98 @@
 			refType = 4;
 		};
 		F52162BB01C7B904012300F4 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = log.c;
-			refType = 4;
+			name = log.c;
+			path = ../src/ngircd/log.c;
+			refType = 2;
 		};
 		F52162BC01C7B904012300F4 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = log.h;
-			refType = 4;
+			name = log.h;
+			path = ../src/ngircd/log.h;
+			refType = 2;
 		};
 		F52162BD01C7B904012300F4 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = Makefile.am;
-			refType = 4;
+			name = Makefile.am;
+			path = ../src/ngircd/Makefile.am;
+			refType = 2;
 		};
 		F52162BE01C7B904012300F4 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = ngircd.c;
-			refType = 4;
+			name = ngircd.c;
+			path = ../src/ngircd/ngircd.c;
+			refType = 2;
 		};
 		F52162BF01C7B904012300F4 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = ngircd.h;
-			refType = 4;
+			name = ngircd.h;
+			path = ../src/ngircd/ngircd.h;
+			refType = 2;
 		};
-		F52162C001C7B904012300F4 = {
-			isa = PBXFileReference;
-			path = tool.c;
-			refType = 4;
-		};
-		F52162C101C7B904012300F4 = {
-			isa = PBXFileReference;
-			path = tool.h;
-			refType = 4;
-		};
 		F52162C301C7B904012300F4 = {
+			fileEncoding = 5;
 			isa = PBXExecutableFileReference;
 			name = autogen.sh;
 			path = ../autogen.sh;
 			refType = 2;
 		};
 		F52162C401C7B904012300F4 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = configure.in;
 			path = ../configure.in;
 			refType = 2;
 		};
 		F52162C501C7B904012300F4 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = Makefile.am;
 			path = ../Makefile.am;
 			refType = 2;
 		};
 		F52162C601C7B904012300F4 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = INSTALL;
 			path = ../INSTALL;
 			refType = 2;
 		};
 		F52162C701C7B904012300F4 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = AUTHORS;
 			path = ../AUTHORS;
 			refType = 2;
 		};
 		F52162C801C7B904012300F4 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = ChangeLog;
 			path = ../ChangeLog;
 			refType = 2;
 		};
 		F52162C901C7B904012300F4 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = COPYING;
 			path = ../COPYING;
 			refType = 2;
 		};
 		F52162CA01C7B904012300F4 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = NEWS;
 			path = ../NEWS;
 			refType = 2;
 		};
 		F52162CB01C7B904012300F4 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = README;
 			path = ../README;
@@ -718,12 +800,6 @@
 			settings = {
 			};
 		};
-		F52162D001C7B904012300F4 = {
-			fileRef = F52162C101C7B904012300F4;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		F52162D101C7B904012300F4 = {
 			fileRef = F52162BB01C7B904012300F4;
 			isa = PBXBuildFile;
@@ -736,13 +812,8 @@
 			settings = {
 			};
 		};
-		F52162D301C7B904012300F4 = {
-			fileRef = F52162C001C7B904012300F4;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		F52162D801C7BAAE012300F4 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = config.h;
 			path = ../src/config.h;
@@ -755,12 +826,14 @@
 			};
 		};
 		F52162DA01C7BCDC012300F4 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = conn.c;
 			path = ../src/ngircd/conn.c;
 			refType = 2;
 		};
 		F52162DB01C7BCDC012300F4 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = conn.h;
 			path = ../src/ngircd/conn.h;
@@ -779,12 +852,14 @@
 			};
 		};
 		F52162E201C7C77B012300F4 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = conf.c;
 			path = ../src/ngircd/conf.c;
 			refType = 2;
 		};
 		F52162E301C7C77B012300F4 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = conf.h;
 			path = ../src/ngircd/conf.h;
@@ -809,6 +884,7 @@
 			};
 		};
 		F5263AEF01E2A9B801CE8F8F = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = Makefile.am;
 			path = ../doc/Makefile.am;
@@ -844,7 +920,6 @@
 			productInstallPath = /usr/local/bin;
 			productName = portabtest;
 			productReference = F538241D024F89BC01A85B04;
-			shouldUseHeadermap = 0;
 		};
 		F538241F024F89BC01A85B04 = {
 			buildActionMask = 2147483647;
@@ -852,6 +927,8 @@
 				F5382420024F89BC01A85B04,
 				F5382421024F89BC01A85B04,
 				F5382422024F89BC01A85B04,
+				FAC0383D03BB318600A85B04,
+				FA550F3003D59C9100A85B04,
 			);
 			isa = PBXHeadersBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -878,6 +955,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				F5382424024F89BC01A85B04,
+				FAC0383C03BB318400A85B04,
+				FAC0383F03BB335400A85B04,
+				FA550F2F03D59C9000A85B04,
 			);
 			isa = PBXSourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -903,14 +983,18 @@
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		F55047BA0240F6E501A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = hash.c;
-			refType = 4;
+			name = hash.c;
+			path = ../src/ngircd/hash.c;
+			refType = 2;
 		};
 		F55047BB0240F6E501A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = hash.h;
-			refType = 4;
+			name = hash.h;
+			path = ../src/ngircd/hash.h;
+			refType = 2;
 		};
 		F55047BC0240F6E501A85B04 = {
 			fileRef = F55047BB0240F6E501A85B04;
@@ -935,9 +1019,10 @@
 			refType = 2;
 		};
 		F56D8B9F01E0BFA00155ADA7 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			path = Makefile.am;
-			refType = 4;
+			refType = 2;
 		};
 		F56D8BA001E0BFA00155ADA7 = {
 			children = (
@@ -948,19 +1033,25 @@
 			refType = 4;
 		};
 		F56D8BA101E0BFA00155ADA7 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = Makefile.am;
-			refType = 4;
+			name = Makefile.am;
+			path = ngircd.pbproj/Makefile.am;
+			refType = 2;
 		};
 		F576ABFA01D5E77301A85B03 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = parse.c;
-			refType = 4;
+			name = parse.c;
+			path = ../src/ngircd/parse.c;
+			refType = 2;
 		};
 		F576ABFB01D5E77301A85B03 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = parse.h;
-			refType = 4;
+			name = parse.h;
+			path = ../src/ngircd/parse.h;
+			refType = 2;
 		};
 		F576ABFC01D5E77301A85B03 = {
 			fileRef = F576ABFB01D5E77301A85B03;
@@ -975,6 +1066,7 @@
 			};
 		};
 		F576ABFE01D61D7401A85B03 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = messages.h;
 			path = ../src/ngircd/messages.h;
@@ -987,14 +1079,18 @@
 			};
 		};
 		F57C88850232853501A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "irc-oper.c";
-			refType = 4;
+			name = "irc-oper.c";
+			path = "../src/ngircd/irc-oper.c";
+			refType = 2;
 		};
 		F57C88860232853501A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "irc-oper.h";
-			refType = 4;
+			name = "irc-oper.h";
+			path = "../src/ngircd/irc-oper.h";
+			refType = 2;
 		};
 		F57C88870232853501A85B04 = {
 			fileRef = F57C88860232853501A85B04;
@@ -1009,14 +1105,18 @@
 			};
 		};
 		F57C88890232884501A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "irc-server.c";
-			refType = 4;
+			name = "irc-server.c";
+			path = "../src/ngircd/irc-server.c";
+			refType = 2;
 		};
 		F57C888A0232884501A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "irc-server.h";
-			refType = 4;
+			name = "irc-server.h";
+			path = "../src/ngircd/irc-server.h";
+			refType = 2;
 		};
 		F57C888B0232884501A85B04 = {
 			fileRef = F57C888A0232884501A85B04;
@@ -1031,14 +1131,18 @@
 			};
 		};
 		F57C888D02328D7201A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "irc-channel.c";
-			refType = 4;
+			name = "irc-channel.c";
+			path = "../src/ngircd/irc-channel.c";
+			refType = 2;
 		};
 		F57C888E02328D7201A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "irc-channel.h";
-			refType = 4;
+			name = "irc-channel.h";
+			path = "../src/ngircd/irc-channel.h";
+			refType = 2;
 		};
 		F57C888F02328D7201A85B04 = {
 			fileRef = F57C888E02328D7201A85B04;
@@ -1053,22 +1157,25 @@
 			};
 		};
 		F5B565290325412B01A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = Protocol.txt;
 			path = ../doc/Protocol.txt;
 			refType = 2;
 		};
 		F5BEF12802A0EFE201A85B03 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = lists.c;
-			path = /Users/alex/Develop/ngircd/src/ngircd/lists.c;
-			refType = 0;
+			path = ../src/ngircd/lists.c;
+			refType = 2;
 		};
 		F5BEF12902A0EFE201A85B03 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = lists.h;
-			path = /Users/alex/Develop/ngircd/src/ngircd/lists.h;
-			refType = 0;
+			path = ../src/ngircd/lists.h;
+			refType = 2;
 		};
 		F5BEF12A02A0EFE201A85B03 = {
 			fileRef = F5BEF12902A0EFE201A85B03;
@@ -1083,14 +1190,18 @@
 			};
 		};
 		F5BEF12C02A1169C01A85B03 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "irc-op.c";
-			refType = 4;
+			name = "irc-op.c";
+			path = "../src/ngircd/irc-op.c";
+			refType = 2;
 		};
 		F5BEF12D02A1169C01A85B03 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "irc-op.h";
-			refType = 4;
+			name = "irc-op.h";
+			path = "../src/ngircd/irc-op.h";
+			refType = 2;
 		};
 		F5BEF12E02A1169C01A85B03 = {
 			fileRef = F5BEF12D02A1169C01A85B03;
@@ -1121,21 +1232,25 @@
 			);
 			isa = PBXLegacyTarget;
 			name = "ngIRCd Makefile";
+			passBuildSettingsInEnvironment = 1;
 			productName = "ngIRCd Makefile";
 			settingsToExpand = 6;
 			settingsToPassInEnvironment = 287;
 			settingsToPassOnCommandLine = 280;
-			shouldUseHeadermap = 0;
 		};
 		F5BEF13102A12AFE01A85B03 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = resolve.c;
-			refType = 4;
+			name = resolve.c;
+			path = ../src/ngircd/resolve.c;
+			refType = 2;
 		};
 		F5BEF13202A12AFE01A85B03 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = resolve.h;
-			refType = 4;
+			name = resolve.h;
+			path = ../src/ngircd/resolve.h;
+			refType = 2;
 		};
 		F5BEF13302A12AFE01A85B03 = {
 			fileRef = F5BEF13202A12AFE01A85B03;
@@ -1159,27 +1274,25 @@
 			refType = 4;
 		};
 		F5D3536203892AD201A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = Makefile.am;
-			path = /Users/alex/Develop/ngircd/contrib/Makefile.am;
-			refType = 0;
+			path = ../contrib/Makefile.am;
+			refType = 2;
 		};
 		F5D3536303892AD201A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = ngircd.spec;
-			path = /Users/alex/Develop/ngircd/contrib/ngircd.spec;
-			refType = 0;
+			path = ../contrib/ngircd.spec;
+			refType = 2;
 		};
-		F5D3536403892AFE01A85B04 = {
-			isa = PBXFileReference;
-			name = "sample-ngircd.conf";
-			path = "en/sample-ngircd.conf";
-			refType = 4;
-		};
 		F5D5CC9303990FED0155B873 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "irc-info.h";
-			refType = 4;
+			name = "irc-info.h";
+			path = "../src/ngircd/irc-info.h";
+			refType = 2;
 		};
 		F5D5CC9403990FED0155B873 = {
 			fileRef = F5D5CC9303990FED0155B873;
@@ -1188,9 +1301,11 @@
 			};
 		};
 		F5D5CC9503990FFA0155B873 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "irc-info.c";
-			refType = 4;
+			name = "irc-info.c";
+			path = "../src/ngircd/irc-info.c";
+			refType = 2;
 		};
 		F5D5CC9603990FFA0155B873 = {
 			fileRef = F5D5CC9503990FFA0155B873;
@@ -1198,59 +1313,40 @@
 			settings = {
 			};
 		};
-		F5E9447B02C9EE0E01A85B04 = {
-			children = (
-				F5E9448002C9EE4901A85B04,
-				F5E9448202C9EE4901A85B04,
-				F5E9448102C9EE4901A85B04,
-				F5D3536403892AFE01A85B04,
-			);
-			isa = PBXGroup;
-			name = en;
-			refType = 4;
-		};
 		F5E9447D02C9EE2801A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = FAQ.txt;
-			refType = 4;
+			name = FAQ.txt;
+			path = ../doc/FAQ.txt;
+			refType = 2;
 		};
 		F5E9447E02C9EE2801A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "README-AUX.txt";
-			refType = 4;
+			name = "README-AUX.txt";
+			path = "../doc/README-AUX.txt";
+			refType = 2;
 		};
 		F5E9447F02C9EE2801A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = "README-BeOS.txt";
-			refType = 4;
+			name = "README-BeOS.txt";
+			path = "../doc/README-BeOS.txt";
+			refType = 2;
 		};
-		F5E9448002C9EE4901A85B04 = {
-			isa = PBXFileReference;
-			name = Makefile.am;
-			path = en/Makefile.am;
-			refType = 4;
-		};
-		F5E9448102C9EE4901A85B04 = {
-			isa = PBXFileReference;
-			name = INSTALL;
-			path = en/INSTALL;
-			refType = 4;
-		};
-		F5E9448202C9EE4901A85B04 = {
-			isa = PBXFileReference;
-			name = README;
-			path = en/README;
-			refType = 4;
-		};
 		F5E9448302C9F49D01A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = match.h;
-			refType = 4;
+			name = match.h;
+			path = ../src/ngircd/match.h;
+			refType = 2;
 		};
 		F5E9448402C9F49D01A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
-			path = match.c;
-			refType = 4;
+			name = match.c;
+			path = ../src/ngircd/match.c;
+			refType = 2;
 		};
 		F5E9448502C9F49D01A85B04 = {
 			fileRef = F5E9448302C9F49D01A85B04;
@@ -1273,6 +1369,7 @@
 				F5F18137023EC63701A85B04,
 				F51044540297AC170173DE11,
 				F51044520297ABF80173DE11,
+				FAC0383E03BB335400A85B04,
 			);
 			isa = PBXGroup;
 			name = portab;
@@ -1280,34 +1377,39 @@
 			refType = 0;
 		};
 		F5F18133023EC63701A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = Makefile.am;
-			path = portab/Makefile.am;
-			refType = 4;
+			path = ../src/portab/Makefile.am;
+			refType = 2;
 		};
 		F5F18134023EC63701A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = exp.h;
-			path = portab/exp.h;
-			refType = 4;
+			path = ../src/portab/exp.h;
+			refType = 2;
 		};
 		F5F18135023EC63701A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = imp.h;
-			path = portab/imp.h;
-			refType = 4;
+			path = ../src/portab/imp.h;
+			refType = 2;
 		};
 		F5F18136023EC63701A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = portab.h;
-			path = portab/portab.h;
-			refType = 4;
+			path = ../src/portab/portab.h;
+			refType = 2;
 		};
 		F5F18137023EC63701A85B04 = {
+			fileEncoding = 5;
 			isa = PBXFileReference;
 			name = portabtest.c;
-			path = portab/portabtest.c;
-			refType = 4;
+			path = ../src/portab/portabtest.c;
+			refType = 2;
 		};
 		F5F18138023EC63701A85B04 = {
 			fileRef = F5F18134023EC63701A85B04;
@@ -1323,10 +1425,245 @@
 		};
 		F5F1813A023EC63701A85B04 = {
 			fileRef = F5F18136023EC63701A85B04;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+//F50
+//F51
+//F52
+//F53
+//F54
+//FA0
+//FA1
+//FA2
+//FA3
+//FA4
+		FA42C8AD03C0A00B00A85B04 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = "conn-zip.c";
+			path = "../src/ngircd/conn-zip.c";
+			refType = 2;
+		};
+		FA42C8AE03C0A00B00A85B04 = {
+			fileRef = FA42C8AD03C0A00B00A85B04;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FA42C8AF03C0A01400A85B04 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = "conn-zip.h";
+			path = "../src/ngircd/conn-zip.h";
+			refType = 2;
+		};
+		FA42C8B003C0A01400A85B04 = {
+			fileRef = FA42C8AF03C0A01400A85B04;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FA42C8B103C0B2F300A85B04 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = "conn-func.c";
+			path = "../src/ngircd/conn-func.c";
+			refType = 2;
+		};
+		FA42C8B203C0B2F300A85B04 = {
+			fileRef = FA42C8B103C0B2F300A85B04;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FA42C8B303C0B30700A85B04 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = "conn-func.h";
+			path = "../src/ngircd/conn-func.h";
+			refType = 2;
+		};
+		FA42C8B403C0B30700A85B04 = {
+			fileRef = FA42C8B303C0B30700A85B04;
 			isa = PBXBuildFile;
 			settings = {
 			};
 		};
+		FA550F2903D59C4D00A85B04 = {
+			children = (
+				FA550F2A03D59C8200A85B04,
+				FA550F2B03D59C8200A85B04,
+				FA550F2C03D59C8200A85B04,
+			);
+			isa = PBXGroup;
+			name = tool;
+			refType = 4;
+		};
+		FA550F2A03D59C8200A85B04 = {
+			fileEncoding = 5;
+			isa = PBXFileReference;
+			name = Makefile.am;
+			path = ../src/tool/Makefile.am;
+			refType = 2;
+		};
+		FA550F2B03D59C8200A85B04 = {
+			fileEncoding = 5;
+			isa = PBXFileReference;
+			name = tool.c;
+			path = ../src/tool/tool.c;
+			refType = 2;
+		};
+		FA550F2C03D59C8200A85B04 = {
+			fileEncoding = 5;
+			isa = PBXFileReference;
+			name = tool.h;
+			path = ../src/tool/tool.h;
+			refType = 2;
+		};
+		FA550F2D03D59C8C00A85B04 = {
+			fileRef = FA550F2B03D59C8200A85B04;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FA550F2E03D59C8D00A85B04 = {
+			fileRef = FA550F2C03D59C8200A85B04;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FA550F2F03D59C9000A85B04 = {
+			fileRef = FA550F2B03D59C8200A85B04;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FA550F3003D59C9100A85B04 = {
+			fileRef = FA550F2C03D59C8200A85B04;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FA550F3103D59CB300A85B04 = {
+			children = (
+				FA550F3503D59CD800A85B04,
+				FA550F3403D59CD800A85B04,
+				FA550F3703D59CD800A85B04,
+				FA550F3203D59CD800A85B04,
+				FA550F3303D59CD800A85B04,
+				FA550F3603D59CD800A85B04,
+				FA550F3803D59CD800A85B04,
+				FA550F3903D59CD800A85B04,
+				FA550F3A03D59CD800A85B04,
+				FA550F3B03D59CD800A85B04,
+			);
+			isa = PBXGroup;
+			name = de;
+			refType = 4;
+		};
+		FA550F3203D59CD800A85B04 = {
+			fileEncoding = 5;
+			isa = PBXFileReference;
+			name = CVS.txt;
+			path = ../doc/de/CVS.txt;
+			refType = 2;
+		};
+		FA550F3303D59CD800A85B04 = {
+			fileEncoding = 5;
+			isa = PBXFileReference;
+			name = FAQ.txt;
+			path = ../doc/de/FAQ.txt;
+			refType = 2;
+		};
+		FA550F3403D59CD800A85B04 = {
+			fileEncoding = 5;
+			isa = PBXFileReference;
+			name = INSTALL;
+			path = ../doc/de/INSTALL;
+			refType = 2;
+		};
+		FA550F3503D59CD800A85B04 = {
+			fileEncoding = 5;
+			isa = PBXFileReference;
+			name = Makefile.am;
+			path = ../doc/de/Makefile.am;
+			refType = 2;
+		};
+		FA550F3603D59CD800A85B04 = {
+			fileEncoding = 5;
+			isa = PBXFileReference;
+			name = Protocol.txt;
+			path = ../doc/de/Protocol.txt;
+			refType = 2;
+		};
+		FA550F3703D59CD800A85B04 = {
+			fileEncoding = 5;
+			isa = PBXFileReference;
+			name = README;
+			path = ../doc/de/README;
+			refType = 2;
+		};
+		FA550F3803D59CD800A85B04 = {
+			fileEncoding = 5;
+			isa = PBXFileReference;
+			name = "README-AUX.txt";
+			path = "../doc/de/README-AUX.txt";
+			refType = 2;
+		};
+		FA550F3903D59CD800A85B04 = {
+			fileEncoding = 5;
+			isa = PBXFileReference;
+			name = "README-BeOS.txt";
+			path = "../doc/de/README-BeOS.txt";
+			refType = 2;
+		};
+		FA550F3A03D59CD800A85B04 = {
+			fileEncoding = 5;
+			isa = PBXFileReference;
+			name = RFC.txt;
+			path = ../doc/de/RFC.txt;
+			refType = 2;
+		};
+		FA550F3B03D59CD800A85B04 = {
+			fileEncoding = 5;
+			isa = PBXFileReference;
+			name = "sample-ngircd.conf";
+			path = "../doc/de/sample-ngircd.conf";
+			refType = 2;
+		};
+		FAC0383C03BB318400A85B04 = {
+			fileRef = F51044520297ABF80173DE11;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FAC0383D03BB318600A85B04 = {
+			fileRef = F51044540297AC170173DE11;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FAC0383E03BB335400A85B04 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			name = strlcpy.c;
+			path = ../src/portab/strlcpy.c;
+			refType = 2;
+		};
+		FAC0383F03BB335400A85B04 = {
+			fileRef = FAC0383E03BB335400A85B04;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		FAC0384003BB335400A85B04 = {
+			fileRef = FAC0383E03BB335400A85B04;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 	};
 	rootObject = 08FB7793FE84155DC02AAC07;
 }