[72818] users/dports/ports/tex/texlive-bin
dports at macports.org
dports at macports.org
Wed Oct 27 19:11:06 PDT 2010
Revision: 72818
http://trac.macports.org/changeset/72818
Author: dports at macports.org
Date: 2010-10-27 19:11:03 -0700 (Wed, 27 Oct 2010)
Log Message:
-----------
Start of texlive-bin updates for TL2010:
* use official distfile now that xz support is available
* pass texmf.cnf from texlive-common into kpathsea build process so
correct search paths are compiled in
* remove now-unnecessary patcfhiles
* patch icu to not attempt universal build
* do not install tlmgr symlink (#26310)
Possible build-time conflict with icu port.
--Select files to commit below--
* M Portfile
* A + files/patch-libs_icu_icu-4.4_configure.diff
* M files/patch-texk_texlive_linked_scripts_Makefile.in.diff
* D files/patch-texk_web2c_luatexdir_image_pdftoepdf_cc
* D files/patch-texk_web2c_pdftexdir_pdftoepdf_cc
* D files/patch-texk_xdvipdfmx_configure.diff
Modified Paths:
--------------
users/dports/ports/tex/texlive-bin/Portfile
users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_linked_scripts_Makefile.in.diff
Added Paths:
-----------
users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-4.4_configure.diff
Removed Paths:
-------------
users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_luatexdir_image_pdftoepdf_cc
users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_pdftexdir_pdftoepdf_cc
users/dports/ports/tex/texlive-bin/files/patch-texk_xdvipdfmx_configure.diff
Modified: users/dports/ports/tex/texlive-bin/Portfile
===================================================================
--- users/dports/ports/tex/texlive-bin/Portfile 2010-10-28 00:23:27 UTC (rev 72817)
+++ users/dports/ports/tex/texlive-bin/Portfile 2010-10-28 02:11:03 UTC (rev 72818)
@@ -6,8 +6,7 @@
PortGroup archcheck 1.0
name texlive-bin
-version 2009
-revision 6
+version 2010
categories tex
maintainers dports
@@ -21,15 +20,14 @@
homepage http://www.tug.org/texlive/
platforms darwin
-# distfile is the same as the official one, but recompressed in bz2
-master_sites http://flute.csail.mit.edu/texlive/
-set distversion 20091107
+master_sites tex_ctan:systems/texlive/Source/
+set distversion 20100720
distname texlive-${distversion}-source
worksrcdir ${distname}
-use_bzip2 yes
-checksums md5 34e636c76534d4b3a1b3f06f568ddedc \
- sha1 891434197b1aa60030eb059553697cb40c6ab15b \
- rmd160 e467932d53abe418f4e36a56afb683912ab0caec
+use_xz yes
+checksums md5 2a2201b84fdbf210032e1df70bc59157 \
+ sha1 713b861123e3d9e073e2c93d7ed3e13262d82c34 \
+ rmd160 b1120f3377ca45b4d86911b99a95c2e6e45927b5
universal_variant no
@@ -59,20 +57,23 @@
path:bin/pkg-config:pkgconfig
patchfiles patch-configure \
+ patch-libs_icu_icu-4.4_configure.diff \
patch-libs-freetype-Makefile.in.diff \
- patch-texk_web2c_luatexdir_image_pdftoepdf_cc \
- patch-texk_web2c_pdftexdir_pdftoepdf_cc \
- patch-texk_xdvipdfmx_configure.diff \
patch-texk_texlive_linked_scripts_Makefile.in.diff
post-patch {
reinplace "s|@@TEXMFMAIN@@|${texlive_texmfmain}|" ${worksrcpath}/texk/texlive/linked_scripts/Makefile.in
reinplace "s|@@TEXMFDIST@@|${texlive_texmfdist}|" ${worksrcpath}/texk/texlive/linked_scripts/Makefile.in
+ # Link our texmf.cnf in so that the proper paths are compiled into kpathsea
+ delete ${worksrcpath}/texk/kpathsea/texmf.cnf
+ ln -s ${texlive_texmfsysconfig}/texmf.cnf ${worksrcpath}/texk/kpathsea/texmf.cnf
+
if {![variant_isset atsui]} {
# Force configure to believe that Carbon API is
# unavailable. This test is actually used to determine whether
# ATSUI should be used.
+ reinplace "s|kpse_cv_have_ApplicationServices=yes|kpse_cv_have_ApplicationServices=no|" ${worksrcpath}/texk/xdvipdfmx/configure
reinplace "s|kpse_cv_have_Carbon=yes|kpse_cv_have_Carbon=no|" ${worksrcpath}/texk/web2c/configure
reinplace "s|kpse_cv_have_Carbon=yes|kpse_cv_have_Carbon=no|" ${worksrcpath}/texk/xdv2pdf/configure
}
@@ -131,12 +132,10 @@
# texmf and texmf-dist will be installed by other texlive ports
delete ${destroot}${prefix}/texmf
delete ${destroot}${prefix}/texmf-dist
- delete ${destroot}${texlive_texmfmain}
- delete ${destroot}${texlive_texmfdist}
# Do not install symlinks to scripts that we will not install
- delete ${destroot}${prefix}/bin/man
delete ${destroot}${prefix}/bin/latexmk
+ delete ${destroot}${prefix}/bin/tlmgr
}
post-activate {
Copied: users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-4.4_configure.diff (from rev 72722, trunk/dports/devel/icu/files/patch-configure.diff)
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-4.4_configure.diff (rev 0)
+++ users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-4.4_configure.diff 2010-10-28 02:11:03 UTC (rev 72818)
@@ -0,0 +1,75 @@
+--- libs/icu/icu-4.4/configure.orig 2009-10-02 11:50:49.000000000 +0200
++++ libs/icu/icu-4.4/configure 2009-10-02 11:54:38.000000000 +0200
+@@ -7034,52 +7034,6 @@
+ $as_echo_n "(cached) " >&6
+ else
+ ac_cv_c_bigendian=unknown
+- # See if we're dealing with a universal compiler.
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#ifndef __APPLE_CC__
+- not a universal capable compiler
+- #endif
+- typedef int dummy;
+-
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+-
+- # Check for potential -arch flags. It is not universal unless
+- # there are some -arch flags. Note that *ppc* also matches
+- # ppc64. This check is also rather less than ideal.
+- case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #(
+- *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
+- esac
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test $ac_cv_c_bigendian = unknown; then
+ # See if sys/param.h defines the BYTE_ORDER macro.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -7418,19 +7372,6 @@
+ ;; #(
+ no)
+ ;; #(
+- universal)
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define AC_APPLE_UNIVERSAL_BUILD 1
+-_ACEOF
+-
+- ;; #(
+- *)
+- { { $as_echo "$as_me:$LINENO: error: unknown endianness
+- presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+-$as_echo "$as_me: error: unknown endianness
+- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+- { (exit 1); exit 1; }; } ;;
+ esac
+
+ if test $ac_cv_c_bigendian = no; then
Modified: users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_linked_scripts_Makefile.in.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_linked_scripts_Makefile.in.diff 2010-10-28 00:23:27 UTC (rev 72817)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_texlive_linked_scripts_Makefile.in.diff 2010-10-28 02:11:03 UTC (rev 72818)
@@ -1,24 +1,6 @@
---- texk/texlive/linked_scripts/Makefile.in 2009-10-14 19:39:50.000000000 -0400
-+++ texk/texlive/linked_scripts/Makefile.in 2010-02-02 14:54:01.000000000 -0500
-@@ -156,7 +156,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- bin_SCRIPTS =
--scriptxdir = ${prefix}/texmf/scripts
-+scriptxdir = @@TEXMFMAIN@@/scripts
- nobase_dist_scriptx_SCRIPTS = \
- a2ping/a2ping.pl \
- getnonfreefonts/getnonfreefonts.pl \
-@@ -167,7 +167,7 @@
- texlive/rungs.tlu \
- texlive/tlmgr.pl
-
--scriptdir = ${prefix}/texmf-dist/scripts
-+scriptdir = @@TEXMFDIST@@/scripts
- nobase_dist_script_SCRIPTS = \
- accfonts/mkt1font \
- accfonts/vpl2ovp \
-@@ -554,16 +554,16 @@
+--- texk/texlive/linked_scripts/Makefile.in.orig 2010-10-26 23:44:12.000000000 -0400
++++ texk/texlive/linked_scripts/Makefile.in 2010-10-26 23:46:18.000000000 -0400
+@@ -589,16 +589,16 @@
for s in $(nobase_dist_scriptx_SCRIPTS); do \
target=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \
rm -f $$target; \
@@ -37,16 +19,19 @@
+ echo "creating link '$$target' -> '@@TEXMFDIST@@/scripts/$$s'"; \
+ $(LN_S) @@TEXMFDIST@@/scripts/$$s $$target; \
done && \
- rm -f rpdfcrop && \
- echo "creating link 'rpdfcrop' -> 'pdfcrop'" && \
-@@ -575,8 +575,8 @@
- echo "creating link 'getnonfreefonts-sys' -> 'getnonfreefonts'" && \
- $(LN_S) getnonfreefonts getnonfreefonts-sys && \
- rm -f man && \
-- echo "creating link 'man' -> '$(REL)/texmf/doc/man'" && \
-- (ln -s $(REL)/texmf/doc/man man || :)
-+ echo "creating link 'man' -> '@@TEXMFMAIN@@/doc/man'" && \
-+ (ln -s @@TEXMFMAIN@@/doc/man man || :)
+ for s in $(bin_links); do \
+ link=`echo $$s | sed 's,.*:,,'`; \
+@@ -606,12 +606,7 @@
+ rm -f $$link; \
+ echo "creating link '$$link' -> '$$file'"; \
+ $(LN_S) $$file $$link; \
+- done && \
+- rm -f man && \
+- if test -d $(REL)/texmf/doc/man; then \
+- echo "creating link 'man' -> '$(REL)/texmf/doc/man'" && \
+- (ln -s $(REL)/texmf/doc/man man || :); \
+- else :; fi
++ done
uninstall-hook:
@for s in $(nobase_dist_scriptx_SCRIPTS) $(nobase_dist_script_SCRIPTS); do \
Deleted: users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_luatexdir_image_pdftoepdf_cc
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_luatexdir_image_pdftoepdf_cc 2010-10-28 00:23:27 UTC (rev 72817)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_luatexdir_image_pdftoepdf_cc 2010-10-28 02:11:03 UTC (rev 72818)
@@ -1,22 +0,0 @@
-$OpenBSD: patch-texk_web2c_luatexdir_image_pdftoepdf_cc,v 1.1 2009/12/12 17:48:34 edd Exp $
---- texk/web2c/luatexdir/image/pdftoepdf.cc.orig Thu Jun 25 15:05:10 2009
-+++ texk/web2c/luatexdir/image/pdftoepdf.cc Tue Oct 13 17:43:02 2009
-@@ -666,7 +666,7 @@ static void writeEncodings()
- }
- for (r = encodingList; r != NULL; r = n) {
- n = r->next;
-- delete r->font;
-+ r->font->decRefCnt();
- delete r;
- }
- }
-@@ -720,7 +720,8 @@ read_pdf_info(image_dict * idict, integer minor_pdf_ve
- // this works only for PDF 1.x -- but since any versions of PDF newer
- // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
- // then have to changed drastically anyway.
-- pdf_version_found = pdf_doc->doc->getPDFVersion();
-+ pdf_version_found = pdf_doc->doc->getPDFMajorVersion() +
-+ 0.1 * pdf_doc->doc->getPDFMinorVersion();
- pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1);
- if (pdf_version_found > pdf_version_wanted + 0.01) {
- char msg[] =
Deleted: users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_pdftexdir_pdftoepdf_cc
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_pdftexdir_pdftoepdf_cc 2010-10-28 00:23:27 UTC (rev 72817)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_pdftexdir_pdftoepdf_cc 2010-10-28 02:11:03 UTC (rev 72818)
@@ -1,22 +0,0 @@
-$OpenBSD: patch-texk_web2c_pdftexdir_pdftoepdf_cc,v 1.1 2009/12/12 17:48:34 edd Exp $
---- texk/web2c/pdftexdir/pdftoepdf.cc.orig Wed May 6 10:19:56 2009
-+++ texk/web2c/pdftexdir/pdftoepdf.cc Tue Oct 13 17:23:48 2009
-@@ -650,7 +650,7 @@ static void writeEncodings()
- }
- for (r = encodingList; r != 0; r = n) {
- n = r->next;
-- delete r->font;
-+ r->font->decRefCnt();
- delete r;
- }
- }
-@@ -705,7 +705,8 @@ read_pdf_info(char *image_name, char *page_name, integ
- // this works only for PDF 1.x -- but since any versions of PDF newer
- // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
- // then have to changed drastically anyway.
-- pdf_version_found = pdf_doc->doc->getPDFVersion();
-+ pdf_version_found = pdf_doc->doc->getPDFMajorVersion() +
-+ 0.1 * pdf_doc->doc->getPDFMinorVersion();
- pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1);
- if (pdf_version_found > pdf_version_wanted) {
- char msg[] =
Deleted: users/dports/ports/tex/texlive-bin/files/patch-texk_xdvipdfmx_configure.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_xdvipdfmx_configure.diff 2010-10-28 00:23:27 UTC (rev 72817)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_xdvipdfmx_configure.diff 2010-10-28 02:11:03 UTC (rev 72818)
@@ -1,12 +0,0 @@
---- texk/xdvipdfmx/configure 2010-01-25 14:39:00.000000000 -0500
-+++ texk/xdvipdfmx/configure 2010-01-25 14:39:55.000000000 -0500
-@@ -18648,6 +18648,9 @@
-
- fi
-
-+# force no ApplicationServices to use fontconfig instead of ATSU
-+kpse_cv_have_ApplicationServices=no
-+
- { $as_echo "$as_me:$LINENO: checking for Mac OS X ApplicationServices framework" >&5
- $as_echo_n "checking for Mac OS X ApplicationServices framework... " >&6; }
- if test "${kpse_cv_have_ApplicationServices+set}" = set; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101027/281f2200/attachment.html>
More information about the macports-changes
mailing list