12 files changed, 156 insertions, 69 deletions

diff --git a/misc/linux-opengroupware/Makefile b/misc/linux-opengroupware/Makefile
index 96475d24c8fc..6322cf5c5765 100644
--- a/misc/linux-opengroupware/Makefile
+++ b/misc/linux-opengroupware/Makefile
@@ -29,8 +29,8 @@ FETCH_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 \
 
 #BEGINSET1
 
-SET1=		opengroupware-core-4.2-ogo014.i386.rpm:ogo \
-		opengroupware-core-tools-4.2-ogo014.i386.rpm:ogo \
+SET1=		opengroupware-core-4.2-ogo015.i386.rpm:ogo \
+		opengroupware-core-tools-4.2-ogo015.i386.rpm:ogo \
 		opengroupware-database-1.0-ogo011.i386.rpm:ogo \
 		opengroupware-docapi-1.0-ogo026.i386.rpm:ogo \
 		opengroupware-env-1.0-ogo007.i386.rpm:ogo \
@@ -38,7 +38,7 @@ SET1=		opengroupware-core-4.2-ogo014.i386.rpm:ogo \
 		opengroupware-gstep-db-postgresql72-4.2-ogo013.i386.rpm:ogo \
 		opengroupware-gstep-make-4.2-ogo008.i386.rpm:ogo \
 		opengroupware-gstep-objc-2.95.3-ogo008.i386.rpm:ogo \
-		opengroupware-js-1.5-ogo008.i386.rpm:ogo \
+		opengroupware-js-1.5-ogo009.i386.rpm:ogo \
 		opengroupware-libfoundation-1.0.12-ogo014.i386.rpm:ogo \
 		opengroupware-libical-0.23.0-ogo006.i386.rpm:ogo \
 		opengroupware-libxml2-2.5.3-ogo007.i386.rpm:ogo \
@@ -70,17 +70,17 @@ SET1=		opengroupware-core-4.2-ogo014.i386.rpm:ogo \
 		opengroupware-webui-news-1.0-ogo008.i386.rpm:ogo \
 		opengroupware-webui-prefs-1.0-ogo008.i386.rpm:ogo \
 		opengroupware-webui-project-1.0-ogo023.i386.rpm:ogo \
-		opengroupware-webui-resource-de-1.0-ogo030.i386.rpm:ogo \
-		opengroupware-webui-resource-dk-1.0-ogo030.i386.rpm:ogo \
-		opengroupware-webui-resource-en-1.0-ogo030.i386.rpm:ogo \
-		opengroupware-webui-resource-es-1.0-ogo030.i386.rpm:ogo \
-		opengroupware-webui-resource-fr-1.0-ogo030.i386.rpm:ogo \
-		opengroupware-webui-resource-it-1.0-ogo030.i386.rpm:ogo \
-		opengroupware-webui-resource-pt_BR-1.0-ogo030.i386.rpm:ogo \
+		opengroupware-webui-resource-de-1.0-ogo032.i386.rpm:ogo \
+		opengroupware-webui-resource-dk-1.0-ogo032.i386.rpm:ogo \
+		opengroupware-webui-resource-en-1.0-ogo032.i386.rpm:ogo \
+		opengroupware-webui-resource-es-1.0-ogo032.i386.rpm:ogo \
+		opengroupware-webui-resource-fr-1.0-ogo032.i386.rpm:ogo \
+		opengroupware-webui-resource-it-1.0-ogo032.i386.rpm:ogo \
+		opengroupware-webui-resource-pt_BR-1.0-ogo032.i386.rpm:ogo \
 		opengroupware-webui-scheduler-1.0-ogo018.i386.rpm:ogo \
-		opengroupware-xml-4.2-ogo014.i386.rpm:ogo \
-		opengroupware-xml-icalsaxdriver-4.2-ogo014.i386.rpm:ogo \
-		opengroupware-xml-libxmlsaxdriver-4.2-ogo014.i386.rpm:ogo \
+		opengroupware-xml-4.2-ogo015.i386.rpm:ogo \
+		opengroupware-xml-icalsaxdriver-4.2-ogo015.i386.rpm:ogo \
+		opengroupware-xml-libxmlsaxdriver-4.2-ogo015.i386.rpm:ogo \
 		opengroupware-xmlrpcd-1.0-ogo013.i386.rpm:ogo \
 		opengroupware-zidestore-1.0-ogo026.i386.rpm:ogo
 #ENDSET1
diff --git a/misc/linux-opengroupware/distinfo.i386 b/misc/linux-opengroupware/distinfo.i386
index 1e6dd9ce0f50..9304d2268626 100644
--- a/misc/linux-opengroupware/distinfo.i386
+++ b/misc/linux-opengroupware/distinfo.i386
@@ -1,5 +1,5 @@
-MD5 (ogo/opengroupware-core-4.2-ogo014.i386.rpm) = e22d423bba826a9043ff5fb04054a280
-MD5 (ogo/opengroupware-core-tools-4.2-ogo014.i386.rpm) = 91bd6eb2d1a982b9f52970493c3c820c
+MD5 (ogo/opengroupware-core-4.2-ogo015.i386.rpm) = 11aa7e08de461bd12a595e94fd5d3f58
+MD5 (ogo/opengroupware-core-tools-4.2-ogo015.i386.rpm) = d051b5e562ec1cb47a6bd34dd7d6d5a9
 MD5 (ogo/opengroupware-database-1.0-ogo011.i386.rpm) = 9f18155e8e37fbcfc35fa5f5c1d3b3bf
 MD5 (ogo/opengroupware-docapi-1.0-ogo026.i386.rpm) = 7a0dd0149d1c45e651ed731b438b915d
 MD5 (ogo/opengroupware-env-1.0-ogo007.i386.rpm) = 1f25e3b728cadc9690d163fd1d1d7076
@@ -7,7 +7,7 @@ MD5 (ogo/opengroupware-gstep-db-4.2-ogo013.i386.rpm) = 47ced419fba0f0fa0afab9b94
 MD5 (ogo/opengroupware-gstep-db-postgresql72-4.2-ogo013.i386.rpm) = 8c837f28854cc2e0915ba0d7173f03b7
 MD5 (ogo/opengroupware-gstep-make-4.2-ogo008.i386.rpm) = 83c7f8d32a478f3e3292752036453ee0
 MD5 (ogo/opengroupware-gstep-objc-2.95.3-ogo008.i386.rpm) = 51a1e4ea7771db97505d5c547542fa0c
-MD5 (ogo/opengroupware-js-1.5-ogo008.i386.rpm) = a6735704e7177480976087b2818e3af3
+MD5 (ogo/opengroupware-js-1.5-ogo009.i386.rpm) = eccdc0f78803f2e796fa39a456cff448
 MD5 (ogo/opengroupware-libfoundation-1.0.12-ogo014.i386.rpm) = 8430bc792deb211eeb9c97d168fdbd99
 MD5 (ogo/opengroupware-libical-0.23.0-ogo006.i386.rpm) = 339fcd165790b8f6901a6f7ef35cb0fe
 MD5 (ogo/opengroupware-libxml2-2.5.3-ogo007.i386.rpm) = 2646720663e31f883717a394ede8f4ae
@@ -39,17 +39,17 @@ MD5 (ogo/opengroupware-webui-mailer-1.0-ogo012.i386.rpm) = bf95b0594f20a4fb2ac82
 MD5 (ogo/opengroupware-webui-news-1.0-ogo008.i386.rpm) = 9a6212968a044f4b9a1c66cf610c4969
 MD5 (ogo/opengroupware-webui-prefs-1.0-ogo008.i386.rpm) = f59d85ff58fec827c9e709ff8121e20c
 MD5 (ogo/opengroupware-webui-project-1.0-ogo023.i386.rpm) = 91b7ad0b635b8df0aceae8d57c2e7084
-MD5 (ogo/opengroupware-webui-resource-de-1.0-ogo030.i386.rpm) = 271592e331a971b1d7fefb9f596c53c2
-MD5 (ogo/opengroupware-webui-resource-dk-1.0-ogo030.i386.rpm) = d23dcb3ce0bc67edfd2d8521bd4cdcd2
-MD5 (ogo/opengroupware-webui-resource-en-1.0-ogo030.i386.rpm) = 849686a004d0fb8596fdcd22aa8d24d7
-MD5 (ogo/opengroupware-webui-resource-es-1.0-ogo030.i386.rpm) = 4c1c5b36ed7f60fd5a947fa80af2cd91
-MD5 (ogo/opengroupware-webui-resource-fr-1.0-ogo030.i386.rpm) = 4643191d5de343417c64b70ddf880c26
-MD5 (ogo/opengroupware-webui-resource-it-1.0-ogo030.i386.rpm) = 23e1a15dc831ef33d90b331d9640f8ba
-MD5 (ogo/opengroupware-webui-resource-pt_BR-1.0-ogo030.i386.rpm) = a54bf278fac7f69dbfaf289746745fcd
+MD5 (ogo/opengroupware-webui-resource-de-1.0-ogo032.i386.rpm) = 93e230a1ae255c3ef02455cccd81c0ff
+MD5 (ogo/opengroupware-webui-resource-dk-1.0-ogo032.i386.rpm) = 25e3e61dad88da0b22367fac0816f6b0
+MD5 (ogo/opengroupware-webui-resource-en-1.0-ogo032.i386.rpm) = 6a0b14b4ae634d3a4f7a543ef3cfa46f
+MD5 (ogo/opengroupware-webui-resource-es-1.0-ogo032.i386.rpm) = 8098bf5f78da5b08e6a443cd61f38fb6
+MD5 (ogo/opengroupware-webui-resource-fr-1.0-ogo032.i386.rpm) = 679b51df393ce029445234df1be3fa2c
+MD5 (ogo/opengroupware-webui-resource-it-1.0-ogo032.i386.rpm) = 3011bb3ec2a0ddaa4dfc71820d430a0a
+MD5 (ogo/opengroupware-webui-resource-pt_BR-1.0-ogo032.i386.rpm) = 86a373e15317e42984854f1e1034c8aa
 MD5 (ogo/opengroupware-webui-scheduler-1.0-ogo018.i386.rpm) = 19419584ea3092230743a1f6cc305616
-MD5 (ogo/opengroupware-xml-4.2-ogo014.i386.rpm) = 0809db9f1370e574928cd6ad62ab9148
-MD5 (ogo/opengroupware-xml-icalsaxdriver-4.2-ogo014.i386.rpm) = 39f662e9cd6a39f74beefb0f901ec7b4
-MD5 (ogo/opengroupware-xml-libxmlsaxdriver-4.2-ogo014.i386.rpm) = d06954f196f94b54a5c8f238484184bb
+MD5 (ogo/opengroupware-xml-4.2-ogo015.i386.rpm) = f9c62ddc3ec4d711b874f4ef795b596b
+MD5 (ogo/opengroupware-xml-icalsaxdriver-4.2-ogo015.i386.rpm) = e1c448b3ea262f83965eef2563d86623
+MD5 (ogo/opengroupware-xml-libxmlsaxdriver-4.2-ogo015.i386.rpm) = 48e9b4955fb0c6da80b738ba9f02ab04
 MD5 (ogo/opengroupware-xmlrpcd-1.0-ogo013.i386.rpm) = 9684db6efebdae7ce5781f9b5a743717
 MD5 (ogo/opengroupware-zidestore-1.0-ogo026.i386.rpm) = 4e21f9b7617e38fa0a449bc8eefaee79
 MD5 (ogo/opengroupware.org-mod_ngobjweb-200310102348.tar.gz) = 3e5a8ecc7d97e25e2344e85ac91df407
diff --git a/misc/linux-opengroupware/files/INSTALL.fbsd b/misc/linux-opengroupware/files/INSTALL.fbsd
index f7a3a467e6f1..219812a6f981 100644
--- a/misc/linux-opengroupware/files/INSTALL.fbsd
+++ b/misc/linux-opengroupware/files/INSTALL.fbsd
@@ -1,5 +1,5 @@
-#$Id: INSTALL.fbsd,v 1.2 2003/09/13 14:59:49 frank Exp $
 GENERAL NOTE:
+=============
 
 	You're welcome to ask questions about OpenGroupware
 	at
@@ -7,7 +7,11 @@ GENERAL NOTE:
 		http://www.opengroupware.org
 
 	too. :p Don't hesitate.
+	Beside the FAQ are several mailinglists and ofcourse
+	our mailinglist archive as first aid kit.
 
+INSTALLATION WALKTHROUGH:
+=========================
 
 1)	First of all - you must have linux compat mode
 	activated.
@@ -38,7 +42,7 @@ GENERAL NOTE:
 
 		linproc                 /compat/linux/proc      linprocfs rw 0 0
 
-	(If you don't have linproc mounted - OGo will coredump :P - so check twice)
+	(If you don't have linproc mounted - OGo will teach you and coredump :P - so check twice)
 
 
 2)	Make sure, that your PostgreSQL Installation
@@ -51,7 +55,7 @@ GENERAL NOTE:
 	should show you if it is.
 	The output might look like:
 
-		[root@minax]/usr/local/pgsql/data: netstat -an -p tcp|grep -i 5432
+		[frank@minax]/usr/local/pgsql/data: netstat -an -p tcp|grep -i 5432
 		tcp4       0      0  *.5432                 *.*                    LISTEN
 
 	(Hoping that it is really PostgreSQL showing up there :))
@@ -60,7 +64,7 @@ GENERAL NOTE:
 
 	should give you better results since it gives an output like this:
 
-		[root@minax]/usr/local/pgsql/data: lsof -Pni|grep -i 5432
+		[frank@minax]/usr/local/pgsql/data: lsof -Pni|grep -i 5432
 		postgres  411 pgsql    3u  IPv4 0xc428cca8      0t0  TCP *:5432 (LISTEN)
 
 	If there's no output at all (ie. nothing similiar to what you've just seen)
@@ -69,7 +73,7 @@ GENERAL NOTE:
 
 		'/usr/local/pgsql/data/postgresql.conf'
 
-	and make sure that there's the following line active:
+	and make sure that there's the following line activated:
 
 		tcpip_socket = true
 
@@ -109,17 +113,22 @@ GENERAL NOTE:
 
 		`psql ogo ogo`
 		
-		a shell like environment appears know.... type there:
+		a shell like environment appears know... type there:
 
 		\i /compat/linux/opt/opengroupware.org/Database/PostgreSQL/pg-build-schema.psql
 
-		...and the database scheme gets installed.
+		...and the basic database scheme gets installed.
+		There's also a scheme with constraints in the same directory.
+		It's safe to add this one too:
+
+		\i /compat/linux/opt/opengroupware.org/Database/PostgreSQL/pg-build-schema.psql.constraints
+		
 
 		Leave this shell with
 
 		\q
 
-		and CTRL-D back to your `root` account.
+		and CTRL-D back into your `root` account.
 
 5)	Restart PostgreSQL again.
 
@@ -128,14 +137,23 @@ GENERAL NOTE:
 
 		`/usr/local/etc/rc.d/ogo.sh.sample start`
 
+7)	There are some other startscripts in /usr/local/etc/rc.d too:
 
-NOW POINT YOUR BROWSER TO:
+	nhsd.sh.sample		-	Network Hotsync (tm) Daemon
+							useful if you want to use PALM [tm] Sync
 
-	http://<host.where.you.installed.tld>/OpenGroupware/
+	xmlrpcd.sh.sample	-	XML-RPC Daemon
+							as the name says - an XMLRPC daemon
 
-and enjoy! :)
+	zidestore.sh.sample	-	the famous ZideStore daemon
+							necessary if you want to use thirdparty
+							applications in conjunction with OGo.
+							(Evolution, Mozilla, Apple iCal.app,
+							KOrganizer, generic WebDAV clients ...)
 
 
--- 
+NOW POINT YOUR BROWSER TO:
+
+	http://<host.where.you.installed.tld>/OpenGroupware/
 
-	Frank Reppin
+and enjoy! :)
diff --git a/misc/linux-opengroupware/files/OpenGroupware.org.apacheinclude b/misc/linux-opengroupware/files/OpenGroupware.org.apacheinclude
deleted file mode 100644
index fbae0db000d0..000000000000
--- a/misc/linux-opengroupware/files/OpenGroupware.org.apacheinclude
+++ /dev/null
@@ -1,15 +0,0 @@
-#$FreeBSD$
-#
-# by Frank Reppin
-#
-# necessary Apache includes!
-# keep an eye on the apacheversion :)
-
-LoadModule ngobjweb_module    /compat/linux/opt/opengroupware.org/ngobjweb_1.3.28.so
-
-<LocationMatch "^/OpenGroupware/*">
-	SetHandler ngobjweb-adaptor
-	SetAppPort 20000
-</LocationMatch>
-
-Alias /OpenGroupware.woa/WebServerResources/ "/compat/linux/opt/opengroupware.org/WebServerResources/"
diff --git a/misc/linux-opengroupware/files/OpenGroupware.plist.tmpl b/misc/linux-opengroupware/files/OpenGroupware.plist.tmpl
index 6fa90fe4b3ae..e4f65fe617ec 100644
--- a/misc/linux-opengroupware/files/OpenGroupware.plist.tmpl
+++ b/misc/linux-opengroupware/files/OpenGroupware.plist.tmpl
@@ -100,9 +100,9 @@
         "Mozilla/4.0 (compatible; MSIE"
     );
     LSPluginViewerEnabled = YES;
-    ServerSideSortingDisabled = YES;
-    ShowOnlySubscribedInRoot = NO;
-    ShowOnlySubscribedInSubFolders = NO;
+    ServerSideSortingDisabled = NO;
+    ShowOnlySubscribedInRoot = YES;
+    ShowOnlySubscribedInSubFolders = YES;
     ShowVacationPanel = YES;
     SkyButtonRowDefaultButtonsLeft = 0;
     SkyButtonRowHideInactiveButtons = 1;
@@ -131,7 +131,7 @@
     UseSkyrixLoginForImap = NO;
     WOCachingEnabled = YES;
     WOContactSNS = NO;
-    WODebuggingEnabled = NO;
+    WODebuggingEnabled = YES;
     WODefaultSessionTimeout = 1200;
     WOResourcePrefix = "";
     language = "English";
@@ -144,5 +144,5 @@
     timezone = MET;
     OGoMinimumActiveSessionCount = 0;
     WOUseWatchDog = YES;
-    ImapDebugEnabled=no;
+    ImapDebugEnabled = NO;
 }
diff --git a/misc/linux-opengroupware/files/ZideStore.plist.tmpl b/misc/linux-opengroupware/files/ZideStore.plist.tmpl
index d1f51e790c2d..15a097edb0a9 100644
--- a/misc/linux-opengroupware/files/ZideStore.plist.tmpl
+++ b/misc/linux-opengroupware/files/ZideStore.plist.tmpl
@@ -2,7 +2,7 @@
     SxExplain = NO;
     WOCachingEnabled = YES;
     WOHttpTransactionUseSimpleParser = YES;
-    WOPort = "localhost:23000";
+    WOPort = "localhost:20001";
     ZLFolderRefresh = 1;
     ZLShowGroupOverviewCalendars = YES;
-}
\ No newline at end of file
+}
diff --git a/misc/linux-opengroupware/files/nhsd.sh.sample b/misc/linux-opengroupware/files/nhsd.sh.sample
index 6a6106fbfd3e..e59b25afe4af 100644
--- a/misc/linux-opengroupware/files/nhsd.sh.sample
+++ b/misc/linux-opengroupware/files/nhsd.sh.sample
@@ -7,7 +7,7 @@ OGO_USER='ogo'
 OGO_GROUP='skyrix'
 NHSD_BIN='/compat/linux/opt/opengroupware.org/Tools/ix86/linux-gnu/gnu-fd-nil/nhsd'
 OGO_DIR='/compat/linux/opt/opengroupware.org'
-LOG='/var/log/opengroupware/xmlrpcd.log'
+LOG='/var/log/opengroupware/nhsd.log'
 
 
 case $1 in
diff --git a/misc/linux-opengroupware/files/skyaptnotify.plist.tmpl b/misc/linux-opengroupware/files/skyaptnotify.plist.tmpl
new file mode 100644
index 000000000000..708543494ac9
--- /dev/null
+++ b/misc/linux-opengroupware/files/skyaptnotify.plist.tmpl
@@ -0,0 +1,7 @@
+{
+    AptNotifyBeVerbose = NO;
+    AptNotifyFromAddress = "ogo@localhost";
+    AptNotifySentResourcesFile = "/var/log/opengroupware/OGosent-resources";
+    AptNotifySkyrixPassword = "";
+    AptNotifySkyrixUser = root;
+}
diff --git a/misc/linux-opengroupware/files/xmlrpcd.plist.tmpl b/misc/linux-opengroupware/files/xmlrpcd.plist.tmpl
new file mode 100644
index 000000000000..d100d1550cfc
--- /dev/null
+++ b/misc/linux-opengroupware/files/xmlrpcd.plist.tmpl
@@ -0,0 +1,4 @@
+{
+    LSMaxSearchCount = 1000;
+    WOPort = "localhost:20000";
+}
\ No newline at end of file
diff --git a/misc/linux-opengroupware/pkg-install b/misc/linux-opengroupware/pkg-install
index db64487c86a6..3441529130db 100644
--- a/misc/linux-opengroupware/pkg-install
+++ b/misc/linux-opengroupware/pkg-install
@@ -53,12 +53,16 @@ WRITE-DEFAULTS-FIRSTTIME)
 		${SU} -l ${OGO} -c "${DW} NSGlobalDomain skyrix_id ${ME}" >/dev/null 2>&1
 		${SU} -l ${OGO} -c "${DW} NSGlobalDomain LSAdaptor PostgreSQL72" >/dev/null 2>&1
 		${SU} -l ${OGO} -c "${DW} NSGlobalDomain LSModelName OpenGroupware.org_PostgreSQL" >/dev/null 2>&1
+		${SU} -l ${OGO} -c "${DW} NSGlobalDomain LSMaxSearchCount 500" >/dev/null 2>&1
 		${SU} -l ${OGO} -c "${DW} NSGlobalDomain LSConnectionDictionary '{hostName=localhost; userName=ogo; password=\"\"; port=5432; databaseName=ogo}'" >/dev/null 2>&1
 		${SU} -l ${OGO} -c "${DW} NSGlobalDomain LSAttachmentPath \"/compat/linux/opt/opengroupware.org/documents\"" >/dev/null 2>&1
 		${SU} -l ${OGO} -c "${DW} NSGlobalDomain LSNewsImagesPath \"/compat/linux/opt/opengroupware.org/news\"" >/dev/null 2>&1
 		${SU} -l ${OGO} -c "${DW} NSGlobalDomain LSNewsImagesUrl \"/ArticleImages\"" >/dev/null 2>&1
 		${SU} -l ${OGO} -c "${DW} NSGlobalDomain NGBundlePath \"/compat/linux/opt/opengroupware.org/Library/OpenGroupware.org\"" >/dev/null 2>&1
 		${SU} -l ${OGO} -c "${DW} NSGlobalDomain XMLReader libxmlSAXDriver" >/dev/null 2>&1
+		${SU} -l ${OGO} -c "${DW} NSGlobalDomain WOPort localhost:19999" >/dev/null 2>&1
+		${SU} -l ${OGO} -c "${DW} NSGlobalDomain TimeZoneName GMT" >/dev/null 2>&1
+		${SU} -l ${OGO} -c "${DW} NSGlobalDomain Languages '{English}'" >/dev/null 2>&1
 
 		${SU} -l ${OGO} -c "${DW} " >/dev/null 2>&1
 		echo "done."
@@ -69,10 +73,15 @@ WRITE-DEFAULTS-FIRSTTIME)
 	;;
 
 COPY-TEMPLATES)
+
+	INSTALL='/usr/bin/install'
+	OGO_USER='ogo'
+	OGO_GROUP='skyrix'
+
 	if [ ! -e /compat/linux/opt/opengroupware.org/.libFoundation/Defaults/OpenGroupware.plist ] 2>/dev/null; then
 		echo "OpenGroupware.plist not found..."
 		echo "thus I am using the one coming with the port."
-		cp files/OpenGroupware.plist.tmpl /compat/linux/opt/opengroupware.org/.libFoundation/Defaults/OpenGroupware.plist >/dev/null 2>&1
+		${INSTALL} -m 640 -o ${OGO_USER} -g ${OGO_GROUP}  files/OpenGroupware.plist.tmpl /compat/linux/opt/opengroupware.org/.libFoundation/Defaults/OpenGroupware.plist >/dev/null 2>&1
 	else
 		echo "OpenGroupware.plist is already in place!"
 	fi
@@ -80,9 +89,26 @@ COPY-TEMPLATES)
 	if [ ! -e /compat/linux/opt/opengroupware.org/.libFoundation/Defaults/ZideStore.plist ] 2>/dev/null; then
 		echo "ZideStore.plist not found..."
 		echo "thus I am using the one coming with the port."
-		cp files/ZideStore.plist.tmpl /compat/linux/opt/opengroupware.org/.libFoundation/Defaults/ZideStore.plist >/dev/null 2>&1
+		${INSTALL} -m 640 -o ${OGO_USER} -g ${OGO_GROUP} files/ZideStore.plist.tmpl /compat/linux/opt/opengroupware.org/.libFoundation/Defaults/ZideStore.plist >/dev/null 2>&1
 	else
 		echo "ZideStore.plist is already in place!"
 	fi
+
+	if [ ! -e /compat/linux/opt/opengroupware.org/.libFoundation/Defaults/xmlrpcd.plist ] 2>/dev/null; then
+		echo "xmlrpcd.plist not found..."
+		echo "thus I am using the one coming with the port."
+		${INSTALL} -m 640 -o ${OGO_USER} -g ${OGO_GROUP} files/xmlrpcd.plist.tmpl /compat/linux/opt/opengroupware.org/.libFoundation/Defaults/xmlrpcd.plist >/dev/null 2>&1
+	else
+		echo "xmlrpcd.plist is already in place!"
+	fi
+
+	if [ ! -e /compat/linux/opt/opengroupware.org/.libFoundation/Defaults/skyaptnotify.plist ] 2>/dev/null; then
+		echo "skyaptnotify.plist not found..."
+		echo "thus I am using the one coming with the port."
+		${INSTALL} -m 640 -o ${OGO_USER} -g ${OGO_GROUP} files/skyaptnotify.plist.tmpl /compat/linux/opt/opengroupware.org/.libFoundation/Defaults/skyaptnotify.plist >/dev/null 2>&1
+	else
+		echo "skyaptnotify.plist is already in place!"
+	fi
+
 	;;
 esac
diff --git a/misc/linux-opengroupware/pkg-message b/misc/linux-opengroupware/pkg-message
index ce4b319800ad..1d8353ba0d8b 100644
--- a/misc/linux-opengroupware/pkg-message
+++ b/misc/linux-opengroupware/pkg-message
@@ -11,9 +11,12 @@
 
 	2)	Install the ogo database scheme for PostgreSQL.
 
-	3)	manually add a line into your httpd.conf
+	3)	manually add one line into your httpd.conf
 
 	For a complete and detailed walkthrough refer to
 	the INSTALL.fbsd in:
 
 	/compat/linux/opt/opengroupware.org
+
+	Enjoy using OpenGroupware.org!
+
diff --git a/misc/linux-opengroupware/scripts/patch_apache_version.pl b/misc/linux-opengroupware/scripts/patch_apache_version.pl
index fa4c4549f01e..040f1ee55b86 100644
--- a/misc/linux-opengroupware/scripts/patch_apache_version.pl
+++ b/misc/linux-opengroupware/scripts/patch_apache_version.pl
@@ -1,11 +1,14 @@
 #!/usr/bin/perl -w
-# by frank
+# 
+# by Frank Reppin <frank.reppin@boerde.de>
+# 
 
 use strict;
 
 my $current_apache_version = `/usr/local/sbin/httpd -v|head -1`;
 my @version = split / /, $current_apache_version;
 my $version;
+my $runs_with;
 
 $version = $version[2];
 $version =~ s/^Apache\///g;
@@ -13,16 +16,57 @@ chomp $version;
 
 if ( ! -e '/compat/linux/opt/opengroupware.org/OpenGroupware.org.apacheinclude' ) {
 	print "OpenGroupware.org.apacheinclude is not present! I'll deal with this issue!\n";
-	open (AI, "> /compat/linux/opt/opengroupware.org/OpenGroupware.org.apacheinclude");
+	open (AI, "> /compat/linux/opt/opengroupware.org/OpenGroupware.org.apacheinclude") || die "Arrr! This won't work, because: $!\n";
+		print AI "# This loads the mod_ngobjweb module which is the binding part between\n";
+		print AI "# the Apache web server and the OGo application.\n";
+		print AI "#\n";
 	print AI "LoadModule ngobjweb_module\t/compat/linux/opt/opengroupware.org/ngobjweb_$version.so\n";
 	print AI "\n";
-	print AI "<LocationMatch \"^/OpenGroupware/*\">\n";
+		print AI "<LocationMatch \"^/OpenGroupware*\">\n";
 	print AI "\tSetHandler ngobjweb-adaptor\n";
-	print AI "\tSetAppPort 20000\n";
+		print AI "\tSetAppPort 19999\n";
+		print AI "</LocationMatch>\n";
+		print AI "\n";
+		print AI "<LocationMatch \"^/evolution*\">\n";
+		print AI "\tSetHandler ngobjweb-adaptor\n";
+		print AI "\tSetAppPort 20001\n";
+		print AI "</LocationMatch>\n";
+		print AI "\n";
+		print AI "<LocationMatch \"^/zidestore/*\">\n";
+		print AI "\tSetHandler ngobjweb-adaptor\n";
+		print AI "\tSetAppPort 20001\n";
 	print AI "</LocationMatch>\n";
 	print AI "\n";
 	print AI "Alias /OpenGroupware.woa/WebServerResources/ \"/compat/linux/opt/opengroupware.org/WebServerResources/\"\n";
+		print AI "Alias /ArticleImages \"/compat/linux/opt/opengroupware.org/news\"\n";
 	close(AI);
 } else {
+		print "\n";
 	print "OpenGroupware.org.apacheinclude is already present and will not be changed!\n";
+		open(OI, "/compat/linux/opt/opengroupware.org/OpenGroupware.org.apacheinclude");
+			while(<OI>) {
+				if (/ngobjweb_\d+.*\.so$/) {
+					$runs_with = $&;
+					$runs_with =~ s/^ngobjweb_//g;
+					$runs_with =~ s/\.so$//g;
+				}
+			}
+		close(OI);
+		if ( $runs_with eq $version ) {
+			print "The OpenGroupware.org.apacheinclude seems to be fine.\n";
+			print "It's configured for Apache $runs_with and we have Apache $version\n";
+		} else {
+			print "\n";
+			print "But! Chances are, that your OpenGroupware.org.apacheinclude is broken.\n";
+			print "This isn't necessarily an error - as it might be a result of a special\n";
+			print "configuration you're using.\n";
+			print "It's also very likely that you've updated your Apache from ports in between.\n";
+			print "\n";
+			print "Here are the results:\n";
+			print "-------------------------\n";
+			print "OpenGroupware.org.apacheinclude is configured to use Apache $runs_with\n";
+			print "The version string of your Apache binary indicates that you run $version\n";
+			print "Please verify this setting manually and - if needed - update your\n";
+			print "OpenGroupware.org.apacheinclude to reflect the recent changes made to your system.\n";
+		}
 }