From 41b357a0c53e3e54046e6c758385aad4ee7b8ac5 Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Sat, 12 Jul 2014 11:25:04 +0000 Subject: [PATCH] - Update to upstream release 5.3.0 - Add LICENSE - Simplify OPTIONS handling Approved by: mentors (implicit) --- devel/papi/Makefile | 26 +++++++++++++++++++------- devel/papi/distinfo | 4 ++-- devel/papi/pkg-plist | 18 +++++++++++++++--- 3 files changed, 36 insertions(+), 12 deletions(-) diff --git a/devel/papi/Makefile b/devel/papi/Makefile index 8b71a54c01f1..f7e552c26e5a 100644 --- a/devel/papi/Makefile +++ b/devel/papi/Makefile @@ -2,13 +2,16 @@ # $FreeBSD$ PORTNAME= papi -PORTVERSION= 5.2.0 +PORTVERSION= 5.3.0 CATEGORIES= devel MASTER_SITES= http://icl.cs.utk.edu/projects/papi/downloads/ MAINTAINER= ports@FreeBSD.org COMMENT= API to access the performance counter hw in the microprocessor +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/LICENSE.txt + ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= HWPMC kernel module is only available for I386 and \ AMD64 machines @@ -26,12 +29,14 @@ OPTIONS_DEFINE= CORETEMP DEBUGINFO CORETEMP_DESC= Add Intel Core thermal sensor (need coretemp.ko) DEBUGINFO_DESC= Add debug information (increased verbosity) +DEBUGINFO_CONFIGURE_WITH= debug + .include HAS_HWPMC!= ${SYSCTL} kern.hwpmc.nsamples >/dev/null 2>&1 && echo yes || ${ECHO_CMD} .if ${HAS_HWPMC} != yes -IGNORE= needs hwmpc module loaded or compiled into the kernel. \ +IGNORE= needs hwpmc module loaded or compiled into the kernel. \ Please consult hwpmc(4) on how to do it (or cat pkg-message) .endif @@ -41,10 +46,17 @@ CONFIGURE_ARGS+= --with-tests=ctests CONFIGURE_ARGS+= --with-components=coretemp_freebsd .endif -.if ${PORT_OPTIONS:MDEBUGINFO} -CONFIGURE_ARGS+= --with-debug -.else -CONFIGURE_ARGS+= --without-debug -.endif +post-patch: + ${REINPLACE_CMD} -e 's|||g' \ + ${WRKSRC}/components/appio/tests/appio_test_pthreads.c \ + ${WRKSRC}/components/appio/tests/iozone/iozone.c \ + ${WRKSRC}/components/appio/tests/iozone/libasync.c \ + ${WRKSRC}/components/perfctr_ppc/linux-ppc64.h \ + ${WRKSRC}/ctests/omptough.c \ + ${WRKSRC}/ctests/pernode.c \ + ${WRKSRC}/ctests/zero_shmem.c \ + ${WRKSRC}/libpfm-3.y/lib/pfmlib_sicortex.c \ + ${WRKSRC}/libpfm4/lib/pfmlib_sicortex.c \ + ${WRKSRC}/testlib/papi_test.h .include diff --git a/devel/papi/distinfo b/devel/papi/distinfo index a55358271684..c74928625789 100644 --- a/devel/papi/distinfo +++ b/devel/papi/distinfo @@ -1,2 +1,2 @@ -SHA256 (papi-5.2.0.tar.gz) = f1397aa1d9aa29aaa5c6566a28269a64c30639e7ba3d88a5905abc2bf52562f5 -SIZE (papi-5.2.0.tar.gz) = 3908882 +SHA256 (papi-5.3.0.tar.gz) = 99f2f36398b370e75d100b4a189d5bc0ac4f5dd66df44d441f88fd32e1421524 +SIZE (papi-5.3.0.tar.gz) = 3928589 diff --git a/devel/papi/pkg-plist b/devel/papi/pkg-plist index aaf8576560e5..10fdefe55fd7 100644 --- a/devel/papi/pkg-plist +++ b/devel/papi/pkg-plist @@ -19,8 +19,8 @@ include/papiStdEventDefs.h lib/libpapi.a lib/libpapi.so lib/libpapi.so.5 -lib/libpapi.so.5.2.0 -lib/libpapi.so.5.2.0.0 +lib/libpapi.so.5.3.0 +lib/libpapi.so.5.3.0.0 man/man1/papi_avail.1.gz man/man1/papi_clockres.1.gz man/man1/papi_command_line.1.gz @@ -29,6 +29,7 @@ man/man1/papi_cost.1.gz man/man1/papi_decode.1.gz man/man1/papi_error_codes.1.gz man/man1/papi_event_chooser.1.gz +man/man1/papi_hybrid_native_avail.1.gz man/man1/papi_mem_info.1.gz man/man1/papi_multiplex_cost.1.gz man/man1/papi_native_avail.1.gz @@ -212,6 +213,7 @@ man/man3/PAPI_thread_init.3.gz man/man3/PAPI_unlock.3.gz man/man3/PAPI_unregister_thread.3.gz man/man3/PAPI_write.3.gz +%%DATADIR%%/ctests/Makefile %%DATADIR%%/ctests/all_events %%DATADIR%%/ctests/all_events.c %%DATADIR%%/ctests/all_native_events @@ -223,6 +225,7 @@ man/man3/PAPI_write.3.gz %%DATADIR%%/ctests/attach3 %%DATADIR%%/ctests/attach3.c %%DATADIR%%/ctests/attach_target +%%DATADIR%%/ctests/attach_target.c %%DATADIR%%/ctests/branches %%DATADIR%%/ctests/branches.c %%DATADIR%%/ctests/burn @@ -245,6 +248,7 @@ man/man3/PAPI_write.3.gz %%DATADIR%%/ctests/cpi.c %%DATADIR%%/ctests/cycle_ratio %%DATADIR%%/ctests/cycle_ratio.c +%%DATADIR%%/ctests/data_range %%DATADIR%%/ctests/data_range.c %%DATADIR%%/ctests/derived %%DATADIR%%/ctests/derived.c @@ -254,6 +258,7 @@ man/man3/PAPI_write.3.gz %%DATADIR%%/ctests/disable_component.c %%DATADIR%%/ctests/dmem_info %%DATADIR%%/ctests/dmem_info.c +%%DATADIR%%/ctests/earprofile %%DATADIR%%/ctests/earprofile.c %%DATADIR%%/ctests/eventname %%DATADIR%%/ctests/eventname.c @@ -353,6 +358,7 @@ man/man3/PAPI_write.3.gz %%DATADIR%%/ctests/overflow_twoevents %%DATADIR%%/ctests/overflow_twoevents.c %%DATADIR%%/ctests/overflow_values.c +%%DATADIR%%/ctests/p4_lst_ins %%DATADIR%%/ctests/p4_lst_ins.c %%DATADIR%%/ctests/papi_1.c %%DATADIR%%/ctests/pernode.c @@ -415,8 +421,11 @@ man/man3/PAPI_write.3.gz %%DATADIR%%/ctests/zero_omp.c %%DATADIR%%/ctests/zero_pthreads %%DATADIR%%/ctests/zero_pthreads.c +%%DATADIR%%/ctests/zero_shmem %%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 @@ -433,7 +442,6 @@ man/man3/PAPI_write.3.gz %%DATADIR%%/ftests/fmatrixpapi2.F %%DATADIR%%/ftests/fmultiplex1.F %%DATADIR%%/ftests/fmultiplex2.F -%%DATADIR%%/ftests/ftests_util.F %%DATADIR%%/ftests/highlevel.F %%DATADIR%%/ftests/johnmay2.F %%DATADIR%%/ftests/nineth.F @@ -445,9 +453,13 @@ man/man3/PAPI_write.3.gz %%DATADIR%%/run_tests.sh %%DATADIR%%/run_tests_exclude.txt %%DATADIR%%/run_tests_exclude_cuda.txt +%%DATADIR%%/testlib/Makefile %%DATADIR%%/testlib/clockcore.c %%DATADIR%%/testlib/do_loops.c %%DATADIR%%/testlib/dummy.c +%%DATADIR%%/testlib/fpapi_test.h +%%DATADIR%%/testlib/ftests_util.F +%%DATADIR%%/testlib/libtestlib.a %%DATADIR%%/testlib/papi_test.h %%DATADIR%%/testlib/test_utils.c %%DATADIR%%/testlib/test_utils.h