[73295] trunk/dports/graphics

[ricci at macports.org]

Revision: 73295
          http://trac.macports.org/changeset/73295
Author:   ricci at macports.org
Date:     2010-11-09 12:02:07 -0800 (Tue, 09 Nov 2010)
Log Message:
-----------
adjust xpdf to install its CLI tools with mangled names (xpdf-*), add variant no_mangle_names to not do so.
add new port xpdf-tools, makes links from xpdf CLI tools fromt heir xpdf-* names to "plain" names
adjust poppler port to conflict with xpdf-tools

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

Added Paths:
-----------
    trunk/dports/graphics/xpdf-tools/
    trunk/dports/graphics/xpdf-tools/Portfile

Modified: trunk/dports/graphics/poppler/Portfile
===================================================================
--- trunk/dports/graphics/poppler/Portfile	2010-11-09 19:59:43 UTC (rev 73294)
+++ trunk/dports/graphics/poppler/Portfile	2010-11-09 20:02:07 UTC (rev 73295)
@@ -30,6 +30,8 @@
     port:openjpeg \
     port:poppler-data
 
+conflicts   port:xpdf-tools
+
 post-patch {
     reinplace "s|\$includedir|${prefix}/include|g" \
         ${worksrcpath}/configure

Modified: trunk/dports/graphics/xpdf/Portfile
===================================================================
--- trunk/dports/graphics/xpdf/Portfile	2010-11-09 19:59:43 UTC (rev 73294)
+++ trunk/dports/graphics/xpdf/Portfile	2010-11-09 20:02:07 UTC (rev 73295)
@@ -4,7 +4,7 @@
 
 name         xpdf
 version      3.02
-revision     7
+revision     8
 description  Xpdf is a viewer for PDF files.
 long_description \
     Xpdf is a viewer for Portable Document Format \
@@ -60,7 +60,7 @@
 
 depends_lib \
 	port:xorg-libXp port:xpm port:xorg-libXt port:freetype \
-	port:poppler port:libpaper lib:libXm:openmotif port:t1lib
+	port:libpaper lib:libXm:openmotif port:t1lib
 
 depends_run  path:share/ghostscript/fonts:ghostscript
 
@@ -121,11 +121,18 @@
     patchfiles-delete xpdf-${version}-salvage-your-eye.patch
 }
 
+variant no_mangle_names description {do not mangle the CLI tool names, conflicts with poppler} {
+	conflicts-append port:poppler
+}
+
 post-destroot {
-    foreach i { pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext } {
-        delete ${destroot}${prefix}/bin/${i}
-        delete ${destroot}${prefix}/share/man/man1/${i}.1
-    }
+	if {! [variant_isset no_mangle_names]} {
+		## rename the CLI tools to xpdf-${TOOL_NAME} to avoid conflicts with poppler
+		foreach binFile { pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext } {
+			move ${destroot}${prefix}/bin/${binFile}  ${destroot}${prefix}/bin/${name}-${binFile}
+			move ${destroot}${prefix}/share/man/man1/${binFile}.1 ${destroot}${prefix}/share/man/man1/${name}-${binFile}.1
+		}
+	}
 }
 
 post-install {

Added: trunk/dports/graphics/xpdf-tools/Portfile
===================================================================
--- trunk/dports/graphics/xpdf-tools/Portfile	                        (rev 0)
+++ trunk/dports/graphics/xpdf-tools/Portfile	2010-11-09 20:02:07 UTC (rev 73295)
@@ -0,0 +1,47 @@
+# -*- 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
+
+name            xpdf-tools
+## keep version in sync w/ xpdf
+version         3.02
+revision        0
+categories      graphics print
+maintainers     ricci openmaintainer
+platforms       darwin
+homepage        http://www.foolabs.com/xpdf/
+
+## conflicts with poppler until poppler renames its CLI tools
+##  (then conflicts w/ poppler-tools if it gets created)
+conflicts       port:poppler
+
+supported_archs noarch
+
+description         Wrapper port for xpdf CLI tools
+long_description    ${description}
+
+distfiles
+
+depends_lib     port:xpdf
+
+use_configure       no
+build {}
+
+##
+## Note:  the destroot section below currently uses lists of files
+##   to know what files to link.  In the future we can use
+##   something like:
+##     set contents_list [registry_port_registered $portname])
+##   to get the lists of binaries and man pages installed by
+##   the xpdf port.
+##
+destroot {
+    foreach binFile { pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext } {
+        ln -s xpdf-${binFile} ${destroot}${prefix}/bin/${binFile}
+        ln -s xpdf-${binFile}.1 ${destroot}${prefix}/share/man/man1/${binFile}.1
+    }
+}
+
+
+livecheck.type     none


Property changes on: trunk/dports/graphics/xpdf-tools/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101109/b9e1712d/attachment.html>