[77166] trunk/dports/graphics/xpdf

ryandesign at macports.org ryandesign at macports.org
Mon Mar 21 08:58:55 PDT 2011


Revision: 77166
          http://trac.macports.org/changeset/77166
Author:   ryandesign at macports.org
Date:     2011-03-21 08:58:53 -0700 (Mon, 21 Mar 2011)
Log Message:
-----------
xpdf: update to 3.02pl5; advertise the patchlevel in the version number instead of hiding it behind the port revision; handle patchfiles as patchfiles not as distfiles

Modified Paths:
--------------
    trunk/dports/graphics/xpdf/Portfile
    trunk/dports/graphics/xpdf/files/patch-xpdf-NameToUnicodeTable.h.diff
    trunk/dports/graphics/xpdf/files/patch-xpdf-UnicodeMapTables.h.diff
    trunk/dports/graphics/xpdf/files/xpdf-3.02-salvage-your-eye.patch

Modified: trunk/dports/graphics/xpdf/Portfile
===================================================================
--- trunk/dports/graphics/xpdf/Portfile	2011-03-21 15:45:21 UTC (rev 77165)
+++ trunk/dports/graphics/xpdf/Portfile	2011-03-21 15:58:53 UTC (rev 77166)
@@ -3,8 +3,8 @@
 PortSystem 1.0
 
 name         xpdf
-version      3.02
-revision     8
+set base_version    3.02
+version      ${base_version}pl5
 description  Xpdf is a viewer for PDF files.
 long_description \
     Xpdf is a viewer for Portable Document Format \
@@ -31,50 +31,49 @@
     ftp://ftp.chg.ru/pub/TeX/CTAN/support/xpdf/ \
     ftp://ftp.foolabs.com/pub/xpdf/
 
-## checksums    md5 599dc4cc65a07ee868cf92a667a913d2
+distname     ${name}-${base_version}
 
-set xpdfmain ${distname}${extract.suffix}
-distfiles    ${xpdfmain}	\
-             xpdf-${version}pl1.patch	\
-             xpdf-${version}pl2.patch	\
-             xpdf-${version}pl3.patch
-
-checksums           xpdf-${version}.tar.gz \
+checksums           ${distfiles} \
                     md5     599dc4cc65a07ee868cf92a667a913d2 \
                     sha1    f9940698840c8a8045677e8be68ab8580903e20a \
                     rmd160  e900cb8670b8c430beaa45895fb474411cb1958d \
-                    xpdf-${version}pl1.patch \
+                    ${distname}pl1.patch \
                     md5     877118786dfe27d1b7aa5a6759cc6e45 \
                     sha1    cd3c8ed6e1fd3606098b85d5cc8a7d1aa305266d \
                     rmd160  5c310f96760f72e9c1062b00c57c2ed035ac6757 \
-                    xpdf-${version}pl2.patch \
+                    ${distname}pl2.patch \
                     md5     3a5cb165ae66781e0b21e6219ae06795 \
                     sha1    d082ebe0d36cad0c04603950216f5c52de1c2593 \
                     rmd160  0024e3d203d69e073a458570cec5679e260ad204 \
-                    xpdf-${version}pl3.patch \
+                    ${distname}pl3.patch \
                     md5     581963ede0fb5715e1a69f01b5b8ce63 \
                     sha1    23f496804802a3da530f1d0bab894bae3e938fc2 \
-                    rmd160  859ec3131d3c4526a6075ee639c5eb704194211b
+                    rmd160  859ec3131d3c4526a6075ee639c5eb704194211b \
+                    xpdf-3.02pl4.patch \
+                    md5     70b752716798dd341a4bf890df5f6fdc \
+                    sha1    1aa3087a1c7882884ae7d3a502240a55acca65fd \
+                    rmd160  428065e8c9639b6799705b216be603f52efb8a22 \
+                    xpdf-3.02pl5.patch \
+                    md5     504902ca5e9d66c67eed03636ec6b163 \
+                    sha1    0acd49e73bba47fa1ec7b479eb8f1398a33eabbc \
+                    rmd160  f502a7c5311e935f3e4a5fd5b770b44e68c09a7a
 
-extract.only ${xpdfmain}
-
 depends_lib \
 	port:xorg-libXp port:xpm port:xorg-libXt port:freetype \
 	port:libpaper lib:libXm:openmotif port:t1lib
 
 depends_run  path:share/ghostscript/fonts:ghostscript
 
-patchfiles   xpdf-${version}-salvage-your-eye.patch \
+patch.post_args     -p1
+patchfiles   ${distname}pl1.patch \
+             ${distname}pl2.patch \
+             ${distname}pl3.patch \
+             ${distname}pl4.patch \
+             ${distname}pl5.patch \
+             ${distname}-salvage-your-eye.patch \
              patch-xpdf-NameToUnicodeTable.h.diff \
              patch-xpdf-UnicodeMapTables.h.diff
 
-
-pre-patch {
-			system "cd ${workpath} && patch -p0 < ${distpath}/xpdf-${version}pl1.patch"
-			system "cd ${workpath} && patch -p0 < ${distpath}/xpdf-${version}pl2.patch"
-			system "cd ${workpath} && patch -p0 < ${distpath}/xpdf-${version}pl3.patch"
-}
-
 post-patch {
     reinplace "s|/usr/local|${prefix}|g" \
         ${worksrcpath}/doc/sample-xpdfrc ${worksrcpath}/xpdf/GlobalParams.cc

Modified: trunk/dports/graphics/xpdf/files/patch-xpdf-NameToUnicodeTable.h.diff
===================================================================
--- trunk/dports/graphics/xpdf/files/patch-xpdf-NameToUnicodeTable.h.diff	2011-03-21 15:45:21 UTC (rev 77165)
+++ trunk/dports/graphics/xpdf/files/patch-xpdf-NameToUnicodeTable.h.diff	2011-03-21 15:58:53 UTC (rev 77166)
@@ -1,5 +1,5 @@
---- xpdf/NameToUnicodeTable.h.orig	2007-02-27 14:05:52.000000000 -0800
-+++ xpdf/NameToUnicodeTable.h	2009-01-15 18:08:24.000000000 -0800
+--- a/xpdf/NameToUnicodeTable.h.orig	2007-02-27 14:05:52.000000000 -0800
++++ b/xpdf/NameToUnicodeTable.h	2009-01-15 18:08:24.000000000 -0800
 @@ -1093,5 +1093,8 @@
    {0x007c, "|"},
    {0x007d, "}"},

Modified: trunk/dports/graphics/xpdf/files/patch-xpdf-UnicodeMapTables.h.diff
===================================================================
--- trunk/dports/graphics/xpdf/files/patch-xpdf-UnicodeMapTables.h.diff	2011-03-21 15:45:21 UTC (rev 77165)
+++ trunk/dports/graphics/xpdf/files/patch-xpdf-UnicodeMapTables.h.diff	2011-03-21 15:58:53 UTC (rev 77166)
@@ -1,5 +1,5 @@
---- xpdf/UnicodeMapTables.h.orig	2007-02-27 14:05:52.000000000 -0800
-+++ xpdf/UnicodeMapTables.h	2009-01-16 10:26:16.000000000 -0800
+--- a/xpdf/UnicodeMapTables.h.orig	2007-02-27 14:05:52.000000000 -0800
++++ b/xpdf/UnicodeMapTables.h	2009-01-16 10:26:16.000000000 -0800
 @@ -25,6 +25,7 @@
    { 0x0178, 0x0178, 0x59, 1 },
    { 0x017d, 0x017d, 0x5a, 1 },

Modified: trunk/dports/graphics/xpdf/files/xpdf-3.02-salvage-your-eye.patch
===================================================================
--- trunk/dports/graphics/xpdf/files/xpdf-3.02-salvage-your-eye.patch	2011-03-21 15:45:21 UTC (rev 77165)
+++ trunk/dports/graphics/xpdf/files/xpdf-3.02-salvage-your-eye.patch	2011-03-21 15:58:53 UTC (rev 77166)
@@ -1,6 +1,5 @@
-diff -Nur xpdf-3.02-orig/xpdf/SecurityHandler.cc xpdf-3.02/xpdf/SecurityHandler.cc
---- xpdf/SecurityHandler.cc	2007-02-27 23:05:52.000000000 +0100
-+++ xpdf/SecurityHandler.cc	2007-06-05 12:23:37.000000000 +0200
+--- a/xpdf/SecurityHandler.cc.orig	2007-02-27 23:05:52.000000000 +0100
++++ b/xpdf/SecurityHandler.cc	2007-06-05 12:23:37.000000000 +0200
 @@ -373,9 +373,6 @@
      return gFalse;
    }
@@ -11,10 +10,9 @@
    if (!(*xsh->getKey)(xsh->handlerData, docData, &key, &length, &encVersion)) {
      return gFalse;
    }
-diff -Nur xpdf-3.02-orig/xpdf/XRef.cc xpdf-3.02/xpdf/XRef.cc
---- xpdf/XRef.cc	2007-02-27 23:05:52.000000000 +0100
-+++ xpdf/XRef.cc	2007-06-05 12:26:31.000000000 +0200
-@@ -771,19 +771,19 @@
+--- a/xpdf/XRef.cc.orig	2007-02-27 23:05:52.000000000 +0100
++++ b/xpdf/XRef.cc	2007-06-05 12:26:31.000000000 +0200
+@@ -782,19 +782,19 @@
  }
  
  GBool XRef::okToPrint(GBool ignoreOwnerPW) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110321/c72e4a12/attachment-0001.html>


More information about the macports-changes mailing list