Attachment 17621 Details for Bug 31937 – file.diff

[patch] file.diff

file.diff (text/plain), 3.00 KB, created by thierry on 2001-11-12 21:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: thierry

Created: 2001-11-12 21:40:01 UTC

Size: 3.00 KB

patch

obsolete

>diff -ruN www/horde.orig/Makefile www/horde/Makefile
>--- www/horde.orig/Makefile	Tue Sep 18 07:51:51 2001
>+++ www/horde/Makefile	Mon Nov 12 22:08:47 2001
>@@ -7,8 +7,7 @@
> #
> 
> PORTNAME=	horde
>-PORTVERSION=	1.2.6
>-PORTREVISION=	1
>+PORTVERSION=	1.2.7
> CATEGORIES=	www
> MASTER_SITES=	ftp://ftp.horde.org/pub/horde/tarballs/
> 
>@@ -68,6 +67,14 @@
> 	@${ECHO_MSG} ""
> .endif
> 
>+pre-install:
>+	@if [ -f ${HORDEDIR}/index.php ]; then \
>+		${ECHO_MSG} "" ; \
>+		${ECHO_MSG} "Please deinstall the port www/horde-devel." ; \
>+		${ECHO_MSG} "" ; \
>+		${FALSE} ; \
>+	 fi
>+
> do-install:
> 	${MKDIR}  ${HORDEDIR}
> 	${MKDIR}  ${PHPLIBDIR}
>@@ -83,6 +90,8 @@
> 	${PERL} -pi -e "s:config/horde:${HORDEDIR}/config/horde:g" ${HORDESBIN}/horde_setup.sh
> 	${PERL} -pi -e "s:imp/config:${HORDEDIR}/imp/config:g" ${HORDESBIN}/horde_setup.sh
> 	${PERL} -pi -e "s:chmod 444 :chmod 444 ${HORDEDIR}/:g" ${HORDESBIN}/horde_setup.sh
>+	${CHMOD} u+x ${HORDESBIN}/horde_secure.sh
>+	${CHMOD} u+x ${HORDESBIN}/horde_setup.sh
> 	${PERL} -pi -e "s:go to the top level directory for your installation and run:run:g" ${HORDEDIR}/setup.php3
> 	${PERL} -pi -e "s:sh ./install.sh:${HORDESBIN}/horde_setup.sh:g" ${HORDEDIR}/setup.php3
> 	${PERL} -pi -e "s:sh ./install.sh:${HORDESBIN}/horde_setup.sh:g" ${HORDEDIR}/templates/index/horde_notconfigured.inc
>@@ -108,15 +117,14 @@
> 	@(if [ -f ${APACHE_CONF} ] ; then \
> 	    (if [ ! -f ${APACHE_CONF}.beforeHorde ] ; then \
> 		${ECHO} "===> Updating httpd.conf..." ; \
>-		${CP} -p ${.CURDIR}/httpd.conf.phplib ${WRKDIR}/httpd.conf.phplib.orig ; \
>+		${CP} -p ${MASTERDIR}/httpd.conf.phplib ${WRKDIR}/httpd.conf.phplib ; \
> 		${PERL} -pi -e "s:/home/httpd/html/horde:${HORDEDIR}:g" ${WRKDIR}/httpd.conf.phplib ; \
> 		${PERL} -pi -e "s:/home/httpd/phplib:${PHPLIBDIR}:g" ${WRKDIR}/httpd.conf.phplib ; \
> 		${CP} -p ${APACHE_CONF} ${APACHE_CONF}.beforeHorde ; \
> 		${GREP} -qw 'phplib' ${APACHE_CONF} || ${CAT} ${WRKDIR}/httpd.conf.phplib >> ${APACHE_CONF} ; \
>-		${RM} ${.CURDIR}/httpd.conf.phplib ; \
>-		${MV} ${.CURDIR}/httpd.conf.phplib.orig ${.CURDIR}/httpd.conf.phplib ; \
> 	    fi) ; \
> 	fi)
>+	${CHOWN} -R www:www ${HORDEDIR}
> .if !defined(NOPORTDOCS)
> 	${MKDIR} ${DOCSDIR}
> .for FILE in ${DOCS}
>diff -ruN www/horde.orig/distinfo www/horde/distinfo
>--- www/horde.orig/distinfo	Sat Aug 18 06:17:52 2001
>+++ www/horde/distinfo	Mon Nov 12 20:40:06 2001
>@@ -1 +1 @@
>-MD5 (horde-1.2.6.tar.gz) = 123d9b8b91f2526ece1595271d33d52c
>+MD5 (horde-1.2.7.tar.gz) = 2433ed0e67739c41021b1a9397130a96
>diff -ruN www/horde.orig/pkg-deinstall www/horde/pkg-deinstall
>--- www/horde.orig/pkg-deinstall	Thu Jan  1 01:00:00 1970
>+++ www/horde/pkg-deinstall	Fri Oct 12 14:33:31 2001
>@@ -0,0 +1,12 @@
>+#!/bin/sh
>+# Try to restore httpd.conf when deinstalling Horde
>+
>+if [ x$2 != xDEINSTALL ]; then
>+    exit
>+fi
>+
>+if [ -f ${PKG_PREFIX}/etc/apache/httpd.conf.beforeHorde ] ; then
>+	echo "Restoring httpd.conf..."
>+	cp ${PKG_PREFIX}/etc/apache/httpd.conf ${PKG_PREFIX}/etc/apache/httpd.conf.deinstHorde
>+	mv ${PKG_PREFIX}/etc/apache/httpd.conf.beforeHorde ${PKG_PREFIX}/etc/apache/httpd.conf
>+fi

Actions: View | Diff

Attachments on bug 31937: 17621