Date: Thu, 23 Jul 2015 08:58:48 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392716 - in head/devel/papi: . files Message-ID: <201507230858.t6N8wmMe045503@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Thu Jul 23 08:58:47 2015 New Revision: 392716 URL: https://svnweb.freebsd.org/changeset/ports/392716 Log: Upgrade to 5.4.1. Deleted: head/devel/papi/files/patch-attach2.c head/devel/papi/files/patch-attach3.c head/devel/papi/files/patch-coretemp_freebsd.c Modified: head/devel/papi/Makefile head/devel/papi/distinfo head/devel/papi/files/patch-configure head/devel/papi/files/patch-x86_cpuid_info.c head/devel/papi/pkg-plist Modified: head/devel/papi/Makefile ============================================================================== --- head/devel/papi/Makefile Thu Jul 23 08:54:55 2015 (r392715) +++ head/devel/papi/Makefile Thu Jul 23 08:58:47 2015 (r392716) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= papi -PORTVERSION= 5.3.0 +PORTVERSION= 5.4.1 CATEGORIES= devel MASTER_SITES= http://icl.cs.utk.edu/projects/papi/downloads/ Modified: head/devel/papi/distinfo ============================================================================== --- head/devel/papi/distinfo Thu Jul 23 08:54:55 2015 (r392715) +++ head/devel/papi/distinfo Thu Jul 23 08:58:47 2015 (r392716) @@ -1,2 +1,2 @@ -SHA256 (papi-5.3.0.tar.gz) = 99f2f36398b370e75d100b4a189d5bc0ac4f5dd66df44d441f88fd32e1421524 -SIZE (papi-5.3.0.tar.gz) = 3928589 +SHA256 (papi-5.4.1.tar.gz) = e131c1449786fe870322a949e44f974a5963824f683232e653fb570cc65d4e87 +SIZE (papi-5.4.1.tar.gz) = 4088726 Modified: head/devel/papi/files/patch-configure ============================================================================== --- head/devel/papi/files/patch-configure Thu Jul 23 08:54:55 2015 (r392715) +++ head/devel/papi/files/patch-configure Thu Jul 23 08:58:47 2015 (r392716) @@ -1,39 +1,11 @@ ---- configure.orig 2013-08-06 20:12:20.000000000 +0400 -+++ configure 2013-11-10 23:00:05.000000000 +0400 -@@ -6906,7 +6906,7 @@ - MAKEVER="freebsd" - LDFLAGS="-lpmc" - # HWPMC driver is available for FreeBSD >= 6 -- FREEBSD_VERSION=`uname -r | cut -c 1` -+ FREEBSD_VERSION=`uname -r | cut -d'.' -f1` - if test "${FREEBSD_VERSION}" -lt 6 ; then - { { echo "$as_me:$LINENO: error: PAPI requires FreeBSD 6 or greater" >&5 - echo "$as_me: error: PAPI requires FreeBSD 6 or greater" >&2;} -@@ -7525,11 +7525,11 @@ - - - for comp in $components; do -- idx=`expr index "$comp" /` -+ idx=`echo "$comp" | sed -n "s/\/.*//p" | wc -c` - if test "$idx" = 0; then - subcomp=$comp - else -- subcomp=${comp:$idx} -+ subcomp=`echo $comp | sed -E "s/^.{${idx}}//"` - fi - COMPONENT_RULES="$COMPONENT_RULES components/$comp/Rules.$subcomp" - echo "extern papi_vector_t _${subcomp}_vector;" >> components_config.h -@@ -7542,11 +7542,11 @@ - fi - - for comp in $components; do -- idx=`expr index "$comp" /` -+ idx=`echo "$comp" | sed -n "s/\/.*//p" | wc -c` - if test "$idx" = 0; then - subcomp=$comp - else -- subcomp=${comp:$idx} -+ subcomp=`echo $comp | sed -E "s/^.{${idx}}//"` - fi - echo " &_${subcomp}_vector," >> components_config.h - done +--- configure.orig 2015-07-23 08:38:09 UTC ++++ configure +@@ -6944,7 +6944,7 @@ echo "$as_me: error: PAPI requires FreeB + { (exit 1); exit 1; }; } + fi + # Determine if HWPMC module is on the kernel +- dmesg | grep hwpmc 2> /dev/null > /dev/null ++ sysctl -a | grep hwpmc 2> /dev/null > /dev/null + if test "$?" != "0" ; then + { { echo "$as_me:$LINENO: error: HWPMC module not found. (see INSTALL.TXT)" >&5 + echo "$as_me: error: HWPMC module not found. (see INSTALL.TXT)" >&2;} Modified: head/devel/papi/files/patch-x86_cpuid_info.c ============================================================================== --- head/devel/papi/files/patch-x86_cpuid_info.c Thu Jul 23 08:54:55 2015 (r392715) +++ head/devel/papi/files/patch-x86_cpuid_info.c Thu Jul 23 08:58:47 2015 (r392716) @@ -1,6 +1,6 @@ ---- x86_cpuid_info.c.orig 2013-08-06 20:12:26.000000000 +0400 -+++ x86_cpuid_info.c 2013-11-14 16:49:25.000000000 +0400 -@@ -1252,11 +1252,14 @@ +--- x86_cpuid_info.c.orig 2015-03-02 20:30:42 UTC ++++ x86_cpuid_info.c +@@ -1274,11 +1274,14 @@ cpuid2 ( unsigned int* eax, unsigned int unsigned int* ecx, unsigned int* edx, unsigned int index, unsigned int ecx_in ) { @@ -18,5 +18,5 @@ + : "m" (*ebx), "0" (index), "1" (ecx_in), "2" (42) + : "esi", "memory" ); } - + #endif Modified: head/devel/papi/pkg-plist ============================================================================== --- head/devel/papi/pkg-plist Thu Jul 23 08:54:55 2015 (r392715) +++ head/devel/papi/pkg-plist Thu Jul 23 08:58:47 2015 (r392716) @@ -19,8 +19,13 @@ include/papiStdEventDefs.h lib/libpapi.a lib/libpapi.so lib/libpapi.so.5 -lib/libpapi.so.5.3.0 -lib/libpapi.so.5.3.0.0 +lib/libpapi.so.5.4.1 +lib/libpapi.so.5.4.1.0 +lib/pkgconfig/papi-5.4.1.0.pc +lib/pkgconfig/papi-5.4.1.pc +lib/pkgconfig/papi-5.pc +lib/pkgconfig/papi.pc +man/man1/PAPI_derived_event_files.1.gz man/man1/papi_avail.1.gz man/man1/papi_clockres.1.gz man/man1/papi_command_line.1.gz @@ -224,6 +229,8 @@ man/man3/PAPI_write.3.gz %%DATADIR%%/ctests/attach2.c %%DATADIR%%/ctests/attach3 %%DATADIR%%/ctests/attach3.c +%%DATADIR%%/ctests/attach_cpu +%%DATADIR%%/ctests/attach_cpu.c %%DATADIR%%/ctests/attach_target %%DATADIR%%/ctests/attach_target.c %%DATADIR%%/ctests/branches @@ -425,31 +432,6 @@ man/man3/PAPI_write.3.gz %%DATADIR%%/ctests/zero_shmem.c %%DATADIR%%/ctests/zero_smp %%DATADIR%%/ctests/zero_smp.c -%%DATADIR%%/ftests/Makefile -%%DATADIR%%/ftests/accum.F -%%DATADIR%%/ftests/avail.F -%%DATADIR%%/ftests/case1.F -%%DATADIR%%/ftests/case2.F -%%DATADIR%%/ftests/clockres.F -%%DATADIR%%/ftests/cost.F -%%DATADIR%%/ftests/description.F -%%DATADIR%%/ftests/eventname.F -%%DATADIR%%/ftests/fdmemtest.F -%%DATADIR%%/ftests/first.F -%%DATADIR%%/ftests/flops.F -%%DATADIR%%/ftests/fmatrixlowpapi.F -%%DATADIR%%/ftests/fmatrixpapi.F -%%DATADIR%%/ftests/fmatrixpapi2.F -%%DATADIR%%/ftests/fmultiplex1.F -%%DATADIR%%/ftests/fmultiplex2.F -%%DATADIR%%/ftests/highlevel.F -%%DATADIR%%/ftests/johnmay2.F -%%DATADIR%%/ftests/nineth.F -%%DATADIR%%/ftests/second.F -%%DATADIR%%/ftests/strtest.F -%%DATADIR%%/ftests/tenth.F -%%DATADIR%%/ftests/zero.F -%%DATADIR%%/ftests/zeronamed.F %%DATADIR%%/run_tests.sh %%DATADIR%%/run_tests_exclude.txt %%DATADIR%%/run_tests_exclude_cuda.txt
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507230858.t6N8wmMe045503>