upgrading package: valgrind 3.2.1 -> 3.5.0

valgrind/valgrind.spec

@@ -21,7 +21,9 @@
 ##  SUCH DAMAGE.
 ##
 
-#   FIXME: currently Linux platform only :-(
+#   package version
+%define       V_valgrind      3.5.0
+%define       V_valgrind_bsd  3.5.0-1
 
 #   package information
 Name:         valgrind
@@ -30,14 +32,15 @@ URL:          http://www.valgrind.org/
 Vendor:       Julian Seward
 Packager:     OpenPKG Foundation e.V.
 Distribution: OpenPKG Community
-Class:        JUNK
+Class:        EVAL
 Group:        Debugging
 License:      Development
-Version:      3.2.1
-Release:      20080101
+Version:      %{V_valgrind}
+Release:      20100109
 
 #   list of sources
-Source0:      http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
+Source0:      http://www.valgrind.org/downloads/valgrind-%{V_valgrind}.tar.bz2
+Source1:      ftp://ftp.SpringDaemons.com/soft/valgrind-%{V_valgrind_bsd}.tar.bz2
 
 #   build information
 Prefix:       %{l_prefix}
@@ -62,30 +65,45 @@ AutoReqProv:  no
 
 %track
     prog valgrind = {
-        disabled
-        comment   = "rse: JUNK class package"
         version   = %{version}
         url       = http://www.valgrind.org/downloads/current.html
         regex     = valgrind-(__VER__)\.tar\.bz2
     }
 
 %prep
-    %setup -q
+    %setup -q -c
+    %setup -q -T -D -a 1
 
 %build
-    CC="%{l_cc}" \
-    CXX="%{l_cxx}" \
-    CFLAGS="%{l_cflags -O}" \
-    CXXFLAGS="%{l_cxxflags -O}" \
-    CPPFLAGS="%{l_cppflags}" \
-    LDFLAGS="%{l_ldflags}" \
+    export CC="%{l_cc}"
+    export CXX="%{l_cxx}"
+    export CFLAGS="%{l_cflags -O}"
+    export CXXFLAGS="%{l_cxxflags -O}"
+    export CPPFLAGS="%{l_cppflags}"
+    export LDFLAGS="%{l_ldflags}"
+    subdir="valgrind-%{V_valgrind}"
+    case "%{l_platform -t}" in
+        *-freebsd* )
+            CC="/usr/bin/cc"
+            subdir="valgrind-%{V_valgrind_bsd}"
+            ;;
+    esac
+    cd $subdir
     ./configure \
         --prefix=%{l_prefix}
     %{l_make} %{l_mflags -O}
 
 %install
     rm -rf $RPM_BUILD_ROOT
-    %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+    subdir="valgrind-%{V_valgrind}"
+    case "%{l_platform -t}" in
+        *-freebsd* )
+            subdir="valgrind-%{V_valgrind_bsd}"
+            ;;
+    esac
+    ( cd $subdir
+      %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+    ) || exit $?
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}