<!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>[115336] trunk/dports/x11/mrxvt</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/115336">115336</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2013-12-31 02:58:58 -0800 (Tue, 31 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>mrxvt: update to 0.5.4, fix png support, add jpeg dep, actually use terminfo from ncurses port</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsx11mrxvtPortfile">trunk/dports/x11/mrxvt/Portfile</a></li>
<li><a href="#trunkdportsx11mrxvtfilespatchsrc__rxvthdiff">trunk/dports/x11/mrxvt/files/patch-src__rxvt.h.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsx11mrxvtfilesnewer_libpngdiff">trunk/dports/x11/mrxvt/files/newer_libpng.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsx11mrxvtPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/mrxvt/Portfile (115335 => 115336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/mrxvt/Portfile 2013-12-31 10:04:46 UTC (rev 115335)
+++ trunk/dports/x11/mrxvt/Portfile 2013-12-31 10:58:58 UTC (rev 115336)
</span><span class="lines">@@ -3,8 +3,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name mrxvt
</span><del>-version 0.5.3
-revision 4
</del><ins>+version 0.5.4
</ins><span class="cx"> categories x11
</span><span class="cx"> license GPL-2+
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -19,25 +18,29 @@
</span><span class="cx"> support, etc.
</span><span class="cx"> # Yes, the homepage name is correct; the project changed names.
</span><span class="cx"> homepage http://materm.sourceforge.net/
</span><del>-master_sites sourceforge:materm
</del><ins>+master_sites sourceforge:project/materm/mrxvt%20source/${version}
</ins><span class="cx"> patch_sites ${master_sites}
</span><del>-patchfiles patch-src__rxvt.h.diff no-scroll-with-buffer-mrxvt-0.5.3.patch
</del><ins>+patchfiles patch-src__rxvt.h.diff \
+ mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch \
+ newer_libpng.diff
</ins><span class="cx"> checksums ${distname}${extract.suffix} \
</span><del>- md5 0dac39bef63a4a69eab35c027e8c5bdf \
- sha1 442006f1d797ea5464c5c49d26d0cdecf79160f4 \
- rmd160 76fbbd5ba20215dd7785eafa07dae909029194ec \
- no-scroll-with-buffer-mrxvt-0.5.3.patch \
- md5 9032af5f981b91462ed916d27ae286b9 \
- sha1 303de6d33aa76892f24c6fac7b93ac21a945fda5 \
- rmd160 0b05e382fe8736617961d8790786ba0341945caf
</del><ins>+ md5 0232c8868484751dcb931a28f0756f69 \
+ sha1 f50e9ad2f652d4212b0ac5241b919372d9e43744 \
+ rmd160 175ce5c554c267ada4efde18e22704ff1b688dac \
+ mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch \
+ md5 2b6ecc9d68185e56a50eca0a2548fa8b \
+ sha1 62b1d128f71e463dd38239efa4d5bc0daa77e9cf \
+ rmd160 039929a83065055abfe29e239d7760390bb54a6b
</ins><span class="cx"> depends_lib \
</span><span class="cx"> port:xorg-libsm \
</span><span class="cx"> port:Xft2 \
</span><span class="cx"> port:xpm \
</span><span class="cx"> port:libpng \
</span><ins>+ port:jpeg \
</ins><span class="cx"> port:ncurses
</span><span class="cx"> configure.args --mandir=${prefix}/share/man \
</span><span class="cx"> --infodir=${prefix}/share/info \
</span><ins>+ --with-terminfo=${prefix}/share/terminfo \
</ins><span class="cx"> --enable-mouseslipwheel \
</span><span class="cx"> --enable-24bits \
</span><span class="cx"> --enable-text-shadow \
</span></span></pre></div>
<a id="trunkdportsx11mrxvtfilesnewer_libpngdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/mrxvt/files/newer_libpng.diff (0 => 115336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/mrxvt/files/newer_libpng.diff (rev 0)
+++ trunk/dports/x11/mrxvt/files/newer_libpng.diff 2013-12-31 10:58:58 UTC (rev 115336)
</span><span class="lines">@@ -0,0 +1,76 @@
</span><ins>+--- configure.orig 2008-05-13 03:22:43.000000000 +1000
++++ configure 2013-12-31 21:36:49.000000000 +1100
+@@ -5818,9 +5818,9 @@
+
+ if test "x$support_png" = "xyes"; then
+
+-{ echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
+-echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6; }
+-if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
++{ echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
++echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6; }
++if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -5839,11 +5839,11 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char png_check_sig ();
++char png_sig_cmp ();
+ int
+ main ()
+ {
+-return png_check_sig ();
++return png_sig_cmp ();
+ ;
+ return 0;
+ }
+@@ -5866,21 +5866,21 @@
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+- ac_cv_lib_png_png_check_sig=yes
++ ac_cv_lib_png_png_sig_cmp=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+- ac_cv_lib_png_png_check_sig=no
++ ac_cv_lib_png_png_sig_cmp=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
+-echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6; }
+-if test $ac_cv_lib_png_png_check_sig = yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_sig_cmp" >&5
++echo "${ECHO_T}$ac_cv_lib_png_png_sig_cmp" >&6; }
++if test $ac_cv_lib_png_png_sig_cmp = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBPNG 1
+ _ACEOF
+--- src/mpng.c.orig 2008-02-18 09:04:50.000000000 +1100
++++ src/mpng.c 2013-12-31 21:47:40.000000000 +1100
+@@ -83,7 +83,7 @@ png_uint_32 png_row_bytes;
+ display_depth = XDefaultDepth(display,XDefaultScreen(display));
+
+ fread(sig, 1, 8, ifile);
+- if (!png_check_sig(sig, 8)){
++ if (png_sig_cmp(sig, 0, 8)){
+ fclose(ifile);
+ return -1;
+ }
+@@ -113,7 +113,7 @@ png_uint_32 png_row_bytes;
+
+ if (png_depth < 8){
+ if (png_color_type == PNG_COLOR_TYPE_GRAY ){
+- png_set_gray_1_2_4_to_8(png_ptr);
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
+ png_row_bytes = png_width;
+ }else{
+ png_set_expand(png_ptr);
</ins></span></pre></div>
<a id="trunkdportsx11mrxvtfilespatchsrc__rxvthdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/mrxvt/files/patch-src__rxvt.h.diff (115335 => 115336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/mrxvt/files/patch-src__rxvt.h.diff 2013-12-31 10:04:46 UTC (rev 115335)
+++ trunk/dports/x11/mrxvt/files/patch-src__rxvt.h.diff 2013-12-31 10:58:58 UTC (rev 115336)
</span><span class="lines">@@ -1,13 +1,5 @@
</span><span class="cx"> --- src/rxvt.h 2006-10-01 21:50:38.000000000 +0000
</span><span class="cx"> +++ src/rxvt.h.new 2007-06-14 22:59:53.000000000 +0000
</span><del>-@@ -53,7 +53,6 @@
- # define ALL_NUMERIC_PTYS
- #endif
-
--
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
</del><span class="cx"> @@ -197,6 +196,11 @@
</span><span class="cx"> # define ut_name ut_user
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>