<!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>[149176] trunk/dports/aqua/qtpfsgui</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/149176">149176</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2016-06-04 13:50:45 -0700 (Sat, 04 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>qtpfsgui: revamp installations process
* remove gcc flags since clang does not understand them (#39443)
* generate proper translations files and allow qtpfsgui to find them
* create links to external programs so qtpfsgui can find them (#16524)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquaqtpfsguiPortfile">trunk/dports/aqua/qtpfsgui/Portfile</a></li>
<li><a href="#trunkdportsaquaqtpfsguifilespatchprojectprodiff">trunk/dports/aqua/qtpfsgui/files/patch-project.pro.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaquaqtpfsguiPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/qtpfsgui/Portfile (149175 => 149176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qtpfsgui/Portfile 2016-06-04 20:33:48 UTC (rev 149175)
+++ trunk/dports/aqua/qtpfsgui/Portfile 2016-06-04 20:50:45 UTC (rev 149176)
</span><span class="lines">@@ -2,11 +2,11 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup qt4 1.0
</del><ins>+PortGroup qmake 1.0
</ins><span class="cx">
</span><span class="cx"> name qtpfsgui
</span><span class="cx"> version 1.9.3
</span><del>-revision 6
</del><ins>+revision 7
</ins><span class="cx"> categories aqua graphics
</span><span class="cx"> license GPL-2+
</span><span class="cx"> maintainers nomaintainer
</span><span class="lines">@@ -17,6 +17,8 @@
</span><span class="cx"> homepage http://qtpfsgui.sourceforge.net/oldsite/
</span><span class="cx"> master_sites sourceforge
</span><span class="cx">
</span><ins>+set target Qtpfsgui
+
</ins><span class="cx"> depends_lib-append \
</span><span class="cx"> port:exiv2 \
</span><span class="cx"> port:openexr \
</span><span class="lines">@@ -25,29 +27,34 @@
</span><span class="cx"> port:fftw-3-single \
</span><span class="cx"> port:tiff
</span><span class="cx">
</span><ins>+depends_run-append \
+ port:dcraw \
+ port:hugin-app
+
</ins><span class="cx"> checksums \
</span><span class="cx"> rmd160 5188b2f1679d6788358067fe761d0c72c475bfe9 \
</span><span class="cx"> sha256 016aaa339ede405bfa55d531069bd64f45fd6139836b6ea9b4d655e2734b8fd6
</span><span class="cx">
</span><span class="cx"> patchfiles patch-project.pro.diff
</span><span class="cx">
</span><del>-# set arch type(s); done is a stage to make sure the 'options
-# qt_arch_types' is evaluated -after- +universal (if selected).
-pre-configure {
- configure.pre_args CONFIG+="${qt_arch_types}"
</del><ins>+post-extract {
+ # generate translation files
+ system -W ${worksrcpath} "${qt_bins_dir}/lrelease project.pro"
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-configure.args APPLICATIONS_DIR="${applications_dir}" \
- DOCDIR="${prefix}/share/doc/${name}" \
- PREFIX="${prefix}" CONFIG+="release" \
- LOCALSOFT="${prefix}"
-configure.cmd ${qt_qmake_cmd}
-configure.post_args
-configure.universal_args
</del><ins>+configure.args-append \
+ LOCALSOFT="${prefix}" \
+ DOCDIR="${prefix}/share/doc/${name}" \
+ APPLICATIONS_DIR="${applications_dir}" \
+ TARGET=${target} \
+ I18NDIR=${applications_dir}/${target}.app/Contents/Resources/i18n
</ins><span class="cx">
</span><del>-# allow ccache, if specified by the user
-pre-build {
- if {[tbool configure.ccache]} {
- build.post_args "CCACHE=ccache"
</del><ins>+post-destroot {
+ # allow app to find external binaries (#16524)
+ foreach bin {dcraw align_image_stack} {
+ ln -s ${prefix}/bin/${bin} ${destroot}${applications_dir}/${target}.app/Contents/MacOS/
</ins><span class="cx"> }
</span><ins>+
+ # allow help menu to find documentation
+ ln -s ${prefix}/share/doc/${name}/html ${destroot}${applications_dir}/${target}.app/Contents/Resources/
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsaquaqtpfsguifilespatchprojectprodiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/qtpfsgui/files/patch-project.pro.diff (149175 => 149176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qtpfsgui/files/patch-project.pro.diff 2016-06-04 20:33:48 UTC (rev 149175)
+++ trunk/dports/aqua/qtpfsgui/files/patch-project.pro.diff 2016-06-04 20:50:45 UTC (rev 149176)
</span><span class="lines">@@ -1,76 +1,94 @@
</span><del>---- project.pro.orig 2010-11-05 12:17:22.000000000 -0400
-+++ project.pro 2010-11-05 12:18:44.000000000 -0400
-@@ -1,5 +1,5 @@
- TEMPLATE = app
--CONFIG += release qt thread
-+CONFIG += qt thread
</del><ins>+--- project.pro.orig 2009-03-29 06:25:15.000000000 -0700
++++ project.pro 2016-06-04 07:52:41.000000000 -0700
+@@ -2,11 +2,9 @@
+ CONFIG += release qt thread
</ins><span class="cx"> DEFINES += QT_NO_DEBUG_OUTPUT
</span><span class="cx">
</span><del>- # Assume openmp-capable g++ (>=4.2)
-@@ -192,7 +192,7 @@
</del><ins>+-# Assume openmp-capable g++ (>=4.2)
+-QMAKE_CXXFLAGS += -funroll-loops -fstrength-reduce -fschedule-insns2 -felide-constructors -frerun-loop-opt -fexceptions -fno-strict-aliasing -fexpensive-optimizations -ffast-math -pipe -fopenmp -msse2
+-QMAKE_LFLAGS += -fopenmp
+-
+-TARGET = qtpfsgui
++isEmpty(TARGET) {
++ error( "TARGET must be set before executing this script; fatal error, bailing out." )
++}
+
+ MOC_DIR = generated_moc
+ OBJECTS_DIR = generated_obj
+@@ -187,12 +185,17 @@
+ message("Qt4, OK")
+ }
+
++########################################### MacPorts Location ###########################################
++isEmpty(LOCALSOFT) {
++ error( "LOCALSOFT must be set before executing this script; fatal error, bailing out." )
++}
++
+ ########################################### EXIV2 ###########################################
+ message ( "" )
</ins><span class="cx"> message ( "Detecting exiv2:" )
</span><span class="cx"> #I think these are the only paths where we have to search for.
</span><span class="cx"> #If your system is more exotic let me know.
</span><span class="cx"> -EXIV2IMAGEHPP = /usr/include/exiv2/image.hpp /usr/local/include/exiv2/image.hpp $$(LOCALSOFT)/include/exiv2/image.hpp
</span><del>-+EXIV2IMAGEHPP = /usr/include/exiv2/image.hpp /usr/local/include/exiv2/image.hpp $${LOCALSOFT}/include/exiv2/image.hpp
</del><ins>++EXIV2IMAGEHPP = $$LOCALSOFT/include/exiv2/image.hpp
</ins><span class="cx"> for(path, EXIV2IMAGEHPP) {
</span><span class="cx"> exists($$path) {
</span><span class="cx"> EXIV2PATH = $$dirname(path)
</span><del>-@@ -218,7 +218,7 @@
</del><ins>+@@ -218,7 +221,7 @@
</ins><span class="cx"> message ( "Detecting OpenEXR:" )
</span><span class="cx"> #I think these are the only paths where we have to search for.
</span><span class="cx"> #If your system is more exotic let me know.
</span><span class="cx"> -OPENEXRHEADER = /usr/include/OpenEXR/ImfHeader.h /usr/local/include/OpenEXR/ImfHeader.h /usr/local/include/ilmbase/ImfHeader.h /usr/include/ilmbase/ImfHeader.h $$(LOCALSOFT)/include/OpenEXR/ImfHeader.h
</span><del>-+OPENEXRHEADER = /usr/include/OpenEXR/ImfHeader.h /usr/local/include/OpenEXR/ImfHeader.h /usr/local/include/ilmbase/ImfHeader.h /usr/include/ilmbase/ImfHeader.h $${LOCALSOFT}/include/OpenEXR/ImfHeader.h
</del><ins>++OPENEXRHEADER = $$LOCALSOFT/include/OpenEXR/ImfHeader.h
</ins><span class="cx"> for(path, OPENEXRHEADER) {
</span><span class="cx"> exists($$path) {
</span><span class="cx"> OPENEXRDIR = $$dirname(path)
</span><del>-@@ -244,7 +244,7 @@
</del><ins>+@@ -244,7 +247,7 @@
</ins><span class="cx"> message ( "Detecting fftw3:" )
</span><span class="cx"> #I think these are the only paths where we have to search for.
</span><span class="cx"> #If your system is more exotic let me know.
</span><span class="cx"> -FFTW3HEADER = /usr/include/fftw3.h /usr/local/include/fftw3.h $$(LOCALSOFT)/include/fftw3.h
</span><del>-+FFTW3HEADER = /usr/include/fftw3.h /usr/local/include/fftw3.h $${LOCALSOFT}/include/fftw3.h
</del><ins>++FFTW3HEADER = $$LOCALSOFT/include/fftw3.h
</ins><span class="cx"> for(path, FFTW3HEADER) {
</span><span class="cx"> exists($$path) {
</span><span class="cx"> FFTW3DIR = $$dirname(path)
</span><del>-@@ -271,7 +271,7 @@
</del><ins>+@@ -271,7 +274,7 @@
</ins><span class="cx"> message ( "Detecting libtiff:" )
</span><span class="cx"> #I think these are the only paths where we have to search for.
</span><span class="cx"> #If your system is more exotic let me know.
</span><span class="cx"> -LIBTIFFHEADER = /usr/include/tiffio.h /usr/local/include/tiffio.h $$(LOCALSOFT)/include/tiffio.h
</span><del>-+LIBTIFFHEADER = /usr/include/tiffio.h /usr/local/include/tiffio.h $${LOCALSOFT}/include/tiffio.h
</del><ins>++LIBTIFFHEADER = $$LOCALSOFT/include/tiffio.h
</ins><span class="cx"> for(path, LIBTIFFHEADER) {
</span><span class="cx"> exists($$path) {
</span><span class="cx"> LIBTIFFDIR = $$dirname(path)
</span><del>-@@ -295,8 +295,12 @@
</del><ins>+@@ -295,7 +298,7 @@
</ins><span class="cx">
</span><span class="cx"> ############################## required by "make install" ########################################
</span><span class="cx"> isEmpty(PREFIX) {
</span><span class="cx"> - PREFIX = /usr/local
</span><span class="cx"> + error( "PREFIX must be set before executing this script; fatal error, bailing out." )
</span><span class="cx"> }
</span><del>-+isEmpty(LOCALSOFT) {
-+ error( "LOCALSOFT must be set before executing this script; fatal error, bailing out." )
-+}
-+
</del><span class="cx"> isEmpty(I18NDIR) {
</span><span class="cx"> mac {
</span><del>- #I18NDIR=(QCoreApplication::applicationDirPath()+\"/i18n\")
-@@ -315,7 +319,11 @@
</del><ins>+@@ -315,7 +318,7 @@
</ins><span class="cx"> HTMLDIR = $${DOCDIR}
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> -target.path = $${PREFIX}/bin
</span><del>-+mac {
-+ target.path = $${APPLICATIONS_DIR}
-+} else {
-+ target.path = $${PREFIX}/bin
-+}
</del><ins>++target.path = $${APPLICATIONS_DIR}
</ins><span class="cx"> menu.files = qtpfsgui.desktop
</span><span class="cx"> menu.path = $${PREFIX}/share/applications
</span><span class="cx"> icon.files = images/qtpfsgui.png
</span><del>-@@ -365,37 +373,8 @@
</del><ins>+@@ -323,7 +326,7 @@
+ htmls.files = html
+ htmls.path = $$HTMLDIR
+ i18n.files = i18n/lang_de.qm i18n/lang_es.qm i18n/lang_it.qm i18n/lang_fr.qm i18n/lang_pl.qm i18n/lang_tr.qm i18n/lang_ru.qm i18n/lang_cs.qm
+-i18n.path = $$I18NDIR
++i18n.path = $${APPLICATIONS_DIR}/$${TARGET}.app/Contents/Resources/i18n
+ docs.files = README LICENSE AUTHORS INSTALL Changelog
+ docs.path = $$DOCDIR
+
+@@ -365,46 +368,8 @@
</ins><span class="cx"> #TODO we have to complete this.
</span><span class="cx"> LIBS+=-lIlmThread
</span><span class="cx">
</span><span class="lines">@@ -105,15 +123,16 @@
</span><span class="cx"> -
</span><span class="cx"> # We like to search the LOCALSOFT/lib explicitly on MacOSX
</span><span class="cx"> -LIBS += -L$$(LOCALSOFT)/lib
</span><del>-+LIBS += -L$${LOCALSOFT}/lib
- # Libtiff depends on jpeg, but it is not searched for automatically on MacOSX
- LIBS += -ljpeg
- # Exiv also depend on libexpat and libiconv, so same as above:
-@@ -418,7 +397,6 @@
</del><ins>+-# Libtiff depends on jpeg, but it is not searched for automatically on MacOSX
+-LIBS += -ljpeg
+-# Exiv also depend on libexpat and libiconv, so same as above:
+-LIBS += -lexpat
+-LIBS += -liconv
+-
+-# for now, we disable openMP on MacOSX - have to wait for support in next
+-# Xcode!
+-QMAKE_CXXFLAGS -= -fopenmp
++LIBS += -L$$LOCALSOFT/lib
+ }
</ins><span class="cx">
</span><del>- # this is just how my MinGW installation is. You gotta change it if you want to compile it in windows.
- CONFIG += windows
--#CONFIG += debug
- CONFIG += console
-
- #OpenEXR available in win32
</del><ins>+ win32 {
</ins></span></pre>
</div>
</div>
</body>
</html>