${PERL} -> ${REINPLACE_CMD}

PR:		39856
Submitted by:	maintainer

6 files changed, 51 insertions, 39 deletions

diff --git a/deskutils/horde-kronolith/Makefile b/deskutils/horde-kronolith/Makefile
index ac563fd6f682..15cbd738af4f 100644
--- a/deskutils/horde-kronolith/Makefile
+++ b/deskutils/horde-kronolith/Makefile
@@ -18,9 +18,11 @@ RUN_DEPENDS=	${LOCALBASE}/www/horde/imp/index.php:${PORTSDIR}/mail/imp3
 
 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 @@ do-install:
 	@${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 @@ post-install:
 	  ${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} | \
diff --git a/deskutils/horde-nag/Makefile b/deskutils/horde-nag/Makefile
index 2f997563f112..cbbd623abdff 100644
--- a/deskutils/horde-nag/Makefile
+++ b/deskutils/horde-nag/Makefile
@@ -16,8 +16,11 @@ MAINTAINER=	thierry@pompo.net
 
 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 @@ do-install:
 	@${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)
diff --git a/deskutils/horde4-kronolith/Makefile b/deskutils/horde4-kronolith/Makefile
index ac563fd6f682..15cbd738af4f 100644
--- a/deskutils/horde4-kronolith/Makefile
+++ b/deskutils/horde4-kronolith/Makefile
@@ -18,9 +18,11 @@ RUN_DEPENDS=	${LOCALBASE}/www/horde/imp/index.php:${PORTSDIR}/mail/imp3
 
 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 @@ do-install:
 	@${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 @@ post-install:
 	  ${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} | \
diff --git a/deskutils/horde4-nag/Makefile b/deskutils/horde4-nag/Makefile
index 2f997563f112..cbbd623abdff 100644
--- a/deskutils/horde4-nag/Makefile
+++ b/deskutils/horde4-nag/Makefile
@@ -16,8 +16,11 @@ MAINTAINER=	thierry@pompo.net
 
 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 @@ do-install:
 	@${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)
diff --git a/deskutils/kronolith/Makefile b/deskutils/kronolith/Makefile
index ac563fd6f682..15cbd738af4f 100644
--- a/deskutils/kronolith/Makefile
+++ b/deskutils/kronolith/Makefile
@@ -18,9 +18,11 @@ RUN_DEPENDS=	${LOCALBASE}/www/horde/imp/index.php:${PORTSDIR}/mail/imp3
 
 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 @@ do-install:
 	@${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 @@ post-install:
 	  ${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} | \
diff --git a/deskutils/nag/Makefile b/deskutils/nag/Makefile
index 2f997563f112..cbbd623abdff 100644
--- a/deskutils/nag/Makefile
+++ b/deskutils/nag/Makefile
@@ -16,8 +16,11 @@ MAINTAINER=	thierry@pompo.net
 
 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 @@ do-install:
 	@${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)