summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--astro/seti_applet/Makefile7
-rw-r--r--databases/mysql-gui/Makefile3
-rw-r--r--lang/gforth/Makefile3
-rw-r--r--misc/findutils/Makefile10
-rw-r--r--misc/sh-utils/Makefile8
-rw-r--r--misc/upclient/Makefile3
-rw-r--r--net/isc-dhcp3-server/Makefile10
-rw-r--r--net/isc-dhcp3/Makefile10
-rw-r--r--net/isc-dhcp30-server/Makefile10
-rw-r--r--net/isc-dhcp31-server/Makefile10
-rw-r--r--net/isc-dhcp40-server/Makefile10
-rw-r--r--security/op/Makefile9
-rw-r--r--textproc/docbook-to-man/Makefile3
-rw-r--r--textproc/gsed/Makefile5
14 files changed, 51 insertions, 50 deletions
diff --git a/astro/seti_applet/Makefile b/astro/seti_applet/Makefile
index abe43fd4da0f..5d1afba0cd38 100644
--- a/astro/seti_applet/Makefile
+++ b/astro/seti_applet/Makefile
@@ -21,6 +21,7 @@ LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop \
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 @@ post-patch: patch-configure patch-makefiles-in \
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:
diff --git a/databases/mysql-gui/Makefile b/databases/mysql-gui/Makefile
index c18d79734b9b..b6445f9ebeaa 100644
--- a/databases/mysql-gui/Makefile
+++ b/databases/mysql-gui/Makefile
@@ -28,6 +28,7 @@ LIB_DEPENDS= sqlplus.1:${PORTSDIR}/databases/mysql++ \
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 @@ remove-inc:
#
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:
diff --git a/lang/gforth/Makefile b/lang/gforth/Makefile
index a23a0f0b9187..a0b6da8395b4 100644
--- a/lang/gforth/Makefile
+++ b/lang/gforth/Makefile
@@ -18,6 +18,7 @@ MAINTAINER= cyrille.lefevre@laposte.net
STRIP= #none
+USE_REINPLACE= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
ALL_TARGET= all info
@@ -61,7 +62,7 @@ remove-info-files:
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
#
diff --git a/misc/findutils/Makefile b/misc/findutils/Makefile
index 8b020cb43e99..552780cbccec 100644
--- a/misc/findutils/Makefile
+++ b/misc/findutils/Makefile
@@ -17,14 +17,12 @@ MAINTAINER= cyrille.lefevre@laposte.net
# 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-extract:
#
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 @@ post-patch:
# --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
diff --git a/misc/sh-utils/Makefile b/misc/sh-utils/Makefile
index b9db1c33a7a1..21ac78ce722e 100644
--- a/misc/sh-utils/Makefile
+++ b/misc/sh-utils/Makefile
@@ -19,12 +19,10 @@ MAINTAINER= cyrille.lefevre@laposte.net
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 @@ remove-info-files:
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
diff --git a/misc/upclient/Makefile b/misc/upclient/Makefile
index e13e3786c927..87f3bb615af0 100644
--- a/misc/upclient/Makefile
+++ b/misc/upclient/Makefile
@@ -15,6 +15,7 @@ MAINTAINER= cyrille.lefevre@laposte.net
# Global variables
#
+USE_REINPLACE= yes
ALL_TARGET= bsd
BUILD_WRKSRC= ${WRKSRC}/src
@@ -34,7 +35,7 @@ DOC_FILES= AUTHORS COPYING FAQ HISTORY INSTALL README TODO
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}
diff --git a/net/isc-dhcp3-server/Makefile b/net/isc-dhcp3-server/Makefile
index ae4f7fb5f922..a5379c84356b 100644
--- a/net/isc-dhcp3-server/Makefile
+++ b/net/isc-dhcp3-server/Makefile
@@ -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 @@ MAINTAINER= cyrille.lefevre@laposte.net
# Global variables
#
+USE_REINPLACE= yes
HAS_CONFIGURE= yes
MAN1= omshell.1
@@ -124,22 +124,22 @@ post-patch: patch-scripts patch-makefile-conf \
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' \
diff --git a/net/isc-dhcp3/Makefile b/net/isc-dhcp3/Makefile
index ae4f7fb5f922..a5379c84356b 100644
--- a/net/isc-dhcp3/Makefile
+++ b/net/isc-dhcp3/Makefile
@@ -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 @@ MAINTAINER= cyrille.lefevre@laposte.net
# Global variables
#
+USE_REINPLACE= yes
HAS_CONFIGURE= yes
MAN1= omshell.1
@@ -124,22 +124,22 @@ post-patch: patch-scripts patch-makefile-conf \
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' \
diff --git a/net/isc-dhcp30-server/Makefile b/net/isc-dhcp30-server/Makefile
index ae4f7fb5f922..a5379c84356b 100644
--- a/net/isc-dhcp30-server/Makefile
+++ b/net/isc-dhcp30-server/Makefile
@@ -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 @@ MAINTAINER= cyrille.lefevre@laposte.net
# Global variables
#
+USE_REINPLACE= yes
HAS_CONFIGURE= yes
MAN1= omshell.1
@@ -124,22 +124,22 @@ post-patch: patch-scripts patch-makefile-conf \
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' \
diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile
index ae4f7fb5f922..a5379c84356b 100644
--- a/net/isc-dhcp31-server/Makefile
+++ b/net/isc-dhcp31-server/Makefile
@@ -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 @@ MAINTAINER= cyrille.lefevre@laposte.net
# Global variables
#
+USE_REINPLACE= yes
HAS_CONFIGURE= yes
MAN1= omshell.1
@@ -124,22 +124,22 @@ post-patch: patch-scripts patch-makefile-conf \
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' \
diff --git a/net/isc-dhcp40-server/Makefile b/net/isc-dhcp40-server/Makefile
index ae4f7fb5f922..a5379c84356b 100644
--- a/net/isc-dhcp40-server/Makefile
+++ b/net/isc-dhcp40-server/Makefile
@@ -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 @@ MAINTAINER= cyrille.lefevre@laposte.net
# Global variables
#
+USE_REINPLACE= yes
HAS_CONFIGURE= yes
MAN1= omshell.1
@@ -124,22 +124,22 @@ post-patch: patch-scripts patch-makefile-conf \
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' \
diff --git a/security/op/Makefile b/security/op/Makefile
index 388644a94c21..124ab6a842af 100644
--- a/security/op/Makefile
+++ b/security/op/Makefile
@@ -19,6 +19,7 @@ MAINTAINER= cyrille.lefevre@laposte.net
# Global variables
#
+USE_REINPLACE= yes
BINMODE= 4555
MAKE_ARGS= BASE="${PREFIX}" \
OPTS='-Dbsdi -DOP_ACCESS=\"${CONF_DIR}/${CONF_FILE}\"' \
@@ -57,13 +58,13 @@ checkout-files:
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
diff --git a/textproc/docbook-to-man/Makefile b/textproc/docbook-to-man/Makefile
index 5a591b48df7d..8ff3a5939b6b 100644
--- a/textproc/docbook-to-man/Makefile
+++ b/textproc/docbook-to-man/Makefile
@@ -35,6 +35,7 @@ RUN_DEPENDS= nsgmls:${PORTSDIR}/textproc/jade
.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 @@ move-instant.1:
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>
diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile
index 82610ad75613..ca083b665b64 100644
--- a/textproc/gsed/Makefile
+++ b/textproc/gsed/Makefile
@@ -17,10 +17,9 @@ MAINTAINER= cyrille.lefevre@laposte.net
# 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 @@ post-configure: patch-makefiles
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