Date: Mon, 24 Jun 2002 01:45:19 +0200 (CEST)
From: Cyrille Lefevre <cyrille.lefevre@laposte.net>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: ports/39746: Maintainer update: ${PERL} -> ${REINPLACE_CMD}
Message-ID: <200206232345.g5NNjJjY004428@gits.gits.dyndns.org>
next in thread | raw e-mail | index | archive | help
>Number: 39746
>Category: ports
>Synopsis: Maintainer update: ${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 Jun 23 16:50:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Cyrille Lefevre
>Release: FreeBSD 4.6-RC i386
>Organization:
ACME
>Environment:
System: FreeBSD gits 4.6-RC FreeBSD 4.6-RC #11: Sun Jun 9 19:48:37 CEST 2002 root@gits:/disk2/freebsd/src/sys/compile/CUSTOM i386
>Description:
${PERL} -> ${REINPLACE_CMD}
>How-To-Repeat:
n/a
>Fix:
Index: /usr/ports/astro/seti_applet/Makefile
===================================================================
RCS file: /home/ncvs/ports/astro/seti_applet/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- /usr/ports/astro/seti_applet/Makefile 12 Apr 2002 17:09:24 -0000 1.13
+++ /usr/ports/astro/seti_applet/Makefile 23 Jun 2002 23:05:35 -0000
@@ -21,6 +21,7 @@
intl.2:${PORTSDIR}/devel/gettext
RUN_DEPENDS= ${LOCALBASE}/sbin/setiathome:${PORTSDIR}/astro/setiathome
+USE_REINPLACE= yes
USE_X_PREFIX= yes
USE_GNOME= yes
USE_LIBTOOL= yes
@@ -43,16 +44,16 @@
patch-seti_applet patch-message
patch-configure:
- @${PERL} -pi.fbsd -e 's|-lpthread|${PTHREAD_LIBS}|g; \
+ @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g;\
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
patch-makefiles-in:
- @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${PERL} -pi.fbsd -e \
+ @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
's|\$\(datadir\)/gnome/|\$\(datadir\)/|g;\
s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
patch-seti_applet:
- @${PERL} -pi.fbsd -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/src/seti_applet.c
patch-message:
Index: /usr/ports/databases/mysql-gui/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/mysql-gui/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- /usr/ports/databases/mysql-gui/Makefile 17 May 2002 21:31:55 -0000 1.6
+++ /usr/ports/databases/mysql-gui/Makefile 23 Jun 2002 22:32:38 -0000
@@ -28,6 +28,7 @@
fleditor.1:${PORTSDIR}/x11-toolkits/fl_editor \
flvw.1:${PORTSDIR}/x11-toolkits/flvw
+USE_REINPLACE= yes
USE_X_PREFIX= yes
USE_MESA= yes
WRKSRC= ${WRKDIR}/${DISTNAME:S/-/-src-/}
@@ -57,7 +58,7 @@
#
pre-patch: copy-inc
- @${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \
+ @${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
${WRKSRC}/Fl_Help.cc
copy-inc:
Index: /usr/ports/lang/gforth/Makefile
===================================================================
RCS file: /home/ncvs/ports/lang/gforth/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- /usr/ports/lang/gforth/Makefile 17 Jan 2002 23:13:36 -0000 1.9
+++ /usr/ports/lang/gforth/Makefile 23 Jun 2002 22:33:08 -0000
@@ -18,6 +18,7 @@
STRIP= #none
+USE_REINPLACE= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
ALL_TARGET= all info
@@ -61,7 +62,7 @@
post-patch: patch-makefiles
patch-makefiles:
- @${PERL} -pi.fbsd -e 's|makeinfo|makeinfo --no-split|g' \
+ @${REINPLACE_CMD} -e 's|makeinfo|makeinfo --no-split|g' \
${WRKSRC}/Makefile.in
#
Index: /usr/ports/misc/findutils/Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/findutils/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- /usr/ports/misc/findutils/Makefile 17 Jan 2002 23:13:36 -0000 1.13
+++ /usr/ports/misc/findutils/Makefile 23 Jun 2002 22:34:51 -0000
@@ -17,14 +17,12 @@
# Global variables
#
+USE_REINPLACE= yes
GNU_CONFIGURE= yes
+USE_GMAKE= yes
CONFIGURE_ARGS= --program-prefix=g # --localstatedir=${LOCALSTATEDIR}
MAKE_ARGS= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
-USE_GMAKE= yes
-# PREFIX isn't honored. force it w/ prefix.
-MAKE_ARGS+= prefix=${PREFIX}
-
MAN1= gfind.1 gxargs.1 glocate.1 gupdatedb.1
MAN5= glocatedb.5
@@ -45,7 +43,7 @@
#
post-patch:
- @${PERL} -pi.fbsd -e 's|makeinfo|makeinfo --no-split|g' \
+ @${REINPLACE_CMD} -e 's|makeinfo|makeinfo --no-split|g' \
${WRKSRC}/doc/Makefile.in
# Post-configure
@@ -53,7 +51,7 @@
# --localstatedir= isn't handled right now, so, do it manually.
post-configure:
- @${PERL} -pi.fbsd -e 's|\$$\(prefix\)/var|${LOCALSTATEDIR}|g' \
+ @${REINPLACE_CMD} -e 's|\$$\(prefix\)/var|${LOCALSTATEDIR}|g' \
${WRKSRC}/Makefile ${WRKSRC}/locate/Makefile
# Post-install
Index: /usr/ports/misc/sh-utils/Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/sh-utils/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- /usr/ports/misc/sh-utils/Makefile 12 Apr 2002 17:09:55 -0000 1.11
+++ /usr/ports/misc/sh-utils/Makefile 23 Jun 2002 22:35:29 -0000
@@ -19,12 +19,10 @@
LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext
+USE_REINPLACE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --program-prefix=g
-
USE_GMAKE= yes
-# PREFIX isn't honored. force it w/ prefix.
-MAKE_ARGS= prefix=${PREFIX}
+CONFIGURE_ARGS= --program-prefix=g
MAN1= gbasename.1 gchroot.1 gdate.1 gdirname.1 gecho.1 genv.1 \
gexpr.1 gfalse.1 ggroups.1 ghostid.1 ghostname.1 gid.1 \
@@ -50,7 +48,7 @@
do-patch:
.if !defined(WITH_SUID)
- @${PERL} -pi -e "s/u\+s/u\+w/g" ${WRKSRC}/src/Makefile.in
+ @${REINPLACE_CMD} -e 's/u\+s/u\+w/g' ${WRKSRC}/src/Makefile.in
.endif
# Post-install
Index: /usr/ports/misc/upclient/Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/upclient/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- /usr/ports/misc/upclient/Makefile 17 Jan 2002 23:13:37 -0000 1.14
+++ /usr/ports/misc/upclient/Makefile 23 Jun 2002 22:36:28 -0000
@@ -15,6 +15,7 @@
# Global variables
#
+USE_REINPLACE= yes
ALL_TARGET= bsd
BUILD_WRKSRC= ${WRKSRC}/src
@@ -34,7 +35,7 @@
post-patch: patch-script patch-message
patch-script:
- @${PERL} -pi.fbsd -e 's.%%PREFIX%%.${PREFIX}.g' ${WRKSRC}/scripts/upchk
+ @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/scripts/upchk
patch-message:
@${SED} 's|%%PREFIX%%|${PREFIX}|g' ${MSG_FILE} > ${PKGMESSAGE}
Index: /usr/ports/net/isc-dhcp3/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/isc-dhcp3/Makefile,v
retrieving revision 1.79
diff -u -r1.79 Makefile
--- /usr/ports/net/isc-dhcp3/Makefile 10 May 2002 04:11:55 -0000 1.79
+++ /usr/ports/net/isc-dhcp3/Makefile 23 Jun 2002 23:07:42 -0000
@@ -8,7 +8,6 @@
PORTNAME= dhcp
PORTVERSION= 3.0.1.r9
-PORTREVISION= 0
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/%SUBDIR%/ \
${US_MASTER_SITES} ${JAPAN_MASTER_SITES} \
@@ -32,6 +31,7 @@
# Global variables
#
+USE_REINPLACE= yes
HAS_CONFIGURE= yes
MAN1= omshell.1
@@ -124,22 +124,22 @@
patch-message
patch-scripts:
- @${PERL} -pi.fbsd -e 's|%%PREFIX%%|${PREFIX}|g' \
+ @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
${WRKSRC}/client/scripts/freebsd
patch-makefile-conf:
- @${PERL} -pi.fbsd -e 's|^DEBUG[ \t]*=|# DEBUG ?=|g' \
+ @${REINPLACE_CMD} -e 's|^DEBUG[ ]*=|# DEBUG ?=|g' \
${WRKSRC}/Makefile.conf
patch-makefiles-dist:
.for subdir in ${PATCH_SUBDIRS}
- @${PERL} -pi.fbsd -e 's|^CFLAGS[ \t]*=|CFLAGS +=|g' \
+ @${REINPLACE_CMD} -e 's|^CFLAGS[ ]*=|CFLAGS +=|g' \
${WRKSRC}/${subdir}/Makefile.dist
.endfor
# temporary hack - no patch file needed for this typo.
patch-man-pages:
- @${PERL} -ni.fbsd -e '/^\.Fd$$/ or print;' ${WRKSRC}/dhcpctl/dhcpctl.3
+ @${REINPLACE_CMD} -e '/^\.Fd$$/d' ${WRKSRC}/dhcpctl/dhcpctl.3
patch-message:
@${SED} 's|%%PREFIX%%|${PREFIX}|g;s|%%MAN1PREFIX%%|${MAN1PREFIX}|g' \
Index: /usr/ports/security/op/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/op/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- /usr/ports/security/op/Makefile 17 May 2002 22:22:53 -0000 1.7
+++ /usr/ports/security/op/Makefile 23 Jun 2002 23:02:50 -0000
@@ -19,6 +19,7 @@
# Global variables
#
+USE_REINPLACE= yes
BINMODE= 4555
MAKE_ARGS= BASE="${PREFIX}" \
OPTS='-Dbsdi -DOP_ACCESS=\"${CONF_DIR}/${CONF_FILE}\"' \
@@ -57,13 +58,13 @@
post-patch: patch-makefile patch-conf-file
patch-makefile:
- @${PERL} -pi.fbsd \
- -e 's|(install)|$$1 -c| if (!/:/);s|CFLAGS=|CFLAGS+=|' \
+ @${REINPLACE_CMD} \
+ -e '/:/!s|\(install\)|\1 -c|;s|CFLAGS=|CFLAGS+=|' \
${WRKSRC}/Makefile
patch-conf-file:
- @${PERL} -pi.fbsd \
- -e 's|^|#| if (!/^#|DEFAULT|MAGIC/);s|/usr/ucb:||' \
+ @${REINPLACE_CMD} -E \
+ -e '/^#|DEFAULT|MAGIC/!s|^|#|;s|/usr/ucb:||' \
${WRKSRC}/${CONF_FILE}
# Post-install
Index: /usr/ports/textproc/docbook-to-man/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/docbook-to-man/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- /usr/ports/textproc/docbook-to-man/Makefile 17 Jan 2002 23:13:38 -0000 1.3
+++ /usr/ports/textproc/docbook-to-man/Makefile 23 Jun 2002 23:04:17 -0000
@@ -35,6 +35,7 @@
.endif
RUN_DEPENDS+= ${LOCALBASE}/share/sgml/docbook:${PORTSDIR}/textproc/docbook
+USE_REINPLACE= yes
USE_IMAKE= yes
USE_X_PREFIX= no
USE_XLIB= yes
@@ -65,7 +66,7 @@
post-patch: patch-docbook-to-man
patch-docbook-to-man:
- @${PERL} -pi.fbsd -e 's|%%PREFIX%%|${PREFIX}|;s|%%NSGMLS%%|${NSGMLS}|' \
+ @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|;s|%%NSGMLS%%|${NSGMLS}|' \
${WRKSRC}/cmd/docbook-to-man.sh
.include <bsd.port.post.mk>
Index: /usr/ports/textproc/gsed/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/gsed/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- /usr/ports/textproc/gsed/Makefile 17 Jan 2002 23:13:38 -0000 1.8
+++ /usr/ports/textproc/gsed/Makefile 23 Jun 2002 23:04:57 -0000
@@ -17,10 +17,9 @@
# Global variables
#
+USE_REINPLACE= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-# PREFIX isn't honored. force it w/ prefix.
-MAKE_ARGS= prefix=${PREFIX}
MAN1= gsed.1
@@ -39,7 +38,7 @@
patch-makefiles:
.for subdir in ${PATCH_SUBDIRS}
- @${PERL} -pi.fbsd -e 's/s,x,x,/s,^,g,/' ${WRKSRC}/${subdir}/Makefile
+ @${REINPLACE_CMD} -e 's|s,x,x,|s,^,g,|' ${WRKSRC}/${subdir}/Makefile
.endfor
# Post-install
>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?200206232345.g5NNjJjY004428>