Ticket #41791: Portfile-texlive-bin.diff

Users/larryv/Projects/MacPorts/svn/trunk/dports/tex/texlive-bin/Portfile

@@ -190 +190 @@
 configure.cppflags-append   -isystem${prefix}/include
 configure.env-append        LIBRARY_PATH=${prefix}/lib
 
-set cxx_stdlibflags {}
+# work around bug in texlive makefiles where $OBJC is not recorded
+# during configure phase
+build.env                   OBJC=${configure.objc} \
+                            OBJCFLAGS="${configure.objcflags} [get_canonical_archflags objc]" \
+                            OBJCXX=${configure.objcxx}
+
 if {[info exists configure.cxx_stdlib] &&
     ${configure.cxx_stdlib} ne {} &&
     [string match *clang* ${configure.cxx}]
 } then {
-    set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
+    build.env-append        OBJCXXFLAGS="${configure.objcxxflags} [get_canonical_archflags objcxx] -stdlib=${configure.cxx_stdlib}"
+} else {
+    build.env-append        OBJCXXFLAGS="${configure.objcxxflags} [get_canonical_archflags objcxx]"
 }
 
-# TODO: Remove when base supports OBJCXX and OBJCXXFLAGS (2.2.1?).
-configure.env-append        OBJCXX=${configure.cxx} \
-                            OBJCXXFLAGS="${configure.objcflags} ${cxx_stdlibflags} [get_canonical_archflags objc]"
-
-# work around bug in texlive makefiles where $OBJC is not recorded
-# during configure phase
-build.env                   OBJC=${configure.objc} \
-                            OBJCFLAGS="${configure.objcflags} [get_canonical_archflags objc]" \
-                            OBJCXX=${configure.cxx} \
-                            OBJCXXFLAGS="${configure.objcflags} ${cxx_stdlibflags} [get_canonical_archflags objc]"            
-
 post-destroot   {
     # Anything that gets installed into texmf-dist will be installed
     # by one of the texmf ports