Attachment #94698 for bug #132910

View | Details | Raw Unified | Return to bug 132910
Collapse All | Expand All




include/papi.h
include/papiStdEventDefs.h
lib/libpapi.a
lib/libpapi.so.3
%%CTESTS%%share/ctests/all_events
%%CTESTS%%share/ctests/all_native_events
%%CTESTS%%share/ctests/branches

%%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

%%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

Lines 1-3 Link Here

(-)/usr/ports/devel/papi-new/distinfo (-3 / +3 lines)
1	MD5 (papi-3.5.0-freebsd-rev49.tar.bz2) = b1e71f08710a4f0bc6fe5b1d8217082d	1	MD5 (papi-3.6.2.tar.gz) = 732065ebc1efeed743b4800a45d80ca4
2	SHA256 (papi-3.5.0-freebsd-rev49.tar.bz2) = 0bca15ff53f75fc56544dc6502da2b76f9f6dbb95bb5b4e07e893127d21d3eef	2	SHA256 (papi-3.6.2.tar.gz) = 761c6e06bc1c80a9efbe35cfeff49ee13281dfb0a33a494d1487dd0bd5f81462
3	SIZE (papi-3.5.0-freebsd-rev49.tar.bz2) = 2740609	3	SIZE (papi-3.6.2.tar.gz) = 4079036




#

PORTNAME=	papi
PORTVERSION=	3.6.2
PORTREVISION=	1
CATEGORIES=	devel
MASTER_SITES=	http://icl.cs.utk.edu/projects/papi/downloads/
DISTFILES=	papi-3.6.2.tar.gz

MAINTAINER=	redcrash@gmail.com
COMMENT=	API to access the performance counter hw in the microprocessor

BROKEN=		does not compile

PROJECTHOST=	papi-for-freebsd
STRIP=
USE_LDCONFIG=	yes
USE_BZIP2=	yes
USE_GMAKE=	yes
HAS_CONFIGURE=	yes
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 -fno-range-check

OPTIONS=	CTESTS "Install C tests" On
OPTIONS+=	FTESTS "Install Fortran tests" On

	PAPI_write.3

PAPI_LIBS=	libpapi.a \
	libpapi.so.3

PAPI_BINARIES=	papi_avail \
	papi_clockres \

	highlevel \
	cost \
	johnmay2 \
	native \
	avail \
	case1 \
	case2 \

	sprofile \
	profile_twoevents \
	byte_profile \
	native \
	overflow_index \
	overflow_one_and_read \
	multiplex1_pthreads \

	${INSTALL_MAN} ${WRKMAN}/man3/${f} ${PREFIX}/man/man3
.endfor

pre-install:
	${CAT} ${PKGMESSAGE}

.include <bsd.port.post.mk>




--- 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];


Return to bug 132910

Lines 12-18 Link Here

(-)/usr/ports/devel/papi-new/pkg-plist (-3 / +1 lines)
12	include/papi.h	12	include/papi.h
13	include/papiStdEventDefs.h	13	include/papiStdEventDefs.h
14	lib/libpapi.a	14	lib/libpapi.a
15	lib/libpapi.so	15	lib/libpapi.so.3
16	%%CTESTS%%share/ctests/all_events	16	%%CTESTS%%share/ctests/all_events
17	%%CTESTS%%share/ctests/all_native_events	17	%%CTESTS%%share/ctests/all_native_events
18	%%CTESTS%%share/ctests/branches	18	%%CTESTS%%share/ctests/branches
Lines 46-52 Link Here
46	%%CTESTS%%share/ctests/multiplex1_pthreads	46	%%CTESTS%%share/ctests/multiplex1_pthreads
47	%%CTESTS%%share/ctests/multiplex2	47	%%CTESTS%%share/ctests/multiplex2
48	%%CTESTS%%share/ctests/multiplex3_pthreads	48	%%CTESTS%%share/ctests/multiplex3_pthreads
49	%%CTESTS%%share/ctests/native
50	%%CTESTS%%share/ctests/overflow	49	%%CTESTS%%share/ctests/overflow
51	%%CTESTS%%share/ctests/overflow2	50	%%CTESTS%%share/ctests/overflow2
52	%%CTESTS%%share/ctests/overflow3_pthreads	51	%%CTESTS%%share/ctests/overflow3_pthreads
Lines 93-99 Link Here
93	%%FTESTS%%share/ftests/fmultiplex2	92	%%FTESTS%%share/ftests/fmultiplex2
94	%%FTESTS%%share/ftests/highlevel	93	%%FTESTS%%share/ftests/highlevel
95	%%FTESTS%%share/ftests/johnmay2	94	%%FTESTS%%share/ftests/johnmay2
96	%%FTESTS%%share/ftests/native
97	%%FTESTS%%share/ftests/second	95	%%FTESTS%%share/ftests/second
98	%%FTESTS%%share/ftests/strtest	96	%%FTESTS%%share/ftests/strtest
99	%%FTESTS%%share/ftests/tenth	97	%%FTESTS%%share/ftests/tenth

Lines 6-35 Link Here

(-)/usr/ports/devel/papi-new/Makefile (-15 / +9 lines)
6	#	6	#
7		7
8	PORTNAME= papi	8	PORTNAME= papi
9	PORTVERSION= 3.5.0	9	PORTVERSION= 3.6.2
10	PORTREVISION= 4	10	PORTREVISION= 1
11	CATEGORIES= devel	11	CATEGORIES= devel
12	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}	12	MASTER_SITES= http://icl.cs.utk.edu/projects/papi/downloads/
13	DISTFILES= papi-3.5.0-freebsd-rev49.tar.bz2	13	DISTFILES= papi-3.6.2.tar.gz
14		14
15	MAINTAINER= redcrash@gmail.com	15	MAINTAINER= redcrash@gmail.com
16	COMMENT= API to access the performance counter hw in the microprocessor	16	COMMENT= API to access the performance counter hw in the microprocessor
17		17
18	BROKEN= does not compile
19
20	PROJECTHOST= papi-for-freebsd
21	STRIP=	18	STRIP=
22	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
23	USE_BZIP2= yes
24	USE_GMAKE= yes	20	USE_GMAKE= yes
25	HAS_CONFIGURE= yes	21	HAS_CONFIGURE= yes
26	WRKSRC= ${WRKDIR}/PAPI/src	22	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
27	WRKMAN= ${WRKDIR}/PAPI/man	23	WRKMAN= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/man
28		24
29	# Although the package may not install the fortran binaries, it requires the	25	# Although the package may not install the fortran binaries, it requires the
30	# fortran compiler	26	# fortran compiler
31	USE_FORTRAN= yes	27	USE_FORTRAN= yes
32	FFLAGS= -fdefault-integer-8	28	FFLAGS= -fdefault-integer-8 -fno-range-check
33		29
34	OPTIONS= CTESTS "Install C tests" On	30	OPTIONS= CTESTS "Install C tests" On
35	OPTIONS+= FTESTS "Install Fortran tests" On	31	OPTIONS+= FTESTS "Install Fortran tests" On
Lines 149-155 Link Here
149	PAPI_write.3	145	PAPI_write.3
150		146
151	PAPI_LIBS= libpapi.a \	147	PAPI_LIBS= libpapi.a \
152	libpapi.so	148	libpapi.so.3
153		149
154	PAPI_BINARIES= papi_avail \	150	PAPI_BINARIES= papi_avail \
155	papi_clockres \	151	papi_clockres \
Lines 177-183 Link Here
177	highlevel \	173	highlevel \
178	cost \	174	cost \
179	johnmay2 \	175	johnmay2 \
180	native \
181	avail \	176	avail \
182	case1 \	177	case1 \
183	case2 \	178	case2 \
Lines 232-238 Link Here
232	sprofile \	227	sprofile \
233	profile_twoevents \	228	profile_twoevents \
234	byte_profile \	229	byte_profile \
235	native \
236	overflow_index \	230	overflow_index \
237	overflow_one_and_read \	231	overflow_one_and_read \
238	multiplex1_pthreads \	232	multiplex1_pthreads \
Lines 282-288 Link Here
282	${INSTALL_MAN} ${WRKMAN}/man3/${f} ${PREFIX}/man/man3	276	${INSTALL_MAN} ${WRKMAN}/man3/${f} ${PREFIX}/man/man3
283	.endfor	277	.endfor
284		278
285	post-install:	279	pre-install:
286	${CAT} ${PKGMESSAGE}	280	${CAT} ${PKGMESSAGE}
287		281
288	.include <bsd.port.post.mk>	282	.include <bsd.port.post.mk>

Line 0 Link Here

(-)/usr/ports/devel/papi-new/files/patch-freebsd.c (+20 lines)
	1	--- freebsd.c 2008-04-26 10:19:38.000000000 +0200
	2	+++ freebsd.new.c 2009-03-21 18:54:19.000000000 +0100
	3	@@ -174,8 +174,6 @@
	4	SHOW_WHERE_I_AM;
	5
	6	/* Initialize PMC library */
	7	- result = pmc_init();
	8	-
	9	if (pmc_init() < 0)
	10	return PAPI_ESYS;
	11
	12	@@ -187,7 +185,7 @@
	13	/* Get CPU clock rate from HW.CLOCKRATE sysctl value, and
	14	MODEL from HW.MODEL */
	15	int mib[5];
	16	- unsigned len;
	17	+ size_t len;
	18	int hw_clockrate;
	19	char hw_model[PAPI_MAX_STR_LEN];
	20