From owner-svn-ports-all@FreeBSD.ORG  Sun Aug 26 12:03:30 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A32301065670;
	Sun, 26 Aug 2012 12:03:30 +0000 (UTC)
	(envelope-from thierry@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 744988FC29;
	Sun, 26 Aug 2012 12:03:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7QC3U26019058;
	Sun, 26 Aug 2012 12:03:30 GMT (envelope-from thierry@svn.freebsd.org)
Received: (from thierry@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7QC3Ui5019056;
	Sun, 26 Aug 2012 12:03:30 GMT (envelope-from thierry@svn.freebsd.org)
Message-Id: <201208261203.q7QC3Ui5019056@svn.freebsd.org>
From: Thierry Thomas <thierry@FreeBSD.org>
Date: Sun, 26 Aug 2012 12:03:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r303187 - head/x11/rxvt-unicode
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Aug 2012 12:03:30 -0000

Author: thierry
Date: Sun Aug 26 12:03:29 2012
New Revision: 303187
URL: http://svn.freebsd.org/changeset/ports/303187

Log:
  1) Fix build on recent current and 9-STABLE.
  
  2) Add an option to depend (or not) on freedesktop startup notification.
  
  PR:		ports/170645 (1) and ports/170667 (2)
  Submitted by:	Mykola Dzham <i (at) levsha.me> (1)
  		and Konstantinos Koukopoulos <koukopoulos (at) gmail.com> (2)

Modified:
  head/x11/rxvt-unicode/Makefile   (contents, props changed)

Modified: head/x11/rxvt-unicode/Makefile
==============================================================================
--- head/x11/rxvt-unicode/Makefile	Sun Aug 26 10:58:50 2012	(r303186)
+++ head/x11/rxvt-unicode/Makefile	Sun Aug 26 12:03:29 2012	(r303187)
@@ -7,7 +7,7 @@
 
 PORTNAME=	rxvt-unicode
 PORTVERSION=	9.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://dist.schmorp.de/rxvt-unicode/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. Attic
@@ -26,7 +26,7 @@ USE_GNOME=		pkgconfig
 USE_XORG=		xpm xft xrender
 GNU_CONFIGURE=		yes
 CPPFLAGS+=		-I${LOCALBASE}/include
-CONFIGURE_ENV=		LIBS="-lutil"
+CONFIGURE_ENV=		LIBS="-lstdc++ -lutil"
 CONFIGURE_ARGS=		--enable-everything --with-term=rxvt	\
 			--with-terminfo=${LOCALBASE}/share/misc/terminfo.db
 USE_BZIP2=		yes
@@ -48,6 +48,7 @@ OPTIONS=	\
 	IMLOCALE_FIX	"imlocale encoding conversion fix" 		On	\
 	GDK_PIXBUF	"Use gdk-pixbuf for background images"		On	\
 	AFTERIMAGE	"Use libAfterImage for background images"	Off	\
+	NOTIFY		"Freedesktop startup notification support"	Off	\
 	256_COLOR	"Support for 256 colors"			Off
 
 .include <bsd.port.pre.mk>
@@ -139,7 +140,7 @@ CONFIGURE_ARGS+=	--disable-pixbuf
 . if defined(WITHOUT_AFTERIMAGE)
 CONFIGURE_ARGS+=	--disable-afterimage	# To be upgraded
 . else
-LIB_DEPENDS+=		AfterImage.0:${PORTSDIR}/graphics/libafterimage
+LIB_DEPENDS+=		AfterImage:${PORTSDIR}/graphics/libafterimage
 CONFIGURE_ARGS+=	--enable-afterimage
 . endif
 .else
@@ -147,6 +148,14 @@ USE_GNOME+=		gdkpixbuf2
 CONFIGURE_ARGS+=	--enable-pixbuf
 .endif
 
+# enable startup notification
+.if defined(WITHOUT_NOTIFY)
+CONFIGURE_ARGS+=	--disable-startup-notification
+.else
+CONFIGURE_ARGS+=	--enable-startup-notification
+LIB_DEPENDS+=		startup-notification-1:${PORTSDIR}/x11/startup-notification
+.endif
+
 # enable support for 256 colors
 .if defined(WITH_256_COLOR)
 CONFIGURE_ARGS+=	--enable-256-color