Date: Tue, 25 Jun 2002 23:50:50 +0200 (CEST)
From: Thierry Thomas <thierry@pompo.net>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: ports/39856: Horde apps: ${PERL} -> ${REINPLACE_CMD}
Message-ID: <20020625215050.CF4A77861@graf.pompo.net>
next in thread | raw e-mail | index | archive | help
>Number: 39856
>Category: ports
>Synopsis: Horde apps: ${PERL} -> ${REINPLACE_CMD}
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Jun 25 15:00:09 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Thierry Thomas
>Release: FreeBSD 4.6-STABLE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 4.6-STABLE FreeBSD 4.6-STABLE #0: Sun Jun 16 15:14:29 CEST 2002 root@graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF010429 i386
>Description:
Replace ${PERL} by ${REINPLACE_CMD} in Horde applications.
>How-To-Repeat:
N.A.
>Fix:
Apply the following patches:
1) www/horde2
diff -urN /usr/ports/www/horde2.orig/Makefile /usr/ports/www/horde2/Makefile
--- /usr/ports/www/horde2.orig/Makefile Tue Jun 18 20:28:49 2002
+++ /usr/ports/www/horde2/Makefile Mon Jun 24 22:15:13 2002
@@ -34,6 +34,9 @@
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 \
@@ -92,33 +95,35 @@
@${CP} -p ${WRKSRC}/*.php ${HORDEDIR}
@if [ ! -f ${CONFDIR}/horde.php ]; then \
${CP} ${CONFDIR}/horde.php.dist ${CONFDIR}/horde.php ; \
- ${PERL} -pi -e "s:/var/www/htdocs/horde/templates:${HORDEDIR}/templates:g" \
- ${CONFDIR}/horde.php ; \
- ${PERL} -pi -e "s:/tmp/horde.log:${LOG_FILE}:g" ${CONFDIR}/horde.php ; \
+ ${REINPLACE_CMD} -e "s:/tmp/horde.log:${LOG_FILE}:g" ${CONFDIR}/horde.php ; \
+ ${RM} ${CONFDIR}/horde.php.beforeHorde ; \
fi
- @${PERL} -pi -e "s:/etc/mpasswd:${LOCALBASE}/etc/mpasswd:g" \
+ @${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
- @${PERL} -pi -e "s:%%LOCALBASE%%:${LOCALBASE}:" ${CONFDIR}/mime_drivers.php
+ @${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
- @${PERL} -pi -e "s:UPDATED_BY_THE_PORT:${HORDEDIR}/:g" \
+ @${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} ; \
- ${PERL} -pi -e "s:/home/httpd/html/horde:${HORDEDIR}:g" ${HORDE_INC}/httpd.conf.horde ; \
- ${PERL} -pi -e "s:/home/httpd/phplib:${PHP_LIB}:g" ${HORDE_INC}/httpd.conf.horde ; \
- ${ECHO_MSG} "===> Updating ${APACHE_CONF}..." ; \
- ${CP} -p ${APACHE_CONF} ${APACHE_CONF}.beforeHorde ; \
- ${PERL} -pi -e "s:php_value auto_prepend_file:# php_value auto_prepend_file:g" ${APACHE_CONF} ; \
- ${PERL} -pi -e "s:${HORDEDIR}/phplib:${PHP_LIB}:g" ${APACHE_CONF} ; \
- ${ECHO_CMD} "# Horde's include directory" >> ${APACHE_CONF} ; \
- ${ECHO_CMD} "Include ${HORDE_INC}" >> ${APACHE_CONF} ; \
+ ${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}
@@ -129,7 +134,8 @@
.for FILE in ${DOCS}
@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
.endfor
- @${PERL} -pi -e "s:/usr/local/apache/htdocs/horde:${DOCSDIR}:g" ${DOCSDIR}/INSTALL
+ @${REINPLACE_CMD} -e "s:/usr/local/apache/htdocs:${PREFIX}/www:g" ${DOCSDIR}/INSTALL
+ @${RM} ${DOCSDIR}/INSTALL.beforeHorde
@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
.endif
diff -urN /usr/ports/www/horde2.orig/files/patch-ab /usr/ports/www/horde2/files/patch-ab
--- /usr/ports/www/horde2.orig/files/patch-ab Thu May 16 20:44:45 2002
+++ /usr/ports/www/horde2/files/patch-ab Mon Jun 24 22:00:14 2002
@@ -1,5 +1,5 @@
---- config/horde.php.dist.orig Sat Mar 9 19:43:35 2002
-+++ config/horde.php.dist Wed Mar 13 01:21:30 2002
+--- 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
@@ -9,18 +9,9 @@
// 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',
+ // 'session' (preferences only persist during the login), 'ldap',
// and 'sql'.
-$conf['prefs']['driver'] = 'none';
+$conf['prefs']['driver'] = 'sql';
@@ -44,18 +35,18 @@
+$conf['prefs']['params']['database'] = 'horde';
+$conf['prefs']['params']['table'] = 'horde_prefs';
-
- /**
-@@ -177,7 +177,7 @@
- // function correctly. For sendmail, this is mainly the sendmail_path
- // option; SMTP requires at least a server and a port (if nonstandard).
+ // 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');
-@@ -223,3 +223,9 @@
+@@ -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;
diff -urN /usr/ports/www/horde2.orig/pkg-deinstall /usr/ports/www/horde2/pkg-deinstall
--- /usr/ports/www/horde2.orig/pkg-deinstall Sun Nov 25 17:06:56 2001
+++ /usr/ports/www/horde2/pkg-deinstall Mon Jun 24 22:22:45 2002
@@ -8,6 +8,7 @@
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
- perl -pi -e "s:Include ${PKG_PREFIX}/etc/horde:# Include ${PKG_PREFIX}/etc/horde:g" \
+ sed_inplace -i.tmp -e "s:Include ${PKG_PREFIX}/etc/horde:# Include ${PKG_PREFIX}/etc/horde:g" \
${PKG_PREFIX}/etc/apache/httpd.conf
+ rm ${PKG_PREFIX}/etc/apache/httpd.conf.tmp
fi
2) mail/turba
diff -urN /usr/ports/mail/turba.orig/Makefile /usr/ports/mail/turba/Makefile
--- /usr/ports/mail/turba.orig/Makefile Tue Jun 18 20:28:27 2002
+++ /usr/ports/mail/turba/Makefile Mon Jun 24 22:59:40 2002
@@ -39,6 +39,9 @@
RUN_DEPENDS+= ${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2
NO_BUILD= yes
+USE_REINPLACE= yes
+
+REINPLACE_ARGS= -i.beforeTurba
DOCS= COPYING README docs/CHANGES docs/CREDITS \
docs/INSTALL docs/turba.dia docs/turba.pdf
CONFFILE= attributes.php conf.php html.php menu.php \
@@ -109,11 +112,10 @@
@${CHOWN} -R www:www ${TURBADIR}
@${CHMOD} -R o-rwx ${CONFDIR}
@${CP} -p ${FILESDIR}/httpd.conf.turba ${HORDE_INC}
- @${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \
+ @${REINPLACE_CMD} -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \
${HORDE_INC}/httpd.conf.turba
- @${CP} -p ${HORDEDIR}/config/registry.php \
- ${HORDEDIR}/config/registry.php.beforeTurba
- @${PERL} -pi -e "s://UNCOMMENTWHENINSTTURBA::" \
+ @${RM} ${HORDE_INC}/httpd.conf.turba.beforeTurba
+ @${REINPLACE_CMD} -e "s://UNCOMMENTWHENINSTTURBA::" \
${HORDEDIR}/config/registry.php
@${CP} -p ${HORDEDIR}/config/registry.php \
${HORDEDIR}/config/registry.php.afterTurba
3) mail/imp3
diff -urN /usr/ports/mail/imp3.orig/Makefile /usr/ports/mail/imp3/Makefile
--- /usr/ports/mail/imp3.orig/Makefile Tue Jun 18 20:28:23 2002
+++ /usr/ports/mail/imp3/Makefile Tue Jun 25 21:55:52 2002
@@ -121,6 +121,9 @@
IS_INTERACTIVE= 'need to build mod_php4 with mcrypt, cclient with SSL.'
NO_BUILD= yes
+USE_REINPLACE= yes
+
+REINPLACE_ARGS= -i.beforeIMP
DOCS= COPYING README docs/CHANGES docs/CREDITS docs/INSTALL
CONFFILE= conf.php filter.txt header.txt html.php menu.php \
mime_drivers.php motd.php prefs.php servers.php \
@@ -238,62 +241,66 @@
${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
fi
.endfor
- @${CP} -p ${HCONFDIR}/mime_drivers.php ${HCONFDIR}/mime_drivers.php.beforeIMP
- @${CP} -p ${HCONFDIR}/registry.php ${HCONFDIR}/registry.php.beforeIMP
- @${CP} -p ${TURBADIR}/config/conf.php ${TURBADIR}/config/conf.php.beforeIMP
- @${PERL} -pi -e "s:example.com:${HOSTNAME}:g" ${CONFDIR}/servers.php
- @${PERL} -pi -e "s:%%LOCALBASE%%:${LOCALBASE}:g" ${CONFDIR}/mime_drivers.php
- @${PERL} -pi -e "s:IMP_VERSION:IMP_VERSION . ' / ${SERVOS}':" \
+ @${CP} -p ${HCONFDIR}/mime_drivers.php ${HCONFDIR}/mime_drivers.php.beforeIMP3
+ @${CP} -p ${HCONFDIR}/registry.php ${HCONFDIR}/registry.php.beforeIMP3
+ @${CP} -p ${TURBADIR}/config/conf.php ${TURBADIR}/config/conf.php.beforeIMP3
+ @${REINPLACE_CMD} -e "s:example.com:${HOSTNAME}:g" ${CONFDIR}/servers.php
+ @${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:g" ${CONFDIR}/mime_drivers.php
+ @${RM} ${CONFDIR}/mime_drivers.php.beforeIMP
+ @${REINPLACE_CMD} -e "s:IMP_VERSION:IMP_VERSION . ' / ${SERVOS}':" \
${IMPDIR}/compose.php
+ @${RM} ${IMPDIR}/compose.php.beforeIMP
.if defined(WITHOUT_SSL)
- @${PERL} -pi -e "s:%%PROTOCOL%%:imap/notls:;s:%%IMAPPORT%%:143:" \
+ @${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/notls:;s:%%IMAPPORT%%:143:" \
${CONFDIR}/servers.php
.else
- @${PERL} -pi -e "s:%%IMAPPORT%%:993:" ${CONFDIR}/servers.php
+ @${REINPLACE_CMD} -e "s:%%IMAPPORT%%:993:" ${CONFDIR}/servers.php
.if defined(WITH_VALID_CERT)
- @${PERL} -pi -e "s:%%PROTOCOL%%:imap/ssl:" ${CONFDIR}/servers.php
+ @${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/ssl:" ${CONFDIR}/servers.php
.else
- @${PERL} -pi -e "s:%%PROTOCOL%%:imap/ssl/novalidate-cert:" \
+ @${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/ssl/novalidate-cert:" \
${CONFDIR}/servers.php
.endif
+ @${RM} ${CONFDIR}/servers.php.beforeIMP
.endif
.if !defined(WITHOUT_ASPELL)
- @${PERL} -pi -e "s:spellchecker'] = '':spellchecker'] = '${LOCALBASE}/bin/aspell':" \
+ @${REINPLACE_CMD} -e "s:spellchecker'] = '':spellchecker'] = '${LOCALBASE}/bin/aspell':" \
${CONFDIR}/conf.php
.endif
.if !defined(WITHOUT_X11)
.if !defined(WITHOUT_WV)
- @${PERL} -pi -e "s://UNCOMMENTIFWV ::" ${HCONFDIR}/mime_drivers.php
+ @${REINPLACE_CMD} -e "s://UNCOMMENTIFWV ::" ${HCONFDIR}/mime_drivers.php
.endif
.if !defined(WITHOUT_XL)
- @${PERL} -pi -e "s://UNCOMMENTIFXL ::" ${HCONFDIR}/mime_drivers.php
+ @${REINPLACE_CMD} -e "s://UNCOMMENTIFXL ::" ${HCONFDIR}/mime_drivers.php
.endif
.endif
#.if !defined(NOCRYPT)
# @(if [ ! -d ${GNUPG_CNFDIR} ] ; then \
# ${MKDIR} ${GNUPG_CNFDIR} ; \
# fi)
-# @${PERL} -pi -e "s:pgp']['enabled'] = false:pgp']['enabled'] = true:g" \
+# @${REINPLACE_CMD} -e "s:pgp']['enabled'] = false:pgp']['enabled'] = true:g" \
# ${CONFDIR}/conf.php
-# @${PERL} -pi -e "s:%%GNUPG_CNFDIR%%:${GNUPG_CNFDIR}:" \
+# @${REINPLACE_CMD} -e "s:%%GNUPG_CNFDIR%%:${GNUPG_CNFDIR}:" \
# ${CONFDIR}/conf.php
#.endif
.if !defined(WITHOUT_ZIP)
- @${PERL} -pi -e "s://UNCOMMENTIFZIP ::" ${HCONFDIR}/mime_drivers.php
+ @${REINPLACE_CMD} -e "s://UNCOMMENTIFZIP ::" ${HCONFDIR}/mime_drivers.php
.endif
.if defined(WITH_RAR)
- @${PERL} -pi -e "s://UNCOMMENTIFRAR ::" ${HCONFDIR}/mime_drivers.php
+ @${REINPLACE_CMD} -e "s://UNCOMMENTIFRAR ::" ${HCONFDIR}/mime_drivers.php
.endif
@${CHOWN} -R www:www ${IMPDIR}
@${CHMOD} -R o-rwx ${CONFDIR}
@${CP} -p ${FILESDIR}/httpd.conf.imp ${HORDE_INC}/httpd.conf.imp
- @${PERL} -pi -e "s:/home/httpd/html/horde/imp:${IMPDIR}:g" ${HORDE_INC}/httpd.conf.imp
+ @${REINPLACE_CMD} -e "s:/home/httpd/html/horde/imp:${IMPDIR}:g" ${HORDE_INC}/httpd.conf.imp
+ @${RM} ${HORDE_INC}/httpd.conf.imp.beforeIMP
# Let's Horde use IMP for auth
- @${PERL} -pi -e "s://UNCOMMENTWHENINSTIMP::" ${HCONFDIR}/registry.php
+ @${REINPLACE_CMD} -e "s://UNCOMMENTWHENINSTIMP::" ${HCONFDIR}/registry.php
# Provide a link to IMP from Turba
.if !defined(WITHOUT_TURBA)
- @${PERL} -pi -e "s://UNCOMMENTWHENINSTIMP::" ${TURBADIR}/config/conf.php
- @${PERL} -pi -e "s:apps'] = array\(\):apps'] = array('turba'):" \
+ @${REINPLACE_CMD} -e "s://UNCOMMENTWHENINSTIMP::" ${TURBADIR}/config/conf.php
+ @${REINPLACE_CMD} -e "s:apps'] = array():apps'] = array('turba'):" \
${CONFDIR}/conf.php
.endif
.if !defined(NOPORTDOCS)
@@ -304,6 +311,10 @@
@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
.endif
# Prepare deinstallation
+ @${RM} ${CONFDIR}/conf.php.beforeIMP
+ @${MV} ${HCONFDIR}/mime_drivers.php.beforeIMP3 ${HCONFDIR}/mime_drivers.php.beforeIMP
+ @${MV} ${HCONFDIR}/registry.php.beforeIMP3 ${HCONFDIR}/registry.php.beforeIMP
+ @${MV} ${TURBADIR}/config/conf.php.beforeIMP3 ${TURBADIR}/config/conf.php.beforeIMP
@${CP} -p ${HCONFDIR}/mime_drivers.php ${HCONFDIR}/mime_drivers.php.afterIMP
@${CP} -p ${HCONFDIR}/registry.php ${HCONFDIR}/registry.php.afterIMP
@${CP} -p ${TURBADIR}/config/conf.php ${TURBADIR}/config/conf.php.afterIMP
4) deskutils/nag
diff -urN /usr/ports/deskutils/nag.orig/Makefile /usr/ports/deskutils/nag/Makefile
--- /usr/ports/deskutils/nag.orig/Makefile Tue Jun 18 20:27:58 2002
+++ /usr/ports/deskutils/nag/Makefile Tue Jun 25 22:47:50 2002
@@ -16,8 +16,11 @@
RUN_DEPENDS= ${LOCALBASE}/www/horde/imp/index.php:${PORTSDIR}/mail/imp3
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
NO_BUILD= yes
+USE_REINPLACE= yes
+
+REINPLACE_ARGS= -i.beforeNag
+
PLIST_SUB= HORDEDIR=${LHORDEDIR} NAGDIR=${LNAGDIR}
DOCS= COPYING README docs/CHANGES docs/CREDITS docs/INSTALL \
@@ -48,11 +51,10 @@
@${CHOWN} -R www:www ${NAGDIR}
@${CHMOD} -R o-rwx ${CONFDIR}
@${CP} -p ${FILESDIR}/httpd.conf.nag ${HORDE_INC}
- @${PERL} -pi -e "s:/home/httpd/html/horde/nag:${NAGDIR}:g" \
+ @${REINPLACE_CMD} -e "s:/home/httpd/html/horde/nag:${NAGDIR}:g" \
${HORDE_INC}/httpd.conf.nag
- @${CP} -p ${HORDEDIR}/config/registry.php \
- ${HORDEDIR}/config/registry.php.beforeNag
- @${PERL} -pi -e "s://UNCOMMENTWHENINSTNAG::" ${HORDEDIR}/config/registry.php
+ @${RM} ${HORDE_INC}/httpd.conf.nag.beforeNag
+ @${REINPLACE_CMD} -e "s://UNCOMMENTWHENINSTNAG::" ${HORDEDIR}/config/registry.php
@${CP} -p ${HORDEDIR}/config/registry.php \
${HORDEDIR}/config/registry.php.afterNag
.if !defined(NOPORTDOCS)
5) deskutils/kronolith
diff -urN /usr/ports/deskutils/kronolith.orig/Makefile /usr/ports/deskutils/kronolith/Makefile
--- /usr/ports/deskutils/kronolith.orig/Makefile Tue Jun 18 20:27:58 2002
+++ /usr/ports/deskutils/kronolith/Makefile Tue Jun 25 23:09:32 2002
@@ -18,9 +18,11 @@
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-IS_INTERACTIVE= 'need to build mod_php4 with mcrypt option set.'
+IS_INTERACTIVE= 'need to build mod_php4 with MCAL option set.'
NO_BUILD= yes
+USE_REINPLACE= yes
+REINPLACE_ARGS= -i.beforeKronolith
DOCS= COPYING README docs/CHANGES docs/CREDITS docs/INSTALL docs/TODO
CONFFILE= conf.php html.php keywords.php menu.php prefs.php
SUB_DIRS= config graphics lib locale po scripts templates
@@ -60,11 +62,10 @@
@${CHOWN} -R www:www ${KRONOLITHDIR}
@${CHMOD} -R o-rwx ${CONFDIR}
@${CP} -p ${FILESDIR}/httpd.conf.kronolith ${HORDE_INC}
- @${PERL} -pi -e "s:/home/httpd/html/horde/kronolith:${KRONOLITHDIR}:g" \
+ @${REINPLACE_CMD} -e "s:/home/httpd/html/horde/kronolith:${KRONOLITHDIR}:g" \
${HORDE_INC}/httpd.conf.kronolith
- @${CP} -p ${HORDEDIR}/config/registry.php \
- ${HORDEDIR}/config/registry.php.beforeKronolith
- @${PERL} -pi -e "s://UNCOMMENTWHENINSTKRONOLITH::" \
+ @${RM} ${HORDE_INC}/httpd.conf.kronolith.beforeKronolith
+ @${REINPLACE_CMD} -e "s://UNCOMMENTWHENINSTKRONOLITH::" \
${HORDEDIR}/config/registry.php
@${CP} -p ${HORDEDIR}/config/registry.php \
${HORDEDIR}/config/registry.php.afterKronolith
@@ -88,16 +89,17 @@
${ECHO} -n "Please enter a password for www's calendar: " ; \
(read PASSCAL; \
${LOCALBASE}/bin/htpasswd -bc ${LOCALBASE}/etc/mpasswd www $${PASSCAL}; \
- ${PERL} -pi -e "s:%%PASSCAL%%:$${PASSCAL}:" ${CONFDIR}/conf.php) \
+ ${REINPLACE_CMD} -e "s:%%PASSCAL%%:$${PASSCAL}:" ${CONFDIR}/conf.php) \
elif ! ${GREP} -q -e "^www" ${LOCALBASE}/etc/mpasswd ; then \
${ECHO_MSG} "===> Adding www into ${LOCALBASE}/etc/mpasswd" ; \
${ECHO} -n "Please enter a password for www's calendar: " ; \
(read PASSCAL; \
${LOCALBASE}/bin/htpasswd -b ${LOCALBASE}/etc/mpasswd www $${PASSCAL} ; \
- ${PERL} -pi -e "s:%%PASSCAL%%:$${PASSCAL}:" ${CONFDIR}/conf.php) \
+ ${REINPLACE_CMD} -e "s:%%PASSCAL%%:$${PASSCAL}:" ${CONFDIR}/conf.php) \
else \
- ${PERL} -pi -e "s:%%PASSCAL%%:www_cal_password:" ${CONFDIR}/conf.php ; \
+ ${REINPLACE_CMD} -e "s:%%PASSCAL%%:www_cal_password:" ${CONFDIR}/conf.php ; \
fi
+ @${RM} ${CONFDIR}/conf.php.beforeKronolith
.endif
@${ECHO_MSG}
@${CAT} ${PKGMESSAGE} | \
6) devel/chora
diff -urN /usr/ports/devel/chora.orig/Makefile /usr/ports/devel/chora/Makefile
--- /usr/ports/devel/chora.orig/Makefile Tue Jun 18 20:27:59 2002
+++ /usr/ports/devel/chora/Makefile Tue Jun 25 23:23:24 2002
@@ -35,6 +35,8 @@
.endif
NO_BUILD= yes
+USE_REINPLACE= yes
+REINPLACE_ARGS= -i.beforeChora
# Specify where your repository belongs.
# (You can reconfigure it after installation anyway)
@@ -70,21 +72,19 @@
${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
fi
.endfor
- @${PERL} -pi -e "s:%%CVSROOT%%:${CVSROOT}:;s:%%CONFDIR%%:${CONFDIR}:" \
+ @${REINPLACE_CMD} -e "s:%%CVSROOT%%:${CVSROOT}:;s:%%CONFDIR%%:${CONFDIR}:" \
${CONFDIR}/cvsroots.php
+ @${RM} ${CONFDIR}/cvsroots.php.beforeChora
@${CHOWN} -R www:www ${CHORADIR}
@${CHMOD} -R o-rwx ${CONFDIR}
@${CP} -p ${FILESDIR}/httpd.conf.chora ${HORDE_INC}
- @${PERL} -pi -e "s:/home/httpd/html/horde/chora:${CHORADIR}:g" \
+ @${REINPLACE_CMD} -e "s:/home/httpd/html/horde/chora:${CHORADIR}:g" \
${HORDE_INC}/httpd.conf.chora
- @${CP} -p ${HORDEDIR}/config/registry.php \
- ${HORDEDIR}/config/registry.php.beforeChora
- @${CP} -p ${HORDEDIR}/config/mime_drivers.php \
- ${HORDEDIR}/config/mime_drivers.php.beforeChora
- @${PERL} -pi -e "s://UNCOMMENTWHENINSTCHORA::" \
+ @${RM} ${HORDE_INC}/httpd.conf.chora.beforeChora
+ @${REINPLACE_CMD} -e "s://UNCOMMENTWHENINSTCHORA::" \
${HORDEDIR}/config/registry.php
.if !defined(WITHOUT_ENSCRIPT)
- @${PERL} -pi -e "s://UNCOMMENTWHENINSTCHORA::" \
+ @${REINPLACE_CMD} -e "s://UNCOMMENTWHENINSTCHORA::" \
${HORDEDIR}/config/mime_drivers.php
.endif
@${CP} -p ${HORDEDIR}/config/registry.php \
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020625215050.CF4A77861>