Date: Fri, 22 Jul 2005 20:22:20 +1200 From: Matthew Luckie <mjl@luckie.org.nz> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/83896: [patch] update x11/mrxvt to 0.4.1 Message-ID: <E1DvsnU-000EZB-5k@lycra.luckie.org.nz> Resent-Message-ID: <200507220830.j6M8UMNh003553@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 83896
>Category: ports
>Synopsis: [patch] update x11/mrxvt to 0.4.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Jul 22 08:30:21 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Matthew Luckie
>Release: FreeBSD 4.11-RELEASE-p8 i386
>Organization:
University of Waikato
>Environment:
System: FreeBSD lycra.luckie.org.nz 4.11-RELEASE-p8 FreeBSD 4.11-RELEASE-p8 #1: Wed May 11 14:02:09 NZST 2005 root@lycra.luckie.org.nz:/files/freebsd_src/sys/compile/lycra i386
>Description:
mrxvt is marked as broken on 4.X
This patch updates mrxvt to 0.4.1 and unbreaks it.
>How-To-Repeat:
NA
>Fix:
diff -uNr mrxvt.orig/Makefile mrxvt/Makefile
--- mrxvt.orig/Makefile Fri Jan 7 07:08:17 2005
+++ mrxvt/Makefile Fri Jul 22 19:14:01 2005
@@ -6,7 +6,7 @@
#
PORTNAME= mrxvt
-PORTVERSION= 0.3.9
+PORTVERSION= 0.4.1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= materm
@@ -25,15 +25,5 @@
LIBS="${LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib"
MAN1= mrxvt.1
-PLIST_FILES= bin/mrxvt
-PORTDOCS= TIPS README.greek README.menu README.xvt \
- xdefaults-sample.txt xterm.seq mrxvt.vbs
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} <= 500000
-IGNORE= Does not build
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -uNr mrxvt.orig/distinfo mrxvt/distinfo
--- mrxvt.orig/distinfo Thu Dec 23 18:08:56 2004
+++ mrxvt/distinfo Fri Jul 22 19:01:09 2005
@@ -1,2 +1,2 @@
-MD5 (mrxvt-0.3.9.tar.gz) = c3a0370622b2e572482581f86975851a
-SIZE (mrxvt-0.3.9.tar.gz) = 457304
+MD5 (mrxvt-0.4.1.tar.gz) = bd41f496e11d2a318e2fa59aca056793
+SIZE (mrxvt-0.4.1.tar.gz) = 504370
diff -uNr mrxvt.orig/files/patch-src-main.c mrxvt/files/patch-src-main.c
--- mrxvt.orig/files/patch-src-main.c Thu Jan 1 12:00:00 1970
+++ mrxvt/files/patch-src-main.c Fri Jul 22 19:43:31 2005
@@ -0,0 +1,11 @@
+--- src/main.c.orig Fri Jul 22 19:42:38 2005
++++ src/main.c Fri Jul 22 19:43:03 2005
+@@ -1568,7 +1568,7 @@
+ void
+ rxvt_set_utf8_property (rxvt_t* r, Atom prop, Window win, const char* str)
+ {
+-#ifdef HAVE_WCHAR_H
++#ifdef HAVE_WCHAR_H && _FreeBSD_version >= 500000
+ wchar_t* ws = rxvt_mbstowcs (str);
+ char* s = rxvt_wcstoutf8 (ws);
+
diff -uNr mrxvt.orig/files/patch-src-strings.c mrxvt/files/patch-src-strings.c
--- mrxvt.orig/files/patch-src-strings.c Thu Jan 1 12:00:00 1970
+++ mrxvt/files/patch-src-strings.c Fri Jul 22 19:52:05 2005
@@ -0,0 +1,18 @@
+--- src/strings.c.orig Fri Jul 22 19:49:43 2005
++++ src/strings.c Fri Jul 22 19:50:40 2005
+@@ -44,6 +44,7 @@
+
+ #ifdef HAVE_WCHAR_H
+ /* EXTPROTO */
++#if _FreeBSD_version >= 500000
+ char*
+ rxvt_wcstombs (const wchar_t* str, int len)
+ {
+@@ -70,6 +71,7 @@
+
+ return r;
+ }
++#endif
+
+
+ /* EXTPROTO */
diff -uNr mrxvt.orig/pkg-plist mrxvt/pkg-plist
--- mrxvt.orig/pkg-plist Thu Jan 1 12:00:00 1970
+++ mrxvt/pkg-plist Fri Jul 22 19:13:18 2005
@@ -0,0 +1,16 @@
+bin/mrxvt
+share/pixmaps/mrxvt-csh.png
+share/pixmaps/mrxvt-csh.xpm
+share/pixmaps/mrxvt-root.png
+share/pixmaps/mrxvt-root.xpm
+share/pixmaps/mrxvt.png
+share/pixmaps/mrxvt.xpm
+%%PORTDOCS%%%%EXAMPLESDIR%%/mrxvt.vbs
+%%PORTDOCS%%%%EXAMPLESDIR%%/mrxvtset.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/README.greek
+%%PORTDOCS%%%%EXAMPLESDIR%%/README.menu
+%%PORTDOCS%%%%EXAMPLESDIR%%/README.xvt
+%%PORTDOCS%%%%EXAMPLESDIR%%/TIPS
+%%PORTDOCS%%%%EXAMPLESDIR%%/xdefaults-sample.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/xterm.seq
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1DvsnU-000EZB-5k>