[macports] updated some conflicts and dependencies for jsbsim and gcc…

…-arm-embedded
paparazzi · Mar 8, 2013 · 14dcace · 14dcace
1 parent 2dfd09c
commit 14dcace
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/darwin/macports/ports/cross/gcc-arm-embedded/Portfile b/darwin/macports/ports/cross/gcc-arm-embedded/Portfile
@@ -20,6 +20,12 @@ distfiles               ${distfilename}-${distfilenamedate}-mac.tar.bz2
 use_bzip2               yes
 checksums               md5     fcfe3aecbfe77c1e5985845fbe722aac
 
+# Uses the same directory names
+conflicts               arm-none-eabi-binutils \
+                        arm-none-eabi-gcc \
+                        arm-none-eabi-gcc-linaro \
+                        arm-none-eabi-gdb
+
 # All cross ports violate the mtree layout.
 destroot.violate_mtree  yes
 

diff --git a/darwin/macports/ports/devel/jsbsim/Portfile b/darwin/macports/ports/devel/jsbsim/Portfile
@@ -13,9 +13,12 @@ homepage                http://jsbsim.sourceforge.net/
 fetch.type              cvs
 cvs.root                :pserver:anonymous@jsbsim.cvs.sourceforge.net:/cvsroot/jsbsim
 cvs.date                "12-June-2012"
-cvs.module 		JSBSim
+cvs.module 		      JSBSim
 
-worksrcdir		JSBSim 
+depends_lib-append      port:autoconf \
+                        port:automake
+
+worksrcdir		      JSBSim 
 
 patchfiles              patch-src-Makefile-am.diff \
                         patch-src-initialization-Makefile-am.diff \