<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[133613] trunk/dports/graphics/lensfun</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/133613">133613</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-03-06 15:16:43 -0800 (Fri, 06 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>lensfun: update to version 0.3.0, add +doc variant (#45377).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicslensfunPortfile">trunk/dports/graphics/lensfun/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicslensfunfilespatchdocsCMakeListstxtdiff">trunk/dports/graphics/lensfun/files/patch-docs-CMakeLists.txt.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicslensfunfilespatchbuildtibstargetmacmakdiff">trunk/dports/graphics/lensfun/files/patch-build-tibs-target-mac-mak.diff</a></li>
<li><a href="#trunkdportsgraphicslensfunfilespatchpkgconfigdiff">trunk/dports/graphics/lensfun/files/patch-pkgconfig.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicslensfunPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/lensfun/Portfile (133612 => 133613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/lensfun/Portfile 2015-03-06 22:36:22 UTC (rev 133612)
+++ trunk/dports/graphics/lensfun/Portfile 2015-03-06 23:16:43 UTC (rev 133613)
</span><span class="lines">@@ -2,16 +2,15 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup muniversal 1.0
</del><ins>+PortGroup cmake 1.0
</ins><span class="cx">
</span><span class="cx"> name lensfun
</span><span class="cx"> epoch 1
</span><del>-version 0.2.8
-revision 1
</del><ins>+version 0.3.0
</ins><span class="cx"> categories graphics
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers devans openmaintainer
</span><del>-license GPL-3 LGPL-3
</del><ins>+license GPL-3 LGPL-3 CC-BY-SA
</ins><span class="cx">
</span><span class="cx"> description Library for fixing lens geometry distortion
</span><span class="cx">
</span><span class="lines">@@ -24,63 +23,38 @@
</span><span class="cx"> master_sites sourceforge:project/${name}/${version}
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><del>-checksums rmd160 527b4ca0e9ce40f514e7340548d0d0635bdc875e \
- sha256 f88f97fbc78259a2b2edddef295caf50770901107c8469e54bb5e9699faa1a48
</del><ins>+checksums rmd160 dc39f4708b2632ed6795052d368f3ad847c6704f \
+ sha256 c2c3c03873cb549d49d42f118fcb0ffa95d1e45b9ff395e19facb63bf699bec1
</ins><span class="cx">
</span><del>-depends_build port:pkgconfig bin:makedep:gccmakedep
</del><ins>+depends_build-append \
+ port:pkgconfig
</ins><span class="cx">
</span><del>-depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2
</del><ins>+depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
+ port:libpng
</ins><span class="cx">
</span><del>-# Ensure lensfun.pc is created
-patchfiles patch-pkgconfig.diff
</del><ins>+# installs python3 helper scripts lensfun-add-adapter lensfun-update-data
</ins><span class="cx">
</span><del>-# Set the correct library install_name and current_version
-patchfiles-append patch-build-tibs-target-mac-mak.diff
-post-patch {
- reinplace "s|@VERSION@|${version}|g" ${worksrcpath}/build/tibs/target/mac.mak
-}
</del><ins>+depends_run port:python34
</ins><span class="cx">
</span><del>-set cxx_stdlibflags {}
-if {[string match *clang* ${configure.cxx}]} {
- set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
</del><ins>+pre-patch {
+ copy ${worksrcpath}/docs/CMakeLists.txt ${worksrcpath}/docs/CMakeLists.txt.orig
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-configure.args -v
-configure.env LD="${configure.cxx} ${cxx_stdlibflags}"
</del><ins>+patchfiles patch-docs-CMakeLists.txt.diff
</ins><span class="cx">
</span><del>-platform darwin 8 {
- # lensfun requires make >= 3.81; Tiger comes with 3.80
- depends_build-append port:gmake
- # fix configure script check which is hardcoded to using "make"
- post-extract {
- xinstall -d ${workpath}/bin
- ln -s ${prefix}/bin/gmake ${workpath}/bin/make
- }
- configure.env PATH=${workpath}/bin:$env(PATH)
- # fix build and destroot
- build.cmd ${prefix}/bin/gmake
</del><ins>+post-patch {
+ reinplace "s|^#!.*|#!${prefix}/bin/python3.4|" \
+ ${worksrcpath}/apps/lensfun-add-adapter \
+ ${worksrcpath}/apps/lensfun-update-data
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-if {[variant_isset universal]} {
- foreach arch ${configure.universal_archs} {
- set merger_host($arch) ""
- }
- set merger_configure_args(ppc64) "--target=mac.powerpc64.G5 --vectorization=''"
- set merger_configure_args(ppc) "--target=mac.powerpc.powerpc --vectorization=''"
- set merger_configure_args(i386) "--target=mac.x86.i686"
- set merger_configure_args(x86_64) "--target=mac.x86_64.generic"
-} elseif {${build_arch} eq "ppc64"} {
- configure.args-append --target=mac.powerpc64.G5 --vectorization=''
-} elseif {${build_arch} eq "ppc"} {
- configure.args-append --target=mac.powerpc.powerpc --vectorization=''
-} elseif {${build_arch} eq "i386"} {
- configure.args-append --target=mac.x86.i686
-} elseif {${build_arch} eq "x86_64"} {
- configure.args-append --target=mac.x86_64.generic
</del><ins>+variant doc description {Build API and man documentation using doxygen, rst2man} {
+ depends_build-append \
+ port:doxygen \
+ port:py34-docutils
+
+ configure.args-append \
+ -DBUILD_DOC=ON
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-configure.universal_args-delete --disable-dependency-tracking
-
-build.args V=1 GCC.LD="${configure.cxx} ${cxx_stdlibflags}"
-
</del><span class="cx"> livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</span></span></pre></div>
<a id="trunkdportsgraphicslensfunfilespatchbuildtibstargetmacmakdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/lensfun/files/patch-build-tibs-target-mac-mak.diff (133612 => 133613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/lensfun/files/patch-build-tibs-target-mac-mak.diff 2015-03-06 22:36:22 UTC (rev 133612)
+++ trunk/dports/graphics/lensfun/files/patch-build-tibs-target-mac-mak.diff 2015-03-06 23:16:43 UTC (rev 133613)
</span><span class="lines">@@ -1,10 +0,0 @@
</span><del>---- build/tibs/target/mac.mak.orig 2011-01-17 20:34:03.000000000 +1300
-+++ build/tibs/target/mac.mak 2011-01-17 20:35:12.000000000 +1300
-@@ -12,6 +12,6 @@
- _EX =
-
- # Flag to tell Darwin linker to set the library name:
--GCC.LDFLAGS.SHARED = -dynamiclib -Wl,"-dylib_install_name,$1"
-+GCC.LDFLAGS.SHARED = -dynamiclib -Wl,"-install_name,$(CONF_LIBDIR)$1" -Wl,"-current_version,@VERSION@"
- # Set to non-empty if platform supports versioned shared libraries
- SO.VERSION = 1
</del></span></pre></div>
<a id="trunkdportsgraphicslensfunfilespatchdocsCMakeListstxtdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/lensfun/files/patch-docs-CMakeLists.txt.diff (0 => 133613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/lensfun/files/patch-docs-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/graphics/lensfun/files/patch-docs-CMakeLists.txt.diff 2015-03-06 23:16:43 UTC (rev 133613)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+--- docs/CMakeLists.txt.orig 2014-09-30 10:37:34.000000000 -0700
++++ docs/CMakeLists.txt 2015-03-06 08:19:31.000000000 -0800
+@@ -26,9 +26,9 @@
+ ADD_CUSTOM_TARGET(man ALL)
+ ADD_CUSTOM_COMMAND(
+ TARGET man
+- COMMAND rst2man ${CMAKE_CURRENT_SOURCE_DIR}/man/g-lensfun-update-data.1.rst > ${CMAKE_CURRENT_BINARY_DIR}/g-lensfun-update-data.1
+- COMMAND rst2man ${CMAKE_CURRENT_SOURCE_DIR}/man/lensfun-update-data.1.rst > ${CMAKE_CURRENT_BINARY_DIR}/lensfun-update-data.1
+- COMMAND rst2man ${CMAKE_CURRENT_SOURCE_DIR}/man/lensfun-add-adapter.1.rst > ${CMAKE_CURRENT_BINARY_DIR}/lensfun-add-adapter.1
++ COMMAND rst2man-3.4.py ${CMAKE_CURRENT_SOURCE_DIR}/man/g-lensfun-update-data.1.rst > ${CMAKE_CURRENT_BINARY_DIR}/g-lensfun-update-data.1
++ COMMAND rst2man-3.4.py ${CMAKE_CURRENT_SOURCE_DIR}/man/lensfun-update-data.1.rst > ${CMAKE_CURRENT_BINARY_DIR}/lensfun-update-data.1
++ COMMAND rst2man-3.4.py ${CMAKE_CURRENT_SOURCE_DIR}/man/lensfun-add-adapter.1.rst > ${CMAKE_CURRENT_BINARY_DIR}/lensfun-add-adapter.1
+ WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+ )
+
+@@ -36,5 +36,5 @@
+ ${CMAKE_CURRENT_BINARY_DIR}/g-lensfun-update-data.1
+ ${CMAKE_CURRENT_BINARY_DIR}/lensfun-update-data.1
+ ${CMAKE_CURRENT_BINARY_DIR}/lensfun-add-adapter.1
+- DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1
++ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
+ )
</ins></span></pre></div>
<a id="trunkdportsgraphicslensfunfilespatchpkgconfigdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/lensfun/files/patch-pkgconfig.diff (133612 => 133613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/lensfun/files/patch-pkgconfig.diff 2015-03-06 22:36:22 UTC (rev 133612)
+++ trunk/dports/graphics/lensfun/files/patch-pkgconfig.diff 2015-03-06 23:16:43 UTC (rev 133613)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>---- build/tibs/compiler/pkgconfig.mak.orig 2010-03-23 09:32:47.000000000 +1300
-+++ build/tibs/compiler/pkgconfig.mak 2011-01-16 13:37:03.000000000 +1300
-@@ -3,8 +3,9 @@
- ifdef CONF_LIBDIR
- # Try to guess here if target supports pkgconfig
- # - Any POSIX platform
-+# - Macintosh
- # - Cross-compiling on a POSIX target for WINDOWS (mingw32)
--ifneq ($(findstring /posix/,/$(TARGET)/)$(findstring /posix-windows/,/$(HOST)-$(TARGET)/),)
-+ifneq ($(findstring /posix/,/$(TARGET)/)$(findstring /mac/,/$(TARGET)/)$(findstring /posix-windows/,/$(HOST)-$(TARGET)/),)
-
- XFNAME.PKGCONFIG = $(addprefix $$(OUT),$1)
- MKDEPS.PKGCONFIG = $1
</del></span></pre>
</div>
</div>
</body>
</html>