Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Apr 2014 17:00:53 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
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
Message-ID:  <201404231700.s3NH0rnD040365@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <mvharding@gmail.com>

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 <bsd.port.post.mk>

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404231700.s3NH0rnD040365>