[111190] trunk/dports/tex/pTeX/Portfile
takanori at macports.org
takanori at macports.org
Mon Sep 16 13:45:54 PDT 2013
Revision: 111190
https://trac.macports.org/changeset/111190
Author: takanori at macports.org
Date: 2013-09-16 13:45:54 -0700 (Mon, 16 Sep 2013)
Log Message:
-----------
pTeX:
- default compiler has been changed to gcc-mp-4.8 (workaround to avoid the instability of dvipdfmx,
Ticket #39334, #35957, http://oku.edu.mie-u.ac.jp/~okumura/texfaq/qa/57132.html )
- variants '+no_x11' '+no_otf' and '+no_hiragino' have been eliminated (Ticket #39383)
- misc fixes / cleanups
Modified Paths:
--------------
trunk/dports/tex/pTeX/Portfile
Modified: trunk/dports/tex/pTeX/Portfile
===================================================================
--- trunk/dports/tex/pTeX/Portfile 2013-09-16 20:37:44 UTC (rev 111189)
+++ trunk/dports/tex/pTeX/Portfile 2013-09-16 20:45:54 UTC (rev 111190)
@@ -4,7 +4,7 @@
name pTeX
version 20110314
-revision 7
+revision 8
epoch ${version}
set ver_ptetex3 20080616
set ver_dvipdfmx 20110311
@@ -109,8 +109,6 @@
powerdot-${ver_powerdot}.zip rmd160 6df0eb5f8c61ee0a92dba9ce3d3184202785018b
depends_lib port:gd2 \
- port:jpeg \
- port:libiconv \
port:libpaper \
port:libpng \
port:ncurses \
@@ -131,12 +129,13 @@
conflicts texlive-common
-if {![variant_isset euc] && ![variant_isset sjis] && ![variant_isset utf8]} {
+default_variants +hiragino +otf
+
+if {[variant_isset euc] || [variant_isset sjis] || [variant_isset utf8]} {
+ # nop
+} else {
default_variants +utf8
}
-if {![variant_isset no_x11] && ![variant_isset motif] && ![variant_isset xaw] && ![variant_isset xaw3d] && ![variant_isset nextaw]} {
- default_variants +motif
-}
extract.only ${distname}${extract.suffix}
post-extract {
@@ -145,7 +144,7 @@
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
+ #move ${worksrcpath}/MappingOther/Adobe-CNS1-ETen-B5 ${worksrcpath}/MappingOther/Adobe-CNS1-ETenms-B5
}
post-patch {
@@ -177,14 +176,20 @@
delete ${worksrcpath}/archive/dvipsk-5.96-p1.7b.tar.gz
}
+# Ticket #39334
+configure.compiler macports-gcc-4.8
+
configure.args --without-texi2html \
--without-texinfo \
--with-system-gd \
--with-system-ncurses \
--with-system-pnglib \
--with-system-t1lib \
- --with-system-zlib
+ --with-system-zlib \
+ --without-x \
+ --without-xdvik
# --enable-shared
+
configure {
set fd [open [file join ${worksrcpath} my_option] w 0644]
puts ${fd} "TMP_PREFIX=${workpath}/temp"
@@ -199,7 +204,9 @@
} else {
puts ${fd} "KANJI_CODE=EUC"
}
- if {[variant_isset no_x11]} {
+ if {[variant_isset motif] || [variant_isset xaw] || [variant_isset xaw3d] || [variant_isset nextaw]} {
+ # nop
+ } else {
puts ${fd} "XDVI=echo"
puts ${fd} "PXDVI=echo"
}
@@ -208,13 +215,20 @@
puts ${fd} "LDFLAGS=\"${configure.ldflags}\""
puts ${fd} "LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH:${prefix}/lib\""
puts ${fd} "export CFLAGS CPPFLAGS LDFLAGS LD_LIBRARY_PATH"
+
+# Ticket #35957, #39334
+ puts ${fd} "CC=\"${configure.cc}\""
+ puts ${fd} "CXX=\"${configure.cxx}\""
+ puts ${fd} "CPP=\"${configure.cpp}\""
+ puts ${fd} "export CC CXX CPP"
+
close ${fd}
}
build.target all0
use_parallel_build no
pre-build {
- if {![variant_isset no_otf]} {build.target-append otf}
+ if {[variant_isset otf]} {build.target-append otf}
build.target-append babel fonty
foreach d {texmf .texmf-var .texmf-config} {
@@ -261,12 +275,6 @@
# Update ls-R, map and fmt files (before packaging)
set destroot_var "PATH=\"${destroot}${prefix}/bin:$env(PATH)\" TEXMFMAIN=${destroot}${prefix}/share/texmf LD_LIBRARY_PATH=${destroot}${prefix}/lib"
system "${destroot_var} mktexlsr"
-# if {![variant_isset no_hiragino]} {
-# system "${destroot_var} updmap-sys --setoption kanjiEmbed hiragino --nomkmap || true"
-# system "${destroot_var} updmap-sys --disable morisawa.map --nomkmap || true"
-# system "${destroot_var} updmap-sys --enable KanjiMap morisawa-hiraginoEmbed.map --nomkmap || true"
-# system "${destroot_var} updmap-sys"
-# }
system "${destroot_var} fmtutil-sys --all"
# Modify mktex.opt to force use of varfonts
@@ -294,7 +302,7 @@
system "${prefix}/bin/updmap-sys --enable Map ${f} --nomkmap || true"
}
- if {![variant_isset no_hiragino]} {
+ if {[variant_isset hiragino]} {
system "${prefix}/bin/updmap-sys --setoption kanjiEmbed hiragino --nomkmap || true"
system "${prefix}/bin/updmap-sys --disable morisawa.map --nomkmap || true"
system "${prefix}/bin/updmap-sys --enable KanjiMap morisawa-hiraginoEmbed.map --nomkmap || true"
@@ -306,37 +314,41 @@
universal_variant no
-variant no_hiragino description {Do not depend on Hiragino fonts} {
+variant hiragino description {Use Hiragino fonts} {
depends_build-delete port:ghostscript-fonts-hiragino
depends_build-append port:ghostscript
depends_run-delete port:ghostscript-fonts-hiragino
depends_run-append port:ghostscript
}
-variant no_otf description {Do not install otf.sty} {}
+variant otf description {Install otf.sty} {}
variant euc conflicts sjis utf8 description {Set the default character encoding to EUC-JP} {}
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 {
- depends_lib-delete port:fontconfig port:freetype port:jpeg port:libiconv
- configure.args-append --without-x --without-xdvik
+variant motif conflicts xaw xaw3d nextaw description {Use Motif to build xdvi} {
+ depends_lib-append port:fontconfig port:freetype port:jpeg port:libiconv
+ depends_lib-append lib:libXm:openmotif
+ configure.args-delete --without-x --without-xdvik
+ configure.args-append --with-xdvi-x-toolkit=motif
}
-variant motif conflicts no_x11 xaw xaw3d nextaw description {Use Motif to build xdvi} {
- depends_lib-append lib:libXm:openmotif
- configure.args-append --with-xdvi-x-toolkit=motif
-}
-variant xaw conflicts no_x11 motif xaw3d nextaw description {Use Xaw to build xdvi} {
+variant xaw conflicts motif xaw3d nextaw description {Use Xaw to build xdvi} {
+ depends_lib-append port:fontconfig port:freetype port:jpeg port:libiconv
depends_lib-append port:xorg-libXaw
+ configure.args-delete --without-x --without-xdvik
configure.args-append --with-xdvi-x-toolkit=xaw
}
-variant xaw3d conflicts no_x11 motif xaw nextaw description {Use Xaw3d to build xdvi} {
+variant xaw3d conflicts motif xaw nextaw description {Use Xaw3d to build xdvi} {
+ depends_lib-append port:fontconfig port:freetype port:jpeg port:libiconv
depends_lib-append port:Xaw3d
+ configure.args-delete --without-x --without-xdvik
configure.args-append --with-xdvi-x-toolkit=xaw3d
}
-variant nextaw conflicts no_x11 motif xaw xaw3d description {Use neXtaw to build xdvi} {
+variant nextaw conflicts motif xaw xaw3d description {Use neXtaw to build xdvi} {
+ depends_lib-append port:fontconfig port:freetype port:jpeg port:libiconv
depends_lib-append port:neXtaw
+ configure.args-delete --without-x --without-xdvik
configure.args-append --with-xdvi-x-toolkit=neXtaw
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130916/aaa55670/attachment.html>
More information about the macports-changes
mailing list