Date: Sun, 7 Jul 2002 14:49:20 +0200 (CEST) From: Thierry Thomas <thierry@pompo.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/40289: Yet another bunch of PERL -> REINPLACE_CMD Message-ID: <20020707124920.EBFB4752E@graf.pompo.net>
next in thread | raw e-mail | index | archive | help
>Number: 40289
>Category: ports
>Synopsis: Yet another bunch of 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: Sun Jul 07 06:00:04 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:
This PR replaces PERL by REINPLACE_CMD in the following ports:
- www/horde;
- mail/imp;
- french/xtel;
- misc/libmcal;
- lang/njs.
>How-To-Repeat:
Deinstall perl, and build these ports.
>Fix:
Apply the following patches.
1) www/horde:
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
2) mail/imp:
diff -urN /usr/ports/mail/imp.orig/Makefile /usr/ports/mail/imp/Makefile
--- /usr/ports/mail/imp.orig/Makefile Mon May 20 22:39:39 2002
+++ /usr/ports/mail/imp/Makefile Sun Jul 7 12:53:30 2002
@@ -93,6 +93,9 @@
.endif
NO_BUILD= yes
+USE_REINPLACE= yes
+
+REINPLACE_ARGS= -i.beforeImp
DOCS= COPYING README docs/CHANGES docs/CREDITS docs/DATABASE \
docs/HELP docs/INSTALL docs/SECURITY docs/KNOWN_BUGS \
docs/PACKAGES
@@ -173,19 +176,17 @@
${CP} -Rp ${WRKSRC}/config ${WRKSRC}/graphics ${WRKSRC}/lib ${IMPDIR}
${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${WRKSRC}/templates ${IMPDIR}
${CP} -p ${WRKSRC}/*.php3 ${WRKSRC}/*.css ${IMPDIR}
- ${PERL} -pi -e "s:/usr/bin/ispell:${LOCALBASE}/bin/ispell:g" \
- ${IMPDIR}/config/defaults.php3.dist
- ${PERL} -pi -e "s:/usr/bin/wvHtml:${LOCALBASE}/bin/wvHtml:g" \
- ${IMPDIR}/config/defaults.php3.dist
- ${PERL} -pi -e "s:/usr/bin/xlHtml:${LOCALBASE}/bin/xlhtml:g" \
+ ${REINPLACE_CMD} -e "s:/usr/bin/ispell:${LOCALBASE}/bin/ispell:g ; \
+ s:/usr/bin/wvHtml:${LOCALBASE}/bin/wvHtml:g ; \
+ s:/usr/bin/xlHtml:${LOCALBASE}/bin/xlhtml:g ; \
+ s:/bin/tar:/usr/bin/tar:g ; \
+ s:/usr/bin/zipinfo:${LOCALBASE}/bin/zipinfo:g" \
${IMPDIR}/config/defaults.php3.dist
- ${PERL} -pi -e "s:/bin/tar:/usr/bin/tar:g" ${IMPDIR}/config/defaults.php3.dist
- ${PERL} -pi -e "s:/usr/bin/zipinfo:${LOCALBASE}/bin/zipinfo:g" \
- ${IMPDIR}/config/defaults.php3.dist
- ${PERL} -pi -e "s:sh ./secure.sh:${HORDESBIN}/horde_secure.sh:g" \
- ${IMPDIR}/templates/index/imp_notconfigured.inc
- ${PERL} -pi -e "s:sh ./install.sh:${HORDESBIN}/horde_setup.sh:g" \
+ @${RM} ${IMPDIR}/config/defaults.php3.dist.beforeImp
+ ${REINPLACE_CMD} -e "s:sh ./secure.sh:${HORDESBIN}/horde_secure.sh:g ; \
+ s:sh ./install.sh:${HORDESBIN}/horde_setup.sh:g" \
${IMPDIR}/templates/index/imp_notconfigured.inc
+ @${RM} ${IMPDIR}/templates/index/imp_notconfigured.inc.beforeImp
@if [ ! -f ${IMPDIR}/config/defaults.php3 ]; then \
${CP} ${IMPDIR}/config/defaults.php3.dist ${IMPDIR}/config/defaults.php3; \
fi
@@ -205,7 +206,7 @@
(if [ ! -f ${APACHE_CONF}.beforeIMP ] ; then \
${ECHO} "===> Updating ${APACHE_CONF}..." ; \
${CP} -p ${.CURDIR}/httpd.conf.imp ${WRKDIR}/httpd.conf.imp ; \
- ${PERL} -pi -e "s:/home/httpd/html/horde/imp:${IMPDIR}:g" \
+ ${REINPLACE_CMD} -e "s:/home/httpd/html/horde/imp:${IMPDIR}:g" \
${WRKDIR}/httpd.conf.imp ; \
${CP} -p ${APACHE_CONF} ${APACHE_CONF}.beforeIMP ; \
${GREP} -qw 'Added for IMP' ${APACHE_CONF} || ${CAT} ${WRKDIR}/httpd.conf.imp \
@@ -213,7 +214,10 @@
fi) ; \
fi)
.if !defined(NOPORTDOCS)
- ${PERL} -pi -e "s:/home/httpd/html/horde/imp:${IMPDIR}:g" ${WRKSRC}/docs/SECURITY
+ ${REINPLACE_CMD} -e "s:/home/httpd/html/horde:${HORDEDIR}:g ; \
+ s:/home/httpd/horde-phplib:${HORDEDIR}/phplib:g ; \
+ s:nobody:www:g" \
+ ${WRKSRC}/docs/SECURITY
${MKDIR} ${DOCSDIR}
.for FILE in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
@@ -248,6 +252,7 @@
@${ECHO} "IMAP-UW; you may want to reinstall it with SSL support, or"
@${ECHO} "if you need an SSL connection to your IMAP server, you can"
@${ECHO} "install the port security/stunnel."
+ @${ECHO} "Note: without SSL, you have to choose the IMAP port 143/notls"
@${ECHO} "******************************************************************"
.include <bsd.port.mk>
3) french/xtel:
diff -urN /usr/ports/french/xtel.orig/Makefile /usr/ports/french/xtel/Makefile
--- /usr/ports/french/xtel.orig/Makefile Thu Mar 14 00:13:09 2002
+++ /usr/ports/french/xtel/Makefile Sun Jul 7 13:26:56 2002
@@ -21,6 +21,7 @@
USE_IMAKE= yes
USE_XPM= yes
+USE_REINPLACE= yes
MAN1= xtel.1 xteld.1
@@ -37,10 +38,9 @@
post-patch:
.for FILE in ${PATCH_FILES}
- @${PERL} -pi -e "s:%%LOCALBASE%%:${LOCALBASE}:g" ${WRKSRC}/${FILE}
+ ${CHMOD} u+w ${WRKSRC}/${FILE}
+ ${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:g" ${WRKSRC}/${FILE}
.endfor
- find ${WRKSRC} -type f | xargs ${PERL} -pi -e \
- "s@#include.*<malloc.h>@#include <stdlib.h>@g"
pre-configure:
.if !exists(${PREFIX}/lib/X11/config/host.def)
diff -urN /usr/ports/french/xtel.orig/files/patch-Videotex_Videotex.c /usr/ports/french/xtel/files/patch-Videotex_Videotex.c
--- /usr/ports/french/xtel.orig/files/patch-Videotex_Videotex.c Thu Jan 1 01:00:00 1970
+++ /usr/ports/french/xtel/files/patch-Videotex_Videotex.c Sun Jul 7 13:18:50 2002
@@ -0,0 +1,11 @@
+--- Videotex/Videotex.c.orig Sun Feb 11 01:13:00 2001
++++ Videotex/Videotex.c Sun Jul 7 13:17:57 2002
+@@ -22,7 +22,7 @@
+ /*
+ * Widget Videotex: VideotexWidgetClass
+ */
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <ctype.h>
+ #include <X11/IntrinsicP.h>
+ #include <X11/StringDefs.h>
4) misc/libmcal:
diff -urN /usr/ports/misc/libmcal.orig/Makefile /usr/ports/misc/libmcal/Makefile
--- /usr/ports/misc/libmcal.orig/Makefile Thu Mar 14 00:13:30 2002
+++ /usr/ports/misc/libmcal/Makefile Sun Jul 7 13:41:29 2002
@@ -20,6 +20,7 @@
HAS_CONFIGURE= yes
USE_LIBTOOL= yes
USE_GMAKE= yes
+USE_REINPLACE= yes
CONFIGURE_ARGS= --with-mstore --with-icap \
--prefix=${PREFIX} --exec-prefix=${PREFIX}
INSTALLS_SHLIB= yes
@@ -43,7 +44,7 @@
${MV} ${WRKSRC}/mstore/README ${WRKSRC}/mstore/README.mstore
post-patch:
- ${PERL} -pi -e "s:/etc/mpasswd:${PREFIX}/etc/mpasswd:" ${WRKSRC}/mstore/mstore.c
+ ${REINPLACE_CMD} -e "s:/etc/mpasswd:${PREFIX}/etc/mpasswd:" ${WRKSRC}/mstore/mstore.c
pre-configure:
@${ECHO_MSG} "===> Building the driver mstore"
@@ -55,8 +56,10 @@
post-install:
.if !defined(NOPORTDOCS)
- ${PERL} -pi -e "s:/etc/mpasswd:${LOCALBASE}/etc/mpasswd:" ${WRKSRC}/FAQ-MCAL
- ${PERL} -pi -e "s:/etc/mpasswd:${LOCALBASE}/etc/mpasswd:" ${WRKSRC}/mstore/README.mstore
+ ${REINPLACE_CMD} -e "s:/etc/mpasswd:${LOCALBASE}/etc/mpasswd:" \
+ ${WRKSRC}/FAQ-MCAL
+ ${REINPLACE_CMD} -e "s:/etc/mpasswd:${LOCALBASE}/etc/mpasswd:" \
+ ${WRKSRC}/mstore/README.mstore
${MKDIR} ${DOCSDIR}
.for FILE in ${DOCS}
@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
5) lang/njs:
diff -urN /usr/ports/lang/njs.orig/Makefile /usr/ports/lang/njs/Makefile
--- /usr/ports/lang/njs.orig/Makefile Tue Jan 29 22:12:40 2002
+++ /usr/ports/lang/njs/Makefile Sun Jul 7 14:30:28 2002
@@ -18,16 +18,16 @@
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
+.if defined(NOPORTDOCS)
+USE_REINPLACE= yes
+.endif
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-shared
MAN1= js.1 jsdas.1
post-extract:
- ${RM} ${WRKSRC}/docs/js.info*
-
-post-patch:
- ${PERL} -pi -e 's:=makeinfo:="makeinfo --no-split":g' ${WRKSRC}/configure
+ @${RM} ${WRKSRC}/docs/js.info*
pre-configure:
@if [ -f ${LOCALBASE}/include/js.h ]; then \
@@ -39,7 +39,7 @@
pre-install:
.if defined(NOPORTDOCS)
- ${PERL} -pi -e "s:docs micros examples:micros:g" ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} -e "s:docs micros examples:micros:g" ${WRKSRC}/Makefile
.endif
post-install:
diff -urN /usr/ports/lang/njs.orig/files/patch-configure /usr/ports/lang/njs/files/patch-configure
--- /usr/ports/lang/njs.orig/files/patch-configure Thu Jan 1 01:00:00 1970
+++ /usr/ports/lang/njs/files/patch-configure Sun Jul 7 14:05:05 2002
@@ -0,0 +1,11 @@
+--- configure.orig Fri Jan 15 08:39:56 1999
++++ configure Sun Jul 7 14:04:03 2002
+@@ -791,7 +791,7 @@
+ # an executable is not found, even if stderr is redirected.
+ # Redirect stdin to placate older versions of autoconf. Sigh.
+ if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
+- MAKEINFO=makeinfo
++ MAKEINFO="makeinfo --no-split"
+ echo "$ac_t""found" 1>&6
+ else
+ MAKEINFO="$missing_dir/missing makeinfo"
>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?20020707124920.EBFB4752E>