Date: Mon, 24 Mar 2008 14:40:03 GMT From: Jason Bacon <jwbacon@tds.net> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/121126: New port: science/caret Computerized Anatomical Reconstruction and Editing Toolkit Message-ID: <200803241440.m2OEe3UG012064@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/121126; it has been noted by GNATS.
From: Jason Bacon <jwbacon@tds.net>
To: bug-followup@freebsd.org, bacon@smithers.neuro.mcw.edu
Cc:
Subject: Re: ports/121126: New port: science/caret Computerized Anatomical Reconstruction and Editing Toolkit
Date: Mon, 24 Mar 2008 09:36:09 -0500
--Boundary-00=_Zx75Ho0kH0mi7Wx
Content-Type: text/plain;
charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Patch for flat_fluid attached. Should be ready to commit now.
Jason
--Boundary-00=_Zx75Ho0kH0mi7Wx
Content-Type: text/x-diff;
charset="us-ascii";
name="caret.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="caret.patch"
diff -ruN caret.orig/Makefile caret/Makefile
--- caret.orig/Makefile 2008-03-24 09:30:49.000000000 -0500
+++ caret/Makefile 2008-03-21 10:59:40.000000000 -0500
@@ -71,7 +71,16 @@
.endif
.if defined(WITH_FLAT_FLUID)
+LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas
+
+PLIST_FILES+= bin/flat_fluid
+
+post-patch:
+ ${REINPLACE_CMD} "s|-latlas|-latlas -lgfortran|" ${WRKSRC}/flat_fluid/Makefile.FreeBSD
+ ${REINPLACE_CMD} "s|brainSet->getCaretHomeDirectory()|\"${PREFIX}\"|" ${WRKSRC}/caret_brain_set/BrainModelRunCaretUtilityProgram.cxx
+
post-build:
+ (d=`ls -d /usr/local/lib/gcc*`; ${REINPLACE_CMD} "s|-L /usr/local/lib|-L${LOCALBASE}/lib -L$${d} -rpath $${d}|" ${WRKSRC}/flat_fluid/Makefile.FreeBSD)
(cd ${WRKSRC}/flat_fluid; ${MAKE} -f Makefile.FreeBSD)
.endif
diff -ruN caret.orig/files/patch-caret_brain_set-BrainModelRunCaretUtilityProgram.cxx caret/files/patch-caret_brain_set-BrainModelRunCaretUtilityProgram.cxx
--- caret.orig/files/patch-caret_brain_set-BrainModelRunCaretUtilityProgram.cxx 1969-12-31 18:00:00.000000000 -0600
+++ caret/files/patch-caret_brain_set-BrainModelRunCaretUtilityProgram.cxx 2008-03-21 10:58:01.000000000 -0500
@@ -0,0 +1,11 @@
+--- caret_brain_set/BrainModelRunCaretUtilityProgram.cxx.orig 2008-03-21 10:56:47.000000000 -0500
++++ caret_brain_set/BrainModelRunCaretUtilityProgram.cxx 2008-03-21 10:56:59.000000000 -0500
+@@ -101,7 +101,7 @@
+ // On a Macintosh, Qt's QProcess expects the program to be a Mac Application bundle so
+ // simple command line programs have to be specially handled on the Mac.
+ //
+- if (doingMacCommandLineProgram) {
++ if (1) {
+ if (utilityProgramArguments.isEmpty() == false) {
+ pgm.append(" ");
+ pgm.append(utilityProgramArguments);
--Boundary-00=_Zx75Ho0kH0mi7Wx--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200803241440.m2OEe3UG012064>