[115336] trunk/dports/x11/mrxvt
jmr at macports.org
jmr at macports.org
Tue Dec 31 02:58:58 PST 2013
Revision: 115336
https://trac.macports.org/changeset/115336
Author: jmr at macports.org
Date: 2013-12-31 02:58:58 -0800 (Tue, 31 Dec 2013)
Log Message:
-----------
mrxvt: update to 0.5.4, fix png support, add jpeg dep, actually use terminfo from ncurses port
Modified Paths:
--------------
trunk/dports/x11/mrxvt/Portfile
trunk/dports/x11/mrxvt/files/patch-src__rxvt.h.diff
Added Paths:
-----------
trunk/dports/x11/mrxvt/files/newer_libpng.diff
Modified: trunk/dports/x11/mrxvt/Portfile
===================================================================
--- 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)
@@ -3,8 +3,7 @@
PortSystem 1.0
name mrxvt
-version 0.5.3
-revision 4
+version 0.5.4
categories x11
license GPL-2+
platforms darwin
@@ -19,25 +18,29 @@
support, etc.
# Yes, the homepage name is correct; the project changed names.
homepage http://materm.sourceforge.net/
-master_sites sourceforge:materm
+master_sites sourceforge:project/materm/mrxvt%20source/${version}
patch_sites ${master_sites}
-patchfiles patch-src__rxvt.h.diff no-scroll-with-buffer-mrxvt-0.5.3.patch
+patchfiles patch-src__rxvt.h.diff \
+ mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch \
+ newer_libpng.diff
checksums ${distname}${extract.suffix} \
- md5 0dac39bef63a4a69eab35c027e8c5bdf \
- sha1 442006f1d797ea5464c5c49d26d0cdecf79160f4 \
- rmd160 76fbbd5ba20215dd7785eafa07dae909029194ec \
- no-scroll-with-buffer-mrxvt-0.5.3.patch \
- md5 9032af5f981b91462ed916d27ae286b9 \
- sha1 303de6d33aa76892f24c6fac7b93ac21a945fda5 \
- rmd160 0b05e382fe8736617961d8790786ba0341945caf
+ md5 0232c8868484751dcb931a28f0756f69 \
+ sha1 f50e9ad2f652d4212b0ac5241b919372d9e43744 \
+ rmd160 175ce5c554c267ada4efde18e22704ff1b688dac \
+ mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch \
+ md5 2b6ecc9d68185e56a50eca0a2548fa8b \
+ sha1 62b1d128f71e463dd38239efa4d5bc0daa77e9cf \
+ rmd160 039929a83065055abfe29e239d7760390bb54a6b
depends_lib \
port:xorg-libsm \
port:Xft2 \
port:xpm \
port:libpng \
+ port:jpeg \
port:ncurses
configure.args --mandir=${prefix}/share/man \
--infodir=${prefix}/share/info \
+ --with-terminfo=${prefix}/share/terminfo \
--enable-mouseslipwheel \
--enable-24bits \
--enable-text-shadow \
Added: trunk/dports/x11/mrxvt/files/newer_libpng.diff
===================================================================
--- 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)
@@ -0,0 +1,76 @@
+--- 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);
Modified: trunk/dports/x11/mrxvt/files/patch-src__rxvt.h.diff
===================================================================
--- 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)
@@ -1,13 +1,5 @@
--- src/rxvt.h 2006-10-01 21:50:38.000000000 +0000
+++ src/rxvt.h.new 2007-06-14 22:59:53.000000000 +0000
-@@ -53,7 +53,6 @@
- # define ALL_NUMERIC_PTYS
- #endif
-
--
- #include <stdio.h>
- #include <ctype.h>
- #include <errno.h>
@@ -197,6 +196,11 @@
# define ut_name ut_user
#endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131231/b4037fdf/attachment.html>
More information about the macports-changes
mailing list