From owner-svn-ports-all@FreeBSD.ORG Wed Aug 8 07:18:25 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 46EC8106566C; Wed, 8 Aug 2012 07:18:25 +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 308BE8FC17; Wed, 8 Aug 2012 07:18:25 +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 q787IPks056410; Wed, 8 Aug 2012 07:18:25 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q787IOwJ056404; Wed, 8 Aug 2012 07:18:24 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201208080718.q787IOwJ056404@svn.freebsd.org> From: Ruslan Mahmatkhanov Date: Wed, 8 Aug 2012 07:18:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302274 - in head/graphics/rawtherapee: . files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 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: Wed, 08 Aug 2012 07:18:25 -0000 Author: rm Date: Wed Aug 8 07:18:24 2012 New Revision: 302274 URL: http://svn.freebsd.org/changeset/ports/302274 Log: - update to 4.0.9 - adjust local patch to new version - pet portlint (drop shlib versions in LIB_DEPENDS) - tab -> space change in pkg-plist:WWW Added: head/graphics/rawtherapee/files/patch-AboutThisBuild.cmake (contents, props changed) Deleted: head/graphics/rawtherapee/files/patch-About-Linux.cmake Modified: head/graphics/rawtherapee/Makefile head/graphics/rawtherapee/distinfo head/graphics/rawtherapee/pkg-descr head/graphics/rawtherapee/pkg-plist Modified: head/graphics/rawtherapee/Makefile ============================================================================== --- head/graphics/rawtherapee/Makefile Wed Aug 8 06:54:57 2012 (r302273) +++ head/graphics/rawtherapee/Makefile Wed Aug 8 07:18:24 2012 (r302274) @@ -6,8 +6,7 @@ # PORTNAME= rawtherapee -PORTVERSION= 4.0.8 -PORTREVISION= 1 +PORTVERSION= 4.0.9 CATEGORIES= graphics MASTER_SITES= GOOGLE_CODE @@ -16,12 +15,12 @@ COMMENT= A powerful RAW image processing LICENSE= GPLv3 -LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \ - iptcdata.3:${PORTSDIR}/graphics/libiptcdata \ - jpeg.11:${PORTSDIR}/graphics/jpeg \ - lcms2.2:${PORTSDIR}/graphics/lcms2 \ +LIB_DEPENDS= gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \ + iptcdata:${PORTSDIR}/graphics/libiptcdata \ + jpeg:${PORTSDIR}/graphics/jpeg \ + lcms2:${PORTSDIR}/graphics/lcms2 \ png15:${PORTSDIR}/graphics/png \ - tiff.4:${PORTSDIR}/graphics/tiff \ + tiff:${PORTSDIR}/graphics/tiff \ sigc-2.0:${PORTSDIR}/devel/libsigc++20 USE_CMAKE= yes @@ -52,6 +51,11 @@ OPTIONS_DEFINE= OPTIMIZED_CFLAGS OPENMP OPTIONS_DEFAULT= OPTIMIZED_CFLAGS OPENMP OPENMP_DESC= Enable multicore processing using OpenMP +post-patch: + @${REINPLACE_CMD} -e 's###g' \ + ${WRKSRC}/rtgui/darkframe.h ${WRKSRC}/rtgui/flatfield.h \ + ${WRKSRC}/rtgui/icmpanel.h + .include .if ${ARCH} == "amd64" || ${ARCH} == "i386" @@ -63,10 +67,6 @@ CXXFLAGS+= -O3 -ffast-math -fexpensive-o .endif .endif -#.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" -#BROKEN= Does not compile on ia64, powerpc, or sparc64 -#.endif - .if ${PORT_OPTIONS:MOPENMP} CMAKE_ARGS+= -DOPTION_OMP:BOOL=ON .else Modified: head/graphics/rawtherapee/distinfo ============================================================================== --- head/graphics/rawtherapee/distinfo Wed Aug 8 06:54:57 2012 (r302273) +++ head/graphics/rawtherapee/distinfo Wed Aug 8 07:18:24 2012 (r302274) @@ -1,2 +1,2 @@ -SHA256 (rawtherapee-4.0.8.tar.xz) = b0cbeac634d927b6afc0527434b24304b9d1ab2a681915933a872cf1a27f39cd -SIZE (rawtherapee-4.0.8.tar.xz) = 40766264 +SHA256 (rawtherapee-4.0.9.tar.xz) = 4ad49b5d3aae9a178b1cfa5efca653982f0a52763ddd37f89500e8fedfb187d2 +SIZE (rawtherapee-4.0.9.tar.xz) = 40201920 Added: head/graphics/rawtherapee/files/patch-AboutThisBuild.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/rawtherapee/files/patch-AboutThisBuild.cmake Wed Aug 8 07:18:24 2012 (r302274) @@ -0,0 +1,31 @@ +--- ./AboutThisBuild.cmake.orig 2012-06-03 19:56:20.000000000 +0400 ++++ ./AboutThisBuild.cmake 2012-08-07 15:18:18.000000000 +0400 +@@ -8,28 +8,9 @@ + find_file(HG_CMD hg) + set (SHELL "/bin/bash") + else (WIN32) # Linux +- find_file(HG_CMD hg) + set (SHELL "/bin/bash") + endif (WIN32) + +-# the hg command is looked for again, at build time +-if (HG_CMD STREQUAL HG_CMD-NOTFOUND) +- message(FATAL_ERROR "hg command not found!") +-else (HG_CMD STREQUAL HG_CMD-NOTFOUND) +- message(STATUS "hg command found: ${HG_CMD}") +-endif (HG_CMD STREQUAL HG_CMD-NOTFOUND) +- +-set (OUT_FILE "${SRC_DIR}/AboutThisBuild.txt") +-# there should be a better way of getting the compiler + compiler version, not restrained to Gcc +-execute_process(COMMAND gcc -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) +-execute_process(COMMAND ${HG_CMD} -R ${SRC_DIR} branch OUTPUT_VARIABLE HG_BRANCH OUTPUT_STRIP_TRAILING_WHITESPACE) +-execute_process(COMMAND ${HG_CMD} parents --template={latesttag}.{latesttagdistance} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) +-execute_process(COMMAND ${HG_CMD} parents --template={node|short} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_CHANGESET OUTPUT_STRIP_TRAILING_WHITESPACE) +-execute_process(COMMAND ${HG_CMD} parents --template={latesttagdistance} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE HG_TAGDISTANCE OUTPUT_STRIP_TRAILING_WHITESPACE) +-if (CACHE_NAME_SUFFIX STREQUAL "") +- execute_process(COMMAND ${HG_CMD} parents --template={latesttag} WORKING_DIRECTORY ${SRC_DIR} OUTPUT_VARIABLE CACHE_NAME_SUFFIX OUTPUT_STRIP_TRAILING_WHITESPACE) +-endif () +- + # build version.h from template + configure_file (${SRC_DIR}/rtgui/version.h.in ${SRC_DIR}/rtgui/version.h) + # build AboutThisBuild.txt from template Modified: head/graphics/rawtherapee/pkg-descr ============================================================================== --- head/graphics/rawtherapee/pkg-descr Wed Aug 8 06:54:57 2012 (r302273) +++ head/graphics/rawtherapee/pkg-descr Wed Aug 8 07:18:24 2012 (r302274) @@ -42,4 +42,4 @@ Main features: * ICC based color management * Change History with bookmarks to support before/after checking -WWW: http://www.rawtherapee.com/ +WWW: http://www.rawtherapee.com/ Modified: head/graphics/rawtherapee/pkg-plist ============================================================================== --- head/graphics/rawtherapee/pkg-plist Wed Aug 8 06:54:57 2012 (r302273) +++ head/graphics/rawtherapee/pkg-plist Wed Aug 8 07:18:24 2012 (r302274) @@ -18,6 +18,9 @@ share/icons/hicolor/48x48/apps/rawtherap %%DATADIR%%/dcpprofiles/Canon EOS 5D.dcp %%DATADIR%%/dcpprofiles/Canon EOS 7D.dcp %%DATADIR%%/dcpprofiles/Canon EOS D60.dcp +%%DATADIR%%/dcpprofiles/Canon EOS Digital Rebel XSi.dcp +%%DATADIR%%/dcpprofiles/Canon EOS Digital Rebel XTi.dcp +%%DATADIR%%/dcpprofiles/Canon EOS Rebel T2i.dcp %%DATADIR%%/dcpprofiles/Canon EOS-1D Mark III.dcp %%DATADIR%%/dcpprofiles/Canon PowerShot G10.dcp %%DATADIR%%/dcpprofiles/Canon PowerShot G12.dcp @@ -27,10 +30,13 @@ share/icons/hicolor/48x48/apps/rawtherap %%DATADIR%%/dcpprofiles/Nikon D3100.dcp %%DATADIR%%/dcpprofiles/Nikon D3S.dcp %%DATADIR%%/dcpprofiles/Nikon D50.dcp +%%DATADIR%%/dcpprofiles/Nikon D5100.dcp %%DATADIR%%/dcpprofiles/Nikon D700.dcp +%%DATADIR%%/dcpprofiles/Nikon D7000.dcp %%DATADIR%%/dcpprofiles/Olympus E-1.dcp %%DATADIR%%/dcpprofiles/Olympus E-P2.dcp %%DATADIR%%/dcpprofiles/Panasonic DMC-FZ150.dcp +%%DATADIR%%/dcpprofiles/Panasonic DMC-FZ35.dcp %%DATADIR%%/dcpprofiles/Panasonic DMC-FZ38.dcp %%DATADIR%%/dcpprofiles/Panasonic DMC-G1.dcp %%DATADIR%%/dcpprofiles/Panasonic DMC-G3.dcp @@ -591,15 +597,15 @@ share/icons/hicolor/48x48/apps/rawtherap %%DATADIR%%/profiles/BW-2.pp3 %%DATADIR%%/profiles/BW-3.pp3 %%DATADIR%%/profiles/BW-4.pp3 +%%DATADIR%%/profiles/Default-ISO-High.pp3 +%%DATADIR%%/profiles/Default-ISO-Medium.pp3 +%%DATADIR%%/profiles/Default.pp3 %%DATADIR%%/profiles/Highkey-1.pp3 %%DATADIR%%/profiles/Natural-1.pp3 %%DATADIR%%/profiles/Natural-2.pp3 +%%DATADIR%%/profiles/Neutral.pp3 %%DATADIR%%/profiles/Punchy-1.pp3 %%DATADIR%%/profiles/Punchy-2.pp3 -%%DATADIR%%/profiles/default-ISO-high.pp3 -%%DATADIR%%/profiles/default-ISO-medium.pp3 -%%DATADIR%%/profiles/default.pp3 -%%DATADIR%%/profiles/neutral.pp3 %%DATADIR%%/sounds/BatchComplete.wav %%DATADIR%%/sounds/Empty.wav %%DATADIR%%/sounds/ProcessComplete.wav