From 401ab0f9659188c7eb6d1da3540734e458e021b6 Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Thu, 18 Jul 2002 16:05:23 +0000 Subject: [PATCH] Use USE_REINPLACE. --- accessibility/gail/Makefile | 5 +++-- x11-toolkits/gail/Makefile | 5 +++-- x11-toolkits/libbonoboui/Makefile | 7 ++++--- x11-toolkits/libgnomeprintui/Makefile | 9 +++++---- x11-toolkits/libgnomeui/Makefile | 9 +++++---- x11-toolkits/libwnck/Makefile | 7 ++++--- x11-wm/metacity/Makefile | 13 +++++++------ 7 files changed, 31 insertions(+), 24 deletions(-) diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile index ca5f670e30eb..969ae2f285b1 100644 --- a/accessibility/gail/Makefile +++ b/accessibility/gail/Makefile @@ -19,6 +19,7 @@ LIB_DEPENDS= gnomecanvas-2.0:${PORTSDIR}/graphics/libgnomecanvas USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes +USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -26,7 +27,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} pre-patch: - @find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \ - 's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g' + @find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \ + 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' .include diff --git a/x11-toolkits/gail/Makefile b/x11-toolkits/gail/Makefile index ca5f670e30eb..969ae2f285b1 100644 --- a/x11-toolkits/gail/Makefile +++ b/x11-toolkits/gail/Makefile @@ -19,6 +19,7 @@ LIB_DEPENDS= gnomecanvas-2.0:${PORTSDIR}/graphics/libgnomecanvas USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes +USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -26,7 +27,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} pre-patch: - @find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \ - 's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g' + @find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \ + 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' .include diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile index c1393c63777c..6094b903c7bb 100644 --- a/x11-toolkits/libbonoboui/Makefile +++ b/x11-toolkits/libbonoboui/Makefile @@ -20,6 +20,7 @@ LIB_DEPENDS= gnomecanvas-2.0:${PORTSDIR}/graphics/libgnomecanvas \ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes +USE_REINPLACE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ @@ -29,8 +30,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} pre-patch: - @find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \ - 's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g ; \ - s|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g' + @find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \ + 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ + s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g' .include diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile index d7fddb89270f..60931ac76c2f 100644 --- a/x11-toolkits/libgnomeprintui/Makefile +++ b/x11-toolkits/libgnomeprintui/Makefile @@ -21,6 +21,7 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes USE_GMAKE= yes +USE_REINPLACE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes USE_BISON= yes @@ -33,10 +34,10 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} 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|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g' + @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \ + 's|[(]datadir[)]/locale|(prefix)/share/locale|g ; \ + s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' .include diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile index f4f9375acaea..75f0c054b8e1 100644 --- a/x11-toolkits/libgnomeui/Makefile +++ b/x11-toolkits/libgnomeui/Makefile @@ -20,6 +20,7 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes USE_GMAKE= yes +USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes USE_BISON= yes @@ -32,10 +33,10 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} 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|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g' + @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \ + 's|[(]datadir[)]/locale|(prefix)/share/locale|g ; \ + s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' .include diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile index 977be242ee13..f4904264c93b 100644 --- a/x11-toolkits/libwnck/Makefile +++ b/x11-toolkits/libwnck/Makefile @@ -19,6 +19,7 @@ LIB_DEPENDS= gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes +USE_REINPLACE= yes USE_BISON= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes @@ -27,9 +28,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} 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|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g' + @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \ + 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' .include diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile index a29753c577cf..305cf8f8c428 100644 --- a/x11-wm/metacity/Makefile +++ b/x11-wm/metacity/Makefile @@ -19,6 +19,7 @@ LIB_DEPENDS= gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20 \ USE_X_PREFIX= yes USE_GMAKE= yes +USE_REINPLACE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ @@ -28,12 +29,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} 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\)/gnome/|\$\(datadir\)/|g ; \ - s|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g ; \ - s|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \ - s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \ + 's|[(]datadir[)]/gnome/|(datadir)/|g ; \ + s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ + s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \ + s|[(]datadir[)]/locale|(prefix)/share/locale|g' .include