Attachment 23409 Details for Bug 40289 – file.diff

[patch] file.diff

file.diff (text/plain), 5.52 KB, created by Thierry Thomas on 2002-07-07 14:00:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Thomas

Created: 2002-07-07 14:00:04 UTC

Size: 5.52 KB

patch

obsolete

>diff -urN /usr/ports/www/horde.orig/Makefile /usr/ports/www/horde/Makefile
>--- /usr/ports/www/horde.orig/Makefile	Mon May 20 22:40:05 2002
>+++ /usr/ports/www/horde/Makefile	Sun Jul  7 11:41:09 2002
>@@ -32,6 +32,9 @@
> .endif
> 
> NO_BUILD=	yes
>+USE_REINPLACE=	yes
>+
>+REINPLACE_ARGS=	-i.beforeHorde
> DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/DATABASE \
> 		docs/HELP docs/INSTALL docs/SECURITY
> 
>@@ -89,23 +92,24 @@
> 	${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${WRKSRC}/templates ${HORDEDIR}
> 	${CP} -p  ${WRKSRC}/phplib/* ${PHPLIBDIR}
> 	${CP} -p  ${WRKSRC}/*.php3 ${HORDEDIR}
>-	${CP} -p  ${WRKSRC}/install.sh ${HORDESBIN}/horde_setup.sh
>-	${CP} -p  ${WRKSRC}/secure.sh  ${HORDESBIN}/horde_secure.sh
>-	${PERL} -pi -e "s:chmod 444 :chmod 444 ${HORDEDIR}/:g" ${HORDESBIN}/horde_secure.sh
>-	${PERL} -pi -e "s:chmod 000 :chmod 000 ${HORDEDIR}/:g" ${HORDESBIN}/horde_secure.sh
>-	${PERL} -pi -e "s:-d imp:-d ${HORDEDIR}/imp:g" ${HORDESBIN}/horde_setup.sh
>-	${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
>+	${REINPLACE_CMD} -e "s:-d imp:-d ${HORDEDIR}/imp:g	; \
>+		s:config/horde:${HORDEDIR}/config/horde:g	; \
>+		s:imp/config:${HORDEDIR}/imp/config:g		; \
>+		s:chmod 444 :chmod 444 ${HORDEDIR}/:g" ${WRKSRC}/install.sh
>+	${CP} ${WRKSRC}/install.sh ${HORDESBIN}/horde_setup.sh
>+	${REINPLACE_CMD} -e "s:%%HORDEDIR%%:${HORDEDIR}:g" ${WRKSRC}/secure.sh
>+	${CP} ${WRKSRC}/secure.sh  ${HORDESBIN}/horde_secure.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"	\
>+	${REINPLACE_CMD} -e "s:go to the top level directory for your installation and run:run:g ; \
>+		s:sh ./install.sh:${HORDESBIN}/horde_setup.sh:g" ${HORDEDIR}/setup.php3
>+	@${RM} ${HORDEDIR}/setup.php3.beforeHorde
>+	${REINPLACE_CMD} -e "s:sh ./install.sh:${HORDESBIN}/horde_setup.sh:g"	\
> 		${HORDEDIR}/templates/index/horde_notconfigured.inc
>-	${PERL} -pi -e "s:sh ./secure.sh:${HORDESBIN}/horde_secure.sh:g"	\
>+	@${RM} ${HORDEDIR}/templates/index/horde_notconfigured.inc.beforeHorde
>+	${REINPLACE_CMD} -e "s:sh ./secure.sh:${HORDESBIN}/horde_secure.sh:g"	\
> 		${HORDEDIR}/templates/setup/imp/write_file.inc
>+	@${RM} ${HORDEDIR}/templates/setup/imp/write_file.inc.beforeHorde
> 	${CP}     ${HORDEDIR}/config/horde.php3.dist ${HORDEDIR}/config/horde.php3
> 	${CHMOD}  444 ${HORDEDIR}/config/horde.php3
> 	${CHMOD}  444 ${HORDEDIR}/setup.php3
>@@ -129,8 +133,8 @@
> 	    (if [ ! -f ${APACHE_CONF}.beforeHorde ] ; then \
> 		${ECHO} "===> Updating httpd.conf..." ; \
> 		${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 ; \
>+		${REINPLACE_CMD} -e "s:/home/httpd/html/horde:${HORDEDIR}:g ; \
>+			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} ; \
> 	    fi) ; \
>@@ -141,8 +145,9 @@
> 	fi
> 	@if ! ${GREP} -q -e '^upload_tmp_dir' ${PHP_INI} ; then \
> 		${ECHO_MSG} "===> Configuring ${PHP_INI} for imp" ; \
>-		${CP} -p ${PHP_INI} ${PHP_INI}.beforeHorde1 ; \
>-		${PERL} -pi -e 's!;upload_tmp_dir =!upload_tmp_dir = /tmp!' ${PHP_INI} ; \
>+		${REINPLACE_CMD} -e 's!;upload_tmp_dir =!upload_tmp_dir = /tmp!' \
>+			${PHP_INI} ; \
>+		${MV} ${PHP_INI}.beforeHorde ${PHP_INI}.beforeHorde1 ; \
> 	fi
> 	${CHOWN} -R www:www ${HORDEDIR}
> .if !defined(NOPORTDOCS)
>diff -urN /usr/ports/www/horde.orig/files/patch-secure.sh /usr/ports/www/horde/files/patch-secure.sh
>--- /usr/ports/www/horde.orig/files/patch-secure.sh	Thu Jan  1 01:00:00 1970
>+++ /usr/ports/www/horde/files/patch-secure.sh	Sun Jul  7 11:38:43 2002
>@@ -0,0 +1,28 @@
>+--- secure.sh.orig	Sun May 28 05:09:52 2000
>++++ secure.sh	Sun Jul  7 11:37:19 2002
>+@@ -1,17 +1,17 @@
>+ #!/bin/sh
>+ 
>+ # Horde Items
>+-chmod 444 config/horde.php3         > /dev/null 2> /dev/null
>+-chmod 444 lib/horde.lib                > /dev/null 2> /dev/null
>+-chmod 444 lib/mime.lib                 > /dev/null 2> /dev/null
>++chmod 444 %%HORDEDIR%%/config/horde.php3            > /dev/null 2> /dev/null
>++chmod 444 %%HORDEDIR%%/lib/horde.lib                > /dev/null 2> /dev/null
>++chmod 444 %%HORDEDIR%%/lib/mime.lib                 > /dev/null 2> /dev/null
>+ 
>+ # IMP Items
>+-chmod 444 imp/config/defaults.php3     > /dev/null 2> /dev/null
>+-chmod 444 imp/lib/imp.lib              > /dev/null 2> /dev/null
>+-chmod 444 imp/lib/mimetypes.lib        > /dev/null 2> /dev/null
>++chmod 444 %%HORDEDIR%%/imp/config/defaults.php3     > /dev/null 2> /dev/null
>++chmod 444 %%HORDEDIR%%/imp/lib/imp.lib              > /dev/null 2> /dev/null
>++chmod 444 %%HORDEDIR%%/imp/lib/mimetypes.lib        > /dev/null 2> /dev/null
>+ 
>+-chmod 000 setup.php3                   > /dev/null 2> /dev/null
>+-chmod 000 test.php3                    > /dev/null 2> /dev/null
>++chmod 000 %%HORDEDIR%%/setup.php3                   > /dev/null 2> /dev/null
>++chmod 000 %%HORDEDIR%%/test.php3                    > /dev/null 2> /dev/null
>+ 
>+ echo 
>+ echo I have made your configuration files, and libraries mode 0444

Actions: View | Diff

Attachments on bug 40289: 23409 | 23410 | 23411 | 23412 | 23413