[patch] Ebuild patch

horde-2.1.patch (text/plain), 2.63 KB, created by Ken Brush on 2002-10-31 03:20:30 UTC

--- horde-2.1.ebuild	2002-10-31 00:38:16.000000000 -0800
+++ horde-2.1.ebuild	2002-10-31 01:07:51.000000000 -0800
@@ -15,15 +15,29 @@
          >=dev-php/PEAR-Log-1.1"
 S=${WORKDIR}/${P}
 
+# We will use these to set the permissions properly
+HTTPD_USER="apache"
+HTTPD_GROUP=`grep $HTTPD_USER /etc/passwd |cut -d: -f4`
+
 # Allow users to move the default data directory by setting the
 # home directory of the 'apache' user elsewhere.
-HTTPD_ROOT=`grep apache /etc/passwd | cut -d: -f6`/htdocs
+HTTPD_ROOT=`grep $HTTPD_USER /etc/passwd | cut -d: -f6`/htdocs
+
+
 
-if [ -z "${HTTPD_ROOT}" ]; then
-    eerror "HTTPD_ROOT is null! Using defaults."
-    eerror "You probably want to check /etc/passwd"
-    HTTPD_ROOT="/home/httpd/htdocs"
-fi
+pkg_setup() {
+	if [ -z "${HTTPD_ROOT}" ]; then
+		eewarn "HTTPD_ROOT is null!"
+		eewarn "You probably want to check /etc/passwd"
+		die "Need to have a place to put horde in"
+	fi
+	if [ -L ${HTTPD_ROOT}/horde ] ; then
+		ewarn "You need to unmerge your old Horde version first."
+		ewarn "Horde will be installed into ${HTTPD_ROOT}/horde"
+		ewarn "directly instead of a version-dependant directory."
+		die "need to unmerge old version first"
+	fi
+}
 
 
 src_compile() {
@@ -32,44 +46,24 @@
 }
 
 src_install () {
-    # detecting apache usergroup
-    GID=`grep apache /etc/group |cut -d: -f3`
-    if [ -z "${GID}" ]; then
-        einfo "Using default GID of 81 for Apache"
-        GID=81
-    fi
-
-    dodir ${HTTPD_ROOT}/${P}
-    cp -r . ${D}/${HTTPD_ROOT}/${P}
+    
+    dodir ${HTTPD_ROOT}/horde
+    cp -r . ${D}/${HTTPD_ROOT}/horde
 
     # protecting files
-    chown -R root.${GID} ${D}/${HTTPD_ROOT}/${P}
-    find ${D}/${HTTPD_ROOT}/${P}/ -type f -exec chmod 0640 {} \;
-    find ${D}/${HTTPD_ROOT}/${P}/ -type d -exec chmod 0750 {} \;
-    chmod 0000 ${D}/${HTTPD_ROOT}/${P}/test.php
+    chown -R ${HTTPD_USER}.${HTTPD_GROUP} ${D}/${HTTPD_ROOT}/horde
+    find ${D}/${HTTPD_ROOT}/horde/ -type f -exec chmod 0640 {} \;
+    find ${D}/${HTTPD_ROOT}/horde/ -type d -exec chmod 0750 {} \;
+    chmod 0000 ${D}/${HTTPD_ROOT}/horde/test.php
 }
 
 pkg_postinst() {
     einfo "Horde requires PHP to have :"
     einfo "    ==> 'short_open_tag enabled = On'"
     einfo "    ==> 'magic_quotes_runtime set = Off'"
     einfo "    ==> 'file_uploads enabled = On'"
     einfo "Please edit /etc/php4/php.ini."
     einfo ""
-    if [ -L ${HTTPD_ROOT}/horde ] ; then
-        einfo "You must upgrade your link ${HTTPD_ROOT}/horde !"
-        einfo ""
-    else
-        einfo "You must create symbolic link ${HTTPD_ROOT}/horde to ${HTTPD_ROOT}/${P}..."
-        einfo ""
-    fi
     einfo "Please read ${HTTPD_ROOT}/${P}/docs/INSTALL !"
 }