Update to 0.5.3.

Approved by:	miwi (mentor)

10 files changed, 72 insertions, 103 deletions

diff --git a/x11/mrxvt-devel/Makefile b/x11/mrxvt-devel/Makefile
index c59524f15f75..068a15003df9 100644
--- a/x11/mrxvt-devel/Makefile
+++ b/x11/mrxvt-devel/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	mrxvt-devel
-PORTVERSION=	0.5.2
-PORTREVISION=	2
+PORTVERSION=	0.5.3
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	materm
 DISTNAME=	mrxvt-${PORTVERSION}
 
@@ -131,10 +130,12 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/share/mrxvtrc ${PREFIX}/etc/mrxvt/mrxvtrc.sample
 	${INSTALL_DATA} ${WRKSRC}/share/default.menu ${PREFIX}/etc/mrxvt/default.menu.sample
 	${INSTALL_DATA} ${WRKSRC}/share/submenus.menu ${PREFIX}/etc/mrxvt/submenus.menu.sample
+	${INSTALL_MAN} ${WRKSRC}/doc/mrxvt.1 ${MANPREFIX}/man/man1
+.if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${EXAMPLESDIR}/scripts
 	${INSTALL_DATA} ${WRKSRC}/share/scripts/mrxvtset.pl ${EXAMPLESDIR}/scripts
 	${INSTALL_DATA} ${WRKSRC}/share/scripts/settitle.c ${EXAMPLESDIR}/scripts
-	${INSTALL_MAN} ${WRKSRC}/doc/mrxvt.1 ${MANPREFIX}/man/man1
+.endif
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/x11/mrxvt-devel/distinfo b/x11/mrxvt-devel/distinfo
index 6f4bfa1873ac..b44cb3048380 100644
--- a/x11/mrxvt-devel/distinfo
+++ b/x11/mrxvt-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (mrxvt-0.5.2.tar.gz) = ed87b7dd9f4fb482de0f14f085085027
-SHA256 (mrxvt-0.5.2.tar.gz) = 558491d1f112362780abaf7429d14216e658b7768dd30f82f102ce646d3065cf
-SIZE (mrxvt-0.5.2.tar.gz) = 559242
+MD5 (mrxvt-0.5.3.tar.gz) = 0dac39bef63a4a69eab35c027e8c5bdf
+SHA256 (mrxvt-0.5.3.tar.gz) = e2327b7fdf1db3f2152d7cbda564f638ec11a4bed17f69e6de985c888ab5d411
+SIZE (mrxvt-0.5.3.tar.gz) = 592897
diff --git a/x11/mrxvt-devel/files/patch-doc-mrxvt.1 b/x11/mrxvt-devel/files/patch-doc-mrxvt.1
new file mode 100644
index 000000000000..57e871e1c87e
--- /dev/null
+++ b/x11/mrxvt-devel/files/patch-doc-mrxvt.1
@@ -0,0 +1,19 @@
+Index: doc/mrxvt.1
+===================================================================
+--- doc/mrxvt.1	(revision 244)
++++ doc/mrxvt.1	(working copy)
+@@ -329,14 +329,6 @@
+ Draw floating scrollbar (i.e. without a trough).
+ .Op Cm scrollbarFloating
+ .
+-.BO sw
+-Scroll synchronusly with buffer. Normally
+-.Nm
+-does not keep the screen completely up to date while scrolling. This allows
+-.Nm
+-to run faster when network latencies are very high and is typically useful when running across a very large internet or many gateways.
+-.Op Cm scrollWithBuffer
+-.
+ .El
+ .Ed
+ .\" {{{2 color
diff --git a/x11/mrxvt-devel/files/patch-src-init.c b/x11/mrxvt-devel/files/patch-src-init.c
deleted file mode 100644
index 741d774d4aed..000000000000
--- a/x11/mrxvt-devel/files/patch-src-init.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/init.c.orig	Sat Jun 16 23:26:00 2007
-+++ src/init.c	Sat Jun 16 23:26:19 2007
-@@ -41,7 +41,7 @@
- # define DEBUG_X
- #else
- # define DEBUG_LEVEL	0
--# define DEBUG_X
-+# undef DEBUG_X
- #endif
- 
- #if DEBUG_LEVEL
-@@ -3369,6 +3369,18 @@
-     wm_hint.initial_state = ISSET_OPTION(r, Opt_iconic) ? IconicState
- 			    : NormalState;
-     wm_hint.window_group = r->TermWin.parent;
-+
-+    /* window icon hint */
-+    if( r->h->rs[Rs_appIcon] ) {
-+        XpmReadFileToPixmap(r->Xdisplay, r->TermWin.parent, r->h->rs[Rs_appIcon],
-+            &r->h->appIcon, &r->h->appIconMask,0);
-+    }
-+    if( r->h->appIcon != None &&  r->h->appIconMask != None ) {
-+        wm_hint.icon_pixmap = r->h->appIcon;
-+        wm_hint.icon_mask = r->h->appIconMask;
-+        wm_hint.flags |= IconPixmapHint | IconMaskHint;
-+    }
-+    
-     /* class hints */
-     class_hint.res_name = (char*) r->h->rs[Rs_name];
-     class_hint.res_class = (char*) APL_CLASS;
diff --git a/x11/mrxvt-devel/files/patch-src-main.c b/x11/mrxvt-devel/files/patch-src-main.c
deleted file mode 100644
index b2e76efcddad..000000000000
--- a/x11/mrxvt-devel/files/patch-src-main.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/main.c.orig	Sun Oct  1 23:50:39 2006
-+++ src/main.c	Sat Jun 16 23:10:08 2007
-@@ -562,6 +562,17 @@
- #  endif
- # endif
- 
-+    if( NOT_NULL( r->h->appIcon ) )
-+    {
-+        XFreePixmap (r->Xdisplay, r->h->appIcon);
-+        SET_NULL(r->h->appIcon);
-+    }
-+    if( NOT_NULL( r->h->appIconMask ) )
-+    {
-+        XFreePixmap (r->Xdisplay, r->h->appIconMask);
-+        SET_NULL(r->h->appIconMask);
-+    }
-+
-     if (IS_CURSOR(r->term_pointer))
-     {
- 	XFreeCursor (r->Xdisplay, r->term_pointer);
-@@ -599,6 +610,7 @@
- 	SET_NULL(r->xftColors);
-     }
- # endif
-+
-     rxvt_free (r->h);		    SET_NULL(r->h);
-     rxvt_free (r);		    SET_NULL(r);
- 
diff --git a/x11/mrxvt-devel/files/patch-src-rxvt.h b/x11/mrxvt-devel/files/patch-src-rxvt.h
deleted file mode 100644
index 6915a879d582..000000000000
--- a/x11/mrxvt-devel/files/patch-src-rxvt.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/rxvt.h.orig	Sun Oct  1 23:50:38 2006
-+++ src/rxvt.h	Sat Jun 16 23:10:15 2007
-@@ -1109,9 +1109,7 @@
- 
- #ifdef BACKGROUND_IMAGE
-     Rs_tabbarPixmap,	/* tabbar background pixmap */
--# if 0 /* appicon not yet implemented */
-     Rs_appIcon,		/* use pixmap as application icon */
--# endif
- #endif
- 
- #ifdef HAVE_MENUBAR
-@@ -1704,6 +1702,10 @@
- 							   succesfully grabbed
- 							   at prevPos */
- #endif
-+
-+    Pixmap          appIcon;
-+    Pixmap          appIconMask;
-+
- };
- 
- #ifndef __attribute__
diff --git a/x11/mrxvt-devel/files/patch-src-rxvtlib.h b/x11/mrxvt-devel/files/patch-src-rxvtlib.h
new file mode 100644
index 000000000000..68303179810c
--- /dev/null
+++ b/x11/mrxvt-devel/files/patch-src-rxvtlib.h
@@ -0,0 +1,14 @@
+Index: src/rxvtlib.h
+===================================================================
+--- src/rxvtlib.h	(revision 244)
++++ src/rxvtlib.h	(working copy)
+@@ -280,7 +280,7 @@
+ #define Opt_forceTransparent	    ((1LU<<16) | IS_OPTION1)
+ #define Opt_mc_hack		    ((1LU<<17) | IS_OPTION1)
+ #define Opt_tripleclickwords	    ((1LU<<18) | IS_OPTION1)
+-#define Opt_scrollWithBuffer	    ((1LU<<19) | IS_OPTION1)
++/* #define Opt_scrollWithBuffer	    ((1LU<<19) | IS_OPTION1) */
+ #define Opt_mouseWheelScrollPage    ((1LU<<21) | IS_OPTION1)
+ #define Opt_pointerBlank	    ((1LU<<22) | IS_OPTION1)
+ #define Opt_cursorBlink		    ((1LU<<23) | IS_OPTION1)
+Index: src/xdefaults.c
diff --git a/x11/mrxvt-devel/files/patch-src-screen.c b/x11/mrxvt-devel/files/patch-src-screen.c
new file mode 100644
index 000000000000..1773da93734d
--- /dev/null
+++ b/x11/mrxvt-devel/files/patch-src-screen.c
@@ -0,0 +1,15 @@
+Index: src/screen.c
+===================================================================
+--- src/screen.c	(revision 244)
++++ src/screen.c	(working copy)
+@@ -938,10 +938,6 @@
+ 	    PVTS(r, page)->nscrolled = SVLINES;
+ 	else
+ 	    PVTS(r, page)->nscrolled = (uint16_t)nscrolled;
+-	if (ISSET_OPTION(r, Opt_scrollWithBuffer) &&
+-	    VSTART != 0 &&
+-	    VSTART != SVLINES)
+-	    rxvt_scr_page(r, page, UP, count);
+     }
+     else if (!spec)
+ 	row1 += SVLINES;
diff --git a/x11/mrxvt-devel/files/patch-src-xdefaults.c b/x11/mrxvt-devel/files/patch-src-xdefaults.c
index 61c504b024f3..0857877aefcb 100644
--- a/x11/mrxvt-devel/files/patch-src-xdefaults.c
+++ b/x11/mrxvt-devel/files/patch-src-xdefaults.c
@@ -1,12 +1,13 @@
---- src/xdefaults.c.orig	Sun Oct  1 23:50:37 2006
-+++ src/xdefaults.c	Sat Jun 16 23:10:19 2007
-@@ -234,9 +234,7 @@
-     STRG(Rs_tabbarPixmap, "tabbarPixmap", "tbpixmap", "file[;geom]", "tabbar background image", 0),
-     BOOL( "tabUsePixmap", "tupixmap", Opt_tabPixmap,
- 	    "use tabbar background image for tabs" ),
--# if 0 /* App icon not yet implemented */
-     STRG(Rs_appIcon, "appIcon", "ic", "file[;geom]", "application icon file", 0),
--#endif
- #endif	/* BACKGROUND_IMAGE */
+Index: src/xdefaults.c
+===================================================================
+--- src/xdefaults.c	(revision 244)
++++ src/xdefaults.c	(working copy)
+@@ -203,8 +203,6 @@
+ 	    "scroll-on-tty-output inhibit" ),
+     BOOL( "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress,
+ 	    "scroll-on-keypress" ),
+-    BOOL( "scrollWithBuffer", "sw", Opt_scrollWithBuffer,
+-	    "scroll-with-buffer" ),
  
-     BOOL( "utmpInhibit", "ut", Opt_utmpInhibit,
+     STRG(Rs_opacity, "opacity", "o", "%",
+ 	"transluscent window (true transparent) opaque degree", 0),
diff --git a/x11/mrxvt-devel/pkg-plist b/x11/mrxvt-devel/pkg-plist
index be40f28c7ec8..ccb150f67638 100644
--- a/x11/mrxvt-devel/pkg-plist
+++ b/x11/mrxvt-devel/pkg-plist
@@ -8,8 +8,8 @@ share/pixmaps/mrxvt.xpm
 etc/mrxvt/mrxvtrc.sample
 etc/mrxvt/default.menu.sample
 etc/mrxvt/submenus.menu.sample
-%%EXAMPLESDIR%%/scripts/mrxvtset.pl
-%%EXAMPLESDIR%%/scripts/settitle.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/mrxvtset.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/settitle.c
 %%DOCSDIR%%/README.greek
 %%DOCSDIR%%/README.xvt
 %%DOCSDIR%%/hack-mrxvt.txt
@@ -19,6 +19,6 @@ etc/mrxvt/submenus.menu.sample
 %%DOCSDIR%%/mrxvt_seq.txt
 %%DOCSDIR%%/xterm-ctlseqs.txt
 @dirrmtry etc/mrxvt
-@dirrm %%EXAMPLESDIR%%/scripts
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/scripts
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%