[101079] trunk/dports

[mfeiri at macports.org]

Revision: 101079
          https://trac.macports.org/changeset/101079
Author:   mfeiri at macports.org
Date:     2013-01-03 17:13:40 -0800 (Thu, 03 Jan 2013)
Log Message:
-----------
conflict between libpftputil and libc-headers

Modified Paths:
--------------
    trunk/dports/devel/libc-headers/Portfile
    trunk/dports/net/libpftputil/Portfile

Modified: trunk/dports/devel/libc-headers/Portfile
===================================================================
--- trunk/dports/devel/libc-headers/Portfile	2013-01-04 01:02:24 UTC (rev 101078)
+++ trunk/dports/devel/libc-headers/Portfile	2013-01-04 01:13:40 UTC (rev 101079)
@@ -20,6 +20,7 @@
 checksums               rmd160  5ad9e1168ff3ca60940e40e84505f0660c3ce15d \
                         sha256  1de4e3dcce08c907d1593e8ff941b8400ffaf5e5badb4aad504d7ba80f507b43
 
+conflicts               libpftputil
 depends_build           path:bin/unifdef:developer_cmds
 
 use_configure           no

Modified: trunk/dports/net/libpftputil/Portfile
===================================================================
--- trunk/dports/net/libpftputil/Portfile	2013-01-04 01:02:24 UTC (rev 101078)
+++ trunk/dports/net/libpftputil/Portfile	2013-01-04 01:13:40 UTC (rev 101079)
@@ -15,4 +15,5 @@
 checksums		md5 777a8fce0a53f4044b8a1261d243f6d1
 patchfiles		patch-parse_utils.c
 
+conflicts		libc-headers
 depends_lib		lib:libpftp:libpftp
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130103/35c7204f/attachment.html>