5 files changed, 49 insertions, 14 deletions

diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile
index 2dc766c12cd5..5e6086642a0e 100644
--- a/x11/mrxvt/Makefile
+++ b/x11/mrxvt/Makefile
@@ -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 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include
 		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 --git a/x11/mrxvt/distinfo b/x11/mrxvt/distinfo
index bd4d19d2580b..ca87454b9724 100644
--- a/x11/mrxvt/distinfo
+++ b/x11/mrxvt/distinfo
@@ -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 --git a/x11/mrxvt/files/patch-src-main.c b/x11/mrxvt/files/patch-src-main.c
new file mode 100644
index 000000000000..52ba4111e025
--- /dev/null
+++ b/x11/mrxvt/files/patch-src-main.c
@@ -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 --git a/x11/mrxvt/files/patch-src-strings.c b/x11/mrxvt/files/patch-src-strings.c
new file mode 100644
index 000000000000..3962ba672e09
--- /dev/null
+++ b/x11/mrxvt/files/patch-src-strings.c
@@ -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 --git a/x11/mrxvt/pkg-plist b/x11/mrxvt/pkg-plist
new file mode 100644
index 000000000000..df2153e1294e
--- /dev/null
+++ b/x11/mrxvt/pkg-plist
@@ -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%%%%DOCSDIR%%/mrxvt.vbs
+%%PORTDOCS%%%%DOCSDIR%%/mrxvtset.pl
+%%PORTDOCS%%%%DOCSDIR%%/README.greek
+%%PORTDOCS%%%%DOCSDIR%%/README.menu
+%%PORTDOCS%%%%DOCSDIR%%/README.xvt
+%%PORTDOCS%%%%DOCSDIR%%/TIPS
+%%PORTDOCS%%%%DOCSDIR%%/xdefaults-sample.txt
+%%PORTDOCS%%%%DOCSDIR%%/xterm.seq
+%%PORTDOCS%%@dirrm %%DOCSDIR%%