Install apache module and default configuration file

Switch to gnustep-base (no need for gui)

svn path=/overlay/; revision=369

4 files changed, 64 insertions, 11 deletions

diff --git a/gnustep-apps/sogo/Manifest b/gnustep-apps/sogo/Manifest
index 95632b4..61e0c89 100644
--- a/gnustep-apps/sogo/Manifest
+++ b/gnustep-apps/sogo/Manifest
@@ -1,3 +1,3 @@
 AUX sogo-foundation_include.patch 296 RMD160 c12185f556ccb3e3c922a9ffe7f1c4f72337aea6 SHA1 3eaabf94cbce392e81a81b74f55b2256712ce168 SHA256 5d230c040c5919acf29c4ddc45306dc38344048eae0fce0580140880a6c6537f
 DIST SOGo-1.0rc6.1.tar.gz 1304442 RMD160 07cbec5672670ff6355687565470bb4265ba7d36 SHA1 81954756dc641c1d9fee23be312f150dea7a5661 SHA256 80477c1949965fbc30a3d01f72b6aa701d7e1b9e8739d529f39c80edcb56a4e6
-EBUILD sogo-1.0_rc6.ebuild 900 RMD160 77cf88160682227b23120232378c45cde8ec6eeb SHA1 5c309963c99d59eb856efb1cf236b573f232d6d1 SHA256 ebcbabc1ccddce22c6cce8c791a43e96164c3195a61cd1e01705c9e5b7f38fa0
+EBUILD sogo-1.0_rc6.ebuild 2059 RMD160 791712c5c75ea76dd928ef11740cf9c1bf8c10f1 SHA1 a6c8ab78c055ce8506299bcf454ee8b9f2218794 SHA256 bc2822e9d8d63b98943a8d3ca6552e310e7f7c86e914e0149ea51f449195856c
diff --git a/gnustep-apps/sogo/sogo-1.0_rc6.ebuild b/gnustep-apps/sogo/sogo-1.0_rc6.ebuild
index 6c6a944..bc8789f 100644
--- a/gnustep-apps/sogo/sogo-1.0_rc6.ebuild
+++ b/gnustep-apps/sogo/sogo-1.0_rc6.ebuild
@@ -3,12 +3,10 @@
 # $Header: $
 
 #TODO:
-# * switch to gnustep-base
-# * Provide default configuration file for apache
 # * create user, fill defaults
 # * complete DEPEND
 
-inherit gnustep-2
+inherit depend.apache gnustep-base
 
 MY_PN="SOGo"
 MY_PV="1.0rc6.1"
@@ -23,6 +21,7 @@ IUSE=""
 
 DEPEND="gnustep-libs/sope"
 RDEPEND="${DEPEND}"
+need_apache2
 
 S=${WORKDIR}/${MY_PN}
 
@@ -40,3 +39,45 @@ src_compile() {
 	./configure
 	egnustep_make
 }
+
+src_install() {
+	gnustep-base_src_install
+	dodir "${APACHE_MODULES_CONFDIR}"
+	cat <<EOF >"${D}/${APACHE_MODULES_CONFDIR}"/47_sogo.conf
+<IfDefine SOPE>
+LoadModule ngobjweb_module modules/mod_ngobjweb.so
+
+Alias   /sogo.woa/WebServerResources/ \
+        ${GNUSTEP_SYSTEM_LIBRARY}/SOGo-0.9/WebServerResources/
+Alias   /SOGo.woa/WebServerResources/ \
+        ${GNUSTEP_SYSTEM_LIBRARY}/SOGo-0.9/WebServerResources/
+
+AliasMatch      /SOGo/so/ControlPanel/Products/(.*)/Resources/(.*) \
+                ${GNUSTEP_SYSTEM_LIBRARY}/SOGo-0.9/\$1.SOGo/Resources/\$2
+
+<LocationMatch "^/SOGo*">
+        AddDefaultCharset UTF-8
+        SetHandler ngobjweb-adaptor
+        SetAppPort 18888
+</LocationMatch>
+
+<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*png">
+        SetHandler default-handler
+</LocationMatch>
+
+<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*gif">
+        SetHandler default-handler
+</LocationMatch>
+
+<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*css">
+        SetHandler default-handler
+</LocationMatch>
+
+<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*js">
+        SetHandler default-handler
+</LocationMatch>
+
+</IfDefine>
+EOF
+
+}
diff --git a/gnustep-libs/sope/Manifest b/gnustep-libs/sope/Manifest
index 5c38bac..7c02f24 100644
--- a/gnustep-libs/sope/Manifest
+++ b/gnustep-libs/sope/Manifest
@@ -4,4 +4,4 @@ AUX sope-nsexception.patch 1139 RMD160 08268926bb3a54408f493637afe196be3788429b
 AUX sope-patchset-r1621.diff 72909 RMD160 82fc9162f5892aa907355e860d59f7a4b6ffec91 SHA1 70bf987c82fe3943b2b53522d099e8157326969d SHA256 eb86e3ca689beb188d832021bcd854cbcbdee2d36618ee060ec08db9e75920e2
 AUX sope-use_system_root.patch 548 RMD160 add8b03f06b20ae96676b4efe17af08e024eae4c SHA1 86d50d562f5a94d3ffbd408fd59cbec288c17eb6 SHA256 6ac0f18cd2b39ae40b490f0e61952f6c7eccdc7939a4c7f844d2a3967abf2e64
 DIST sope-trunk-r1621-200805211100.tar.gz 4223699 RMD160 9b09c70577e32fb94daced41853a1c30c1d3ed8c SHA1 1d152ff065146cb10e4cfd80523ddb21bddc52d2 SHA256 fc6516599e3c292b2c08989bb274d6ccadb036b8bd1fe550f33774f3b7ed9ada
-EBUILD sope-4.7_pre20080521.ebuild 1325 RMD160 a2d284eb6537d738443333f7d52790de61340503 SHA1 6c2d6516c8cb53c13f1f1acae3f9b571497f0b9a SHA256 cb19b31fa2f1e8135179fe1719756148598dd1f4aff26e3f1f16ee24851b0e4c
+EBUILD sope-4.7_pre20080521.ebuild 1519 RMD160 dfaf4d79195975ca3dabd0ce760fe1bc54d901bb SHA1 a69a887231beb9b1a316bf05b6a1d8fcb360872b SHA256 965ec22f261a6ad0ab38f869fbcd668a5026c5c17b9b264e4325a86dec3cd610
diff --git a/gnustep-libs/sope/sope-4.7_pre20080521.ebuild b/gnustep-libs/sope/sope-4.7_pre20080521.ebuild
index 6d54f4d..2950aae 100644
--- a/gnustep-libs/sope/sope-4.7_pre20080521.ebuild
+++ b/gnustep-libs/sope/sope-4.7_pre20080521.ebuild
@@ -3,12 +3,10 @@
 # $Header: $
 
 #TODO:
-# * switch to gnustep-base
-# * Install module from sope-appserver/mod_ngobjweb/
 # * add use flags and deps for mysql,postrgesql, sqlite
 # * complete DEPEND
 
-inherit gnustep-2
+inherit gnustep-base apache-module
 
 MY_PV="1621-200805211100"
 
@@ -21,11 +19,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-libs/libxml2
-	net-nds/openldap
-	www-servers/apache"
+DEPEND="gnustep-base/gnustep-base
+	dev-libs/libxml2
+	net-nds/openldap"
 RDEPEND="${DEPEND}"
 
+APACHE2_MOD_DEFINE="SOPE"
+APACHE2_MOD_FILE="sope-appserver/mod_ngobjweb/mod_ngobjweb.so"
+need_apache2
+
 S=${WORKDIR}/${PN}
 
 src_unpack() {
@@ -47,3 +49,13 @@ src_compile() {
 	./configure --with-gnustep || die "configure failed"
 	egnustep_make apxs=/usr/sbin/apxs apr=/usr/bin/apr-1-config
 }
+
+src_install() {
+	gnustep-base_src_install
+	apache-module_src_install
+}
+
+pkg_postinst() {
+	gnustep-base_pkg_postinst
+	apache-module_pkg_postinst
+}