Revision: 83376 http://trac.macports.org/changeset/83376 Author: dports@macports.org Date: 2011-08-30 16:52:40 -0700 (Tue, 30 Aug 2011) Log Message: ----------- gwenhywfar4: don't overwrite conflicts in subport Modified Paths: -------------- trunk/dports/devel/gwenhywfar4/Portfile Modified: trunk/dports/devel/gwenhywfar4/Portfile =================================================================== --- trunk/dports/devel/gwenhywfar4/Portfile 2011-08-30 23:47:36 UTC (rev 83375) +++ trunk/dports/devel/gwenhywfar4/Portfile 2011-08-30 23:52:40 UTC (rev 83376) @@ -42,7 +42,7 @@ patch.pre_args -p1 if {$subport == $name} { - conflicts gwenhywfar4-gtk + conflicts-append gwenhywfar4-gtk configure.args-append --with-qt4-libs=${prefix}/lib \ --with-qt4-includes=${prefix}/include \ --with-qt4-moc=${prefix}/bin/moc \ @@ -52,7 +52,7 @@ } subport gwenhywfar4-gtk { - conflicts gwenhywfar4 + conflicts-append gwenhywfar4 depends_lib-append port:gtk2 configure.args-append --with-guis=gtk2 --disable-qt4 }