svn commit: r348011 - in head/x11/rxvt-unicode: . files

[Thierry Thomas]

Author: thierry
Date: Wed Mar 12 21:57:05 2014
New Revision: 348011
URL: http://svnweb.freebsd.org/changeset/ports/348011
QAT: https://qat.redports.org/buildarchive/r348011/

Log:
  Do not require GCC anymore: mousewheel is now supported with clang!
  
  Since I'm there, do some cleaning and follow the new rules.
  
  PR:		ports/187462
  Submitted by:	Christophe Juniet <c.juniet (at) gmail.com>

Added:
  head/x11/rxvt-unicode/files/patch-src_rxvt.h   (contents, props changed)
Modified:
  head/x11/rxvt-unicode/Makefile

Modified: head/x11/rxvt-unicode/Makefile
==============================================================================
--- head/x11/rxvt-unicode/Makefile	Wed Mar 12 21:51:28 2014	(r348010)
+++ head/x11/rxvt-unicode/Makefile	Wed Mar 12 21:57:05 2014	(r348011)
@@ -3,7 +3,7 @@
 
 PORTNAME=	rxvt-unicode
 PORTVERSION=	9.19
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://dist.schmorp.de/rxvt-unicode/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. Attic
@@ -18,14 +18,13 @@ BUILD_DEPENDS=	tic:${PORTSDIR}/devel/ncu
 RUN_DEPENDS=	${LOCALBASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig	\
 		${LOCALBASE}/share/misc/terminfo.db:${PORTSDIR}/devel/ncurses
 
-USES=			pkgconfig shebangfix
+USES=			pkgconfig shebangfix tar:bzip2
 USE_XORG=		xpm xft xrender
 GNU_CONFIGURE=		yes
 CPPFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ENV=		LIBS="-lstdc++ -lutil" TIC=${LOCALBASE}/bin/tic
 CONFIGURE_ARGS=		--enable-everything --with-term=rxvt	\
 			--with-terminfo=${LOCALBASE}/share/misc/terminfo.db
-USE_BZIP2=		yes
 
 OPTIONS_DEFINE=	PERL XIM UNICODE3 ISO14755 COMBINING RXVT_SCROLLBAR	\
 		NEXT_SCROLLBAR XTERM_SCROLLBAR BACKSPACE_KEY DELETE_KEY	\
@@ -129,8 +128,6 @@ CONFIGURE_ARGS+=	--disable-delete-key
 # enable scrolling via mouse wheel or buttons 4 & 5
 .if !${PORT_OPTIONS:MMOUSEWHEEL}
 CONFIGURE_ARGS+=	--disable-mousewheel
-.else
-USE_GCC=		yes # segfaults when trying to scroll with the mouse wheel if clang
 .endif
 
 # enable smart resize
@@ -153,7 +150,7 @@ CONFIGURE_ARGS+=	--enable-pixbuf
 CONFIGURE_ARGS+=	--disable-startup-notification
 .else
 CONFIGURE_ARGS+=	--enable-startup-notification
-LIB_DEPENDS+=		startup-notification-1:${PORTSDIR}/x11/startup-notification
+LIB_DEPENDS+=		libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
 .endif
 
 # enable support for 256 colors

Added: head/x11/rxvt-unicode/files/patch-src_rxvt.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/rxvt-unicode/files/patch-src_rxvt.h	Wed Mar 12 21:57:05 2014	(r348011)
@@ -0,0 +1,11 @@
+--- src/rxvt.h.orig	2013-10-03 01:05:18.000000000 +0200
++++ src/rxvt.h	2014-03-12 22:52:58.000000000 +0100
+@@ -1540,7 +1540,7 @@
+   bool scr_page (int nlines) NOTHROW;
+   bool scr_page (enum page_dirn direction, int nlines) NOTHROW
+   {
+-    scr_page (direction * nlines);
++    return scr_page (direction * nlines);
+   }
+   bool scr_changeview (int new_view_start) NOTHROW;
+   void scr_bell () NOTHROW;