[94274] trunk/dports/graphics

[ryandesign at macports.org]

Revision: 94274
          https://trac.macports.org/changeset/94274
Author:   ryandesign at macports.org
Date:     2012-06-13 12:40:38 -0700 (Wed, 13 Jun 2012)
Log Message:
-----------
mupdf: update to 1.0, which no longer conflicts with poppler or xpdf-tools (#31780); replace a patchfile with an environment variable

Modified Paths:
--------------
    trunk/dports/graphics/mupdf/Portfile
    trunk/dports/graphics/poppler/Portfile
    trunk/dports/graphics/xpdf-tools/Portfile

Removed Paths:
-------------
    trunk/dports/graphics/mupdf/files/

Modified: trunk/dports/graphics/mupdf/Portfile
===================================================================
--- trunk/dports/graphics/mupdf/Portfile	2012-06-13 19:11:00 UTC (rev 94273)
+++ trunk/dports/graphics/mupdf/Portfile	2012-06-13 19:40:38 UTC (rev 94274)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 
 name                mupdf
-conflicts           poppler xpdf-tools
-version             0.9
+version             1.0
 categories          graphics
 platforms           darwin
 maintainers         nomaintainer
@@ -30,10 +29,10 @@
 homepage            http://www.mupdf.com/
 
 master_sites        googlecode
-distfiles           [suffix ${name}-${version}-source]
+distname            ${name}-${version}-source
 
-checksums           rmd160  9ba1df205f9f95c7ff4b0a3be224786ad5a65d99 \
-                    sha256  abed825cb1d73e0e28f0a7ee72b5d7a451ba41d21b0c55837ed2a212f3b16b2d
+checksums           rmd160  7820cf68552d64c52c7d08cdcf5a1965df39bd42 \
+                    sha256  4f5e12625f7f827f6eb5606026c9a7a7dbdeaf935fcea3bc173ed8d469698ec2
 
 depends_build       port:pkgconfig
 
@@ -44,13 +43,12 @@
                     port:xorg-libXext \
                     port:zlib
 
-patchfiles          patch-Makerules.diff
-
 use_configure       no
 
 build.env           CC="${configure.cc}" \
                     CFLAGS="${configure.cflags} ${configure.cppflags} [get_canonical_archflags]" \
                     LDFLAGS="${configure.ldflags} [get_canonical_archflags]" \
+                    OS=Linux \
                     verbose=1
 
 destroot.destdir    prefix=${destroot}${prefix}

Modified: trunk/dports/graphics/poppler/Portfile
===================================================================
--- trunk/dports/graphics/poppler/Portfile	2012-06-13 19:11:00 UTC (rev 94273)
+++ trunk/dports/graphics/poppler/Portfile	2012-06-13 19:40:38 UTC (rev 94274)
@@ -5,7 +5,7 @@
 PortGroup  muniversal 1.0
 
 name        poppler
-conflicts   mupdf xpdf-tools
+conflicts   xpdf-tools
 version     0.18.4
 revision    5
 license     GPL-2+

Modified: trunk/dports/graphics/xpdf-tools/Portfile
===================================================================
--- trunk/dports/graphics/xpdf-tools/Portfile	2012-06-13 19:11:00 UTC (rev 94273)
+++ trunk/dports/graphics/xpdf-tools/Portfile	2012-06-13 19:40:38 UTC (rev 94274)
@@ -14,7 +14,7 @@
 
 ## conflicts with poppler until poppler renames its CLI tools
 ##  (then conflicts w/ poppler-tools if it gets created)
-conflicts       mupdf poppler
+conflicts       poppler
 
 supported_archs noarch
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120613/d99c160b/attachment-0001.html>