[40734] trunk/dports/textproc/pandoc

[gwright at macports.org]

Revision: 40734
          http://trac.macports.org/changeset/40734
Author:   gwright at macports.org
Date:     2008-10-13 09:23:30 -0700 (Mon, 13 Oct 2008)
Log Message:
-----------
Make sure the right ghc and ghc-pkg are found and fix port lint
warnings.  Part of general ghc housecleaning in preparation for 6.10.

Modified Paths:
--------------
    trunk/dports/textproc/pandoc/Portfile

Added Paths:
-----------
    trunk/dports/textproc/pandoc/files/patch-Text-Pandoc-Definition.hs.diff

Removed Paths:
-------------
    trunk/dports/textproc/pandoc/files/patch-Text-Pandoc-Definition.hs

Modified: trunk/dports/textproc/pandoc/Portfile
===================================================================
--- trunk/dports/textproc/pandoc/Portfile	2008-10-13 15:10:47 UTC (rev 40733)
+++ trunk/dports/textproc/pandoc/Portfile	2008-10-13 16:23:30 UTC (rev 40734)
@@ -1,6 +1,6 @@
 # $Id$
 
-PortSystem          1.0
+PortSystem 1.0
 
 name                pandoc
 version             0.46
@@ -20,12 +20,14 @@
 checksums           md5 9a92a800678767393adab6eb1b69c04b
 depends_build       port:ghc port:haddock
 depends_lib         port:gmp
-patchfiles          patch-Text-Pandoc-Definition.hs
+patchfiles          patch-Text-Pandoc-Definition.hs.diff
 
 use_configure       no
-build.args          PREFIX=${prefix}
+build.args          PREFIX=${prefix} GHC=${prefix}/bin/ghc GHC_PKG=${prefix}/bin/ghc-pkg
 build.target        build-all
 
+test.run	    yes
+
 destroot            {
   # install pandoc executable, libraries, and library documentation:
   system "(cd ${worksrcpath}; ./setup copy --destdir=${destroot})"

Deleted: trunk/dports/textproc/pandoc/files/patch-Text-Pandoc-Definition.hs
===================================================================
--- trunk/dports/textproc/pandoc/files/patch-Text-Pandoc-Definition.hs	2008-10-13 15:10:47 UTC (rev 40733)
+++ trunk/dports/textproc/pandoc/files/patch-Text-Pandoc-Definition.hs	2008-10-13 16:23:30 UTC (rev 40734)
@@ -1,12 +0,0 @@
---- Text/Pandoc/Definition.hs.orig	2008-04-03 20:59:27.000000000 -0700
-+++ Text/Pandoc/Definition.hs	2008-04-03 20:59:46.000000000 -0700
-@@ -89,7 +89,8 @@
- -- | Type of quotation marks to use in Quoted inline.
- data QuoteType = SingleQuote | DoubleQuote deriving (Show, Eq, Read)
- 
--type Target = (String, String)  -- ^ Link target (URL, title)
-+-- | Link target (URL, title).
-+type Target = (String, String)
- 
- -- | Inline elements.
- data Inline 

Copied: trunk/dports/textproc/pandoc/files/patch-Text-Pandoc-Definition.hs.diff (from rev 40701, trunk/dports/textproc/pandoc/files/patch-Text-Pandoc-Definition.hs)
===================================================================
--- trunk/dports/textproc/pandoc/files/patch-Text-Pandoc-Definition.hs.diff	                        (rev 0)
+++ trunk/dports/textproc/pandoc/files/patch-Text-Pandoc-Definition.hs.diff	2008-10-13 16:23:30 UTC (rev 40734)
@@ -0,0 +1,12 @@
+--- Text/Pandoc/Definition.hs.orig	2008-04-03 20:59:27.000000000 -0700
++++ Text/Pandoc/Definition.hs	2008-04-03 20:59:46.000000000 -0700
+@@ -89,7 +89,8 @@
+ -- | Type of quotation marks to use in Quoted inline.
+ data QuoteType = SingleQuote | DoubleQuote deriving (Show, Eq, Read)
+ 
+-type Target = (String, String)  -- ^ Link target (URL, title)
++-- | Link target (URL, title).
++type Target = (String, String)
+ 
+ -- | Inline elements.
+ data Inline 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20081013/91da60f9/attachment.html