<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[130067] trunk/dports/print/pdflib</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/130067">130067</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-12-25 18:09:19 -0800 (Thu, 25 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>pdflib: use patchfile instead of reinplace; also remove lots of incorrect/undesired -arch selection and universal code from the configure script (MacPorts already handles this)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsprintpdflibPortfile">trunk/dports/print/pdflib/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsprintpdflibfilespatchconfigurediff">trunk/dports/print/pdflib/files/patch-configure.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsprintpdflibPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/print/pdflib/Portfile (130066 => 130067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/print/pdflib/Portfile 2014-12-26 00:18:29 UTC (rev 130066)
+++ trunk/dports/print/pdflib/Portfile 2014-12-26 02:09:19 UTC (rev 130067)
</span><span class="lines">@@ -23,14 +23,10 @@
</span><span class="cx"> sha1 5b2bf5edc49dba3da0997ade0e191511a37fae01 \
</span><span class="cx"> rmd160 7f3862e70e2f74cf3143ea61e051c30e518ab2eb
</span><span class="cx">
</span><del>-patchfiles patch-perl_Makefile.diff \
</del><ins>+patchfiles patch-configure.diff \
+ patch-perl_Makefile.diff \
</ins><span class="cx"> patch-libtool.diff
</span><span class="cx">
</span><del>-post-patch {
- reinplace "s/PYTHONLIBDIR=`cat << EOF | python/PYTHONLIBDIR=`cat << EOF | \$PYTHONBIN/g" \
- ${worksrcpath}/configure
-}
-
</del><span class="cx"> configure.ccache no
</span><span class="cx"> configure.args --without-java \
</span><span class="cx"> --without-perl \
</span></span></pre></div>
<a id="trunkdportsprintpdflibfilespatchconfigurediff"></a>
<div class="addfile"><h4>Added: trunk/dports/print/pdflib/files/patch-configure.diff (0 => 130067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/print/pdflib/files/patch-configure.diff (rev 0)
+++ trunk/dports/print/pdflib/files/patch-configure.diff 2014-12-26 02:09:19 UTC (rev 130067)
</span><span class="lines">@@ -0,0 +1,152 @@
</span><ins>+--- configure.orig 2010-04-29 08:50:03.000000000 -0500
++++ configure 2014-12-25 20:04:51.000000000 -0600
+@@ -1022,8 +1022,6 @@
+ --enable-profile turn on profiling
+ --enable-64bit turn on 64bit build
+ --enable-sfio turn on sfio build
+- --enable-mac_legacy build legacy (carbon, ...) binaries (Mac), unsupported
+- --enable-universal build universal binaries (Mac), unsupported
+ --enable-large_files enable support for files large than 2GB
+ --enable-xplink xplink and dynamic linking (z/OS USS)
+ --enable-tiffwrite enable write support for tifflib
+@@ -1044,7 +1042,6 @@
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-pdflibname=name set file name of generated library default=pdf
+ --with-libm=name set math library option default=-lm
+- --with-macarch=architecture Mac OSX architecture to build for, unsupported.
+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]
+ --with-pic try to use only PIC/non-PIC objects [default=use
+ both]
+@@ -3662,37 +3659,7 @@
+ MATHLIB=""
+ with_gnu_ld=yes
+
+- # choose if we do a legacy build (carbon, ...)
+- # Check whether --enable-mac_legacy or --disable-mac_legacy was given.
+-if test "${enable_mac_legacy+set}" = set; then
+- enableval="$enable_mac_legacy"
+- if test "$enableval" = "yes" ; then
+- ENABLE_MAC_LEGACY="yes"
+- PLATFORM_ID="MacOSX"
+- fi
+-fi;
+-
+- # selecet correct SDK for build
+- # and set min Mac Version we want to be compatible for
+- if test "$ENABLE_MAC_LEGACY" = "yes"; then
+- CPPFLAGS="$CPPFLAGS -DPDF_MAC_LEGACY"
+- DEVSDK="/Developer/SDKs/MacOSX10.4u.sdk"
+- MAC_LDFLAGS="$MAC_LDFLAGS -mmacosx-version-min=10.2"
+- # add Framework ApplicationServices
+- LEGACY_ID="-10.4"
+- else
+- case $ac_sys_vers in
+- 9.*)
+- DEVSDK="/Developer/SDKs/MacOSX10.5.sdk" ;;
+- 10.*)
+- DEVSDK="/Developer/SDKs/MacOSX10.6.sdk"
+- ;;
+- esac
+- fi
+- CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon"
+ LDFLAGS="$LDFLAGS -framework ApplicationServices"
+- MAC_CFLAGS="$MAC_CFLAGS -isysroot $DEVSDK"
+- MAC_LDFLAGS="$MAC_LDFLAGS -Wl,-syslibroot,$DEVSDK"
+
+ # set PLATFROM ID
+ # will be completed in pc_config.h (32/64 ppc/intel)
+@@ -3703,85 +3670,6 @@
+ PLATFORM="-DPDF_MAC_PLATFORM=\\\"\"Mac OS X$LEGACY_ID\"\\\"";;
+ esac
+
+- # Build Universal Binaries ?
+- # Check whether --enable-universal or --disable-universal was given.
+-if test "${enable_universal+set}" = set; then
+- enableval="$enable_universal"
+- if test "$enableval" = "yes" ; then
+- WITH_UNIVERSAL=yes
+- fi
+-fi;
+-
+- # set --arch flags
+-
+-# Check whether --with-macarch or --without-macarch was given.
+-if test "${with_macarch+set}" = set; then
+- withval="$with_macarch"
+- MAC_ARCH="$withval"
+-else
+- MAC_ARCH=default
+-fi;
+- echo "$as_me:$LINENO: checking Mac build Architecture" >&5
+-echo $ECHO_N "checking Mac build Architecture... $ECHO_C" >&6
+- case $MAC_ARCH in
+- i386)
+- MAC_CFLAGS="$MAC_CFLAGS -arch i386"
+- MAC_LDFLAGS="$MAC_LDFLAGS -arch i386"
+- ;;
+- x86_64)
+- # we do 64 bit builds >= 10.5 only
+- case $ac_sys_vers in
+- 9.*)
+- MAC_CFLAGS="$MAC_CFLAGS -arch x86_64"
+- MAC_LDFLAGS="$MAC_LDFLAGS -arch x86_64"
+- ;
+- 10.*)
+- MAC_CFLAGS="$MAC_CFLAGS -arch x86_64"
+- MAC_LDFLAGS="$MAC_LDFLAGS -arch x86_64"
+- ;
+- esac
+- ;;
+- ppc)
+- # not on 10.6
+- case $ac_sys_vers in
+- 8.*| 9.*)
+- MAC_CFLAGS="$MAC_CFLAGS -arch ppc"
+- MAC_LDFLAGS="$MAC_LDFLAGS -arch ppc"
+- ;
+- esac
+- ;;
+- ppc64)
+- # we do 64 bit builds on 10.5 only
+- case $ac_sys_vers in
+- 9.*)
+- MAC_CFLAGS="$MAC_CFLAGS -arch ppc64"
+- MAC_LDFLAGS="$MAC_LDFLAGS -arch ppc64"
+- ;
+- esac
+- ;;
+- universal)
+- case $ac_sys_vers in
+- 8.*)
+- MAC_CFLAGS="$MAC_CFLAGS -arch i386 -arch ppc"
+- MAC_LDFLAGS="$MAC_LDFLAGS -arch i386 -arch ppc"
+- ;
+- 9.*)
+- MAC_CFLAGS="$MAC_CFLAGS arch i386 -arch ppc -arch ppc64 -arch x86_64"
+- MAC_LDFLAGS="$MAC_LDFLAGS arch i386 -arch ppc -arch ppc64 -arch x86_64"
+- ;
+- 10.*)
+- MAC_CFLAGS="$MAC_CFLAGS -arch i386 -arch x86_64"
+- MAC_LDFLAGS="$MAC_LDFLAGS -arch i386 -arch x86_64"
+- ;
+- esac
+- ;;
+- *) echo"unknown architecture (--with-macarch)"
+- ;;
+- esac
+-
+-
+- echo "$as_me:$LINENO: result: $MAC_CFLAGS $MAC_LDFLAGS" >&5
+-echo "${ECHO_T}$MAC_CFLAGS $MAC_LDFLAGS" >&6
+ ;
+
+ linux|Linux*)
+@@ -19874,7 +19762,7 @@
+ if test "$PYTHONBIN" = "nope" ; then
+ WITH_PYTHON=no
+ else
+- PYTHONLIBDIR=`cat << EOF | python
++ PYTHONLIBDIR=`cat << EOF | $PYTHONBIN
+ import sys
+ import string
+ print string.join(filter(lambda x: -1 != string.find(x, 'dynload'), sys.path))
</ins></span></pre>
</div>
</div>
</body>
</html>