[109517] trunk/dports

[cal at macports.org]

Revision: 109517
          https://trac.macports.org/changeset/109517
Author:   cal at macports.org
Date:     2013-08-16 15:19:47 -0700 (Fri, 16 Aug 2013)
Log Message:
-----------
hs-template-haskell: delete, provided by ghc, add deactivate hack, remove all dependencies

Modified Paths:
--------------
    trunk/dports/devel/hs-data-accessor-template/Portfile
    trunk/dports/lang/ghc/Portfile

Removed Paths:
-------------
    trunk/dports/devel/hs-template-haskell/

Modified: trunk/dports/devel/hs-data-accessor-template/Portfile
===================================================================
--- trunk/dports/devel/hs-data-accessor-template/Portfile	2013-08-16 22:08:01 UTC (rev 109516)
+++ trunk/dports/devel/hs-data-accessor-template/Portfile	2013-08-16 22:19:47 UTC (rev 109517)
@@ -5,6 +5,7 @@
 PortGroup           haskell 1.0
 
 haskell.setup       data-accessor-template 0.2.1.10
+revision            1
 checksums           rmd160  e8ab0a4be533b0dcef4f4c88165c514110ab1cd1 \
                     sha256  fe3b5588b1101ab5dac3a8ad7379c0ccb54374371d36a0a93df45e721e604485
 
@@ -18,5 +19,4 @@
     Haskell functions.
 
 depends_lib-append  port:hs-data-accessor \
-                    port:hs-template-haskell \
                     port:hs-utility-ht

Modified: trunk/dports/lang/ghc/Portfile
===================================================================
--- trunk/dports/lang/ghc/Portfile	2013-08-16 22:08:01 UTC (rev 109516)
+++ trunk/dports/lang/ghc/Portfile	2013-08-16 22:19:47 UTC (rev 109517)
@@ -143,6 +143,12 @@
         # force deactivation
         registry_deactivate_composite hs-process "" [list ports_nodepcheck 1]
     }
+    # Legacy port deactivation hack added 2013-08-14, hs-template-haskell is provided by base
+    if {![catch {set hs_template_haskell_installed [lindex [registry_active hs-template-haskell] 0]}]} {
+        # hs-template-haskell is installed and active
+        # force deactivation
+        registry_deactivate_composite hs-template-haskell "" [list ports_nodepcheck 1]
+    }
 }
 
 post-activate {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130816/193a67ba/attachment.html>