From e99ceadaf6c77b80c19e16d91306e944305b1c88 Mon Sep 17 00:00:00 2001 From: Trevor Johnson Date: Thu, 13 Nov 2003 14:45:08 +0000 Subject: Use the FIND and XARGS macros introduced in bsd.port.mk 1.391. --- japanese/balsa/Makefile | 2 +- japanese/emacs-emcws/Makefile | 2 +- japanese/emacs20-emcws/Makefile | 2 +- japanese/emacs21-emcws/Makefile | 2 +- japanese/gal/Makefile | 2 +- japanese/hns/Makefile | 6 ++++-- japanese/postgresql/Makefile | 2 +- japanese/tkdesk/Makefile | 2 +- japanese/vje30-trial/Makefile | 2 +- japanese/xdvik-vflib/Makefile | 2 +- japanese/xdvik/Makefile | 2 +- 11 files changed, 14 insertions(+), 12 deletions(-) (limited to 'japanese') diff --git a/japanese/balsa/Makefile b/japanese/balsa/Makefile index bb7db1cd0d23..67b222fed765 100644 --- a/japanese/balsa/Makefile +++ b/japanese/balsa/Makefile @@ -32,7 +32,7 @@ MAN1= balsa.1 pre-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \ s|\$\(gnomedatadir\)/gnome|\$\(gnomedatadir\)|g' diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile index f57cc97a1b1f..9dd0d223580a 100644 --- a/japanese/emacs-emcws/Makefile +++ b/japanese/emacs-emcws/Makefile @@ -150,7 +150,7 @@ pre-fetch: @${CAT} ${FILESDIR}/emcws-message pre-build: - find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \; + ${FIND} ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \; ${RM} -rf ${WRKSRC}/info/* @(cd ${WRKSRC}/src/../lisp; \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} compile-files EMACS=${LOCALBASE}/bin/emacs-${EMACS_VER}) diff --git a/japanese/emacs20-emcws/Makefile b/japanese/emacs20-emcws/Makefile index cedad248b1ed..cedf674f89a0 100644 --- a/japanese/emacs20-emcws/Makefile +++ b/japanese/emacs20-emcws/Makefile @@ -145,7 +145,7 @@ pre-fetch: @${CAT} ${FILESDIR}/emcws-message pre-build: - find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \; + ${FIND} ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \; ${RM} -rf ${WRKSRC}/info/* @(cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} emacs) @(cd ${WRKSRC}/src/../lisp; \ diff --git a/japanese/emacs21-emcws/Makefile b/japanese/emacs21-emcws/Makefile index f57cc97a1b1f..9dd0d223580a 100644 --- a/japanese/emacs21-emcws/Makefile +++ b/japanese/emacs21-emcws/Makefile @@ -150,7 +150,7 @@ pre-fetch: @${CAT} ${FILESDIR}/emcws-message pre-build: - find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \; + ${FIND} ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \; ${RM} -rf ${WRKSRC}/info/* @(cd ${WRKSRC}/src/../lisp; \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} compile-files EMACS=${LOCALBASE}/bin/emacs-${EMACS_VER}) diff --git a/japanese/gal/Makefile b/japanese/gal/Makefile index a3c83c3a337f..2b4ea3b82930 100644 --- a/japanese/gal/Makefile +++ b/japanese/gal/Makefile @@ -14,6 +14,6 @@ MAINTAINER= ports@FreeBSD.org post-patch: perl -pi -e 's/gdk_font_load(\s)\(.*\)/gdk_fontset_load$$1\("-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*"\)/' \ - `find ${WRKSRC} -name "*.c" -print` + `${FIND} ${WRKSRC} -name "*.c" -print` .include "${MASTERDIR}/Makefile" diff --git a/japanese/hns/Makefile b/japanese/hns/Makefile index 3ed38c5eec32..03c623df763b 100644 --- a/japanese/hns/Makefile +++ b/japanese/hns/Makefile @@ -28,8 +28,10 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/contrib/todayhns/todayhns ${PREFIX}/bin/todayhns post-install: - @cd ${WRKSRC} && find . -type f -o -type l | sed 's,^\.,share/${PORTNAME},' | sort >> ${TMPPLIST} - @cd ${WRKSRC} && find . -type d | sed 's,^\.,@dirrm share/${PORTNAME},' | sort -r >> ${TMPPLIST} + @cd ${WRKSRC} && ${FIND} . -type f -o -type l | \ + sed 's,^\.,share/${PORTNAME},' | sort >> ${TMPPLIST} + @cd ${WRKSRC} && ${FIND} . -type d | \ + sed 's,^\.,@dirrm share/${PORTNAME},' | sort -r >> ${TMPPLIST} @${CAT} ${PKGMESSAGE} .include diff --git a/japanese/postgresql/Makefile b/japanese/postgresql/Makefile index a3891da6649f..1a211647b016 100644 --- a/japanese/postgresql/Makefile +++ b/japanese/postgresql/Makefile @@ -104,7 +104,7 @@ pre-fetch: .include post-patch: - find ${WRKDIR} -name '*.orig' -exec ${RM} {} \; + ${FIND} ${WRKDIR} -name '*.orig' -exec ${RM} {} \; post-build: @ ${ECHO} "------------------------------------------------------------" diff --git a/japanese/tkdesk/Makefile b/japanese/tkdesk/Makefile index 1ad20a915fdd..75d2e6070b9d 100644 --- a/japanese/tkdesk/Makefile +++ b/japanese/tkdesk/Makefile @@ -37,7 +37,7 @@ pre-patch: @cd ${WRKSRC}; ${PATCH} -s < ${FILESDIR}/pre-patch post-patch: - @/usr/bin/find ${WRKSRC}/tcldesk '(' -name '*.orig' -o -name '*~' ')' \ + @${FIND} ${WRKSRC}/tcldesk '(' -name '*.orig' -o -name '*~' ')' \ -exec ${RM} -f {} \; @${RM} ${WRKSRC}/config.h ${WRKSRC}/config.cache diff --git a/japanese/vje30-trial/Makefile b/japanese/vje30-trial/Makefile index 39c179af2dfd..af07aff4e696 100644 --- a/japanese/vje30-trial/Makefile +++ b/japanese/vje30-trial/Makefile @@ -46,7 +46,7 @@ BINSTUFF= vje \ post-patch: @cd ${WRKSRC}/vje30/bin && ${RM} swingall.jar - @find ${WRKSRC} -name '*.orig' -delete + @${FIND} ${WRKSRC} -name '*.orig' -delete @${CP} ${FILESDIR}/vje.sh ${WRKSRC}/etc/rc.d/ .if defined(NOPORTDOCS) @cd ${WRKSRC}/vje30 && ${RM} -rf doc README FAQ diff --git a/japanese/xdvik-vflib/Makefile b/japanese/xdvik-vflib/Makefile index 64752ab39561..3dc86f39085d 100644 --- a/japanese/xdvik-vflib/Makefile +++ b/japanese/xdvik-vflib/Makefile @@ -154,7 +154,7 @@ pre-fetch: ${ECHO} "**************************************************************") pre-build: - @(cd ${WRKSRC} ; find . -name '*.orig' -exec ${RM} -f {} \;) + @(cd ${WRKSRC} ; ${FIND} . -name '*.orig' -exec ${RM} -f {} \;) do-install: @(cd ${WRKSRC}/texk/xdvik ; ${SETENV} ${MAKE_ENV} ${GMAKE} \ diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile index 64752ab39561..3dc86f39085d 100644 --- a/japanese/xdvik/Makefile +++ b/japanese/xdvik/Makefile @@ -154,7 +154,7 @@ pre-fetch: ${ECHO} "**************************************************************") pre-build: - @(cd ${WRKSRC} ; find . -name '*.orig' -exec ${RM} -f {} \;) + @(cd ${WRKSRC} ; ${FIND} . -name '*.orig' -exec ${RM} -f {} \;) do-install: @(cd ${WRKSRC}/texk/xdvik ; ${SETENV} ${MAKE_ENV} ${GMAKE} \ -- cgit v1.2.3