4 files changed, 40 insertions, 22 deletions

diff --git a/devel/papi/Makefile b/devel/papi/Makefile
index cd4f7f40fe14..68d06e5f4c18 100644
--- a/devel/papi/Makefile
+++ b/devel/papi/Makefile
@@ -6,30 +6,29 @@
 #
 
 PORTNAME=	papi
-PORTVERSION=	3.5.0
-PORTREVISION=	4
+PORTVERSION=	3.6.2
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-DISTFILES=	papi-3.5.0-freebsd-rev49.tar.bz2
+MASTER_SITES=	http://icl.cs.utk.edu/projects/papi/downloads/
 
 MAINTAINER=	redcrash@gmail.com
 COMMENT=	API to access the performance counter hw in the microprocessor
 
-BROKEN=		does not compile
+ONLY_FOR_ARCHS=	i386 amd64
+ONLY_FOR_ARCHS_REASON=	HWPMC kernel module is only available for I386 and \
+			AMD64 machines
+NO_PACKAGE=	Needs to be compiled for specific CPU
 
-PROJECTHOST=	papi-for-freebsd
 STRIP=
 USE_LDCONFIG=	yes
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/PAPI/src
-WRKMAN=		${WRKDIR}/PAPI/man
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
+WRKMAN=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/man
 
 # Although the package may not install the fortran binaries, it requires the
 # fortran compiler
 USE_FORTRAN=	yes
-FFLAGS=		-fdefault-integer-8
+FFLAGS=		-fdefault-integer-8 -fno-range-check
 
 OPTIONS=	CTESTS "Install C tests" On
 OPTIONS+=	FTESTS "Install Fortran tests" On
@@ -37,9 +36,12 @@ OPTIONS+=	DEBUG  "Add debug information (increased verbosity)" Off
 
 .include <bsd.port.pre.mk>
 
-ONLY_FOR_ARCHS=	i386 amd64
-ONLY_FOR_ARCHS_REASON=	HWPMC kernel module is only available for I386 and \
-  AMD64 machines
+HAS_HWMPC!=     ${SYSCTL} kern.hwpmc >/dev/null 2>&1 && echo yes || true
+
+.if ${HAS_HWMPC} != "yes"
+IGNORE=		needs hwmpc module loaded or compiled into the kernel. \
+		Please consult hwpmc(4) on how to do it (or cat pkg-message)
+.endif
 
 .if defined(WITHOUT_CTESTS)
 PLIST_SUB+=	CTESTS="@comment "
@@ -149,7 +151,7 @@ MAN3=	PAPI.3 \
 	PAPI_write.3
 
 PAPI_LIBS=	libpapi.a \
-	libpapi.so
+	libpapi.so.3
 
 PAPI_BINARIES=	papi_avail \
 	papi_clockres \
@@ -177,7 +179,6 @@ PAPI_FORTRAN_TESTS=	strtest \
 	highlevel \
 	cost \
 	johnmay2 \
-	native \
 	avail \
 	case1 \
 	case2 \
@@ -232,7 +233,6 @@ PAPI_C_TESTS=	ipc \
 	sprofile \
 	profile_twoevents \
 	byte_profile \
-	native \
 	overflow_index \
 	overflow_one_and_read \
 	multiplex1_pthreads \
diff --git a/devel/papi/distinfo b/devel/papi/distinfo
index 86208b2783b1..f8e7241b475f 100644
--- a/devel/papi/distinfo
+++ b/devel/papi/distinfo
@@ -1,3 +1,3 @@
-MD5 (papi-3.5.0-freebsd-rev49.tar.bz2) = b1e71f08710a4f0bc6fe5b1d8217082d
-SHA256 (papi-3.5.0-freebsd-rev49.tar.bz2) = 0bca15ff53f75fc56544dc6502da2b76f9f6dbb95bb5b4e07e893127d21d3eef
-SIZE (papi-3.5.0-freebsd-rev49.tar.bz2) = 2740609
+MD5 (papi-3.6.2.tar.gz) = 732065ebc1efeed743b4800a45d80ca4
+SHA256 (papi-3.6.2.tar.gz) = 761c6e06bc1c80a9efbe35cfeff49ee13281dfb0a33a494d1487dd0bd5f81462
+SIZE (papi-3.6.2.tar.gz) = 4079036
diff --git a/devel/papi/files/patch-freebsd.c b/devel/papi/files/patch-freebsd.c
new file mode 100644
index 000000000000..8f7af39891a4
--- /dev/null
+++ b/devel/papi/files/patch-freebsd.c
@@ -0,0 +1,20 @@
+--- freebsd.c	2008-04-26 10:19:38.000000000 +0200
++++ freebsd.new.c	2009-03-21 18:54:19.000000000 +0100
+@@ -174,8 +174,6 @@
+ 	SHOW_WHERE_I_AM;
+ 
+ 	/* Initialize PMC library */
+-	result = pmc_init();
+-
+ 	if (pmc_init() < 0)
+ 		return PAPI_ESYS;
+       
+@@ -187,7 +185,7 @@
+ 		/* Get CPU clock rate from HW.CLOCKRATE sysctl value, and
+ 		   MODEL from HW.MODEL */
+ 		int mib[5];
+-		unsigned len;
++		size_t len;
+ 		int hw_clockrate;
+ 		char hw_model[PAPI_MAX_STR_LEN];
+      
diff --git a/devel/papi/pkg-plist b/devel/papi/pkg-plist
index f93865cbbbc8..2813c7e74772 100644
--- a/devel/papi/pkg-plist
+++ b/devel/papi/pkg-plist
@@ -12,7 +12,7 @@ include/fpapi.h
 include/papi.h
 include/papiStdEventDefs.h
 lib/libpapi.a
-lib/libpapi.so
+lib/libpapi.so.3
 %%CTESTS%%share/ctests/all_events
 %%CTESTS%%share/ctests/all_native_events
 %%CTESTS%%share/ctests/branches
@@ -46,7 +46,6 @@ lib/libpapi.so
 %%CTESTS%%share/ctests/multiplex1_pthreads
 %%CTESTS%%share/ctests/multiplex2
 %%CTESTS%%share/ctests/multiplex3_pthreads
-%%CTESTS%%share/ctests/native
 %%CTESTS%%share/ctests/overflow
 %%CTESTS%%share/ctests/overflow2
 %%CTESTS%%share/ctests/overflow3_pthreads
@@ -93,7 +92,6 @@ lib/libpapi.so
 %%FTESTS%%share/ftests/fmultiplex2
 %%FTESTS%%share/ftests/highlevel
 %%FTESTS%%share/ftests/johnmay2
-%%FTESTS%%share/ftests/native
 %%FTESTS%%share/ftests/second
 %%FTESTS%%share/ftests/strtest
 %%FTESTS%%share/ftests/tenth