diff options
| author | rene <rene@FreeBSD.org> | 2011-03-14 00:08:48 +0800 |
|---|---|---|
| committer | rene <rene@FreeBSD.org> | 2011-03-14 00:08:48 +0800 |
| commit | c19971c76b078244d6bc423cbf4475fae183363d (patch) | |
| tree | 03bae9da327c13b6d304394e1483f9a6a285f3ea | |
| parent | 7c5e4bcd28126973fba3b7d1ef5cd769fa4f3efa (diff) | |
| download | freebsd-ports-gnome-c19971c76b078244d6bc423cbf4475fae183363d.tar.gz freebsd-ports-gnome-c19971c76b078244d6bc423cbf4475fae183363d.tar.zst freebsd-ports-gnome-c19971c76b078244d6bc423cbf4475fae183363d.zip | |
- Fix m4 script so that shells/bash is no longer required.
- Bump PORTREVISION
4 files changed, 26 insertions, 8 deletions
diff --git a/astro/boinc-astropulse/Makefile b/astro/boinc-astropulse/Makefile index 71b039220b94..0e465bab0a07 100644 --- a/astro/boinc-astropulse/Makefile +++ b/astro/boinc-astropulse/Makefile @@ -6,7 +6,7 @@ PORTNAME= boinc-astropulse PORTVERSION= 5.06 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= astro MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ DISTNAME= astropulse-svn-868 @@ -18,7 +18,6 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 \ - ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \ ${NONEXISTENT}:${PORTSDIR}/astro/boinc-setiathome-enhanced:patch RUN_DEPENDS= boinc_client:${PORTSDIR}/net/boinc-client LIB_DEPENDS= fftw3f:${PORTSDIR}/math/fftw3-float @@ -91,8 +90,6 @@ PLIST_SUB+= AP_BINARY=${AP_BINARY} \ pre-configure: (cd ${WRKSRC} ; ./_autosetup) - ${REINPLACE_CMD} -E -e "s|/bin/sh|${LOCALBASE}/bin/bash|" \ - ${WRKSRC}/configure do-install: ${INSTALL} -d -o ${BOINC_USER} -g ${BOINC_GROUP} ${BOINC_HOME}/projects diff --git a/astro/boinc-astropulse/files/patch-client__m4__sah_check_boinc.m4 b/astro/boinc-astropulse/files/patch-client__m4__sah_check_boinc.m4 new file mode 100644 index 000000000000..d1996c0de03d --- /dev/null +++ b/astro/boinc-astropulse/files/patch-client__m4__sah_check_boinc.m4 @@ -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/.. diff --git a/astro/boinc-setiathome-enhanced/Makefile b/astro/boinc-setiathome-enhanced/Makefile index caba1ac47379..952568749d8a 100644 --- a/astro/boinc-setiathome-enhanced/Makefile +++ b/astro/boinc-setiathome-enhanced/Makefile @@ -6,6 +6,7 @@ PORTNAME= boinc-setiathome-enhanced PORTVERSION= 6.12 +PORTREVISION= 1 CATEGORIES= astro MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ DISTNAME= setiathome-svn-1008 @@ -16,8 +17,7 @@ COMMENT= Setiathome Enhanced for BOINC LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 \ - ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash +BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 RUN_DEPENDS= boinc_client:${PORTSDIR}/net/boinc-client LIB_DEPENDS= fftw3f:${PORTSDIR}/math/fftw3-float @@ -90,8 +90,7 @@ post-patch: ${WRKSRC}/db/xml_util.cpp pre-configure: - (cd ${WRKSRC} ; ./_autosetup ; ${REINPLACE_CMD} -E -e \ - "s|/bin/sh|${LOCALBASE}/bin/bash|" ./configure) + (cd ${WRKSRC} ; ./_autosetup) do-install: ${INSTALL} -d -o ${BOINC_USER} -g ${BOINC_GROUP} ${BOINC_HOME}/projects diff --git a/astro/boinc-setiathome-enhanced/files/patch-m4__sah_check_boinc.m4 b/astro/boinc-setiathome-enhanced/files/patch-m4__sah_check_boinc.m4 new file mode 100644 index 000000000000..821d7e296845 --- /dev/null +++ b/astro/boinc-setiathome-enhanced/files/patch-m4__sah_check_boinc.m4 @@ -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/.. |