svn commit: r403378 - in head/devel/papi: . files

[Vanilla I. Shu]

Author: vanilla
Date: Wed Dec  9 12:13:04 2015
New Revision: 403378
URL: https://svnweb.freebsd.org/changeset/ports/403378

Log:
  1: Upgrade to 5.4.1.
  2: move all pkgconfig to libdata/
  3: use option helper.

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	Wed Dec  9 12:06:49 2015	(r403377)
+++ head/devel/papi/Makefile	Wed Dec  9 12:13:04 2015	(r403378)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	papi
-PORTVERSION=	5.4.1
+PORTVERSION=	5.4.2
 CATEGORIES=	devel
 MASTER_SITES=	http://icl.cs.utk.edu/projects/papi/downloads/
 
@@ -19,16 +19,18 @@ NO_PACKAGE=	Needs to be compiled for spe
 
 STRIP=		# empty
 USE_LDCONFIG=	yes
-USES=		gmake
+USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 WRKMAN=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/man
 INSTALL_TARGET=	install-all
+CONFIGURE_ARGS+=	--with-tests=ctests
 
 OPTIONS_DEFINE=	CORETEMP DEBUGINFO
 CORETEMP_DESC=	Add Intel Core thermal sensor (need coretemp.ko)
 DEBUGINFO_DESC=	Add debug information (increased verbosity)
 
+CORETEMP_CONFIGURE_ON=	--with-components=coretemp_freebsd
 DEBUGINFO_CONFIGURE_WITH=	debug
 
 .include <bsd.port.options.mk>
@@ -40,12 +42,6 @@ IGNORE=		needs hwpmc module loaded or co
 		Please consult hwpmc(4) on how to do it (or cat pkg-message)
 .endif
 
-CONFIGURE_ARGS+=	--with-tests=ctests
-
-.if ${PORT_OPTIONS:MCORETEMP}
-CONFIGURE_ARGS+=	--with-components=coretemp_freebsd
-.endif
-
 post-patch:
 	${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' \
 		${WRKSRC}/components/appio/tests/appio_test_pthreads.c \

Modified: head/devel/papi/distinfo
==============================================================================
--- head/devel/papi/distinfo	Wed Dec  9 12:06:49 2015	(r403377)
+++ head/devel/papi/distinfo	Wed Dec  9 12:13:04 2015	(r403378)
@@ -1,2 +1,2 @@
-SHA256 (papi-5.4.1.tar.gz) = e131c1449786fe870322a949e44f974a5963824f683232e653fb570cc65d4e87
-SIZE (papi-5.4.1.tar.gz) = 4088726
+SHA256 (papi-5.4.2.tar.gz) = bb71919d197b43a12e07cdeb0dce4f471bd3158f101259a34579a5df8087f002
+SIZE (papi-5.4.2.tar.gz) = 4361516

Modified: head/devel/papi/files/patch-configure
==============================================================================
--- head/devel/papi/files/patch-configure	Wed Dec  9 12:06:49 2015	(r403377)
+++ head/devel/papi/files/patch-configure	Wed Dec  9 12:13:04 2015	(r403378)
@@ -1,6 +1,6 @@
---- configure.orig	2015-07-23 08:38:09 UTC
+--- configure.orig	2015-12-03 22:41:27 UTC
 +++ configure
-@@ -6944,7 +6944,7 @@ echo "$as_me: error: PAPI requires FreeB
+@@ -6946,7 +6946,7 @@ echo "$as_me: error: PAPI requires FreeB
     { (exit 1); exit 1; }; }
      fi
      # Determine if HWPMC module is on the kernel

Modified: head/devel/papi/files/patch-x86_cpuid_info.c
==============================================================================
--- head/devel/papi/files/patch-x86_cpuid_info.c	Wed Dec  9 12:06:49 2015	(r403377)
+++ head/devel/papi/files/patch-x86_cpuid_info.c	Wed Dec  9 12:13:04 2015	(r403378)
@@ -1,4 +1,4 @@
---- x86_cpuid_info.c.orig	2015-03-02 20:30:42 UTC
+--- x86_cpuid_info.c.orig	2015-12-03 22:41:35 UTC
 +++ x86_cpuid_info.c
 @@ -1274,11 +1274,14 @@ cpuid2 ( unsigned int* eax, unsigned int
                      unsigned int* ecx, unsigned int* edx, 

Modified: head/devel/papi/pkg-plist
==============================================================================
--- head/devel/papi/pkg-plist	Wed Dec  9 12:06:49 2015	(r403377)
+++ head/devel/papi/pkg-plist	Wed Dec  9 12:13:04 2015	(r403378)
@@ -19,12 +19,12 @@ include/papiStdEventDefs.h
 lib/libpapi.a
 lib/libpapi.so
 lib/libpapi.so.5
-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
+lib/libpapi.so.5.4.2
+lib/libpapi.so.5.4.2.0
+libdata/pkgconfig/papi-5.4.2.0.pc
+libdata/pkgconfig/papi-5.4.2.pc
+libdata/pkgconfig/papi-5.pc
+libdata/pkgconfig/papi.pc
 man/man1/PAPI_derived_event_files.1.gz
 man/man1/papi_avail.1.gz
 man/man1/papi_clockres.1.gz