svn commit: r306259 - in head/devel/papi: . files
Ruslan Mahmatkhanov
rm at FreeBSD.org
Mon Oct 22 08:44:01 UTC 2012
Author: rm
Date: Mon Oct 22 08:44:00 2012
New Revision: 306259
URL: http://svn.freebsd.org/changeset/ports/306259
Log:
- fix build on 10.0-CURRENT
while here:
- trim Makefile header
- convert to optionsng
- remove trailing whitespace in pkg-descr
Submitted by: hiren panchasara <hiren.panchasara at gmail dot com> (via ports@)
Approved by: Harald Servat <redcrash at gmail dot com> (maintainer, via ports@)
Feature safe: yes
Added:
head/devel/papi/files/
head/devel/papi/files/patch-configure (contents, props changed)
Modified:
head/devel/papi/Makefile
head/devel/papi/pkg-descr
Modified: head/devel/papi/Makefile
==============================================================================
--- head/devel/papi/Makefile Mon Oct 22 07:54:32 2012 (r306258)
+++ head/devel/papi/Makefile Mon Oct 22 08:44:00 2012 (r306259)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: papi
-# Date created: 21 May 2007
-# Whom: redcrash at gmail.com
-#
+# Created by: redcrash at gmail.com
# $FreeBSD$
-#
PORTNAME= papi
PORTVERSION= 4.1.2.1
@@ -25,10 +21,11 @@ HAS_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
WRKMAN= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/man
-OPTIONS= CORETEMP "Add Intel Core thermal sensor (need coretemp.ko)" Off
-OPTIONS+= DEBUG "Add debug information (increased verbosity)" Off
+OPTIONS_DEFINE= CORETEMP DEBUGINFO
+CORETEMP_DESC= Add Intel Core thermal sensor (need coretemp.ko)
+DEBUGINFO_DESC= Add debug information (increased verbosity)
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
HAS_HWMPC!= ${SYSCTL} kern.hwpmc >/dev/null 2>&1 && echo yes || true
@@ -39,11 +36,11 @@ IGNORE= needs hwmpc module loaded or co
CONFIGURE_ARGS+= --with-tests=ctests
-.if defined(WITH_CORETEMP)
+.if ${PORT_OPTIONS:MCORETEMP}
CONFIGURE_ARGS+= --with-components=coretemp_freebsd
.endif
-.if defined(WITHOUT_DEBUG)
+.if ${PORT_OPTIONS:MDEBUGINFO}
CONFIGURE_ARGS+= --without-debug
.else
CONFIGURE_ARGS+= --with-debug
@@ -272,4 +269,4 @@ do-install:
post-install:
${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Added: head/devel/papi/files/patch-configure
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/papi/files/patch-configure Mon Oct 22 08:44:00 2012 (r306259)
@@ -0,0 +1,11 @@
+--- ./configure.orig 2011-01-21 06:49:01.000000000 +0300
++++ ./configure 2012-10-22 12:27:41.000000000 +0400
+@@ -5800,7 +5800,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
+ as_fn_error "PAPI requires FreeBSD 6 or greater" "$LINENO" 5
+ fi
Modified: head/devel/papi/pkg-descr
==============================================================================
--- head/devel/papi/pkg-descr Mon Oct 22 07:54:32 2012 (r306258)
+++ head/devel/papi/pkg-descr Mon Oct 22 08:44:00 2012 (r306259)
@@ -3,7 +3,7 @@ consistent interface and methodology for
hardware found in most major microprocessors.
PAPI enables software engineers to see, in near real time, the relation
-between software performance and processor events.
+between software performance and processor events.
WWW: http://code.google.com/p/papi-for-freebsd/
WWW: http://icl.cs.utk.edu/papi
More information about the svn-ports-head
mailing list