From owner-svn-ports-all@FreeBSD.ORG Mon Oct 22 08:44:01 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D857CD08; Mon, 22 Oct 2012 08:44:00 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BF2438FC0A; Mon, 22 Oct 2012 08:44:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9M8i05p072290; Mon, 22 Oct 2012 08:44:00 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9M8i0Rf072286; Mon, 22 Oct 2012 08:44:00 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201210220844.q9M8i0Rf072286@svn.freebsd.org> From: Ruslan Mahmatkhanov Date: Mon, 22 Oct 2012 08:44:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306259 - in head/devel/papi: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Oct 2012 08:44:01 -0000 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 (via ports@) Approved by: Harald Servat (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@gmail.com -# +# Created by: redcrash@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 +.include 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 +.include 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