[65644] trunk/dports/tex/pTeX

takanori at macports.org takanori at macports.org
Mon Mar 29 12:05:06 PDT 2010


Revision: 65644
          http://trac.macports.org/changeset/65644
Author:   takanori at macports.org
Date:     2010-03-29 12:05:05 -0700 (Mon, 29 Mar 2010)
Log Message:
-----------
pTeX:
 - Update dvipdfmx to the snapshot 20100328.
 - Added newer CMap files distributed from Adobe.
   http://opensource.adobe.com/wiki/display/pdfmapping/Downloads
 - dvipdfm: Allow building with libpng 1.4.x

Modified Paths:
--------------
    trunk/dports/tex/pTeX/Portfile
    trunk/dports/tex/pTeX/files/patch-1check-archive.sh.diff
    trunk/dports/tex/pTeX/files/patch-2extract-src.sh.diff
    trunk/dports/tex/pTeX/files/patch-7font-search.sh.diff
    trunk/dports/tex/pTeX/files/patch-md5sum_texsrc.traditional.diff

Added Paths:
-----------
    trunk/dports/tex/pTeX/files/archive/dvipdfm-png14.diff

Modified: trunk/dports/tex/pTeX/Portfile
===================================================================
--- trunk/dports/tex/pTeX/Portfile	2010-03-29 19:01:44 UTC (rev 65643)
+++ trunk/dports/tex/pTeX/Portfile	2010-03-29 19:05:05 UTC (rev 65644)
@@ -3,10 +3,10 @@
 PortSystem      1.0
 
 name            pTeX
-version         20100328
+version         20100330
 epoch           ${version}
 set ver_ptetex3     20080616
-set ver_dvipdfmx    20090708
+set ver_dvipdfmx    20100328
 set ver_dvipsk      5.97-p1.7b-20090509
 set ver_jsclasses   100314
 set ver_txfonts     3.2.1
@@ -43,7 +43,9 @@
                 jsclasses-${ver_jsclasses}.zip:jsclasses \
                 txfonts-${ver_txfonts}.zip:misc \
                 pxfonts-${ver_pxfonts}.zip:misc \
-                cmap-gs871.tar.gz:misc
+                cmap-gs871.tar.gz:misc \
+                mappingresources4pdf_2unicode-20091208.tar.Z:misc \
+                mappingresources4pdf_other-20091208.tar.Z:misc
 patchfiles      patch-1check-archive.sh.diff \
                 patch-2extract-src.sh.diff \
                 patch-3extract-texmf.sh.diff \
@@ -55,18 +57,21 @@
 checksums       tetex-src-3.0.tar.gz            rmd160 15a139f5f36993e4ed3583260e175cfb13ce7bcc \
                 tetex-texmf-3.0po.tar.gz        rmd160 a1e87733fa3cbef04e39a690ed8549aeaaddb241 \
                 ${distname}${extract.suffix}    rmd160 50bcf8986d1cb5f23e578ba97d7ade20bb05f3a2 \
-                dvipdfmx-${ver_dvipdfmx}.tar.gz rmd160 41b57a20264a569222f3b59ac023dff427e2fddf \
+                dvipdfmx-${ver_dvipdfmx}.tar.gz rmd160 40a41a03776b5f4579b75e94ad2ac85d3742074e \
                 dvipsk-${ver_dvipsk}.tar.gz     rmd160 c15135bcd4c01143a921d5eaeadd43247738289e \
                 jsclasses-${ver_jsclasses}.zip  rmd160 7e2704ca941fa6e4cd4e0d200fd3387b4052f4e0 \
                 txfonts-${ver_txfonts}.zip      rmd160 e0881b33012ae10a7557ee773439df62e600e56d \
                 pxfonts-${ver_pxfonts}.zip      rmd160 9a2e8df4b779dab2c93704f0716f3d69dcbac6fe \
-                cmap-gs871.tar.gz               rmd160 1fb4a51914f6b17050d984414e0490d9a5e6edc9
+                cmap-gs871.tar.gz               rmd160 1fb4a51914f6b17050d984414e0490d9a5e6edc9 \
+                mappingresources4pdf_2unicode-20091208.tar.Z rmd160 bc1b86e6a5f0e022f88070195eb3e01e167114a7 \
+                mappingresources4pdf_other-20091208.tar.Z    rmd160 1e2ea9af6be8b60c9a54963e542fa06ceb2daccd
 
 depends_lib     bin:perl:perl5 \
                 port:gd2 \
                 port:ghostscript-fonts-hiragino \
                 port:jpeg \
                 port:libiconv \
+                port:libpaper \
                 port:libpng \
                 port:ncurses \
                 port:t1lib \
@@ -91,7 +96,12 @@
 
 extract.only    ${distname}${extract.suffix}
 post-extract {
-    system "cd ${worksrcpath} && gzip -dc ${distpath}/cmap-gs871.tar.gz | tar --no-same-owner -xf -"
+    foreach f {cmap-gs871.tar.gz
+               mappingresources4pdf_2unicode-20091208.tar.Z
+               mappingresources4pdf_other-20091208.tar.Z} {
+        system "cd ${worksrcpath} && gzip -dc ${distpath}/${f} | tar --no-same-owner -xf -"
+    }
+    move ${worksrcpath}/MappingOther/Adobe-CNS1-ETen-B5 ${worksrcpath}/MappingOther/Adobe-CNS1-ETenms-B5
 }
 
 post-patch {
@@ -238,7 +248,7 @@
 variant sjis conflicts euc utf8 description {Set the default character encoding to Shift_JIS} {}
 variant utf8 conflicts euc sjis description {Set the default character encoding to UTF-8} {}
 
-variant no_x11 conflicts motif xaw xaw3d nextaw description {Do not use X11} {
+variant no_x11 conflicts motif xaw xaw3d nextaw {
     depends_lib-delete port:fontconfig port:freetype port:jpeg port:libiconv
     configure.args-append --without-x --without-xdvik
 }

Added: trunk/dports/tex/pTeX/files/archive/dvipdfm-png14.diff
===================================================================
--- trunk/dports/tex/pTeX/files/archive/dvipdfm-png14.diff	                        (rev 0)
+++ trunk/dports/tex/pTeX/files/archive/dvipdfm-png14.diff	2010-03-29 19:05:05 UTC (rev 65644)
@@ -0,0 +1,22 @@
+--- tetex-src-3.0/texk/dvipdfm/pngimage.c.orig	2002-12-26 02:51:16.000000000 +0900
++++ tetex-src-3.0/texk/dvipdfm/pngimage.c	2010-03-29 20:16:47.000000000 +0900
+@@ -42,7 +42,7 @@
+   rewind (png_file);
+   if (fread (sigbytes, 1, sizeof(sigbytes), png_file) !=
+       sizeof(sigbytes) ||
+-      (!png_check_sig (sigbytes, sizeof(sigbytes))))
++      (!(png_sig_cmp (sigbytes, 0, sizeof(sigbytes)) == 0)))
+     return 0;
+   else
+     return 1;
+--- tetex-src-3.0/texk/dvipdfm/thumbnail.c.orig	2002-12-26 02:51:16.000000000 +0900
++++ tetex-src-3.0/texk/dvipdfm/thumbnail.c	2010-03-29 20:17:31.000000000 +0900
+@@ -79,7 +79,7 @@
+   }
+   if (fread (sigbytes, 1, sizeof(sigbytes), thumb_file) !=
+       sizeof(sigbytes) ||
+-      (!png_check_sig (sigbytes, sizeof(sigbytes)))) {
++      (!(png_sig_cmp (sigbytes, 0, sizeof(sigbytes)) == 0))) {
+     fprintf (stderr, "\nThumbnail not a png file! Skipping\n");
+     return NULL;
+   }

Modified: trunk/dports/tex/pTeX/files/patch-1check-archive.sh.diff
===================================================================
--- trunk/dports/tex/pTeX/files/patch-1check-archive.sh.diff	2010-03-29 19:01:44 UTC (rev 65643)
+++ trunk/dports/tex/pTeX/files/patch-1check-archive.sh.diff	2010-03-29 19:05:05 UTC (rev 65644)
@@ -5,7 +5,7 @@
  md5check <<EOF || exit
  92579eca220d2279787ddb98b5b1e439  archive/config.ps
 -3429510a849f0736ffa78ce6a5b5a3a7  archive/dvipdfmx-20070409.tar.gz
-+c727370d57633eb58618022516d17b07  archive/dvipdfmx-20090708.tar.gz
++3486bd11730bedec2b8b31f1d83bd797  archive/dvipdfmx-20100328.tar.gz
  92f5fcdf523381c6e30288d0e2c487ab  archive/dvipdfmx-contrib-latex.tar.gz
 -02e0b121e2c391efffb46d6485d7899f  archive/dvipsk-5.96-p1.7b.tar.gz
 +0c7e46e0562ee2debcf93e313b70e7ac  archive/dvipsk-5.97-p1.7b-20090509.tar.gz

Modified: trunk/dports/tex/pTeX/files/patch-2extract-src.sh.diff
===================================================================
--- trunk/dports/tex/pTeX/files/patch-2extract-src.sh.diff	2010-03-29 19:01:44 UTC (rev 65643)
+++ trunk/dports/tex/pTeX/files/patch-2extract-src.sh.diff	2010-03-29 19:05:05 UTC (rev 65644)
@@ -33,7 +33,7 @@
  
  ## for dvipdfmx
 -tarx archive/dvipdfmx-20070409.tar.gz $SRC/texk
-+tarx archive/dvipdfmx-20090708.tar.gz $SRC/texk
++tarx archive/dvipdfmx-20100328.tar.gz $SRC/texk
  mv $SRC/texk/dvipdfmx-* $SRC/texk/dvipdfmx || exit
 -perlprint "s/ cid-x.map\$/ kanjix.map/g;
 -	s|^%(D  \"gs .*%o) (%i .*\")|\1 $GSNOEMBED -f \2|" \
@@ -67,7 +67,7 @@
  #exit # uncomment if 'mktemp' command doesn't exist
  # Don't use PID for temporary file names in scripts. (impoted from FC4)
  cpatch security/tetex-3.0-badscript.patch          1 $SRC
-@@ -263,7 +258,11 @@
+@@ -263,7 +258,12 @@
  
  
  ## check
@@ -75,6 +75,7 @@
 +if cat md5sum/texsrc.$JAPANESE | (cd $SRC; md5check); then
 +    cpatch archive/dvipng-tiger-#18254.diff        1 $SRC
 +    cpatch archive/xdvik-tiger-#18254.diff         1 $SRC
++    cpatch archive/dvipdfm-png14.diff              1 $SRC
 +    exit
 +fi
  cat <<EOF

Modified: trunk/dports/tex/pTeX/files/patch-7font-search.sh.diff
===================================================================
--- trunk/dports/tex/pTeX/files/patch-7font-search.sh.diff	2010-03-29 19:01:44 UTC (rev 65643)
+++ trunk/dports/tex/pTeX/files/patch-7font-search.sh.diff	2010-03-29 19:05:05 UTC (rev 65644)
@@ -1,6 +1,6 @@
 --- ./7font-search.sh.orig	2008-06-16 13:06:07.000000000 +0900
 +++ ./7font-search.sh	2008-08-14 00:16:11.000000000 +0900
-@@ -109,41 +109,8 @@
+@@ -109,41 +109,10 @@
  
  # -----------------------------------
  
@@ -41,6 +41,8 @@
 -EOF
 +$MKDIR $CMAP/ghostscript
 +$CP ./cmap-gs871/* $CMAP/ghostscript
++$CP ./ToUnicode/* $CMAP/ghostscript
++$CP ./MappingOther/* $CMAP/ghostscript
  
  if test -d /System/Library/Fonts; then # Mac OS X
  LC_ALL=ja_JP.UTF-8

Modified: trunk/dports/tex/pTeX/files/patch-md5sum_texsrc.traditional.diff
===================================================================
--- trunk/dports/tex/pTeX/files/patch-md5sum_texsrc.traditional.diff	2010-03-29 19:01:44 UTC (rev 65643)
+++ trunk/dports/tex/pTeX/files/patch-md5sum_texsrc.traditional.diff	2010-03-29 19:05:05 UTC (rev 65644)
@@ -9,8 +9,8 @@
 -df9d869cd778ef524a6d110d3f1185ec  ./texk/dvipsk/ChangeLog
 -4a650475d99b54df8aa76781aaa002d2  ./texk/dvipsk/Makefile.in.jp
 -61ebec113e202414044a7e84a192d853  ./texk/dvipsk/afm2tfm.c
-+3abe611cc8205c4ba0b555c8ef04a7fb  ./texk/dvipdfmx/data/Makefile.in
-+fb752e6f178ca874204114d7ecf57a20  ./texk/dvipdfmx/data/dvipdfmx.cfg
++1a8769fad6ce0666388e3f7c06f3c3bf  ./texk/dvipdfmx/data/Makefile.in
++c82436df8e7dda30ff696d8e69431fec  ./texk/dvipdfmx/data/dvipdfmx.cfg
 +4575f131665ad2c08a201c07d13e3658  ./texk/dvipsk/ChangeLog
 +860f7a736f8583ed2bbc3dcdd06bfa0f  ./texk/dvipsk/Makefile.in.jp
 +0e3d5acfa6e67087b3b0a7eb35bb21c5  ./texk/dvipsk/afm2tfm.c
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100329/ef5e61ad/attachment.html>


More information about the macports-changes mailing list