From 091dfe7895aef2457036ad52b4930489b2ad7d80 Mon Sep 17 00:00:00 2001 From: sobomax Date: Thu, 18 Jul 2002 17:58:57 +0000 Subject: Use USE_REINPLACE. --- databases/db3/Makefile | 5 +++-- graphics/Mesa3/Makefile | 5 +++-- graphics/mesagl/Makefile | 5 +++-- net/openldap2/Makefile | 5 +++-- net/openldap20-server/Makefile | 5 +++-- net/openldap20/Makefile | 5 +++-- net/openldap21-server/Makefile | 5 +++-- net/openldap21/Makefile | 5 +++-- net/openldap22-server/Makefile | 5 +++-- net/openldap22/Makefile | 5 +++-- net/openldap23-server/Makefile | 5 +++-- net/openldap24-server/Makefile | 5 +++-- x11/gnome-applets/Makefile | 13 +++++++------ x11/gnomeapplets2/Makefile | 13 +++++++------ 14 files changed, 50 insertions(+), 36 deletions(-) diff --git a/databases/db3/Makefile b/databases/db3/Makefile index b1e73be27e6f..0d712e1380fd 100644 --- a/databases/db3/Makefile +++ b/databases/db3/Makefile @@ -22,6 +22,7 @@ MAINTAINER= ports@FreeBSD.org WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix +USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes CONFIGURE_SCRIPT= ../dist/configure @@ -34,10 +35,10 @@ CONFIGURE_ARGS= --enable-compat185 \ --target=${ARCH}-unknown-freebsd${OSREL} pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT} + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT} post-patch: @${CHMOD} 755 ${WRKSRC}/${CONFIGURE_SCRIPT} - @${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure + @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure .include diff --git a/graphics/Mesa3/Makefile b/graphics/Mesa3/Makefile index 6e324e255f20..a8200a941dbe 100644 --- a/graphics/Mesa3/Makefile +++ b/graphics/Mesa3/Makefile @@ -19,6 +19,7 @@ DISTFILES= MesaLib-${PORTVERSION}${EXTRACT_SUFX} \ MAINTAINER= sobomax@FreeBSD.org USE_BZIP2= yes +USE_REINPLACE= yes .if defined(WANT_GGI) LIB_DEPENDS= ggi.2:${PORTSDIR}/graphics/libggi @@ -53,10 +54,10 @@ MAKE_ENV+= SUB_GL="${SUB_GL}" \ INCLUDE_GL=${INCLUDE_GL} pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure post-configure: - @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/src/config.c + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/src/config.c post-install: .for lib in GL GLU diff --git a/graphics/mesagl/Makefile b/graphics/mesagl/Makefile index 6e324e255f20..a8200a941dbe 100644 --- a/graphics/mesagl/Makefile +++ b/graphics/mesagl/Makefile @@ -19,6 +19,7 @@ DISTFILES= MesaLib-${PORTVERSION}${EXTRACT_SUFX} \ MAINTAINER= sobomax@FreeBSD.org USE_BZIP2= yes +USE_REINPLACE= yes .if defined(WANT_GGI) LIB_DEPENDS= ggi.2:${PORTSDIR}/graphics/libggi @@ -53,10 +54,10 @@ MAKE_ENV+= SUB_GL="${SUB_GL}" \ INCLUDE_GL=${INCLUDE_GL} pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure post-configure: - @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/src/config.c + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/src/config.c post-install: .for lib in GL GLU diff --git a/net/openldap2/Makefile b/net/openldap2/Makefile index 123cf53ed292..2f2aadd2d6c5 100644 --- a/net/openldap2/Makefile +++ b/net/openldap2/Makefile @@ -27,6 +27,7 @@ LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3 USE_AUTOCONF_VER=213 USE_LIBTOOL= yes USE_OPENSSL= yes +USE_REINPLACE= yes LATEST_LINK= openldap2 @@ -84,8 +85,8 @@ BINS= bin/ldapadd \ .include "${FILESDIR}/manpages" post-patch: - @${PERL} -pi.fbsd -e 's@pidfile\t\t%LOCALSTATEDIR%/slapd.pid@pidfile\t\t/var/run/slapd.pid@g; \ - s@argsfile\t%LOCALSTATEDIR%/slapd.args@argsfile\t/var/run/slapd.args@g' ${WRKSRC}/servers/slapd/slapd.conf + @${REINPLACE_CMD} -e 's@%LOCALSTATEDIR%/slapd[.]pid@/var/run/slapd.pid@g; \ + s@%LOCALSTATEDIR%/slapd[.]args@/var/run/slapd.args@g' ${WRKSRC}/servers/slapd/slapd.conf post-configure: @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff diff --git a/net/openldap20-server/Makefile b/net/openldap20-server/Makefile index 123cf53ed292..2f2aadd2d6c5 100644 --- a/net/openldap20-server/Makefile +++ b/net/openldap20-server/Makefile @@ -27,6 +27,7 @@ LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3 USE_AUTOCONF_VER=213 USE_LIBTOOL= yes USE_OPENSSL= yes +USE_REINPLACE= yes LATEST_LINK= openldap2 @@ -84,8 +85,8 @@ BINS= bin/ldapadd \ .include "${FILESDIR}/manpages" post-patch: - @${PERL} -pi.fbsd -e 's@pidfile\t\t%LOCALSTATEDIR%/slapd.pid@pidfile\t\t/var/run/slapd.pid@g; \ - s@argsfile\t%LOCALSTATEDIR%/slapd.args@argsfile\t/var/run/slapd.args@g' ${WRKSRC}/servers/slapd/slapd.conf + @${REINPLACE_CMD} -e 's@%LOCALSTATEDIR%/slapd[.]pid@/var/run/slapd.pid@g; \ + s@%LOCALSTATEDIR%/slapd[.]args@/var/run/slapd.args@g' ${WRKSRC}/servers/slapd/slapd.conf post-configure: @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff diff --git a/net/openldap20/Makefile b/net/openldap20/Makefile index 123cf53ed292..2f2aadd2d6c5 100644 --- a/net/openldap20/Makefile +++ b/net/openldap20/Makefile @@ -27,6 +27,7 @@ LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3 USE_AUTOCONF_VER=213 USE_LIBTOOL= yes USE_OPENSSL= yes +USE_REINPLACE= yes LATEST_LINK= openldap2 @@ -84,8 +85,8 @@ BINS= bin/ldapadd \ .include "${FILESDIR}/manpages" post-patch: - @${PERL} -pi.fbsd -e 's@pidfile\t\t%LOCALSTATEDIR%/slapd.pid@pidfile\t\t/var/run/slapd.pid@g; \ - s@argsfile\t%LOCALSTATEDIR%/slapd.args@argsfile\t/var/run/slapd.args@g' ${WRKSRC}/servers/slapd/slapd.conf + @${REINPLACE_CMD} -e 's@%LOCALSTATEDIR%/slapd[.]pid@/var/run/slapd.pid@g; \ + s@%LOCALSTATEDIR%/slapd[.]args@/var/run/slapd.args@g' ${WRKSRC}/servers/slapd/slapd.conf post-configure: @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff diff --git a/net/openldap21-server/Makefile b/net/openldap21-server/Makefile index 123cf53ed292..2f2aadd2d6c5 100644 --- a/net/openldap21-server/Makefile +++ b/net/openldap21-server/Makefile @@ -27,6 +27,7 @@ LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3 USE_AUTOCONF_VER=213 USE_LIBTOOL= yes USE_OPENSSL= yes +USE_REINPLACE= yes LATEST_LINK= openldap2 @@ -84,8 +85,8 @@ BINS= bin/ldapadd \ .include "${FILESDIR}/manpages" post-patch: - @${PERL} -pi.fbsd -e 's@pidfile\t\t%LOCALSTATEDIR%/slapd.pid@pidfile\t\t/var/run/slapd.pid@g; \ - s@argsfile\t%LOCALSTATEDIR%/slapd.args@argsfile\t/var/run/slapd.args@g' ${WRKSRC}/servers/slapd/slapd.conf + @${REINPLACE_CMD} -e 's@%LOCALSTATEDIR%/slapd[.]pid@/var/run/slapd.pid@g; \ + s@%LOCALSTATEDIR%/slapd[.]args@/var/run/slapd.args@g' ${WRKSRC}/servers/slapd/slapd.conf post-configure: @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff diff --git a/net/openldap21/Makefile b/net/openldap21/Makefile index 123cf53ed292..2f2aadd2d6c5 100644 --- a/net/openldap21/Makefile +++ b/net/openldap21/Makefile @@ -27,6 +27,7 @@ LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3 USE_AUTOCONF_VER=213 USE_LIBTOOL= yes USE_OPENSSL= yes +USE_REINPLACE= yes LATEST_LINK= openldap2 @@ -84,8 +85,8 @@ BINS= bin/ldapadd \ .include "${FILESDIR}/manpages" post-patch: - @${PERL} -pi.fbsd -e 's@pidfile\t\t%LOCALSTATEDIR%/slapd.pid@pidfile\t\t/var/run/slapd.pid@g; \ - s@argsfile\t%LOCALSTATEDIR%/slapd.args@argsfile\t/var/run/slapd.args@g' ${WRKSRC}/servers/slapd/slapd.conf + @${REINPLACE_CMD} -e 's@%LOCALSTATEDIR%/slapd[.]pid@/var/run/slapd.pid@g; \ + s@%LOCALSTATEDIR%/slapd[.]args@/var/run/slapd.args@g' ${WRKSRC}/servers/slapd/slapd.conf post-configure: @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile index 123cf53ed292..2f2aadd2d6c5 100644 --- a/net/openldap22-server/Makefile +++ b/net/openldap22-server/Makefile @@ -27,6 +27,7 @@ LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3 USE_AUTOCONF_VER=213 USE_LIBTOOL= yes USE_OPENSSL= yes +USE_REINPLACE= yes LATEST_LINK= openldap2 @@ -84,8 +85,8 @@ BINS= bin/ldapadd \ .include "${FILESDIR}/manpages" post-patch: - @${PERL} -pi.fbsd -e 's@pidfile\t\t%LOCALSTATEDIR%/slapd.pid@pidfile\t\t/var/run/slapd.pid@g; \ - s@argsfile\t%LOCALSTATEDIR%/slapd.args@argsfile\t/var/run/slapd.args@g' ${WRKSRC}/servers/slapd/slapd.conf + @${REINPLACE_CMD} -e 's@%LOCALSTATEDIR%/slapd[.]pid@/var/run/slapd.pid@g; \ + s@%LOCALSTATEDIR%/slapd[.]args@/var/run/slapd.args@g' ${WRKSRC}/servers/slapd/slapd.conf post-configure: @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff diff --git a/net/openldap22/Makefile b/net/openldap22/Makefile index 123cf53ed292..2f2aadd2d6c5 100644 --- a/net/openldap22/Makefile +++ b/net/openldap22/Makefile @@ -27,6 +27,7 @@ LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3 USE_AUTOCONF_VER=213 USE_LIBTOOL= yes USE_OPENSSL= yes +USE_REINPLACE= yes LATEST_LINK= openldap2 @@ -84,8 +85,8 @@ BINS= bin/ldapadd \ .include "${FILESDIR}/manpages" post-patch: - @${PERL} -pi.fbsd -e 's@pidfile\t\t%LOCALSTATEDIR%/slapd.pid@pidfile\t\t/var/run/slapd.pid@g; \ - s@argsfile\t%LOCALSTATEDIR%/slapd.args@argsfile\t/var/run/slapd.args@g' ${WRKSRC}/servers/slapd/slapd.conf + @${REINPLACE_CMD} -e 's@%LOCALSTATEDIR%/slapd[.]pid@/var/run/slapd.pid@g; \ + s@%LOCALSTATEDIR%/slapd[.]args@/var/run/slapd.args@g' ${WRKSRC}/servers/slapd/slapd.conf post-configure: @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile index 123cf53ed292..2f2aadd2d6c5 100644 --- a/net/openldap23-server/Makefile +++ b/net/openldap23-server/Makefile @@ -27,6 +27,7 @@ LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3 USE_AUTOCONF_VER=213 USE_LIBTOOL= yes USE_OPENSSL= yes +USE_REINPLACE= yes LATEST_LINK= openldap2 @@ -84,8 +85,8 @@ BINS= bin/ldapadd \ .include "${FILESDIR}/manpages" post-patch: - @${PERL} -pi.fbsd -e 's@pidfile\t\t%LOCALSTATEDIR%/slapd.pid@pidfile\t\t/var/run/slapd.pid@g; \ - s@argsfile\t%LOCALSTATEDIR%/slapd.args@argsfile\t/var/run/slapd.args@g' ${WRKSRC}/servers/slapd/slapd.conf + @${REINPLACE_CMD} -e 's@%LOCALSTATEDIR%/slapd[.]pid@/var/run/slapd.pid@g; \ + s@%LOCALSTATEDIR%/slapd[.]args@/var/run/slapd.args@g' ${WRKSRC}/servers/slapd/slapd.conf post-configure: @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index 123cf53ed292..2f2aadd2d6c5 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -27,6 +27,7 @@ LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3 USE_AUTOCONF_VER=213 USE_LIBTOOL= yes USE_OPENSSL= yes +USE_REINPLACE= yes LATEST_LINK= openldap2 @@ -84,8 +85,8 @@ BINS= bin/ldapadd \ .include "${FILESDIR}/manpages" post-patch: - @${PERL} -pi.fbsd -e 's@pidfile\t\t%LOCALSTATEDIR%/slapd.pid@pidfile\t\t/var/run/slapd.pid@g; \ - s@argsfile\t%LOCALSTATEDIR%/slapd.args@argsfile\t/var/run/slapd.args@g' ${WRKSRC}/servers/slapd/slapd.conf + @${REINPLACE_CMD} -e 's@%LOCALSTATEDIR%/slapd[.]pid@/var/run/slapd.pid@g; \ + s@%LOCALSTATEDIR%/slapd[.]args@/var/run/slapd.args@g' ${WRKSRC}/servers/slapd/slapd.conf post-configure: @cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index b7cf32a653d5..bf19e645698b 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -22,6 +22,7 @@ LIB_DEPENDS= panel-applet-2.0:${PORTSDIR}/x11/gnomepanel \ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes +USE_REINPLACE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome @@ -38,13 +39,13 @@ PLIST_SUB= BATTERY="" .endif pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ - 's|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \ - s|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ - s|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g ; \ + @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \ + 's|[(]datadir[)]/locale|(prefix)/share/locale|g ; \ + s|[(]datadir[)]/gnome/|(datadir)/|g ; \ + s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ s|\$\(prefix\)/lib/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \ - s|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g' + s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g' .include diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile index b7cf32a653d5..bf19e645698b 100644 --- a/x11/gnomeapplets2/Makefile +++ b/x11/gnomeapplets2/Makefile @@ -22,6 +22,7 @@ LIB_DEPENDS= panel-applet-2.0:${PORTSDIR}/x11/gnomepanel \ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes +USE_REINPLACE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome @@ -38,13 +39,13 @@ PLIST_SUB= BATTERY="" .endif pre-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ - 's|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \ - s|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ - s|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g ; \ + @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \ + 's|[(]datadir[)]/locale|(prefix)/share/locale|g ; \ + s|[(]datadir[)]/gnome/|(datadir)/|g ; \ + s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ s|\$\(prefix\)/lib/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \ - s|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g' + s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g' .include -- cgit