From owner-svn-ports-all@FreeBSD.ORG Tue Apr 29 20:57:47 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A657A8C6; Tue, 29 Apr 2014 20:57:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 78F0818C4; Tue, 29 Apr 2014 20:57:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3TKvlV8035432; Tue, 29 Apr 2014 20:57:47 GMT (envelope-from rodrigo@svn.freebsd.org) Received: (from rodrigo@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3TKvlAD035430; Tue, 29 Apr 2014 20:57:47 GMT (envelope-from rodrigo@svn.freebsd.org) Message-Id: <201404292057.s3TKvlAD035430@svn.freebsd.org> From: Rodrigo Osorio Date: Tue, 29 Apr 2014 20:57:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r352642 - in branches/2014Q2/graphics/ufraw: . files X-SVN-Group: ports-branches 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.17 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: Tue, 29 Apr 2014 20:57:47 -0000 Author: rodrigo Date: Tue Apr 29 20:57:46 2014 New Revision: 352642 URL: http://svnweb.freebsd.org/changeset/ports/352642 QAT: https://qat.redports.org/buildarchive/r352642/ Log: - fix clang issue caused by incorrect namespacing - add dependency - bump portrevision PR: ports/188044 Submitted by: Chris Rees Approved by: bapt (mentor) Approved by: portmgr (bapt) Obtained from: Macports Added: branches/2014Q2/graphics/ufraw/files/patch-ufraw.h - copied unchanged from r351834, head/graphics/ufraw/files/patch-ufraw.h Modified: branches/2014Q2/graphics/ufraw/Makefile Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/graphics/ufraw/Makefile ============================================================================== --- branches/2014Q2/graphics/ufraw/Makefile Tue Apr 29 20:53:20 2014 (r352641) +++ branches/2014Q2/graphics/ufraw/Makefile Tue Apr 29 20:57:46 2014 (r352642) @@ -3,7 +3,7 @@ PORTNAME= ufraw PORTVERSION= 0.19.2 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -19,7 +19,7 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/grap GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-silent-rules --enable-extras -USES= gettext pkgconfig gmake +USES= gettext pkgconfig gmake desktop-file-utils CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} Copied: branches/2014Q2/graphics/ufraw/files/patch-ufraw.h (from r351834, head/graphics/ufraw/files/patch-ufraw.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/graphics/ufraw/files/patch-ufraw.h Tue Apr 29 20:57:46 2014 (r352642, copy of r351834, head/graphics/ufraw/files/patch-ufraw.h) @@ -0,0 +1,24 @@ +--- ufraw.h.orig 2014-01-11 11:04:08.000000000 -0800 ++++ ufraw.h 2014-01-11 11:04:54.000000000 -0800 +@@ -41,6 +41,10 @@ + /* An impossible value for conf float values */ + #define NULLF -10000.0 + ++#ifdef __cplusplus ++extern "C" { ++#endif // __cplusplus ++ + /* Options, like auto-adjust buttons can be in 3 states. Enabled and disabled + * are obvious. Apply means that the option was selected and some function + * has to act accourdingly, before changing to one of the first two states */ +@@ -78,10 +82,6 @@ extern UFName ufRawImage; + extern UFName ufRawResources; + extern UFName ufCommandLine; + +-#ifdef __cplusplus +-extern "C" { +-#endif // __cplusplus +- + UFObject *ufraw_image_new(); + #ifdef HAVE_LENSFUN + UFObject *ufraw_lensfun_new();