From 7f53b2a997fb84be517e7293dfa5510db8019f64 Mon Sep 17 00:00:00 2001 From: brooks Date: Mon, 14 Feb 2005 22:19:30 +0000 Subject: Fix a bug that caused perl dependencies not to be installed. While I'm here, quite portlint a bit by replacing an number of bare commands with ${CMD} variables. Reported by: joe --- audio/squeezeboxserver/Makefile | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'audio/squeezeboxserver') diff --git a/audio/squeezeboxserver/Makefile b/audio/squeezeboxserver/Makefile index a7992a17f307..41f54e608295 100644 --- a/audio/squeezeboxserver/Makefile +++ b/audio/squeezeboxserver/Makefile @@ -17,12 +17,11 @@ COMMENT= Slim Devices audio streaming server DISTVERSION?= ${PORTVERSION} - RUN_DEPENDS+= ${LOCALBASE}/bin/mDNSResponderPosix:${PORTSDIR}/net/mDNSResponder .include -SLIM_CPAN_DEPS!= cut -f 2 -d, ${FILESDIR}/pm2port | grep -v ^_builtin +SLIM_CPAN_DEPS!= cut -f 2 -d, ${FILESDIR}/pm2port | ${GREP} -v ^_builtin | ${XARGS} echo RUN_DEPENDS+= ${SLIM_CPAN_DEPS:S|^|${SITE_PERL}/|:S|:|:${PORTSDIR}/|} .if ${PERL_LEVEL} < 500800 @@ -72,16 +71,16 @@ do-build: ${EXCEPTDIRS:S/$/\*/:S/^/-o -path .\//} -o -print | \ ${CPIO} ${CPIOARGS} ${BINOWN}:${BINGRP} ${TMP_SLIMDIR} @cd ${TMP_SLIMDIR}/CPAN && \ - for pm in `egrep -v ,$$ ${FILESDIR}/pm2port | cut -f 1 -d,`; do \ - grep "$${pm}:" ${FILESDIR}/CPANfiles | cut -f2 -d: | xargs rm; \ + for pm in `${EGREP} -v ,$$ ${FILESDIR}/pm2port | cut -f 1 -d,`; do \ + ${GREP} "$${pm}:" ${FILESDIR}/CPANfiles | cut -f2 -d: | ${XARGS} rm; \ done - @find ${TMP_SLIMDIR}/CPAN -depth -type d -empty -delete + @${FIND} ${TMP_SLIMDIR}/CPAN -depth -type d -empty -delete .if defined(PORTDEV) @echo "Checking for unexpected files in CPAN" @cd ${TMP_SLIMDIR}/CPAN && \ - for file in `find . -type f | sed -e 's|^\./||'`; do \ - egrep -q ":$${file}\$$" ${FILESDIR}/CPANfiles || \ - echo $${file} ; \ + for _file in `${FIND} . -type f | ${SED} -e 's|^\./||'`; do \ + ${EGREP} -q ":$${_file}\$$" ${FILESDIR}/CPANfiles || \ + echo $${_file} ; \ done @echo .endif -- cgit