gnuradio: updated to 3.1.2

git-svn-id: svn+slack://slack.fluxo.info/var/svn/mkbuilds@217 18ef50b8-d735-4ccd-97c1-689132df3dd9

1 files changed, 13 insertions, 18 deletions

diff --git a/media/radio/gnuradio/gnuradio.mkbuild b/media/radio/gnuradio/gnuradio.mkbuild
index fae0db5..dcda3a5 100644
--- a/media/radio/gnuradio/gnuradio.mkbuild
+++ b/media/radio/gnuradio/gnuradio.mkbuild
@@ -27,7 +27,7 @@
 #------------------------
 
 # Complete URL address or URL base address ( without $SRC_NAME-$VERSION... )
-[[DOWNLOAD FOLDER URL]]="http://gnuradio.org/releases/gnuradio/gnuradio-3.1.1.tar.gz"
+[[DOWNLOAD FOLDER URL]]="http://gnuradio.org/releases/gnuradio/gnuradio-3.1.2.tar.gz"
 
 #
 # Package requirements
@@ -39,6 +39,14 @@
 [[DOCUMENTATION FILES]]="AUTHORS COPYING ChangeLog NEWS README README.hacking"
 
 #
+# Config files
+[[CONFIG FILES]]="etc/gnuradio/conf.d/gnuradio-core.conf etc/gnuradio/conf.d/gr-audio-alsa.conf etc/gnuradio/conf.d/gr-audio-jack.conf etc/gnuradio/conf.d/gr-audio-oss.conf etc/gnuradio/conf.d/gr-wxgui.conf"
+
+#
+# Install script
+[[REST OF DOINST.SH]]="config etc/gnuradio/conf.d/gnuradio-core.conf.new ; config etc/gnuradio/conf.d/gr-audio-alsa.conf.new ; config etc/gnuradio/conf.d/gr-audio-jack.new ; etc/gnuradio/conf.d/gr-audio-oss.conf.new ; config etc/gnuradio/conf.d/gr-wxgui.conf.new"
+
+#
 # Default enable sections:
 #      head, set_variables, slkflags, start_structure, untar_source,
 #      make_package, install_package, build_package
@@ -64,7 +72,8 @@ off: compress_manpages
 off: compress_info_files
  on: install_documentation
  on: slackdesc
-off: postinstall_script
+ on: move_config_files
+ on: postinstall_script
  on: build_package
  on: clean_builds
 #<< End SlackBuild Sections
@@ -83,14 +92,14 @@ if [ -z "$boost" ]; then
 fi
 
 pack="`basename $boost | sed -e 's/-[^-]*-[^-]*-[^-]*$//'`"
-boost_version="`echo $boost | sed -e "s/^$pack-//" | cut -d "-" -f 1 | sed -e 's/\./_/g'`"
+boost_version="`echo $boost | sed -e "s/^$pack-//" | cut -d "-" -f 1 | \
+                              sed -e 's/\./_/g' -e 's/\([0-9]\+\)_\([0-9]\+\)_0/\1_\2/'`"
 
 CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
   ./configure \
   --prefix="$PREFIX" --libdir="$LIBDIR" --sysconfdir=/etc \
   --with-boost-include-dir=/usr/include/boost-$boost_version $CONF_OPTIONS || exit $ERROR_CONF
-</configure>
 #<configure
 
 #>slackdesc
@@ -106,17 +115,3 @@ gnuradio:
 gnuradio:
 gnuradio:
 #<slackdesc
-
-#>build_package
-cd "$PKG"
-
-# config files
-echo '( chroot . /sbin/ldconfig )' > install/doinst.sh
-for conf in gnuradio-core gr-audio-alsa gr-audio-jack gr-audio-oss; do
-  mv etc/gnuradio/conf.d/$conf.conf etc/gnuradio/conf.d/$conf.conf.new
-  echo "( if [ ! -f "etc/gnuradio/conf.d/$conf.conf" ]; then mv etc/gnuradio/conf.d/$conf.conf.new etc/gnuradio/conf.d/$conf.conf ; fi )" >> install/doinst.sh
-done
-
-# Build the package
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
-#<build_package