From owner-svn-ports-all@FreeBSD.ORG Wed Apr 23 17:00:53 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E8D715A9; Wed, 23 Apr 2014 17:00:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BBA541D6A; Wed, 23 Apr 2014 17:00:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3NH0rw1040367; Wed, 23 Apr 2014 17:00:53 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3NH0rnD040365; Wed, 23 Apr 2014 17:00:53 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201404231700.s3NH0rnD040365@svn.freebsd.org> From: Tijl Coosemans Date: Wed, 23 Apr 2014 17:00:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351960 - in head: editors/gedit graphics/evince X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Apr 2014 17:00:54 -0000 Author: tijl Date: Wed Apr 23 17:00:53 2014 New Revision: 351960 URL: http://svnweb.freebsd.org/changeset/ports/351960 QAT: https://qat.redports.org/buildarchive/r351960/ Log: Link editors/gedit and graphics/evince with libICE. (Fixup for r351936) Reported by: Mike Harding Modified: head/editors/gedit/Makefile head/graphics/evince/Makefile Modified: head/editors/gedit/Makefile ============================================================================== --- head/editors/gedit/Makefile Wed Apr 23 16:28:14 2014 (r351959) +++ head/editors/gedit/Makefile Wed Apr 23 17:00:53 2014 (r351960) @@ -19,7 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgcon USES= desktop-file-utils gettext gmake libtool:keepla pathfix \ pkgconfig tar:bzip2 -USE_XORG= sm +USE_XORG= ice sm INSTALLS_OMF= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes @@ -45,4 +45,8 @@ CONFIGURE_ARGS+=--disable-python PLIST_SUB+= PYTHON="@comment " .endif +post-patch: + ${REINPLACE_CMD} '/EGG_SMCLIENT_LIBS =/s/$$/ -lICE/' \ + ${WRKSRC}/gedit/smclient/Makefile.in + .include Modified: head/graphics/evince/Makefile ============================================================================== --- head/graphics/evince/Makefile Wed Apr 23 16:28:14 2014 (r351959) +++ head/graphics/evince/Makefile Wed Apr 23 17:00:53 2014 (r351960) @@ -28,6 +28,7 @@ INSTALLS_OMF= yes USES= desktop-file-utils gettext gmake libtool:keepla pathfix \ pkgconfig tar:bzip2 USE_GNOME= intlhack gnomeprefix gnomedocutils gconf2 +USE_XORG= ice sm CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip @@ -117,6 +118,8 @@ post-patch: @${REINPLACE_CMD} -e 's|execinfo.h|#|g' \ -e 's|" == "|" = "|g' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e '/SMCLIENT_LIBS =/s/$$/ -lICE/' \ + ${WRKSRC}/cut-n-paste/smclient/Makefile.in @${REINPLACE_CMD} -e '/^DOC_MODULE_VERSION/d' \ ${WRKSRC}/help/reference/libdocument/Makefile.in \ ${WRKSRC}/help/reference/libview/Makefile.in