Attachment #23102 for bug #39856




RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4

NO_BUILD=	yes
USE_REINPLACE=	yes

REINPLACE_ARGS=	-i.beforeHorde
DOCS=		COPYING README docs/CHANGES docs/CODING_STANDARDS \
		docs/CONTRIBUTING docs/CREDITS docs/HACKING docs/INSTALL
CONFFILE=	html.php lang.php mime_drivers.php mime_mapping.php \

	@${CP} -p  ${WRKSRC}/*.php ${HORDEDIR}
	@if [ ! -f ${CONFDIR}/horde.php ]; then \
		${CP} ${CONFDIR}/horde.php.dist ${CONFDIR}/horde.php ; \
		${REINPLACE_CMD} -e "s:/tmp/horde.log:${LOG_FILE}:g" ${CONFDIR}/horde.php ; \
		${RM} ${CONFDIR}/horde.php.beforeHorde ; \
		${PERL} -pi -e "s:/tmp/horde.log:${LOG_FILE}:g" ${CONFDIR}/horde.php ; \
	fi
	@${REINPLACE_CMD} -e "s:/etc/mpasswd:${LOCALBASE}/etc/mpasswd:g" \
		${HORDEDIR}/lib/Auth/mcal.php
	@${RM} ${HORDEDIR}/lib/Auth/mcal.php.beforeHorde
.for FILE in ${CONFFILE}
	@if [ ! -f ${CONFDIR}/${FILE} ]; then \
	  ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
	fi
.endfor
	@${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" ${CONFDIR}/mime_drivers.php
	@${RM} ${CONFDIR}/mime_drivers.php.beforeHorde
	@${CP} ${WRKSRC}/scripts/set_perms.sh ${HORDESBIN}/horde_set_perms.sh
	@${REINPLACE_CMD} -e "s:UPDATED_BY_THE_PORT:${HORDEDIR}/:g" \
		${HORDESBIN}/horde_set_perms.sh
	@${RM} ${HORDESBIN}/horde_set_perms.sh.beforeHorde
	@${CHMOD} u+x ${HORDESBIN}/horde_set_perms.sh
	@(if [ -f ${APACHE_CONF} ] ; then \
		${MKDIR} ${HORDE_INC} ; \
		${CP} -p ${FILESDIR}/httpd.conf.horde ${HORDE_INC} ; \
		${REINPLACE_CMD} -e "s:/home/httpd/html/horde:${HORDEDIR}:g ; \
			s:/home/httpd/phplib:${PHP_LIB}:g" ${HORDE_INC}/httpd.conf.horde ; \
		${RM} ${HORDE_INC}/httpd.conf.horde.beforeHorde ; \
		${ECHO_MSG} "===> Updating ${APACHE_CONF}..." ; \
		${REINPLACE_CMD} -e "s:php_value auto_prepend_file:# php_value auto_prepend_file:g ; \
			s:${HORDEDIR}/phplib:${PHP_LIB}:g" ${APACHE_CONF} ; \
		${ECHO_CMD} "# Horde's include directory" >> ${APACHE_CONF} ; \
		${ECHO_CMD} "Include ${HORDE_INC}" >> ${APACHE_CONF} ; \
	fi)
	@${CHOWN} -R www:www ${HORDEDIR}
	@${CHMOD} -R o-rwx ${CONFDIR}

.for FILE in ${DOCS}
	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
.endfor
	@${REINPLACE_CMD} -e "s:/usr/local/apache/htdocs:${PREFIX}/www:g" ${DOCSDIR}/INSTALL
	@${RM} ${DOCSDIR}/INSTALL.beforeHorde
	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
.endif





--- config/horde.php.dist.orig	Sat Jun  1 01:57:03 2002
+++ config/horde.php.dist	Mon Jun 24 21:59:21 2002
@@ -75,7 +75,7 @@
 
 // What backend should we use for authenticating users to Horde? Valid

 
 // An array holding any parameters that the Auth object will need to
 // function correctly.
@@ -106,7 +106,7 @@
 // and for sql it would be the table name to use. For the 'syslog'
 // driver it is the facility as a _constant_ (with no quotes), e.g.:
 // ... = LOG_LOCAL0;
-$conf['log']['name'] = '/tmp/horde.log';
+$conf['log']['name'] = '/var/log/horde.log';
 
 // What level of messages should we log? The values are LOG_EMERG,
 // LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING, LOG_NOTICE, LOG_INFO,
@@ -131,7 +131,7 @@
 // (meaning use system defaults and don't save any user preferences),
 // 'session' (preferences only persist during the login), 'ldap',
 // and 'sql'.
-$conf['prefs']['driver'] = 'none';
+$conf['prefs']['driver'] = 'sql';

+$conf['prefs']['params']['database'] = 'horde';
+$conf['prefs']['params']['table'] = 'horde_prefs';
 
 // This is an example configuration for an LDAP preference backend.
 // The schemas needed for ldap are in horde/scripts/ldap.  For more
@@ -195,7 +195,7 @@
 // If you want to use SMTP authentication, set the 'auth' parameter
 // to 'true' (without quotes).
 $conf['mailer']['params'] = array();
-// $conf['mailer']['params'] = array('sendmail_path' => '/usr/lib/sendmail');
+// $conf['mailer']['params'] = array('sendmail_path' => '/usr/sbin/sendmail');
 // $conf['mailer']['params'] = array('host' => 'smtp.example.com');
 
 
@@ -241,3 +241,9 @@
 // Should we use DHTML to display a floating menu of Horde appliation
 // links, instead of a frame?
 $conf['menu']['floating_bar'] = false;

Lines 8-13 Link Here

(-)/usr/ports/www/horde2/pkg-deinstall (-1 / +2 lines)
8	if [ -f ${PKG_PREFIX}/etc/apache/httpd.conf.beforeHorde ] ; then	8	if [ -f ${PKG_PREFIX}/etc/apache/httpd.conf.beforeHorde ] ; then
9	echo "Restoring httpd.conf..."	9	echo "Restoring httpd.conf..."
10	cp ${PKG_PREFIX}/etc/apache/httpd.conf ${PKG_PREFIX}/etc/apache/httpd.conf.deinstHorde	10	cp ${PKG_PREFIX}/etc/apache/httpd.conf ${PKG_PREFIX}/etc/apache/httpd.conf.deinstHorde
11	perl -pi -e "s:Include ${PKG_PREFIX}/etc/horde:# Include ${PKG_PREFIX}/etc/horde:g" \	11	sed_inplace -i.tmp -e "s:Include ${PKG_PREFIX}/etc/horde:# Include ${PKG_PREFIX}/etc/horde:g" \
12	${PKG_PREFIX}/etc/apache/httpd.conf	12	${PKG_PREFIX}/etc/apache/httpd.conf
		13	rm ${PKG_PREFIX}/etc/apache/httpd.conf.tmp
13	fi	14	fi

Return to bug 39856

Lines 34-39 Link Here

(-)/usr/ports/www/horde2/Makefile (-17 / +23 lines)
34	RUN_DEPENDS+= ${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4	34	RUN_DEPENDS+= ${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
35		35
36	NO_BUILD= yes	36	NO_BUILD= yes
		37	USE_REINPLACE= yes
		38
		39	REINPLACE_ARGS= -i.beforeHorde
37	DOCS= COPYING README docs/CHANGES docs/CODING_STANDARDS \	40	DOCS= COPYING README docs/CHANGES docs/CODING_STANDARDS \
38	docs/CONTRIBUTING docs/CREDITS docs/HACKING docs/INSTALL	41	docs/CONTRIBUTING docs/CREDITS docs/HACKING docs/INSTALL
39	CONFFILE= html.php lang.php mime_drivers.php mime_mapping.php \	42	CONFFILE= html.php lang.php mime_drivers.php mime_mapping.php \
Lines 92-124 Link Here
92	@${CP} -p ${WRKSRC}/*.php ${HORDEDIR}	95	@${CP} -p ${WRKSRC}/*.php ${HORDEDIR}
93	@if [ ! -f ${CONFDIR}/horde.php ]; then \	96	@if [ ! -f ${CONFDIR}/horde.php ]; then \
94	${CP} ${CONFDIR}/horde.php.dist ${CONFDIR}/horde.php ; \	97	${CP} ${CONFDIR}/horde.php.dist ${CONFDIR}/horde.php ; \
95	${PERL} -pi -e "s:/var/www/htdocs/horde/templates:${HORDEDIR}/templates:g" \	98	${REINPLACE_CMD} -e "s:/tmp/horde.log:${LOG_FILE}:g" ${CONFDIR}/horde.php ; \
96	${CONFDIR}/horde.php ; \	99	${RM} ${CONFDIR}/horde.php.beforeHorde ; \
97	${PERL} -pi -e "s:/tmp/horde.log:${LOG_FILE}:g" ${CONFDIR}/horde.php ; \
98	fi	100	fi
99	@${PERL} -pi -e "s:/etc/mpasswd:${LOCALBASE}/etc/mpasswd:g" \	101	@${REINPLACE_CMD} -e "s:/etc/mpasswd:${LOCALBASE}/etc/mpasswd:g" \
100	${HORDEDIR}/lib/Auth/mcal.php	102	${HORDEDIR}/lib/Auth/mcal.php
		103	@${RM} ${HORDEDIR}/lib/Auth/mcal.php.beforeHorde
101	.for FILE in ${CONFFILE}	104	.for FILE in ${CONFFILE}
102	@if [ ! -f ${CONFDIR}/${FILE} ]; then \	105	@if [ ! -f ${CONFDIR}/${FILE} ]; then \
103	${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \	106	${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
104	fi	107	fi
105	.endfor	108	.endfor
106	@${PERL} -pi -e "s:%%LOCALBASE%%:${LOCALBASE}:" ${CONFDIR}/mime_drivers.php	109	@${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" ${CONFDIR}/mime_drivers.php
		110	@${RM} ${CONFDIR}/mime_drivers.php.beforeHorde
107	@${CP} ${WRKSRC}/scripts/set_perms.sh ${HORDESBIN}/horde_set_perms.sh	111	@${CP} ${WRKSRC}/scripts/set_perms.sh ${HORDESBIN}/horde_set_perms.sh
108	@${PERL} -pi -e "s:UPDATED_BY_THE_PORT:${HORDEDIR}/:g" \	112	@${REINPLACE_CMD} -e "s:UPDATED_BY_THE_PORT:${HORDEDIR}/:g" \
109	${HORDESBIN}/horde_set_perms.sh	113	${HORDESBIN}/horde_set_perms.sh
		114	@${RM} ${HORDESBIN}/horde_set_perms.sh.beforeHorde
110	@${CHMOD} u+x ${HORDESBIN}/horde_set_perms.sh	115	@${CHMOD} u+x ${HORDESBIN}/horde_set_perms.sh
111	@(if [ -f ${APACHE_CONF} ] ; then \	116	@(if [ -f ${APACHE_CONF} ] ; then \
112	${MKDIR} ${HORDE_INC} ; \	117	${MKDIR} ${HORDE_INC} ; \
113	${CP} -p ${FILESDIR}/httpd.conf.horde ${HORDE_INC} ; \	118	${CP} -p ${FILESDIR}/httpd.conf.horde ${HORDE_INC} ; \
114	${PERL} -pi -e "s:/home/httpd/html/horde:${HORDEDIR}:g" ${HORDE_INC}/httpd.conf.horde ; \	119	${REINPLACE_CMD} -e "s:/home/httpd/html/horde:${HORDEDIR}:g ; \
115	${PERL} -pi -e "s:/home/httpd/phplib:${PHP_LIB}:g" ${HORDE_INC}/httpd.conf.horde ; \	120	s:/home/httpd/phplib:${PHP_LIB}:g" ${HORDE_INC}/httpd.conf.horde ; \
116	${ECHO_MSG} "===> Updating ${APACHE_CONF}..." ; \	121	${RM} ${HORDE_INC}/httpd.conf.horde.beforeHorde ; \
117	${CP} -p ${APACHE_CONF} ${APACHE_CONF}.beforeHorde ; \	122	${ECHO_MSG} "===> Updating ${APACHE_CONF}..." ; \
118	${PERL} -pi -e "s:php_value auto_prepend_file:# php_value auto_prepend_file:g" ${APACHE_CONF} ; \	123	${REINPLACE_CMD} -e "s:php_value auto_prepend_file:# php_value auto_prepend_file:g ; \
119	${PERL} -pi -e "s:${HORDEDIR}/phplib:${PHP_LIB}:g" ${APACHE_CONF} ; \	124	s:${HORDEDIR}/phplib:${PHP_LIB}:g" ${APACHE_CONF} ; \
120	${ECHO_CMD} "# Horde's include directory" >> ${APACHE_CONF} ; \	125	${ECHO_CMD} "# Horde's include directory" >> ${APACHE_CONF} ; \
121	${ECHO_CMD} "Include ${HORDE_INC}" >> ${APACHE_CONF} ; \	126	${ECHO_CMD} "Include ${HORDE_INC}" >> ${APACHE_CONF} ; \
122	fi)	127	fi)
123	@${CHOWN} -R www:www ${HORDEDIR}	128	@${CHOWN} -R www:www ${HORDEDIR}
124	@${CHMOD} -R o-rwx ${CONFDIR}	129	@${CHMOD} -R o-rwx ${CONFDIR}
Lines 129-135 Link Here
129	.for FILE in ${DOCS}	134	.for FILE in ${DOCS}
130	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}	135	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
131	.endfor	136	.endfor
132	@${PERL} -pi -e "s:/usr/local/apache/htdocs/horde:${DOCSDIR}:g" ${DOCSDIR}/INSTALL	137	@${REINPLACE_CMD} -e "s:/usr/local/apache/htdocs:${PREFIX}/www:g" ${DOCSDIR}/INSTALL
		138	@${RM} ${DOCSDIR}/INSTALL.beforeHorde
133	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."	139	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
134	.endif	140	.endif
135		141

Lines 1-5 Link Here

(-)/usr/ports/www/horde2/files/patch-ab (-18 / +9 lines)
1	--- config/horde.php.dist.orig Sat Mar 9 19:43:35 2002	1	--- config/horde.php.dist.orig Sat Jun 1 01:57:03 2002
2	+++ config/horde.php.dist Wed Mar 13 01:21:30 2002	2	+++ config/horde.php.dist Mon Jun 24 21:59:21 2002
3	@@ -75,7 +75,7 @@	3	@@ -75,7 +75,7 @@
4		4
5	// What backend should we use for authenticating users to Horde? Valid	5	// What backend should we use for authenticating users to Horde? Valid
Lines 9-26 Link Here
9		9
10	// An array holding any parameters that the Auth object will need to	10	// An array holding any parameters that the Auth object will need to
11	// function correctly.	11	// function correctly.
12	@@ -106,7 +106,7 @@
13	// and for sql it would be the table name to use. For the 'syslog'
14	// driver it is the facility as a _constant_ (with no quotes), e.g.:
15	// ... = LOG_LOCAL0;
16	-$conf['log']['name'] = '/tmp/horde.log';
17	+$conf['log']['name'] = '/var/log/horde.log';
18
19	// What level of messages should we log? The values are LOG_EMERG,
20	// LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING, LOG_NOTICE, LOG_INFO,
21	@@ -131,7 +131,7 @@	12	@@ -131,7 +131,7 @@
22	// (meaning use system defaults and don't save any user preferences),	13	// (meaning use system defaults and don't save any user preferences),
23	// 'session' (preferences only persist during the login), 'ldap',	14	// 'session' (preferences only persist during the login), 'ldap',
24	// and 'sql'.	15	// and 'sql'.
25	-$conf['prefs']['driver'] = 'none';	16	-$conf['prefs']['driver'] = 'none';
26	+$conf['prefs']['driver'] = 'sql';	17	+$conf['prefs']['driver'] = 'sql';
Lines 44-61 Link Here
44	+$conf['prefs']['params']['database'] = 'horde';	35	+$conf['prefs']['params']['database'] = 'horde';
45	+$conf['prefs']['params']['table'] = 'horde_prefs';	36	+$conf['prefs']['params']['table'] = 'horde_prefs';
46		37
47		38	// This is an example configuration for an LDAP preference backend.
48	/**	39	// The schemas needed for ldap are in horde/scripts/ldap. For more
49	@@ -177,7 +177,7 @@	40	@@ -195,7 +195,7 @@
50	// function correctly. For sendmail, this is mainly the sendmail_path	41	// If you want to use SMTP authentication, set the 'auth' parameter
51	// option; SMTP requires at least a server and a port (if nonstandard).	42	// to 'true' (without quotes).
52	$conf['mailer']['params'] = array();	43	$conf['mailer']['params'] = array();
53	-// $conf['mailer']['params'] = array('sendmail_path' => '/usr/lib/sendmail');	44	-// $conf['mailer']['params'] = array('sendmail_path' => '/usr/lib/sendmail');
54	+// $conf['mailer']['params'] = array('sendmail_path' => '/usr/sbin/sendmail');	45	+// $conf['mailer']['params'] = array('sendmail_path' => '/usr/sbin/sendmail');
55	// $conf['mailer']['params'] = array('host' => 'smtp.example.com');	46	// $conf['mailer']['params'] = array('host' => 'smtp.example.com');
56		47
57		48
58	@@ -223,3 +223,9 @@	49	@@ -241,3 +241,9 @@
59	// Should we use DHTML to display a floating menu of Horde appliation	50	// Should we use DHTML to display a floating menu of Horde appliation
60	// links, instead of a frame?	51	// links, instead of a frame?
61	$conf['menu']['floating_bar'] = false;	52	$conf['menu']['floating_bar'] = false;