[142233] trunk/dports

[dstrubbe at macports.org]

Revision: 142233
          https://trac.macports.org/changeset/142233
Author:   dstrubbe at macports.org
Date:     2015-11-07 10:15:13 -0800 (Sat, 07 Nov 2015)
Log Message:
-----------
xemacs, ctags: Remove conflict, making ctags a dependent of xemacs, and deleting from xemacs destroot the files that would conflict.

Modified Paths:
--------------
    trunk/dports/devel/ctags/Portfile
    trunk/dports/editors/xemacs/Portfile

Modified: trunk/dports/devel/ctags/Portfile
===================================================================
--- trunk/dports/devel/ctags/Portfile	2015-11-07 17:57:38 UTC (rev 142232)
+++ trunk/dports/devel/ctags/Portfile	2015-11-07 18:15:13 UTC (rev 142233)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
 PortSystem 1.0
@@ -10,7 +11,7 @@
 license          GPL-2
 
 # developer_cmds installs BSD ctags.
-conflicts        developer_cmds xemacs
+conflicts        developer_cmds
 
 description      Reimplementation of ctags(1)
 long_description \

Modified: trunk/dports/editors/xemacs/Portfile
===================================================================
--- trunk/dports/editors/xemacs/Portfile	2015-11-07 17:57:38 UTC (rev 142232)
+++ trunk/dports/editors/xemacs/Portfile	2015-11-07 18:15:13 UTC (rev 142233)
@@ -4,7 +4,7 @@
 PortSystem      1.0
 
 name            xemacs
-conflicts       emacs ctags
+conflicts       emacs
 version         21.5.16
 set sumo_date   2010-07-27
 categories      editors x11
@@ -65,6 +65,7 @@
 
 depends_lib     port:libpng port:Xaw3d port:ncurses port:gdbm port:jpeg \
                 port:tiff port:compface port:gettext port:zlib port:xorg-libXaw
+depends_run     port:ctags
 
 destroot.args   prefix=${destroot}${prefix} mandir=${destroot}${prefix}/share/man/man1
 
@@ -81,6 +82,10 @@
         ui_debug "Installing sumo distribution into destroot"
         file copy ${workpath}/xemacs-packages ${xemacs_lib}
     }
+
+    # avoid conflicts with ctags port
+    delete ${destroot}${prefix}/bin/ctags
+    delete ${destroot}${prefix}/share/man/man1/ctags.1
 }
 
 variant no_sumo \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/a71622aa/attachment.html>