[94519] users/dports/ports/tex/texlive-bin/files

dports at macports.org dports at macports.org
Wed Jun 20 23:10:23 PDT 2012


Revision: 94519
          https://trac.macports.org/changeset/94519
Author:   dports at macports.org
Date:     2012-06-20 23:10:22 -0700 (Wed, 20 Jun 2012)
Log Message:
-----------
txelive-bin: remove some unnecessary patchfiles

Removed Paths:
-------------
    users/dports/ports/tex/texlive-bin/files/patch-r23716-synctex-fix.diff
    users/dports/ports/tex/texlive-bin/files/patch-r23740-enctex-xetex-segfault.diff
    users/dports/ports/tex/texlive-bin/files/patch-r24159-file-line-error.diff
    users/dports/ports/tex/texlive-bin/files/patch-r24218-luatex-poppler-1.8-compat.diff
    users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_xetexdir_xetex.ch.diff

Deleted: users/dports/ports/tex/texlive-bin/files/patch-r23716-synctex-fix.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-r23716-synctex-fix.diff	2012-06-21 05:45:38 UTC (rev 94518)
+++ users/dports/ports/tex/texlive-bin/files/patch-r23716-synctex-fix.diff	2012-06-21 06:10:22 UTC (rev 94519)
@@ -1,66 +0,0 @@
-Index: texk/web2c/synctexdir/synctex-luatex.h
-===================================================================
---- texk/web2c/synctexdir/synctex-luatex.h	(revision 23715)
-+++ texk/web2c/synctexdir/synctex-luatex.h	(revision 23716)
-@@ -1,6 +1,6 @@
- /* synctex-luatex.h
- 
--   Copyright (c) 2010 Taco Hoekwater <taco at luatex.org>
-+   Copyright (c) 2010, 2011 Taco Hoekwater <taco at luatex.org>
- 
-    This file is part of LuaTeX.
- 
-@@ -50,9 +50,12 @@
- #define SYNCTEX_HEIGHT(NODE) height(NODE)
- #define SYNCTEX_VALUE int_par(synctex_code)
- 
--#define SYNCTEX_CURV (dimen_par(page_height_code)-static_pdf->posstruct->pos.v)
--#define SYNCTEX_CURH static_pdf->posstruct->pos.h
-+#define SYNCTEX_CURVV (dimen_par(page_height_code)-static_pdf->posstruct->pos.v)
-+#define SYNCTEX_CURHH static_pdf->posstruct->pos.h
- 
-+#define SYNCTEX_CURV (static_pdf->o_mode==OMODE_PDF?SYNCTEX_CURVV:SYNCTEX_CURVV-4736287)
-+#define SYNCTEX_CURH (static_pdf->o_mode==OMODE_PDF?SYNCTEX_CURHH:SYNCTEX_CURHH-4736287)
-+
- #define SYNCTEX_GET_JOB_NAME() makecstring(job_name)
- #define SYNCTEX_GET_LOG_NAME() get_full_log_name()
- 
-Index: texk/web2c/synctexdir/ChangeLog
-===================================================================
---- texk/web2c/synctexdir/ChangeLog	(revision 23715)
-+++ texk/web2c/synctexdir/ChangeLog	(revision 23716)
-@@ -1,3 +1,8 @@
-+2011-08-22  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
-+
-+	* synctex-luatex.h, synctex-xetex.h: Define SYNCTEX_CURH and
-+	SYNCTEX_CURH to yield correct coordinates in dvi and pdf mode.
-+
- 2011-06-11  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
- 
- 	* synctex_parser_utils.c: fix a typo.
-Index: texk/web2c/synctexdir/synctex-xetex.h
-===================================================================
---- texk/web2c/synctexdir/synctex-xetex.h	(revision 23715)
-+++ texk/web2c/synctexdir/synctex-xetex.h	(revision 23716)
-@@ -1,9 +1,9 @@
- /* 
--Copyright (c) 2008, 2009 jerome DOT laurens AT u-bourgogne DOT fr
-+Copyright (c) 2008-2011 jerome DOT laurens AT u-bourgogne DOT fr
- 
- This file is part of the SyncTeX package.
- 
--Latest Revision: Wed Jul  1 11:16:29 UTC 2009
-+Latest Revision: Wed Aug 22 07:20:29 UTC 2011
- 
- License:
- --------
-@@ -57,6 +57,9 @@
- #  define SYNCTEX_OFFSET_IS_PDF (nopdfoutput==0)
- #  define SYNCTEX_OUTPUT (nopdfoutput!=0?"xdv":"pdf")
- 
-+#define SYNCTEX_CURH ((nopdfoutput==0)?(curh+4736287):curh)
-+#define SYNCTEX_CURV ((nopdfoutput==0)?(curv+4736287):curv)
-+
- /*  WARNING:
-     The definition below must be in sync with their eponym declarations in synctex-xetex.ch1
- */

Deleted: users/dports/ports/tex/texlive-bin/files/patch-r23740-enctex-xetex-segfault.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-r23740-enctex-xetex-segfault.diff	2012-06-21 05:45:38 UTC (rev 94518)
+++ users/dports/ports/tex/texlive-bin/files/patch-r23740-enctex-xetex-segfault.diff	2012-06-21 06:10:22 UTC (rev 94519)
@@ -1,26 +0,0 @@
-Index: texk/web2c/xetexdir/xetex.ch
-===================================================================
---- texk/web2c/xetexdir/xetex.ch	(revision 23739)
-+++ texk/web2c/xetexdir/xetex.ch	(revision 23740)
-@@ -328,7 +328,7 @@
- {Initialize enc\TeX\ data.}
- for i:=0 to 255 do mubyte_read[i]:=null;
- for i:=0 to 255 do mubyte_write[i]:=0;
--for i:=0 to 128 do mubyte_cswrite[i]:=null;
-+for i:=0 to 127 do mubyte_cswrite[i]:=null;
- mubyte_keep := 0; mubyte_start := false;
- write_noexpanding := false; cs_converting := false;
- special_printing := false; message_printing := false;
-Index: texk/web2c/enctex.ch
-===================================================================
---- texk/web2c/enctex.ch	(revision 23739)
-+++ texk/web2c/enctex.ch	(revision 23740)
-@@ -42,7 +42,7 @@
- {Initialize enc\TeX\ data.}
- for i:=0 to 255 do mubyte_read[i]:=null;
- for i:=0 to 255 do mubyte_write[i]:=0;
--for i:=0 to 128 do mubyte_cswrite[i]:=null;
-+for i:=0 to 127 do mubyte_cswrite[i]:=null;
- mubyte_keep := 0; mubyte_start := false;
- write_noexpanding := false; cs_converting := false;
- special_printing := false; message_printing := false;

Deleted: users/dports/ports/tex/texlive-bin/files/patch-r24159-file-line-error.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-r24159-file-line-error.diff	2012-06-21 05:45:38 UTC (rev 94518)
+++ users/dports/ports/tex/texlive-bin/files/patch-r24159-file-line-error.diff	2012-06-21 06:10:22 UTC (rev 94519)
@@ -1,161 +0,0 @@
-Index: texk/web2c/luatexdir/tex/inputstack.w
-===================================================================
---- texk/web2c/luatexdir/tex/inputstack.w	(revision 24158)
-+++ texk/web2c/luatexdir/tex/inputstack.w	(revision 24159)
-@@ -307,12 +307,13 @@
-                                 print_int(iname - 1);
-                             print_char('>');
-                         };
--                    } else if (iindex != in_open) {     /* input from a pseudo file */
--                        tprint_nl("l.");
--                        print_int(line_stack[iindex + 1]);
-                     } else {
-                         tprint_nl("l.");
--                        print_int(line);
-+                        if (iindex == in_open) {
-+                            print_int(line);
-+                        } else {     /* input from a pseudo file */
-+                            print_int(line_stack[iindex + 1]);
-+                        }
-                     }
-                     print_char(' ');
-                     PSEUDO_PRINT_THE_LINE();
-Index: texk/web2c/luatexdir/tex/printing.w
-===================================================================
---- texk/web2c/luatexdir/tex/printing.w	(revision 24158)
-+++ texk/web2c/luatexdir/tex/printing.w	(revision 24159)
-@@ -946,7 +946,7 @@
-         if (level == in_open)
-             print_int(line);
-         else
--            print_int(line_stack[iindex + 1 - (in_open - level)]);
-+            print_int(line_stack[level + 1]);
-         tprint(": ");
-     }
- }
-Index: texk/web2c/tex.ch
-===================================================================
---- texk/web2c/tex.ch	(revision 24158)
-+++ texk/web2c/tex.ch	(revision 24159)
-@@ -4532,7 +4532,7 @@
-   else begin
-     print_nl (""); print (full_source_filename_stack[level]); print (":");
-     if level=in_open then print_int (line)
--    else print_int (line_stack[index+1-(in_open-level)]);
-+    else print_int (line_stack[level+1]);
-     print (": ");
-   end;
- end;
-Index: texk/web2c/tests/wprob.tex
-===================================================================
---- texk/web2c/tests/wprob.tex	(revision 0)
-+++ texk/web2c/tests/wprob.tex	(revision 24159)
-@@ -0,0 +1,15 @@
-+\catcode`\%=14
-+
-+\catcode`\{=1
-+\catcode`\}=2
-+\catcode`\#=6
-+
-+\def\err#1{%
-+  \errmessage{Could not open file #1}%
-+}
-+\scantokens{
-+  \err{NoSuchFile.eps}
-+} % The message above should be >>./wprob.tex:12: Could not open...<<
-+\end
-+
-+
-
-Property changes on: texk/web2c/tests/wprob.tex
-___________________________________________________________________
-Added: svn:eol-style
-   + native
-
-Index: texk/web2c/etexdir/wprob.test
-===================================================================
---- texk/web2c/etexdir/wprob.test	(revision 0)
-+++ texk/web2c/etexdir/wprob.test	(revision 24159)
-@@ -0,0 +1,14 @@
-+#! /bin/sh
-+
-+# Copyright (C) 2011 Peter Breitenlohner <tex-live at tug.org>
-+# You may freely use, modify and/or distribute this file.
-+
-+rm -rf wprob.*
-+cp $srcdir/tests/wprob.tex .
-+
-+TEXMFCNF=$srcdir/../kpathsea \
-+	./etex --ini --etex --file-line-error --interaction=nonstopmode wprob.tex
-+
-+grep '^\./wprob\.tex:12: Could not open file NoSuchFile\.eps\.$' \
-+	wprob.log || exit 1
-+
-Index: texk/web2c/etexdir/etex.ch
-===================================================================
---- texk/web2c/etexdir/etex.ch	(revision 24158)
-+++ texk/web2c/etexdir/etex.ch	(revision 24159)
-@@ -871,10 +871,9 @@
- @x [22] m.313 l.6809 - e-TeX scan_tokens
- else  begin print_nl("l."); print_int(line);
- @y
--else if index<>in_open then {input from a pseudo file}
--  begin print_nl("l."); print_int(line_stack[index+1]);
--  end
--else  begin print_nl("l."); print_int(line);
-+else  begin print_nl("l.");
-+  if index=in_open then print_int(line)
-+  else print_int(line_stack[index+1]); {input from a pseudo file}
- @z
- %---------------------------------------
- @x [22] m.314 l.6831 - e-TeX basic
-Index: texk/web2c/alephdir/eobase.ch
-===================================================================
---- texk/web2c/alephdir/eobase.ch	(revision 24158)
-+++ texk/web2c/alephdir/eobase.ch	(revision 24159)
-@@ -805,10 +805,9 @@
- @x [22] m.313 l.6794 - e-TeX scan_tokens
- else  begin print_nl("l."); print_int(line);
- @y
--else if index<>in_open then {input from a pseudo file}
--  begin print_nl("l."); print_int(line_stack[index+1]);
--  end
--else  begin print_nl("l."); print_int(line);
-+else  begin print_nl("l.");
-+  if index=in_open then print_int(line)
-+  else print_int(line_stack[index+1]); {input from a pseudo file}
- @z
- %---------------------------------------
- @x [22] m.314 l.6814 - e-TeX basic
-Index: texk/web2c/alephdir/com16bit.ch
-===================================================================
---- texk/web2c/alephdir/com16bit.ch	(revision 24158)
-+++ texk/web2c/alephdir/com16bit.ch	(revision 24159)
-@@ -2784,7 +2784,7 @@
-   else begin
-     print_nl (""); print (full_source_filename_stack[level]); print (":");
-     if level=in_open then print_int (line)
--    else print_int (line_stack[index+1-(in_open-level)]);
-+    else print_int (line_stack[level+1]);
-     print (": ");
-   end;
- end;
-Index: texk/web2c/pdftexdir/wprob.test
-===================================================================
---- texk/web2c/pdftexdir/wprob.test	(revision 0)
-+++ texk/web2c/pdftexdir/wprob.test	(revision 24159)
-@@ -0,0 +1,14 @@
-+#! /bin/sh
-+
-+# Copyright (C) 2011 Peter Breitenlohner <tex-live at tug.org>
-+# You may freely use, modify and/or distribute this file.
-+
-+rm -rf wprob.*
-+cp $srcdir/tests/wprob.tex .
-+
-+TEXMFCNF=$srcdir/../kpathsea \
-+	./pdftex --ini --etex --file-line-error --interaction=nonstopmode wprob.tex
-+
-+grep '^\./wprob\.tex:12: Could not open file NoSuchFile\.eps\.$' \
-+	wprob.log || exit 1
-+

Deleted: users/dports/ports/tex/texlive-bin/files/patch-r24218-luatex-poppler-1.8-compat.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-r24218-luatex-poppler-1.8-compat.diff	2012-06-21 05:45:38 UTC (rev 94518)
+++ users/dports/ports/tex/texlive-bin/files/patch-r24218-luatex-poppler-1.8-compat.diff	2012-06-21 06:10:22 UTC (rev 94519)
@@ -1,322 +0,0 @@
-Index: texk/web2c/luatexdir/lua/lepdflib.cc
-===================================================================
---- texk/web2c/luatexdir/lua/lepdflib.cc	(revision 24217)
-+++ texk/web2c/luatexdir/lua/lepdflib.cc	(revision 24218)
-@@ -89,8 +89,10 @@
- new_poppler_userdata(Annots);
- new_poppler_userdata(Array);
- new_poppler_userdata(Catalog);
-+new_poppler_userdata(Dict);
-+#ifdef EMBFILE_IN_CATALOG_H
- new_poppler_userdata(EmbFile);
--new_poppler_userdata(Dict);
-+#endif
- //new_poppler_userdata(GooString);
- new_poppler_userdata(LinkDest);
- new_poppler_userdata(Links);
-@@ -393,7 +395,11 @@
-     printf("\n===== Annot GC ===== uin=<%p>\n", uin);
- #endif
-     if (uin->atype == ALLOC_LEPDF)
-+#ifdef HAVE_ANNOTDECREFCNT
-+        ((Annot *) uin->d)->decRefCnt();
-+#else
-         delete(Annot *) uin->d;
-+#endif
-     return 0;
- }
- 
-@@ -410,6 +416,8 @@
- //**********************************************************************
- // AnnotBorderStyle
- 
-+#ifdef HAVE_ANNOTBORDERSTYLE
-+
- m_poppler_get_DOUBLE(AnnotBorderStyle, getWidth);
- 
- m_poppler__tostring(AnnotBorderStyle);
-@@ -435,6 +443,8 @@
-     {NULL, NULL}                // sentinel
- };
- 
-+#endif
-+
- //**********************************************************************
- // Annots
- 
-@@ -684,6 +694,8 @@
- m_poppler_get_poppler(Catalog, Object, getDests);
- m_poppler_get_INT(Catalog, numEmbeddedFiles);
- 
-+#ifdef EMBFILE_IN_CATALOG_H
-+
- static int m_Catalog_embeddedFile(lua_State * L)
- {
-     EmbFile *ef;
-@@ -708,6 +720,8 @@
-     return 1;
- }
- 
-+#endif
-+
- m_poppler_get_INT(Catalog, numJS);
- 
- static int m_Catalog_getJS(lua_State * L)
-@@ -749,7 +763,9 @@
-     {"findDest", m_Catalog_findDest},
-     {"getDests", m_Catalog_getDests},
-     {"numEmbeddedFiles", m_Catalog_numEmbeddedFiles},
-+#ifdef EMBFILE_IN_CATALOG_H
-     {"embeddedFile", m_Catalog_embeddedFile},
-+#endif
-     {"numJS", m_Catalog_numJS},
-     {"getJS", m_Catalog_getJS},
-     {"getOutline", m_Catalog_getOutline},
-@@ -761,6 +777,8 @@
- //**********************************************************************
- // EmbFile
- 
-+#ifdef EMBFILE_IN_CATALOG_H
-+
- m_poppler_get_GOOSTRING(EmbFile, name);
- m_poppler_get_GOOSTRING(EmbFile, description);
- m_poppler_get_INT(EmbFile, size);
-@@ -801,6 +819,8 @@
-     {NULL, NULL}                // sentinel
- };
- 
-+#endif
-+
- //**********************************************************************
- // Dict
- 
-@@ -2683,12 +2703,16 @@
- {
-     register_meta(Annot);
-     // TODO register_meta(AnnotBorder);
-+#ifdef HAVE_ANNOTBORDERSTYLE
-     register_meta(AnnotBorderStyle);
-+#endif
-     register_meta(Annots);
-     register_meta(Array);
-     register_meta(Catalog);
-+    register_meta(Dict);
-+#ifdef EMBFILE_IN_CATALOG_H
-     register_meta(EmbFile);
--    register_meta(Dict);
-+#endif
-     register_meta(GooString);
-     register_meta(LinkDest);
-     register_meta(Links);
-Index: texk/web2c/configure.ac
-===================================================================
---- texk/web2c/configure.ac	(revision 24217)
-+++ texk/web2c/configure.ac	(revision 24218)
-@@ -272,6 +272,48 @@
- KPSE_ICU_XETEX_FLAGS([icule])
- KPSE_OBSDCOMPAT_FLAGS
- 
-+# Checks for xpdf poppler features.
-+KPSE_ADD_FLAGS([poppler])
-+AC_LANG_PUSH([C++])
-+AC_CACHE_CHECK([for Annot::decRefCnt],
-+               [kpse_cv_have_Annot_decRefCnt],
-+               [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <goo/GooString.h>
-+#include <Object.h>
-+#include <Array.h>
-+#include <Annot.h>]],
-+                                                   [[Annot *an; an->decRefCnt();]])],
-+                                  [kpse_cv_have_Annot_decRefCnt=yes],
-+                                  [kpse_cv_have_Annot_decRefCnt=no])])
-+AS_IF([test "x$kpse_cv_have_Annot_decRefCnt" = xyes],
-+      [AC_DEFINE([HAVE_ANNOTDECREFCNT], 1,
-+                 [Define to 1 if class `Annot' has the `decRefCnt' member.])])
-+AC_CACHE_CHECK([for class AnnotBorderStyle],
-+               [kpse_cv_have_AnnotBorderStyle],
-+               [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <goo/GooString.h>
-+#include <Object.h>
-+#include <Array.h>
-+#include <Annot.h>]],
-+                                                   [[AnnotBorderStyle *an;]])],
-+                                  [kpse_cv_have_AnnotBorderStyle=yes],
-+                                  [kpse_cv_have_AnnotBorderStyle=no])])
-+AS_IF([test "x$kpse_cv_have_AnnotBorderStyle" = xyes],
-+      [AC_DEFINE([HAVE_ANNOTBORDERSTYLE], 1,
-+                 [Define to 1 if we have the class `AnnotBorderStyle'.])])
-+AC_CACHE_CHECK([for class EmbFile in Catalog.h],
-+               [kpse_cv_have_EmbFile_in_Catalog_h],
-+               [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <goo/GooString.h>
-+#include <Object.h>
-+#include <Array.h>
-+#include <Catalog.h>]],
-+                                                   [[EmbFile *ef;]])],
-+                                  [kpse_cv_have_EmbFile_in_Catalog_h=yes],
-+                                  [kpse_cv_have_EmbFile_in_Catalog_h=no])])
-+AS_IF([test "x$kpse_cv_have_EmbFile_in_Catalog_h" = xyes],
-+      [AC_DEFINE([EMBFILE_IN_CATALOG_H], 1,
-+                 [Define to 1 for the class `EmbFile' in <Catalog.h>.])])
-+AC_LANG_POP([C++])
-+KPSE_RESTORE_FLAGS
-+
- dnl Write output here, instead of putting a zillion -D's on the command line.
- AC_CONFIG_HEADERS([w2c/c-auto.h:c-auto.in],
-  [sed -e 's/^#define PACKAGE/#define WEB2C_PACKAGE/' \
-Index: texk/web2c/configure
-===================================================================
---- texk/web2c/configure	(revision 24217)
-+++ texk/web2c/configure	(revision 24218)
-@@ -22550,6 +22550,127 @@
- 	cd ${top_builddir}/../../libs/obsdcompat && $(MAKE) $(AM_MAKEFLAGS) rebuild'
- 
- 
-+# Checks for xpdf poppler features.
-+eval CPPFLAGS=\"$POPPLER_INCLUDES \$CPPFLAGS\"
-+eval LIBS=\"$POPPLER_LIBS \$LIBS\"
-+
-+ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+ac_link="./libtool --mode=link --tag=CXX $ac_link"
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Annot::decRefCnt" >&5
-+$as_echo_n "checking for Annot::decRefCnt... " >&6; }
-+if ${kpse_cv_have_Annot_decRefCnt+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <goo/GooString.h>
-+#include <Object.h>
-+#include <Array.h>
-+#include <Annot.h>
-+int
-+main ()
-+{
-+Annot *an; an->decRefCnt();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  kpse_cv_have_Annot_decRefCnt=yes
-+else
-+  kpse_cv_have_Annot_decRefCnt=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_Annot_decRefCnt" >&5
-+$as_echo "$kpse_cv_have_Annot_decRefCnt" >&6; }
-+if test "x$kpse_cv_have_Annot_decRefCnt" = xyes; then :
-+
-+$as_echo "#define HAVE_ANNOTDECREFCNT 1" >>confdefs.h
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for class AnnotBorderStyle" >&5
-+$as_echo_n "checking for class AnnotBorderStyle... " >&6; }
-+if ${kpse_cv_have_AnnotBorderStyle+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <goo/GooString.h>
-+#include <Object.h>
-+#include <Array.h>
-+#include <Annot.h>
-+int
-+main ()
-+{
-+AnnotBorderStyle *an;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  kpse_cv_have_AnnotBorderStyle=yes
-+else
-+  kpse_cv_have_AnnotBorderStyle=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_AnnotBorderStyle" >&5
-+$as_echo "$kpse_cv_have_AnnotBorderStyle" >&6; }
-+if test "x$kpse_cv_have_AnnotBorderStyle" = xyes; then :
-+
-+$as_echo "#define HAVE_ANNOTBORDERSTYLE 1" >>confdefs.h
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for class EmbFile in Catalog.h" >&5
-+$as_echo_n "checking for class EmbFile in Catalog.h... " >&6; }
-+if ${kpse_cv_have_EmbFile_in_Catalog_h+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <goo/GooString.h>
-+#include <Object.h>
-+#include <Array.h>
-+#include <Catalog.h>
-+int
-+main ()
-+{
-+EmbFile *ef;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  kpse_cv_have_EmbFile_in_Catalog_h=yes
-+else
-+  kpse_cv_have_EmbFile_in_Catalog_h=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_EmbFile_in_Catalog_h" >&5
-+$as_echo "$kpse_cv_have_EmbFile_in_Catalog_h" >&6; }
-+if test "x$kpse_cv_have_EmbFile_in_Catalog_h" = xyes; then :
-+
-+$as_echo "#define EMBFILE_IN_CATALOG_H 1" >>confdefs.h
-+
-+fi
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+ac_link="./libtool --mode=link --tag=CC $ac_link"
-+
-+CPPFLAGS=$kpse_save_CPPFLAGS
-+LIBS=$kpse_save_LIBS
-+
-+
- ac_config_headers="$ac_config_headers w2c/c-auto.h:c-auto.in"
- 
- 
-Index: texk/web2c/c-auto.in
-===================================================================
---- texk/web2c/c-auto.in	(revision 24217)
-+++ texk/web2c/c-auto.in	(revision 24218)
-@@ -37,6 +37,9 @@
- /* web2c: Default editor for interactive `e' option. */
- #undef EDITOR
- 
-+/* Define to 1 for the class `EmbFile' in <Catalog.h>. */
-+#undef EMBFILE_IN_CATALOG_H
-+
- /* metafont: Define to include EPSF pseudo window support. */
- #undef EPSFWIN
- 
-@@ -46,6 +49,12 @@
- /* Define to 1 if you have the `access' function. */
- #undef HAVE_ACCESS
- 
-+/* Define to 1 if we have the class `AnnotBorderStyle'. */
-+#undef HAVE_ANNOTBORDERSTYLE
-+
-+/* Define to 1 if class `Annot' has the `decRefCnt' member. */
-+#undef HAVE_ANNOTDECREFCNT
-+
- /* Define to 1 if you have the <assert.h> header file. */
- #undef HAVE_ASSERT_H
- 

Deleted: users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_xetexdir_xetex.ch.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_xetexdir_xetex.ch.diff	2012-06-21 05:45:38 UTC (rev 94518)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_xetexdir_xetex.ch.diff	2012-06-21 06:10:22 UTC (rev 94519)
@@ -1,10 +0,0 @@
---- texk/web2c/xetexdir/xetex.ch.orig	2012-02-06 20:50:45.000000000 -0500
-+++ texk/web2c/xetexdir/xetex.ch	2012-02-06 20:51:05.000000000 -0500
-@@ -6944,7 +6944,6 @@
- @y
- undump_int(x);
- if (x<>69069) then goto bad_fmt;
--if not w_eof(fmt_file) then goto bad_fmt
- @z
- 
- @x
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120620/5b3f092b/attachment-0001.html>


More information about the macports-changes mailing list