- Fix m4 script so that shells/bash is no longer required.

- Bump PORTREVISION
This commit is contained in:
Rene Ladan 2011-03-13 16:08:48 +00:00
parent 36eee2c739
commit 3de9d6ef8c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=270803
4 changed files with 26 additions and 8 deletions

View file

@ -6,7 +6,7 @@
PORTNAME= boinc-astropulse PORTNAME= boinc-astropulse
PORTVERSION= 5.06 PORTVERSION= 5.06
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= astro CATEGORIES= astro
MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/
DISTNAME= astropulse-svn-868 DISTNAME= astropulse-svn-868
@ -18,7 +18,6 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 \ BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 \
${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
${NONEXISTENT}:${PORTSDIR}/astro/boinc-setiathome-enhanced:patch ${NONEXISTENT}:${PORTSDIR}/astro/boinc-setiathome-enhanced:patch
RUN_DEPENDS= boinc_client:${PORTSDIR}/net/boinc-client RUN_DEPENDS= boinc_client:${PORTSDIR}/net/boinc-client
LIB_DEPENDS= fftw3f:${PORTSDIR}/math/fftw3-float LIB_DEPENDS= fftw3f:${PORTSDIR}/math/fftw3-float
@ -91,8 +90,6 @@ PLIST_SUB+= AP_BINARY=${AP_BINARY} \
pre-configure: pre-configure:
(cd ${WRKSRC} ; ./_autosetup) (cd ${WRKSRC} ; ./_autosetup)
${REINPLACE_CMD} -E -e "s|/bin/sh|${LOCALBASE}/bin/bash|" \
${WRKSRC}/configure
do-install: do-install:
${INSTALL} -d -o ${BOINC_USER} -g ${BOINC_GROUP} ${BOINC_HOME}/projects ${INSTALL} -d -o ${BOINC_USER} -g ${BOINC_GROUP} ${BOINC_HOME}/projects

View file

@ -0,0 +1,11 @@
--- m4/sah_check_boinc.m4.orig 2010-03-23 22:00:23.000000000 +0100
+++ m4/sah_check_boinc.m4 2011-03-13 16:32:29.000000000 +0100
@@ -30,7 +30,7 @@
cd $thisdir
break
else
- if $FIND $boinc_dir -name "std_fixes.h" >& /dev/null
+ if $FIND $boinc_dir -name "std_fixes.h" > /dev/null
then
BOINCDIR=`$FIND $boinc_dir -name "std_fixes.h" -print | $HEAD -1 | sed 's/\/std_fixes.h//'`
cd $BOINCDIR/..

View file

@ -6,6 +6,7 @@
PORTNAME= boinc-setiathome-enhanced PORTNAME= boinc-setiathome-enhanced
PORTVERSION= 6.12 PORTVERSION= 6.12
PORTREVISION= 1
CATEGORIES= astro CATEGORIES= astro
MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/
DISTNAME= setiathome-svn-1008 DISTNAME= setiathome-svn-1008
@ -16,8 +17,7 @@ COMMENT= Setiathome Enhanced for BOINC
LICENSE= GPLv2 LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 \ BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
RUN_DEPENDS= boinc_client:${PORTSDIR}/net/boinc-client RUN_DEPENDS= boinc_client:${PORTSDIR}/net/boinc-client
LIB_DEPENDS= fftw3f:${PORTSDIR}/math/fftw3-float LIB_DEPENDS= fftw3f:${PORTSDIR}/math/fftw3-float
@ -90,8 +90,7 @@ post-patch:
${WRKSRC}/db/xml_util.cpp ${WRKSRC}/db/xml_util.cpp
pre-configure: pre-configure:
(cd ${WRKSRC} ; ./_autosetup ; ${REINPLACE_CMD} -E -e \ (cd ${WRKSRC} ; ./_autosetup)
"s|/bin/sh|${LOCALBASE}/bin/bash|" ./configure)
do-install: do-install:
${INSTALL} -d -o ${BOINC_USER} -g ${BOINC_GROUP} ${BOINC_HOME}/projects ${INSTALL} -d -o ${BOINC_USER} -g ${BOINC_GROUP} ${BOINC_HOME}/projects

View file

@ -0,0 +1,11 @@
--- m4/sah_check_boinc.m4.orig 2008-09-09 18:55:19.000000000 +0200
+++ m4/sah_check_boinc.m4 2011-03-13 16:24:18.000000000 +0100
@@ -30,7 +30,7 @@
cd $thisdir
break
else
- if $FIND $boinc_dir -name "std_fixes.h" >& /dev/null
+ if $FIND $boinc_dir -name "std_fixes.h" > /dev/null
then
BOINCDIR=`$FIND $boinc_dir -name "std_fixes.h" -print | $HEAD -1 | sed 's/\/std_fixes.h//'`
cd $BOINCDIR/..